diff --git a/.changes/README.md b/.changes/README.md
new file mode 100644
index 000000000..e41282f03
--- /dev/null
+++ b/.changes/README.md
@@ -0,0 +1,120 @@
+# Release notes (`.changes/`)
+
+Every PR with a user-visible change drops one file here describing that change
+in plain language. At release time
+`tools/release/build-release-notes.mjs` turns the accumulated files into the
+GitHub release body, the `CHANGELOG.md` section, and a blog-post scaffold for
+the website — then deletes them.
+
+The point is to write the note **while the context is still fresh**, instead of
+reconstructing three months of work from commit titles at release time.
+
+## File
+
+Name it `<area>-<short-slug>.md`, e.g. `.changes/playback-up-next-rail.md`.
+
+```markdown
+---
+type: feature
+area: playback
+issues: [1187]
+screenshot: up-next-rail
+---
+
+Series now show an "Up Next" rail beside the player on wide windows: the rest
+of the current season, watch progress, and click-to-play inline.
+```
+
+| Field        | Required | Value                                                       |
+| ------------ | -------- | ----------------------------------------------------------- |
+| `type`       | yes      | `breaking`, `feature`, `fix`, `perf`, or `internal`          |
+| `area`       | yes      | lowercase slug, same as the conventional-commit scope        |
+| `issues`     | no       | issue numbers this closes — `[1187]` or `1187`               |
+| `screenshot` | no       | slug from `tools/release/screenshots.manifest.json`          |
+
+There is **no version field**. The release version is chosen deliberately at
+release time, not derived from these files.
+
+You never write a PR number: the generator resolves it from the commit that
+added the file.
+
+## Writing the body
+
+One to three sentences, present tense, **written for a user, not a reviewer**.
+The body is capped at 400 characters — depth belongs in the blog post.
+
+- ❌ "Refactor `WebVideoControlsAdapter` to hoist volume state into the session"
+- ✅ "The player now remembers volume between episodes"
+
+- ❌ "Fix off-by-one in `resolveEnrichmentSeasonNumber`"
+- ✅ "Series whose title carries a season marker no longer show the wrong season"
+
+`type: internal` is for changes with no user-visible effect that are still worth
+recording (dependency bumps with behaviour risk, packaging moves). They stay out
+of the release body and blog post, and land collapsed in `CHANGELOG.md`.
+
+## When a note is not needed
+
+Skip the note — and apply the `no-release-note` label — for test-only changes,
+docs, CI/workflow plumbing, and pure refactors with no behaviour change.
+
+## Commands
+
+```bash
+pnpm run release:notes:validate
+pnpm run release:notes:github
+pnpm run release:notes:changelog
+pnpm run release:notes:blog
+node tools/release/build-release-notes.mjs --consume
+```
+
+The release version comes from the root `package.json` — bump it first, then
+generate. `--version 0.24.0` overrides it to preview a release before the bump:
+
+```bash
+pnpm run release:notes:github --version 0.24.0
+```
+
+A bare `--` separator is accepted and ignored, so the npm habit of
+`pnpm run release:notes:github -- --version 0.24.0` works too: pnpm forwards
+that separator to the script rather than consuming it the way npm does.
+
+`--validate` and `--format github` only read and print. `--format changelog`
+and `--format blog` write their target file (rerunning `changelog` for the same
+version replaces that section rather than duplicating it). Only `--consume`
+deletes anything.
+
+The release sequence is: bump the version → `release:notes:changelog` →
+`release:notes:blog` → `--consume` → commit → tag → push. The tag build then
+extracts the new `CHANGELOG.md` section into the GitHub release body
+(`tools/release/extract-changelog-section.mjs`) and **fails the release** if
+the section is missing — a tag cut without the changelog step cannot silently
+ship PR-title-only notes.
+
+The website publishes **one post per minor version** (`v0-18` … `v0-22`), and
+release screenshots live under the matching `blog/v0-24/` directory. A patch
+release therefore edits the existing post rather than generating a new one, so
+`--format blog` refuses to overwrite unless you pass `--force`.
+
+## Screenshots
+
+`pnpm run release:screenshots` captures every manifest shot in dark and light
+against the built app plus the Xtream mock server — never a real account.
+The run is fail-closed: it proves the real `~/.iptvnator/databases` directory
+(including the SQLite WAL sidecars, checked after Electron exits) was not
+touched, launches the app with an allowlisted environment, records and blocks
+all non-localhost traffic, scans every frame for external resources and
+credential-shaped text, and asserts TMDB enrichment stays disabled. Frames are
+staged outside the repository and published only once every shot and every
+guard has passed.
+
+Adding a shot for a new feature = one entry in
+`tools/release/screenshots.manifest.json` (plus, if navigation is new, one
+named action in `tools/release/capture-navigation.ts`).
+
+```bash
+pnpm nx run electron-backend:build-e2e   # once, before capturing
+pnpm run release:screenshots             # all shots, both themes
+pnpm run release:screenshots -- --only dashboard --theme dark
+pnpm run release:screenshots -- --release v0-24
+```
diff --git a/.changes/backup-hidden-categories.md b/.changes/backup-hidden-categories.md
new file mode 100644
index 000000000..064f99137
--- /dev/null
+++ b/.changes/backup-hidden-categories.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: backup
+issues: [1017]
+---
+
+Backups carry hidden Xtream categories correctly. An export used to lose which
+categories you had hidden, and restoring such a backup then hid every category
+of that kind.
diff --git a/.changes/deps-npm-minor-patch-group.md b/.changes/deps-npm-minor-patch-group.md
new file mode 100644
index 000000000..1e2eb2a84
--- /dev/null
+++ b/.changes/deps-npm-minor-patch-group.md
@@ -0,0 +1,9 @@
+---
+type: internal
+area: deps
+---
+
+Updated 43 dependencies, including the HTTP client behind every playlist and
+portal request — that one closes seven advisories that affect the shipped app,
+among them a proxy-credential leak on redirects. Also refreshes the ArtPlayer,
+hls.js, Video.js and Shaka player engines. No behaviour change intended.
diff --git a/.changes/deps-transitive-cve-overrides.md b/.changes/deps-transitive-cve-overrides.md
new file mode 100644
index 000000000..8be3e46d5
--- /dev/null
+++ b/.changes/deps-transitive-cve-overrides.md
@@ -0,0 +1,8 @@
+---
+type: internal
+area: deps
+---
+
+Patched five vulnerable transitive dependencies that ship with the app —
+including the YAML parser `electron-updater` uses to read update manifests, and
+the HTTP form encoder behind portal requests. No behaviour change.
diff --git a/.changes/downloads-pause-resume.md b/.changes/downloads-pause-resume.md
new file mode 100644
index 000000000..2bde5dffb
--- /dev/null
+++ b/.changes/downloads-pause-resume.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: downloads
+---
+
+Downloads can be paused and picked up later. A paused transfer keeps what it
+already fetched and continues from that point instead of starting over, and
+downloads cut short by a crash or a closed app come back as paused rather than
+lost.
diff --git a/.changes/electron-remote-static-paths.md b/.changes/electron-remote-static-paths.md
new file mode 100644
index 000000000..70313de33
--- /dev/null
+++ b/.changes/electron-remote-static-paths.md
@@ -0,0 +1,7 @@
+---
+type: fix
+area: electron
+---
+
+The desktop remote-control server now blocks crafted static paths from escaping
+bundled web files on Windows.
diff --git a/.changes/embedded-mpv-frame-copy.md b/.changes/embedded-mpv-frame-copy.md
new file mode 100644
index 000000000..6a866ae2f
--- /dev/null
+++ b/.changes/embedded-mpv-frame-copy.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: embedded-mpv
+---
+
+Experimental Embedded MPV can draw video inside the app window instead of into a
+separate layer pinned on top of it, so menus, dialogs and the player controls
+stop being swallowed by the picture. Available on macOS (Apple Silicon), Windows
+and Linux x64; switching it on needs a restart.
diff --git a/.changes/epg-manual-channel-mapping.md b/.changes/epg-manual-channel-mapping.md
new file mode 100644
index 000000000..7cb429b15
--- /dev/null
+++ b/.changes/epg-manual-channel-mapping.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: epg
+---
+
+Channels whose guide never matched can be mapped by hand: right-click a channel
+in any list and pick "Map EPG channel" to attach it to a channel from your
+uploaded XMLTV guide. The mapping is remembered and used everywhere the guide is
+read — M3U playlists, Xtream and Stalker portals alike.
diff --git a/.changes/epg-mapping-lookup-fail-soft.md b/.changes/epg-mapping-lookup-fail-soft.md
new file mode 100644
index 000000000..dc35aebbe
--- /dev/null
+++ b/.changes/epg-mapping-lookup-fail-soft.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: epg
+---
+
+A database error while reading or saving a manual EPG channel mapping no longer
+surfaces as a failed request. Looking up, saving, deleting, and searching
+mappings now fall back quietly, so a transient storage hiccup can no longer take
+down the EPG panel or the "Map EPG channel" dialog.
diff --git a/.changes/favorites-lost-updates.md b/.changes/favorites-lost-updates.md
new file mode 100644
index 000000000..a54c32de3
--- /dev/null
+++ b/.changes/favorites-lost-updates.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: favorites
+issues: [1137]
+---
+
+Favorites stop losing changes. The custom drag-and-drop order of an Xtream
+playlist's own favorites is saved again, and two favorites or history entries
+added at almost the same moment no longer quietly overwrite each other.
diff --git a/.changes/i18n-hungarian.md b/.changes/i18n-hungarian.md
new file mode 100644
index 000000000..691f77900
--- /dev/null
+++ b/.changes/i18n-hungarian.md
@@ -0,0 +1,7 @@
+---
+type: feature
+area: i18n
+issues: [1192]
+---
+
+IPTVnator speaks Hungarian, its 19th language — contributed by @htibcsike.
diff --git a/.changes/m3u-dash-clearkey.md b/.changes/m3u-dash-clearkey.md
new file mode 100644
index 000000000..c2853da6b
--- /dev/null
+++ b/.changes/m3u-dash-clearkey.md
@@ -0,0 +1,10 @@
+---
+type: feature
+area: m3u
+issues: [86, 614, 656, 733, 752]
+---
+
+MPEG-DASH channels play in the built-in player, ClearKey-encrypted ones
+included — the keys are read from the playlist's #KODIPROP lines, whether they
+sit above or below the channel entry. Streams locked with Widevine or PlayReady
+still cannot be played, but they now say so instead of failing silently.
diff --git a/.changes/m3u-favorites-hydration.md b/.changes/m3u-favorites-hydration.md
new file mode 100644
index 000000000..97d9deb64
--- /dev/null
+++ b/.changes/m3u-favorites-hydration.md
@@ -0,0 +1,7 @@
+---
+type: perf
+area: m3u
+---
+
+Importing large M3U playlists is faster because IPTVnator no longer rewrites
+the entire playlist when loading saved favorites.
diff --git a/.changes/m3u-long-stream-urls.md b/.changes/m3u-long-stream-urls.md
new file mode 100644
index 000000000..e084e55ee
--- /dev/null
+++ b/.changes/m3u-long-stream-urls.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: m3u
+issues: [1189]
+---
+
+Playlists with very long stream URLs — Pluto TV style lists that carry a session
+token in every link — import in full again instead of collapsing into a single
+channel.
diff --git a/.changes/m3u-refresh-cancellation.md b/.changes/m3u-refresh-cancellation.md
new file mode 100644
index 000000000..6029dad22
--- /dev/null
+++ b/.changes/m3u-refresh-cancellation.md
@@ -0,0 +1,8 @@
+---
+type: perf
+area: m3u
+---
+
+Cancelling a large M3U refresh now stops its background worker before parsed
+channels can be copied or saved, keeping the interface responsive and leaving
+the existing playlist unchanged.
diff --git a/.changes/playback-shared-player-controls.md b/.changes/playback-shared-player-controls.md
new file mode 100644
index 000000000..d2f27b104
--- /dev/null
+++ b/.changes/playback-shared-player-controls.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: playback
+---
+
+An optional new set of player controls that looks and behaves the same in the
+HTML5, Video.js and ArtPlayer players, with picture-in-picture and, in
+fullscreen, the name of what you are watching. Enable it in Settings → Playback;
+left off, each of the three keeps its own controls exactly as before.
diff --git a/.changes/playback-subtitle-preference.md b/.changes/playback-subtitle-preference.md
new file mode 100644
index 000000000..8c320a9d1
--- /dev/null
+++ b/.changes/playback-subtitle-preference.md
@@ -0,0 +1,11 @@
+---
+type: fix
+area: playback
+issues: [1155]
+---
+
+The "Show subtitles" setting now works in the built-in players: turning it off
+hides subtitles a stream switched on by itself, and the preference finally
+applies on Xtream and Stalker pages too. Previously it only reached the M3U
+player, and even there Video.js and ArtPlayer ignored it. The player's own
+subtitle menu still overrides the setting for the current stream.
diff --git a/.changes/playback-theater-stage.md b/.changes/playback-theater-stage.md
new file mode 100644
index 000000000..b8f67a5c4
--- /dev/null
+++ b/.changes/playback-theater-stage.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: playback
+---
+
+The inline player on movie and series pages fills the whole content area like a
+theater: the video sits centered in black instead of leaving a strip of app
+background beside it. In the built-in web players, an optional ambient mode
+fills that space with a blurred, dimmed copy of the poster.
diff --git a/.changes/playback-up-next-rail.md b/.changes/playback-up-next-rail.md
new file mode 100644
index 000000000..13738a792
--- /dev/null
+++ b/.changes/playback-up-next-rail.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: playback
+---
+
+A series playing inline on a wide window shows an "Up Next" rail beside the
+video: the rest of the season and the start of the next one, the current episode
+highlighted, watch progress on every card. Click one to jump straight to it.
+Built-in web players only; switch the rail off in Settings → Playback.
diff --git a/.changes/playlists-auto-refresh.md b/.changes/playlists-auto-refresh.md
new file mode 100644
index 000000000..2104099f2
--- /dev/null
+++ b/.changes/playlists-auto-refresh.md
@@ -0,0 +1,10 @@
+---
+type: fix
+area: playlists
+issues: [931]
+---
+
+One unreachable playlist no longer holds up the rest. Refreshes give up after 30
+seconds and run a few at a time, so your other playlists still update, and the
+message on startup names how many actually failed instead of always claiming
+success.
diff --git a/.changes/search-punctuation-words.md b/.changes/search-punctuation-words.md
new file mode 100644
index 000000000..b33302a09
--- /dev/null
+++ b/.changes/search-punctuation-words.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: search
+issues: [1161]
+---
+
+Searching for names that carry punctuation inside them — "A&E", "X-Men",
+"L'Equipe" — finds them anywhere in a title, including channels the provider
+prefixes, like "US: A&E".
diff --git a/.changes/settings-strip-country-prefix.md b/.changes/settings-strip-country-prefix.md
new file mode 100644
index 000000000..bc8980306
--- /dev/null
+++ b/.changes/settings-strip-country-prefix.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: settings
+---
+
+A new setting drops the country prefix from live channel names, turning
+"UK - BBC One" into "BBC One" in lists, the guide and the player. Movie and
+series titles are left alone, and names that only look like a prefix — "Sky -
+Sports F1" — stay intact.
diff --git a/.changes/stalker-detail-requests.md b/.changes/stalker-detail-requests.md
new file mode 100644
index 000000000..f8651f05d
--- /dev/null
+++ b/.changes/stalker-detail-requests.md
@@ -0,0 +1,9 @@
+---
+type: perf
+area: stalker
+---
+
+Detail pages for anything that is not a series — a movie, a live channel, a VOD
+item that only looks like a series — no longer fire an episode-list request
+before they can show anything, so they open faster on every route in, from
+browsing and search to Favorites, Recent and the dashboard.
diff --git a/.changes/stalker-embedded-series-episodes.md b/.changes/stalker-embedded-series-episodes.md
new file mode 100644
index 000000000..f808d4cbf
--- /dev/null
+++ b/.changes/stalker-embedded-series-episodes.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: stalker
+---
+
+Series opened from Favorites, Recent or the dashboard show their current
+episodes. One saved back when a single episode existed used to keep showing that
+one episode forever; the list is refreshed from the portal in the background
+instead.
diff --git a/.changes/stalker-live-tv-channel-list.md b/.changes/stalker-live-tv-channel-list.md
new file mode 100644
index 000000000..d93bfe8c4
--- /dev/null
+++ b/.changes/stalker-live-tv-channel-list.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: stalker
+---
+
+The Live TV section loads its full channel list up front: search covers every
+channel instead of only the page you are on, genres show how many channels they
+hold, and Live TV opens on a grid of all channels. Guide data for the visible
+rows loads in bulk, so it shows up without playing a channel first.
diff --git a/.changes/tmdb-broken-provider-id.md b/.changes/tmdb-broken-provider-id.md
new file mode 100644
index 000000000..cbc5b6cf4
--- /dev/null
+++ b/.changes/tmdb-broken-provider-id.md
@@ -0,0 +1,10 @@
+---
+type: fix
+area: tmdb
+---
+
+Movies whose provider ships a dead or wrong TMDB id are enriched again. The
+id is weighed against the title and release year: a dead one falls back to
+the title search, a stale one that clearly points at another film loses to
+it, and a working id is no longer thrown away just because the provider
+spells the title differently.
diff --git a/.changes/tmdb-cache-panel.md b/.changes/tmdb-cache-panel.md
new file mode 100644
index 000000000..0156ea055
--- /dev/null
+++ b/.changes/tmdb-cache-panel.md
@@ -0,0 +1,8 @@
+---
+type: feature
+area: tmdb
+---
+
+Settings → Metadata (TMDB) now shows how many entries the metadata cache
+holds and how much space they take, with a button to empty it. Clearing
+costs nothing but the next few lookups — enrichment refetches on demand.
diff --git a/.changes/tmdb-detail-page-extras.md b/.changes/tmdb-detail-page-extras.md
new file mode 100644
index 000000000..8b57a6181
--- /dev/null
+++ b/.changes/tmdb-detail-page-extras.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: tmdb
+---
+
+Series pages show whether a show has ended or is still returning, so you know
+before committing to it. Directors and creators became clickable avatar chips
+like the cast — they open the person's page, where directing credits now sit
+alongside acting ones.
diff --git a/.changes/tmdb-series-cast.md b/.changes/tmdb-series-cast.md
new file mode 100644
index 000000000..037ad2f8a
--- /dev/null
+++ b/.changes/tmdb-series-cast.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: tmdb
+---
+
+Series detail pages now list the cast of the whole show instead of only its
+newest season, so actors who left partway through stop disappearing from
+long-running shows — while people who joined for the current season still
+show up.
diff --git a/.changes/tmdb-title-matching.md b/.changes/tmdb-title-matching.md
new file mode 100644
index 000000000..025cb790a
--- /dev/null
+++ b/.changes/tmdb-title-matching.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: tmdb
+---
+
+Titles that providers dress up with language or quality tags — "|ALB| Fallout",
+"4K-DE - The Pitt (2025)", "Breaking Bad-eng" — now match against TMDB, so they
+get artwork, plot and cast like the rest of the catalog. Shows split into one
+entry per season also pull the season that entry really contains.
diff --git a/.changes/window-controls-fullscreen-exit.md b/.changes/window-controls-fullscreen-exit.md
new file mode 100644
index 000000000..65607da9b
--- /dev/null
+++ b/.changes/window-controls-fullscreen-exit.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: window-controls
+---
+
+On Windows, the minimize, maximize and close buttons disappeared for good after
+leaving fullscreen video playback — the only way to get them back was to restart
+the app. They now reappear as soon as you exit fullscreen, and the maximize
+button no longer gets stuck on the wrong icon afterwards.
diff --git a/.changes/xtream-catchup-collections.md b/.changes/xtream-catchup-collections.md
new file mode 100644
index 000000000..b8aa5dda6
--- /dev/null
+++ b/.changes/xtream-catchup-collections.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: xtream
+issues: [1138]
+---
+
+Catch-up is available from Favorites and Recent, not just Live TV, so an
+archived programme is reachable wherever the channel is. The programme currently
+on air can also be restarted from the beginning.
diff --git a/.changes/xtream-portal-connection.md b/.changes/xtream-portal-connection.md
new file mode 100644
index 000000000..6d680359d
--- /dev/null
+++ b/.changes/xtream-portal-connection.md
@@ -0,0 +1,9 @@
+---
+type: fix
+area: xtream
+---
+
+Portals sitting behind Cloudflare or a similar firewall connect again. Those
+setups answered the app with a challenge page instead of data, so "Test
+connection" failed on portals that worked fine in every other player; requests
+now identify themselves the way an ordinary IPTV player does.
diff --git a/.changes/xtream-series-resume.md b/.changes/xtream-series-resume.md
new file mode 100644
index 000000000..8f4b89b8a
--- /dev/null
+++ b/.changes/xtream-series-resume.md
@@ -0,0 +1,9 @@
+---
+type: feature
+area: xtream
+---
+
+Continue Watching resumes a series where you left it: opening one from the
+dashboard starts the exact episode at its saved position, and the series page
+offers "Play episode N" instead of always starting at the first one. Episodes
+launched in MPV or VLC count towards this too.
diff --git a/.claude/skills/release-cut/SKILL.md b/.claude/skills/release-cut/SKILL.md
new file mode 100644
index 000000000..62e07edd5
--- /dev/null
+++ b/.claude/skills/release-cut/SKILL.md
@@ -0,0 +1,88 @@
+---
+name: release-cut
+description: Cut an IPTVnator release — bump the version, generate release notes from .changes/, scaffold the website post, tag, and verify the draft. Use when asked to release, cut a version, prepare release notes, or publish a new version.
+---
+
+# Release Cut
+
+The pipeline turns accumulated `.changes/*.md` notes into all three release
+surfaces. Order matters: **the tag build extracts the CHANGELOG section into
+the GitHub release body and fails if it is missing**, so the changelog step
+is not optional.
+
+## Sequence
+
+1. **Pick the version** — deliberate choice, edit `version` in the root
+   `package.json`. Bare semver only: any suffix flips electron-updater into
+   prerelease mode and leaks into installer version fields.
+
+2. **Review the notes** — read every file in `.changes/`. Fix wording (user
+   language, not reviewer language), then:
+
+    ```bash
+    pnpm run release:notes:validate
+    ```
+
+3. **Generate the changelog section** (idempotent per version — rerunning
+   replaces the section, so regenerate freely until it reads well):
+
+    ```bash
+    pnpm run release:notes:changelog
+    ```
+
+4. **Scaffold the website post**:
+
+    ```bash
+    pnpm run release:notes:blog
+    ```
+
+    Output is `apps/website/src/content/blog/v0-XX-release-notes.mdx` with
+    `draft: true`. The narrative intro, headlines, and `description` are
+    editorial — fill every `TODO` by hand. One post per **minor** version:
+    for a patch release, edit the existing post (the scaffold refuses to
+    overwrite without `--force`).
+
+5. **Screenshots** — only from the fail-closed capture script against the
+   mock servers, never from a real playlist or account: real streams, logos,
+   and TMDB artwork are copyrighted, and credentials must never reach a
+   published image.
+
+    ```bash
+    pnpm nx run electron-backend:build-e2e   # once
+    pnpm run release:screenshots             # all manifest shots, dark+light
+    ```
+
+    Output goes to `apps/website/public/blog/v0-XX/screenshots/`. New feature
+    to showcase = new entry in `tools/release/screenshots.manifest.json`
+    (slug must match the note's `screenshot:` field). The run aborts and
+    deletes its frames on any guard violation (real-DB touch, external
+    request, credential-shaped text in frame, TMDB active).
+
+6. **Consume the notes** (the only destructive step):
+
+    ```bash
+    node tools/release/build-release-notes.mjs --consume
+    ```
+
+7. **Commit, tag, push**:
+
+    ```bash
+    git add CHANGELOG.md .changes apps/website package.json
+    git commit -m "chore(release): v0.XX.0"
+    git tag v0.XX.0 && git push && git push --tags
+    ```
+
+8. **Verify the draft release** once `build-and-make.yaml` finishes: authored
+   notes on top, GitHub's generated commit list below, all platform assets
+   present (`.dmg`/`.zip` + `latest-mac.yml`, `.exe`/`.msi` + `latest.yml`,
+   `.deb`/`.rpm`/`.AppImage`/`.snap`/`.flatpak` + `latest-linux*.yml`,
+   blockmaps). Publish manually; flip the blog post to `draft: false`.
+
+## Failure modes
+
+- **create-release fails with "CHANGELOG.md has no section for X"** — step 3
+  was skipped. Run it, commit, delete and re-push the tag.
+- **Snap store publication** is a separate manual flow after the public
+  release exists (`publish-snap.yaml`).
+- Post-release checklist candidates: i18n drift (`pnpm run i18n:check`),
+  update the website `v0-XX` blog assets, announce in Telegram.
diff --git a/.claude/skills/release-notes/SKILL.md b/.claude/skills/release-notes/SKILL.md
new file mode 100644
index 000000000..7ccb1338d
--- /dev/null
+++ b/.claude/skills/release-notes/SKILL.md
@@ -0,0 +1,70 @@
+---
+name: release-notes
+description: Write the .changes/ release note that every PR with a user-visible change must include. Use when creating or finishing a PR that changes behavior in apps/ or libs/, when the "Release note gate" CI check fails, or when deciding whether the no-release-note label applies.
+---
+
+# Release Notes (`.changes/`)
+
+Every PR with a user-visible change adds **one** note file under `.changes/`.
+At release time the notes become the GitHub release body, the `CHANGELOG.md`
+section, and the website blog scaffold. CI enforces this: the **Release note
+gate** check fails any PR that touches runtime code under `apps/` or `libs/`
+without an added `.changes/*.md` file or the `no-release-note` label.
+
+## File format
+
+Name: `.changes/<area>-<short-slug>.md` — `area` matches the
+conventional-commit scope of the PR.
+
+```markdown
+---
+type: feature
+area: playback
+issues: [1187]
+screenshot: up-next-rail
+---
+
+Series now show an "Up Next" rail beside the player on wide windows: the rest
+of the current season, watch progress, and click-to-play inline.
+```
+
+| Field        | Required | Value                                                |
+| ------------ | -------- | ---------------------------------------------------- |
+| `type`       | yes      | `breaking` / `feature` / `fix` / `perf` / `internal`  |
+| `area`       | yes      | lowercase slug = conventional-commit scope            |
+| `issues`     | no       | `[1187]` or bare `1187` — issues this PR closes       |
+| `screenshot` | no       | slug from the release screenshot manifest             |
+
+- **No version field.** The release version is chosen at release time.
+- **Never write a PR number.** The generator resolves it from git.
+- Unknown keys fail validation — this is what catches typos like `scopr:`.
+
+## Writing the body
+
+One to three sentences, present tense, max 400 characters, **written for a
+user, not a reviewer**:
+
+- ❌ "Refactor `WebVideoControlsAdapter` to hoist volume state"
+- ✅ "The player now remembers volume between episodes"
+- ❌ "Fix off-by-one in `resolveEnrichmentSeasonNumber`"
+- ✅ "Series with a season marker in the title no longer show the wrong season"
+
+`type: internal` is for changes worth recording but invisible to users
+(dependency bumps with behavior risk, packaging moves). They are excluded
+from the release body and blog, and collapsed in `CHANGELOG.md`.
+
+## When to skip (`no-release-note` label)
+
+Test-only changes, docs, CI/workflow plumbing, pure refactors with no
+behavior change. The gate auto-exempts `*.spec.ts`, `*.e2e.ts`,
+`__snapshots__/`, `apps/website/`, `apps/*-e2e/`, `apps/*-mock-server/`,
+`libs/shared/testing/` and `*.md` — if only those changed, no label needed.
+
+## Verify before finishing
+
+```bash
+pnpm run release:notes:validate
+```
+
+Full format reference: `.changes/README.md`. Gate policy:
+`tools/release/check-release-note-gate.mjs`.
diff --git a/.codex/skills/release-cut/SKILL.md b/.codex/skills/release-cut/SKILL.md
new file mode 100644
index 000000000..62e07edd5
--- /dev/null
+++ b/.codex/skills/release-cut/SKILL.md
@@ -0,0 +1,88 @@
+---
+name: release-cut
+description: Cut an IPTVnator release — bump the version, generate release notes from .changes/, scaffold the website post, tag, and verify the draft. Use when asked to release, cut a version, prepare release notes, or publish a new version.
+---
+
+# Release Cut
+
+The pipeline turns accumulated `.changes/*.md` notes into all three release
+surfaces. Order matters: **the tag build extracts the CHANGELOG section into
+the GitHub release body and fails if it is missing**, so the changelog step
+is not optional.
+
+## Sequence
+
+1. **Pick the version** — deliberate choice, edit `version` in the root
+   `package.json`. Bare semver only: any suffix flips electron-updater into
+   prerelease mode and leaks into installer version fields.
+
+2. **Review the notes** — read every file in `.changes/`. Fix wording (user
+   language, not reviewer language), then:
+
+    ```bash
+    pnpm run release:notes:validate
+    ```
+
+3. **Generate the changelog section** (idempotent per version — rerunning
+   replaces the section, so regenerate freely until it reads well):
+
+    ```bash
+    pnpm run release:notes:changelog
+    ```
+
+4. **Scaffold the website post**:
+
+    ```bash
+    pnpm run release:notes:blog
+    ```
+
+    Output is `apps/website/src/content/blog/v0-XX-release-notes.mdx` with
+    `draft: true`. The narrative intro, headlines, and `description` are
+    editorial — fill every `TODO` by hand. One post per **minor** version:
+    for a patch release, edit the existing post (the scaffold refuses to
+    overwrite without `--force`).
+
+5. **Screenshots** — only from the fail-closed capture script against the
+   mock servers, never from a real playlist or account: real streams, logos,
+   and TMDB artwork are copyrighted, and credentials must never reach a
+   published image.
+
+    ```bash
+    pnpm nx run electron-backend:build-e2e   # once
+    pnpm run release:screenshots             # all manifest shots, dark+light
+    ```
+
+    Output goes to `apps/website/public/blog/v0-XX/screenshots/`. New feature
+    to showcase = new entry in `tools/release/screenshots.manifest.json`
+    (slug must match the note's `screenshot:` field). The run aborts and
+    deletes its frames on any guard violation (real-DB touch, external
+    request, credential-shaped text in frame, TMDB active).
+
+6. **Consume the notes** (the only destructive step):
+
+    ```bash
+    node tools/release/build-release-notes.mjs --consume
+    ```
+
+7. **Commit, tag, push**:
+
+    ```bash
+    git add CHANGELOG.md .changes apps/website package.json
+    git commit -m "chore(release): v0.XX.0"
+    git tag v0.XX.0 && git push && git push --tags
+    ```
+
+8. **Verify the draft release** once `build-and-make.yaml` finishes: authored
+   notes on top, GitHub's generated commit list below, all platform assets
+   present (`.dmg`/`.zip` + `latest-mac.yml`, `.exe`/`.msi` + `latest.yml`,
+   `.deb`/`.rpm`/`.AppImage`/`.snap`/`.flatpak` + `latest-linux*.yml`,
+   blockmaps). Publish manually; flip the blog post to `draft: false`.
+
+## Failure modes
+
+- **create-release fails with "CHANGELOG.md has no section for X"** — step 3
+  was skipped. Run it, commit, delete and re-push the tag.
+- **Snap store publication** is a separate manual flow after the public
+  release exists (`publish-snap.yaml`).
+- Post-release checklist candidates: i18n drift (`pnpm run i18n:check`),
+  update the website `v0-XX` blog assets, announce in Telegram.
diff --git a/.codex/skills/release-notes/SKILL.md b/.codex/skills/release-notes/SKILL.md
new file mode 100644
index 000000000..7ccb1338d
--- /dev/null
+++ b/.codex/skills/release-notes/SKILL.md
@@ -0,0 +1,70 @@
+---
+name: release-notes
+description: Write the .changes/ release note that every PR with a user-visible change must include. Use when creating or finishing a PR that changes behavior in apps/ or libs/, when the "Release note gate" CI check fails, or when deciding whether the no-release-note label applies.
+---
+
+# Release Notes (`.changes/`)
+
+Every PR with a user-visible change adds **one** note file under `.changes/`.
+At release time the notes become the GitHub release body, the `CHANGELOG.md`
+section, and the website blog scaffold. CI enforces this: the **Release note
+gate** check fails any PR that touches runtime code under `apps/` or `libs/`
+without an added `.changes/*.md` file or the `no-release-note` label.
+
+## File format
+
+Name: `.changes/<area>-<short-slug>.md` — `area` matches the
+conventional-commit scope of the PR.
+
+```markdown
+---
+type: feature
+area: playback
+issues: [1187]
+screenshot: up-next-rail
+---
+
+Series now show an "Up Next" rail beside the player on wide windows: the rest
+of the current season, watch progress, and click-to-play inline.
+```
+
+| Field        | Required | Value                                                |
+| ------------ | -------- | ---------------------------------------------------- |
+| `type`       | yes      | `breaking` / `feature` / `fix` / `perf` / `internal`  |
+| `area`       | yes      | lowercase slug = conventional-commit scope            |
+| `issues`     | no       | `[1187]` or bare `1187` — issues this PR closes       |
+| `screenshot` | no       | slug from the release screenshot manifest             |
+
+- **No version field.** The release version is chosen at release time.
+- **Never write a PR number.** The generator resolves it from git.
+- Unknown keys fail validation — this is what catches typos like `scopr:`.
+
+## Writing the body
+
+One to three sentences, present tense, max 400 characters, **written for a
+user, not a reviewer**:
+
+- ❌ "Refactor `WebVideoControlsAdapter` to hoist volume state"
+- ✅ "The player now remembers volume between episodes"
+- ❌ "Fix off-by-one in `resolveEnrichmentSeasonNumber`"
+- ✅ "Series with a season marker in the title no longer show the wrong season"
+
+`type: internal` is for changes worth recording but invisible to users
+(dependency bumps with behavior risk, packaging moves). They are excluded
+from the release body and blog, and collapsed in `CHANGELOG.md`.
+
+## When to skip (`no-release-note` label)
+
+Test-only changes, docs, CI/workflow plumbing, pure refactors with no
+behavior change. The gate auto-exempts `*.spec.ts`, `*.e2e.ts`,
+`__snapshots__/`, `apps/website/`, `apps/*-e2e/`, `apps/*-mock-server/`,
+`libs/shared/testing/` and `*.md` — if only those changed, no label needed.
+
+## Verify before finishing
+
+```bash
+pnpm run release:notes:validate
+```
+
+Full format reference: `.changes/README.md`. Gate policy:
+`tools/release/check-release-note-gate.mjs`.
diff --git a/.codex/skills/stalker-portal/SKILL.md b/.codex/skills/stalker-portal/SKILL.md
new file mode 100644
index 000000000..d59fa7a20
--- /dev/null
+++ b/.codex/skills/stalker-portal/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: stalker-portal
+description: Repository guidance for Stalker/Ministra portal catalogs, VOD/series shapes, playback metadata, collections, EPG, and remote control.
+---
+
+# Stalker Portal
+
+Use this skill when changing Stalker/Ministra routes, stores, catalog/detail
+views, playback, favorites/recent activity, EPG, or remote control.
+
+## Read First
+
+- `docs/architecture/stalker-portal.md`
+- `docs/architecture/stalker-epg.md` for ITV EPG work
+- `docs/architecture/remote-control.md` for live remote-control work
+
+## Ownership
+
+- Feature UI: `libs/portal/stalker/feature/src/lib/`
+- Store/API data access: `libs/portal/stalker/data-access/src/lib/`
+- Electron requests: `apps/electron-backend/src/app/events/stalker.events.ts`
+- Shared Stalker item normalization:
+  `libs/shared/interfaces/src/lib/stalker-item.normalizer.ts`
+- Dashboard aggregation: `libs/workspace/dashboard/data-access/src/lib/`
+
+Keep provider-specific API and normalization behavior in Stalker data access.
+Keep shared portal layouts/utilities provider-neutral. Preserve full-portal
+session auth and simple IPC request paths.
+
+## `is_series` Cross-Surface Checklist
+
+Treat VOD items with `is_series` as series across every downstream surface.
+Do not stop after making the detail view render.
+
+1. Accept portal flags `true`, `1`, and `'1'` through the existing normalizers.
+   Preserve all three modes: regular `/series`, embedded VOD `series[]`, and
+   lazy Ministra VOD `is_series`.
+2. Build quick-start state through the shared series utility. Preserve
+   `labelKey`, `labelParams`, and `episodeLabel` when adapting it for Stalker;
+   translation parameters must reach the template.
+3. Preserve `is_series` and the VOD origin in favorites/recent activity.
+   `extractStalkerItemType()` must normalize that activity to dashboard type
+   `series`.
+4. Before either inline or external episode playback, persist the parent
+   `seriesXtreamId` plus resolved `seasonNumber` and `episodeNumber`. Keep
+   generated episode tracking IDs stable for lazy `is_series` episodes. When
+   `season_number` is absent, derive the coordinate from the same naturally
+   ordered season list used by quick start; do not default every season to 1.
+5. The dashboard reads saved playback positions; it must not infer episode
+   numbers from provider payloads. Legacy rows without season/episode metadata
+   remain badge-less until that episode is played again.
+
+## Regression Coverage
+
+- Series view/UI and playback handoff:
+  `pnpm nx test portal-stalker-feature`
+- Stalker shape/store behavior:
+  `pnpm nx test portal-stalker-data-access`
+- Dashboard classification and position lookup:
+  `pnpm nx test workspace-dashboard-data-access`
+- Dashboard badge rendering when changed:
+  `pnpm nx test workspace-dashboard-feature`
+
+For user-visible workflow changes, run the closest available E2E target. If no
+fixture covers the affected portal shape, record that gap and perform the
+strongest targeted unit/build validation available.
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
new file mode 100644
index 000000000..7cd37535a
--- /dev/null
+++ b/.github/actionlint.yaml
@@ -0,0 +1,10 @@
+paths:
+    # build-cross-platform and build-linux share their steps via a YAML anchor
+    # (steps: *electron-build-steps). actionlint type-checks the anchored steps
+    # against each job's own matrix, so matrix.linux_profile — defined only in
+    # build-linux — is reported as unknown when the same steps are checked
+    # against the build-cross-platform matrix. The steps guard every use with
+    # `matrix.os == 'linux'` or a `|| ''` fallback, so this is a false positive.
+    .github/workflows/build-and-make.yaml:
+        ignore:
+            - 'property "linux_profile" is not defined in object type'
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..fdccfe138
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,39 @@
+# Every Dependabot PR triggers the full pipeline (~15 jobs), so version
+# updates are batched: weekly cadence, minor+patch bumps grouped into one PR
+# per ecosystem, majors as individual PRs so CI gates them one by one.
+# Security updates are separate and are not limited by this schedule.
+version: 2
+updates:
+    - package-ecosystem: npm
+      directory: /
+      schedule:
+          interval: weekly
+          day: monday
+          time: '06:00'
+      open-pull-requests-limit: 5
+      groups:
+          npm-minor-patch:
+              update-types:
+                  - minor
+                  - patch
+
+    - package-ecosystem: github-actions
+      directory: /
+      schedule:
+          interval: weekly
+          day: monday
+          time: '06:00'
+      groups:
+          actions-minor-patch:
+              patterns:
+                  - '*'
+              update-types:
+                  - minor
+                  - patch
+
+    - package-ecosystem: docker
+      directory: /docker
+      schedule:
+          interval: weekly
+          day: monday
+          time: '06:00'
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..887886187
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,23 @@
+<!--
+Thanks for contributing to IPTVnator!
+Keep the description short — what changed and why is enough.
+-->
+
+## What changed
+
+## Why
+
+## Release note
+
+Changes a user could notice need one file in `.changes/` describing the change
+in plain language — see
+[`.changes/README.md`](https://github.com/4gray/iptvnator/blob/master/.changes/README.md).
+It becomes the release notes and the website post, so it is worth a minute.
+
+- [ ] Added a note under `.changes/`
+- [ ] Not needed (test-only, docs, CI, or a refactor with no behavior change)
+
+## Checks
+
+- [ ] Tests added or updated for the changed behavior
+- [ ] `pnpm run lint` and the affected `pnpm nx test <project>` pass
diff --git a/.github/workflows/build-and-make.yaml b/.github/workflows/build-and-make.yaml
index 41dd2a48e..efc62626e 100644
--- a/.github/workflows/build-and-make.yaml
+++ b/.github/workflows/build-and-make.yaml
@@ -1,22 +1,351 @@
 name: Build and Make Electron App
 
+# Docs-only changes never affect the packaged app, so they skip the build
+# matrix. apps/website/** is intentionally NOT ignored: the Linux build job
+# builds the website to verify AppStream screenshot assets. Tag pushes are
+# unaffected — GitHub does not evaluate paths filters for tags, so v* release
+# builds always run.
+#
+# Known accepted edge case: if a PR built a test-pr-<n> draft and later
+# reverts its code changes so the remaining diff is docs-only, new pushes
+# skip this workflow and the draft keeps assets from the older commit. The
+# draft's title/body name the exact commit they were built from, and
+# cleanup-pr-draft.yml deletes the draft when the PR closes, so the stale
+# window is visible and bounded; refreshing drafts on skipped runs is not
+# worth a separate workflow.
 on:
     push:
         branches:
             - master
         tags:
             - 'v*.*.*'
+        paths-ignore:
+            - '**/*.md'
+            - 'docs/**'
+            - '.plans/**'
+            - '.codex/**'
+            - '.claude/**'
     pull_request:
         branches:
             - master
+        paths-ignore:
+            - '**/*.md'
+            - 'docs/**'
+            - '.plans/**'
+            - '.codex/**'
+            - '.claude/**'
     workflow_dispatch:
 
+# Build jobs only read the repo; the create-release job raises itself to
+# contents: write at the job level to manage the rolling draft release.
+permissions:
+    contents: read
+
 jobs:
-    build:
+    linux-embedded-mpv-runtime:
+        name: Build pinned Linux Embedded MPV runtime
+        runs-on: ubuntu-22.04
+        timeout-minutes: 120
+        # Concurrency lives on the build jobs, not the workflow: cancelling a
+        # whole run could interrupt action-gh-release mid-update and leave the
+        # rolling draft with missing assets. Build slots cancel superseded PR
+        # work; the release job only serializes and is never cancelled.
+        concurrency:
+            group: ${{ github.workflow }}-build-linux-runtime-${{ github.event.pull_request.number || github.ref }}
+            cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v7
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: '22'
+
+            - name: Resolve Linux runtime toolchain cache key
+              id: linux-runtime-cache-key
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  sudo apt-get update
+                  {
+                      apt-cache policy \
+                          binutils build-essential cmake curl git gperf \
+                          libasound2-dev libdrm-dev libegl-dev libgbm-dev \
+                          libgl-dev libpulse-dev libva-dev make nasm \
+                          ninja-build patchelf perl pkg-config python3-pip \
+                          tar xz-utils
+                      echo 'meson=1.7.2'
+                  } > "${RUNNER_TEMP}/linux-runtime-toolchain.txt"
+                  TOOLCHAIN_SHA256="$(sha256sum "${RUNNER_TEMP}/linux-runtime-toolchain.txt" | cut -d ' ' -f 1)"
+                  SOURCE_SHA256="${{ hashFiles('tools/embedded-mpv/build-linux-runtime.cjs', 'tools/embedded-mpv/build-linux-runtime.mjs', 'tools/embedded-mpv/generate-linux-runtime-notices.cjs', 'tools/embedded-mpv/linux-runtime-manifest.cjs', 'tools/embedded-mpv/linux-source-archive-contract.cjs', 'tools/embedded-mpv/stage-runtime.mjs', 'tools/packaging/prepare-linux-runtime-source-snapshot.cjs') }}"
+                  echo "toolchain-sha256=${TOOLCHAIN_SHA256}" >> "${GITHUB_OUTPUT}"
+                  echo "key=linux-frame-copy-runtime-v5-ubuntu-22.04-${TOOLCHAIN_SHA256}-${SOURCE_SHA256}" >> "${GITHUB_OUTPUT}"
+
+            - name: Restore pinned Linux runtime and immutable source inputs
+              id: linux-runtime-cache
+              uses: actions/cache@v4
+              with:
+                  path: |
+                      vendor/embedded-mpv/linux-x64/include
+                      vendor/embedded-mpv/linux-x64/lib
+                      vendor/embedded-mpv/linux-x64/runtime-manifest.json
+                      dist/linux-frame-copy-runtime-source-inputs
+                  key: ${{ steps.linux-runtime-cache-key.outputs.key }}
+
+            - name: Install pinned Linux runtime build dependencies
+              if: steps.linux-runtime-cache.outputs.cache-hit != 'true'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  sudo apt-get install --no-install-recommends -y \
+                      binutils \
+                      build-essential \
+                      cmake \
+                      curl \
+                      git \
+                      gperf \
+                      libasound2-dev \
+                      libdrm-dev \
+                      libegl-dev \
+                      libgbm-dev \
+                      libgl-dev \
+                      libpulse-dev \
+                      libva-dev \
+                      make \
+                      nasm \
+                      ninja-build \
+                      patchelf \
+                      perl \
+                      pkg-config \
+                      python3-pip \
+                      tar \
+                      xz-utils
+                  python3 -m pip install --user 'meson==1.7.2'
+
+            - name: Build and stage pinned LGPL Linux runtime
+              if: steps.linux-runtime-cache.outputs.cache-hit != 'true'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  export PATH="${HOME}/.local/bin:${PATH}"
+                  export IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT="${RUNNER_TEMP}/linux-frame-copy-runtime-build"
+                  export RUNTIME_PREFIX="${RUNNER_TEMP}/linux-frame-copy-runtime-prefix"
+
+                  node tools/embedded-mpv/build-linux-runtime.mjs "${RUNTIME_PREFIX}"
+                  node tools/embedded-mpv/stage-runtime.mjs linux x64 "${RUNTIME_PREFIX}"
+
+                  export SOURCE_INPUT_ROOT="${GITHUB_WORKSPACE}/dist/linux-frame-copy-runtime-source-inputs"
+                  rm -rf "${SOURCE_INPUT_ROOT}"
+                  mkdir -p \
+                      "${SOURCE_INPUT_ROOT}/archives" \
+                      "${SOURCE_INPUT_ROOT}/git"
+
+                  git -C "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/sources/libplacebo" \
+                      submodule foreach --recursive git clean -ffdqx
+                  git -C "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/sources/libplacebo" \
+                      clean -ffdqx
+                  cp -a "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/archives/." "${SOURCE_INPUT_ROOT}/archives/"
+                  cp -a "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/sources/libplacebo" "${SOURCE_INPUT_ROOT}/git/libplacebo"
+                  node tools/embedded-mpv/generate-linux-runtime-notices.cjs collect \
+                      --runtime-manifest "${RUNTIME_PREFIX}/runtime-manifest.json" \
+                      --source-root "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/sources" \
+                      --output-root "${SOURCE_INPUT_ROOT}/license-inputs"
+
+            - name: Generate Linux runtime notices and assemble source compliance
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  export RUNTIME_ROOT="${GITHUB_WORKSPACE}/vendor/embedded-mpv/linux-x64"
+                  export SOURCE_INPUT_ROOT="${GITHUB_WORKSPACE}/dist/linux-frame-copy-runtime-source-inputs"
+                  export SOURCE_BUNDLE_ROOT="${RUNNER_TEMP}/linux-frame-copy-runtime-sources"
+                  export LIBPLACEBO_SOURCE_RECORD="${RUNNER_TEMP}/libplacebo-source-record.json"
+
+                  test -f "${RUNTIME_ROOT}/runtime-manifest.json"
+                  test -d "${SOURCE_INPUT_ROOT}/archives"
+                  test -d "${SOURCE_INPUT_ROOT}/git/libplacebo"
+                  test -f "${SOURCE_INPUT_ROOT}/license-inputs/linux-runtime-license-inputs.json"
+
+                  rm -rf "${RUNTIME_ROOT}/notices" "${SOURCE_BUNDLE_ROOT}"
+                  node tools/embedded-mpv/generate-linux-runtime-notices.cjs generate \
+                      --runtime-manifest "${RUNTIME_ROOT}/runtime-manifest.json" \
+                      --license-input-root "${SOURCE_INPUT_ROOT}/license-inputs" \
+                      --output-root "${RUNTIME_ROOT}/notices"
+
+                  mkdir -p \
+                      "${SOURCE_BUNDLE_ROOT}/archives" \
+                      "${SOURCE_BUNDLE_ROOT}/git" \
+                      "${SOURCE_BUNDLE_ROOT}/license-inputs" \
+                      "${SOURCE_BUNDLE_ROOT}/metadata" \
+                      "${SOURCE_BUNDLE_ROOT}/notices" \
+                      "${SOURCE_BUNDLE_ROOT}/tooling"
+
+                  cp -a "${SOURCE_INPUT_ROOT}/archives/." "${SOURCE_BUNDLE_ROOT}/archives/"
+                  cp -a "${SOURCE_INPUT_ROOT}/license-inputs/." "${SOURCE_BUNDLE_ROOT}/license-inputs/"
+                  cp -a "${RUNTIME_ROOT}/notices/." "${SOURCE_BUNDLE_ROOT}/notices/"
+                  cp "${RUNTIME_ROOT}/runtime-manifest.json" "${SOURCE_BUNDLE_ROOT}/metadata/runtime-manifest.json"
+                  node tools/packaging/prepare-linux-runtime-source-snapshot.cjs prepare \
+                      --runtime-manifest "${RUNTIME_ROOT}/runtime-manifest.json" \
+                      --checkout "${SOURCE_INPUT_ROOT}/git/libplacebo" \
+                      --output "${SOURCE_BUNDLE_ROOT}/git/libplacebo" \
+                      --record-output "${LIBPLACEBO_SOURCE_RECORD}"
+                  cp \
+                      tools/embedded-mpv/build-linux-runtime.cjs \
+                      tools/embedded-mpv/build-linux-runtime.mjs \
+                      tools/embedded-mpv/generate-linux-runtime-notices.cjs \
+                      tools/embedded-mpv/linux-runtime-manifest.cjs \
+                      tools/embedded-mpv/linux-source-archive-contract.cjs \
+                      tools/embedded-mpv/stage-runtime.mjs \
+                      tools/packaging/prepare-linux-runtime-source-snapshot.cjs \
+                      "${SOURCE_BUNDLE_ROOT}/tooling/"
+                  test -f "${SOURCE_BUNDLE_ROOT}/notices/THIRD_PARTY_NOTICES.txt"
+                  test -f "${SOURCE_BUNDLE_ROOT}/notices/embedded-mpv-notices.json"
+                  git rev-parse HEAD > "${SOURCE_BUNDLE_ROOT}/metadata/iptvnator-git-revision.txt"
+                  git diff --binary HEAD > "${SOURCE_BUNDLE_ROOT}/metadata/local-changes.patch"
+                  node <<'NODE'
+                  const crypto = require('node:crypto');
+                  const fs = require('node:fs');
+                  const path = require('node:path');
+                  const {
+                    EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+                    validateLinuxRuntimeSourceSnapshot,
+                  } = require('./tools/packaging/prepare-linux-runtime-source-snapshot.cjs');
+
+                  const manifest = JSON.parse(
+                    fs.readFileSync(path.join(process.env.RUNTIME_ROOT, 'runtime-manifest.json'), 'utf8')
+                  );
+                  const archivesDirectory = path.join(process.env.SOURCE_BUNDLE_ROOT, 'archives');
+                  const archives = fs.readdirSync(archivesDirectory).sort().map((name) => {
+                    const contents = fs.readFileSync(path.join(archivesDirectory, name));
+                    return {
+                      name,
+                      sha256: crypto.createHash('sha256').update(contents).digest('hex'),
+                    };
+                  });
+                  const expectedArchiveHashes = Object.values(manifest.packages)
+                    .map(({ sourceSha256 }) => sourceSha256)
+                    .filter(Boolean)
+                    .sort();
+                  const actualArchiveHashes = archives.map(({ sha256 }) => sha256).sort();
+                  if (
+                    new Set(expectedArchiveHashes).size !== expectedArchiveHashes.length ||
+                    new Set(actualArchiveHashes).size !== actualArchiveHashes.length ||
+                    archives.length !== expectedArchiveHashes.length ||
+                    JSON.stringify(actualArchiveHashes) !== JSON.stringify(expectedArchiveHashes)
+                  ) {
+                    throw new Error(
+                      'Source bundle archives must match the exact unique pinned archive hash set.'
+                    );
+                  }
+
+                  const libplacebo = JSON.parse(
+                    fs.readFileSync(process.env.LIBPLACEBO_SOURCE_RECORD, 'utf8')
+                  );
+                  if (
+                    libplacebo.sourceGitCommit !== manifest.packages.libplacebo.sourceGitCommit ||
+                    JSON.stringify(libplacebo.sourceSubmodules) !==
+                    JSON.stringify(manifest.packages.libplacebo.sourceSubmodules)
+                  ) {
+                    throw new Error('Prepared libplacebo source identity does not match the runtime manifest.');
+                  }
+                  validateLinuxRuntimeSourceSnapshot(libplacebo.sourceSnapshot, {
+                    expectedSha256:
+                      EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+                  });
+
+                  const notices = JSON.parse(
+                    fs.readFileSync(
+                      path.join(process.env.SOURCE_BUNDLE_ROOT, 'notices', 'embedded-mpv-notices.json'),
+                      'utf8'
+                    )
+                  );
+                  const repositoryRevision = fs
+                    .readFileSync(
+                      path.join(
+                        process.env.SOURCE_BUNDLE_ROOT,
+                        'metadata',
+                        'iptvnator-git-revision.txt'
+                      ),
+                      'utf8'
+                    )
+                    .trim();
+                  fs.writeFileSync(
+                    path.join(process.env.SOURCE_BUNDLE_ROOT, 'metadata', 'source-index.json'),
+                    `${JSON.stringify(
+                      {
+                        schemaVersion: 3,
+                        repositoryRevision,
+                        sourcePackages: manifest.packages,
+                        archives,
+                        libplacebo,
+                        legal: {
+                          manifest: 'notices/embedded-mpv-notices.json',
+                          noticeFile: notices.noticeFile,
+                          packages: notices.packages,
+                        },
+                      },
+                      null,
+                      2
+                    )}\n`
+                  );
+                  NODE
+                  (
+                      cd "${SOURCE_BUNDLE_ROOT}/archives"
+                      sha256sum * > "../metadata/archive-sha256.txt"
+                  )
+                  node tools/packaging/prepare-linux-runtime-source-snapshot.cjs assert-vcs-free \
+                      --directory "${SOURCE_BUNDLE_ROOT}"
+
+                  mkdir -p dist/compliance
+                  rm -f dist/compliance/linux-frame-copy-runtime-sources.tar.xz
+                  tar \
+                      --create \
+                      --xz \
+                      --sort=name \
+                      --mtime='UTC 1970-01-01' \
+                      --owner=0 \
+                      --group=0 \
+                      --numeric-owner \
+                      --file dist/compliance/linux-frame-copy-runtime-sources.tar.xz \
+                      --directory "${SOURCE_BUNDLE_ROOT}" \
+                      .
+                  rm -f "${RUNTIME_ROOT}/source-archive-binding.json"
+                  node tools/embedded-mpv/linux-source-archive-contract.cjs create \
+                      --archive dist/compliance/linux-frame-copy-runtime-sources.tar.xz \
+                      --repository-revision "$(git rev-parse HEAD)" \
+                      --output "${RUNTIME_ROOT}/source-archive-binding.json"
+                  test -s "${RUNTIME_ROOT}/source-archive-binding.json"
+
+            - name: Upload staged Linux runtime
+              uses: actions/upload-artifact@v7
+              with:
+                  name: linux-embedded-mpv-runtime
+                  path: vendor/embedded-mpv/linux-x64
+                  if-no-files-found: error
+                  retention-days: 7
+
+            - name: Upload Linux runtime source compliance
+              uses: actions/upload-artifact@v7
+              with:
+                  name: linux-frame-copy-runtime-sources
+                  path: dist/compliance/linux-frame-copy-runtime-sources.tar.xz
+                  if-no-files-found: error
+                  retention-days: 7
+
+    build-cross-platform:
         name: Build on ${{ matrix.os }} ${{ matrix.arch }}
         runs-on: ${{ matrix.runner }}
         timeout-minutes: 120
+        concurrency:
+            group: ${{ github.workflow }}-build-${{ matrix.os }}-${{ matrix.arch }}-${{ github.event.pull_request.number || github.ref }}
+            cancel-in-progress: ${{ github.event_name == 'pull_request' }}
         strategy:
+            fail-fast: false
             matrix:
                 include:
                     # macOS builds - separate runners to avoid native module conflicts
@@ -32,28 +361,16 @@ jobs:
                       embedded_mpv_platform: darwin
                       embedded_mpv_arch: arm64
                       embedded_mpv_build_runtime: true
-                    # Linux and Windows
-                    - os: linux
-                      runner: ubuntu-22.04
-                      linux_profile: standard
-                      embedded_mpv_platform: linux
-                      embedded_mpv_arch: x64
-                      embedded_mpv_build_runtime: false
-                    - os: linux
-                      runner: ubuntu-24.04
-                      linux_profile: flatpak
-                      embedded_mpv_platform: linux
-                      embedded_mpv_arch: x64
-                      embedded_mpv_build_runtime: false
                     - os: windows
                       runner: windows-2022
+                      arch: x64
                       embedded_mpv_platform: win32
                       embedded_mpv_arch: x64
                       embedded_mpv_build_runtime: false
 
-        steps:
+        steps: &electron-build-steps
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v7
 
             - name: Install pnpm
               uses: pnpm/action-setup@v4
@@ -68,38 +385,50 @@ jobs:
               if: matrix.os == 'linux'
               run: |
                   sudo apt-get update
-                  sudo apt-get install --no-install-recommends -y rpm libarchive-tools flatpak flatpak-builder appstream libx11-dev libxext-dev libmpv-dev mpv pkg-config
+                  sudo apt-get install --no-install-recommends -y \
+                      appstream \
+                      binutils \
+                      dbus-daemon \
+                      flatpak \
+                      flatpak-builder \
+                      libarchive-tools \
+                      libegl-dev \
+                      libgbm-dev \
+                      libgl-dev \
+                      libx11-dev \
+                      libxext-dev \
+                      mpv \
+                      pkg-config \
+                      rpm \
+                      snapd \
+                      squashfs-tools \
+                      xauth \
+                      xvfb
+
+            - name: Configure Flatpak build runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'flatpak'
+              run: |
+                  set -euo pipefail
 
-                  # Configure Flatpak
-                  # 1. Add the Flathub repository (source of runtimes)
                   flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
-
-                  # 2. Install the standard Freedesktop Platform and SDK (required by electron-builder)
-                  # We install version 24.08 as a safe default, electron-builder might pick what it needs
                   flatpak install --user -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08
 
             - name: Select Linux packaging targets for CI profile
               if: matrix.os == 'linux'
               run: |
-                  node -e "
-                    const fs = require('fs');
-                    const path = 'electron-builder.json';
-                    const config = JSON.parse(fs.readFileSync(path, 'utf8'));
-                    const targets = Array.isArray(config.linux?.target) ? config.linux.target : [];
-                    const profile = '${{ matrix.linux_profile }}';
-
-                    if (profile === 'standard') {
-                      config.linux.target = targets.filter((entry) => String(entry.target).toLowerCase() !== 'flatpak');
-                    } else if (profile === 'flatpak') {
-                      config.linux.target = targets.filter((entry) => String(entry.target).toLowerCase() === 'flatpak');
-                    }
-
-                    fs.writeFileSync(path, JSON.stringify(config, null, 4) + '\n');
-                  "
+                  cp electron-builder.json "${RUNNER_TEMP}/electron-builder.base.json"
+                  node tools/packaging/configure-linux-frame-copy-build.mjs --profile "${{ matrix.linux_profile }}"
 
             - name: Install dependencies
               run: pnpm install --frozen-lockfile
 
+            - name: Download pinned Linux Embedded MPV runtime
+              if: matrix.os == 'linux'
+              uses: actions/download-artifact@v8
+              with:
+                  name: linux-embedded-mpv-runtime
+                  path: vendor/embedded-mpv/linux-x64
+
             - name: Inject TMDB API key
               # No-op when the secret is unavailable (e.g. fork PRs) — the
               # app then requires a user-provided key for TMDB enrichment.
@@ -107,18 +436,26 @@ jobs:
                   TMDB_API_KEY: ${{ secrets.TMDB_API_KEY }}
               run: node tools/tmdb/inject-tmdb-key.mjs
 
+            - name: Inject build commit
+              # Shows "<version> (<sha>)" in Settings > About so bug reports
+              # from test builds identify the exact commit. PR builds use the
+              # head SHA — github.sha would be the ephemeral merge commit.
+              env:
+                  BUILD_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
+              run: node tools/build/inject-build-commit.mjs
+
             - name: Build frontend
               run: pnpm nx build web --skip-nx-cache
 
             - name: Resolve embedded MPV runtime cache key
               # TEMPORARY ARTIFACT TEST: remove `|| github.event_name == 'pull_request' || github.ref == 'refs/heads/master'`
               # after the macOS Embedded MPV artifacts are built and manually tested.
-              if: matrix.embedded_mpv_platform && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
+              if: matrix.embedded_mpv_platform && matrix.os != 'linux' && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
               id: embedded-mpv-runtime-cache-key
               shell: bash
               env:
                   IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: ${{ vars.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256 || secrets.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256 || '' }}
-                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: a26e28fa55c15ac5b6209d8a9f9c3c8cb39649631a53d3c4774beeae559a078c
+                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: 6014aa0e6d8e98cdba90f5288295a7105d7d14ab0ca906f51465eeb478d5fea0
               run: |
                   set -euo pipefail
 
@@ -186,7 +523,7 @@ jobs:
             - name: Restore embedded MPV runtime cache
               # TEMPORARY ARTIFACT TEST: remove `|| github.event_name == 'pull_request' || github.ref == 'refs/heads/master'`
               # after the macOS Embedded MPV artifacts are built and manually tested.
-              if: matrix.embedded_mpv_platform && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
+              if: matrix.embedded_mpv_platform && matrix.os != 'linux' && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
               id: embedded-mpv-runtime-cache
               uses: actions/cache/restore@v4
               with:
@@ -199,7 +536,7 @@ jobs:
             - name: Clear stale embedded MPV runtime files
               # TEMPORARY ARTIFACT TEST: remove `|| github.event_name == 'pull_request' || github.ref == 'refs/heads/master'`
               # after the macOS Embedded MPV artifacts are built and manually tested.
-              if: matrix.embedded_mpv_platform && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master') && steps.embedded-mpv-runtime-cache.outputs.cache-hit != 'true'
+              if: matrix.embedded_mpv_platform && matrix.os != 'linux' && !startsWith(github.ref, 'refs/tags/v') && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master') && steps.embedded-mpv-runtime-cache.outputs.cache-hit != 'true'
               shell: bash
               run: |
                   set -euo pipefail
@@ -229,8 +566,8 @@ jobs:
               env:
                   IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL: ${{ vars.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL || secrets.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL || '' }}
                   IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: ${{ vars.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256 || secrets.IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256 || '' }}
-                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_URL: https://github.com/zhongfly/mpv-winbuild/releases/download/2026-06-14-7d245fd100/mpv-dev-lgpl-x86_64-20260614-git-7d245fd100.7z
-                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: a26e28fa55c15ac5b6209d8a9f9c3c8cb39649631a53d3c4774beeae559a078c
+                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_URL: https://github.com/zhongfly/mpv-winbuild/releases/download/2026-07-17-94335ab87a/mpv-dev-lgpl-x86_64-20260717-git-94335ab87a.7z
+                  IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256: 6014aa0e6d8e98cdba90f5288295a7105d7d14ab0ca906f51465eeb478d5fea0
               run: |
                   set -euo pipefail
 
@@ -254,47 +591,11 @@ jobs:
 
                   pnpm embedded-mpv:stage-runtime:windows-archive -- "${WINDOWS_RUNTIME_URL}" "${WINDOWS_RUNTIME_SHA256}"
 
-            - name: Stage Linux embedded MPV build inputs
-              if: matrix.os == 'linux'
-              shell: bash
-              run: |
-                  set -euo pipefail
-
-                  RUNTIME_PREFIX="${RUNNER_TEMP}/embedded-mpv-runtime/linux-x64/prefix"
-                  rm -rf "${RUNTIME_PREFIX}"
-                  mkdir -p "${RUNTIME_PREFIX}/include"
-
-                  cp -a /usr/include/mpv "${RUNTIME_PREFIX}/include/"
-
-                  LIBMPV_DEV_VERSION="$(dpkg-query -W -f='${Version}' libmpv-dev)"
-                  MPV_VERSION="$(dpkg-query -W -f='${Version}' mpv)"
-                  export RUNTIME_PREFIX LIBMPV_DEV_VERSION MPV_VERSION
-                  node <<'NODE'
-                  const fs = require('fs');
-                  const path = require('path');
-
-                  const manifest = {
-                    linuxBackend: 'process-isolated mpv --wid',
-                    buildInputs: {
-                      libmpvDevPackage: process.env.LIBMPV_DEV_VERSION,
-                      mpvPackage: process.env.MPV_VERSION,
-                    },
-                    sourceDistribution:
-                      'Linux CI build inputs come from Ubuntu runner packages. Runtime playback uses the system mpv executable; IPTVnator does not bundle or load libmpv in the Electron process on Linux.',
-                  };
-
-                  fs.writeFileSync(
-                    path.join(process.env.RUNTIME_PREFIX, 'runtime-manifest.json'),
-                    `${JSON.stringify(manifest, null, 2)}\n`
-                  );
-                  NODE
-
-                  pnpm embedded-mpv:stage-runtime -- linux x64 "${RUNTIME_PREFIX}"
-
             - name: Build backend
               env:
                   IPTVNATOR_EMBEDDED_MPV_PLATFORM: ${{ matrix.embedded_mpv_platform || '' }}
                   IPTVNATOR_EMBEDDED_MPV_ARCH: ${{ matrix.embedded_mpv_arch || matrix.arch || '' }}
+                  IPTVNATOR_LINUX_FRAME_COPY_PROFILE: ${{ matrix.linux_profile || '' }}
                   IPTVNATOR_REQUIRE_EMBEDDED_MPV: ${{ (matrix.os == 'linux' || matrix.os == 'windows' || (matrix.os == 'macos' && (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' || github.ref == 'refs/heads/master'))) && '1' || '0' }}
               run: pnpm run build:backend
 
@@ -323,17 +624,37 @@ jobs:
                       ;;
                     win32)
                       test -f dist/apps/electron-backend/native/lib/mpv-2.dll || test -f dist/apps/electron-backend/native/lib/libmpv-2.dll || test -f dist/apps/electron-backend/native/lib/mpv.dll || test -f dist/apps/electron-backend/native/lib/libmpv.dll
+                      # Frame-copy engine artifacts ship on Windows. The helper
+                      # resolves the mpv DLL from its own directory, so the DLL
+                      # must sit beside it at the native/ top level too.
+                      test -f dist/apps/electron-backend/native/iptvnator_mpv_helper.exe
+                      test -f dist/apps/electron-backend/native/embedded_mpv_frame_reader.node
+                      find dist/apps/electron-backend/native -maxdepth 1 \( -name 'mpv-2.dll' -o -name 'libmpv-2.dll' -o -name 'mpv.dll' -o -name 'libmpv.dll' \) -print -quit | grep -q .
                       ;;
                     linux)
-                      node -e "const manifest = require('./dist/apps/electron-backend/native/embedded-mpv-runtime.json'); if (manifest.origin !== 'external-mpv-process') { throw new Error('Linux embedded MPV manifest must use external-mpv-process origin.'); }"
-                      if find dist/apps/electron-backend/native/lib -name 'libmpv.so*' -print -quit 2>/dev/null | grep -q .; then
-                          echo "::error::Linux embedded MPV packages must not bundle libmpv"
-                          find dist/apps/electron-backend/native/lib -name 'libmpv.so*' -print
+                      node -e "const { execFileSync } = require('node:child_process'); const manifest = require('./dist/apps/electron-backend/native/embedded-mpv-runtime.json'); const revision = execFileSync('git', ['rev-parse', 'HEAD'], { encoding: 'utf8' }).trim(); if (manifest.origin !== 'linux-frame-copy-build' || manifest.sourceRuntimeValidated !== true || manifest.sourceArchive?.schemaVersion !== 1 || manifest.sourceArchive?.name !== 'linux-frame-copy-runtime-sources.tar.xz' || !/^[a-f0-9]{64}$/.test(manifest.sourceArchive?.sha256 ?? '') || manifest.sourceArchive?.repositoryRevision !== revision) { throw new Error('Linux embedded MPV build manifest must describe the validated source runtime and exact source archive.'); }"
+                      test -f dist/apps/electron-backend/native/lib/libmpv.so.2
+                      test -f dist/apps/electron-backend/native/iptvnator_mpv_helper
+                      test -f dist/apps/electron-backend/native/embedded_mpv_frame_reader.node
+                      if readelf -d dist/apps/electron-backend/native/embedded_mpv.node | grep -Eq 'Shared library:.*libmpv\.so'; then
+                          echo "::error::Linux embedded MPV addon must not link directly to libmpv"
+                          readelf -d dist/apps/electron-backend/native/embedded_mpv.node
                           exit 1
                       fi
-                      if ldd dist/apps/electron-backend/native/embedded_mpv.node | grep -q 'libmpv'; then
-                          echo "::error::Linux embedded MPV addon must not link directly to libmpv"
-                          ldd dist/apps/electron-backend/native/embedded_mpv.node
+                      if readelf -d dist/apps/electron-backend/native/embedded_mpv_frame_reader.node | grep -Eq 'Shared library:.*libmpv\.so'; then
+                          echo "::error::Linux frame reader must not link directly to libmpv"
+                          readelf -d dist/apps/electron-backend/native/embedded_mpv_frame_reader.node
+                          exit 1
+                      fi
+                      HELPER_DYNAMIC="$(readelf -d dist/apps/electron-backend/native/iptvnator_mpv_helper)"
+                      if ! printf '%s\n' "${HELPER_DYNAMIC}" | grep -Eq 'Shared library: \[libmpv\.so\.2\]'; then
+                          echo "::error::Linux frame-copy helper must need libmpv.so.2"
+                          printf '%s\n' "${HELPER_DYNAMIC}"
+                          exit 1
+                      fi
+                      if ! printf '%s\n' "${HELPER_DYNAMIC}" | grep -Fq 'Library runpath: [$ORIGIN/lib]'; then
+                          echo "::error::Linux frame-copy helper must keep only the relative runtime path"
+                          printf '%s\n' "${HELPER_DYNAMIC}"
                           exit 1
                       fi
                       ;;
@@ -539,6 +860,7 @@ jobs:
               env:
                   IPTVNATOR_EMBEDDED_MPV_PLATFORM: ${{ matrix.embedded_mpv_platform || '' }}
                   IPTVNATOR_EMBEDDED_MPV_ARCH: ${{ matrix.embedded_mpv_arch || matrix.arch || '' }}
+                  IPTVNATOR_LINUX_FRAME_COPY_PROFILE: ${{ matrix.linux_profile || '' }}
                   # TEMPORARY PR TEST: change this back to '0' after manually
                   # testing the macOS PR artifact with Embedded MPV included.
                   IPTVNATOR_REQUIRE_EMBEDDED_MPV: ${{ (matrix.os == 'linux' || matrix.os == 'windows' || (matrix.os == 'macos' && github.event_name == 'pull_request')) && '1' || '0' }}
@@ -549,11 +871,250 @@ jobs:
               env:
                   PACKAGE_OS: ${{ matrix.os }}
                   PACKAGE_ARCH: ${{ matrix.arch || matrix.embedded_mpv_arch || '' }}
+                  IPTVNATOR_LINUX_FRAME_COPY_PROFILE: ${{ matrix.linux_profile || '' }}
                   # TEMPORARY ARTIFACT TEST: remove `|| github.event_name == 'pull_request' || github.ref == 'refs/heads/master'`
                   # after the macOS Embedded MPV artifacts are built and manually tested.
                   IPTVNATOR_REQUIRE_EMBEDDED_MPV: ${{ (matrix.os == 'linux' || matrix.os == 'windows' || (matrix.os == 'macos' && (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' || github.ref == 'refs/heads/master'))) && '1' || '0' }}
               run: pnpm run verify:package-layout -- "$PACKAGE_OS" "$PACKAGE_ARCH"
 
+            - name: Make marker-only foreign-architecture DEB packages
+              if: matrix.os == 'linux' && matrix.linux_profile == 'system'
+              shell: bash
+              env:
+                  IPTVNATOR_EMBEDDED_MPV_PLATFORM: linux
+                  IPTVNATOR_EMBEDDED_MPV_ARCH: x64
+                  IPTVNATOR_LINUX_FRAME_COPY_PROFILE: ''
+                  IPTVNATOR_REQUIRE_EMBEDDED_MPV: '1'
+              run: |
+                  set -euo pipefail
+
+                  for foreign_arch in armv7l arm64; do
+                      rm -rf dist/executables-linux-foreign
+                      cp "${RUNNER_TEMP}/electron-builder.base.json" electron-builder.json
+                      node tools/packaging/configure-linux-frame-copy-build.mjs \
+                          --foreign-deb \
+                          --foreign-arch "${foreign_arch}"
+                      pnpm nx run electron-backend:make \
+                          --arch="${foreign_arch}" \
+                          --outputPath=dist/executables-linux-foreign \
+                          --publishPolicy=never
+                      mapfile -t foreign_debs < <(
+                          find dist/executables-linux-foreign -maxdepth 1 -type f -name '*.deb' -print
+                      )
+                      test "${#foreign_debs[@]}" -eq 1
+                      case "${foreign_arch}" in
+                          armv7l) expected_deb_arch=armhf ;;
+                          arm64) expected_deb_arch=arm64 ;;
+                          *)
+                              echo "::error::Unexpected foreign DEB build architecture ${foreign_arch}"
+                              exit 1
+                              ;;
+                      esac
+                      actual_deb_arch="$(dpkg-deb --field "${foreign_debs[0]}" Architecture)"
+                      test "${actual_deb_arch}" = "${expected_deb_arch}"
+                      mv "${foreign_debs[0]}" dist/executables/
+                  done
+
+            - name: Verify DEB payloads and x64 system runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'system'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  found=false
+                  for artifact in dist/executables/*.deb; do
+                      test -f "${artifact}" || continue
+                      found=true
+                      case "$(dpkg-deb --field "${artifact}" Architecture)" in
+                          amd64)
+                              docker run --rm \
+                                  --volume "${GITHUB_WORKSPACE}:/workspace:ro" \
+                                  --volume "$(realpath "${artifact}"):/artifact.deb:ro" \
+                                  --workdir /workspace \
+                                  ubuntu:24.04 \
+                                  bash -euo pipefail -c '
+                                      apt-get update
+                                      DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+                                          binutils libegl1 libgbm1 libgl1 libgl1-mesa-dri libmpv2 \
+                                          nodejs squashfs-tools xauth xvfb
+                                      xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                                          node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                                              --artifact /artifact.deb --profile system
+                                  '
+                              ;;
+                          arm64|armhf)
+                              node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                                  --artifact "${artifact}" --profile system
+                              ;;
+                          *)
+                              echo "::error::Unexpected DEB architecture in ${artifact}"
+                              exit 1
+                              ;;
+                      esac
+                  done
+                  test "${found}" = true
+
+            - name: Verify RPM payload and x64 system runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'system'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  artifact="$(find dist/executables -maxdepth 1 -type f -name '*.rpm' -print -quit)"
+                  test -n "${artifact}"
+                  docker run --rm \
+                      --volume "${GITHUB_WORKSPACE}:/workspace:ro" \
+                      --volume "$(realpath "${artifact}"):/artifact.rpm:ro" \
+                      --workdir /workspace \
+                      fedora:latest \
+                      bash -euo pipefail -c '
+                          dnf install -y \
+                              binutils bsdtar libglvnd-egl libglvnd-glx mesa-dri-drivers \
+                              mesa-libgbm mpv-libs nodejs rpm xorg-x11-server-Xvfb \
+                              xorg-x11-xauth
+                          xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                              node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                                  --artifact /artifact.rpm --profile system
+                      '
+
+            - name: Verify Pacman payload and x64 system runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'system'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  artifact="$(find dist/executables -maxdepth 1 -type f \( -name '*.pacman' -o -name '*.pkg.tar.*' \) -print -quit)"
+                  test -n "${artifact}"
+                  docker run --rm \
+                      --volume "${GITHUB_WORKSPACE}:/workspace:ro" \
+                      --volume "$(realpath "${artifact}"):/artifact.pacman:ro" \
+                      --workdir /workspace \
+                      archlinux:latest \
+                      bash -euo pipefail -c '
+                          pacman -Syu --noconfirm \
+                              binutils libarchive libglvnd mesa mpv nodejs xorg-server-xvfb \
+                              xorg-xauth
+                          xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                              node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                                  --artifact /artifact.pacman --profile system
+                      '
+
+            - name: Verify AppImage payloads and bundled runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'portable'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  found=false
+                  for artifact in dist/executables/*.AppImage; do
+                      test -f "${artifact}" || continue
+                      found=true
+                      xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                          node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                              --artifact "${artifact}" --profile portable
+                  done
+                  test "${found}" = true
+
+            - name: Verify Snap payloads and strict-confinement runtime
+              if: matrix.os == 'linux' && matrix.linux_profile == 'portable'
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  found=false
+                  installed_x64=false
+                  for artifact in dist/executables/*.snap; do
+                      test -f "${artifact}" || continue
+                      found=true
+                      verification="$(
+                          xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                              node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                                  --artifact "${artifact}" --profile portable \
+                                  2>&1 | tee /dev/stderr
+                      )"
+                      if printf '%s\n' "${verification}" | grep -Fq 'Verified snap x64 Linux'; then
+                          snap list mesa-core22 >/dev/null 2>&1 || sudo snap install mesa-core22
+                          snap list gnome-3-28-1804 >/dev/null 2>&1 || sudo snap install gnome-3-28-1804
+                          sudo snap install --dangerous "${artifact}"
+                          installed_x64=true
+                      fi
+                  done
+                  test "${found}" = true
+                  test "${installed_x64}" = true
+                  sudo snap connect iptvnator:graphics-core22 mesa-core22:graphics-core22
+                  sudo snap connect iptvnator:gnome-3-28-1804 gnome-3-28-1804:gnome-3-28-1804
+                  sudo snap disconnect iptvnator:graphics-core22 mesa-core22:graphics-core22
+                  snap connections iptvnator | awk \
+                      '$2 == "iptvnator:graphics-core22" && $3 == "-" { found=1 } END { exit !found }'
+                  set +e
+                  disconnected_probe="$(
+                      xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                          snap run iptvnator --embedded-mpv-runtime-probe 2>&1
+                  )"
+                  disconnected_status=$?
+                  set -e
+                  printf '%s\n' "${disconnected_probe}"
+                  test "${disconnected_status}" -eq 1
+                  printf '%s\n' "${disconnected_probe}" | \
+                      grep -Fx '{"usable":false,"reason":"snap-graphics-provider-unavailable"}'
+                  sudo snap connect iptvnator:graphics-core22 mesa-core22:graphics-core22
+                  snap connections iptvnator | awk \
+                      '$2 == "iptvnator:graphics-core22" && $3 == "mesa-core22:graphics-core22" { found=1 } END { exit !found }'
+                  snap connections iptvnator | awk \
+                      '$2 == "iptvnator:gnome-3-28-1804" && $3 == "gnome-3-28-1804:gnome-3-28-1804" { found=1 } END { exit !found }'
+                  snap connections iptvnator | awk \
+                      '$1 == "shared-memory" && $2 == "iptvnator:shared-memory" && $3 == ":shared-memory" { found=1 } END { exit !found }'
+                  xvfb-run -a env \
+                      LIBGL_ALWAYS_SOFTWARE=1 \
+                      IPTVNATOR_TRACE_PLAYER=1 \
+                      EGL_LOG_LEVEL=debug \
+                      LIBGL_DEBUG=verbose \
+                      __EGL_VENDOR_LIBRARY_FILENAMES=/tmp/hostile-egl-vendor.json \
+                      GBM_BACKEND=/tmp/hostile-gbm \
+                      MESA_LOADER_DRIVER_OVERRIDE=/tmp/hostile-dri \
+                      LIBVA_DRIVER_NAME=/tmp/hostile-va \
+                      VDPAU_DRIVER_PATH=/tmp/hostile-vdpau \
+                      VK_DRIVER_FILES=/tmp/hostile-vulkan-driver.json \
+                      VK_ICD_FILENAMES=/tmp/hostile-vulkan-icd.json \
+                      VK_ADD_DRIVER_FILES=/tmp/hostile-vulkan-add-driver.json \
+                      VK_ADD_LAYER_PATH=/tmp/hostile-vulkan-layers \
+                      VK_IMPLICIT_LAYER_PATH=/tmp/hostile-vulkan-implicit-layers \
+                      VK_ADD_IMPLICIT_LAYER_PATH=/tmp/hostile-vulkan-add-implicit-layers \
+                      XDG_CONFIG_HOME=/tmp/hostile-xdg-config-home \
+                      XDG_CONFIG_DIRS=/tmp/hostile-xdg-config-dirs \
+                      XDG_DATA_HOME=/tmp/hostile-xdg-data-home \
+                      XDG_DATA_DIRS=/tmp/hostile-xdg-data-dirs \
+                      snap run iptvnator --embedded-mpv-runtime-probe
+
+            - name: Run packaged x64 frame-copy and fallback smoke
+              if: matrix.os == 'linux' && matrix.linux_profile == 'portable'
+              env:
+                  IPTVNATOR_E2E_REQUIRE_PACKAGED_FRAME_COPY: '1'
+                  IPTVNATOR_E2E_PACKAGED_EXECUTABLE: ${{ github.workspace }}/dist/executables/linux-unpacked/iptvnator
+                  LIBGL_ALWAYS_SOFTWARE: '1'
+              run: |
+                  xvfb-run -a pnpm nx run \
+                      electron-backend-e2e:packaged-frame-copy-smoke \
+                      --skip-nx-cache
+
+            - name: Diagnose packaged x64 frame-copy hardware path
+              if: matrix.os == 'linux' && matrix.linux_profile == 'portable'
+              continue-on-error: true
+              env:
+                  IPTVNATOR_E2E_REQUIRE_PACKAGED_FRAME_COPY: '1'
+                  IPTVNATOR_E2E_PACKAGED_EXECUTABLE: ${{ github.workspace }}/dist/executables/linux-unpacked/iptvnator
+              run: |
+                  set -euo pipefail
+
+                  if [ ! -e /dev/dri/renderD128 ]; then
+                      echo "::notice::No /dev/dri/renderD128 is available; skipping the non-blocking hardware-path diagnostic."
+                      exit 0
+                  fi
+                  ls -la /dev/dri
+                  xvfb-run -a pnpm nx run \
+                      electron-backend-e2e:packaged-frame-copy-smoke \
+                      --skip-nx-cache
+
             - name: Save embedded MPV runtime cache
               # TEMPORARY ARTIFACT TEST: remove `|| github.ref == 'refs/heads/master'`
               # after the macOS Embedded MPV artifacts are built and manually tested.
@@ -566,7 +1127,7 @@ jobs:
                       vendor/embedded-mpv/${{ matrix.embedded_mpv_platform }}-${{ matrix.embedded_mpv_arch }}/runtime-manifest.json
                   key: ${{ steps.embedded-mpv-runtime-cache-key.outputs.key }}
 
-            - name: Smoke test packaged Flatpak launcher
+            - name: Verify Flatpak payload, launcher, and sandboxed runtime
               if: matrix.os == 'linux' && matrix.linux_profile == 'flatpak'
               shell: bash
               run: |
@@ -578,8 +1139,12 @@ jobs:
                       exit 1
                   fi
 
+                  xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                      node tools/packaging/verify-linux-frame-copy-runtime.mjs \
+                          --artifact "${FLATPAK_BUNDLE}" --profile flatpak
                   flatpak install --user --noninteractive -y "${FLATPAK_BUNDLE}"
-                  flatpak run --command=sh com.fourgray.iptvnator -c '
+                  xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1 \
+                      flatpak run --command=sh com.fourgray.iptvnator -c '
                       set -euo pipefail
 
                       test -f /app/share/metainfo/com.fourgray.iptvnator.metainfo.xml
@@ -587,14 +1152,42 @@ jobs:
 
                       LAUNCHER_PATH="$(readlink -f /app/bin/iptvnator)"
                       test -f "${LAUNCHER_PATH}"
-                      test -f "${LAUNCHER_PATH}.bin"
-                      grep -q '\''readlink -f "$SCRIPT_PATH"'\'' "${LAUNCHER_PATH}"
-                      grep -q '\''exec "$SCRIPT_DIR/iptvnator.bin"'\'' "${LAUNCHER_PATH}"
+                      test -x "${LAUNCHER_PATH}"
+                      if [ -e "${LAUNCHER_PATH}.bin" ] || [ -L "${LAUNCHER_PATH}.bin" ]; then
+                          echo "::error::Flatpak must not contain ${LAUNCHER_PATH}.bin"
+                          exit 1
+                      fi
+                      ELF_MAGIC="$(od -An -tx1 -N4 "${LAUNCHER_PATH}" | tr -d "[:space:]")"
+                      test "${ELF_MAGIC}" = "7f454c46"
                   '
+                  set +e
+                  PROBE_OUTPUT="$(
+                      xvfb-run -a dbus-run-session -- flatpak run \
+                          --env=LIBGL_ALWAYS_SOFTWARE=1 \
+                          com.fourgray.iptvnator \
+                          --embedded-mpv-runtime-probe 2>&1
+                  )"
+                  PROBE_STATUS=$?
+                  set -e
+
+                  PROBE_OUTPUT_LIMIT=16384
+                  printf '%s\n' "${PROBE_OUTPUT:0:PROBE_OUTPUT_LIMIT}"
+                  if [ "${#PROBE_OUTPUT}" -gt "${PROBE_OUTPUT_LIMIT}" ]; then
+                      echo "::warning::Flatpak runtime probe output was truncated to ${PROBE_OUTPUT_LIMIT} characters."
+                  fi
+                  if [[ "${PROBE_OUTPUT}" == *"not an ELF file"* ]] ||
+                      [[ "${PROBE_OUTPUT}" == *"Zypak needs to be called directly"* ]]; then
+                      echo "::error::Flatpak launched a wrapper instead of the Electron ELF."
+                      exit 1
+                  fi
+                  if [ "${PROBE_STATUS}" -ne 0 ]; then
+                      echo "::error::Flatpak application runtime probe failed with status ${PROBE_STATUS}."
+                      exit "${PROBE_STATUS}"
+                  fi
 
             - name: Upload artifacts (macOS)
               if: matrix.os == 'macos'
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: macos-${{ matrix.arch }}-artifacts
                   path: |
@@ -604,25 +1197,33 @@ jobs:
                       dist/executables/**/*.blockmap
                   retention-days: 7
 
-            - name: Upload artifacts (Linux)
-              if: matrix.os == 'linux' && matrix.linux_profile == 'standard'
-              uses: actions/upload-artifact@v4
+            - name: Upload system-runtime Linux artifacts
+              if: matrix.os == 'linux' && matrix.linux_profile == 'system'
+              uses: actions/upload-artifact@v7
               with:
-                  name: linux-artifacts
+                  name: linux-system-artifacts
                   path: |
-                      dist/executables/**/*.deb
-                      dist/executables/**/*.rpm
-                      dist/executables/**/*.snap
-                      dist/executables/**/*.AppImage
-                      dist/executables/**/*.tar.gz
-                      dist/executables/**/*.pacman
+                      dist/executables/*.deb
+                      dist/executables/*.rpm
+                      dist/executables/*.pacman
+                      dist/executables/*.pkg.tar.*
+                  retention-days: 7
+
+            - name: Upload portable-runtime Linux artifacts
+              if: matrix.os == 'linux' && matrix.linux_profile == 'portable'
+              uses: actions/upload-artifact@v7
+              with:
+                  name: linux-portable-artifacts
+                  path: |
+                      dist/executables/*.AppImage
+                      dist/executables/*.snap
                       dist/executables/**/latest-linux*.yml
                       dist/executables/**/*.blockmap
                   retention-days: 7
 
-            - name: Upload artifacts (Flatpak)
+            - name: Upload Flatpak-runtime Linux artifacts
               if: matrix.os == 'linux' && matrix.linux_profile == 'flatpak'
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: linux-flatpak-artifacts
                   path: |
@@ -631,7 +1232,7 @@ jobs:
 
             - name: Upload artifacts (Windows)
               if: matrix.os == 'windows'
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: windows-artifacts
                   path: |
@@ -642,20 +1243,61 @@ jobs:
                       dist/executables/**/*.blockmap
                   retention-days: 7
 
+    build-linux:
+        name: Build on ${{ matrix.os }} ${{ matrix.arch }} (${{ matrix.linux_profile }})
+        needs: linux-embedded-mpv-runtime
+        runs-on: ${{ matrix.runner }}
+        timeout-minutes: 120
+        concurrency:
+            group: ${{ github.workflow }}-build-${{ matrix.os }}-${{ matrix.linux_profile }}-${{ github.event.pull_request.number || github.ref }}
+            cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - os: linux
+                      runner: ubuntu-22.04
+                      arch: x64
+                      linux_profile: system
+                      embedded_mpv_platform: linux
+                      embedded_mpv_arch: x64
+                      embedded_mpv_build_runtime: false
+                    - os: linux
+                      runner: ubuntu-22.04
+                      arch: x64
+                      linux_profile: portable
+                      embedded_mpv_platform: linux
+                      embedded_mpv_arch: x64
+                      embedded_mpv_build_runtime: false
+                    - os: linux
+                      runner: ubuntu-24.04
+                      arch: x64
+                      linux_profile: flatpak
+                      embedded_mpv_platform: linux
+                      embedded_mpv_arch: x64
+                      embedded_mpv_build_runtime: false
+
+        steps: *electron-build-steps
+
     create-release:
         name: Create Draft Release
-        needs: build
+        needs:
+            - build-cross-platform
+            - build-linux
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
         runs-on: ubuntu-latest
+        concurrency:
+            group: ${{ github.workflow }}-release-${{ github.event.pull_request.number || github.ref }}
+            cancel-in-progress: false
         permissions:
             contents: write
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v7
 
             - name: Download all artifacts
-              uses: actions/download-artifact@v4
+              uses: actions/download-artifact@v8
               with:
                   path: artifacts
 
@@ -777,15 +1419,127 @@ jobs:
 
             - name: Get version from package.json
               id: package-version
-              run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+              run: echo "version=$(node -p "require('./package.json').version")" >> "$GITHUB_OUTPUT"
+
+            # Test drafts (PR/master) get a self-describing title plus a context
+            # header linking the PR, real head commit, and workflow run. A stable
+            # tag per PR (test-pr-<n>) / branch (test-master) makes the action
+            # update one rolling draft in place instead of piling up a new draft
+            # for every push. PR builds must not use github.sha here: that is the
+            # ephemeral merge-commit SHA, which resolves to nothing in the repo.
+            - name: Compose release metadata
+              id: release-meta
+              shell: bash
+              env:
+                  VERSION: ${{ steps.package-version.outputs.version }}
+                  EVENT_NAME: ${{ github.event_name }}
+                  IS_TAG_BUILD: ${{ startsWith(github.ref, 'refs/tags/') }}
+                  PR_NUMBER: ${{ github.event.pull_request.number }}
+                  PR_TITLE: ${{ github.event.pull_request.title }}
+                  PR_URL: ${{ github.event.pull_request.html_url }}
+                  HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+                  SOURCE_BRANCH: ${{ github.head_ref || github.ref_name }}
+                  REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+                  RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+              run: |
+                  set -euo pipefail
+
+                  SHORT_SHA="${HEAD_SHA:0:7}"
+                  SAFE_BRANCH="${SOURCE_BRANCH//\//-}"
+
+                  if [ "${IS_TAG_BUILD}" = "true" ]; then
+                      NAME="Release v${VERSION}"
+                      TAG="${GITHUB_REF_NAME}"
+                      # Authored release notes: the release flow writes this
+                      # CHANGELOG section from .changes/*.md before tagging
+                      # (see .changes/README.md), so at tag time the changelog
+                      # is the authored source of truth. The extractor exits
+                      # non-zero when the section is missing, failing the
+                      # release rather than silently shipping PR-title-only
+                      # notes. generate_release_notes stays on below, so the
+                      # GitHub commit list still renders under this body.
+                      BODY="$(node tools/release/extract-changelog-section.mjs "${VERSION}")"
+                  elif [ "${EVENT_NAME}" = "pull_request" ]; then
+                      NAME="v${VERSION} — PR #${PR_NUMBER} @ ${SHORT_SHA} [test]"
+                      TAG="test-pr-${PR_NUMBER}"
+                      BODY="$(printf '🧪 Test build for PR [#%s](%s) — %s\n\nCommit [`%s`](%s/commit/%s) · branch `%s` · [workflow run](%s)' \
+                          "${PR_NUMBER}" "${PR_URL}" "${PR_TITLE}" \
+                          "${SHORT_SHA}" "${REPO_URL}" "${HEAD_SHA}" "${SOURCE_BRANCH}" "${RUN_URL}")"
+                  else
+                      NAME="v${VERSION} — ${SAFE_BRANCH} @ ${SHORT_SHA} [test]"
+                      TAG="test-${SAFE_BRANCH}"
+                      BODY="$(printf '🧪 Test build from `%s` — commit [`%s`](%s/commit/%s) · [workflow run](%s)' \
+                          "${SOURCE_BRANCH}" "${SHORT_SHA}" "${REPO_URL}" "${HEAD_SHA}" "${RUN_URL}")"
+                  fi
+
+                  {
+                      echo "name=${NAME}"
+                      echo "tag=${TAG}"
+                      echo "commitish=${HEAD_SHA}"
+                  } >> "${GITHUB_OUTPUT}"
+
+                  if [ -n "${BODY}" ]; then
+                      {
+                          echo "body<<RELEASE_BODY_EOF"
+                          echo "${BODY}"
+                          echo "RELEASE_BODY_EOF"
+                      } >> "${GITHUB_OUTPUT}"
+                  else
+                      echo "body=" >> "${GITHUB_OUTPUT}"
+                  fi
+
+            # A PR can be closed while this workflow is still running; the
+            # cleanup workflow deletes the PR draft on close. Re-check the live
+            # PR state right before touching the draft so a late-finishing run
+            # cannot recreate a draft for a closed PR.
+            - name: Check PR is still open
+              if: github.event_name == 'pull_request'
+              id: pr-state
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  set -euo pipefail
+                  echo "state=$(gh api "repos/${GITHUB_REPOSITORY}/pulls/${{ github.event.pull_request.number }}" --jq '.state')" >> "${GITHUB_OUTPUT}"
+
+            # The rolling draft keeps assets across runs and the release action
+            # only replaces same-name files. If the app version changes between
+            # pushes, old-version installers would linger beside the new set,
+            # so drop every existing asset first — the action re-uploads the
+            # full current set right after. Only drafts are pruned; published
+            # releases are never touched.
+            - name: Prune stale draft assets
+              if: github.event_name != 'pull_request' || steps.pr-state.outputs.state == 'open'
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  RELEASE_TAG: ${{ steps.release-meta.outputs.tag }}
+              run: |
+                  set -euo pipefail
+
+                  release_id="$(gh api "repos/${GITHUB_REPOSITORY}/releases?per_page=100" --paginate |
+                      jq -s --arg tag "${RELEASE_TAG}" \
+                          'add | [.[] | select(.draft and .tag_name == $tag)][0].id // empty')"
+
+                  if [ -z "${release_id}" ]; then
+                      echo "No existing draft for ${RELEASE_TAG}; nothing to prune."
+                      exit 0
+                  fi
+
+                  gh api "repos/${GITHUB_REPOSITORY}/releases/${release_id}/assets?per_page=100" --paginate --jq '.[].id' |
+                      xargs -r -n1 -I{} gh api -X DELETE "repos/${GITHUB_REPOSITORY}/releases/assets/{}"
+
+                  echo "Pruned assets from draft ${release_id} (${RELEASE_TAG})."
 
             - name: Create Draft Release
+              id: draft-release
+              if: github.event_name != 'pull_request' || steps.pr-state.outputs.state == 'open'
               uses: softprops/action-gh-release@v2
               with:
                   draft: true
-                  prerelease: ${{ github.event_name == 'pull_request' }}
-                  name: Release v${{ steps.package-version.outputs.version }}
-                  tag_name: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || format('test-{0}', github.sha) }}
+                  prerelease: ${{ !startsWith(github.ref, 'refs/tags/') }}
+                  name: ${{ steps.release-meta.outputs.name }}
+                  tag_name: ${{ steps.release-meta.outputs.tag }}
+                  target_commitish: ${{ steps.release-meta.outputs.commitish }}
+                  body: ${{ steps.release-meta.outputs.body }}
                   generate_release_notes: true
                   files: |
                       artifacts/macos-x64-artifacts/*-x64.dmg
@@ -795,15 +1549,16 @@ jobs:
                       artifacts/macos-arm64-artifacts/*-arm64.zip
                       artifacts/macos-arm64-artifacts/*.blockmap
                       artifacts/latest-mac.yml
-                      artifacts/linux-artifacts/*.AppImage
-                      artifacts/linux-artifacts/*.deb
-                      artifacts/linux-artifacts/*.rpm
-                      artifacts/linux-artifacts/*.snap
-                      artifacts/linux-artifacts/*.tar.gz
-                      artifacts/linux-artifacts/*.pacman
-                      artifacts/linux-artifacts/latest-linux*.yml
-                      artifacts/linux-artifacts/*.blockmap
+                      artifacts/linux-system-artifacts/*.deb
+                      artifacts/linux-system-artifacts/*.rpm
+                      artifacts/linux-system-artifacts/*.pacman
+                      artifacts/linux-system-artifacts/*.pkg.tar.*
+                      artifacts/linux-portable-artifacts/*.AppImage
+                      artifacts/linux-portable-artifacts/*.snap
+                      artifacts/linux-portable-artifacts/latest-linux*.yml
+                      artifacts/linux-portable-artifacts/*.blockmap
                       artifacts/linux-flatpak-artifacts/*.flatpak
+                      artifacts/linux-frame-copy-runtime-sources/linux-frame-copy-runtime-sources.tar.xz
                       artifacts/windows-artifacts/*-setup.exe
                       artifacts/windows-artifacts/*.msi
                       artifacts/windows-artifacts/*.zip
@@ -812,30 +1567,57 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    publish-snap:
-        name: Publish to Snapcraft Store
-        needs: build
-        runs-on: ubuntu-latest
-        if: startsWith(github.ref, 'refs/tags/v')
-        env:
-            SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraft_token }}
-
-        steps:
-            - name: Download snap artifact
-              uses: actions/download-artifact@v4
-              with:
-                  name: linux-artifacts
-                  path: artifacts
-
-            - name: Setup Snapcraft
-              uses: samuelmeuli/action-snapcraft@v3
-
-            - name: Publish all snaps to edge channel
+            # Rare action-gh-release path: when the release listing transiently
+            # misses the rolling draft, the action creates a duplicate, deletes
+            # it in favor of the canonical (oldest) draft, and uploads assets
+            # there WITHOUT refreshing that draft's metadata. Rebuild the full
+            # metadata (title, commitish, and body = context header + notes
+            # from the same generate-notes API the action uses) on the release
+            # id the action actually used, so the draft ends up correct no
+            # matter which internal path ran. If notes generation fails, the
+            # body is left as the action set it and only title/commitish are
+            # re-asserted.
+            - name: Ensure draft metadata is current
+              if: steps.draft-release.outputs.id != ''
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  RELEASE_ID: ${{ steps.draft-release.outputs.id }}
+                  RELEASE_TAG: ${{ steps.release-meta.outputs.tag }}
+                  RELEASE_NAME: ${{ steps.release-meta.outputs.name }}
+                  RELEASE_COMMITISH: ${{ steps.release-meta.outputs.commitish }}
+                  RELEASE_BODY: ${{ steps.release-meta.outputs.body }}
               run: |
-                  # Find and publish all snap files
-                  for SNAP_FILE in artifacts/*.snap; do
-                      if [ -f "$SNAP_FILE" ]; then
-                          echo "Publishing: $SNAP_FILE"
-                          snapcraft upload --release=edge "$SNAP_FILE"
-                      fi
-                  done
+                  set -euo pipefail
+
+                  GENERATED_NOTES="$(gh api -X POST "repos/${GITHUB_REPOSITORY}/releases/generate-notes" \
+                      -f tag_name="${RELEASE_TAG}" \
+                      -f target_commitish="${RELEASE_COMMITISH}" \
+                      --jq '.body' || true)"
+
+                  # tag_name MUST be included in every PATCH: updating a draft
+                  # without it makes GitHub drop the pending tag (the draft
+                  # becomes "untagged-<hash>"), which breaks the rolling-draft
+                  # lookup on the next run.
+                  if [ -z "${GENERATED_NOTES}" ]; then
+                      jq -n \
+                          --arg tag "${RELEASE_TAG}" \
+                          --arg name "${RELEASE_NAME}" \
+                          --arg commitish "${RELEASE_COMMITISH}" \
+                          '{tag_name: $tag, name: $name, target_commitish: $commitish}' |
+                          gh api -X PATCH "repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}" --input - > /dev/null
+                      exit 0
+                  fi
+
+                  if [ -n "${RELEASE_BODY}" ]; then
+                      FULL_BODY="$(printf '%s\n\n%s' "${RELEASE_BODY}" "${GENERATED_NOTES}")"
+                  else
+                      FULL_BODY="${GENERATED_NOTES}"
+                  fi
+
+                  jq -n \
+                      --arg tag "${RELEASE_TAG}" \
+                      --arg name "${RELEASE_NAME}" \
+                      --arg commitish "${RELEASE_COMMITISH}" \
+                      --arg body "${FULL_BODY}" \
+                      '{tag_name: $tag, name: $name, target_commitish: $commitish, body: ($body | .[0:120000])}' |
+                      gh api -X PATCH "repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}" --input - > /dev/null
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf4da6b24..14f32433b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,82 @@ on:
             - master
     workflow_dispatch:
 
+# Superseded PR pushes cancel their still-running checks. Non-PR runs get a
+# unique group (run_id) because GitHub keeps at most one pending run per
+# group even with cancel-in-progress: false — a shared ref group would let a
+# rapid master push silently replace a queued sibling and leave a merged
+# commit without a lint/test record.
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+permissions:
+    contents: read
+
 jobs:
+    actionlint:
+        name: Workflow lint
+        runs-on: ubuntu-latest
+        timeout-minutes: 10
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v7
+
+            # Image pinned by digest (tag 1.7.12). False positives are
+            # suppressed in .github/actionlint.yaml; shellcheck runs at
+            # warning+ severity so style/info notes in long release scripts
+            # don't fail CI while real quoting/logic bugs still do.
+            - name: Run actionlint
+              uses: docker://rhysd/actionlint:1.7.12@sha256:b1934ee5f1c509618f2508e6eb47ee0d3520686341fec936f3b79331f9315667
+              with:
+                  args: -color
+              env:
+                  SHELLCHECK_OPTS: --severity=warning
+
+    release-note-gate:
+        name: Release note gate
+        if: github.event_name == 'pull_request'
+        runs-on: ubuntu-latest
+        timeout-minutes: 10
+        permissions:
+            contents: read
+            pull-requests: read
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v7
+
+            # The gate scripts are dependency-free Node, so this job skips
+            # pnpm install entirely and stays cheap.
+            - name: Validate release note format
+              run: node tools/release/build-release-notes.mjs --validate
+
+            # Labels are fetched live rather than read from the (stale) event
+            # payload, so applying `no-release-note` and re-running the check
+            # works without a new push. Policy lives in a unit-tested script,
+            # not in workflow bash.
+            - name: Require a release note for user-visible changes
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  PR_NUMBER: ${{ github.event.pull_request.number }}
+              run: |
+                  set -euo pipefail
+
+                  gh api "repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?per_page=100" \
+                      --paginate --jq '[.[] | {filename, status}]' |
+                      jq -s 'add // []' > /tmp/pr-files.json
+
+                  gh api "repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/labels?per_page=100" \
+                      --paginate --jq '[.[].name]' |
+                      jq -s 'add // []' > /tmp/pr-labels.json
+
+                  jq -n \
+                      --slurpfile files /tmp/pr-files.json \
+                      --slurpfile labels /tmp/pr-labels.json \
+                      '{files: $files[0], labels: $labels[0]}' |
+                      node tools/release/check-release-note-gate.mjs
+
     lint:
         name: Lint
         runs-on: ubuntu-latest
@@ -17,7 +92,10 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v7
+              with:
+                  # nx affected needs the merge-base with the PR target branch.
+                  fetch-depth: 0
 
             - name: Install pnpm
               uses: pnpm/action-setup@v4
@@ -31,7 +109,18 @@ jobs:
             - name: Install dependencies
               run: pnpm install --frozen-lockfile
 
-            - name: Lint all projects
+            # PRs lint only affected projects for faster feedback; root config
+            # or lockfile changes make every project affected, so the
+            # module-boundary and max-lines rules cannot be dodged this way.
+            - name: Lint affected projects (PR)
+              if: github.event_name == 'pull_request'
+              run: pnpm nx affected --target=lint --base=origin/${{ github.base_ref }} --head=HEAD --parallel=3 --output-style=static
+              env:
+                  CI: true
+                  NX_TASKS_RUNNER_DYNAMIC_OUTPUT: false
+
+            - name: Lint all projects (master)
+              if: github.event_name != 'pull_request'
               run: pnpm nx run-many --target=lint --all --parallel=3 --output-style=static
               env:
                   CI: true
@@ -44,7 +133,7 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v7
 
             - name: Install pnpm
               uses: pnpm/action-setup@v4
@@ -78,7 +167,7 @@ jobs:
 
             - name: Upload unit coverage artifact
               if: always()
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: unit-coverage
                   path: |
@@ -87,7 +176,7 @@ jobs:
 
             - name: Upload unit coverage to Codecov
               if: always()
-              uses: codecov/codecov-action@v6
+              uses: codecov/codecov-action@v7
               with:
                   files: ./coverage/merged/lcov.info,./coverage/merged/cobertura-coverage.xml
                   flags: unit
diff --git a/.github/workflows/cleanup-pr-draft.yml b/.github/workflows/cleanup-pr-draft.yml
new file mode 100644
index 000000000..695685255
--- /dev/null
+++ b/.github/workflows/cleanup-pr-draft.yml
@@ -0,0 +1,92 @@
+name: Cleanup PR Draft Release
+
+on:
+    pull_request:
+        types: [closed]
+
+# contents: write — delete the draft release; actions: write — cancel the
+# closed PR's still-running build workflow before deleting.
+permissions:
+    actions: write
+    contents: write
+
+jobs:
+    delete-draft:
+        name: Delete PR draft release
+        # Fork PRs never get a draft (the release job skips them) and their
+        # GITHUB_TOKEN is read-only regardless of the permissions block, so
+        # there is nothing to cancel or delete.
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        runs-on: ubuntu-latest
+        steps:
+            # A closed PR can be reopened while this job is still queued or
+            # waiting; a reopened PR's fresh build must not be cancelled and
+            # its draft must not be deleted. Check the live state up front
+            # (and again right before deleting below).
+            - name: Check PR is still closed
+              id: pr-state
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  PR_NUMBER: ${{ github.event.pull_request.number }}
+              run: |
+                  set -euo pipefail
+                  echo "state=$(gh api "repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}" --jq '.state')" >> "${GITHUB_OUTPUT}"
+
+            # A build for this PR may still be running and would recreate the
+            # rolling draft after we delete it. Cancel those runs (dead work
+            # for a closed PR anyway) and wait for them to wind down. The
+            # release job additionally re-checks the live PR state, so this
+            # wait is defense in depth, not the only guard.
+            - name: Cancel in-progress builds for the closed PR
+              if: steps.pr-state.outputs.state == 'closed'
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  HEAD_BRANCH: ${{ github.event.pull_request.head.ref }}
+              run: |
+                  set -euo pipefail
+
+                  # --event pull_request: a manually dispatched build on the
+                  # same branch is not this PR's work and must not be cancelled.
+                  list_active_runs() {
+                      gh run list --repo "${GITHUB_REPOSITORY}" \
+                          --workflow 'Build and Make Electron App' \
+                          --branch "${HEAD_BRANCH}" \
+                          --event pull_request \
+                          --json databaseId,status \
+                          --jq '.[] | select(.status == "queued" or .status == "in_progress" or .status == "waiting" or .status == "requested" or .status == "pending") | .databaseId'
+                  }
+
+                  for run_id in $(list_active_runs); do
+                      echo "Cancelling run ${run_id}"
+                      gh run cancel "${run_id}" --repo "${GITHUB_REPOSITORY}" || true
+                  done
+
+                  # Cancellation is asynchronous; poll until the runs settle.
+                  for _ in $(seq 1 18); do
+                      if [ -z "$(list_active_runs)" ]; then
+                          break
+                      fi
+                      sleep 10
+                  done
+
+            # Draft releases have no real git tag, so a lookup via
+            # releases/tags/<tag> returns 404. List releases and match the
+            # draft by its stored tag_name (test-pr-<n>) instead. The PR state
+            # is re-checked one last time right before deleting, in case the
+            # PR was reopened during the cancellation wait above.
+            - name: Delete draft release for closed PR
+              if: steps.pr-state.outputs.state == 'closed'
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  PR_NUMBER: ${{ github.event.pull_request.number }}
+              run: |
+                  set -euo pipefail
+
+                  if [ "$(gh api "repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}" --jq '.state')" != "closed" ]; then
+                      echo "PR #${PR_NUMBER} was reopened; keeping its draft."
+                      exit 0
+                  fi
+
+                  gh api "repos/${GITHUB_REPOSITORY}/releases?per_page=100" --paginate \
+                      --jq ".[] | select(.draft and .tag_name == \"test-pr-${PR_NUMBER}\") | .id" |
+                      xargs -r -n1 -I{} gh api -X DELETE "repos/${GITHUB_REPOSITORY}/releases/{}"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3359f2dda..dfe88308a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,6 +14,14 @@ on:
   schedule:
     - cron: '0 20 * * 3'
 
+# Required so `codeql-action/analyze` can upload its SARIF results. Without an
+# explicit grant the default token is read-only and the upload fails with
+# "Resource not accessible by integration".
+permissions:
+  actions: read
+  contents: read
+  security-events: write
+
 jobs:
   analyze:
     name: Analyze
@@ -30,42 +38,19 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      uses: actions/checkout@v7
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
+    # Initializes the CodeQL tools for scanning. PR runs analyze the merge
+    # commit checked out above (the modern default); JavaScript is
+    # interpreted, so no build step is needed before analysis.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
index b7c0b8bac..aa235d701 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -42,7 +42,7 @@ jobs:
         run: pnpm nx build website
 
       - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: dist/apps/website
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ed059fefc..dff445563 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -26,6 +26,14 @@ on:
 permissions:
     contents: read
 
+# Superseded PR pushes cancel their still-running image build. Master/tag/
+# manual runs get a unique group (run_id): GitHub keeps at most one pending
+# run per group even with cancel-in-progress: false, so a shared ref group
+# could silently drop a queued publish between two rapid master pushes.
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
     build:
         name: Build Docker image
@@ -34,7 +42,7 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v6
+              uses: actions/checkout@v7
 
             - name: Prepare Docker metadata
               id: docker-meta
@@ -109,5 +117,7 @@ jobs:
                   push: ${{ steps.docker-meta.outputs.publish == 'true' }}
                   tags: ${{ steps.docker-meta.outputs.tags }}
                   platforms: ${{ steps.docker-meta.outputs.platforms }}
+                  build-args: |
+                      BUILD_COMMIT=${{ github.event.pull_request.head.sha || github.sha }}
                   cache-from: type=gha
                   cache-to: type=gha,mode=max,ignore-error=true
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index fe56b10ce..abd9d577a 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -4,9 +4,36 @@ on:
     push:
         branches:
             - master
+        paths-ignore:
+            - '**/*.md'
+            - 'docs/**'
+            - '.plans/**'
+            - '.codex/**'
+            - '.claude/**'
+            - 'apps/website/**'
     pull_request:
         branches:
             - master
+        paths-ignore:
+            - '**/*.md'
+            - 'docs/**'
+            - '.plans/**'
+            - '.codex/**'
+            - '.claude/**'
+            - 'apps/website/**'
+    workflow_dispatch:
+
+# Superseded PR pushes cancel their still-running E2E matrix (the most
+# expensive per-PR runner time). Non-PR runs get a unique group (run_id):
+# GitHub keeps at most one pending run per group even with
+# cancel-in-progress: false, so a shared ref group could silently drop a
+# queued master run between two rapid pushes.
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+permissions:
+    contents: read
 
 jobs:
     electron-e2e-tests:
@@ -22,7 +49,7 @@ jobs:
                 os: [ubuntu-latest, macos-latest, windows-latest]
 
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v7
 
             - name: Install pnpm
               uses: pnpm/action-setup@v4
@@ -60,7 +87,7 @@ jobs:
 
             - name: Upload Electron Test Results
               if: always()
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: playwright-report-electron-${{ matrix.os }}
                   path: |
@@ -76,7 +103,7 @@ jobs:
             NX_SKIP_NX_CACHE: true
 
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v7
 
             - name: Install pnpm
               uses: pnpm/action-setup@v4
@@ -104,7 +131,7 @@ jobs:
 
             - name: Upload Web Test Results
               if: always()
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v7
               with:
                   name: playwright-report-web-ubuntu
                   path: |
diff --git a/.github/workflows/publish-snap.yaml b/.github/workflows/publish-snap.yaml
new file mode 100644
index 000000000..d74213ec2
--- /dev/null
+++ b/.github/workflows/publish-snap.yaml
@@ -0,0 +1,269 @@
+name: Publish Snap after public release
+
+on:
+    release:
+        types:
+            - published
+
+permissions:
+    contents: read
+
+jobs:
+    verify-snap:
+        name: Verify public-release Snap assets
+        if: ${{ startsWith(github.event.release.tag_name, 'v') && github.event.release.draft == false }}
+        runs-on: ubuntu-latest
+        timeout-minutes: 45
+        env:
+            SOURCE_ARCHIVE_NAME: linux-frame-copy-runtime-sources.tar.xz
+        outputs:
+            receipt-sha256: ${{ steps.bind-transfer.outputs.receipt-sha256 }}
+
+        steps:
+            - name: Checkout released tooling
+              uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
+              with:
+                  ref: ${{ github.event.release.tag_name }}
+                  persist-credentials: false
+
+            - name: Install release source verifier
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  sudo apt-get update
+                  sudo apt-get install --no-install-recommends -y \
+                      binutils \
+                      squashfs-tools \
+                      xz-utils
+
+            - name: Select exact public release assets
+              shell: bash
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              run: |
+                  set -euo pipefail
+
+                  gh api \
+                      --paginate \
+                      --slurp \
+                      "repos/${GITHUB_REPOSITORY}/releases/${{ github.event.release.id }}/assets?per_page=100" \
+                      > "${RUNNER_TEMP}/snap-release-assets.json"
+                  node tools/packaging/release-snap-assets.cjs select \
+                      --assets-json "${RUNNER_TEMP}/snap-release-assets.json" \
+                      --output-json "${RUNNER_TEMP}/selected-snap-release-assets.json"
+
+            - name: Download exact public release assets
+              shell: bash
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              run: |
+                  set -euo pipefail
+
+                  ASSET_DIRECTORY="${RUNNER_TEMP}/snap-release-downloads"
+                  rm -rf "${ASSET_DIRECTORY}"
+                  mkdir -p "${ASSET_DIRECTORY}"
+                  node -e \
+                      "const fs=require('node:fs'); const selected=JSON.parse(fs.readFileSync(process.argv[1],'utf8')); for (const asset of [...selected.snapAssets, selected.sourceAsset]) console.log([asset.id, asset.name].join('\\t'));" \
+                      "${RUNNER_TEMP}/selected-snap-release-assets.json" |
+                      while IFS=$'\t' read -r ASSET_ID ASSET_NAME; do
+                          gh api \
+                              --header "Accept: application/octet-stream" \
+                              "repos/${GITHUB_REPOSITORY}/releases/assets/${ASSET_ID}" \
+                              > "${ASSET_DIRECTORY}/${ASSET_NAME}"
+                      done
+
+            - name: Verify downloaded public release assets
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  VERIFIED_ASSET_STAGING="${RUNNER_TEMP}/verified-snap-release-assets"
+                  SEALED_ASSET_PARENT="/var/lib/iptvnator-snap-release"
+                  SEALED_ASSET_DIRECTORY="${SEALED_ASSET_PARENT}/assets"
+                  test -s "${RUNNER_TEMP}/snap-release-downloads/${SOURCE_ARCHIVE_NAME}"
+                  test ! -e "${VERIFIED_ASSET_STAGING}"
+                  sudo test ! -e "${SEALED_ASSET_PARENT}"
+                  node tools/packaging/release-snap-assets.cjs verify \
+                      --manifest "${RUNNER_TEMP}/selected-snap-release-assets.json" \
+                      --directory "${RUNNER_TEMP}/snap-release-downloads" \
+                      --repository-revision "$(git rev-parse HEAD)" \
+                      --verified-directory "${VERIFIED_ASSET_STAGING}"
+                  sudo install -d -m 0700 -o root -g root "${SEALED_ASSET_PARENT}"
+                  sudo mv "${VERIFIED_ASSET_STAGING}" "${SEALED_ASSET_DIRECTORY}"
+                  sudo chown -R root:root "${SEALED_ASSET_DIRECTORY}"
+                  sudo find "${SEALED_ASSET_DIRECTORY}" -type d -exec chmod 0555 {} +
+                  sudo find "${SEALED_ASSET_DIRECTORY}" -type f -exec chmod 0444 {} +
+                  sudo chmod 0555 "${SEALED_ASSET_PARENT}"
+
+            - name: Reverify sealed public release assets
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  VERIFIED_ASSET_DIRECTORY="/var/lib/iptvnator-snap-release/assets"
+                  node tools/packaging/release-snap-assets.cjs verify-sealed \
+                      --manifest "${RUNNER_TEMP}/selected-snap-release-assets.json" \
+                      --directory "${VERIFIED_ASSET_DIRECTORY}" \
+                      --receipt "${VERIFIED_ASSET_DIRECTORY}/verified-release-assets.json" \
+                      --repository-revision "$(git rev-parse HEAD)"
+
+            - name: Bind verified release transfer
+              id: bind-transfer
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  RECEIPT_PATH="/var/lib/iptvnator-snap-release/assets/verified-release-assets.json"
+                  RECEIPT_RECORD="$(/usr/bin/sha256sum --binary "${RECEIPT_PATH}")"
+                  RECEIPT_SHA256="${RECEIPT_RECORD%% *}"
+                  [[ "${RECEIPT_SHA256}" =~ ^[a-f0-9]{64}$ ]]
+                  printf 'receipt-sha256=%s\n' "${RECEIPT_SHA256}" >> "${GITHUB_OUTPUT}"
+
+            - name: Transfer verified release assets
+              uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
+              with:
+                  name: verified-snap-release-assets
+                  path: /var/lib/iptvnator-snap-release/assets
+                  if-no-files-found: error
+                  retention-days: 1
+                  compression-level: 0
+                  include-hidden-files: true
+
+    publish-snap:
+        name: Publish verified public-release Snap to edge
+        needs: verify-snap
+        if: ${{ needs.verify-snap.result == 'success' && startsWith(github.event.release.tag_name, 'v') && github.event.release.draft == false }}
+        runs-on: ubuntu-latest
+        timeout-minutes: 20
+
+        steps:
+            - name: Download verified release assets
+              uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
+              with:
+                  name: verified-snap-release-assets
+                  path: ${{ runner.temp }}/verified-snap-release-assets
+
+            - name: Seal transferred public release assets
+              shell: bash
+              env:
+                  EXPECTED_RECEIPT_SHA256: ${{ needs.verify-snap.outputs.receipt-sha256 }}
+              run: |
+                  set -euo pipefail
+
+                  TRANSFERRED_ASSET_DIRECTORY="${RUNNER_TEMP}/verified-snap-release-assets"
+                  SEALED_ASSET_PARENT="/var/lib/iptvnator-snap-release"
+                  SEALED_ASSET_DIRECTORY="${SEALED_ASSET_PARENT}/assets"
+                  test -d "${TRANSFERRED_ASSET_DIRECTORY}"
+                  test ! -L "${TRANSFERRED_ASSET_DIRECTORY}"
+                  shopt -s nullglob dotglob
+                  TRANSFERRED_FILES=("${TRANSFERRED_ASSET_DIRECTORY}"/*)
+                  TRANSFERRED_SNAPS=("${TRANSFERRED_ASSET_DIRECTORY}"/*.snap)
+                  test "${#TRANSFERRED_SNAPS[@]}" -gt 0
+                  test "${#TRANSFERRED_FILES[@]}" -eq "$(( ${#TRANSFERRED_SNAPS[@]} + 2 ))"
+                  test -f "${TRANSFERRED_ASSET_DIRECTORY}/linux-frame-copy-runtime-sources.tar.xz"
+                  test ! -L "${TRANSFERRED_ASSET_DIRECTORY}/linux-frame-copy-runtime-sources.tar.xz"
+                  test -f "${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"
+                  test ! -L "${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"
+                  for ASSET_FILE in "${TRANSFERRED_FILES[@]}"; do
+                      test -f "${ASSET_FILE}"
+                      test ! -L "${ASSET_FILE}"
+                  done
+                  RECEIPT_PATH="${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"
+                  RECEIPT_RECORD="$(/usr/bin/sha256sum --binary "${RECEIPT_PATH}")"
+                  ACTUAL_RECEIPT_SHA256="${RECEIPT_RECORD%% *}"
+                  [[ "${EXPECTED_RECEIPT_SHA256}" =~ ^[a-f0-9]{64}$ ]]
+                  test "${ACTUAL_RECEIPT_SHA256}" = "${EXPECTED_RECEIPT_SHA256}"
+                  /usr/bin/jq --exit-status '
+                      type == "object" and
+                      (keys == ["assets", "repositoryRevision", "schemaVersion"]) and
+                      (.schemaVersion == 1) and
+                      (.repositoryRevision |
+                          type == "string" and test("^[a-f0-9]{40,64}$")) and
+                      (.assets | type == "array" and length >= 2) and
+                      (.assets | all(.[];
+                          type == "object" and
+                          (keys == ["id", "name", "sha256", "size"]) and
+                          (.id |
+                              type == "number" and . > 0 and
+                              . <= 9007199254740991 and . == floor) and
+                          (.name |
+                              type == "string" and length > 0 and
+                              . != "." and . != ".." and
+                              (contains("/") | not) and
+                              (contains("\\") | not) and
+                              (explode | all(.[]; . > 31 and . != 127))) and
+                          (.sha256 |
+                              type == "string" and test("^[a-f0-9]{64}$")) and
+                          (.size |
+                              type == "number" and . > 0 and
+                              . <= 9007199254740991 and . == floor))) and
+                      ([.assets[].name] | length == (unique | length)) and
+                      ([.assets[] |
+                          select(.name == "linux-frame-copy-runtime-sources.tar.xz")] |
+                          length == 1) and
+                      ([.assets[] | select(.name | endswith(".snap"))] |
+                          length >= 1) and
+                      (.assets | all(.[];
+                          .name == "linux-frame-copy-runtime-sources.tar.xz" or
+                          (.name | endswith(".snap"))))
+                  ' "${RECEIPT_PATH}" > /dev/null
+                  RECEIPT_ASSET_COUNT="$(/usr/bin/jq --raw-output '.assets | length' "${RECEIPT_PATH}")"
+                  test "${RECEIPT_ASSET_COUNT}" -eq "$(( ${#TRANSFERRED_SNAPS[@]} + 1 ))"
+                  SIZE_MANIFEST="${RUNNER_TEMP}/verified-release-asset-sizes.tsv"
+                  CHECKSUM_MANIFEST="${RUNNER_TEMP}/verified-release-asset-checksums.txt"
+                  umask 077
+                  /usr/bin/jq --raw-output \
+                      '.assets[] | [.name, (.size | tostring)] | @tsv' \
+                      "${RECEIPT_PATH}" > "${SIZE_MANIFEST}"
+                  while IFS=$'\t' read -r ASSET_NAME EXPECTED_SIZE; do
+                      ASSET_PATH="${TRANSFERRED_ASSET_DIRECTORY}/${ASSET_NAME}"
+                      ACTUAL_SIZE="$(/usr/bin/stat --format=%s -- "${ASSET_PATH}")"
+                      test "${ACTUAL_SIZE}" = "${EXPECTED_SIZE}"
+                  done < "${SIZE_MANIFEST}"
+                  /usr/bin/jq --raw-output \
+                      '.assets[] | "\(.sha256)  \(.name)"' \
+                      "${RECEIPT_PATH}" > "${CHECKSUM_MANIFEST}"
+                  (
+                      cd "${TRANSFERRED_ASSET_DIRECTORY}"
+                      /usr/bin/sha256sum --strict --check "${CHECKSUM_MANIFEST}"
+                  )
+                  rm -f "${SIZE_MANIFEST}" "${CHECKSUM_MANIFEST}"
+                  shopt -u nullglob dotglob
+                  sudo test ! -e "${SEALED_ASSET_PARENT}"
+                  sudo install -d -m 0700 -o root -g root "${SEALED_ASSET_PARENT}"
+                  sudo mv "${TRANSFERRED_ASSET_DIRECTORY}" "${SEALED_ASSET_DIRECTORY}"
+                  sudo chown -R root:root "${SEALED_ASSET_DIRECTORY}"
+                  sudo find "${SEALED_ASSET_DIRECTORY}" -type d -exec chmod 0555 {} +
+                  sudo find "${SEALED_ASSET_DIRECTORY}" -type f -exec chmod 0444 {} +
+                  sudo chmod 0555 "${SEALED_ASSET_PARENT}"
+
+            - name: Install Snapcraft
+              shell: bash
+              run: |
+                  set -euo pipefail
+
+                  sudo snap install snapcraft --classic --channel=stable
+
+            - name: Publish all public-release snaps to edge
+              shell: bash
+              env:
+                  SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraft_token }}
+              run: |
+                  set -euo pipefail
+
+                  VERIFIED_ASSET_DIRECTORY="/var/lib/iptvnator-snap-release/assets"
+                  STORE_CREDENTIALS="${SNAPCRAFT_STORE_CREDENTIALS}"
+                  unset SNAPCRAFT_STORE_CREDENTIALS
+                  shopt -s nullglob dotglob
+                  SNAP_FILES=("${VERIFIED_ASSET_DIRECTORY}"/*.snap)
+                  test "${#SNAP_FILES[@]}" -gt 0
+                  for SNAP_FILE in "${SNAP_FILES[@]}"; do
+                      SNAP_NAME="${SNAP_FILE##*/}"
+                      echo "Publishing public release asset: ${SNAP_NAME}"
+                      # Candidate/stable promotion is manual after installed-Snap frame-copy and missing-runtime fallback smoke.
+                      # GitHub Actions never promotes automatically.
+                      SNAPCRAFT_STORE_CREDENTIALS="${STORE_CREDENTIALS}" /snap/bin/snapcraft upload --release=edge "${SNAP_FILE}"
+                  done
+                  unset STORE_CREDENTIALS
+                  shopt -u nullglob dotglob
diff --git a/.gitignore b/.gitignore
index ea63467e3..13da340a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,17 @@ Thumbs.db
 .gemini
 .cursor
 .agent
-.claude
+# Agent config stays local, except the skills the repo owns. Claude Code only
+# discovers skills under .claude/skills/, so the release skills are committed
+# there as well as under .codex/skills/. Personal skills in .claude/skills/
+# remain ignored — each shared skill is opted in by name.
+.claude/*
+!.claude/skills/
+.claude/skills/*
+!.claude/skills/release-notes/
+!.claude/skills/release-notes/**
+!.claude/skills/release-cut/
+!.claude/skills/release-cut/**
 .codex/*
 !.codex/skills/
 !.codex/skills/**
@@ -84,4 +94,9 @@ apps/electron-backend/src/app/options/electron-builder.metadata.generated.json
 vendor/embedded-mpv/*/bin/
 vendor/embedded-mpv/*/include/
 vendor/embedded-mpv/*/lib/
+vendor/embedded-mpv/*/notices/
 vendor/embedded-mpv/*/runtime-manifest.json
+
+# MemPalace per-project files (issue #185)
+mempalace.yaml
+entities.json
diff --git a/.plans/2026-07-18-linux-embedded-mpv-frame-copy-packaging.md b/.plans/2026-07-18-linux-embedded-mpv-frame-copy-packaging.md
new file mode 100644
index 000000000..dd616baea
--- /dev/null
+++ b/.plans/2026-07-18-linux-embedded-mpv-frame-copy-packaging.md
@@ -0,0 +1,90 @@
+# Linux Embedded MPV Frame-Copy Packaging Plan
+
+## Audited baseline
+
+- Linux frame-copy already has an isolated `iptvnator_mpv_helper`, a frame
+  reader addon, shared controls, native-view fallback, and runtime capability
+  probes.
+- Existing packaged Linux builds intentionally remove the helper/runtime and
+  retain only system `mpv --wid` native-view.
+- Electron, Electron libraries, `embedded_mpv.node`, and
+  `embedded_mpv_frame_reader.node` must never load or link libmpv. Only the
+  helper may link it.
+- Electron Builder produces AppImage, DEB, RPM, Pacman, Snap, and Flatpak
+  Linux targets. The available reproducible native/runtime toolchain is x64.
+
+## Decisions
+
+1. Support official frame-copy artifacts on Linux x64 only. Keep every non-x64
+   artifact marker-only and fail closed to native-view; never accept an
+   architecture override that injects x64 native files.
+2. Use three isolated packaging profiles:
+   - `system`: DEB/RPM/Pacman use declared distribution libmpv/GL dependencies
+     and contain no private `native/lib`.
+   - `portable`: AppImage/Snap contain a pinned LGPL-compatible shared-library
+     closure with `$ORIGIN`-relative helper loading.
+   - `flatpak`: Flatpak contains the same pinned closure, validated in the
+     exact `/app` runtime context.
+3. Treat the package manifest as necessary but insufficient. Frame-copy is
+   available only after exact manifest/schema/profile checks, executable-mode
+   checks, artifact hashes, dependency-closure/process-isolation checks, and a
+   bounded helper runtime probe. No environment flag bypasses this gate.
+4. Publish exact source archives, recursive source identities, build flags,
+   licenses, notices, patches/tooling, and pinned display data for bundled
+   runtimes. Bind every bundled x64 package manifest to the final compliance
+   archive bytes and released repository revision.
+5. Keep Snap Store credentials isolated from release-tag code on a fresh
+   runner. Store publication is edge-only; candidate/stable promotion remains
+   manual after installed-package smoke.
+
+## TDD implementation phases
+
+1. Add failing tests for target/profile partitioning, x64 and marker-only
+   layouts, exact dependency declarations, RPATH/SONAME rules, executable
+   modes, and Electron/libmpv isolation.
+2. Implement profile-aware build and packaging hooks that stage the helper,
+   frame reader, runtime manifest, private closure where applicable, and legal
+   payload without weakening native-view.
+3. Add failing runtime-policy tests for missing/tampered files, wrong
+   architecture/profile, malformed manifests, loader failures, hostile
+   environments, probe timeout/output bounds, and stable fallback reasons.
+4. Implement one sanitized helper environment shared by probe and playback,
+   including Snap graphics-provider handling and Flatpak runtime paths.
+5. Add failing compliance/release tests for exact recursive submodule records,
+   VCS-free source inventory, archive member/type layout, source checksums,
+   license/notices completeness, package-to-source byte binding, sealed asset
+   receipts, and credential boundaries.
+6. Implement deterministic source generation, package bindings, static Snap
+   inspection, fresh-runner artifact transfer, and minimal direct Store
+   upload.
+7. Add packaged x64 smoke for actual frame-copy playback plus missing-runtime
+   native-view fallback. Run fixture-contract tests before the smoke and allow
+   CI llvmpipe through Chromium's GPU blocklist without bypassing the runtime
+   gate.
+8. Update canonical architecture/maintenance documentation and mirrored
+   `AGENTS.md`/`CLAUDE.md` contracts.
+
+## Acceptance and verification matrix
+
+- Local/macOS:
+  - Nx discovery
+  - packaging and Electron backend unit/integration tests
+  - packaged-smoke fixture tests
+  - affected lint targets
+  - production backend build
+  - formatting, syntax, and `git diff --check`
+- Linux x64 CI:
+  - build the pinned runtime/helper/frame reader
+  - verify helper links/resolves libmpv and Electron/addons do not
+  - extract and statically validate all six package families
+  - run system, portable, Snap-installed, and Flatpak application probes
+  - run packaged frame-copy playback and missing-runtime native-view fallback
+  - regenerate and bind the exact compliance source archive
+- Non-x64 CI:
+  - build selected ARM package targets independently
+  - require marker-only layout and absence of every x64 native/runtime artifact
+- Merge gate:
+  - exact-head CI green
+  - no unresolved review findings
+  - fresh code review clean
+  - no automatic Snap promotion beyond edge
diff --git a/AGENTS.md b/AGENTS.md
index 9937811d5..cdf03a35e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,7 +16,8 @@ This file provides guidance to coding agents working in this repository.
 - Use scoped path aliases from `tsconfig.base.json` such as `@iptvnator/services`, `@iptvnator/shared/interfaces`, and `@iptvnator/ui/components`. Do not add new imports from legacy bare aliases such as `services`, `shared-interfaces`, `components`, `m3u-state`, or `database`.
 - Every Nx project should keep `scope:*`, `domain:*`, and `type:*` tags in `project.json` so `@nx/enforce-module-boundaries` remains useful for humans and agents.
 - See `docs/architecture/nx-workspace-boundaries.md` for the current Nx tag and alias policy.
-- Repository-specific skills are committed under `.codex/skills/`. If an external agent does not support skills, treat those files as concise ownership docs.
+- ESLint enforces `max-lines` on TypeScript files (target under 300, hard maximum 400). Files that predate the rule are baselined in `tools/eslint/max-lines-baseline.mjs`; after splitting a file, regenerate it with `node tools/eslint/generate-max-lines-baseline.mjs`. Never add new files to the baseline — the list must only shrink. A new file that genuinely cannot be split (for example a function serialized into another process) instead carries its own file-wide `/* eslint-disable max-lines -- <why> */`; the generator skips those files, so a justified exemption never lands in the baseline.
+- Repository-specific skills are committed under `.codex/skills/`. Claude Code only discovers skills under `.claude/skills/`, so `release-notes` and `release-cut` are mirrored there and the two copies must be kept in sync; every other entry in `.claude/skills/` is personal and stays gitignored. If an external agent does not support skills, treat those files as concise ownership docs.
 
 ## Documentation After Changes
 
@@ -33,6 +34,18 @@ This file provides guidance to coding agents working in this repository.
 - Repo docs are canonical even when they were originally drafted by an LLM.
 - Final task summaries should state whether docs were updated and which doc changed.
 
+## Release Notes For User-Visible Changes
+
+- Any change a user could notice — new behavior, changed behavior, bug fix, performance win, breaking change — must add one note file under `.changes/` in the same PR. Format, field table, and writing rules: `.changes/README.md`.
+- Name it `<area>-<short-slug>.md`; `area` matches the conventional-commit scope. There is no version field — the release version is chosen at release time.
+- Write the body for a user, not a reviewer: "the player now remembers volume between episodes", not "hoist volume state into the session". Max 400 characters; depth belongs in the release blog post.
+- Skip the note for test-only changes, docs, CI/workflow plumbing, and pure refactors with no behavior change. When skipping on a PR that touches `apps/**` or `libs/**`, apply the `no-release-note` label.
+- CI enforces this: the "Release note gate" job in `.github/workflows/ci.yml` fails PRs that change runtime code without an added `.changes/*.md` or the label (policy in `tools/release/check-release-note-gate.mjs`; tests/e2e/website/mock-server/docs paths are auto-exempt).
+- The `release-notes` skill covers writing notes; the `release-cut` skill covers the full release sequence.
+- Validate before finishing: `pnpm run release:notes:validate`.
+- Release-post screenshots come only from the release capture script running against the mock servers. Never add a screenshot taken from a real playlist or account to `apps/website/public/blog/**` — real streams, logos, and metadata are copyrighted, and credentials must never reach a published image.
+- Final task summaries should state whether a release note was added or why it was skipped.
+
 ## Regression Prevention And Test Updates
 
 - Before the final summary for any feature, behavior change, bug fix, data-flow change, Electron IPC/database change, or user-visible UI workflow change, complete a test impact pass. Identify the affected projects and decide whether unit, integration, E2E, build, lint, or manual/CDP verification is required.
@@ -70,14 +83,14 @@ IPTVNATOR_TRACE_STARTUP=1 nx serve electron-backend
     - `IPTVNATOR_TRACE_DB=1` traces DB worker requests and request-scoped DB events
     - `IPTVNATOR_TRACE_SQL=1` traces SQLite statements in the main process and DB worker
     - `IPTVNATOR_TRACE_WINDOW=1` traces BrowserWindow lifecycle and unresponsive events
-    - `IPTVNATOR_TRACE_PLAYER=1` traces external-player launch/reuse/polling debug output
+    - `IPTVNATOR_TRACE_PLAYER=1` traces external-player activity and bounded Embedded MPV runtime-probe stderr
     - `IPTVNATOR_TRACE_RENDERER_CONSOLE=1` mirrors renderer console output into the Electron terminal
+    - `IPTVNATOR_PERF_CAPTURE=1` enables development/test-only, redacted preload IPC request/completion markers plus count-only M3U acquire/parse/normalize and renderer store phase capture; renderer wrappers emit only while the benchmark installs its Symbol hook, benchmark tooling sets the flag explicitly, and production launches must leave it unset
+    - `IPTVNATOR_PERF_WORKER_PROFILING=1` enables development/test-only, request-scoped worker receive/work/response-post timestamps, thread CPU, event-loop utilization/delay, count-only playlist serialization/SQLite write/read/deserialization phase events, valid-sample-counted isolate peak memory, and the database worker's idle-only one-shot post-GC heap probe; overlapping database requests are explicitly invalidated instead of misattributed, the performance benchmark sets the flag automatically, and production launches must leave it unset
 
-- GPU/compositor debugging:
-
-```bash
-IPTVNATOR_DISABLE_HARDWARE_ACCELERATION=1 nx serve electron-backend
-```
+- Settings, portal request/response, and trace payloads must use
+  `@iptvnator/shared/logging` or the redacting portal logger before reaching
+  `console.*`; never log raw credentials while debugging.
 
 - If local Nx state gets weird before a rerun:
 
@@ -128,6 +141,268 @@ Key files:
 - `libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.html` — template conditionals for radio vs video
 - `libs/shared/interfaces/src/lib/channel.interface.ts` — `radio: string` field on Channel interface
 
+## Shared Player Controls
+
+- `libs/ui/playback/src/lib/player-controls/` contains the additive,
+  engine-neutral `PlayerController` contract, standalone
+  `app-player-controls`, generic web-video adapter/helper, and component-scoped
+  `WEB_PLAYER_SHARED_CONTROLS` rollout token.
+- In fullscreen, `app-player-controls` shows a pointer-transparent media-title
+  overlay at the top while controls are revealed (`mediaTitle` input:
+  movie/channel/series name, plus an `S01E03` second line for episodes). Series
+  names flow from the Xtream/Stalker detail views through
+  `PortalInlinePlayerComponent.seriesTitle` and `WebPlayerViewComponent.mediaTitle`;
+  movie and live hosts fall back to `playback.title`, skipping raw stream-URL
+  fallbacks. Outside fullscreen the overlay stays hidden.
+- Persisted `Settings.webPlayerSharedControls` is default-off, and its checkbox
+  appears only when HTML5, Video.js, or ArtPlayer is selected.
+  `WebPlayerViewComponent` snapshots the preference into
+  `WEB_PLAYER_SHARED_CONTROLS` for each new player host. The parent `/workspace`
+  route awaits the initial `SettingsStore` load, including cold-start direct
+  links, before this snapshot can occur. Saving applies to the next host without
+  an application restart; an existing session never changes controls mode in
+  place.
+- `Settings.showCaptions` is deliberately outside this rollout gate: it is
+  engine state, not controls UI. HTML5, Video.js, and ArtPlayer apply it in both
+  modes — shared controls through their controls bridge, the preference-off
+  paths through the same helpers without an adapter (`WebVideoSourceTracks` for
+  HTML5/ArtPlayer, `VjsLegacyTracks` for Video.js). Both re-apply the preference
+  as the engine adds or switches text tracks. `WebPlayerViewComponent` reads it
+  from `SettingsStore` rather than a host input, so the M3U player, the
+  Xtream/Stalker live layouts, and the portal detail inline player all inherit
+  it (#1155).
+- The modes differ in how long the preference is enforced. Shared controls are
+  authoritative for the session; user intent arrives through `setSubtitleTrack`
+  and wins until the source changes. Vendor chrome is source-default: the
+  preference seeds each new source and is released once the media element
+  reports `playing`, so the engine's own caption menu keeps working. The mode is
+  selected by the optional `playbackStarted` probe the legacy owners pass to all
+  three helpers (HLS, native text tracks, Shaka); in that mode the HLS helper
+  deselects the track (`subtitleTrack = -1`) instead of hiding it, because
+  `subtitleDisplay` would silently override whatever the vendor menu picks. For
+  DASH the seed happens in `ShakaVideoSession.start()` after the manifest loads,
+  so the helper only stops re-suppressing afterwards.
+- Embedded MPV ignores the web-player preference. Frame-copy always uses shared
+  DOM controls through its component-scoped `EmbeddedMpvControlsAdapter`, while
+  native-view retains the legacy compositor-safe dock and external MPV/VLC
+  retain their own UI. The host must render exactly one controls system for the
+  reported Embedded MPV engine.
+- Frame-copy shared controls own DOM surface interactions, shortcuts,
+  fullscreen, and recording feedback. `showControls=false` detaches the shared
+  surface, modal overlays gate playback shortcuts, fullscreen still triggers
+  bounds sync, and a playback/session transition key prevents engine or session
+  handoff from presenting stale recording feedback while timers and pending
+  commands are cancelled. Same-session IPC replies also yield to a broadcast
+  snapshot received while the command was pending, preventing a successful
+  recording acknowledgement from being rolled back by a stale reply.
+- DASH (`.mpd`) sources play through a lazily imported Shaka Player source
+  engine (`libs/ui/playback/src/lib/shaka-engine/`) inside the HTML5 and
+  ArtPlayer components; ClearKey keys come from KODIPROP-derived
+  `Channel.drm`, and the shared bridge exposes Shaka audio/text tracks via
+  source kind `shaka`. See the CLAUDE.md "Video Players" feature entry and
+  `docs/architecture/m3u-playlist-module.md` ("DASH + ClearKey Playback").
+- The built-in HTML5/hls.js player is the second guarded consumer.
+  `HtmlVideoPlayerComponent` provides a component-scoped
+  `WebVideoControlsAdapter`; its neutral `web-video-support` bridge is shared
+  with ArtPlayer and owns HLS/Shaka(DASH)/native tracks, MPEG-TS VOD duration correction,
+  caption preference, and source cleanup.
+  `HtmlVideoElementSession` owns native video-event lifecycle, persisted
+  volume, start-time/time/ended propagation, and legacy post-play caption
+  suppression.
+  `WebPlayerViewComponent.resolvedIsLive` supplies authoritative live/VOD
+  metadata, while a visible playback diagnostic disables both shared surface
+  interaction and shortcuts and exits the HTML5 shell's own fullscreen so the
+  diagnostic actions remain visible. The preference-off path keeps native
+  controls and legacy series navigation unchanged.
+- Video.js is the third guarded consumer. `VjsPlayerComponent` provides a
+  component-scoped `WebVideoControlsAdapter`; its bridge binds the current Tech
+  video, rebinds after `playerreset`, exposes source-stable audio/subtitle IDs,
+  preserves caption preference and explicit subtitle-off state, and reads
+  duration from Video.js. Reset-driven raw MPEG-TS changes pause first,
+  coalesce to the latest desired source, preserve actual volume across
+  Video.js's reset, and restart when authoritative live/VOD metadata changes.
+  The shared-controls path disables native controls, Video.js
+  click/double-click/hotkey actions, and spatial navigation;
+  diagnostic gating and owned-fullscreen exit match HTML5. The preference-off
+  path keeps the existing Video.js skin and legacy series navigation unchanged.
+- ArtPlayer is the fourth guarded consumer. `ArtPlayerComponent` provides a
+  component-scoped `WebVideoControlsAdapter`; `ArtPlayerSourceSession` owns
+  HLS/DASH(Shaka)/MPEG-TS/native sources, the neutral web-video bridge, exact cleanup, and
+  a destroyed-session guard for delayed `customType` callbacks, while
+  `ArtPlayerVideoSession` owns native media/ArtPlayer events. Shared mode uses
+  authoritative live/VOD metadata, HLS/Shaka/native tracks and caption preference,
+  MPEG-TS VOD duration correction, and reapplies app volume directly after
+  ArtPlayer restores its own stored volume. Vendor chrome/hotkeys are disabled,
+  and a transparent capture layer gives shared controls exclusive click and
+  double-click ownership. Diagnostic interaction gating and owned-fullscreen
+  exit match the other web players. The preference-off path keeps the legacy
+  ArtPlayer skin, source behavior, and series navigation unchanged.
+- Shared web picture-in-picture stays inside that default-off rollout.
+  `PlayerController` exposes capability `pictureInPicture`, state
+  `pictureInPictureActive`/`canPictureInPicture`, and command
+  `togglePictureInPicture()`. HTML5, Video.js, and ArtPlayer use standard
+  element PiP from the adapter's attached video; shared ArtPlayer keeps vendor
+  `pip: false`, while preference-off native/vendor paths remain unchanged. The
+  capability-gated button sits before fullscreen and uses active enter/exit
+  semantics; entry is disabled until metadata, and the action is disabled while
+  an operation is pending. Embedded MPV reports capability/state false with a
+  no-op command and has no popup/mini-window.
+- `WebVideoControlsAdapter` supplies its current video and binding generation to
+  `WebVideoPictureInPictureController`; the controller reads the video's
+  `ownerDocument`, while browser enter/leave events remain authoritative.
+  Exact-owner exit stays available if request support changes. Request/exit
+  invocation remains synchronous for user activation, one operation is
+  serialized, and binding generation plus exact video identity protects
+  replacement and teardown from stale completion. Video.js Tech reset and
+  ArtPlayer rebuild rebind with exact-owner cleanup; HTML5 source changes on a
+  retained target preserve PiP.
+  Standard PiP shows the browser/OS video surface without Angular control
+  chrome, with browser-dependent subtitles. AirPlay, Cast, Document PiP, a PiP
+  keyboard shortcut, and Embedded MPV popup/native support are out of scope.
+- Canonical docs: `docs/architecture/player-controls-contract.md` and
+  `docs/architecture/embedded-mpv-native.md`
+
+## Linux Embedded MPV Packaging
+
+- Official Linux frame-copy artifacts are x64-only. AppImage, DEB, RPM,
+  Pacman, Snap, and Flatpak are supported; non-x64 Linux packages must remain
+  marker-only and must never inherit x64 native artifacts from environment
+  overrides.
+- Packaging runs three isolated profiles:
+    - `system`: DEB/RPM/Pacman, no private `native/lib`, with package
+      dependencies DEB=`libmpv2,libegl1,libgl1,libgbm1`,
+      RPM=`mpv-libs,libglvnd-egl,libglvnd-glx,mesa-libgbm`, and
+      Pacman=`mpv,libglvnd,mesa`
+    - `portable`: AppImage/Snap with the pinned LGPL-compatible closure
+    - `flatpak`: Flatpak with the same pinned closure
+- Flatpak is an isolated packaging pass and keeps `iptvnator` as the real
+  Electron ELF so Electron Builder's `electron-wrapper` passes it directly to
+  Zypak. Other Linux targets retain the conditional `iptvnator` wrapper and
+  `iptvnator.bin`. Mixed Flatpak/non-Flatpak target sets fail before mutation.
+- The DEB system-runtime contract is Ubuntu 24.04+ (`libmpv2`). Ubuntu 22.04
+  provides `libmpv1`, so use the x64 AppImage on Jammy instead of weakening the
+  package dependency or advertising frame-copy without a compatible runtime.
+- Only `iptvnator_mpv_helper` may link libmpv. The Electron executable,
+  Electron libraries, `embedded_mpv.node`, and
+  `embedded_mpv_frame_reader.node` must not load or link it. Preserve this
+  process-isolation contract in build, package, and smoke checks.
+- `electron-backend/native{,/**/*}` is excluded from `app.asar`; `afterPack`
+  exclusively writes the profile-normalized unpacked native tree. Layout and
+  final-artifact checks must reject every archived
+  `/electron-backend/native/**` entry so system and marker-only packages cannot
+  hide stale x64 artifacts.
+- Packaged addon, frame-reader, and helper discovery is package-owned
+  `app.asar.unpacked` only. Writable cwd/dist candidates are development-only
+  and must never satisfy packaged native-view support or the frame-copy gate.
+- Pristine afterPack/unpacked layouts scan Electron libraries recursively.
+  Extracted Snap payloads exclude only the package-manager `lib/**` and
+  `usr/lib/**` trees that Snap overlays into the same root; every other
+  directory remains recursive, and Electron-library symlinks still fail
+  closed.
+- Linux frame-copy availability is fail-closed. The packaged manifest,
+  artifact modes, declared bundled hashes/closure, and bounded
+  `--runtime-probe` must all succeed before frame-copy can relax the renderer
+  sandbox. Any failure reports a stable reason and falls back to native-view
+  without crashing; an environment flag never bypasses this gate.
+- Snap is `core22`/strict and uses an exact private `shared-memory` plug plus
+  the `graphics-core22` content plug at an empty mode-0755 `$SNAP/graphics`,
+  with `mesa-core22` as default provider. It declares only the canonical
+  provider layouts: `/usr/share/libdrm` binds from
+  `$SNAP/graphics/libdrm`, and `/usr/share/drirc.d` symlinks to
+  `$SNAP/graphics/drirc.d`. The provider is external shared content, not part
+  of IPTVnator's package size, source archive, or notices. Installed-Snap CI
+  must prove controlled unavailable exit after disconnect, then reconnect and
+  prove success. The helper links `libGL.so.1` rather than `libOpenGL.so.0`.
+- The probe and playback helper share one sanitized loader environment:
+  ambient audit, preload, library, graphics-driver, and shell-startup overrides
+  are removed; the validated private closure wins; trusted Snap GL,
+  `graphics-core22`, the core22 base x64 root, and exact GNOME-platform roots
+  precede generic in-snap roots. The core22 base must precede GNOME so its
+  `libedit.so.2` cannot be replaced by the older copy requiring
+  `libtinfo.so.5`. The extracted-artifact verifier removes the identical
+  unsafe loader/graphics/shell set before direct helper smoke while preserving
+  feature/debug selectors such as `LIBGL_ALWAYS_SOFTWARE`. Snap fixes the
+  wrapper `PATH`, removes exported `BASH_FUNC_*` functions, and launches
+  probe/playback through the regular executable
+  `$SNAP/graphics/bin/graphics-core22-provider-wrapper`; a missing or
+  disconnected provider returns `snap-graphics-provider-unavailable` before
+  helper spawn. The packaging-only `--embedded-mpv-runtime-probe` app switch
+  runs the complete cached manifest/hash/helper gate before BrowserWindow
+  startup and exits with one availability JSON line. A nonzero helper exit
+  keeps top-level reason `helper-probe-failed`; `helperReason` is present only
+  for an exact protocol-v1 line carrying a fixed allowlisted reason, and its
+  optional `helperDetail` must be 1–1024 printable ASCII characters. Invalid
+  detail suppresses both helper fields. Every probe uses an explicit 16 MiB
+  aggregate captured-output ceiling independent of tracing. With
+  `IPTVNATOR_TRACE_PLAYER=1`, a non-empty helper stderr capture is emitted
+  separately as one JSON-escaped stderr line whose `stderr` field is limited
+  to 16,384 characters and whose `truncated` field is always explicit;
+  trace-write failure cannot change the capability result. Installed-Snap CI
+  enables Mesa EGL/GL diagnostics through this bounded channel. Any loader
+  failure remains a stable native-view fallback, never a flag-enabled success.
+- In the exact packaged Flatpak `/app` context, reconstruct only Freedesktop
+  Platform 24.08's immutable `__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS`; its GL
+  extension loader path comes from the sandbox cache. Flatpak CI must invoke
+  the application-level `--embedded-mpv-runtime-probe`, not a direct helper
+  probe that bypasses capability detection.
+- The packaged x64 Playwright smoke runs its fixture-contract target first and
+  passes Chromium `--ignore-gpu-blocklist` so CI llvmpipe can expose WebGL2.
+  This launch-only flag does not bypass the manifest, hash, loader, or helper
+  capability gate; `--no-sandbox` remains root-only.
+- Bundled Linux releases must publish the exact source archives/git records,
+  checksums, licenses, flags, patches, build scripts, and the pinned hwdata
+  `pnp.ids` input. Each bundled package carries
+  `embedded-mpv-notices.json`, `THIRD_PARTY_NOTICES.txt`, and the exact
+  `licenses/**` files. CI may cache immutable source inputs, but regenerates
+  notices and a VCS-metadata-free
+  `linux-frame-copy-runtime-sources.tar.xz` for the current checkout on every
+  run while retaining the exact pinned six recursive libplacebo submodule
+  records. Each record is canonical `full-commit safe/path`; clone-depth
+  dependent `git describe` annotations are discarded and never form part of
+  the provenance identity. Its source index carries the globally sorted libplacebo
+  directory/file/symlink inventory; file hashes, sizes, executable bits, link
+  targets, aggregates, and canonical tree digest must match the trusted pinned
+  checkout. The archive has an exact member/type layout and its
+  `metadata/archive-sha256.txt` records must match the actual source archives.
+  Concatenated tar/xz streams are inspected past every end marker. The final
+  archive's SHA-256 and repository revision are copied into every bundled x64
+  package manifest; system and marker-only packages carry no source-archive
+  binding.
+  Automated Snap Store publication is allowed only after a public `v*` GitHub
+  release contains both the Snap assets and exactly one matching source
+  archive. Before any upload, the workflow hashes and inspects that archive,
+  verifies its exact member/type set and size bounds, clean tag revision,
+  pinned sources including the six recursive submodule records and exact
+  libplacebo tree digest, legal files, and exact released tooling, then
+  performs bounded extraction and static package validation for every Snap.
+  That public-release boundary independently revalidates the exact strict
+  `meta/snap.yaml` graphics/shared-memory contract and enumerates
+  `resources/app.asar`, rejecting any archived
+  `electron-backend/native/**` payload before publication. Its bounded ASAR
+  header reader uses only Node built-ins and released local tooling, so the
+  clean tag checkout does not require `node_modules`.
+  Exactly one x64 Snap must have matching
+  `sourceArchive` and `sourceRuntime`; any non-x64 Snap must remain
+  marker-only. Checkout and the artifact-transfer actions are pinned to full
+  commits; checkout does not persist credentials, and repository credentials
+  are limited to download steps. A secretless verification job copies assets
+  through no-follow descriptors, checks pre/post hashes, writes an exact
+  receipt, repeats the complete source/package verification on a root-owned
+  read-only snapshot, and transfers only that data through the pinned artifact
+  service while its receipt digest travels separately through a job output.
+  The dependent publish job runs on a bounded `ubuntu-latest` runner with no
+  checkout or release-tag code, verifies that digest plus the exact receipt,
+  asset hashes, and file-only layout, root-seals the data again, and installs
+  Snapcraft directly. Store credentials exist only in its final fixed shell
+  step, which resolves no PATH command, executes no released code, and exposes
+  the credential only to each exact
+  `/snap/bin/snapcraft upload --release=edge` process.
+  Candidate/stable promotion is manual after installed-Snap frame-copy and
+  missing-runtime fallback smoke; GitHub Actions never promotes automatically.
+  Canonical maintenance docs:
+  `docs/architecture/embedded-mpv-native.md` and
+  `tools/embedded-mpv/README.md`.
+
 ## Repo Skills
 
 - `iptvnator-ui-design`
@@ -150,6 +425,11 @@ Key files:
   Use when moving heavy database work off the main thread, adding worker-backed SQLite operations, or wiring loading/progress UI for Xtream and playlist DB flows.
   File: `.codex/skills/iptvnator-sqlite-db-worker/SKILL.md`
 
+- `stalker-portal`
+  Repository-specific guidance for Stalker/Ministra catalogs, all three VOD/series modes, cross-surface `is_series` behavior, playback metadata, collections, EPG, and remote control.
+  Use when changing Stalker routes, stores, detail views, playback, favorites/recent activity, EPG, or remote control.
+  File: `.codex/skills/stalker-portal/SKILL.md`
+
 - `xtream-electron`
   Repository-specific guidance for IPTVnator's Electron-first Xtream implementation, including feature/data-access boundaries, worker-backed DB flows, and Xtream loading/progress UX expectations.
   Use when working on Xtream routes, store/data-source logic, or Electron-backed Xtream import/search/delete behavior.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42aacde10..854fbf7e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# Changelog
+
+Releases **0.13.0 – 0.23.0** were published as
+[GitHub releases](https://github.com/4gray/iptvnator/releases) and
+[website posts](https://4gray.github.io/iptvnator/blog/) rather than collected
+here. This file resumes from the next release onwards; the entries below are
+kept as they were written.
+
+New sections are generated from `.changes/*.md` and inserted directly below
+this marker — see `.changes/README.md`.
+
+<!-- next-release -->
+
 # [0.12.0](https://github.com/4gray/iptvnator/compare/v0.11.1...v0.12.0) (2023-03-11)
 
 
diff --git a/CLAUDE.md b/CLAUDE.md
index f2a10f93d..223d8db5d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -26,6 +26,18 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - Repo docs are canonical even when they were originally drafted by an LLM.
 - Final task summaries should state whether docs were updated and which doc changed.
 
+## Release Notes For User-Visible Changes
+
+- Any change a user could notice — new behavior, changed behavior, bug fix, performance win, breaking change — must add one note file under `.changes/` in the same PR. Format, field table, and writing rules: `.changes/README.md`.
+- Name it `<area>-<short-slug>.md`; `area` matches the conventional-commit scope. There is no version field — the release version is chosen at release time.
+- Write the body for a user, not a reviewer: "the player now remembers volume between episodes", not "hoist volume state into the session". Max 400 characters; depth belongs in the release blog post.
+- Skip the note for test-only changes, docs, CI/workflow plumbing, and pure refactors with no behavior change. When skipping on a PR that touches `apps/**` or `libs/**`, apply the `no-release-note` label.
+- CI enforces this: the "Release note gate" job in `.github/workflows/ci.yml` fails PRs that change runtime code without an added `.changes/*.md` or the label (policy in `tools/release/check-release-note-gate.mjs`; tests/e2e/website/mock-server/docs paths are auto-exempt).
+- The `release-notes` skill covers writing notes; the `release-cut` skill covers the full release sequence.
+- Validate before finishing: `pnpm run release:notes:validate`.
+- Release-post screenshots come only from the release capture script running against the mock servers. Never add a screenshot taken from a real playlist or account to `apps/website/public/blog/**` — real streams, logos, and metadata are copyrighted, and credentials must never reach a published image.
+- Final task summaries should state whether a release note was added or why it was skipped.
+
 ## Regression Prevention And Test Updates
 
 - Before the final summary for any feature, behavior change, bug fix, data-flow change, Electron IPC/database change, or user-visible UI workflow change, Claude Code must complete a test impact pass. Identify the affected projects and decide whether unit, integration, E2E, build, lint, or manual/CDP verification is required.
@@ -59,7 +71,7 @@ pnpm nx show projects
 - Do not add new imports from legacy bare aliases such as `services`, `shared-interfaces`, `components`, `m3u-state`, or `database`.
 - Every Nx project should keep `scope:*`, `domain:*`, and `type:*` tags in `project.json`.
 - See `docs/architecture/nx-workspace-boundaries.md` for the current Nx tag and alias policy.
-- Repository-specific skills are committed under `.codex/skills/`. If Claude Code does not load skills directly, treat those files as concise ownership docs.
+- Repository-specific skills are committed under `.codex/skills/`. Claude Code only discovers skills under `.claude/skills/`, so `release-notes` and `release-cut` are mirrored there and the two copies must be kept in sync; every other entry in `.claude/skills/` is personal and stays gitignored. If an agent does not load skills directly, treat those files as concise ownership docs.
 
 ### Building and Serving
 
@@ -127,14 +139,14 @@ Useful narrower flags:
 - `IPTVNATOR_TRACE_DB=1` traces DB worker requests and DB progress events
 - `IPTVNATOR_TRACE_SQL=1` traces SQLite statements in both main and worker connections
 - `IPTVNATOR_TRACE_WINDOW=1` traces BrowserWindow navigation/load lifecycle
-- `IPTVNATOR_TRACE_PLAYER=1` traces external-player launch/reuse/polling debug output
+- `IPTVNATOR_TRACE_PLAYER=1` traces external-player activity and bounded Embedded MPV runtime-probe stderr
 - `IPTVNATOR_TRACE_RENDERER_CONSOLE=1` mirrors renderer console logs into the Electron terminal
+- `IPTVNATOR_PERF_CAPTURE=1` enables development/test-only, redacted preload IPC request/completion markers plus count-only M3U acquire/parse/normalize and renderer store phase capture; renderer wrappers emit only while the benchmark installs its Symbol hook, benchmark tooling sets the flag explicitly, and production launches must leave it unset
+- `IPTVNATOR_PERF_WORKER_PROFILING=1` enables development/test-only, request-scoped worker receive/work/response-post timestamps, thread CPU, event-loop utilization/delay, count-only playlist serialization/SQLite write/read/deserialization phase events, valid-sample-counted isolate peak memory, and the database worker's idle-only one-shot post-GC heap probe; overlapping database requests are explicitly invalidated instead of misattributed, the performance benchmark sets the flag automatically, and production launches must leave it unset
 
-For GPU/compositor debugging:
-
-```bash
-IPTVNATOR_DISABLE_HARDWARE_ACCELERATION=1 nx serve electron-backend
-```
+Settings, portal request/response, and trace payloads must use
+`@iptvnator/shared/logging` or the redacting portal logger before reaching
+`console.*`; never log raw credentials while debugging.
 
 If the Nx daemon gets into a bad state before rerunning Electron:
 
@@ -195,7 +207,7 @@ Before finishing behavior changes or bug fixes, follow `Regression Prevention An
 ### Linting
 
 ```bash
-# Lint all projects (what CI enforces on every PR)
+# Lint all projects (CI runs this on master; PRs lint affected projects)
 pnpm run lint
 
 # Lint a single project
@@ -203,12 +215,17 @@ nx lint web
 nx lint electron-backend
 ```
 
-CI runs lint for every project (`.github/workflows/ci.yml`). This enforces the
+CI lints affected projects on PRs (`nx affected`) and every project on master
+pushes (`.github/workflows/ci.yml`). This enforces the
 Nx module-boundary tags, the legacy bare-alias ban, and a `max-lines` ESLint
 rule (hard maximum 400 lines per TypeScript file). Pre-existing oversized files
 are baselined in `tools/eslint/max-lines-baseline.mjs`; regenerate the baseline
 with `node tools/eslint/generate-max-lines-baseline.mjs` after splitting a file.
-Never add new files to the baseline.
+Never add new files to the baseline — the list must only shrink. A new file
+that genuinely cannot be split (for example a function serialized into another
+process) instead carries its own file-wide
+`/* eslint-disable max-lines -- <why> */`; the generator skips those files, so
+a justified exemption never lands in the baseline.
 
 Project `lint` targets that shell out to eslint must quote the glob, e.g.
 `eslint "apps/<project>/**/*.ts"`. An unquoted `**` is expanded by the POSIX
@@ -244,8 +261,10 @@ This is an Nx monorepo with the following structure:
     - **portal/shared/{data-access,ui,util}** - Cross-portal shared code
     - **services** - Abstract DataService contract and shared app services (incl. the TMDB metadata enrichment module in `lib/tmdb/`)
     - **shared/interfaces** - TypeScript interfaces and types (incl. `ElectronBridgeApi`)
+    - **shared/logging** - Dependency-free structured redaction for diagnostic logs
     - **shared/database** - Canonical Drizzle schema and DB connection (used by the Electron backend)
     - **shared/m3u-utils** - M3U playlist utilities
+    - **shared/marketing-fixtures** - Provider-neutral fictional movie metadata shared by the Xtream and Stalker marketing mocks
     - **shared/testing** - Shared test helpers
     - **ui/components** - Reusable UI components (incl. channel list)
     - **ui/epg** - EPG UI (timeline ribbon, multi-EPG, progress panel, program dialogs)
@@ -345,10 +364,11 @@ Key patterns:
 - **Factory injection**: `provideXtreamDataSource()` selects Electron or PWA implementation at runtime
 
 Data strategies by environment:
-| Environment | Strategy |
-|-------------|----------|
+
+| Environment  | Strategy                                                |
+| ------------ | ------------------------------------------------------- |
 | **Electron** | DB-first: Check DB → fetch API if missing → cache to DB |
-| **PWA** | API-only: Always fetch from API, store in memory |
+| **PWA**      | API-only: Always fetch from API, store in memory        |
 
 **M3U Playlist Module Architecture**:
 
@@ -424,7 +444,7 @@ State management via NgRx (`libs/m3u-state/`):
 - `PlaylistActions`: loadPlaylists, addPlaylist, removePlaylist, parsePlaylist
 - `ChannelActions`: setChannels, setActiveChannel, setAdjacentChannelAsActive
 - `EpgActions`: setActiveEpgProgram, setCurrentEpgProgram, setEpgAvailableFlag
-- `FavoritesActions`: updateFavorites, setFavorites
+- `FavoritesActions`: updateFavorites, setFavorites, hydrateFavorites
 
 See `docs/architecture/m3u-playlist-module.md` for complete documentation.
 
@@ -579,6 +599,7 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
     - `favorites` - User favorites
     - `recentlyViewed` - Watch history
     - `epgChannels`, `epgPrograms` - Persisted EPG data
+    - `epgChannelMappings` (`epg_channel_mappings`) - Manual EPG channel mappings (defined in `epg-mapping.schema.ts`, re-exported by `schema.ts`)
     - `playbackPositions` - Resume positions
     - `downloads` - Download manager state
     - `appState` - Key-value app state (also tracks one-off data migrations)
@@ -597,7 +618,7 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
 - **Event handlers**: `apps/electron-backend/src/app/events/`
     - `database.events.ts` - Database CRUD operations
     - `playlist.events.ts` - Playlist import/update
-    - `epg.events.ts` - EPG IPC registration and freshness/fetch orchestration; worker lifecycle lives in `epg-worker.service.ts`, DB lookups in `epg-query.service.ts`
+    - `epg.events.ts` - EPG IPC registration; freshness/fetch orchestration lives in `epg-fetch.service.ts`, manual channel-mapping resolution and CRUD in `epg-mapping.service.ts`, worker lifecycle in `epg-worker.service.ts`, DB lookups in `epg-query.service.ts`
     - `xtream.events.ts` - Xtream Codes API
     - `stalker.events.ts` - Stalker portal API
     - `player.events.ts` - External player IPC registration; MPV/VLC lifecycle logic lives in `mpv-session.service.ts`, `vlc-session.service.ts`, and shared `external-player-*` helpers
@@ -608,7 +629,7 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
 
 - EPG parsing: `epg-parser.worker.ts`; main-process worker lifecycle is coordinated from `apps/electron-backend/src/app/events/epg-worker.service.ts`
 - Non-EPG SQLite work: `database.worker.ts` (see `docs/architecture/sqlite-db-worker.md`)
-- Playlist refresh: `playlist-refresh.worker.ts`
+- Playlist refresh: `playlist-refresh.worker.ts`; explicit cancellation is main-process-owned and terminates the one-shot worker before acknowledging `PLAYLIST_CANCEL_REFRESH` (see `docs/architecture/m3u-playlist-module.md`)
 
 ### Key Features
 
@@ -620,16 +641,186 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
 
 **Video Players**:
 
-- Built-in HTML5 player with HLS.js or Video.js
+- Built-in web players: HTML5+hls.js, Video.js, and ArtPlayer
+- DASH + ClearKey (M3U module): `.mpd` channels play through a lazily loaded
+  Shaka Player source engine inside the HTML5 and ArtPlayer components (no new
+  player in settings). ClearKey keys come from `#KODIPROP:inputstream.adaptive.*`
+  lines, post-processed into `Channel.drm` by `extractDrmFromRaw()` in
+  `libs/shared/m3u-utils` (hooked in `createPlaylistObject()`, covering all
+  import paths). DASH channels always play inline: `isDashChannel()` bypasses
+  the external-player setting (radio precedent) and routes Video.js/MPV/VLC/
+  embedded-MPV users to the HTML5 player via `playerOverride` (ArtPlayer keeps
+  ArtPlayer). Unsupported license types (Widevine/PlayReady — out of scope,
+  need the castLabs Electron fork) surface a DRM playback diagnostic instead
+  of crashing. ClearKey EME works in stock Electron. Engine:
+  `libs/ui/playback/src/lib/shaka-engine/`; details in
+  `docs/architecture/m3u-playlist-module.md` ("DASH + ClearKey Playback").
 - External players: MPV, VLC (via IPC to Electron backend)
-- Embedded MPV (experimental, macOS/Windows/Linux): renders mpv video inside the Electron window through a native addon. macOS uses the libmpv render API in an `NSOpenGLView`; Windows uses in-process libmpv with `--wid` against an app-owned child `HWND`; Linux spawns an out-of-process `mpv --wid=<x11-window>` controlled over a JSON IPC socket (X11/XWayland only, requires system `mpv` on PATH; subtitles/speed/aspect/recording are not exported there). mpv's own screensaver inhibition does not apply to any of these paths, so `EmbeddedMpvNativeService` holds an Electron `powerSaveBlocker` (`prevent-display-sleep`) whenever any session's status is `playing`, and releases it on pause, dispose, or shutdown. Service: `apps/electron-backend/src/app/services/embedded-mpv-native.service.ts`; full architecture: `docs/architecture/embedded-mpv-native.md`.
+- Embedded MPV (experimental, macOS/Windows/Linux): renders mpv video inside the Electron window through a native addon. macOS uses the libmpv render API in an `NSOpenGLView`; Windows uses in-process libmpv with `--wid` against an app-owned child `HWND`; Linux spawns an out-of-process `mpv --wid=<x11-window>` controlled over a JSON IPC socket (X11/XWayland only, requires system `mpv` on PATH; subtitles/speed/aspect/recording are not exported there). mpv's own screensaver inhibition does not apply to any of these paths, so `EmbeddedMpvNativeService` holds an Electron `powerSaveBlocker` (`prevent-display-sleep`) whenever any session's status is `playing`, and releases it on pause, dispose, or shutdown. Renderer bounds are CSS pixels; the service converts them to native units in the main process (`embedded-mpv-bounds.util.ts`: × page zoom everywhere, × display scale on Windows/Linux whose child windows are positioned in physical pixels; frame-copy bounds stay unscaled), and the session controller re-syncs bounds when `devicePixelRatio` changes. Service: `apps/electron-backend/src/app/services/embedded-mpv-native.service.ts`; full architecture: `docs/architecture/embedded-mpv-native.md`.
+- Embedded MPV frame-copy engine (experimental, macOS Apple Silicon + Linux
+  x64 + Windows; enabled via `Settings > Playback > Embedded MPV: frame-copy
+engine` (restart required) or
+  `IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY=1` on top of the embedded MPV
+  experiment flag): a per-session helper renders mpv offscreen (CGL on macOS,
+  EGL on Linux, WGL on Windows), publishes BGRA frames into a shm ring, and the
+  preload frame pump uploads them to
+  `<canvas data-embedded-mpv-frame>`. Shared `app-player-controls` owns the DOM
+  UI; native-view retains the legacy dock. On Linux, only
+  `iptvnator_mpv_helper` may link libmpv; Electron, its shipped libraries, the
+  addon, and frame reader must not. Pristine afterPack/unpacked layouts scan
+  Electron libraries recursively; extracted Snap payloads exclude only the
+  package-manager `lib/**` and `usr/lib/**` trees overlaid into the same root.
+  Every other directory remains recursive, and Electron-library symlinks still
+  fail closed. `electron-backend/native{,/**/*}` is excluded from `app.asar`;
+  `afterPack` alone owns the profile-normalized unpacked native tree, and
+  package checks reject every archived `/electron-backend/native/**` entry.
+  Packaged addon, frame-reader, and helper discovery uses only package-owned
+  `app.asar.unpacked` paths; cwd/dist candidates remain development-only.
+  Official x64 packages use three separate profiles:
+  DEB/RPM/Pacman depend on system libmpv plus the helper's direct
+  EGL/GL/GBM interfaces, AppImage/Snap bundle the pinned LGPL closure, and
+  Flatpak bundles the same closure. Flatpak is an isolated packaging pass and
+  keeps `iptvnator` as the real Electron ELF so Electron Builder's
+  `electron-wrapper` passes it directly to Zypak. Other Linux targets retain the
+  conditional `iptvnator` wrapper and `iptvnator.bin`. Mixed
+  Flatpak/non-Flatpak target sets fail before mutation. Exact system
+  dependencies are DEB=`libmpv2,libegl1,libgl1,libgbm1`,
+  RPM=`mpv-libs,libglvnd-egl,libglvnd-glx,mesa-libgbm`, and
+  Pacman=`mpv,libglvnd,mesa`. The DEB contract is verified on Ubuntu 24.04+;
+  Ubuntu 22.04 users need the x64 AppImage because Jammy provides `libmpv1`.
+  ARM packages are marker-only. Stored or explicit opt-ins cannot bypass the
+  fail-closed packaged manifest/file/hash gate and bounded `--runtime-probe`;
+  any failure keeps the sandbox enabled, records a stable reason, and falls
+  back to native-view without crashing. Snap is `core22`/strict and uses an
+  exact private `shared-memory` plug plus the `graphics-core22` content plug at
+  a real empty mode-0755 `$SNAP/graphics`, with external `mesa-core22` as the
+  default provider. Its only provider-data layouts bind `/usr/share/libdrm`
+  from `$SNAP/graphics/libdrm` and symlink `/usr/share/drirc.d` to
+  `$SNAP/graphics/drirc.d`. Installed-Snap CI requires controlled unavailable
+  status after disconnect, then reconnects and requires success. The helper
+  links `libGL.so.1`, and probe/playback share a sanitized loader environment
+  in which ambient audit, preload, library, graphics-driver, and shell-startup
+  overrides are removed; the validated private closure plus trusted host GL,
+  graphics-content, core22 base x64, and exact GNOME-platform roots have
+  explicit precedence. The core22 base stays ahead of GNOME so the older
+  `libedit.so.2` requiring `libtinfo.so.5` cannot shadow the base ABI. The
+  extracted-artifact verifier removes the identical unsafe loader/graphics/
+  shell set before direct helper smoke while preserving selectors such as
+  `LIBGL_ALWAYS_SOFTWARE`. Snap fixes the wrapper `PATH`,
+  removes exported `BASH_FUNC_*` functions, and
+  launches probe/playback through the regular executable
+  `$SNAP/graphics/bin/graphics-core22-provider-wrapper`; a missing or
+  disconnected provider returns `snap-graphics-provider-unavailable` before
+  helper spawn. The packaging-only
+  `--embedded-mpv-runtime-probe` app switch runs the complete packaged gate
+  before BrowserWindow startup and emits one availability JSON line. A nonzero
+  helper exit keeps top-level reason `helper-probe-failed`; `helperReason` is
+  present only for an exact protocol-v1 line carrying a fixed allowlisted
+  reason, and its optional `helperDetail` must be 1–1024 printable ASCII
+  characters. Invalid detail suppresses both helper fields. Every probe uses
+  an explicit 16 MiB aggregate captured-output ceiling independent of tracing.
+  With `IPTVNATOR_TRACE_PLAYER=1`, non-empty helper stderr is emitted separately
+  as one JSON-escaped stderr line with a 16,384-character `stderr` limit and an
+  explicit `truncated` field; trace-write failure cannot change availability.
+  Installed-Snap CI enables Mesa EGL/GL diagnostics through this bounded
+  channel. The exact packaged Flatpak `/app` context reconstructs only
+  Freedesktop Platform 24.08's immutable
+  `__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS`; its CI smoke invokes that
+  application-level probe instead of the helper directly. The packaged x64
+  Playwright smoke runs its fixture-contract target first and passes Chromium
+  `--ignore-gpu-blocklist` so CI llvmpipe exposes WebGL2; this does not bypass
+  the runtime gate, and `--no-sandbox` remains root-only. Bundled Linux
+  packages carry hash-validated
+  `embedded-mpv-notices.json`, `THIRD_PARTY_NOTICES.txt`, and `licenses/**`.
+  CI caches the staged runtime plus immutable source inputs, never finished
+  notices or the compliance tarball; it regenerates those notices and the
+  VCS-metadata-free `linux-frame-copy-runtime-sources.tar.xz` for the current
+  checkout while preserving the exact pinned six recursive libplacebo
+  submodule records. Each record is canonical `full-commit safe/path`;
+  clone-depth dependent `git describe` annotations are discarded and never
+  form part of the provenance identity. Its source index carries the globally sorted libplacebo
+  directory/file/symlink inventory; file hashes, sizes, executable bits, link
+  targets, aggregates, and canonical tree digest must match the trusted pinned
+  checkout. The archive has an exact member/type layout and its
+  `metadata/archive-sha256.txt` records must match the actual source archives.
+  Concatenated tar/xz streams are inspected past every end marker. Every
+  bundled x64 package manifest binds the final archive's SHA-256 and repository
+  revision; system and marker-only packages do not carry that binding. Snap
+  Store
+  publication runs only from a public `v*` GitHub release that already
+  contains the Snap assets and exactly one source archive. Before any upload,
+  the workflow hashes and checks the archive's exact member/type set and size
+  bounds, verifies its clean tag revision, pinned sources including the six
+  recursive submodule records and exact libplacebo tree digest, legal payload,
+  and exact released tooling, then performs bounded extraction and static
+  validation for every Snap. That public-release boundary independently
+  revalidates the exact strict `meta/snap.yaml` graphics/shared-memory
+  contract and enumerates `resources/app.asar`, rejecting any archived
+  `electron-backend/native/**` payload before publication. Its bounded ASAR
+  header reader uses only Node built-ins and released local tooling, so the
+  clean tag checkout does not require `node_modules`. Exactly one x64 Snap
+  must have matching
+  `sourceArchive` and `sourceRuntime`; any non-x64 Snap remains marker-only.
+  Checkout and artifact-transfer actions are pinned to full commits; checkout
+  does not persist credentials, and repository credentials are scoped to
+  download steps. A secretless verification job copies assets through
+  no-follow descriptors, checks them before and after inspection, writes an
+  exact receipt, fully reverifies a root-owned read-only snapshot, and
+  transfers only that data through the pinned artifact service while passing
+  the receipt digest separately through a job output. The dependent publish
+  job uses a bounded `ubuntu-latest` runner with no checkout or release-tag
+  code, verifies that digest plus the exact receipt, asset hashes, and
+  file-only layout, root-seals the data again, and installs Snapcraft directly.
+  Its final fixed shell step alone receives the Store credential, resolves no
+  PATH command, executes no released code, and exposes that credential only to
+  each exact
+  `/snap/bin/snapcraft upload --release=edge` process. Candidate/stable
+  promotion is manual after installed-Snap frame-copy and missing-runtime
+  fallback smoke; GitHub Actions never promotes automatically. On Windows,
+  package validation requires the exact MPV DLL named by the helper's PE import
+  table beside the executable.
+  Backend adapter:
+  `apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts`;
+  shared-controls adapter:
+  `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts`;
+  helper: `apps/electron-backend/native/helper/`; canonical packaging/runtime
+  contracts: `docs/architecture/embedded-mpv-native.md` and
+  `tools/embedded-mpv/README.md`.
+- Shared player-controls layer: `libs/ui/playback/src/lib/player-controls/` exports the engine-neutral `PlayerController` contract, standalone `app-player-controls`, a generic web-video adapter/helper, and component-scoped `WEB_PLAYER_SHARED_CONTROLS` rollout token. In fullscreen, `app-player-controls` shows a pointer-transparent media-title overlay at the top while controls are revealed (`mediaTitle` input: movie/channel/series name, plus an `S01E03` second line for episodes; series names flow from the detail views through `PortalInlinePlayerComponent.seriesTitle` and `WebPlayerViewComponent.mediaTitle`). Persisted `Settings.webPlayerSharedControls` is default-off, and its checkbox appears only when HTML5, Video.js, or ArtPlayer is selected. `WebPlayerViewComponent` snapshots the preference into the immutable token for each new player host. The parent `/workspace` route awaits the initial `SettingsStore` load, including cold-start direct links, before this snapshot can occur. Saving applies to the next host without an application restart; an existing session never changes controls mode in place. Embedded MPV ignores the web-player preference: frame-copy always uses shared DOM controls through `EmbeddedMpvControlsAdapter`, native-view retains its compositor-safe legacy dock, and external MPV/VLC retain their own UI. The Embedded MPV host selects exactly one controls UI for its reported engine. `showControls=false` detaches the shared surface, modal overlays gate frame-copy playback shortcuts, fullscreen remains DOM-based with Embedded MPV bounds sync, and a playback/session transition key prevents engine or session handoff from presenting stale recording feedback while timers and pending commands are cancelled. Same-session IPC replies yield to a broadcast snapshot received while the command was pending, so a successful recording acknowledgement cannot be rolled back by a stale reply. The built-in HTML5/hls.js player is the second guarded consumer: `HtmlVideoPlayerComponent` provides a component-scoped `WebVideoControlsAdapter`, while its neutral `web-video-support` bridge is shared with ArtPlayer and owns HLS/Shaka(DASH)/native tracks, MPEG-TS VOD duration correction, caption preference, and source cleanup. `HtmlVideoElementSession` owns native video-event lifecycle, persisted volume, and start-time/time/ended propagation. Video.js is the third guarded consumer: `VjsPlayerComponent` provides a component-scoped `WebVideoControlsAdapter`; its bridge rebinds the current Tech video after `playerreset`, exposes source-stable audio/subtitle IDs, preserves caption preference and explicit subtitle-off state, and reads Video.js duration. Reset-driven raw MPEG-TS changes pause first, coalesce to the latest desired source, preserve actual volume across Video.js's reset, and restart when authoritative live/VOD metadata changes. In shared-controls mode, Video.js native controls, click/double-click/hotkey actions, and spatial navigation are disabled. ArtPlayer is the fourth guarded consumer: `ArtPlayerComponent` provides a component-scoped `WebVideoControlsAdapter`; `ArtPlayerSourceSession` owns HLS/DASH(Shaka)/MPEG-TS/native sources, the neutral web-video bridge, exact cleanup, and a destroyed-session guard for delayed `customType` callbacks, while `ArtPlayerVideoSession` owns native media/ArtPlayer events. Shared ArtPlayer mode uses authoritative live/VOD metadata, HLS/Shaka/native tracks and caption preference, MPEG-TS VOD duration correction, and reapplies app volume directly after ArtPlayer restores its own stored volume. Vendor chrome/hotkeys are disabled, and a transparent capture layer gives shared controls exclusive click and double-click ownership. `WebPlayerViewComponent.resolvedIsLive` supplies authoritative metadata; visible playback diagnostics disable shared pointer/keyboard ownership and exit only the active HTML5, Video.js, or ArtPlayer shell's own fullscreen so retry/fallback actions remain visible. On the preference-off path, all three web players retain their existing controls, source behavior, and legacy series navigation. `Settings.showCaptions` is deliberately outside this rollout gate: it is engine state, so the preference-off players apply it through the same helpers without an adapter (`WebVideoSourceTracks` for HTML5/ArtPlayer, `VjsLegacyTracks` for Video.js), re-applying it as the engine adds or switches text tracks. The two modes differ in how long it is enforced: shared controls are authoritative for the session (user intent arrives via `setSubtitleTrack`), while vendor chrome is source-default — the preference seeds each new source and is released once the media reports `playing`, so the engine's own caption menu keeps working. Mode selection is the optional `playbackStarted` probe the legacy owners pass to all three helpers (HLS, native text tracks, Shaka); in that mode the HLS helper deselects (`subtitleTrack = -1`) rather than hiding, since `subtitleDisplay` would override the vendor menu, and DASH is seeded by `ShakaVideoSession.start()` after the manifest loads. `WebPlayerViewComponent` reads it from `SettingsStore` instead of a host input so every host (M3U, Xtream/Stalker live layouts, portal detail inline player) inherits it. Contract: `docs/architecture/player-controls-contract.md`.
+- Shared web picture-in-picture stays inside that default-off rollout.
+  `PlayerController` exposes capability `pictureInPicture`, state
+  `pictureInPictureActive`/`canPictureInPicture`, and command
+  `togglePictureInPicture()`. HTML5, Video.js, and ArtPlayer use standard
+  element PiP from the adapter's attached video; shared ArtPlayer keeps vendor
+  `pip: false`, while preference-off native/vendor paths remain unchanged. The
+  capability-gated button sits before fullscreen and uses active enter/exit
+  semantics; entry is disabled until metadata, and the action is disabled while
+  an operation is pending. Embedded MPV reports capability/state false with a
+  no-op command and has no popup/mini-window.
+- `WebVideoControlsAdapter` supplies its current video and binding generation to
+  `WebVideoPictureInPictureController`; the controller reads the video's
+  `ownerDocument`, while browser enter/leave events remain authoritative.
+  Exact-owner exit stays available if request support changes. Request/exit
+  invocation remains synchronous for user activation, one operation is
+  serialized, and binding generation plus exact video identity protects
+  replacement and teardown from stale completion. Video.js Tech reset and
+  ArtPlayer rebuild rebind with exact-owner cleanup; HTML5 source changes on a
+  retained target preserve PiP.
+  Standard PiP shows the browser/OS video surface without Angular control
+  chrome, with browser-dependent subtitles. AirPlay, Cast, Document PiP, a PiP
+  keyboard shortcut, and Embedded MPV popup/native support are out of scope.
 
 **VOD/Series Detail Pages (two-state layout)**:
 
 - Xtream and Stalker detail pages use the shared `PortalDetailShellComponent` (`libs/ui/components/src/lib/portal-detail-shell/`) with two states: **Browse** (hero with poster/metadata/actions, episodes below) and **Watch** (hero collapses with a ~300ms morph, the inline player takes the full content width, metadata moves to an About block below the episodes)
+- The inline player (`PortalInlinePlayerComponent`) renders a full-width **theater stage** (`.player-shell__viewport`): the 16:9 player is centered and letterboxed so the leftover on wide-short windows is always the stage's black background, never app surface. An opt-in `playerAmbientMode` setting (Settings → Playback, default off, built-in web players only) fills that leftover with a blurred, dimmed copy of the poster (YouTube "Ambient mode" style)
+- For inline **series** playback on wide windows the stage instead docks the player left and shows an **"Up Next" episode rail** in the leftover column (`app-up-next-rail` in `libs/ui/playback/src/lib/portal-inline-player/`): rest of the current season plus next-season spillover, playing episode highlighted, watch-progress bars from playback positions; clicking plays inline via the host's episode flow (both Xtream and Stalker). Gated by the `playerUpNextRail` setting (default on, web players only) and a ≥320px leftover-width check via ResizeObserver — narrower windows keep the centered theater/ambient stage; movies and live never show the rail. The rail is opaque and sits on top of the ambient fill
 - Watch state derives from `inlinePlayback() !== null` only; external MPV/VLC playback keeps the browse layout. Esc and "Close player" exit to browse without navigation; the now-playing back arrow is route-level back (straight to the list via the host's `goBack()`)
+- A successful external MPV/VLC episode launch immediately persists the selected episode as the latest playback-position entry and retargets the series CTA to `Play episode N`; real player telemetry overwrites that marker when available, so episode identity is reliable while exact external timestamps remain best-effort.
+- Stalker preserves this contract for regular `/series`, embedded VOD `series[]`, and lazy Ministra VOD `is_series` items: quick-start translation parameters must reach the CTA, and inline/external episode handoffs must include the parent series id plus resolved season and episode numbers. This metadata lets the dashboard render the tracked S/E badge for VOD-backed series. Existing playback rows without it remain badge-less until the episode is played again.
 - Hosts pass hero chips/meta/actions as `*appDetailTags`/`*appDetailMeta`/`*appDetailActions` templates; the shell stamps them into both the hero and the About block
 - Seasons are tabs (`SeasonTabsComponent`, dropdown beyond 6 seasons) with auto-selection (playing episode's season → resume season → first) that fires the same `seasonSelected` lazy-load/enrichment hooks as manual clicks; grid/list episode view toggle persists to localStorage; season descriptions come from `get_series_info` (Xtream) or TMDB (Stalker)
+- Dashboard hero/Continue Watching clicks for an Xtream series carry a one-shot resume target through the global-recent inline-detail handoff; after series metadata and playback positions load, the exact saved episode starts at its stored position. A failed positions load leaves the target unconsumed and the handoff detail-only, so a transient storage error never starts the episode from the beginning. Ordinary global-recent grid clicks remain detail-only.
 - See `docs/architecture/embedded-inline-playback.md` ("Two-State Detail Layout")
 
 **Radio Player**:
@@ -647,19 +838,21 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
 - XMLTV format support
 - Background parsing in worker thread
 - Stored in database for quick lookup
+- Manual EPG mapping (Electron only): right-click a channel in any list (M3U views, Xtream portal list, Stalker ITV sidebar, global favorites) → "Map EPG channel" attaches it to an uploaded-XMLTV channel; stored in `epg_channel_mappings` keyed by the M3U lookup key or a playlist-scoped portal key (`xtream:{playlistId}:{id}` / `stalker:{playlistId}:{id}`, helpers in `libs/shared/interfaces/src/lib/epg-mapping-key.util.ts`); resolved on every EPG path (single + batch IPC lookups, portal detail views, preview queues); dialog: `libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/`
 
 **TMDB Metadata Enrichment** (opt-in):
 
 - Enriches Xtream and Stalker VOD/series detail views with TMDB data (plot, cast with avatar chips, director, genres, rating, artwork, YouTube trailers) via a field-level merge — the provider stays authoritative for stream data and any field TMDB can't fill; Cyrillic titles are searched with `ru-RU` so exact-title matching works
 - "Similar" rail in ALL detail views: TMDB recommendations matched against the provider catalog by normalized title, two-tier — exact form first, year-stripped fallback gated on year compatibility (`libs/portal/xtream/feature/src/lib/tmdb-similar.util.ts`, `normalizeTitleKeys`); cross-portal matches from other imported Xtream playlists supplement the Xtream rail and fully power the Stalker rail (`CrossPortalSimilarService` in `libs/services`, batched `DB_MATCH_TITLES`, Electron only); detail components re-initialize on route param changes since the router reuses them for detail→detail navigation
-- Season/episode enrichment: opening a season lazily fetches `/tv/{id}/season/{n}` and overlays real episode names, overviews and stills via `mergeEpisodesWithTmdb` (Xtream: `XtreamStore.enrichSelectedSerialSeason`; Stalker: overlay in the series view's `mappedSeasons`)
+- Season/episode enrichment: opening a season lazily fetches `/tv/{id}/season/{n}` and overlays real episode names, overviews and stills via `mergeEpisodesWithTmdb` (Xtream: `XtreamStore.enrichSelectedSerialSeason`; Stalker: overlay in the series view's `mappedSeasons`); for single-season provider slices whose title carries an explicit season marker ("The Mandalorian (2 season)", "s02", "2 сезон"), the marker overrides the provider's renumbered season (`resolveEnrichmentSeasonNumber` in `libs/shared/interfaces/src/lib/season-marker.util.ts`)
 - Dashboard: opt-in "Trending this week" rail (weekly TMDB trending matched against imported Xtream playlists via one batched `DB_MATCH_TITLES` request; Electron-only, `dashboardRails.tmdbTrending` toggle) and hero TMDB extras (backdrop fallback, rating + genre badges, memoized per session; series heroes show the tracked S/E badge from playback positions) — `DashboardTrendingService` in `libs/workspace/dashboard/data-access`, `DashboardHeroTmdbService` in `libs/workspace/dashboard/feature`; both load async after first paint
-- Actor pages: cast avatar chips are clickable (TMDB person id) and open `actor/:personId` inside the current portal — TMDB person bio + full filmography; Xtream matches titles against the loaded catalog (direct navigation), unmatched titles and all Stalker titles open the portal search prefilled (`?q=`); the in-portal search page shows a Back button (`SearchLayoutComponent.showBackButton` → `Location.back()`) so users can return to the actor page; shared UI in `libs/ui/shared-portals` (`ActorViewComponent`)
+- Series detail views show a TMDB production-status chip (`tmdb_status`, e.g. Ended / Returning) — TMDB sends `status` in English regardless of request language, so it is normalized to a token by `normalizeSeriesStatus` and rendered via `seriesStatusLabelKey` translations; person pages show `deathday` alongside `birthday`
+- Actor pages: cast avatar chips are clickable (TMDB person id) and open `actor/:personId` inside the current portal — TMDB person bio + full filmography (acting + directing credits merged; acting wins the per-title dedup); director/creator chips (`tmdb_directors` via `enrichedDirectors`/`enrichedCreators` in `tmdb-credits.ts`) are clickable the same way and open the same person page; Xtream matches titles against the loaded catalog (direct navigation), unmatched titles and all Stalker titles open the portal search prefilled (`?q=`); the in-portal search page shows a Back button (`SearchLayoutComponent.showBackButton` → `Location.back()`) so users can return to the actor page; shared UI in `libs/ui/shared-portals` (`ActorViewComponent`)
 - Actor page "All portals" scope (Electron only): batched `DB_MATCH_TITLES` worker op (trigram FTS over all imported Xtream playlists, `apps/electron-backend/src/app/database/operations/title-match.operations.ts`); `normalizeTitle` is shared renderer/worker via `libs/shared/interfaces/src/lib/title-normalization.util.ts`
-- Opt-in via `Settings > Metadata (TMDB)` (sends titles to TMDB); optional user API key overrides the embedded default (`DEFAULT_TMDB_API_KEY` in `libs/services/src/lib/tmdb/tmdb-config.ts` — an empty placeholder in the repo by design; the real key lives in the `TMDB_API_KEY` GitHub Actions secret and is injected at CI build time by `tools/tmdb/inject-tmdb-key.mjs`)
-- Match confidence: provider `tmdb_id` trusted fully; otherwise normalized-title + year (±1) search with a strict gate — no confident match means no enrichment
+- Opt-in via `Settings > Metadata (TMDB)` (sends titles to TMDB); the section also has a "check key" button and a cache panel (row count + payload size, with a clear button); optional user API key overrides the embedded default (`DEFAULT_TMDB_API_KEY` in `libs/services/src/lib/tmdb/tmdb-config.ts` — an empty placeholder in the repo by design; the real key lives in the `TMDB_API_KEY` GitHub Actions secret and is injected at CI build time by `tools/tmdb/inject-tmdb-key.mjs`)
+- Match confidence: a provider `tmdb_id` is a strong hint, not gospel — its payload is weighed against the item (`assessProviderId`: title or year agrees → use it; both years known and incompatible → the search may take over; title-only mismatch → keep it, since TMDB localizes titles). A 404 marks the id dead (`badProviderId:<id>` row); transient failures never do. Without a usable id: normalized-title + year (±1) search with a strict gate — no confident match means no enrichment
 - Detail views render provider data immediately; enrichment patches the selection asynchronously (staleness-guarded)
-- Cached in SQLite `tmdb_metadata` (Electron, via DB worker ops `DB_GET/SET_TMDB_METADATA`) or in-memory (PWA); localized via the app language setting
+- Cached in SQLite `tmdb_metadata` (Electron, via DB worker ops `DB_GET/SET_TMDB_METADATA`, plus `DB_GET_TMDB_CACHE_STATS` / `DB_CLEAR_TMDB_METADATA` behind the settings cache panel) or in-memory (PWA); localized via the app language setting. Search-match lookup keys are versioned, and connection startup removes obsolete unversioned rows once through the `migration:tmdb-search-lookup-v2-cache-cleanup:v1` app-state marker.
 - Service layer: `libs/services/src/lib/tmdb/`; store glue: `libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.ts` and `libs/portal/stalker/data-access/src/lib/stores/stalker-tmdb-enrichment.ts` (hooked in `withStalkerSelection().setSelectedItem`)
 - TMDB attribution (logo + disclaimer) is required and shown in the settings TMDB section and About
 - See `docs/architecture/tmdb-metadata-enrichment.md`
@@ -671,7 +864,7 @@ This project uses modern Angular signal-based APIs and patterns. **ALWAYS** use
 
 **Internationalization**:
 
-- Uses `@ngx-translate` with 18 language files in `apps/web/src/assets/i18n/`
+- Uses `@ngx-translate` with 19 language files in `apps/web/src/assets/i18n/`
 
 ## Development Notes
 
@@ -718,6 +911,9 @@ Build configurations in `apps/web/project.json`:
 **Factory Pattern Implementation**:
 The factory pattern ensures a single codebase works in both environments without conditional checks scattered throughout the application. All environment-specific logic is encapsulated in the service implementations.
 
+**Build Commit In About**:
+CI injects the git commit into `apps/web/src/environments/build-commit.ts` via `tools/build/inject-build-commit.mjs` (same placeholder pattern as the TMDB key inject); `Settings > About` then shows `"<version> (<short-sha>)"`. The semver version itself deliberately stays untouched — a `-sha` suffix would flip electron-updater into prerelease mode and leak into installer/artifact version fields. Local/dev builds keep the placeholder empty and show the plain version.
+
 ### Testing Strategy
 
 - **Unit tests**: Jest with `jest-preset-angular` and `ng-mocks`
diff --git a/README.md b/README.md
index 084cd51bf..9ddc18150 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ The application is a cross-platform, open-source project built with Electron and
 **Playback**
 
 - Built-in HTML5 player (HLS.js or Video.js) with a resizable, resumable inline view
+- Optional unified IPTVnator controls for HTML5, Video.js, and ArtPlayer, enabled in **Settings → Playback** _(experimental)_
 - External players — MPV, VLC, and IINA on macOS (`mpv.app` / `VLC.app` bundle paths supported) _(desktop)_
 - Embedded MPV — native mpv rendered inside the app window on macOS, Windows & Linux 🖥️ _(experimental · desktop)_
 - Dedicated radio player for `radio="true"` streams 📻
@@ -66,7 +67,7 @@ The application is a cross-platform, open-source project built with Electron and
 - Cross-platform desktop (Electron) and installable PWA
 - Desktop auto-updater and mobile remote control _(desktop)_
 - Docker self-hosting for the PWA + web backend
-- 18 languages ([translation files](apps/web/src/assets/i18n/)), light & dark themes, and keyboard shortcuts
+- 19 languages ([translation files](apps/web/src/assets/i18n/)), light & dark themes, and keyboard shortcuts
 
 ## Keyboard shortcuts
 
@@ -299,13 +300,6 @@ This redirects the SQLite database, Electron user data, and local config under
 the given directory. Delete that directory whenever you want a fresh empty
 state.
 
-If you need to debug renderer freezes or GPU/compositor issues in Electron, you
-can disable hardware acceleration for a run:
-
-```
-$ IPTVNATOR_DISABLE_HARDWARE_ACCELERATION=1 pnpm run serve:backend
-```
-
 If you need startup diagnostics for a white screen or a frozen route, you can
 also turn on opt-in Electron tracing. These logs are written to the Electron
 terminal output so they still help when the renderer DevTools never open:
diff --git a/apps/electron-backend-e2e/playwright.packaged.config.ts b/apps/electron-backend-e2e/playwright.packaged.config.ts
new file mode 100644
index 000000000..d5f67f26a
--- /dev/null
+++ b/apps/electron-backend-e2e/playwright.packaged.config.ts
@@ -0,0 +1,27 @@
+import { defineConfig } from '@playwright/test';
+import baseConfig from './playwright.config';
+
+export default defineConfig({
+    ...baseConfig,
+    outputDir:
+        '../../dist/test-results/electron-backend-e2e/packaged-frame-copy-smoke',
+    reporter: [
+        ['list'],
+        [
+            'html',
+            {
+                outputFolder:
+                    '../../dist/playwright-report/electron-backend-e2e/packaged-frame-copy-smoke',
+            },
+        ],
+        [
+            'json',
+            {
+                outputFile:
+                    '../../dist/test-results/electron-backend-e2e/packaged-frame-copy-smoke/results.json',
+            },
+        ],
+    ],
+    timeout: 120000,
+    webServer: [],
+});
diff --git a/apps/electron-backend-e2e/playwright.performance.config.ts b/apps/electron-backend-e2e/playwright.performance.config.ts
new file mode 100644
index 000000000..58a6ba03b
--- /dev/null
+++ b/apps/electron-backend-e2e/playwright.performance.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+    fullyParallel: false,
+    reporter: [['list']],
+    testDir: './src',
+    testMatch: '**/*.performance.ts',
+    timeout: 30 * 60 * 1_000,
+    use: {
+        testIdAttribute: 'data-test-id',
+    },
+    workers: 1,
+});
diff --git a/apps/electron-backend-e2e/project.json b/apps/electron-backend-e2e/project.json
index 1e886ba34..ee68cd410 100644
--- a/apps/electron-backend-e2e/project.json
+++ b/apps/electron-backend-e2e/project.json
@@ -12,6 +12,53 @@
         "e2e": {
             "dependsOn": ["electron-backend:build-e2e"]
         },
+        "test-performance-harness": {
+            "executor": "nx:run-commands",
+            "options": {
+                "cwd": "apps/electron-backend-e2e",
+                "command": "pnpm exec tsx --test src/performance/*.spec.ts"
+            }
+        },
+        "benchmark-m3u-refresh-cancellation": {
+            "dependsOn": ["electron-backend:build-performance"],
+            "executor": "nx:run-commands",
+            "cache": false,
+            "parallelism": false,
+            "options": {
+                "cwd": "apps/electron-backend-e2e",
+                "command": "pnpm exec playwright test --config=playwright.performance.config.ts src/m3u-refresh-cancellation.performance.ts"
+            }
+        },
+        "benchmark-m3u-import": {
+            "dependsOn": ["electron-backend:build-performance"],
+            "executor": "nx:run-commands",
+            "cache": false,
+            "parallelism": false,
+            "options": {
+                "cwd": "apps/electron-backend-e2e",
+                "command": "pnpm exec playwright test --config=playwright.performance.config.ts src/m3u-import.performance.ts"
+            }
+        },
+        "packaged-frame-copy-smoke": {
+            "dependsOn": ["test-packaged-frame-copy-fixtures"],
+            "executor": "nx:run-commands",
+            "cache": false,
+            "outputs": [
+                "{workspaceRoot}/dist/playwright-report/electron-backend-e2e/packaged-frame-copy-smoke",
+                "{workspaceRoot}/dist/test-results/electron-backend-e2e/packaged-frame-copy-smoke"
+            ],
+            "options": {
+                "cwd": "apps/electron-backend-e2e",
+                "command": "pnpm exec playwright test --config=playwright.packaged.config.ts src/embedded-mpv-frame-copy-packaged.e2e.ts"
+            }
+        },
+        "test-packaged-frame-copy-fixtures": {
+            "executor": "nx:run-commands",
+            "options": {
+                "cwd": "apps/electron-backend-e2e",
+                "command": "pnpm exec tsx --test src/embedded-mpv-frame-copy-packaged-fixtures.spec.ts"
+            }
+        },
         "lint": {
             "executor": "@nx/eslint:lint"
         }
diff --git a/apps/electron-backend-e2e/src/backup-roundtrip.e2e.ts b/apps/electron-backend-e2e/src/backup-roundtrip.e2e.ts
new file mode 100644
index 000000000..102cf35f6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/backup-roundtrip.e2e.ts
@@ -0,0 +1,277 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { Locator, Page } from '@playwright/test';
+import {
+    addXtreamPortal,
+    closeElectronApp,
+    deleteSource,
+    expect,
+    launchElectronApp,
+    openSettings,
+    openSources,
+    openWorkspaceSection,
+    resetMockServers,
+    restartElectronApp,
+    sourceRowByTitle,
+    test,
+    waitForXtreamWorkspaceReady,
+} from './electron-test-fixtures';
+
+/**
+ * Full backup round-trip through the real UI, DB worker and IPC stack:
+ * hide a category, export the backup, delete the source, import the file
+ * back and verify the restored portal hides the same category again after
+ * its content is re-imported from the mock server (regression for #1017 —
+ * exported hidden categories lost their xtream IDs and the restore either
+ * hid everything or nothing).
+ */
+test.describe('Electron playlist backup round-trip', () => {
+    test('exports a backup and re-imports it with hidden categories restored', async ({
+        dataDir,
+        request,
+    }) => {
+        await resetMockServers(request, ['xtream']);
+        const portalName = 'Backup Roundtrip Xtream';
+        const exportPath = join(dataDir, 'roundtrip-backup.json');
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            await addXtreamPortal(app.mainWindow, { name: portalName });
+            await waitForXtreamWorkspaceReady(app.mainWindow);
+            await openWorkspaceSection(app.mainWindow, 'Live TV');
+            await app.mainWindow.waitForURL(
+                /\/workspace\/xtreams\/[^/]+\/live/
+            );
+
+            const targetCategory = await pickVisibleCategoryWithContent(
+                app.mainWindow
+            );
+
+            let dialog = await openManageCategoriesDialog(app.mainWindow);
+            await setManagedCategoryChecked(dialog, targetCategory.name, false);
+            await dialog
+                .getByRole('button', { name: 'Save', exact: true })
+                .click();
+            await app.mainWindow.waitForSelector('mat-dialog-container', {
+                state: 'detached',
+            });
+            await expect(
+                sidebarCategoryById(app.mainWindow, targetCategory.id)
+            ).toHaveCount(0);
+
+            // Export through the real settings flow with the native save
+            // dialog stubbed to a fixed path inside the test data dir.
+            await app.electronApp.evaluate(({ dialog: nativeDialog }, path) => {
+                nativeDialog.showSaveDialog = async () => ({
+                    canceled: false,
+                    filePath: path,
+                });
+            }, exportPath);
+
+            await openSettings(app.mainWindow);
+            const backupSection = app.mainWindow.locator('#backup');
+            await backupSection
+                .getByRole('button', { name: 'Export', exact: true })
+                .click();
+            await expect(
+                app.mainWindow.getByText('Playlist backup exported.')
+            ).toBeVisible({ timeout: 15000 });
+
+            // The exported manifest must reference hidden categories by
+            // numeric xtream ID — the #1017 regression exported anonymous
+            // { categoryType } entries.
+            const manifest = JSON.parse(readFileSync(exportPath, 'utf-8')) as {
+                playlists: Array<{
+                    portalType: string;
+                    userState?: {
+                        hiddenCategories?: Array<{
+                            categoryType?: string;
+                            xtreamId?: unknown;
+                        }>;
+                    };
+                }>;
+            };
+            const xtreamEntry = manifest.playlists.find(
+                (entry) => entry.portalType === 'xtream'
+            );
+            const hiddenCategories =
+                xtreamEntry?.userState?.hiddenCategories ?? [];
+            expect(hiddenCategories.length).toBeGreaterThan(0);
+            expect(
+                hiddenCategories.every(
+                    (hiddenCategory) =>
+                        typeof hiddenCategory.xtreamId === 'number'
+                )
+            ).toBe(true);
+
+            await openSources(app.mainWindow);
+            await deleteSource(app.mainWindow, portalName);
+            await expect(
+                sourceRowByTitle(app.mainWindow, portalName)
+            ).toHaveCount(0);
+
+            // Import the exported file back through the settings flow; the
+            // renderer opens a browser file chooser for it.
+            await openSettings(app.mainWindow);
+            const fileChooserPromise =
+                app.mainWindow.waitForEvent('filechooser');
+            await backupSection
+                .getByRole('button', { name: 'Import', exact: true })
+                .click();
+            const fileChooser = await fileChooserPromise;
+            await fileChooser.setFiles(exportPath);
+            await expect(
+                app.mainWindow.getByText(/Backup import finished: 1 imported/)
+            ).toBeVisible({ timeout: 15000 });
+
+            // Restart before opening the restored portal: the root-provided
+            // XtreamStore still holds the deleted portal's in-memory state
+            // under the same playlist id and would skip content
+            // initialization in this session. A restart matches the primary
+            // restore workflow (fresh install) and forces a real re-import.
+            const restarted = await restartElectronApp(app, dataDir);
+            app.electronApp = restarted.electronApp;
+            app.mainWindow = restarted.mainWindow;
+
+            // Opening the restored portal re-imports content from the mock
+            // server; the pending restore state must hide the same category
+            // again.
+            await openSources(app.mainWindow);
+            await sourceRowByTitle(app.mainWindow, portalName).first().click();
+            await waitForXtreamWorkspaceReady(app.mainWindow);
+            await openWorkspaceSection(app.mainWindow, 'Live TV');
+            await app.mainWindow.waitForURL(
+                /\/workspace\/xtreams\/[^/]+\/live/
+            );
+            await expect(
+                sidebarCategoryById(app.mainWindow, targetCategory.id)
+            ).toHaveCount(0);
+
+            // The restored hidden flag must live in the database itself,
+            // not only in the rendered sidebar state.
+            const restoredPlaylistId =
+                app.mainWindow.url().match(/xtreams\/([^/]+)/)?.[1] ?? '';
+            expect(restoredPlaylistId).not.toEqual('');
+            const restoredDbRows = await app.mainWindow.evaluate(
+                (playlistId) =>
+                    (
+                        window as unknown as {
+                            electron: {
+                                dbGetAllCategories: (
+                                    id: string,
+                                    type: string
+                                ) => Promise<
+                                    Array<{ name: string; hidden: boolean }>
+                                >;
+                            };
+                        }
+                    ).electron.dbGetAllCategories(playlistId, 'live'),
+                restoredPlaylistId
+            );
+            expect(restoredDbRows.length).toBeGreaterThan(0);
+            expect(
+                restoredDbRows
+                    .filter((row) => row.hidden)
+                    .map((row) => row.name)
+            ).toEqual([targetCategory.name]);
+
+            dialog = await openManageCategoriesDialog(app.mainWindow);
+            await dialog
+                .locator('input[type="search"]')
+                .fill(targetCategory.name);
+            const restoredRow = dialog.locator('.category-item').first();
+            await expect(restoredRow).toBeVisible({ timeout: 15000 });
+            await expect(
+                restoredRow.locator('mat-checkbox input')
+            ).not.toBeChecked();
+        } finally {
+            await closeElectronApp(app);
+        }
+    });
+});
+
+async function openManageCategoriesDialog(page: Page): Promise<Locator> {
+    await page.getByRole('button', { name: 'Manage categories' }).click();
+    const dialog = page.locator('mat-dialog-container').last();
+
+    await expect(dialog).toBeVisible();
+    await expect(dialog.locator('.category-item').first()).toBeVisible({
+        timeout: 15000,
+    });
+    return dialog;
+}
+
+async function setManagedCategoryChecked(
+    dialog: Locator,
+    categoryName: string,
+    shouldBeChecked: boolean
+): Promise<void> {
+    await dialog.locator('input[type="search"]').fill(categoryName);
+    const row = dialog.locator('.category-item').first();
+    await expect(row).toBeVisible({ timeout: 15000 });
+    const checkbox = row.locator('mat-checkbox input');
+
+    if (shouldBeChecked) {
+        await checkbox.check();
+        await expect(checkbox).toBeChecked();
+    } else {
+        await checkbox.uncheck();
+        await expect(checkbox).not.toBeChecked();
+    }
+}
+
+function sidebarCategoryById(page: Page, categoryId: string): Locator {
+    return page.locator(
+        `app-workspace-context-panel .category-item[data-category-id="${categoryId}"]`
+    );
+}
+
+async function pickVisibleCategoryWithContent(
+    page: Page
+): Promise<{ id: string; name: string }> {
+    let picked: { id: string; name: string } | null = null;
+
+    await expect
+        .poll(
+            async () => {
+                const categories = page.locator(
+                    'app-workspace-context-panel .category-item:visible'
+                );
+                const count = await categories.count();
+
+                for (let index = 0; index < count; index += 1) {
+                    const category = categories.nth(index);
+                    const id =
+                        (
+                            await category.getAttribute('data-category-id')
+                        )?.trim() ?? '';
+                    const name =
+                        (
+                            await category
+                                .locator('.nav-item-label')
+                                .textContent()
+                        )?.trim() ?? '';
+                    const countText =
+                        (
+                            await category.locator('.item-count').textContent()
+                        )?.trim() ?? '';
+
+                    if (id && name && (Number.parseInt(countText, 10) || 0) > 0) {
+                        picked = { id, name };
+                        return true;
+                    }
+                }
+
+                picked = null;
+                return false;
+            },
+            {
+                message:
+                    'No visible Xtream category with content was found in the sidebar.',
+                timeout: 15000,
+            }
+        )
+        .toBe(true);
+
+    return picked!;
+}
diff --git a/apps/electron-backend-e2e/src/dash-clearkey.e2e.ts b/apps/electron-backend-e2e/src/dash-clearkey.e2e.ts
new file mode 100644
index 000000000..553708db6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/dash-clearkey.e2e.ts
@@ -0,0 +1,172 @@
+import { createServer, Server } from 'http';
+import { readFileSync } from 'fs';
+import { basename, join } from 'path';
+import {
+    channelItemByTitle,
+    closeElectronApp,
+    expect,
+    launchElectronApp,
+    LaunchedElectronApp,
+    openAddPlaylistDialog,
+    test,
+    waitForM3uCatalog,
+    workspaceRoot,
+} from './electron-test-fixtures';
+
+/**
+ * DASH + ClearKey playback in the real Electron runtime — the only automated
+ * proof that ClearKey EME works in the packaged `file://` renderer (secure
+ * context). Uses the shared offline fixtures from apps/web-e2e/src/fixtures.
+ */
+
+const FIXTURE_DIR = join(workspaceRoot, 'apps/web-e2e/src/fixtures/dash');
+
+const CLEARKEY_KID = '00112233445566778899aabbccddeeff';
+const CLEARKEY_KEY = 'ffeeddccbbaa99887766554433221100';
+
+type DashFixtureServer = {
+    close: () => Promise<void>;
+    origin: string;
+};
+
+/** Serves the DASH fixture directory with HTTP Range support (Shaka fetches
+ * init segments and the sidx via byte ranges). */
+async function startDashFixtureServer(): Promise<DashFixtureServer> {
+    const server: Server = createServer((request, response) => {
+        const pathname = (request.url ?? '').split('?')[0];
+        const fileName = basename(pathname);
+        let body: Buffer;
+        try {
+            body = readFileSync(join(FIXTURE_DIR, fileName));
+        } catch {
+            response.writeHead(404);
+            response.end('not found');
+            return;
+        }
+
+        const contentType = fileName.endsWith('.mpd')
+            ? 'application/dash+xml'
+            : 'video/mp4';
+        const range = /bytes=(\d+)-(\d+)?/.exec(
+            request.headers.range ?? ''
+        );
+        if (!range) {
+            response.writeHead(200, {
+                'Content-Type': contentType,
+                'Accept-Ranges': 'bytes',
+                'Content-Length': body.length,
+            });
+            response.end(body);
+            return;
+        }
+
+        const start = Number(range[1]);
+        const end = range[2] ? Number(range[2]) : body.length - 1;
+        const chunk = body.subarray(start, end + 1);
+        response.writeHead(206, {
+            'Content-Type': contentType,
+            'Accept-Ranges': 'bytes',
+            'Content-Range': `bytes ${start}-${end}/${body.length}`,
+            'Content-Length': chunk.length,
+        });
+        response.end(chunk);
+    });
+
+    await new Promise<void>((resolvePromise, reject) => {
+        server.once('error', reject);
+        server.listen(0, '127.0.0.1', () => {
+            server.off('error', reject);
+            resolvePromise();
+        });
+    });
+    const address = server.address();
+    if (!address || typeof address === 'string') {
+        throw new Error('Failed to resolve dash fixture server address.');
+    }
+
+    return {
+        origin: `http://127.0.0.1:${address.port}`,
+        close: () =>
+            new Promise<void>((resolvePromise, reject) => {
+                server.close((error) =>
+                    error ? reject(error) : resolvePromise()
+                );
+            }),
+    };
+}
+
+function buildDashPlaylist(origin: string): string {
+    return [
+        '#EXTM3U',
+        '#EXTINF:-1 tvg-id="ck-dash" group-title="DASH",ClearKey DASH',
+        '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+        `#KODIPROP:inputstream.adaptive.license_key=${CLEARKEY_KID}:${CLEARKEY_KEY}`,
+        `${origin}/clearkey.mpd`,
+        '#EXTINF:-1 tvg-id="wv-dash" group-title="DASH",Widevine DASH',
+        '#KODIPROP:inputstream.adaptive.license_type=com.widevine.alpha',
+        '#KODIPROP:inputstream.adaptive.license_key=https://license.example.com/wv',
+        `${origin}/clearkey.mpd`,
+    ].join('\n');
+}
+
+async function importDashPlaylistFromText(
+    app: LaunchedElectronApp,
+    playlist: string
+): Promise<void> {
+    await openAddPlaylistDialog(app.mainWindow);
+    const dialog = app.mainWindow.locator('mat-dialog-container').last();
+    await dialog.getByRole('radio', { name: /Raw m3u text/i }).click();
+    await dialog.locator('textarea').fill(playlist);
+    await dialog.getByRole('button', { name: 'Import', exact: true }).click();
+    await dialog.waitFor({ state: 'detached' });
+    await waitForM3uCatalog(app.mainWindow);
+}
+
+test('@electron @dash ClearKey DASH plays inline and unsupported DRM surfaces a diagnostic', async ({
+    dataDir,
+}) => {
+    const fixtureServer = await startDashFixtureServer();
+    const app = await launchElectronApp(dataDir);
+
+    try {
+        await importDashPlaylistFromText(
+            app,
+            buildDashPlaylist(fixtureServer.origin)
+        );
+
+        // Happy path: ClearKey EME decrypts and playback advances.
+        await channelItemByTitle(app.mainWindow, 'ClearKey DASH')
+            .first()
+            .click();
+        const video = app.mainWindow
+            .locator('app-web-player-view video')
+            .first();
+        await expect(video).toBeVisible({ timeout: 15_000 });
+        await expect
+            .poll(
+                () =>
+                    video.evaluate(
+                        (element: HTMLVideoElement) => element.currentTime
+                    ),
+                { timeout: 20_000 }
+            )
+            .toBeGreaterThan(0.5);
+        await expect(
+            app.mainWindow.getByTestId('playback-diagnostic-banner')
+        ).toBeHidden();
+
+        // Negative: an unsupported license type must not crash — it shows the
+        // DRM diagnostic instead.
+        await channelItemByTitle(app.mainWindow, 'Widevine DASH')
+            .first()
+            .click();
+        const banner = app.mainWindow.getByTestId(
+            'playback-diagnostic-banner'
+        );
+        await expect(banner).toBeVisible({ timeout: 15_000 });
+        await expect(banner).toContainText(/encrypted or DRM-protected/i);
+    } finally {
+        await closeElectronApp(app);
+        await fixtureServer.close();
+    }
+});
diff --git a/apps/electron-backend-e2e/src/database-worker-post-gc.e2e.ts b/apps/electron-backend-e2e/src/database-worker-post-gc.e2e.ts
new file mode 100644
index 000000000..14c2dc93e
--- /dev/null
+++ b/apps/electron-backend-e2e/src/database-worker-post-gc.e2e.ts
@@ -0,0 +1,122 @@
+import type { ElectronApplication, Page } from '@playwright/test';
+
+import {
+    closeElectronApp,
+    expect,
+    launchElectronApp,
+    test,
+    type LaunchedElectronApp,
+} from './electron-test-fixtures';
+import {
+    installMainCapture,
+    rolloverMainCapture,
+    startMainCapture,
+    stopMainCapture,
+} from './performance/m3u-refresh-main-capture';
+import type { MainCaptureMetrics } from './performance/m3u-refresh-cancellation-contract';
+import type { RendererWindowIdentity } from './performance/renderer-window-rss-session';
+
+test('captures the exact database worker post-GC heap in built Electron', async ({
+    dataDir,
+}) => {
+    const launchedApps: LaunchedElectronApp[] = [];
+
+    try {
+        const app = await launchElectronApp(dataDir, {
+            args: ['--js-flags=--expose-gc'],
+            env: {
+                IPTVNATOR_DB_WORKER_BATCH_DELAY_MS: '0',
+                IPTVNATOR_PERF_CAPTURE: '1',
+                IPTVNATOR_PERF_WORKER_PROFILING: '1',
+            },
+        });
+        launchedApps.push(app);
+        await installMainCapture(app.electronApp);
+        const rendererWindowIdentity = await resolveRendererWindowIdentity(
+            app.electronApp,
+            app.mainWindow
+        );
+        const captureOptions = {
+            diagnostic: false,
+            outputDirectory: dataDir,
+            rendererWindowIdentity,
+        } as const;
+
+        await startMainCapture(app.electronApp, captureOptions);
+        await requestDatabaseWorker(app);
+        const rollover = await rolloverMainCapture(
+            app.electronApp,
+            captureOptions
+        );
+        expect(rollover.nextCaptureStarted).toBe(true);
+        expect(rollover.nextCaptureUnavailableReason).toBeNull();
+        const firstDatabaseWorker = expectExactDatabaseWorker(
+            rollover.completedCapture
+        );
+
+        await requestDatabaseWorker(app);
+        const secondDatabaseWorker = expectExactDatabaseWorker(
+            await stopMainCapture(app.electronApp)
+        );
+        expect(secondDatabaseWorker.ordinal).toBe(firstDatabaseWorker.ordinal);
+
+        await startMainCapture(app.electronApp, captureOptions);
+        const noDatabasePhase = await stopMainCapture(app.electronApp);
+        expect(
+            noDatabasePhase.workers.filter(
+                (worker) => worker.kind === 'database.worker'
+            )
+        ).toHaveLength(0);
+    } finally {
+        await Promise.all(launchedApps.map((app) => closeElectronApp(app)));
+    }
+});
+
+async function requestDatabaseWorker(app: LaunchedElectronApp): Promise<void> {
+    await app.mainWindow.evaluate(() => window.electron.dbGetAppPlaylists());
+}
+
+function expectExactDatabaseWorker(capture: MainCaptureMetrics) {
+    const databaseWorkers = capture.workers.filter(
+        (worker) => worker.kind === 'database.worker'
+    );
+
+    expect(databaseWorkers).toHaveLength(1);
+    const databaseWorker = databaseWorkers[0];
+    expect(databaseWorker?.ordinal).toBeGreaterThan(0);
+    expect(databaseWorker?.postGcHeapUnavailableReason).toBeNull();
+    expect(databaseWorker?.postGcHeapUsedBytes).toBeGreaterThan(0);
+    expect(databaseWorker?.requests).toHaveLength(1);
+    expect(databaseWorker?.requests[0]).toEqual(
+        expect.objectContaining({
+            invalidReason: null,
+            operation: 'DB_GET_APP_PLAYLISTS',
+            performanceCaptureUnavailableReason: null,
+            playlistId: null,
+            requestId: expect.any(String),
+            success: true,
+        })
+    );
+    return databaseWorker;
+}
+
+async function resolveRendererWindowIdentity(
+    electronApp: ElectronApplication,
+    page: Page
+): Promise<RendererWindowIdentity> {
+    const browserWindowHandle = await electronApp.browserWindow(page);
+    try {
+        return await browserWindowHandle.evaluate((browserWindow) => {
+            const exactWindow = browserWindow as unknown as {
+                readonly id: number;
+                readonly webContents: { readonly id: number };
+            };
+            return {
+                browserWindowId: exactWindow.id,
+                webContentsId: exactWindow.webContents.id,
+            };
+        });
+    } finally {
+        await browserWindowHandle.dispose();
+    }
+}
diff --git a/apps/electron-backend-e2e/src/downloads.e2e.ts b/apps/electron-backend-e2e/src/downloads.e2e.ts
index 6810cc3c1..fe92a4208 100644
--- a/apps/electron-backend-e2e/src/downloads.e2e.ts
+++ b/apps/electron-backend-e2e/src/downloads.e2e.ts
@@ -1,4 +1,6 @@
-import { mkdirSync, readdirSync } from 'fs';
+import { mkdirSync, readdirSync, readFileSync, statSync } from 'fs';
+import { createServer } from 'http';
+import type { AddressInfo } from 'net';
 import { join } from 'path';
 import type { Page } from '@playwright/test';
 import {
@@ -17,6 +19,90 @@ async function openDownloadsPage(page: Page): Promise<void> {
     await page.waitForURL(/\/workspace\/downloads(?:\?.*)?$/);
 }
 
+interface RangeServerRequest {
+    ifRange?: string;
+    range?: string;
+}
+
+interface ThrottledRangeServer {
+    close: () => Promise<void>;
+    payload: Buffer;
+    requests: RangeServerRequest[];
+    url: string;
+}
+
+const RANGE_SERVER_ETAG = '"e2e-range-etag"';
+
+/**
+ * Serves a payload slowly on the first (full) request so the UI has a wide
+ * window to pause mid-transfer, and answers Range requests with an immediate
+ * 206 so the resumed transfer finishes fast. Records Range/If-Range headers.
+ */
+async function createThrottledRangeServer(): Promise<ThrottledRangeServer> {
+    const payload = Buffer.from(
+        Array.from({ length: 96 * 1024 }, (_, index) =>
+            String(index % 10)
+        ).join('')
+    );
+    const requests: RangeServerRequest[] = [];
+
+    const server = createServer((req, res) => {
+        const range = req.headers.range;
+        const ifRange = req.headers['if-range'];
+        requests.push({
+            ifRange: typeof ifRange === 'string' ? ifRange : undefined,
+            range: typeof range === 'string' ? range : undefined,
+        });
+
+        const offset = range
+            ? Number(/^bytes=(\d+)-$/.exec(range)?.[1] ?? Number.NaN)
+            : 0;
+        if (range && Number.isFinite(offset)) {
+            res.writeHead(206, {
+                'Content-Length': payload.length - offset,
+                'Content-Range': `bytes ${offset}-${payload.length - 1}/${payload.length}`,
+                'Content-Type': 'video/mp4',
+                ETag: RANGE_SERVER_ETAG,
+            });
+            res.end(payload.subarray(offset));
+            return;
+        }
+
+        res.writeHead(200, {
+            'Content-Length': payload.length,
+            'Content-Type': 'video/mp4',
+            ETag: RANGE_SERVER_ETAG,
+        });
+        // First 16 KiB immediately, then a trickle: the transfer stays alive
+        // for tens of seconds unless it is paused or resumed via Range.
+        let sent = 16 * 1024;
+        res.write(payload.subarray(0, sent));
+        const timer = setInterval(() => {
+            if (sent >= payload.length) {
+                clearInterval(timer);
+                res.end();
+                return;
+            }
+            res.write(payload.subarray(sent, sent + 2 * 1024));
+            sent += 2 * 1024;
+        }, 150);
+        res.on('close', () => clearInterval(timer));
+    });
+
+    await new Promise<void>((resolve) =>
+        server.listen(0, '127.0.0.1', resolve)
+    );
+    const { port } = server.address() as AddressInfo;
+
+    return {
+        close: () =>
+            new Promise<void>((resolve) => server.close(() => resolve())),
+        payload,
+        requests,
+        url: `http://127.0.0.1:${port}/media/e2e-pause-movie.mp4`,
+    };
+}
+
 /**
  * On a cold profile the renderer can query SQLite while the DB worker is
  * still creating tables ("database is locked" / "no such table" on slow CI
@@ -163,4 +249,104 @@ test.describe('Electron Downloads', () => {
             await fileServer.close();
         }
     });
+
+    test('@downloads @electron pauses a download, retains the partial, and resumes it with an HTTP Range request', async ({
+        dataDir,
+        request,
+    }) => {
+        await resetMockServers(request, ['xtream']);
+        const rangeServer = await createThrottledRangeServer();
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            await addXtreamPortal(app.mainWindow, {
+                name: 'Pause Portal',
+                username: 'user1',
+                password: 'pass1',
+            });
+            await waitForXtreamWorkspaceReady(app.mainWindow);
+            await openDownloadsPage(app.mainWindow);
+
+            const downloadsDir = join(dataDir, 'e2e-pause-downloads');
+            mkdirSync(downloadsDir, { recursive: true });
+            await app.electronApp.evaluate(({ dialog }, folder) => {
+                dialog.showOpenDialog = async () =>
+                    ({
+                        canceled: false,
+                        filePaths: [folder],
+                    }) as Awaited<ReturnType<typeof dialog.showOpenDialog>>;
+            }, downloadsDir);
+            await app.mainWindow
+                .getByRole('button', { name: 'Change Folder' })
+                .click();
+            await expect(
+                app.mainWindow.locator('.downloads__folder-inline-path')
+            ).toContainText('e2e-pause-downloads');
+
+            const startResult = await app.mainWindow.evaluate(
+                async ({ url, folder }) =>
+                    window.electron?.downloadsStart?.({
+                        playlistId: 'e2e-playlist',
+                        xtreamId: 7373,
+                        contentType: 'vod',
+                        title: 'E2E Pause Movie',
+                        url,
+                        downloadFolder: folder,
+                    }),
+                { url: rangeServer.url, folder: downloadsDir }
+            );
+            expect(startResult?.error ?? null).toBeNull();
+
+            const item = app.mainWindow.locator('.downloads__item');
+            await expect(item).toHaveCount(1, { timeout: 20000 });
+            await expect(item.locator('.downloads__item-status')).toContainText(
+                'Downloading',
+                { timeout: 20000 }
+            );
+
+            // Pause mid-transfer: the row flips to Paused and only a .part
+            // file exists on disk (final file absent, progress retained).
+            await item
+                .getByRole('button')
+                .filter({ hasText: 'pause' })
+                .click();
+            await expect(item.locator('.downloads__item-status')).toContainText(
+                'Paused',
+                { timeout: 20000 }
+            );
+            const pausedFiles = readdirSync(downloadsDir);
+            expect(pausedFiles).toEqual(['E2E Pause Movie.mp4.part']);
+            const pausedBytes = statSync(
+                join(downloadsDir, 'E2E Pause Movie.mp4.part')
+            ).size;
+            expect(pausedBytes).toBeGreaterThan(0);
+            expect(pausedBytes).toBeLessThan(rangeServer.payload.length);
+
+            // Resume: the runtime must continue via Range/If-Range instead of
+            // restarting, and the assembled file must match the payload.
+            await item
+                .getByRole('button')
+                .filter({ hasText: 'play_arrow' })
+                .click();
+            await expect(item.locator('.downloads__item-status')).toContainText(
+                'Completed',
+                { timeout: 30000 }
+            );
+
+            const resumeRequest = rangeServer.requests.find(
+                (entry) => entry.range
+            );
+            expect(resumeRequest?.range).toMatch(/^bytes=\d+-$/);
+            expect(resumeRequest?.ifRange).toBe(RANGE_SERVER_ETAG);
+
+            expect(readdirSync(downloadsDir)).toEqual(['E2E Pause Movie.mp4']);
+            const finalFile = readFileSync(
+                join(downloadsDir, 'E2E Pause Movie.mp4')
+            );
+            expect(finalFile.equals(rangeServer.payload)).toBe(true);
+        } finally {
+            await closeElectronApp(app);
+            await rangeServer.close();
+        }
+    });
 });
diff --git a/apps/electron-backend-e2e/src/electron-test-fixtures.ts b/apps/electron-backend-e2e/src/electron-test-fixtures.ts
index 48038d7d2..df1f1f025 100644
--- a/apps/electron-backend-e2e/src/electron-test-fixtures.ts
+++ b/apps/electron-backend-e2e/src/electron-test-fixtures.ts
@@ -9,14 +9,18 @@ import {
 } from '@playwright/test';
 import { createServer, Server } from 'http';
 import {
+    accessSync,
+    constants as fsConstants,
     existsSync,
     mkdtempSync,
+    readdirSync,
     readFileSync,
     rmSync,
+    statSync,
     writeFileSync,
 } from 'fs';
 import { tmpdir } from 'os';
-import { join, resolve } from 'path';
+import { dirname, join, resolve } from 'path';
 
 export const workspaceRoot = resolve(__dirname, '../../..');
 export const electronMainPath = join(
@@ -70,7 +74,8 @@ type ElectronFixtures = {
     dataDir: string;
 };
 
-type LaunchElectronAppOptions = {
+export type LaunchElectronAppOptions = {
+    args?: readonly string[];
     env?: Record<string, string | undefined>;
 };
 
@@ -138,7 +143,7 @@ export async function launchElectronApp(
     }
     assertPackagedRendererBuildIsElectronSafe();
 
-    const args = [electronMainPath];
+    const args = [...(options.args ?? []), electronMainPath];
 
     if (process.platform === 'linux' && process.env['CI']) {
         args.unshift('--no-sandbox', '--disable-gpu');
@@ -171,7 +176,142 @@ export async function launchElectronApp(
     };
 }
 
-function attachElectronProcessDiagnostics(electronApp: ElectronApplication): void {
+/**
+ * Resolve the x64 unpacked Linux executable produced by electron-builder.
+ * An explicit path wins so CI can point at an AppImage/Flatpak extraction
+ * without relying on electron-builder's local output directory names.
+ */
+export function resolvePackagedLinuxExecutable(
+    explicitPath = process.env['IPTVNATOR_E2E_PACKAGED_EXECUTABLE']
+): string | undefined {
+    if (explicitPath?.trim()) {
+        return resolve(explicitPath.trim());
+    }
+
+    const executablesRoot = join(workspaceRoot, 'dist', 'executables');
+    if (!existsSync(executablesRoot)) {
+        return undefined;
+    }
+
+    const unpackedDirectories = readdirSync(executablesRoot, {
+        withFileTypes: true,
+    })
+        .filter(
+            (entry) =>
+                entry.isDirectory() &&
+                entry.name.startsWith('linux') &&
+                entry.name.endsWith('-unpacked') &&
+                !entry.name.includes('arm')
+        )
+        .sort((left, right) => {
+            const leftPriority = left.name === 'linux-unpacked' ? 0 : 1;
+            const rightPriority = right.name === 'linux-unpacked' ? 0 : 1;
+            return (
+                leftPriority - rightPriority ||
+                left.name.localeCompare(right.name)
+            );
+        });
+
+    for (const directory of unpackedDirectories) {
+        for (const executableName of ['IPTVnator', 'iptvnator']) {
+            const candidate = join(
+                executablesRoot,
+                directory.name,
+                executableName
+            );
+            try {
+                accessSync(candidate, fsConstants.X_OK);
+                if (statSync(candidate).isFile()) {
+                    return candidate;
+                }
+            } catch {
+                // Keep looking for the next unpacked x64 layout.
+            }
+        }
+    }
+
+    return undefined;
+}
+
+export function getPackagedLinuxNativeDir(executablePath: string): string {
+    return join(
+        dirname(resolve(executablePath)),
+        'resources',
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+}
+
+export function resolvePackagedElectronLaunchArgs(
+    getuid: (() => number) | undefined
+): string[] {
+    const args = ['--ignore-gpu-blocklist'];
+    if (typeof getuid === 'function' && getuid() === 0) {
+        args.push('--no-sandbox');
+    }
+    return args;
+}
+
+/**
+ * Launch a real packaged Linux executable. Unlike the regular source E2E
+ * launcher, this deliberately keeps Chromium's GPU path enabled and ignores
+ * its GPU blocklist: the frame-copy smoke sets LIBGL_ALWAYS_SOFTWARE=1, and
+ * CI's llvmpipe WebGL2 context must prove that the shared-memory frame reaches
+ * the renderer canvas.
+ */
+export async function launchPackagedElectronApp(
+    executablePath: string,
+    dataDir: string,
+    options: LaunchElectronAppOptions = {}
+): Promise<LaunchedElectronApp> {
+    if (process.platform !== 'linux') {
+        throw new Error(
+            'The packaged embedded-MPV launcher is available on Linux only.'
+        );
+    }
+
+    const resolvedExecutablePath = resolve(executablePath);
+    try {
+        accessSync(resolvedExecutablePath, fsConstants.X_OK);
+        if (!statSync(resolvedExecutablePath).isFile()) {
+            throw new Error('not a regular file');
+        }
+    } catch (error) {
+        throw new Error(
+            `Packaged Linux executable is not a regular executable file at ${resolvedExecutablePath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+
+    const electronApp = await electron.launch({
+        executablePath: resolvedExecutablePath,
+        args: resolvePackagedElectronLaunchArgs(process.getuid),
+        env: {
+            ...process.env,
+            IPTVNATOR_ALLOW_PRIVATE_NETWORK_URLS:
+                process.env['IPTVNATOR_ALLOW_PRIVATE_NETWORK_URLS'] ?? '1',
+            ...options.env,
+            ELECTRON_IS_DEV: '0',
+            IPTVNATOR_E2E_DATA_DIR: dataDir,
+            NODE_ENV: 'test',
+        },
+    });
+    attachElectronProcessDiagnostics(electronApp);
+
+    const mainWindow = await findMainWindow(electronApp);
+    await waitForAppReady(mainWindow);
+
+    return {
+        electronApp,
+        mainWindow,
+    };
+}
+
+function attachElectronProcessDiagnostics(
+    electronApp: ElectronApplication
+): void {
     if (!process.env['CI']) {
         return;
     }
@@ -235,10 +375,7 @@ async function waitForPromiseWithTimeout(
         return await Promise.race([
             promise.then(() => true),
             new Promise<boolean>((resolvePromise) => {
-                timeoutId = setTimeout(
-                    () => resolvePromise(false),
-                    timeoutMs
-                );
+                timeoutId = setTimeout(() => resolvePromise(false), timeoutMs);
             }),
         ]);
     } finally {
@@ -297,11 +434,11 @@ async function waitForAppReady(page: Page): Promise<void> {
     } catch (error) {
         const diagnostics = await page.evaluate(() => ({
             appRootLength:
-                document.querySelector('app-root')?.innerHTML.trim().length ?? 0,
+                document.querySelector('app-root')?.innerHTML.trim().length ??
+                0,
             baseHref:
-                document
-                    .querySelector('base')
-                    ?.getAttribute('href') ?? '<missing>',
+                document.querySelector('base')?.getAttribute('href') ??
+                '<missing>',
             readyState: document.readyState,
             title: document.title,
             url: location.href,
@@ -357,7 +494,7 @@ export async function importM3uPlaylistFromNativeDialog(
     const fileInput = dialog.locator('input[type="file"][name="playlist"]');
 
     await fileInput.evaluate((element, selectedFilePath) => {
-        (element as HTMLInputElement).dataset.filePathOverride =
+        (element as HTMLInputElement).dataset['filePathOverride'] =
             selectedFilePath;
     }, filePath);
     await fileInput.setInputFiles(filePath);
@@ -501,15 +638,17 @@ async function clickDialogMethodOption(
     label: RegExp,
     legacySelector?: string
 ): Promise<void> {
-    const optionByRadio = dialog
-        .getByRole('radio', { name: label })
-        .first();
+    const optionByRadio = dialog.getByRole('radio', { name: label }).first();
     if ((await optionByRadio.count()) > 0) {
         await optionByRadio.click();
         return;
     }
 
-    for (const tablistLabel of ['Source method', 'Playlist category', 'M3U source']) {
+    for (const tablistLabel of [
+        'Source method',
+        'Playlist category',
+        'M3U source',
+    ]) {
         const tablist = dialog
             .locator(`[role="tablist"][aria-label="${tablistLabel}"]`)
             .first();
@@ -541,9 +680,7 @@ async function clickDialogMethodOption(
     }
 
     if (!legacySelector) {
-        throw new Error(
-            `Could not find dialog option matching ${label}.`
-        );
+        throw new Error(`Could not find dialog option matching ${label}.`);
     }
 
     await dialog.locator(legacySelector).click();
@@ -632,8 +769,23 @@ export async function enableRemoteControl(
 export async function saveSettings(page: Page): Promise<void> {
     const saveButton = page.getByTestId('save-settings');
 
-    await saveButton.click();
+    // The save control is a native form submit (`<button type="submit">`
+    // inside `<form (ngSubmit)="onSubmit()">`). Clicking it makes Chromium
+    // register a form-submission navigation, which Angular's `ngSubmit`
+    // handler immediately cancels via `preventDefault()` — no real navigation
+    // ever happens. Playwright's default post-click "wait for signals" barrier
+    // still observes that requested-then-cancelled navigation and waits for it
+    // to settle; on slow/loaded CI runners that wait can stall for the full
+    // timeout ("waiting for scheduled navigations to finish"). We never depend
+    // on a navigation here, so opt out of the barrier and instead assert the
+    // deterministic post-save state below.
+    await saveButton.click({ noWaitAfter: true });
+    // `onSubmit()` calls `applyChangedSettings()` -> `markAsPristine()` once the
+    // settings write resolves, which disables the button. Awaiting that is a
+    // stronger, race-free confirmation that the save actually committed.
     await expect(saveButton).toBeDisabled();
+    // Let the fire-and-forget `window.electron.updateSettings(...)` IPC flush to
+    // the main process before callers may relaunch the app to assert persistence.
     await page.waitForTimeout(300);
 }
 
@@ -689,9 +841,7 @@ export function buildM3uContent(channels: M3uTestChannel[]): string {
         const attributes = [
             channel.tvgId ? `tvg-id="${channel.tvgId}"` : '',
             channel.tvgCountry ? `tvg-country="${channel.tvgCountry}"` : '',
-            channel.tvgLanguage
-                ? `tvg-language="${channel.tvgLanguage}"`
-                : '',
+            channel.tvgLanguage ? `tvg-language="${channel.tvgLanguage}"` : '',
             channel.tvgName ? `tvg-name="${channel.tvgName}"` : '',
             channel.logo ? `tvg-logo="${channel.logo}"` : '',
             channel.groupTitle ? `group-title="${channel.groupTitle}"` : '',
@@ -874,9 +1024,7 @@ export async function switchUnifiedCollectionContent(
     await clickButtonToggleOption(toggleGroup, contentLabel);
 }
 
-export async function clearCurrentUnifiedCollection(
-    page: Page
-): Promise<void> {
+export async function clearCurrentUnifiedCollection(page: Page): Promise<void> {
     await page
         .getByRole('button', {
             name: /Clear .* (favorites|recently viewed)/i,
@@ -1449,6 +1597,15 @@ export async function expectWorkspaceSearchStatus(
     ).toHaveText(expected);
 }
 
+/** The degraded-search hint chip must be absent (e.g. complete local search). */
+export async function expectNoWorkspaceSearchStatus(
+    page: Page
+): Promise<void> {
+    await expect(
+        page.locator('app-workspace-shell-header .search-chip--status')
+    ).toHaveCount(0);
+}
+
 async function startPortalDebugCapture(page: Page): Promise<void> {
     await page.evaluate(() => {
         const electronApi = window.electron as typeof window.electron & {
diff --git a/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.tests.ts b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.tests.ts
new file mode 100644
index 000000000..191f7688d
--- /dev/null
+++ b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.tests.ts
@@ -0,0 +1,288 @@
+import assert = require('node:assert/strict');
+import {
+    chmodSync,
+    existsSync,
+    lstatSync,
+    mkdtempSync,
+    mkdirSync,
+    readFileSync,
+    readlinkSync,
+    rmSync,
+    statSync,
+    symlinkSync,
+    writeFileSync,
+} from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, it } from 'node:test';
+import {
+    createDisposablePackagedLinuxApp,
+    createPackagedEntryGuard,
+    readPackagedRuntimeIdentity,
+} from './embedded-mpv-frame-copy-packaged-filesystem';
+
+const temporaryDirectories = new Set<string>();
+
+type PackageFixture = {
+    executablePath: string;
+    libmpvAliasPath: string;
+    libmpvSonamePath: string;
+    nativeDir: string;
+    packageRoot: string;
+    payloadPath: string;
+    runtimeManifestPath: string;
+};
+
+function createPackageFixture(): PackageFixture {
+    const packageRoot = mkdtempSync(
+        join(tmpdir(), 'iptvnator-packaged-fixture-source-')
+    );
+    temporaryDirectories.add(packageRoot);
+    const executablePath = join(packageRoot, 'IPTVnator');
+    const nativeDir = join(
+        packageRoot,
+        'resources',
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    const payloadPath = join(packageRoot, 'resources', 'payload.bin');
+    const runtimeManifestPath = join(nativeDir, 'embedded-mpv-runtime.json');
+    const runtimeLibraryDir = join(nativeDir, 'lib');
+    const libmpvSonamePath = join(runtimeLibraryDir, 'libmpv.so.2');
+    const libmpvAliasPath = join(runtimeLibraryDir, 'libmpv.so');
+
+    mkdirSync(runtimeLibraryDir, { recursive: true });
+    writeFileSync(executablePath, '#!/bin/sh\nexit 0\n');
+    chmodSync(executablePath, 0o755);
+    writeFileSync(payloadPath, 'packaged payload');
+    chmodSync(payloadPath, 0o640);
+    writeFileSync(libmpvSonamePath, 'packaged libmpv');
+    symlinkSync('libmpv.so.2', libmpvAliasPath);
+    writeFileSync(
+        runtimeManifestPath,
+        JSON.stringify({
+            arch: 'x64',
+            libmpvSoname: 'libmpv.so.2',
+            platform: 'linux',
+            profile: 'portable',
+            runtimeMode: 'bundled',
+        })
+    );
+
+    if (process.platform !== 'win32') {
+        symlinkSync(
+            'payload.bin',
+            join(packageRoot, 'resources', 'payload-link')
+        );
+    }
+
+    return {
+        executablePath,
+        libmpvAliasPath,
+        libmpvSonamePath,
+        nativeDir,
+        packageRoot,
+        payloadPath,
+        runtimeManifestPath,
+    };
+}
+
+function entryExists(entryPath: string): boolean {
+    try {
+        lstatSync(entryPath);
+        return true;
+    } catch (error) {
+        if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
+
+afterEach(() => {
+    for (const directory of temporaryDirectories) {
+        rmSync(directory, { force: true, recursive: true });
+    }
+    temporaryDirectories.clear();
+});
+
+describe('disposable unpacked package clone', () => {
+    it('requires a safe versioned libmpv target in the packaged manifest', () => {
+        const source = createPackageFixture();
+
+        assert.equal(
+            readPackagedRuntimeIdentity(source.nativeDir).libmpvSoname,
+            'libmpv.so.2'
+        );
+
+        writeFileSync(
+            source.runtimeManifestPath,
+            JSON.stringify({
+                arch: 'x64',
+                libmpvSoname: '../libmpv.so.2',
+                platform: 'linux',
+                profile: 'portable',
+                runtimeMode: 'bundled',
+            })
+        );
+        assert.throws(
+            () => readPackagedRuntimeIdentity(source.nativeDir),
+            /libmpvSoname/
+        );
+    });
+
+    it('hides and restores a cloned regular dependency without changing the source package', () => {
+        const source = createPackageFixture();
+        const clone = createDisposablePackagedLinuxApp(source.executablePath);
+        temporaryDirectories.add(clone.temporaryRoot);
+
+        const clonedLibmpvPath = join(clone.nativeDir, 'lib', 'libmpv.so.2');
+        const guard = createPackagedEntryGuard(clonedLibmpvPath, {
+            expectedKind: 'regular-file',
+            hiddenDirectory: clone.temporaryRoot,
+        });
+
+        try {
+            assert.equal(lstatSync(clonedLibmpvPath).isFile(), true);
+            assert.equal(
+                statSync(clonedLibmpvPath).ino,
+                statSync(source.libmpvSonamePath).ino
+            );
+
+            guard.hide();
+
+            assert.equal(entryExists(clonedLibmpvPath), false);
+            assert.equal(lstatSync(source.libmpvSonamePath).isFile(), true);
+            assert.equal(
+                readFileSync(source.libmpvSonamePath, 'utf8'),
+                'packaged libmpv'
+            );
+
+            guard.restore();
+
+            assert.equal(lstatSync(clonedLibmpvPath).isFile(), true);
+            assert.equal(
+                statSync(clonedLibmpvPath).ino,
+                statSync(source.libmpvSonamePath).ino
+            );
+        } finally {
+            guard.restore();
+            clone.cleanup();
+            temporaryDirectories.delete(clone.temporaryRoot);
+        }
+
+        assert.equal(entryExists(source.libmpvSonamePath), true);
+    });
+
+    it('hides and restores a cloned symbolic link without dereferencing it', () => {
+        const source = createPackageFixture();
+        const clone = createDisposablePackagedLinuxApp(source.executablePath);
+        temporaryDirectories.add(clone.temporaryRoot);
+
+        const clonedAliasPath = join(clone.nativeDir, 'lib', 'libmpv.so');
+        const guard = createPackagedEntryGuard(clonedAliasPath, {
+            expectedKind: 'symbolic-link',
+            hiddenDirectory: clone.temporaryRoot,
+        });
+
+        try {
+            guard.hide();
+            assert.equal(entryExists(clonedAliasPath), false);
+            assert.equal(
+                lstatSync(source.libmpvAliasPath).isSymbolicLink(),
+                true
+            );
+            assert.equal(readlinkSync(source.libmpvAliasPath), 'libmpv.so.2');
+
+            guard.restore();
+            assert.equal(lstatSync(clonedAliasPath).isSymbolicLink(), true);
+            assert.equal(readlinkSync(clonedAliasPath), 'libmpv.so.2');
+        } finally {
+            guard.restore();
+            clone.cleanup();
+            temporaryDirectories.delete(clone.temporaryRoot);
+        }
+    });
+
+    it('hardlinks regular files and preserves modes, symlinks, and the source manifest', () => {
+        const source = createPackageFixture();
+        const clone = createDisposablePackagedLinuxApp(source.executablePath);
+        temporaryDirectories.add(clone.temporaryRoot);
+
+        try {
+            assert.notEqual(clone.packageRoot, source.packageRoot);
+            assert.equal(
+                statSync(clone.executablePath).mode & 0o777,
+                statSync(source.executablePath).mode & 0o777
+            );
+
+            const clonedPayloadPath = join(
+                clone.packageRoot,
+                'resources',
+                'payload.bin'
+            );
+            assert.equal(
+                statSync(clonedPayloadPath).ino,
+                statSync(source.payloadPath).ino
+            );
+            assert.equal(statSync(clonedPayloadPath).mode & 0o777, 0o640);
+
+            if (process.platform !== 'win32') {
+                const clonedLinkPath = join(
+                    clone.packageRoot,
+                    'resources',
+                    'payload-link'
+                );
+                assert.equal(lstatSync(clonedLinkPath).isSymbolicLink(), true);
+                assert.equal(readlinkSync(clonedLinkPath), 'payload.bin');
+            }
+
+            const clonedRuntimeManifestPath = join(
+                clone.nativeDir,
+                'embedded-mpv-runtime.json'
+            );
+            assert.equal(existsSync(clonedRuntimeManifestPath), true);
+            assert.equal(existsSync(source.runtimeManifestPath), true);
+        } finally {
+            clone.cleanup();
+            temporaryDirectories.delete(clone.temporaryRoot);
+        }
+
+        assert.equal(existsSync(clone.temporaryRoot), false);
+        assert.equal(existsSync(source.runtimeManifestPath), true);
+    });
+
+    it('copies a regular file when hardlinking is unavailable', () => {
+        const source = createPackageFixture();
+        const clone = createDisposablePackagedLinuxApp(source.executablePath, {
+            linkFile() {
+                throw Object.assign(new Error('cross-device hardlink'), {
+                    code: 'EXDEV',
+                });
+            },
+        });
+        temporaryDirectories.add(clone.temporaryRoot);
+
+        try {
+            assert.equal(statSync(clone.executablePath).mode & 0o777, 0o755);
+            const clonedPayloadPath = join(
+                clone.packageRoot,
+                'resources',
+                'payload.bin'
+            );
+            assert.equal(
+                readFileSync(clonedPayloadPath, 'utf8'),
+                readFileSync(source.payloadPath, 'utf8')
+            );
+            assert.notEqual(
+                statSync(clonedPayloadPath).ino,
+                statSync(source.payloadPath).ino
+            );
+            assert.equal(statSync(clonedPayloadPath).mode & 0o777, 0o640);
+        } finally {
+            clone.cleanup();
+            temporaryDirectories.delete(clone.temporaryRoot);
+        }
+    });
+});
diff --git a/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.ts b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.ts
new file mode 100644
index 000000000..69d0c0a19
--- /dev/null
+++ b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-filesystem.ts
@@ -0,0 +1,255 @@
+import {
+    chmodSync,
+    copyFileSync,
+    linkSync,
+    lstatSync,
+    mkdirSync,
+    mkdtempSync,
+    readFileSync,
+    readdirSync,
+    readlinkSync,
+    renameSync,
+    rmSync,
+    symlinkSync,
+    type Stats,
+} from 'fs';
+import { tmpdir } from 'os';
+import { basename, dirname, join, resolve } from 'path';
+import { getPackagedLinuxNativeDir } from './electron-test-fixtures';
+
+export type DisposablePackagedLinuxApp = {
+    cleanup: () => void;
+    executablePath: string;
+    nativeDir: string;
+    packageRoot: string;
+    temporaryRoot: string;
+};
+
+export type DisposablePackagedLinuxAppOptions = {
+    linkFile?: (existingPath: string, newPath: string) => void;
+};
+
+export type PackagedRuntimeIdentity = {
+    arch: string;
+    libmpvSoname: string;
+    platform: string;
+    profile: string;
+    runtimeMode: string;
+};
+
+export type PackagedEntryKind = 'regular-file' | 'symbolic-link';
+
+export type PackagedEntryGuard = {
+    hide: () => void;
+    restore: () => void;
+};
+
+export type PackagedEntryGuardOptions = {
+    expectedKind: PackagedEntryKind;
+    hiddenDirectory: string;
+};
+
+const HARDLINK_COPY_FALLBACK_CODES = new Set([
+    'EACCES',
+    'EMLINK',
+    'ENOSYS',
+    'ENOTSUP',
+    'EPERM',
+    'EXDEV',
+]);
+const VERSIONED_LIBMPV_PATTERN = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+
+function entryKindMatches(
+    stats: Stats,
+    expectedKind: PackagedEntryKind
+): boolean {
+    return expectedKind === 'regular-file'
+        ? stats.isFile() && !stats.isSymbolicLink()
+        : stats.isSymbolicLink();
+}
+
+function entryExistsByLstat(entryPath: string): boolean {
+    try {
+        lstatSync(entryPath);
+        return true;
+    } catch (error) {
+        if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
+
+function clonePackagedEntry(
+    sourcePath: string,
+    destinationPath: string,
+    linkFile: (existingPath: string, newPath: string) => void
+): void {
+    const sourceStats = lstatSync(sourcePath);
+
+    if (sourceStats.isDirectory()) {
+        mkdirSync(destinationPath);
+        for (const entry of readdirSync(sourcePath)) {
+            clonePackagedEntry(
+                join(sourcePath, entry),
+                join(destinationPath, entry),
+                linkFile
+            );
+        }
+        chmodSync(destinationPath, sourceStats.mode & 0o7777);
+        return;
+    }
+
+    if (sourceStats.isSymbolicLink()) {
+        symlinkSync(readlinkSync(sourcePath), destinationPath);
+        return;
+    }
+
+    if (!sourceStats.isFile()) {
+        throw new Error(
+            `Unsupported packaged runtime entry type at ${sourcePath}.`
+        );
+    }
+
+    try {
+        linkFile(sourcePath, destinationPath);
+    } catch (error) {
+        const code = (error as NodeJS.ErrnoException).code;
+        if (!code || !HARDLINK_COPY_FALLBACK_CODES.has(code)) {
+            throw error;
+        }
+        copyFileSync(sourcePath, destinationPath);
+        chmodSync(destinationPath, sourceStats.mode & 0o7777);
+    }
+}
+
+export function createDisposablePackagedLinuxApp(
+    executablePath: string,
+    options: DisposablePackagedLinuxAppOptions = {}
+): DisposablePackagedLinuxApp {
+    const sourceExecutablePath = resolve(executablePath);
+    const sourcePackageRoot = dirname(sourceExecutablePath);
+    const temporaryRoot = mkdtempSync(
+        join(tmpdir(), 'iptvnator-packaged-frame-copy-')
+    );
+    const packageRoot = join(temporaryRoot, basename(sourcePackageRoot));
+    let cleaned = false;
+
+    try {
+        clonePackagedEntry(
+            sourcePackageRoot,
+            packageRoot,
+            options.linkFile ?? linkSync
+        );
+    } catch (error) {
+        rmSync(temporaryRoot, { force: true, recursive: true });
+        throw error;
+    }
+
+    const clonedExecutablePath = join(
+        packageRoot,
+        basename(sourceExecutablePath)
+    );
+    return {
+        cleanup() {
+            if (cleaned) {
+                return;
+            }
+            rmSync(temporaryRoot, { force: true, recursive: true });
+            cleaned = true;
+        },
+        executablePath: clonedExecutablePath,
+        nativeDir: getPackagedLinuxNativeDir(clonedExecutablePath),
+        packageRoot,
+        temporaryRoot,
+    };
+}
+
+export function createPackagedEntryGuard(
+    entryPath: string,
+    options: PackagedEntryGuardOptions
+): PackagedEntryGuard {
+    const guardedEntryPath = resolve(entryPath);
+    const hiddenDirectory = resolve(options.hiddenDirectory);
+    const hiddenEntryPath = join(
+        hiddenDirectory,
+        `.${basename(guardedEntryPath)}.e2e-hidden-${process.pid}`
+    );
+    let hidden = false;
+
+    return {
+        hide() {
+            const entryStats = lstatSync(guardedEntryPath);
+            if (!entryKindMatches(entryStats, options.expectedKind)) {
+                throw new Error(
+                    `Packaged entry is not a ${options.expectedKind}: ${guardedEntryPath}`
+                );
+            }
+            const hiddenDirectoryStats = lstatSync(hiddenDirectory);
+            if (
+                hiddenDirectoryStats.isSymbolicLink() ||
+                !hiddenDirectoryStats.isDirectory()
+            ) {
+                throw new Error(
+                    `Packaged entry stash is not a regular directory: ${hiddenDirectory}`
+                );
+            }
+            if (entryExistsByLstat(hiddenEntryPath)) {
+                throw new Error(
+                    `Stale hidden packaged entry exists: ${hiddenEntryPath}`
+                );
+            }
+            renameSync(guardedEntryPath, hiddenEntryPath);
+            hidden = true;
+        },
+        restore() {
+            if (!hidden) {
+                return;
+            }
+            if (!entryExistsByLstat(hiddenEntryPath)) {
+                throw new Error(
+                    `Hidden packaged entry disappeared before restore: ${hiddenEntryPath}`
+                );
+            }
+            if (entryExistsByLstat(guardedEntryPath)) {
+                throw new Error(
+                    `Refusing to overwrite packaged entry during restore: ${guardedEntryPath}`
+                );
+            }
+            renameSync(hiddenEntryPath, guardedEntryPath);
+            hidden = false;
+        },
+    };
+}
+
+export function readPackagedRuntimeIdentity(
+    nativeDir: string
+): PackagedRuntimeIdentity {
+    const runtimeManifestPath = join(nativeDir, 'embedded-mpv-runtime.json');
+    const parsed = JSON.parse(
+        readFileSync(runtimeManifestPath, 'utf8')
+    ) as Partial<PackagedRuntimeIdentity>;
+
+    for (const field of [
+        'arch',
+        'platform',
+        'profile',
+        'runtimeMode',
+    ] as const) {
+        if (typeof parsed[field] !== 'string' || !parsed[field]) {
+            throw new Error(
+                `Packaged runtime manifest ${field} is invalid at ${runtimeManifestPath}.`
+            );
+        }
+    }
+    if (
+        typeof parsed.libmpvSoname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(parsed.libmpvSoname)
+    ) {
+        throw new Error(
+            `Packaged runtime manifest libmpvSoname is invalid at ${runtimeManifestPath}.`
+        );
+    }
+
+    return parsed as PackagedRuntimeIdentity;
+}
diff --git a/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.spec.ts b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.spec.ts
new file mode 100644
index 000000000..7e9130f5e
--- /dev/null
+++ b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.spec.ts
@@ -0,0 +1,191 @@
+import assert = require('node:assert/strict');
+import { readFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { describe, it } from 'node:test';
+import { isMeaningfulNativePlaybackSnapshot } from './embedded-mpv-frame-copy-packaged-fixtures';
+import './embedded-mpv-frame-copy-packaged-filesystem.tests';
+import { resolvePackagedElectronLaunchArgs } from './electron-test-fixtures';
+import packagedPlaywrightConfig from '../playwright.packaged.config';
+
+const projectRoot = resolve(__dirname, '..');
+
+describe('packaged Electron launch arguments', () => {
+    it('keeps WebGL enabled for software rendering while disabling the sandbox only as root', () => {
+        assert.deepEqual(
+            resolvePackagedElectronLaunchArgs(() => 1000),
+            ['--ignore-gpu-blocklist']
+        );
+        assert.deepEqual(resolvePackagedElectronLaunchArgs(undefined), [
+            '--ignore-gpu-blocklist',
+        ]);
+        assert.deepEqual(
+            resolvePackagedElectronLaunchArgs(() => 0),
+            ['--ignore-gpu-blocklist', '--no-sandbox']
+        );
+    });
+});
+
+describe('native-view playback proof', () => {
+    it('requires the loaded URL, a playing or paused state, and positive duration', () => {
+        const expectedUrl = 'http://127.0.0.1:3210/fixture.y4m';
+        const baseSnapshot = {
+            durationSeconds: 2,
+            status: 'playing',
+            streamUrl: expectedUrl,
+        };
+
+        assert.equal(
+            isMeaningfulNativePlaybackSnapshot(baseSnapshot, expectedUrl),
+            true
+        );
+        assert.equal(
+            isMeaningfulNativePlaybackSnapshot(
+                { ...baseSnapshot, status: 'paused' },
+                `${expectedUrl}#ignored`
+            ),
+            true
+        );
+        assert.equal(
+            isMeaningfulNativePlaybackSnapshot(
+                { ...baseSnapshot, durationSeconds: null },
+                expectedUrl
+            ),
+            false
+        );
+        assert.equal(
+            isMeaningfulNativePlaybackSnapshot(
+                { ...baseSnapshot, status: 'idle' },
+                expectedUrl
+            ),
+            false
+        );
+        assert.equal(
+            isMeaningfulNativePlaybackSnapshot(
+                { ...baseSnapshot, streamUrl: `${expectedUrl}?other=1` },
+                expectedUrl
+            ),
+            false
+        );
+    });
+
+    it('loads the fixture and observes playback before disposing the native session', () => {
+        const source = readFileSync(
+            join(projectRoot, 'src', 'embedded-mpv-frame-copy-packaged.e2e.ts'),
+            'utf8'
+        );
+        const fallbackStart = source.indexOf('const launchedFallbackApp');
+        const captureIndex = source.indexOf(
+            'installEmbeddedMpvSessionCapture',
+            fallbackStart
+        );
+        const loadIndex = source.indexOf(
+            'loadEmbeddedMpvPlayback',
+            fallbackStart
+        );
+        const proofIndex = source.indexOf(
+            'isMeaningfulNativePlaybackSnapshot',
+            fallbackStart
+        );
+        const exitCodeIndex = source.indexOf(
+            'electronApp.process().exitCode',
+            fallbackStart
+        );
+        const disposeIndex = source.indexOf(
+            'disposeEmbeddedMpvSession',
+            fallbackStart
+        );
+
+        assert.ok(fallbackStart >= 0);
+        assert.ok(captureIndex > fallbackStart);
+        assert.ok(loadIndex > captureIndex);
+        assert.ok(proofIndex > loadIndex);
+        assert.ok(exitCodeIndex > proofIndex);
+        assert.ok(disposeIndex > exitCodeIndex);
+    });
+
+    it('removes the manifest-declared libmpv target and expects the stable missing-library reason', () => {
+        const source = readFileSync(
+            join(projectRoot, 'src', 'embedded-mpv-frame-copy-packaged.e2e.ts'),
+            'utf8'
+        );
+        const manifestIdentityIndex = source.indexOf(
+            'const runtimeIdentity = readPackagedRuntimeIdentity'
+        );
+        const guardIndex = source.indexOf(
+            'createPackagedEntryGuard(',
+            manifestIdentityIndex
+        );
+        const sonameIndex = source.indexOf(
+            'runtimeIdentity.libmpvSoname',
+            guardIndex
+        );
+        const hideIndex = source.indexOf('.hide()', sonameIndex);
+        const fallbackStart = source.indexOf(
+            'const launchedFallbackApp',
+            hideIndex
+        );
+        const missingReasonIndex = source.indexOf(
+            "frameCopyUnavailableReason: 'runtime-library-missing'",
+            fallbackStart
+        );
+
+        assert.ok(manifestIdentityIndex >= 0);
+        assert.ok(guardIndex > manifestIdentityIndex);
+        assert.ok(sonameIndex > guardIndex);
+        assert.ok(hideIndex > sonameIndex);
+        assert.ok(fallbackStart > hideIndex);
+        assert.ok(missingReasonIndex > fallbackStart);
+        assert.doesNotMatch(source, /createRuntimeManifestGuard/);
+        assert.doesNotMatch(source, /runtimeManifest\.hide/);
+    });
+});
+
+describe('dedicated packaged smoke target', () => {
+    it('inherits the GL mode from the workflow environment', () => {
+        const source = readFileSync(
+            join(projectRoot, 'src', 'embedded-mpv-frame-copy-packaged.e2e.ts'),
+            'utf8'
+        );
+
+        assert.doesNotMatch(source, /LIBGL_ALWAYS_SOFTWARE\s*:/);
+    });
+
+    it('does not build the backend or start portal mock servers', () => {
+        const project = JSON.parse(
+            readFileSync(join(projectRoot, 'project.json'), 'utf8')
+        ) as {
+            targets?: Record<
+                string,
+                {
+                    cache?: boolean;
+                    dependsOn?: unknown;
+                    options?: { command?: string };
+                }
+            >;
+        };
+        const target = project.targets?.['packaged-frame-copy-smoke'];
+        const packagedConfig = readFileSync(
+            join(projectRoot, 'playwright.packaged.config.ts'),
+            'utf8'
+        );
+
+        if (!target) {
+            throw new Error('The packaged frame-copy smoke target is missing.');
+        }
+        assert.equal(target.cache, false);
+        assert.deepEqual(target.dependsOn, [
+            'test-packaged-frame-copy-fixtures',
+        ]);
+        assert.match(
+            target.options?.command ?? '',
+            /playwright\.packaged\.config\.ts/
+        );
+        assert.match(
+            target.options?.command ?? '',
+            /embedded-mpv-frame-copy-packaged\.e2e\.ts/
+        );
+        assert.match(packagedConfig, /timeout:\s*120000/);
+        assert.match(packagedConfig, /webServer:\s*\[\]/);
+        assert.deepEqual(packagedPlaywrightConfig.webServer, []);
+    });
+});
diff --git a/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.ts b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.ts
new file mode 100644
index 000000000..31c888631
--- /dev/null
+++ b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged-fixtures.ts
@@ -0,0 +1,344 @@
+import type {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+} from '@iptvnator/shared/interfaces';
+import { spawnSync } from 'child_process';
+import { createServer, type Server } from 'http';
+import sharp = require('sharp');
+import {
+    closeElectronApp,
+    expect,
+    type LaunchedElectronApp,
+} from './electron-test-fixtures';
+import type {
+    DisposablePackagedLinuxApp,
+    PackagedEntryGuard,
+} from './embedded-mpv-frame-copy-packaged-filesystem';
+
+declare global {
+    interface Window {
+        __packagedEmbeddedMpvSessions?: EmbeddedMpvSession[];
+        __packagedEmbeddedMpvUnsubscribe?: () => void;
+    }
+}
+
+export type LocalMediaServer = {
+    close: () => Promise<void>;
+    url: string;
+};
+
+function createTwoSecondY4mFixture(): Buffer {
+    const width = 64;
+    const height = 36;
+    const framesPerSecond = 10;
+    const frameCount = framesPerSecond * 2;
+    const yPlaneBytes = width * height;
+    const chromaPlaneBytes = (width / 2) * (height / 2);
+    const chunks: Buffer[] = [
+        Buffer.from(
+            `YUV4MPEG2 W${width} H${height} F${framesPerSecond}:1 Ip A1:1 C420jpeg\n`,
+            'ascii'
+        ),
+    ];
+
+    for (let index = 0; index < frameCount; index += 1) {
+        const evenFrame = index % 2 === 0;
+        chunks.push(
+            Buffer.from('FRAME\n', 'ascii'),
+            Buffer.alloc(yPlaneBytes, evenFrame ? 76 : 150),
+            Buffer.alloc(chromaPlaneBytes, evenFrame ? 84 : 44),
+            Buffer.alloc(chromaPlaneBytes, evenFrame ? 255 : 21)
+        );
+    }
+
+    return Buffer.concat(chunks);
+}
+
+async function listen(server: Server): Promise<void> {
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        const onError = (error: Error) => {
+            server.off('listening', onListening);
+            rejectPromise(error);
+        };
+        const onListening = () => {
+            server.off('error', onError);
+            resolvePromise();
+        };
+
+        server.once('error', onError);
+        server.once('listening', onListening);
+        server.listen(0, '127.0.0.1');
+    });
+}
+
+async function closeServer(server: Server): Promise<void> {
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.close((error) => {
+            if (error) {
+                rejectPromise(error);
+                return;
+            }
+            resolvePromise();
+        });
+    });
+}
+
+export async function createLocalMediaServer(): Promise<LocalMediaServer> {
+    const body = createTwoSecondY4mFixture();
+    const resourcePath = '/embedded-mpv-frame-copy-smoke.y4m';
+    const server = createServer((request, response) => {
+        const pathname = (request.url ?? '').split('?')[0];
+        if (pathname !== resourcePath) {
+            response.writeHead(404).end();
+            return;
+        }
+
+        const range = request.headers.range?.match(/^bytes=(\d+)-(\d*)$/);
+        if (!range) {
+            response.writeHead(200, {
+                'Accept-Ranges': 'bytes',
+                'Content-Length': body.length,
+                'Content-Type': 'video/x-yuv4mpeg',
+            });
+            response.end(request.method === 'HEAD' ? undefined : body);
+            return;
+        }
+
+        const start = Number(range[1]);
+        const requestedEnd = range[2] ? Number(range[2]) : body.length - 1;
+        const end = Math.min(requestedEnd, body.length - 1);
+        if (
+            !Number.isSafeInteger(start) ||
+            !Number.isSafeInteger(end) ||
+            start < 0 ||
+            start > end ||
+            start >= body.length
+        ) {
+            response.writeHead(416, {
+                'Content-Range': `bytes */${body.length}`,
+            });
+            response.end();
+            return;
+        }
+
+        response.writeHead(206, {
+            'Accept-Ranges': 'bytes',
+            'Content-Length': end - start + 1,
+            'Content-Range': `bytes ${start}-${end}/${body.length}`,
+            'Content-Type': 'video/x-yuv4mpeg',
+        });
+        response.end(
+            request.method === 'HEAD'
+                ? undefined
+                : body.subarray(start, end + 1)
+        );
+    });
+
+    await listen(server);
+    const address = server.address();
+    if (!address || typeof address === 'string') {
+        await closeServer(server);
+        throw new Error('Unable to resolve the local media server address.');
+    }
+
+    return {
+        close: () => closeServer(server),
+        url: `http://127.0.0.1:${address.port}${resourcePath}`,
+    };
+}
+
+export function assertNativeFallbackPrerequisites(): void {
+    if (!process.env['DISPLAY']) {
+        throw new Error(
+            'The packaged native-view fallback smoke requires DISPLAY (run it under Xvfb/X11).'
+        );
+    }
+
+    const mpv = spawnSync('mpv', ['--version'], {
+        stdio: 'ignore',
+        timeout: 3000,
+    });
+    if (mpv.status !== 0) {
+        throw new Error(
+            'The packaged native-view fallback smoke requires a working system mpv CLI on PATH.'
+        );
+    }
+}
+
+export async function installEmbeddedMpvSessionCapture(
+    app: LaunchedElectronApp
+): Promise<void> {
+    await app.mainWindow.evaluate(() => {
+        window.__packagedEmbeddedMpvUnsubscribe?.();
+        window.__packagedEmbeddedMpvSessions = [];
+        window.__packagedEmbeddedMpvUnsubscribe =
+            window.electron.onEmbeddedMpvSessionUpdate?.((session) => {
+                window.__packagedEmbeddedMpvSessions?.push(session);
+            });
+    });
+}
+
+export async function installFrameCanvasAndSessionCapture(
+    app: LaunchedElectronApp
+): Promise<void> {
+    await installEmbeddedMpvSessionCapture(app);
+    await app.mainWindow.evaluate(() => {
+        document.querySelector('canvas[data-embedded-mpv-frame]')?.remove();
+        const canvas = document.createElement('canvas');
+        canvas.dataset['embeddedMpvFrame'] = '';
+        canvas.dataset['testId'] = 'packaged-embedded-mpv-frame';
+        Object.assign(canvas.style, {
+            background: '#000',
+            height: '180px',
+            left: '0',
+            position: 'fixed',
+            top: '0',
+            width: '320px',
+            zIndex: '2147483647',
+        });
+        document.body.append(canvas);
+    });
+}
+
+export async function getEmbeddedMpvSupport(
+    app: LaunchedElectronApp
+): Promise<EmbeddedMpvSupport> {
+    return app.mainWindow.evaluate(async () => {
+        return window.electron.getEmbeddedMpvSupport();
+    });
+}
+
+export async function getLatestSession(
+    app: LaunchedElectronApp,
+    sessionId: string
+): Promise<EmbeddedMpvSession | null> {
+    return app.mainWindow.evaluate((id) => {
+        const sessions =
+            window.__packagedEmbeddedMpvSessions?.filter(
+                (session) => session.id === id
+            ) ?? [];
+        return sessions.at(-1) ?? null;
+    }, sessionId);
+}
+
+export function isMeaningfulNativePlaybackSnapshot(
+    snapshot: {
+        durationSeconds: number | null;
+        error?: string;
+        status: string;
+        streamUrl: string;
+    } | null,
+    expectedUrl: string
+): boolean {
+    if (
+        !snapshot ||
+        snapshot.error ||
+        !['paused', 'playing'].includes(snapshot.status) ||
+        typeof snapshot.durationSeconds !== 'number' ||
+        !Number.isFinite(snapshot.durationSeconds) ||
+        snapshot.durationSeconds <= 0
+    ) {
+        return false;
+    }
+
+    const normalizeUrl = (value: string): string => {
+        try {
+            const url = new URL(value);
+            url.hash = '';
+            return url.href;
+        } catch {
+            return value.trim();
+        }
+    };
+
+    return normalizeUrl(snapshot.streamUrl) === normalizeUrl(expectedUrl);
+}
+
+export async function renderedFrameSignal(
+    app: LaunchedElectronApp
+): Promise<number> {
+    const canvas = app.mainWindow.getByTestId('packaged-embedded-mpv-frame');
+    const png = await canvas.screenshot();
+    const { data, info } = await sharp(png)
+        .removeAlpha()
+        .raw()
+        .toBuffer({ resolveWithObject: true });
+    let signal = 0;
+
+    for (let offset = 0; offset < data.length; offset += info.channels) {
+        if (data[offset] + data[offset + 1] + data[offset + 2] > 30) {
+            signal += 1;
+        }
+    }
+
+    return signal;
+}
+
+export async function closeAndWaitForExit(
+    app: LaunchedElectronApp
+): Promise<void> {
+    const processHandle = app.electronApp.process();
+    await closeElectronApp(app);
+    await expect
+        .poll(
+            () =>
+                processHandle.exitCode !== null ||
+                processHandle.signalCode !== null,
+            { timeout: 10000 }
+        )
+        .toBe(true);
+}
+
+export async function cleanupPackagedFrameCopySmoke(options: {
+    apps: Array<LaunchedElectronApp | undefined>;
+    hiddenRuntimeEntry?: PackagedEntryGuard;
+    media?: LocalMediaServer;
+    packageClone?: DisposablePackagedLinuxApp;
+}): Promise<void> {
+    const errors: unknown[] = [];
+
+    for (const app of options.apps) {
+        if (!app) {
+            continue;
+        }
+        try {
+            await closeAndWaitForExit(app);
+        } catch (error) {
+            errors.push(error);
+        }
+    }
+
+    if (options.hiddenRuntimeEntry) {
+        try {
+            options.hiddenRuntimeEntry.restore();
+        } catch (error) {
+            errors.push(error);
+        }
+    }
+
+    if (options.media) {
+        try {
+            await options.media.close();
+        } catch (error) {
+            errors.push(error);
+        }
+    }
+
+    if (options.packageClone) {
+        try {
+            options.packageClone.cleanup();
+        } catch (error) {
+            errors.push(error);
+        }
+    }
+
+    if (errors.length > 0) {
+        throw new Error(
+            `Packaged frame-copy smoke cleanup failed: ${errors
+                .map((error) =>
+                    error instanceof Error ? error.message : String(error)
+                )
+                .join('; ')}`
+        );
+    }
+}
diff --git a/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts
new file mode 100644
index 000000000..b9a43f860
--- /dev/null
+++ b/apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts
@@ -0,0 +1,311 @@
+import {
+    expect,
+    launchPackagedElectronApp,
+    resolvePackagedLinuxExecutable,
+    test,
+    type LaunchedElectronApp,
+} from './electron-test-fixtures';
+import { join } from 'path';
+import {
+    assertNativeFallbackPrerequisites,
+    cleanupPackagedFrameCopySmoke,
+    closeAndWaitForExit,
+    createLocalMediaServer,
+    getEmbeddedMpvSupport,
+    getLatestSession,
+    installEmbeddedMpvSessionCapture,
+    installFrameCanvasAndSessionCapture,
+    isMeaningfulNativePlaybackSnapshot,
+    renderedFrameSignal,
+    type LocalMediaServer,
+} from './embedded-mpv-frame-copy-packaged-fixtures';
+import {
+    createDisposablePackagedLinuxApp,
+    createPackagedEntryGuard,
+    readPackagedRuntimeIdentity,
+    type DisposablePackagedLinuxApp,
+    type PackagedEntryGuard,
+} from './embedded-mpv-frame-copy-packaged-filesystem';
+
+const PACKAGED_FRAME_COPY_REQUIRED_ENV =
+    'IPTVNATOR_E2E_REQUIRE_PACKAGED_FRAME_COPY';
+const FRAME_COPY_OPT_IN_ENV = 'IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY';
+const packagedExecutable = resolvePackagedLinuxExecutable();
+const packagedFrameCopyRequired = isTruthy(
+    process.env[PACKAGED_FRAME_COPY_REQUIRED_ENV]
+);
+
+function isTruthy(value: string | undefined): boolean {
+    return ['1', 'true', 'yes', 'on'].includes(
+        (value ?? '').trim().toLowerCase()
+    );
+}
+
+// This smoke drives the public preload API directly so it exercises the real
+// packaged main process, helper, frame reader, WebGL pump, and pause controls
+// without coupling runtime validation to playlist import/settings UI state.
+test.describe('Packaged Linux embedded MPV frame-copy runtime', () => {
+    test.skip(
+        process.platform !== 'linux',
+        'The packaged frame-copy runtime is Linux-only.'
+    );
+    test.skip(
+        !packagedExecutable && !packagedFrameCopyRequired,
+        `Set IPTVNATOR_E2E_PACKAGED_EXECUTABLE or ${PACKAGED_FRAME_COPY_REQUIRED_ENV}=1 in the dedicated packaged-runtime job.`
+    );
+
+    test('@critical @electron @embedded-mpv uses packaged frame-copy and fails closed to native-view', async ({
+        dataDir,
+    }) => {
+        expect(
+            process.arch,
+            'The official Linux frame-copy runtime is x64-only.'
+        ).toBe('x64');
+        expect(
+            packagedExecutable,
+            `The dedicated packaged-runtime job must provide a real unpacked x64 executable with IPTVNATOR_E2E_PACKAGED_EXECUTABLE when ${PACKAGED_FRAME_COPY_REQUIRED_ENV}=1.`
+        ).toBeTruthy();
+
+        const sourceExecutablePath = packagedExecutable as string;
+        assertNativeFallbackPrerequisites();
+        let packageClone: DisposablePackagedLinuxApp | undefined;
+        let hiddenRuntimeEntry: PackagedEntryGuard | undefined;
+        let media: LocalMediaServer | undefined;
+        let frameCopyApp: LaunchedElectronApp | undefined;
+        let fallbackApp: LaunchedElectronApp | undefined;
+
+        try {
+            packageClone =
+                createDisposablePackagedLinuxApp(sourceExecutablePath);
+            const executablePath = packageClone.executablePath;
+            const nativeDir = packageClone.nativeDir;
+            const runtimeIdentity = readPackagedRuntimeIdentity(nativeDir);
+            hiddenRuntimeEntry = createPackagedEntryGuard(
+                join(nativeDir, 'lib', runtimeIdentity.libmpvSoname),
+                {
+                    expectedKind: 'regular-file',
+                    hiddenDirectory: packageClone.temporaryRoot,
+                }
+            );
+            const mediaServer = await createLocalMediaServer();
+            media = mediaServer;
+
+            expect(runtimeIdentity).toMatchObject({
+                arch: 'x64',
+                platform: 'linux',
+                runtimeMode: 'bundled',
+            });
+            expect(['portable', 'flatpak']).toContain(runtimeIdentity.profile);
+
+            const launchedFrameCopyApp = await launchPackagedElectronApp(
+                executablePath,
+                dataDir,
+                {
+                    env: {
+                        [FRAME_COPY_OPT_IN_ENV]: '1',
+                    },
+                }
+            );
+            frameCopyApp = launchedFrameCopyApp;
+
+            await expect
+                .poll(() => getEmbeddedMpvSupport(launchedFrameCopyApp))
+                .toMatchObject({
+                    engine: 'frame-copy',
+                    frameCopyAvailable: true,
+                    platform: 'linux',
+                    supported: true,
+                });
+
+            await installFrameCanvasAndSessionCapture(launchedFrameCopyApp);
+            const created = await launchedFrameCopyApp.mainWindow.evaluate(
+                async () => {
+                    return window.electron.createEmbeddedMpvSession(
+                        { x: 0, y: 0, width: 320, height: 180 },
+                        'Packaged frame-copy smoke',
+                        0
+                    );
+                }
+            );
+
+            await launchedFrameCopyApp.mainWindow.evaluate(
+                async ({ sessionId, streamUrl }) => {
+                    await window.electron.setEmbeddedMpvPaused(sessionId, true);
+                    await window.electron.loadEmbeddedMpvPlayback(sessionId, {
+                        streamUrl,
+                        title: 'Two-second generated Y4M fixture',
+                        isLive: false,
+                    });
+                },
+                { sessionId: created.id, streamUrl: mediaServer.url }
+            );
+
+            await expect
+                .poll(
+                    () => getLatestSession(launchedFrameCopyApp, created.id),
+                    {
+                        timeout: 15000,
+                    }
+                )
+                .toMatchObject({
+                    status: 'paused',
+                    streamUrl: mediaServer.url,
+                    videoHeight: 36,
+                    videoWidth: 64,
+                });
+
+            const attached = await launchedFrameCopyApp.mainWindow.evaluate(
+                async (sessionId) => {
+                    return window.electron.attachEmbeddedMpvFrameView?.(
+                        sessionId
+                    );
+                },
+                created.id
+            );
+            expect(attached).toBe(true);
+            await expect(
+                launchedFrameCopyApp.mainWindow.getByTestId(
+                    'packaged-embedded-mpv-frame'
+                )
+            ).toHaveAttribute('width', '320');
+            await expect(
+                launchedFrameCopyApp.mainWindow.getByTestId(
+                    'packaged-embedded-mpv-frame'
+                )
+            ).toHaveAttribute('height', '180');
+            await expect
+                .poll(() => renderedFrameSignal(launchedFrameCopyApp), {
+                    timeout: 15000,
+                })
+                .toBeGreaterThan(0);
+
+            await launchedFrameCopyApp.mainWindow.evaluate(
+                (sessionId) =>
+                    window.electron.setEmbeddedMpvPaused(sessionId, false),
+                created.id
+            );
+            await expect
+                .poll(
+                    async () =>
+                        (
+                            await getLatestSession(
+                                launchedFrameCopyApp,
+                                created.id
+                            )
+                        )?.status,
+                    { timeout: 10000 }
+                )
+                .toBe('playing');
+
+            await launchedFrameCopyApp.mainWindow.evaluate(
+                (sessionId) =>
+                    window.electron.setEmbeddedMpvPaused(sessionId, true),
+                created.id
+            );
+            await expect
+                .poll(
+                    async () =>
+                        (
+                            await getLatestSession(
+                                launchedFrameCopyApp,
+                                created.id
+                            )
+                        )?.status,
+                    { timeout: 10000 }
+                )
+                .toBe('paused');
+            await launchedFrameCopyApp.mainWindow.evaluate(
+                async (sessionId) => {
+                    window.electron.detachEmbeddedMpvFrameView?.();
+                    await window.electron.disposeEmbeddedMpvSession(sessionId);
+                    window.__packagedEmbeddedMpvUnsubscribe?.();
+                },
+                created.id
+            );
+
+            await closeAndWaitForExit(launchedFrameCopyApp);
+            frameCopyApp = undefined;
+
+            hiddenRuntimeEntry.hide();
+            expect(readPackagedRuntimeIdentity(nativeDir)).toEqual(
+                runtimeIdentity
+            );
+
+            const launchedFallbackApp = await launchPackagedElectronApp(
+                executablePath,
+                dataDir,
+                {
+                    env: {
+                        [FRAME_COPY_OPT_IN_ENV]: '1',
+                    },
+                }
+            );
+            fallbackApp = launchedFallbackApp;
+            const fallbackSupport =
+                await getEmbeddedMpvSupport(launchedFallbackApp);
+
+            expect(fallbackSupport).toMatchObject({
+                engine: 'native',
+                frameCopyAvailable: false,
+                frameCopyUnavailableReason: 'runtime-library-missing',
+                platform: 'linux',
+                supported: true,
+            });
+
+            await installEmbeddedMpvSessionCapture(launchedFallbackApp);
+            const nativeSession = await launchedFallbackApp.mainWindow.evaluate(
+                async () => {
+                    return window.electron.createEmbeddedMpvSession(
+                        { x: 0, y: 0, width: 320, height: 180 },
+                        'Native-view fallback smoke',
+                        0
+                    );
+                }
+            );
+            expect(nativeSession.id).toMatch(/^embedded-mpv-/);
+            await launchedFallbackApp.mainWindow.evaluate(
+                async ({ sessionId, streamUrl }) => {
+                    await window.electron.loadEmbeddedMpvPlayback(sessionId, {
+                        streamUrl,
+                        title: 'Native-view generated Y4M fixture',
+                        isLive: false,
+                    });
+                },
+                { sessionId: nativeSession.id, streamUrl: mediaServer.url }
+            );
+            await expect
+                .poll(
+                    async () =>
+                        isMeaningfulNativePlaybackSnapshot(
+                            await getLatestSession(
+                                launchedFallbackApp,
+                                nativeSession.id
+                            ),
+                            mediaServer.url
+                        ),
+                    { timeout: 15000 }
+                )
+                .toBe(true);
+            expect(
+                launchedFallbackApp.electronApp.process().exitCode
+            ).toBeNull();
+            expect(
+                launchedFallbackApp.electronApp.process().signalCode
+            ).toBeNull();
+            await launchedFallbackApp.mainWindow.evaluate(async (sessionId) => {
+                await window.electron.disposeEmbeddedMpvSession(sessionId);
+                window.__packagedEmbeddedMpvUnsubscribe?.();
+            }, nativeSession.id);
+            await expect
+                .poll(() => launchedFallbackApp.mainWindow.title())
+                .toContain('IPTVnator');
+        } finally {
+            await cleanupPackagedFrameCopySmoke({
+                apps: [frameCopyApp, fallbackApp],
+                hiddenRuntimeEntry,
+                media,
+                packageClone,
+            });
+        }
+    });
+});
diff --git a/apps/electron-backend-e2e/src/m3u-import.performance.ts b/apps/electron-backend-e2e/src/m3u-import.performance.ts
new file mode 100644
index 000000000..d1ba60ab4
--- /dev/null
+++ b/apps/electron-backend-e2e/src/m3u-import.performance.ts
@@ -0,0 +1,8 @@
+import { test } from '@playwright/test';
+
+import { runM3uImportBenchmark } from './performance/m3u-import.benchmark';
+
+// eslint-disable-next-line playwright/expect-expect -- Assertions run inside the shared benchmark lifecycle.
+test('profiles initial M3U imports at 10k, 50k, and 100k', async () => {
+    await runM3uImportBenchmark();
+});
diff --git a/apps/electron-backend-e2e/src/m3u-refresh-cancellation.performance.ts b/apps/electron-backend-e2e/src/m3u-refresh-cancellation.performance.ts
new file mode 100644
index 000000000..6ff9b5f6c
--- /dev/null
+++ b/apps/electron-backend-e2e/src/m3u-refresh-cancellation.performance.ts
@@ -0,0 +1,8 @@
+import { test } from '@playwright/test';
+
+import { runM3uRefreshCancellationBenchmark } from './performance/m3u-refresh-cancellation.benchmark';
+
+// eslint-disable-next-line playwright/expect-expect -- Assertions run inside the shared benchmark lifecycle.
+test('profiles cancellation of a 100k M3U refresh', async () => {
+    await runM3uRefreshCancellationBenchmark();
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-request-identity-capture.spec.ts b/apps/electron-backend-e2e/src/performance/database-request-identity-capture.spec.ts
new file mode 100644
index 000000000..4c3eac434
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-request-identity-capture.spec.ts
@@ -0,0 +1,359 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import { EventEmitter } from 'node:events';
+import test from 'node:test';
+
+import {
+    installDatabaseRequestIdentityCaptureInMain,
+    type DatabaseRequestIdentityCaptureApi,
+} from './database-request-identity-capture';
+
+const CHANNEL = 'IPTVNATOR_PERF_CAPTURE_MARKER';
+let nextStateId = 1;
+
+function createCapture(): {
+    api: DatabaseRequestIdentityCaptureApi;
+    ipcMain: EventEmitter;
+} {
+    const ipcMain = new EventEmitter();
+    const stateKey = `__identityCapture${nextStateId}`;
+    nextStateId += 1;
+    installDatabaseRequestIdentityCaptureInMain({ ipcMain } as never, stateKey);
+    const api = (globalThis as unknown as Record<string, unknown>)[
+        stateKey
+    ] as DatabaseRequestIdentityCaptureApi;
+    api.start();
+    return { api, ipcMain };
+}
+
+function marker(overrides: Record<string, unknown> = {}) {
+    return {
+        correlationState: 'correlated',
+        invalidReason: null,
+        ipcCallId: 2,
+        method: 'dbGetAppPlaylist',
+        operationId: 'refresh-operation-1',
+        phase: 'start',
+        playlistId: 'playlist-1',
+        sourceEpochMs: 100,
+        ...overrides,
+    };
+}
+
+test('correlates the real preload marker to a DB request whose payload omits operationId', () => {
+    const { api, ipcMain } = createCapture();
+    ipcMain.emit(CHANNEL, {}, marker());
+
+    const identity = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-1',
+        type: 'request',
+    });
+
+    assert.deepEqual(identity, {
+        ipcCallId: 2,
+        operationId: 'refresh-operation-1',
+        operationIdUnavailableReason: null,
+        sourceEpochMs: 100,
+    });
+});
+
+test('retains the initial-import upsert marker when its operationId is intentionally uncorrelated', () => {
+    const { api, ipcMain } = createCapture();
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            correlationState: 'uncorrelated',
+            ipcCallId: 7,
+            method: 'dbUpsertAppPlaylist',
+            operationId: null,
+            sourceEpochMs: 1_077.25,
+        })
+    );
+
+    const identity = api.matchDatabaseRequest({
+        operation: 'DB_UPSERT_APP_PLAYLIST',
+        payload: { _id: 'playlist-1' },
+        requestId: 'initial-import-upsert',
+        type: 'request',
+    });
+
+    assert.deepEqual(identity, {
+        ipcCallId: 7,
+        operationId: null,
+        operationIdUnavailableReason: 'preload-performance-marker-uncorrelated',
+        sourceEpochMs: 1_077.25,
+    });
+});
+
+test('captures exact successful preload completion markers for DB return-clone attribution', () => {
+    const { api, ipcMain } = createCapture();
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            correlationState: 'uncorrelated',
+            ipcCallId: 7,
+            method: 'dbUpsertAppPlaylist',
+            operationId: null,
+            phase: 'success',
+            sourceEpochMs: 140.25,
+        })
+    );
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            correlationState: 'uncorrelated',
+            ipcCallId: 8,
+            operationId: null,
+            phase: 'success',
+            sourceEpochMs: 175.5,
+        })
+    );
+
+    assert.equal(api.successMarkerCount(), 2);
+    assert.deepEqual(api.takeSuccessMarkers(), [
+        {
+            ipcCallId: 7,
+            operation: 'DB_UPSERT_APP_PLAYLIST',
+            operationId: null,
+            playlistId: 'playlist-1',
+            sourceEpochMs: 140.25,
+        },
+        {
+            ipcCallId: 8,
+            operation: 'DB_GET_APP_PLAYLIST',
+            operationId: null,
+            playlistId: 'playlist-1',
+            sourceEpochMs: 175.5,
+        },
+    ]);
+    assert.equal(api.successMarkerCount(), 0);
+    assert.deepEqual(api.takeSuccessMarkers(), []);
+});
+
+test('fails closed for malformed or invalid successful preload markers and resets completions', () => {
+    const { api, ipcMain } = createCapture();
+    for (const invalid of [
+        { invalidReason: 'out-of-order' },
+        { correlationState: 'invalid' },
+        { ipcCallId: 0 },
+        { playlistId: '' },
+        { sourceEpochMs: Number.NaN },
+        { method: 'refreshPlaylist' },
+        { correlationState: 'correlated', operationId: null },
+    ]) {
+        ipcMain.emit(
+            CHANNEL,
+            {},
+            marker({
+                phase: 'success',
+                ...invalid,
+            })
+        );
+    }
+    assert.equal(api.successMarkerCount(), 0);
+    assert.deepEqual(api.takeSuccessMarkers(), []);
+
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            phase: 'success',
+        })
+    );
+    api.stop();
+    api.start();
+    assert.equal(api.successMarkerCount(), 0);
+    assert.deepEqual(api.takeSuccessMarkers(), []);
+});
+
+test('resolves a response-retained request identity when the marker arrives later and resets between captures', () => {
+    const { api, ipcMain } = createCapture();
+    const identity = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-before-marker',
+        type: 'request',
+    });
+    assert.equal(
+        identity.operationIdUnavailableReason,
+        'preload-performance-marker-missing'
+    );
+    const responseOutcome = { identity };
+
+    ipcMain.emit(CHANNEL, {}, marker());
+    assert.deepEqual(responseOutcome.identity, {
+        ipcCallId: 2,
+        operationId: 'refresh-operation-1',
+        operationIdUnavailableReason: null,
+        sourceEpochMs: 100,
+    });
+
+    api.stop();
+    ipcMain.emit(CHANNEL, {}, marker({ operationId: 'marker-while-stopped' }));
+    api.start();
+    const afterReset = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-after-reset',
+        type: 'request',
+    });
+    assert.deepEqual(afterReset, {
+        ipcCallId: null,
+        operationId: null,
+        operationIdUnavailableReason: 'preload-performance-marker-missing',
+        sourceEpochMs: null,
+    });
+});
+
+test('fails closed for missing and ambiguous preload markers', () => {
+    const missingCapture = createCapture();
+    const missing = missingCapture.api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-missing',
+        type: 'request',
+    });
+    assert.deepEqual(missing, {
+        ipcCallId: null,
+        operationId: null,
+        operationIdUnavailableReason: 'preload-performance-marker-missing',
+        sourceEpochMs: null,
+    });
+
+    const ambiguousCapture = createCapture();
+    ambiguousCapture.ipcMain.emit(CHANNEL, {}, marker());
+    ambiguousCapture.ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            ipcCallId: 3,
+            operationId: 'refresh-operation-2',
+        })
+    );
+    const ambiguous = ambiguousCapture.api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-ambiguous',
+        type: 'request',
+    });
+    assert.deepEqual(ambiguous, {
+        ipcCallId: null,
+        operationId: null,
+        operationIdUnavailableReason: 'preload-performance-marker-ambiguous',
+        sourceEpochMs: null,
+    });
+});
+
+test('quarantines a key after response-before-marker ambiguity', () => {
+    const { api, ipcMain } = createCapture();
+    const requestA = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-a',
+        type: 'request',
+    });
+    const requestB = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-b',
+        type: 'request',
+    });
+
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({ ipcCallId: 2, operationId: 'refresh-operation-a' })
+    );
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({ ipcCallId: 3, operationId: 'refresh-operation-b' })
+    );
+
+    const requestC = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'request-c',
+        type: 'request',
+    });
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            ipcCallId: 4,
+            operationId: 'other-playlist-operation',
+            playlistId: 'playlist-2',
+        })
+    );
+    const otherPlaylist = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-2' },
+        requestId: 'other-playlist-request',
+        type: 'request',
+    });
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            ipcCallId: 5,
+            method: 'dbUpsertAppPlaylist',
+            operationId: 'other-db-operation',
+        })
+    );
+    const otherOperation = api.matchDatabaseRequest({
+        operation: 'DB_UPSERT_APP_PLAYLIST',
+        payload: { _id: 'playlist-1' },
+        requestId: 'other-operation-request',
+        type: 'request',
+    });
+
+    const ambiguousIdentity = {
+        ipcCallId: null,
+        operationId: null,
+        operationIdUnavailableReason: 'preload-performance-marker-ambiguous',
+        sourceEpochMs: null,
+    };
+    assert.deepEqual(requestA, ambiguousIdentity);
+    assert.deepEqual(requestB, ambiguousIdentity);
+    assert.deepEqual(requestC, ambiguousIdentity);
+    assert.deepEqual(otherPlaylist, {
+        ipcCallId: 4,
+        operationId: 'other-playlist-operation',
+        operationIdUnavailableReason: null,
+        sourceEpochMs: 100,
+    });
+    assert.deepEqual(otherOperation, {
+        ipcCallId: 5,
+        operationId: 'other-db-operation',
+        operationIdUnavailableReason: null,
+        sourceEpochMs: 100,
+    });
+
+    api.stop();
+    api.start();
+    ipcMain.emit(
+        CHANNEL,
+        {},
+        marker({
+            ipcCallId: 6,
+            operationId: 'fresh-capture-operation',
+        })
+    );
+    const freshCaptureIdentity = api.matchDatabaseRequest({
+        operation: 'DB_GET_APP_PLAYLIST',
+        payload: { playlistId: 'playlist-1' },
+        requestId: 'fresh-capture-request',
+        type: 'request',
+    });
+    assert.deepEqual(freshCaptureIdentity, {
+        ipcCallId: 6,
+        operationId: 'fresh-capture-operation',
+        operationIdUnavailableReason: null,
+        sourceEpochMs: 100,
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-request-identity-capture.ts b/apps/electron-backend-e2e/src/performance/database-request-identity-capture.ts
new file mode 100644
index 000000000..2de76e7e3
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-request-identity-capture.ts
@@ -0,0 +1,354 @@
+import type { ElectronApplication } from '@playwright/test';
+
+export const DATABASE_REQUEST_IDENTITY_CAPTURE_STATE_KEY =
+    '__iptvnatorM3uRefreshDatabaseRequestIdentityCapture';
+
+export interface DatabaseRequestIdentity {
+    ipcCallId: number | null;
+    operationId: string | null;
+    operationIdUnavailableReason: string | null;
+    sourceEpochMs: number | null;
+}
+
+export interface PreloadDatabaseSuccessMarker {
+    ipcCallId: number;
+    operation: 'DB_GET_APP_PLAYLIST' | 'DB_UPSERT_APP_PLAYLIST';
+    operationId: string | null;
+    playlistId: string;
+    sourceEpochMs: number;
+}
+
+export interface DatabaseRequestIdentityCaptureApi {
+    matchDatabaseRequest(message: unknown): DatabaseRequestIdentity;
+    start(): void;
+    stop(): void;
+    successMarkerCount(): number;
+    takeSuccessMarkers(): readonly PreloadDatabaseSuccessMarker[];
+}
+
+interface DatabaseRequestIdentityElectron {
+    readonly ipcMain: {
+        on(
+            channel: string,
+            listener: (event: unknown, marker: unknown) => void
+        ): void;
+    };
+}
+
+export function installDatabaseRequestIdentityCaptureInMain(
+    { ipcMain }: DatabaseRequestIdentityElectron,
+    stateKey: string
+): void {
+    type JsonRecord = Record<string, unknown>;
+    interface PendingMarker {
+        readonly ipcCallId: number;
+        readonly operation: string;
+        readonly operationId: string | null;
+        readonly operationIdUnavailableReason: string | null;
+        readonly playlistId: string;
+        readonly sourceEpochMs: number;
+    }
+    interface PendingRequest {
+        readonly identity: DatabaseRequestIdentity;
+        readonly operation: string;
+        readonly playlistId: string;
+    }
+    interface QuarantinedKey {
+        readonly operation: string;
+        readonly playlistId: string;
+    }
+
+    const target = globalThis as unknown as Record<string, unknown>;
+    if (target[stateKey] !== undefined) {
+        return;
+    }
+
+    const markerChannel = 'IPTVNATOR_PERF_CAPTURE_MARKER';
+    const markerMethodToOperation: Readonly<Record<string, string>> = {
+        dbGetAppPlaylist: 'DB_GET_APP_PLAYLIST',
+        dbUpsertAppPlaylist: 'DB_UPSERT_APP_PLAYLIST',
+    };
+    let active = false;
+    let pendingMarkers: PendingMarker[] = [];
+    let pendingRequests: PendingRequest[] = [];
+    let quarantinedKeys: QuarantinedKey[] = [];
+    let successMarkers: PreloadDatabaseSuccessMarker[] = [];
+
+    const readRecord = (value: unknown): JsonRecord | null =>
+        typeof value === 'object' && value !== null
+            ? (value as JsonRecord)
+            : null;
+    const readPlaylistId = (
+        operation: string,
+        payload: unknown
+    ): string | null => {
+        const value = readRecord(payload);
+        if (!value) {
+            return null;
+        }
+        const playlistId =
+            operation === 'DB_UPSERT_APP_PLAYLIST'
+                ? value['_id']
+                : value['playlistId'];
+        return typeof playlistId === 'string' && playlistId.length > 0
+            ? playlistId
+            : null;
+    };
+    const matches = (
+        candidate: { operation: string; playlistId: string },
+        operation: string,
+        playlistId: string
+    ): boolean =>
+        candidate.operation === operation &&
+        candidate.playlistId === playlistId;
+    const markAmbiguous = (requests: PendingRequest[]): void => {
+        for (const request of requests) {
+            request.identity.ipcCallId = null;
+            request.identity.operationId = null;
+            request.identity.operationIdUnavailableReason =
+                'preload-performance-marker-ambiguous';
+            request.identity.sourceEpochMs = null;
+        }
+    };
+    const unavailableIdentity = (reason: string): DatabaseRequestIdentity => ({
+        ipcCallId: null,
+        operationId: null,
+        operationIdUnavailableReason: reason,
+        sourceEpochMs: null,
+    });
+    const identityFromMarker = (
+        marker: PendingMarker
+    ): DatabaseRequestIdentity => ({
+        ipcCallId: marker.ipcCallId,
+        operationId: marker.operationId,
+        operationIdUnavailableReason: marker.operationIdUnavailableReason,
+        sourceEpochMs: marker.sourceEpochMs,
+    });
+    const applyMarker = (
+        identity: DatabaseRequestIdentity,
+        marker: PendingMarker
+    ): void => {
+        identity.ipcCallId = marker.ipcCallId;
+        identity.operationId = marker.operationId;
+        identity.operationIdUnavailableReason =
+            marker.operationIdUnavailableReason;
+        identity.sourceEpochMs = marker.sourceEpochMs;
+    };
+    const isQuarantined = (operation: string, playlistId: string): boolean =>
+        quarantinedKeys.some((key) => matches(key, operation, playlistId));
+    const quarantine = (operation: string, playlistId: string): void => {
+        if (!isQuarantined(operation, playlistId)) {
+            quarantinedKeys.push({ operation, playlistId });
+        }
+        const requestCandidates = pendingRequests.filter((request) =>
+            matches(request, operation, playlistId)
+        );
+        markAmbiguous(requestCandidates);
+        pendingRequests = pendingRequests.filter(
+            (request) => !matches(request, operation, playlistId)
+        );
+        pendingMarkers = pendingMarkers.filter(
+            (marker) => !matches(marker, operation, playlistId)
+        );
+    };
+
+    ipcMain.on(markerChannel, (_event, input) => {
+        if (!active) {
+            return;
+        }
+        const marker = readRecord(input);
+        const correlationState = marker?.['correlationState'];
+        const operation =
+            typeof marker?.['method'] === 'string'
+                ? markerMethodToOperation[marker['method']]
+                : undefined;
+        const operationId = marker?.['operationId'];
+        const playlistId = marker?.['playlistId'];
+        const ipcCallId = marker?.['ipcCallId'];
+        const sourceEpochMs = marker?.['sourceEpochMs'];
+        const validMarkerIdentity =
+            operation !== undefined &&
+            typeof playlistId === 'string' &&
+            playlistId.length > 0 &&
+            Number.isSafeInteger(ipcCallId) &&
+            Number(ipcCallId) >= 1 &&
+            typeof sourceEpochMs === 'number' &&
+            Number.isFinite(sourceEpochMs) &&
+            sourceEpochMs >= 0;
+        if (
+            marker?.['phase'] === 'success' &&
+            (correlationState === 'correlated' ||
+                correlationState === 'uncorrelated') &&
+            marker['invalidReason'] === null &&
+            validMarkerIdentity &&
+            (correlationState !== 'correlated' ||
+                (typeof operationId === 'string' &&
+                    operationId.length > 0))
+        ) {
+            successMarkers.push({
+                ipcCallId: Number(ipcCallId),
+                operation: operation as PreloadDatabaseSuccessMarker['operation'],
+                operationId:
+                    correlationState === 'correlated'
+                        ? String(operationId)
+                        : null,
+                playlistId,
+                sourceEpochMs,
+            });
+            return;
+        }
+        if (
+            !marker ||
+            marker['phase'] !== 'start' ||
+            (correlationState !== 'correlated' &&
+                correlationState !== 'uncorrelated') ||
+            marker['invalidReason'] !== null
+        ) {
+            return;
+        }
+        const correlatedOperationId =
+            correlationState === 'correlated' &&
+            typeof operationId === 'string' &&
+            operationId.length > 0
+                ? operationId
+                : null;
+        if (
+            operation === undefined ||
+            (correlationState === 'correlated' &&
+                correlatedOperationId === null) ||
+            typeof playlistId !== 'string' ||
+            playlistId.length === 0 ||
+            !Number.isSafeInteger(ipcCallId) ||
+            Number(ipcCallId) < 1 ||
+            typeof sourceEpochMs !== 'number' ||
+            !Number.isFinite(sourceEpochMs) ||
+            sourceEpochMs < 0
+        ) {
+            return;
+        }
+        const pendingMarker: PendingMarker = {
+            ipcCallId: Number(ipcCallId),
+            operation,
+            operationId: correlatedOperationId,
+            operationIdUnavailableReason:
+                correlationState === 'correlated'
+                    ? null
+                    : 'preload-performance-marker-uncorrelated',
+            playlistId,
+            sourceEpochMs,
+        };
+
+        if (isQuarantined(operation, playlistId)) {
+            return;
+        }
+        const requestCandidates = pendingRequests.filter((request) =>
+            matches(request, operation, playlistId)
+        );
+        if (requestCandidates.length === 1) {
+            const request = requestCandidates[0];
+            if (!request) {
+                return;
+            }
+            applyMarker(request.identity, pendingMarker);
+            pendingRequests = pendingRequests.filter(
+                (candidate) => candidate !== request
+            );
+            return;
+        }
+        if (requestCandidates.length > 1) {
+            quarantine(operation, playlistId);
+            return;
+        }
+
+        pendingMarkers.push(pendingMarker);
+        pendingMarkers.sort((left, right) => left.ipcCallId - right.ipcCallId);
+    });
+
+    const api: DatabaseRequestIdentityCaptureApi = {
+        matchDatabaseRequest: (input) => {
+            const message = readRecord(input);
+            const operation = message?.['operation'];
+            const playlistId =
+                typeof operation === 'string'
+                    ? readPlaylistId(operation, message?.['payload'])
+                    : null;
+            if (
+                !active ||
+                (operation !== 'DB_GET_APP_PLAYLIST' &&
+                    operation !== 'DB_UPSERT_APP_PLAYLIST') ||
+                playlistId === null
+            ) {
+                return unavailableIdentity(
+                    'preload-performance-marker-not-applicable'
+                );
+            }
+
+            if (isQuarantined(operation, playlistId)) {
+                return unavailableIdentity(
+                    'preload-performance-marker-ambiguous'
+                );
+            }
+            const markerCandidates = pendingMarkers.filter((marker) =>
+                matches(marker, operation, playlistId)
+            );
+            if (markerCandidates.length === 1) {
+                const marker = markerCandidates[0];
+                if (!marker) {
+                    return unavailableIdentity(
+                        'preload-performance-marker-missing'
+                    );
+                }
+                pendingMarkers = pendingMarkers.filter(
+                    (candidate) => candidate !== marker
+                );
+                return identityFromMarker(marker);
+            }
+            if (markerCandidates.length > 1) {
+                quarantine(operation, playlistId);
+                return unavailableIdentity(
+                    'preload-performance-marker-ambiguous'
+                );
+            }
+
+            const identity = unavailableIdentity(
+                'preload-performance-marker-missing'
+            );
+            pendingRequests.push({
+                identity,
+                operation,
+                playlistId,
+            });
+            return identity;
+        },
+        start: () => {
+            pendingMarkers = [];
+            pendingRequests = [];
+            quarantinedKeys = [];
+            successMarkers = [];
+            active = true;
+        },
+        stop: () => {
+            active = false;
+            pendingMarkers = [];
+            pendingRequests = [];
+            quarantinedKeys = [];
+            successMarkers = [];
+        },
+        successMarkerCount: () => successMarkers.length,
+        takeSuccessMarkers: () => {
+            const captured = Object.freeze([...successMarkers]);
+            successMarkers = [];
+            return captured;
+        },
+    };
+    target[stateKey] = api;
+}
+
+export async function installDatabaseRequestIdentityCapture(
+    electronApp: ElectronApplication
+): Promise<void> {
+    await electronApp.evaluate(
+        installDatabaseRequestIdentityCaptureInMain,
+        DATABASE_REQUEST_IDENTITY_CAPTURE_STATE_KEY
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-capture.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-capture.spec.ts
new file mode 100644
index 000000000..37b19a714
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-capture.spec.ts
@@ -0,0 +1,98 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+const source = readFileSync(
+    new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+    'utf8'
+);
+
+function section(startMarker: string, endMarker: string): string {
+    const start = source.indexOf(startMarker);
+    const end = source.indexOf(endMarker, start);
+    assert.ok(start >= 0, `missing start marker: ${startMarker}`);
+    assert.ok(end > start, `missing end marker: ${endMarker}`);
+    return source.slice(start, end);
+}
+
+test('counts only finite nonnegative worker heap and external-memory samples per capture generation', () => {
+    const workerRecord = section(
+        'interface WorkerRecord',
+        'interface TimelineRecord'
+    );
+    const createRecord = section(
+        'const record: WorkerRecord = {',
+        'nextWorkerOrdinal += 1'
+    );
+    const sampleWorker = section(
+        'const sampleWorker =',
+        'const resetWorkerForCapture'
+    );
+    const resetWorker = section(
+        'const resetWorkerForCapture',
+        'const startWorker'
+    );
+
+    assert.match(workerRecord, /externalMemorySampleCount: number/);
+    assert.match(workerRecord, /heapUsedSampleCount: number/);
+    assert.match(createRecord, /externalMemorySampleCount: 0/);
+    assert.match(createRecord, /heapUsedSampleCount: 0/);
+    assert.match(resetWorker, /record\.externalMemorySampleCount = 0/);
+    assert.match(resetWorker, /record\.heapUsedSampleCount = 0/);
+
+    assert.match(sampleWorker, /const heapUsedSample = stats\.used_heap_size/);
+    assert.match(
+        sampleWorker,
+        /Number\.isFinite\(heapUsedSample\)[\s\S]*heapUsedSample >= 0/
+    );
+    assert.match(sampleWorker, /record\.heapUsedSampleCount \+= 1/);
+    assert.match(
+        sampleWorker,
+        /const externalMemorySample = stats\.external_memory/
+    );
+    assert.match(
+        sampleWorker,
+        /Number\.isFinite\(externalMemorySample\)[\s\S]*externalMemorySample >= 0/
+    );
+    assert.match(sampleWorker, /record\.externalMemorySampleCount \+= 1/);
+    assert.doesNotMatch(sampleWorker, /used_heap_size \?\? 0/);
+    assert.doesNotMatch(sampleWorker, /external_memory \?\? 0/);
+});
+
+test('raw worker metrics distinguish missing samples from measured zero-byte peaks', () => {
+    const transport = section(
+        'const workers = currentWorkerRecords',
+        'const transport: MainCaptureGenerationTransport'
+    );
+
+    assert.match(
+        transport,
+        /externalMemorySampleCount:\s*record\.externalMemorySampleCount/
+    );
+    assert.match(
+        transport,
+        /heapUsedSampleCount:\s*record\.heapUsedSampleCount/
+    );
+    assert.match(
+        transport,
+        /peakExternalBytes:\s*record\.externalMemorySampleCount > 0[\s\S]*\?\s*record\.externalPeak[\s\S]*:\s*null/
+    );
+    assert.match(
+        transport,
+        /peakHeapUsedBytes:\s*record\.heapUsedSampleCount > 0[\s\S]*\?\s*record\.heapPeak[\s\S]*:\s*null/
+    );
+    assert.match(
+        transport,
+        /peakExternalUnavailableReason:\s*record\.externalMemorySampleCount > 0[\s\S]*\?\s*null[\s\S]*:\s*'worker-external-memory-samples-missing'/
+    );
+    assert.match(
+        transport,
+        /peakHeapUsedUnavailableReason:\s*record\.heapUsedSampleCount > 0[\s\S]*\?\s*null[\s\S]*:\s*'worker-heap-used-samples-missing'/
+    );
+    assert.doesNotMatch(
+        transport,
+        /peakExternalBytes: record\.externalPeak[,}]/
+    );
+    assert.doesNotMatch(transport, /peakHeapUsedBytes: record\.heapPeak[,}]/);
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.spec.ts
new file mode 100644
index 000000000..ffe7d9fb2
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.spec.ts
@@ -0,0 +1,121 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import {
+    assessDatabaseWorkerPeakMemoryValidity,
+    DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON,
+} from './database-worker-peak-memory-validity';
+
+describe('database worker peak-memory validity', () => {
+    it('requires successful heap and external-memory samples in every measured run', () => {
+        const validity = assessDatabaseWorkerPeakMemoryValidity([
+            iteration('warmup', 'warmup', worker(0, 0)),
+            iteration('run-01', 'measured', worker(3, 4)),
+            iteration('diagnostic', 'diagnostic', worker(0, 0)),
+        ]);
+
+        assert.deepEqual(validity, {
+            invalidMeasuredRuns: [],
+            measuredRunCount: 1,
+            validForComparison: true,
+            validMeasuredRunCount: 1,
+        });
+    });
+
+    it('fails closed for absent samples instead of accepting initialized zero peaks', () => {
+        const missingCounts = assessDatabaseWorkerPeakMemoryValidity([
+            iteration('run-01', 'measured', {
+                kind: 'database.worker',
+                peakExternalBytes: 0,
+                peakHeapUsedBytes: 0,
+            }),
+            iteration('run-02', 'measured', worker(0, 1)),
+            iteration('run-03', 'measured', worker(1, 0)),
+        ]);
+
+        assert.deepEqual(missingCounts.invalidMeasuredRuns, [
+            {
+                reason: DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_SAMPLES_MISSING,
+                runId: 'run-01',
+            },
+            {
+                reason: DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_SAMPLES_MISSING,
+                runId: 'run-02',
+            },
+            {
+                reason: DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.EXTERNAL_MEMORY_SAMPLES_MISSING,
+                runId: 'run-03',
+            },
+        ]);
+        assert.equal(missingCounts.validForComparison, false);
+        assert.equal(missingCounts.validMeasuredRunCount, 0);
+    });
+
+    it('reports stable worker-cardinality and malformed-peak reasons', () => {
+        const validity = assessDatabaseWorkerPeakMemoryValidity([
+            { kind: 'measured', main: { workers: [] }, runId: 'missing' },
+            {
+                kind: 'measured',
+                main: { workers: [worker(1, 1), worker(1, 1)] },
+                runId: 'multiple',
+            },
+            iteration('heap-invalid', 'measured', {
+                ...worker(1, 1),
+                peakHeapUsedBytes: Number.NaN,
+            }),
+            iteration('external-invalid', 'measured', {
+                ...worker(1, 1),
+                peakExternalBytes: -1,
+            }),
+            iteration('heap-reason-incoherent', 'measured', {
+                ...worker(1, 1),
+                peakHeapUsedUnavailableReason:
+                    'worker-heap-used-samples-missing',
+            }),
+            iteration('external-reason-incoherent', 'measured', {
+                ...worker(1, 1),
+                peakExternalUnavailableReason:
+                    'worker-external-memory-samples-missing',
+            }),
+        ]);
+
+        assert.deepEqual(
+            validity.invalidMeasuredRuns.map(({ reason }) => reason),
+            [
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.DATABASE_WORKER_MISSING,
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.MULTIPLE_DATABASE_WORKERS,
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_PEAK_INVALID,
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.EXTERNAL_MEMORY_PEAK_INVALID,
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_PEAK_INVALID,
+                DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.EXTERNAL_MEMORY_PEAK_INVALID,
+            ]
+        );
+    });
+});
+
+function iteration(
+    runId: string,
+    kind: string,
+    databaseWorker: Record<string, unknown>
+) {
+    return {
+        kind,
+        main: { workers: [databaseWorker] },
+        runId,
+    };
+}
+
+function worker(
+    heapUsedSampleCount: number,
+    externalMemorySampleCount: number
+) {
+    return {
+        externalMemorySampleCount,
+        heapUsedSampleCount,
+        kind: 'database.worker',
+        peakExternalBytes: 600,
+        peakExternalUnavailableReason: null,
+        peakHeapUsedBytes: 1_500,
+        peakHeapUsedUnavailableReason: null,
+    };
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.ts b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.ts
new file mode 100644
index 000000000..09f9bf36a
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-peak-memory-validity.ts
@@ -0,0 +1,114 @@
+export const DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON = {
+    EXTERNAL_MEMORY_PEAK_INVALID:
+        'database-worker-external-memory-peak-invalid',
+    EXTERNAL_MEMORY_SAMPLES_MISSING:
+        'database-worker-external-memory-samples-missing',
+    HEAP_PEAK_INVALID: 'database-worker-heap-peak-invalid',
+    HEAP_SAMPLES_MISSING: 'database-worker-heap-samples-missing',
+    MULTIPLE_DATABASE_WORKERS: 'multiple-database-workers',
+    DATABASE_WORKER_MISSING: 'database-worker-missing',
+} as const;
+
+export type DatabaseWorkerPeakMemoryInvalidReason =
+    (typeof DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON)[keyof typeof DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON];
+
+export interface DatabaseWorkerPeakMemoryValidity {
+    readonly invalidMeasuredRuns: readonly {
+        readonly reason: DatabaseWorkerPeakMemoryInvalidReason;
+        readonly runId: string;
+    }[];
+    readonly measuredRunCount: number;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+}
+
+interface PeakMemoryWorker {
+    readonly externalMemorySampleCount?: unknown;
+    readonly heapUsedSampleCount?: unknown;
+    readonly kind: string;
+    readonly peakExternalBytes: unknown;
+    readonly peakExternalUnavailableReason?: unknown;
+    readonly peakHeapUsedBytes: unknown;
+    readonly peakHeapUsedUnavailableReason?: unknown;
+}
+
+interface PeakMemoryIteration {
+    readonly kind: string;
+    readonly main: {
+        readonly workers: readonly PeakMemoryWorker[];
+    };
+    readonly runId: string;
+}
+
+export function assessDatabaseWorkerPeakMemoryValidity(
+    iterations: readonly PeakMemoryIteration[]
+): DatabaseWorkerPeakMemoryValidity {
+    const measured = iterations.filter(
+        (iteration) => iteration.kind === 'measured'
+    );
+    const invalidMeasuredRuns: {
+        reason: DatabaseWorkerPeakMemoryInvalidReason;
+        runId: string;
+    }[] = [];
+
+    for (const iteration of measured) {
+        const workers = iteration.main.workers.filter(
+            (worker) => worker.kind === 'database.worker'
+        );
+        const reason = assessWorkers(workers);
+        if (reason !== null) {
+            invalidMeasuredRuns.push({ reason, runId: iteration.runId });
+        }
+    }
+
+    return Object.freeze({
+        invalidMeasuredRuns: Object.freeze(invalidMeasuredRuns),
+        measuredRunCount: measured.length,
+        validForComparison:
+            measured.length > 0 && invalidMeasuredRuns.length === 0,
+        validMeasuredRunCount: measured.length - invalidMeasuredRuns.length,
+    });
+}
+
+function assessWorkers(
+    workers: readonly PeakMemoryWorker[]
+): DatabaseWorkerPeakMemoryInvalidReason | null {
+    if (workers.length === 0) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.DATABASE_WORKER_MISSING;
+    }
+    if (workers.length !== 1) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.MULTIPLE_DATABASE_WORKERS;
+    }
+
+    const worker = workers[0];
+    if (!worker) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.DATABASE_WORKER_MISSING;
+    }
+    if (!isPositiveSampleCount(worker.heapUsedSampleCount)) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_SAMPLES_MISSING;
+    }
+    if (
+        !isPeak(worker.peakHeapUsedBytes) ||
+        worker.peakHeapUsedUnavailableReason !== null
+    ) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.HEAP_PEAK_INVALID;
+    }
+    if (!isPositiveSampleCount(worker.externalMemorySampleCount)) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.EXTERNAL_MEMORY_SAMPLES_MISSING;
+    }
+    if (
+        !isPeak(worker.peakExternalBytes) ||
+        worker.peakExternalUnavailableReason !== null
+    ) {
+        return DATABASE_WORKER_PEAK_MEMORY_INVALID_REASON.EXTERNAL_MEMORY_PEAK_INVALID;
+    }
+    return null;
+}
+
+function isPositiveSampleCount(value: unknown): value is number {
+    return Number.isSafeInteger(value) && Number(value) > 0;
+}
+
+function isPeak(value: unknown): value is number {
+    return Number.isSafeInteger(value) && Number(value) >= 0;
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.spec.ts
new file mode 100644
index 000000000..631081fd4
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.spec.ts
@@ -0,0 +1,116 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+type RequestDisposition = 'after-cutoff' | 'capture' | 'outside-capture';
+
+interface CutoffApi {
+    beginCapture(): void;
+    beginStop(): void;
+    finishStop(): void;
+    observeDatabaseRequest(): RequestDisposition;
+    rolloverCapture?(): void;
+    snapshot(): {
+        readonly lateRequestCount: number;
+        readonly phase: 'active' | 'idle' | 'stopping';
+    };
+}
+
+interface CutoffModule {
+    createDatabaseWorkerPostGcCutoffApi?: () => CutoffApi;
+}
+
+const cutoffModulePromise = import(
+    new URL('./database-worker-post-gc-cutoff.ts', import.meta.url).href
+)
+    .then((module) => module as CutoffModule)
+    .catch(() => null);
+
+async function restoreSerializableApi(): Promise<CutoffApi> {
+    const module = await cutoffModulePromise;
+    assert.ok(module, 'database worker post-GC cutoff module must exist');
+    const factory = module.createDatabaseWorkerPostGcCutoffApi;
+    assert.equal(typeof factory, 'function');
+
+    const source = factory.toString();
+    assert.doesNotMatch(source, /__name/);
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => CutoffApi;
+    return restoredFactory();
+}
+
+test('classifies requests after the synchronous capture cutoff without carrying state across generations', async () => {
+    const api = await restoreSerializableApi();
+
+    assert.equal(api.observeDatabaseRequest(), 'outside-capture');
+    api.beginCapture();
+    assert.equal(api.observeDatabaseRequest(), 'capture');
+    api.beginStop();
+    assert.equal(api.observeDatabaseRequest(), 'after-cutoff');
+    assert.equal(api.observeDatabaseRequest(), 'after-cutoff');
+    assert.deepEqual(api.snapshot(), {
+        lateRequestCount: 2,
+        phase: 'stopping',
+    });
+    api.finishStop();
+    assert.equal(api.observeDatabaseRequest(), 'outside-capture');
+
+    api.beginCapture();
+    assert.deepEqual(api.snapshot(), {
+        lateRequestCount: 0,
+        phase: 'active',
+    });
+});
+
+test('atomically rolls a clean cutoff into the next generation without erasing contamination', async () => {
+    const clean = await restoreSerializableApi();
+    assert.equal(typeof clean.rolloverCapture, 'function');
+    clean.beginCapture();
+    clean.beginStop();
+    clean.rolloverCapture?.();
+    assert.deepEqual(clean.snapshot(), {
+        lateRequestCount: 0,
+        phase: 'active',
+    });
+    assert.equal(clean.observeDatabaseRequest(), 'capture');
+
+    const contaminated = await restoreSerializableApi();
+    assert.equal(typeof contaminated.rolloverCapture, 'function');
+    contaminated.beginCapture();
+    contaminated.beginStop();
+    assert.equal(contaminated.observeDatabaseRequest(), 'after-cutoff');
+    assert.throws(
+        () => contaminated.rolloverCapture?.(),
+        /database-worker-post-gc-capture-contaminated/
+    );
+    assert.deepEqual(contaminated.snapshot(), {
+        lateRequestCount: 1,
+        phase: 'stopping',
+    });
+});
+
+test('main capture arms cutoff before awaiting and rejects late DB work before startWorker can restart profiling', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const stopStart = source.indexOf('stop: async (');
+    const cutoffStart = source.indexOf(
+        'databaseWorkerPostGcCutoffApi.beginStop()',
+        stopStart
+    );
+    const activeFalse = source.indexOf('state.active = false', stopStart);
+    const firstAwait = source.indexOf('await ', stopStart);
+    const observeRequest = source.indexOf(
+        'databaseWorkerPostGcCutoffApi.observeDatabaseRequest()'
+    );
+    const startWorker = source.indexOf('startWorker(record)', observeRequest);
+
+    assert.ok(stopStart >= 0);
+    assert.ok(cutoffStart > stopStart && cutoffStart < firstAwait);
+    assert.ok(activeFalse > stopStart && activeFalse < firstAwait);
+    assert.ok(observeRequest >= 0 && observeRequest < startWorker);
+    assert.match(source, /database-worker-activity-after-cutoff/);
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.ts
new file mode 100644
index 000000000..997963bdb
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-cutoff.ts
@@ -0,0 +1,74 @@
+export type DatabaseWorkerPostGcRequestDisposition =
+    'after-cutoff' | 'capture' | 'outside-capture';
+
+export interface DatabaseWorkerPostGcCutoffSnapshot {
+    readonly lateRequestCount: number;
+    readonly phase: 'active' | 'idle' | 'stopping';
+}
+
+export interface DatabaseWorkerPostGcCutoffApi {
+    beginCapture(): void;
+    beginStop(): void;
+    finishStop(): void;
+    observeDatabaseRequest(): DatabaseWorkerPostGcRequestDisposition;
+    rolloverCapture(): void;
+    snapshot(): DatabaseWorkerPostGcCutoffSnapshot;
+}
+
+export function createDatabaseWorkerPostGcCutoffApi(): DatabaseWorkerPostGcCutoffApi {
+    let lateRequestCount = 0;
+    let phase: DatabaseWorkerPostGcCutoffSnapshot['phase'] = 'idle';
+
+    const api: DatabaseWorkerPostGcCutoffApi = {
+        beginCapture(): void {
+            if (phase !== 'idle') {
+                throw new Error(
+                    phase === 'stopping'
+                        ? 'database-worker-post-gc-stop-in-progress'
+                        : 'database-worker-post-gc-capture-already-active'
+                );
+            }
+            lateRequestCount = 0;
+            phase = 'active';
+        },
+
+        beginStop(): void {
+            if (phase !== 'active') {
+                throw new Error('database-worker-post-gc-capture-not-active');
+            }
+            phase = 'stopping';
+        },
+
+        finishStop(): void {
+            phase = 'idle';
+        },
+
+        observeDatabaseRequest(): DatabaseWorkerPostGcRequestDisposition {
+            if (phase === 'active') {
+                return 'capture';
+            }
+            if (phase === 'stopping') {
+                lateRequestCount += 1;
+                return 'after-cutoff';
+            }
+            return 'outside-capture';
+        },
+
+        rolloverCapture(): void {
+            if (phase !== 'stopping') {
+                throw new Error('database-worker-post-gc-stop-not-in-progress');
+            }
+            if (lateRequestCount > 0) {
+                throw new Error('database-worker-post-gc-capture-contaminated');
+            }
+            lateRequestCount = 0;
+            phase = 'active';
+        },
+
+        snapshot(): DatabaseWorkerPostGcCutoffSnapshot {
+            return Object.freeze({ lateRequestCount, phase });
+        },
+    };
+
+    return Object.freeze(api);
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.spec.ts
new file mode 100644
index 000000000..bcd3ac969
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.spec.ts
@@ -0,0 +1,392 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+type AncillaryFailureStage = 'heap-snapshot' | 'post-gc-probe' | 'profile-stop';
+
+type PostGcOutcome =
+    | {
+          readonly postGcHeapUsedBytes: number;
+          readonly unavailableReason: null;
+      }
+    | {
+          readonly postGcHeapUsedBytes: null;
+          readonly unavailableReason: string;
+      };
+
+interface FinalizationInput {
+    readonly finalizationKey: object;
+    readonly joinFinalSample: () => Promise<void>;
+    readonly probePostGc: () => Promise<PostGcOutcome>;
+    readonly reportAncillaryFailure: (
+        stage: AncillaryFailureStage,
+        error: unknown
+    ) => void;
+    readonly stopProfile: () => Promise<void>;
+    readonly stopSampling: () => void;
+    readonly takeHeapSnapshot?: () => Promise<void>;
+}
+
+interface FinalizationApi {
+    finalize(input: FinalizationInput): Promise<PostGcOutcome>;
+}
+
+interface FinalizationModule {
+    createDatabaseWorkerPostGcFinalizationApi?: () => FinalizationApi;
+}
+
+const finalizationModulePromise = import(
+    new URL('./database-worker-post-gc-finalization.ts', import.meta.url).href
+)
+    .then((module) => module as FinalizationModule)
+    .catch(() => null);
+
+function deferred(): {
+    readonly promise: Promise<void>;
+    readonly resolve: () => void;
+} {
+    let resolve!: () => void;
+    const promise = new Promise<void>((resolvePromise) => {
+        resolve = resolvePromise;
+    });
+    return { promise, resolve };
+}
+
+async function restoreSerializableApi(): Promise<FinalizationApi> {
+    const module = await finalizationModulePromise;
+    assert.ok(module, 'database worker post-GC finalization module must exist');
+    const factory = module.createDatabaseWorkerPostGcFinalizationApi;
+    assert.equal(typeof factory, 'function');
+
+    const source = factory.toString();
+    assert.doesNotMatch(source, /__name/);
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => FinalizationApi;
+    return restoredFactory();
+}
+
+test('coordinates database worker post-GC finalization in order and single-flight', async () => {
+    const api = await restoreSerializableApi();
+    const finalSampleGate = deferred();
+    const events: string[] = [];
+    let probeCalls = 0;
+    const successfulPostGc = {
+        postGcHeapUsedBytes: 98_304,
+        unavailableReason: null,
+    } as const;
+    const input: FinalizationInput = {
+        finalizationKey: {},
+        joinFinalSample: async () => {
+            events.push('final-sample:start');
+            await finalSampleGate.promise;
+            events.push('final-sample:joined');
+        },
+        probePostGc: async () => {
+            probeCalls += 1;
+            events.push('post-gc-probe');
+            return successfulPostGc;
+        },
+        reportAncillaryFailure: () => {
+            assert.fail('the successful path has no ancillary failures');
+        },
+        stopProfile: async () => {
+            events.push('profile-stop');
+        },
+        stopSampling: () => {
+            events.push('sampling-stop');
+        },
+        takeHeapSnapshot: async () => {
+            events.push('heap-snapshot');
+        },
+    };
+
+    const firstFinalization = api.finalize(input);
+    const concurrentFinalization = api.finalize(input);
+    await Promise.resolve();
+
+    assert.deepEqual(events, ['sampling-stop', 'final-sample:start']);
+    assert.equal(probeCalls, 0);
+
+    finalSampleGate.resolve();
+    const [firstResult, concurrentResult] = await Promise.all([
+        firstFinalization,
+        concurrentFinalization,
+    ]);
+
+    assert.deepEqual(events, [
+        'sampling-stop',
+        'final-sample:start',
+        'final-sample:joined',
+        'profile-stop',
+        'post-gc-probe',
+        'heap-snapshot',
+    ]);
+    assert.equal(probeCalls, 1);
+    assert.deepEqual(firstResult, successfulPostGc);
+    assert.deepEqual(concurrentResult, successfulPostGc);
+});
+
+test('reports profile and snapshot failures without erasing successful post-GC', async () => {
+    const api = await restoreSerializableApi();
+    const events: string[] = [];
+    const profileError = new Error('profile-stop-failed');
+    const snapshotError = new Error('heap-snapshot-failed');
+    const failures: {
+        readonly error: unknown;
+        readonly stage: AncillaryFailureStage;
+    }[] = [];
+
+    const result = await api.finalize({
+        finalizationKey: {},
+        joinFinalSample: async () => {
+            events.push('final-sample:joined');
+        },
+        probePostGc: async () => {
+            events.push('post-gc-probe');
+            return {
+                postGcHeapUsedBytes: 131_072,
+                unavailableReason: null,
+            };
+        },
+        reportAncillaryFailure: (stage, error) => {
+            failures.push({ error, stage });
+        },
+        stopProfile: async () => {
+            events.push('profile-stop');
+            throw profileError;
+        },
+        stopSampling: () => {
+            events.push('sampling-stop');
+        },
+        takeHeapSnapshot: async () => {
+            events.push('heap-snapshot');
+            throw snapshotError;
+        },
+    });
+
+    assert.deepEqual(events, [
+        'sampling-stop',
+        'final-sample:joined',
+        'profile-stop',
+        'post-gc-probe',
+        'heap-snapshot',
+    ]);
+    assert.deepEqual(failures, [
+        { error: profileError, stage: 'profile-stop' },
+        { error: snapshotError, stage: 'heap-snapshot' },
+    ]);
+    assert.deepEqual(result, {
+        postGcHeapUsedBytes: 131_072,
+        unavailableReason: null,
+    });
+});
+
+test('fails closed when the post-GC probe throws without relabelling profile artifacts', async () => {
+    const api = await restoreSerializableApi();
+    const probeError = new Error('probe-failed');
+    const failures: {
+        readonly error: unknown;
+        readonly stage: AncillaryFailureStage;
+    }[] = [];
+
+    const result = await api.finalize({
+        finalizationKey: {},
+        joinFinalSample: async () => undefined,
+        probePostGc: async () => {
+            throw probeError;
+        },
+        reportAncillaryFailure: (stage, error) => {
+            failures.push({ error, stage });
+        },
+        stopProfile: async () => undefined,
+        stopSampling: () => undefined,
+    });
+
+    assert.deepEqual(result, {
+        postGcHeapUsedBytes: null,
+        unavailableReason: 'capture-failed',
+    });
+    assert.deepEqual(failures, [{ error: probeError, stage: 'post-gc-probe' }]);
+});
+
+test('the Electron main capture wires exact DB selection and explicit-GC finalization', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+
+    assert.match(
+        source,
+        /databaseWorkerPostGcSelectionApiFactorySource:\s+createDatabaseWorkerPostGcSelectionApi\.toString\(\)/
+    );
+    assert.match(
+        source,
+        /databaseWorkerPostGcProbeApiFactorySource:\s+createDatabaseWorkerPostGcProbeApi\.toString\(\)/
+    );
+    assert.match(
+        source,
+        /databaseWorkerPostGcFinalizationApiFactorySource:\s+createDatabaseWorkerPostGcFinalizationApi\.toString\(\)/
+    );
+    assert.match(source, /new workerThreads\.MessageChannel\(\)/);
+    assert.match(
+        source,
+        /databaseWorkerPostGcSelectionApi\.select\(\s*currentWorkerRecords,\s*state\.captureGeneration\s*\)/
+    );
+    assert.match(source, /databaseWorkerPostGcFinalizationApi\s*\.finalize\(/);
+    assert.match(source, /pendingCount: 0/);
+    assert.match(source, /record\.pendingCount \+= 1/);
+    assert.match(
+        source,
+        /request\.record\.pendingCount = Math\.max\(\s*0,\s*request\.record\.pendingCount - 1\s*\)/
+    );
+    assert.match(source, /samplePromise/);
+    assert.match(source, /postGcHeapUnavailableReason/);
+    assert.match(source, /ordinal: nextWorkerOrdinal/);
+    assert.match(
+        source,
+        /`\$\{record\.kind\}-\$\{record\.ordinal\}\.cpuprofile`/
+    );
+    assert.doesNotMatch(source, /sampleBusy/);
+    assert.doesNotMatch(source, /const postSnapshot/);
+});
+
+test('main CPU profiling stops at the operation cutoff before worker artifact finalization', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const stopStart = source.indexOf('stop: async (');
+    const mainProfileStop = source.indexOf("'Profiler.stop'", stopStart);
+    const databaseSelection = source.indexOf(
+        'databaseWorkerPostGcSelectionApi.select',
+        stopStart
+    );
+    const databaseFinalization = source.indexOf(
+        'await finalizeDatabaseWorker',
+        stopStart
+    );
+
+    assert.ok(stopStart >= 0);
+    assert.ok(mainProfileStop > stopStart);
+    assert.ok(mainProfileStop < databaseSelection);
+    assert.ok(mainProfileStop < databaseFinalization);
+});
+
+test('worker CPU profile serialization runs only after the main CPU profiler stops', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const profileStopStart = source.indexOf('const stopWorkerProfile');
+    const profileStopEnd = source.indexOf(
+        'const writeWorkerProfile',
+        profileStopStart
+    );
+    const profileStop = source.slice(profileStopStart, profileStopEnd);
+    const stopStart = source.indexOf('stop: async (');
+    const mainProfileStop = source.indexOf("'Profiler.stop'", stopStart);
+    const workerProfileFlush = source.indexOf(
+        'flushWorkerProfiles(currentWorkerRecords)',
+        mainProfileStop
+    );
+
+    assert.match(profileStop, /const profileResult = await handle\.stop\(\)/);
+    assert.match(profileStop, /record\.profileResult = profileResult/);
+    assert.doesNotMatch(profileStop, /writeFileSync|JSON\.stringify/);
+    assert.ok(mainProfileStop > stopStart);
+    assert.ok(workerProfileFlush > mainProfileStop);
+});
+
+test('measured termination stays unperturbed while diagnostic capture finalizes its profile before termination', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const terminateStart = source.indexOf(
+        'WorkerClass.prototype.terminate = function'
+    );
+    const terminateEnd = source.indexOf('const inspectorPost', terminateStart);
+    const terminateBlock = source.slice(terminateStart, terminateEnd);
+    const terminatingFinalizerStart = source.indexOf(
+        'const finalizeTerminatingWorker'
+    );
+    const terminatingFinalizerEnd = source.indexOf(
+        'WorkerClass.prototype.postMessage',
+        terminatingFinalizerStart
+    );
+    const terminatingFinalizer = source.slice(
+        terminatingFinalizerStart,
+        terminatingFinalizerEnd
+    );
+
+    const measuredTerminate = terminateBlock.indexOf(
+        'const termination = originalTerminate.call(this)'
+    );
+    const measuredFinalization = terminateBlock.indexOf(
+        'void finalizeTerminatingWorker(record, false)'
+    );
+    const diagnosticFinalizationStart = terminateBlock.indexOf(
+        'void finalizeTerminatingWorker(record, true)'
+    );
+    const diagnosticFinalizationWait = terminateBlock.indexOf(
+        'await waitForTerminatingWorkerFinalization(record)'
+    );
+    const diagnosticTerminate = terminateBlock.indexOf(
+        'return originalTerminate.call(this)',
+        diagnosticFinalizationWait
+    );
+
+    assert.ok(
+        diagnosticFinalizationStart >= 0 &&
+            diagnosticFinalizationStart < diagnosticFinalizationWait &&
+            diagnosticFinalizationWait < diagnosticTerminate,
+        'diagnostic capture must start profile finalization, bound its wait, and then terminate the worker'
+    );
+    assert.ok(
+        measuredTerminate >= 0 && measuredTerminate < measuredFinalization,
+        'measured capture must initiate termination before best-effort finalization'
+    );
+    assert.doesNotMatch(terminatingFinalizer, /takeWorkerHeapSnapshot/);
+    assert.match(
+        terminatingFinalizer,
+        /stopWorkerProfile\(record, waitForProfileHandle\)/
+    );
+    assert.match(source, /resolvedProfileHandle/);
+    assert.match(source, /worker-profile-finalization-timeout/);
+    assert.match(source, /finalizationTimedOut/);
+    assert.match(source, /profileCaptureKey/);
+    assert.match(source, /record\.profileCaptureKey !== profileCaptureKey/);
+});
+
+test('worker capture failures use an artifact-neutral timeline label', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+
+    assert.match(source, /worker-artifact-error:\$\{stage\}/);
+    assert.doesNotMatch(source, /worker-profile-error:\$\{stage\}/);
+});
+
+test('capture generation resets artifact paths and always emits current DB records', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const start = source.indexOf('const startCapture = async (');
+    const diagnostic = source.indexOf('if (state.diagnostic)', start);
+    const profileReset = source.indexOf('state.mainProfilePath = null', start);
+    const snapshotReset = source.indexOf(
+        'state.mainSnapshotPath = null',
+        start
+    );
+
+    assert.ok(profileReset > start && profileReset < diagnostic);
+    assert.ok(snapshotReset > start && snapshotReset < diagnostic);
+    assert.match(
+        source,
+        /record\.captureGeneration === state\.captureGeneration[\s\S]*record\.kind === 'database\.worker'/
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.ts
new file mode 100644
index 000000000..53ff8a226
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-finalization.ts
@@ -0,0 +1,90 @@
+import type { DatabaseWorkerPostGcProbeUnavailableReason } from './database-worker-post-gc-probe';
+import type { DatabaseWorkerPostGcUnavailableReason } from './database-worker-post-gc-selection';
+
+export type DatabaseWorkerPostGcAncillaryFailureStage =
+    'heap-snapshot' | 'post-gc-probe' | 'profile-stop' | 'profile-write';
+
+export type DatabaseWorkerPostGcFinalizationOutcome =
+    | {
+          readonly postGcHeapUsedBytes: number;
+          readonly unavailableReason: null;
+      }
+    | {
+          readonly postGcHeapUsedBytes: null;
+          readonly unavailableReason:
+              | DatabaseWorkerPostGcProbeUnavailableReason
+              | DatabaseWorkerPostGcUnavailableReason;
+      };
+
+export interface DatabaseWorkerPostGcFinalizationInput {
+    readonly finalizationKey: object;
+    readonly joinFinalSample: () => Promise<void>;
+    readonly probePostGc: () => Promise<DatabaseWorkerPostGcFinalizationOutcome>;
+    readonly reportAncillaryFailure: (
+        stage: DatabaseWorkerPostGcAncillaryFailureStage,
+        error: unknown
+    ) => void;
+    readonly stopProfile: () => Promise<void>;
+    readonly stopSampling: () => void;
+    readonly takeHeapSnapshot?: () => Promise<void>;
+}
+
+export interface DatabaseWorkerPostGcFinalizationApi {
+    finalize(
+        input: DatabaseWorkerPostGcFinalizationInput
+    ): Promise<DatabaseWorkerPostGcFinalizationOutcome>;
+}
+
+export function createDatabaseWorkerPostGcFinalizationApi(): DatabaseWorkerPostGcFinalizationApi {
+    const finalizations = new WeakMap<
+        object,
+        Promise<DatabaseWorkerPostGcFinalizationOutcome>
+    >();
+
+    const helpers = {
+        async run(
+            input: DatabaseWorkerPostGcFinalizationInput
+        ): Promise<DatabaseWorkerPostGcFinalizationOutcome> {
+            input.stopSampling();
+            await input.joinFinalSample();
+            try {
+                await input.stopProfile();
+            } catch (error: unknown) {
+                input.reportAncillaryFailure('profile-stop', error);
+            }
+
+            let outcome: DatabaseWorkerPostGcFinalizationOutcome;
+            try {
+                outcome = await input.probePostGc();
+            } catch (error: unknown) {
+                input.reportAncillaryFailure('post-gc-probe', error);
+                outcome = {
+                    postGcHeapUsedBytes: null,
+                    unavailableReason: 'capture-failed',
+                };
+            }
+            if (input.takeHeapSnapshot) {
+                try {
+                    await input.takeHeapSnapshot();
+                } catch (error: unknown) {
+                    input.reportAncillaryFailure('heap-snapshot', error);
+                }
+            }
+            return outcome;
+        },
+
+        finalize(
+            input: DatabaseWorkerPostGcFinalizationInput
+        ): Promise<DatabaseWorkerPostGcFinalizationOutcome> {
+            const existing = finalizations.get(input.finalizationKey);
+            if (existing) {
+                return existing;
+            }
+            const finalization = helpers.run(input);
+            finalizations.set(input.finalizationKey, finalization);
+            return finalization;
+        },
+    };
+
+    return Object.freeze({ finalize: helpers.finalize });
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.spec.ts
new file mode 100644
index 000000000..7ddf4e4cf
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.spec.ts
@@ -0,0 +1,469 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+/* eslint-disable max-lines -- The one-shot transport contract keeps all terminal-path fixtures together. */
+import assert from 'node:assert/strict';
+import { EventEmitter } from 'node:events';
+import test from 'node:test';
+
+type WorkerUnavailableReason =
+    'capture-failed' | 'gc-unavailable' | 'profiling-disabled' | 'worker-busy';
+
+type MainUnavailableReason =
+    | 'post-gc-probe-invalid-response'
+    | 'post-gc-probe-message-error'
+    | 'post-gc-probe-port-closed'
+    | 'post-gc-probe-post-failed'
+    | 'post-gc-probe-timeout';
+
+type ProbeUnavailableReason = WorkerUnavailableReason | MainUnavailableReason;
+
+type ProbeResult =
+    | {
+          readonly postGcHeapUsedBytes: number;
+          readonly unavailableReason: null;
+      }
+    | {
+          readonly postGcHeapUsedBytes: null;
+          readonly unavailableReason: ProbeUnavailableReason;
+      };
+
+interface ProbePort {
+    close(): void;
+    off(event: 'close', listener: () => void): unknown;
+    off(event: 'message', listener: (message: unknown) => void): unknown;
+    off(event: 'messageerror', listener: (error: unknown) => void): unknown;
+    on(event: 'close', listener: () => void): unknown;
+    on(event: 'message', listener: (message: unknown) => void): unknown;
+    on(event: 'messageerror', listener: (error: unknown) => void): unknown;
+    postMessage(message: unknown): void;
+    start(): void;
+}
+
+interface ProbeWorker {
+    postMessage(message: unknown, transferList: readonly unknown[]): void;
+}
+
+interface ProbeTimers {
+    clearTimeout(handle: unknown): void;
+    setTimeout(callback: () => void, delayMs: number): unknown;
+}
+
+interface ProbeApi {
+    probe(input: {
+        readonly createMessageChannel: () => {
+            readonly port1: ProbePort;
+            readonly port2: ProbePort;
+        };
+        readonly timeoutMs?: number;
+        readonly timers?: ProbeTimers;
+        readonly worker: ProbeWorker;
+    }): Promise<ProbeResult>;
+}
+
+interface ProbeModule {
+    createDatabaseWorkerPostGcProbeApi?: () => ProbeApi;
+}
+
+interface ProductionWorkerPostGcModule {
+    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON?: Readonly<
+        Record<string, WorkerUnavailableReason>
+    >;
+}
+
+const probeModulePromise = import(
+    new URL('./database-worker-post-gc-probe.ts', import.meta.url).href
+)
+    .then((module) => module as ProbeModule)
+    .catch(() => null);
+const productionWorkerPostGcModulePromise = import(
+    new URL(
+        '../../../electron-backend/src/app/workers/database-worker-post-gc-heap.ts',
+        import.meta.url
+    ).href
+)
+    .then((module) => module as ProductionWorkerPostGcModule)
+    .catch(() => null);
+
+class FakePort extends EventEmitter implements ProbePort {
+    closeCalls = 0;
+    peer: FakePort | null = null;
+    startCalls = 0;
+
+    close(): void {
+        this.closeCalls += 1;
+    }
+
+    postMessage(message: unknown): void {
+        this.peer?.emit('message', message);
+    }
+
+    start(): void {
+        this.startCalls += 1;
+    }
+}
+
+class FakeTimers implements ProbeTimers {
+    readonly cleared: unknown[] = [];
+    readonly scheduled: {
+        readonly callback: () => void;
+        readonly delayMs: number;
+        readonly handle: number;
+    }[] = [];
+    private nextHandle = 1;
+
+    clearTimeout(handle: unknown): void {
+        this.cleared.push(handle);
+    }
+
+    fire(handle: number): void {
+        const timer = this.scheduled.find(
+            (candidate) => candidate.handle === handle
+        );
+        assert.ok(timer, `timer ${handle} must exist`);
+        timer.callback();
+    }
+
+    setTimeout(callback: () => void, delayMs: number): number {
+        const handle = this.nextHandle;
+        this.nextHandle += 1;
+        this.scheduled.push({ callback, delayMs, handle });
+        return handle;
+    }
+}
+
+interface ProbeHarness {
+    readonly createMessageChannel: () => {
+        readonly port1: FakePort;
+        readonly port2: FakePort;
+    };
+    readonly port1: FakePort;
+    readonly port2: FakePort;
+    readonly timers: FakeTimers;
+}
+
+function createProbeHarness(): ProbeHarness {
+    const port1 = new FakePort();
+    const port2 = new FakePort();
+    port1.peer = port2;
+    port2.peer = port1;
+    const timers = new FakeTimers();
+
+    return {
+        createMessageChannel: () => ({ port1, port2 }),
+        port1,
+        port2,
+        timers,
+    };
+}
+
+async function restoreSerializableApi(): Promise<ProbeApi> {
+    const module = await probeModulePromise;
+    assert.ok(module, 'database worker post-GC probe module must exist');
+    const factory = module.createDatabaseWorkerPostGcProbeApi;
+    assert.equal(typeof factory, 'function');
+
+    const source = factory.toString();
+    assert.doesNotMatch(source, /__name/);
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => ProbeApi;
+    return restoredFactory();
+}
+
+function assertCoherentResult(result: ProbeResult): void {
+    const hasHeap =
+        Number.isSafeInteger(result.postGcHeapUsedBytes) &&
+        Number(result.postGcHeapUsedBytes) >= 0;
+    assert.equal(
+        hasHeap,
+        result.unavailableReason === null,
+        'probe result must preserve the heap/reason XOR'
+    );
+}
+
+function cleanupCounts(port: FakePort): Record<string, number> {
+    return {
+        close: port.listenerCount('close'),
+        message: port.listenerCount('message'),
+        messageerror: port.listenerCount('messageerror'),
+    };
+}
+
+test('serializes the factory and sends the exact one-shot worker request with its transfer port', async () => {
+    const api = await restoreSerializableApi();
+    const harness = createProbeHarness();
+    let postedMessage: unknown;
+    let postedTransferList: readonly unknown[] | null = null;
+    let terminateCalls = 0;
+    const worker = {
+        postMessage(message: unknown, transferList: readonly unknown[]): void {
+            postedMessage = message;
+            postedTransferList = transferList;
+            const responsePort = (
+                message as { readonly responsePort: ProbePort }
+            ).responsePort;
+            responsePort.postMessage({
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: 73_728,
+                unavailableReason: null,
+            });
+        },
+        terminate(): void {
+            terminateCalls += 1;
+        },
+    };
+
+    const result = await api.probe({
+        createMessageChannel: harness.createMessageChannel,
+        timers: harness.timers,
+        worker,
+    });
+
+    assert.deepEqual(postedMessage, {
+        type: 'performance:collect-post-gc-heap',
+        responsePort: harness.port2,
+    });
+    assert.deepEqual(postedTransferList, [harness.port2]);
+    assert.deepEqual(result, {
+        postGcHeapUsedBytes: 73_728,
+        unavailableReason: null,
+    });
+    assertCoherentResult(result);
+    assert.equal(harness.port1.startCalls, 1);
+    assert.equal(harness.port1.closeCalls, 1);
+    assert.deepEqual(cleanupCounts(harness.port1), {
+        close: 0,
+        message: 0,
+        messageerror: 0,
+    });
+    assert.deepEqual(
+        harness.timers.scheduled.map((timer) => timer.delayMs),
+        [5_000]
+    );
+    assert.deepEqual(harness.timers.cleared, [1]);
+    assert.equal(terminateCalls, 0);
+});
+
+test('preserves every coherent worker-side unavailable result', async () => {
+    const api = await restoreSerializableApi();
+    const productionModule = await productionWorkerPostGcModulePromise;
+    assert.ok(productionModule, 'production worker post-GC module must load');
+    const productionReasons =
+        productionModule.DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON;
+    assert.ok(productionReasons, 'production worker reasons must be exported');
+    const reasons = Object.values(productionReasons);
+    assert.deepEqual(
+        new Set(reasons),
+        new Set<WorkerUnavailableReason>([
+            'capture-failed',
+            'gc-unavailable',
+            'profiling-disabled',
+            'worker-busy',
+        ])
+    );
+
+    for (const unavailableReason of reasons) {
+        const harness = createProbeHarness();
+        const result = await api.probe({
+            createMessageChannel: harness.createMessageChannel,
+            timers: harness.timers,
+            worker: {
+                postMessage(message: unknown): void {
+                    (
+                        message as { readonly responsePort: ProbePort }
+                    ).responsePort.postMessage({
+                        type: 'performance:post-gc-heap-result',
+                        postGcHeapUsedBytes: null,
+                        unavailableReason,
+                    });
+                },
+            },
+        });
+
+        assert.deepEqual(result, {
+            postGcHeapUsedBytes: null,
+            unavailableReason,
+        });
+        assertCoherentResult(result);
+    }
+});
+
+test('fails closed for malformed or incoherent worker responses', async () => {
+    const api = await restoreSerializableApi();
+    const malformedResponses: readonly unknown[] = [
+        null,
+        [],
+        {
+            type: 'wrong-result',
+            postGcHeapUsedBytes: 1,
+            unavailableReason: null,
+        },
+        {
+            type: 'performance:post-gc-heap-result',
+            postGcHeapUsedBytes: 1,
+            unavailableReason: 'capture-failed',
+        },
+        {
+            type: 'performance:post-gc-heap-result',
+            postGcHeapUsedBytes: null,
+            unavailableReason: null,
+        },
+        {
+            type: 'performance:post-gc-heap-result',
+            postGcHeapUsedBytes: null,
+            unavailableReason: 'unknown-reason',
+        },
+        ...[-1, 1.5, Number.NaN, Number.POSITIVE_INFINITY].map(
+            (postGcHeapUsedBytes) => ({
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes,
+                unavailableReason: null,
+            })
+        ),
+        {
+            type: 'performance:post-gc-heap-result',
+            postGcHeapUsedBytes: Number.MAX_SAFE_INTEGER + 1,
+            unavailableReason: null,
+        },
+    ];
+
+    for (const response of malformedResponses) {
+        const harness = createProbeHarness();
+        const result = await api.probe({
+            createMessageChannel: harness.createMessageChannel,
+            timers: harness.timers,
+            worker: {
+                postMessage(message: unknown): void {
+                    (
+                        message as { readonly responsePort: ProbePort }
+                    ).responsePort.postMessage(response);
+                },
+            },
+        });
+
+        assert.deepEqual(result, {
+            postGcHeapUsedBytes: null,
+            unavailableReason: 'post-gc-probe-invalid-response',
+        });
+        assertCoherentResult(result);
+    }
+});
+
+test('times out once with an injectable deadline and ignores every later terminal signal', async () => {
+    const api = await restoreSerializableApi();
+    const harness = createProbeHarness();
+    let terminateCalls = 0;
+    const resultPromise = api.probe({
+        createMessageChannel: harness.createMessageChannel,
+        timeoutMs: 37,
+        timers: harness.timers,
+        worker: {
+            postMessage(): void {
+                // Keep the one-shot probe pending until its bounded deadline.
+            },
+            terminate(): void {
+                terminateCalls += 1;
+            },
+        },
+    });
+    const timer = harness.timers.scheduled[0];
+    assert.ok(timer);
+    assert.equal(timer.delayMs, 37);
+
+    harness.timers.fire(timer.handle);
+    const result = await resultPromise;
+    harness.port1.emit('message', {
+        type: 'performance:post-gc-heap-result',
+        postGcHeapUsedBytes: 99,
+        unavailableReason: null,
+    });
+    harness.port1.emit('messageerror', new Error('late message error'));
+    harness.port1.emit('close');
+    timer.callback();
+
+    assert.deepEqual(result, {
+        postGcHeapUsedBytes: null,
+        unavailableReason: 'post-gc-probe-timeout',
+    });
+    assertCoherentResult(result);
+    assert.equal(harness.port1.closeCalls, 1);
+    assert.deepEqual(cleanupCounts(harness.port1), {
+        close: 0,
+        message: 0,
+        messageerror: 0,
+    });
+    assert.deepEqual(harness.timers.cleared, [timer.handle]);
+    assert.equal(terminateCalls, 0);
+});
+
+test('maps message errors and an early response-port close to fixed reasons', async () => {
+    const api = await restoreSerializableApi();
+    const cases = [
+        {
+            emit(port: FakePort): void {
+                port.emit('messageerror', new Error('clone failed'));
+            },
+            reason: 'post-gc-probe-message-error',
+        },
+        {
+            emit(port: FakePort): void {
+                port.emit('close');
+            },
+            reason: 'post-gc-probe-port-closed',
+        },
+    ] as const;
+
+    for (const testCase of cases) {
+        const harness = createProbeHarness();
+        const resultPromise = api.probe({
+            createMessageChannel: harness.createMessageChannel,
+            timers: harness.timers,
+            worker: {
+                postMessage(): void {
+                    testCase.emit(harness.port1);
+                },
+            },
+        });
+
+        const result = await resultPromise;
+        assert.deepEqual(result, {
+            postGcHeapUsedBytes: null,
+            unavailableReason: testCase.reason,
+        });
+        assertCoherentResult(result);
+        assert.equal(harness.port1.closeCalls, 1);
+        assert.deepEqual(cleanupCounts(harness.port1), {
+            close: 0,
+            message: 0,
+            messageerror: 0,
+        });
+    }
+});
+
+test('closes both ports and reports a fixed reason when the request cannot be posted', async () => {
+    const api = await restoreSerializableApi();
+    const harness = createProbeHarness();
+
+    const result = await api.probe({
+        createMessageChannel: harness.createMessageChannel,
+        timers: harness.timers,
+        worker: {
+            postMessage(): void {
+                throw new Error('worker already exited');
+            },
+        },
+    });
+
+    assert.deepEqual(result, {
+        postGcHeapUsedBytes: null,
+        unavailableReason: 'post-gc-probe-post-failed',
+    });
+    assertCoherentResult(result);
+    assert.equal(harness.port1.closeCalls, 1);
+    assert.equal(harness.port2.closeCalls, 1);
+    assert.deepEqual(cleanupCounts(harness.port1), {
+        close: 0,
+        message: 0,
+        messageerror: 0,
+    });
+    assert.deepEqual(harness.timers.cleared, [1]);
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.ts
new file mode 100644
index 000000000..7e11645c6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-probe.ts
@@ -0,0 +1,242 @@
+export type DatabaseWorkerPostGcProbeUnavailableReason =
+    | 'capture-failed'
+    | 'gc-unavailable'
+    | 'post-gc-probe-invalid-response'
+    | 'post-gc-probe-message-error'
+    | 'post-gc-probe-port-closed'
+    | 'post-gc-probe-post-failed'
+    | 'post-gc-probe-timeout'
+    | 'profiling-disabled'
+    | 'worker-busy';
+
+export type DatabaseWorkerPostGcProbeResult =
+    | {
+          readonly postGcHeapUsedBytes: number;
+          readonly unavailableReason: null;
+      }
+    | {
+          readonly postGcHeapUsedBytes: null;
+          readonly unavailableReason: DatabaseWorkerPostGcProbeUnavailableReason;
+      };
+
+export interface DatabaseWorkerPostGcProbePort {
+    close(): void;
+    off(event: 'close', listener: () => void): unknown;
+    off(event: 'message', listener: (message: unknown) => void): unknown;
+    off(event: 'messageerror', listener: (error: unknown) => void): unknown;
+    on(event: 'close', listener: () => void): unknown;
+    on(event: 'message', listener: (message: unknown) => void): unknown;
+    on(event: 'messageerror', listener: (error: unknown) => void): unknown;
+    start(): void;
+}
+
+export interface DatabaseWorkerPostGcProbeWorker {
+    postMessage(message: unknown, transferList: readonly unknown[]): void;
+}
+
+export interface DatabaseWorkerPostGcProbeTimers {
+    clearTimeout(handle: unknown): void;
+    setTimeout(callback: () => void, delayMs: number): unknown;
+}
+
+export interface DatabaseWorkerPostGcProbeInput {
+    readonly createMessageChannel: () => {
+        readonly port1: DatabaseWorkerPostGcProbePort;
+        readonly port2: DatabaseWorkerPostGcProbePort;
+    };
+    readonly timeoutMs?: number;
+    readonly timers?: DatabaseWorkerPostGcProbeTimers;
+    readonly worker: DatabaseWorkerPostGcProbeWorker;
+}
+
+export interface DatabaseWorkerPostGcProbeApi {
+    probe(
+        input: DatabaseWorkerPostGcProbeInput
+    ): Promise<DatabaseWorkerPostGcProbeResult>;
+}
+
+export function createDatabaseWorkerPostGcProbeApi(): DatabaseWorkerPostGcProbeApi {
+    type JsonRecord = Record<string, unknown>;
+
+    const DEFAULT_TIMEOUT_MS = 5_000;
+    const REQUEST_TYPE = 'performance:collect-post-gc-heap';
+    const RESULT_TYPE = 'performance:post-gc-heap-result';
+    const workerUnavailableReasons = new Set([
+        'capture-failed',
+        'gc-unavailable',
+        'profiling-disabled',
+        'worker-busy',
+    ]);
+    const defaultTimers: DatabaseWorkerPostGcProbeTimers = {
+        clearTimeout(handle: unknown): void {
+            globalThis.clearTimeout(
+                handle as ReturnType<typeof globalThis.setTimeout>
+            );
+        },
+        setTimeout(callback: () => void, delayMs: number): unknown {
+            return globalThis.setTimeout(callback, delayMs);
+        },
+    };
+
+    const helpers = {
+        unavailable(
+            unavailableReason: DatabaseWorkerPostGcProbeUnavailableReason
+        ): DatabaseWorkerPostGcProbeResult {
+            return Object.freeze({
+                postGcHeapUsedBytes: null,
+                unavailableReason,
+            });
+        },
+
+        normalizeResponse(response: unknown): DatabaseWorkerPostGcProbeResult {
+            if (
+                typeof response !== 'object' ||
+                response === null ||
+                Array.isArray(response)
+            ) {
+                return helpers.unavailable('post-gc-probe-invalid-response');
+            }
+
+            const candidate = response as JsonRecord;
+            const postGcHeapUsedBytes = candidate['postGcHeapUsedBytes'];
+            const unavailableReason = candidate['unavailableReason'];
+            if (
+                candidate['type'] === RESULT_TYPE &&
+                Number.isSafeInteger(postGcHeapUsedBytes) &&
+                Number(postGcHeapUsedBytes) >= 0 &&
+                unavailableReason === null
+            ) {
+                return Object.freeze({
+                    postGcHeapUsedBytes: Number(postGcHeapUsedBytes),
+                    unavailableReason: null,
+                });
+            }
+            if (
+                candidate['type'] === RESULT_TYPE &&
+                postGcHeapUsedBytes === null &&
+                typeof unavailableReason === 'string' &&
+                workerUnavailableReasons.has(unavailableReason)
+            ) {
+                return helpers.unavailable(
+                    unavailableReason as DatabaseWorkerPostGcProbeUnavailableReason
+                );
+            }
+            return helpers.unavailable('post-gc-probe-invalid-response');
+        },
+
+        probe(
+            input: DatabaseWorkerPostGcProbeInput
+        ): Promise<DatabaseWorkerPostGcProbeResult> {
+            let channel: ReturnType<typeof input.createMessageChannel>;
+            try {
+                channel = input.createMessageChannel();
+            } catch {
+                return Promise.resolve(
+                    helpers.unavailable('post-gc-probe-post-failed')
+                );
+            }
+
+            const { port1, port2 } = channel;
+            const timers = input.timers ?? defaultTimers;
+            const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+
+            return new Promise((resolve) => {
+                let settled = false;
+                let timerHandle: unknown;
+                let timerScheduled = false;
+                const callbacks = {
+                    cleanup(): void {
+                        try {
+                            port1.off('message', callbacks.onMessage);
+                        } catch {
+                            // Best-effort profiling cleanup must not escape.
+                        }
+                        try {
+                            port1.off('messageerror', callbacks.onMessageError);
+                        } catch {
+                            // Best-effort profiling cleanup must not escape.
+                        }
+                        try {
+                            port1.off('close', callbacks.onClose);
+                        } catch {
+                            // Best-effort profiling cleanup must not escape.
+                        }
+                        if (timerScheduled) {
+                            try {
+                                timers.clearTimeout(timerHandle);
+                            } catch {
+                                // Best-effort profiling cleanup must not escape.
+                            }
+                        }
+                        try {
+                            port1.close();
+                        } catch {
+                            // The one-shot response port may already be closed.
+                        }
+                    },
+
+                    settle(result: DatabaseWorkerPostGcProbeResult): void {
+                        if (settled) {
+                            return;
+                        }
+                        settled = true;
+                        callbacks.cleanup();
+                        resolve(result);
+                    },
+
+                    onClose(): void {
+                        callbacks.settle(
+                            helpers.unavailable('post-gc-probe-port-closed')
+                        );
+                    },
+
+                    onMessage(message: unknown): void {
+                        callbacks.settle(helpers.normalizeResponse(message));
+                    },
+
+                    onMessageError(): void {
+                        callbacks.settle(
+                            helpers.unavailable('post-gc-probe-message-error')
+                        );
+                    },
+
+                    onTimeout(): void {
+                        callbacks.settle(
+                            helpers.unavailable('post-gc-probe-timeout')
+                        );
+                    },
+                };
+
+                try {
+                    port1.on('message', callbacks.onMessage);
+                    port1.on('messageerror', callbacks.onMessageError);
+                    port1.on('close', callbacks.onClose);
+                    port1.start();
+                    timerHandle = timers.setTimeout(
+                        callbacks.onTimeout,
+                        timeoutMs
+                    );
+                    timerScheduled = true;
+                    input.worker.postMessage(
+                        {
+                            type: REQUEST_TYPE,
+                            responsePort: port2,
+                        },
+                        [port2]
+                    );
+                } catch {
+                    callbacks.settle(
+                        helpers.unavailable('post-gc-probe-post-failed')
+                    );
+                    try {
+                        port2.close();
+                    } catch {
+                        // A synchronous transfer failure may already close it.
+                    }
+                }
+            });
+        },
+    };
+
+    return Object.freeze({ probe: helpers.probe });
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-report.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-report.spec.ts
new file mode 100644
index 000000000..83b221927
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-report.spec.ts
@@ -0,0 +1,131 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+    type CancellationBenchmarkManifest,
+    type CancellationIterationResult,
+    PERFORMANCE_ITERATION_KIND,
+    PERFORMANCE_WORKER_KIND,
+    type WorkerCaptureMetrics,
+} from './m3u-refresh-cancellation-contract';
+import { createCancellationBenchmarkSummary } from './m3u-refresh-cancellation-report';
+
+function databaseWorker(
+    postGcHeapUsedBytes: number | null,
+    postGcHeapUnavailableReason: string | null
+): WorkerCaptureMetrics {
+    return {
+        kind: PERFORMANCE_WORKER_KIND.DATABASE,
+        peakExternalBytes: 0,
+        peakHeapUsedBytes: 0,
+        postGcHeapUnavailableReason,
+        postGcHeapUsedBytes,
+        requests: [],
+    } as unknown as WorkerCaptureMetrics;
+}
+
+function measuredIteration(
+    workers: readonly WorkerCaptureMetrics[]
+): CancellationIterationResult {
+    return {
+        cancellationEffectObserved: true,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: {
+            eventLoopDelay: { maxMs: 0, p95Ms: 0, p99Ms: 0 },
+            eventLoopUtilization: null,
+            memory: {
+                peakHeapUsedBytes: 0,
+                peakRssBytes: 0,
+                postGcHeapUsedBytes: null,
+                postGcRssBytes: null,
+            },
+            rendererWindow: {
+                responsiveEvents: 0,
+                rss: {
+                    identity: {
+                        creationTime: 1_721_234_567_890,
+                        pid: 42,
+                    },
+                    missingSampleCount: 0,
+                    peakRssBytes: 2_048,
+                    unavailableReason: null,
+                    validSampleCount: 1,
+                },
+                unresponsiveEvents: 0,
+                windowIdentity: {
+                    browserWindowId: 7,
+                    webContentsId: 11,
+                },
+            },
+            workers,
+        },
+        phases: {},
+        renderer: {
+            peakHeapUsedBytes: 0,
+            postGcHeapUsedBytes: null,
+            probe: {
+                frameGapsMs: [],
+                heartbeatDelaysMs: [],
+                longTasksMs: [],
+            },
+        },
+        runId: 'measured',
+    } as unknown as CancellationIterationResult;
+}
+
+test('summary includes every database isolate instead of silently taking the first', () => {
+    const unavailable = databaseWorker(null, 'post-gc-probe-invalid-response');
+    const summary = createCancellationBenchmarkSummary(
+        {} as CancellationBenchmarkManifest,
+        [
+            measuredIteration([
+                databaseWorker(100, null),
+                databaseWorker(300, null),
+                unavailable,
+            ]),
+        ]
+    );
+
+    assert.deepEqual(summary.measured.databaseWorkerPostGcHeapBytes, {
+        count: 2,
+        max: 300,
+        mean: 200,
+        median: 200,
+        min: 100,
+        p95: 290,
+        p99: 298,
+    });
+    assert.deepEqual(
+        (
+            summary as unknown as {
+                readonly validity: {
+                    readonly databaseWorkerPostGc: unknown;
+                };
+            }
+        ).validity.databaseWorkerPostGc,
+        {
+            applicableMeasuredRunCount: 1,
+            invalidMeasuredRuns: [
+                {
+                    databaseWorkerCount: 3,
+                    reason: 'database-worker-unexpected-activity',
+                    runId: 'measured',
+                },
+            ],
+            measuredRunCount: 1,
+            notApplicableMeasuredRuns: [],
+            validForBenchmark: false,
+            validForComparison: false,
+            validMeasuredRunCount: 0,
+        }
+    );
+    assert.equal(
+        (
+            summary.iterations[0]?.main.workers[2] as WorkerCaptureMetrics & {
+                readonly postGcHeapUnavailableReason: string | null;
+            }
+        )?.postGcHeapUnavailableReason,
+        'post-gc-probe-invalid-response'
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.spec.ts
new file mode 100644
index 000000000..89559182f
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.spec.ts
@@ -0,0 +1,145 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+type WorkerKind = 'database.worker' | 'playlist-refresh.worker';
+
+interface TestWorkerRecord {
+    readonly captureGeneration: number | null;
+    readonly finalized: boolean;
+    readonly kind: WorkerKind;
+    readonly ordinal: number;
+    readonly pendingCount: number;
+    readonly sampleTimer: object | null;
+}
+
+type SelectionReason =
+    | 'database-worker-missing'
+    | 'database-worker-not-idle'
+    | 'multiple-database-workers';
+
+interface Selection<T> {
+    readonly selected: T | null;
+    readonly unavailableReason: SelectionReason | null;
+}
+
+type Selector = <T extends TestWorkerRecord>(
+    records: readonly T[],
+    activeGeneration: number
+) => Selection<T>;
+
+interface SelectionModule {
+    createDatabaseWorkerPostGcSelectionApi?: () => {
+        readonly select: Selector;
+    };
+}
+
+const selectionModulePromise = import(
+    new URL('./database-worker-post-gc-selection.ts', import.meta.url).href
+)
+    .then((module) => module as SelectionModule)
+    .catch(() => null);
+
+function workerRecord(
+    ordinal: number,
+    overrides: Partial<TestWorkerRecord> = {}
+): TestWorkerRecord {
+    return {
+        captureGeneration: 7,
+        finalized: true,
+        kind: 'database.worker',
+        ordinal,
+        pendingCount: 0,
+        sampleTimer: null,
+        ...overrides,
+    };
+}
+
+async function restoreSerializableSelector(): Promise<Selector> {
+    const module = await selectionModulePromise;
+    assert.ok(module, 'database worker post-GC selector module must exist');
+    const factory = module.createDatabaseWorkerPostGcSelectionApi;
+    assert.equal(typeof factory, 'function');
+    const source = factory.toString();
+    assert.doesNotMatch(source, /__name/);
+
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => {
+        readonly select: Selector;
+    };
+    return restoredFactory().select;
+}
+
+test('selects the only current-generation database worker independently of sampling and finalization state', async () => {
+    const select = await restoreSerializableSelector();
+    const currentDatabase = workerRecord(4, {
+        finalized: true,
+        sampleTimer: null,
+    });
+    const previousDatabase = workerRecord(1, {
+        captureGeneration: 6,
+        finalized: false,
+        sampleTimer: {},
+    });
+    const currentPlaylist = workerRecord(2, {
+        finalized: false,
+        kind: 'playlist-refresh.worker',
+        sampleTimer: {},
+    });
+
+    const selection = select(
+        [previousDatabase, currentPlaylist, currentDatabase],
+        7
+    );
+
+    assert.equal(selection.selected, currentDatabase);
+    assert.deepEqual(selection, {
+        selected: currentDatabase,
+        unavailableReason: null,
+    });
+});
+
+test('reports a missing database worker after ignoring playlists and previous generations', async () => {
+    const select = await restoreSerializableSelector();
+
+    assert.deepEqual(
+        select(
+            [
+                workerRecord(1, { captureGeneration: 6 }),
+                workerRecord(2, { kind: 'playlist-refresh.worker' }),
+            ],
+            7
+        ),
+        {
+            selected: null,
+            unavailableReason: 'database-worker-missing',
+        }
+    );
+});
+
+test('fails closed for multiple current-generation database workers instead of taking the first', async () => {
+    const select = await restoreSerializableSelector();
+    const first = workerRecord(1, {
+        finalized: false,
+        sampleTimer: {},
+    });
+    const second = workerRecord(2, {
+        finalized: true,
+        sampleTimer: null,
+    });
+
+    assert.deepEqual(select([first, second], 7), {
+        selected: null,
+        unavailableReason: 'multiple-database-workers',
+    });
+});
+
+test('fails closed while the only current-generation database worker is not idle', async () => {
+    const select = await restoreSerializableSelector();
+
+    assert.deepEqual(select([workerRecord(3, { pendingCount: 2 })], 7), {
+        selected: null,
+        unavailableReason: 'database-worker-not-idle',
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.ts
new file mode 100644
index 000000000..149e4bada
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-selection.ts
@@ -0,0 +1,70 @@
+export type DatabaseWorkerPostGcUnavailableReason =
+    | 'database-worker-missing'
+    | 'database-worker-not-idle'
+    | 'multiple-database-workers';
+
+export interface DatabaseWorkerPostGcSelectionRecord {
+    readonly captureGeneration: number | null;
+    readonly kind: string;
+    readonly ordinal: number;
+    readonly pendingCount: number;
+}
+
+export interface DatabaseWorkerPostGcSelection<T> {
+    readonly selected: T | null;
+    readonly unavailableReason: DatabaseWorkerPostGcUnavailableReason | null;
+}
+
+export interface DatabaseWorkerPostGcSelectionApi {
+    select<T extends DatabaseWorkerPostGcSelectionRecord>(
+        records: readonly T[],
+        activeGeneration: number
+    ): DatabaseWorkerPostGcSelection<T>;
+}
+
+export function createDatabaseWorkerPostGcSelectionApi(): DatabaseWorkerPostGcSelectionApi {
+    const helpers = {
+        select<T extends DatabaseWorkerPostGcSelectionRecord>(
+            records: readonly T[],
+            activeGeneration: number
+        ): DatabaseWorkerPostGcSelection<T> {
+            const currentDatabaseWorkers: T[] = [];
+            for (const record of records) {
+                if (
+                    record.captureGeneration === activeGeneration &&
+                    record.kind === 'database.worker'
+                ) {
+                    currentDatabaseWorkers.push(record);
+                }
+            }
+
+            if (currentDatabaseWorkers.length === 0) {
+                return Object.freeze({
+                    selected: null,
+                    unavailableReason: 'database-worker-missing',
+                });
+            }
+            if (currentDatabaseWorkers.length > 1) {
+                return Object.freeze({
+                    selected: null,
+                    unavailableReason: 'multiple-database-workers',
+                });
+            }
+
+            const selected = currentDatabaseWorkers[0] as T;
+            if (selected.pendingCount > 0) {
+                return Object.freeze({
+                    selected: null,
+                    unavailableReason: 'database-worker-not-idle',
+                });
+            }
+
+            return Object.freeze({
+                selected,
+                unavailableReason: null,
+            });
+        },
+    };
+
+    return Object.freeze({ select: helpers.select });
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.spec.ts
new file mode 100644
index 000000000..c26a4163d
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.spec.ts
@@ -0,0 +1,392 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+type IterationKind = 'diagnostic' | 'measured' | 'warmup';
+type WorkerKind = 'database.worker' | 'playlist-refresh.worker';
+
+interface TestWorkerCapture {
+    readonly kind: WorkerKind;
+    readonly postGcHeapUnavailableReason: string | null;
+    readonly postGcHeapUsedBytes: number | null;
+}
+
+interface TestIteration {
+    readonly cancellationEffectObserved: boolean;
+    readonly kind: IterationKind;
+    readonly main: {
+        readonly timeline: readonly {
+            readonly type: string;
+        }[];
+        readonly workers: readonly TestWorkerCapture[];
+    };
+    readonly runId: string;
+}
+
+interface InvalidMeasuredRun {
+    readonly databaseWorkerCount: number;
+    readonly reason: string;
+    readonly runId: string;
+}
+
+interface DatabaseWorkerPostGcValidity {
+    readonly applicableMeasuredRunCount: number;
+    readonly invalidMeasuredRuns: readonly InvalidMeasuredRun[];
+    readonly measuredRunCount: number;
+    readonly notApplicableMeasuredRuns: readonly {
+        readonly reason: string;
+        readonly runId: string;
+    }[];
+    readonly validForBenchmark: boolean;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+}
+
+interface ValidityModule {
+    assessDatabaseWorkerPostGcValidity?: (
+        iterations: readonly TestIteration[]
+    ) => DatabaseWorkerPostGcValidity;
+}
+
+const validityModulePromise = import(
+    new URL('./database-worker-post-gc-validity.ts', import.meta.url).href
+)
+    .then((module) => module as ValidityModule)
+    .catch(() => null);
+
+function worker(
+    postGcHeapUsedBytes: number | null,
+    postGcHeapUnavailableReason: string | null,
+    kind: WorkerKind = 'database.worker'
+): TestWorkerCapture {
+    return {
+        kind,
+        postGcHeapUnavailableReason,
+        postGcHeapUsedBytes,
+    };
+}
+
+function iteration(
+    runId: string,
+    kind: IterationKind,
+    workers: readonly TestWorkerCapture[],
+    timeline: readonly { readonly type: string }[] = [],
+    cancellationEffectObserved = false
+): TestIteration {
+    return {
+        cancellationEffectObserved,
+        kind,
+        main: { timeline, workers },
+        runId,
+    };
+}
+
+test('validates database post-GC heap per measured iteration without losing raw reasons', async () => {
+    const module = await validityModulePromise;
+    assert.ok(module, 'database worker post-GC validity helper must exist');
+    const assess = module.assessDatabaseWorkerPostGcValidity;
+    assert.equal(typeof assess, 'function');
+
+    const valid = assess([
+        iteration('warmup-broken', 'warmup', []),
+        iteration('diagnostic-broken', 'diagnostic', [
+            worker(null, 'gc-unavailable'),
+            worker(100, null),
+        ]),
+        iteration('measured-valid', 'measured', [
+            worker(4_096, null),
+            worker(
+                null,
+                'worker-force-terminated-before-gc',
+                'playlist-refresh.worker'
+            ),
+        ]),
+    ]);
+    assert.deepEqual(valid, {
+        applicableMeasuredRunCount: 1,
+        invalidMeasuredRuns: [],
+        measuredRunCount: 1,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: true,
+        validForComparison: true,
+        validMeasuredRunCount: 1,
+    });
+
+    const compensatingCardinality = assess([
+        iteration('measured-duplicate', 'measured', [
+            worker(1_024, null),
+            worker(2_048, null),
+        ]),
+        iteration(
+            'measured-missing',
+            'measured',
+            [worker(3_072, null, 'playlist-refresh.worker')],
+            [{ type: 'db-request' }]
+        ),
+    ]);
+    assert.deepEqual(compensatingCardinality, {
+        applicableMeasuredRunCount: 2,
+        invalidMeasuredRuns: [
+            {
+                databaseWorkerCount: 2,
+                reason: 'multiple-database-workers',
+                runId: 'measured-duplicate',
+            },
+            {
+                databaseWorkerCount: 0,
+                reason: 'database-worker-missing',
+                runId: 'measured-missing',
+            },
+        ],
+        measuredRunCount: 2,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+
+    const unavailableWorker = worker(null, 'post-gc-probe-timeout');
+    const unavailableAndIncoherent = assess([
+        iteration('measured-unavailable', 'measured', [unavailableWorker]),
+        iteration('measured-incoherent', 'measured', [
+            worker(8_192, 'gc-unavailable'),
+        ]),
+    ]);
+    assert.deepEqual(unavailableAndIncoherent, {
+        applicableMeasuredRunCount: 2,
+        invalidMeasuredRuns: [
+            {
+                databaseWorkerCount: 1,
+                reason: 'post-gc-probe-timeout',
+                runId: 'measured-unavailable',
+            },
+            {
+                databaseWorkerCount: 1,
+                reason: 'post-gc-capture-invalid',
+                runId: 'measured-incoherent',
+            },
+        ],
+        measuredRunCount: 2,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+    assert.equal(
+        unavailableWorker.postGcHeapUnavailableReason,
+        'post-gc-probe-timeout'
+    );
+});
+
+test('marks parsing cancellation before persistence as DB N/A without accepting late or missing captured DB work', async () => {
+    const module = await validityModulePromise;
+    assert.ok(module);
+    const assess = module.assessDatabaseWorkerPostGcValidity;
+    assert.equal(typeof assess, 'function');
+
+    const noDatabasePhase = assess([
+        iteration(
+            'run-01',
+            'measured',
+            [
+                worker(
+                    null,
+                    'worker-force-terminated-before-gc',
+                    'playlist-refresh.worker'
+                ),
+            ],
+            [],
+            true
+        ),
+        iteration(
+            'run-02',
+            'measured',
+            [
+                worker(
+                    null,
+                    'worker-force-terminated-before-gc',
+                    'playlist-refresh.worker'
+                ),
+            ],
+            [],
+            true
+        ),
+    ]);
+    assert.deepEqual(noDatabasePhase, {
+        applicableMeasuredRunCount: 0,
+        invalidMeasuredRuns: [],
+        measuredRunCount: 2,
+        notApplicableMeasuredRuns: [
+            {
+                reason: 'operation-cancelled-before-database-phase',
+                runId: 'run-01',
+            },
+            {
+                reason: 'operation-cancelled-before-database-phase',
+                runId: 'run-02',
+            },
+        ],
+        validForBenchmark: true,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+
+    const mixedApplicability = assess([
+        iteration('run-cancelled', 'measured', [], [], true),
+        iteration('run-persisted', 'measured', [worker(4_096, null)]),
+    ]);
+    assert.deepEqual(mixedApplicability, {
+        applicableMeasuredRunCount: 1,
+        invalidMeasuredRuns: [],
+        measuredRunCount: 2,
+        notApplicableMeasuredRuns: [
+            {
+                reason: 'operation-cancelled-before-database-phase',
+                runId: 'run-cancelled',
+            },
+        ],
+        validForBenchmark: true,
+        validForComparison: false,
+        validMeasuredRunCount: 1,
+    });
+
+    const lateDatabaseWork = assess([
+        iteration(
+            'run-late',
+            'measured',
+            [],
+            [{ type: 'db-request-after-capture-cutoff' }],
+            true
+        ),
+    ]);
+    assert.deepEqual(lateDatabaseWork, {
+        applicableMeasuredRunCount: 1,
+        invalidMeasuredRuns: [
+            {
+                databaseWorkerCount: 0,
+                reason: 'database-worker-activity-after-cutoff',
+                runId: 'run-late',
+            },
+        ],
+        measuredRunCount: 1,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+
+    const unrelatedDatabaseWorker = assess([
+        iteration(
+            'run-unrelated-db',
+            'measured',
+            [worker(4_096, null)],
+            [{ type: 'db-request' }],
+            true
+        ),
+    ]);
+    assert.deepEqual(unrelatedDatabaseWorker, {
+        applicableMeasuredRunCount: 1,
+        invalidMeasuredRuns: [
+            {
+                databaseWorkerCount: 1,
+                reason: 'database-worker-unexpected-activity',
+                runId: 'run-unrelated-db',
+            },
+        ],
+        measuredRunCount: 1,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+
+    const nonCancelLateRequest = assess([
+        iteration(
+            'run-non-cancel-late',
+            'measured',
+            [worker(8_192, null)],
+            [{ type: 'db-request-after-capture-cutoff' }]
+        ),
+    ]);
+    assert.deepEqual(nonCancelLateRequest, {
+        applicableMeasuredRunCount: 1,
+        invalidMeasuredRuns: [
+            {
+                databaseWorkerCount: 1,
+                reason: 'database-worker-activity-after-cutoff',
+                runId: 'run-non-cancel-late',
+            },
+        ],
+        measuredRunCount: 1,
+        notApplicableMeasuredRuns: [],
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+});
+
+test('the benchmark preserves raw artifacts before rejecting an invalid formal comparison', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const summaryWrite = source.indexOf(
+        "writeJson(join(config.outputDirectory, 'summary.json'), summary)"
+    );
+    const validityGuard = source.indexOf(
+        'summary.validity.databaseWorkerPostGc.validForBenchmark'
+    );
+    const cancellationEffectGuard = source.indexOf(
+        'summary.cancellationEffectRate !== 1'
+    );
+
+    assert.ok(summaryWrite >= 0, 'summary artifact write must exist');
+    assert.ok(
+        cancellationEffectGuard >= 0,
+        'formal cancellation-effect guard must exist'
+    );
+    assert.ok(validityGuard >= 0, 'formal validity guard must exist');
+    assert.ok(
+        summaryWrite < cancellationEffectGuard && summaryWrite < validityGuard,
+        'raw summary must be durable before either formal guard fails'
+    );
+    assert.match(source, /Cancellation effect was not observed/);
+    assert.match(source, /Database worker post-GC capture is invalid/);
+});
+
+test('the benchmark persists the real seed DB lifecycle and atomically arms the measured generation', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const seedCaptureStart = source.indexOf(
+        'await startMainCapture(app.electronApp',
+        source.indexOf('const rendererWindowIdentity')
+    );
+    const seedPlaylist = source.indexOf('await seedPlaylist');
+    const seedSettlement = source.indexOf('await waitForSeedSettlement');
+    const seedRollover = source.indexOf(
+        'await rolloverMainCapture(app.electronApp',
+        seedSettlement
+    );
+    const seedArtifactWrite = source.indexOf(
+        "'seed-main-capture.json'",
+        seedRollover
+    );
+
+    assert.ok(seedCaptureStart >= 0 && seedCaptureStart < seedPlaylist);
+    assert.ok(seedPlaylist < seedSettlement);
+    assert.ok(seedSettlement < seedRollover);
+    assert.ok(seedRollover < seedArtifactWrite);
+    assert.doesNotMatch(
+        source.slice(seedRollover + 1, source.indexOf('const renderer =')),
+        /await startMainCapture\(app\.electronApp/
+    );
+    assert.match(source, /seedRollover\.nextCaptureStarted/);
+    assert.match(source, /seedRollover\.nextCaptureUnavailableReason/);
+    assert.match(
+        source,
+        /status\.databaseRequests\s*>\s*0[\s\S]*status\.databaseUpsertsCompleted\s*>\s*0[\s\S]*status\.databasePending\s*===\s*0/
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.ts b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.ts
new file mode 100644
index 000000000..43345e718
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-post-gc-validity.ts
@@ -0,0 +1,141 @@
+import {
+    type DatabaseWorkerPostGcValidity,
+    type InvalidDatabaseWorkerPostGcMeasuredRun,
+    WORKER_POST_GC_HEAP_UNAVAILABLE_REASON,
+} from './m3u-refresh-cancellation-contract';
+
+export interface DatabaseWorkerPostGcValidityWorker {
+    readonly kind: string;
+    readonly postGcHeapUnavailableReason: unknown;
+    readonly postGcHeapUsedBytes: unknown;
+}
+
+export interface DatabaseWorkerPostGcValidityIteration {
+    readonly cancellationEffectObserved?: boolean;
+    readonly kind: string;
+    readonly main: {
+        readonly timeline?: readonly {
+            readonly type: string;
+        }[];
+        readonly workers: readonly DatabaseWorkerPostGcValidityWorker[];
+    };
+    readonly runId: string;
+}
+
+const UNAVAILABLE_REASONS = new Set<string>(
+    Object.values(WORKER_POST_GC_HEAP_UNAVAILABLE_REASON)
+);
+
+export function assessDatabaseWorkerPostGcValidity(
+    iterations: readonly DatabaseWorkerPostGcValidityIteration[]
+): DatabaseWorkerPostGcValidity {
+    const measured = iterations.filter(
+        (iteration) => iteration.kind === 'measured'
+    );
+    const invalidMeasuredRuns: InvalidDatabaseWorkerPostGcMeasuredRun[] = [];
+    const notApplicableMeasuredRuns: {
+        readonly reason: 'operation-cancelled-before-database-phase';
+        readonly runId: string;
+    }[] = [];
+    let applicableMeasuredRunCount = 0;
+    let validMeasuredRunCount = 0;
+
+    for (const iteration of measured) {
+        const databaseWorkers = iteration.main.workers.filter(
+            (worker) => worker.kind === 'database.worker'
+        );
+        const timeline = iteration.main.timeline ?? [];
+        const lateDatabaseRequest = timeline.some(
+            (record) => record.type === 'db-request-after-capture-cutoff'
+        );
+        const databasePhaseObserved =
+            lateDatabaseRequest ||
+            timeline.some((record) => record.type === 'db-request');
+
+        if (lateDatabaseRequest) {
+            applicableMeasuredRunCount += 1;
+            invalidMeasuredRuns.push({
+                databaseWorkerCount: databaseWorkers.length,
+                reason: WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.DATABASE_WORKER_ACTIVITY_AFTER_CUTOFF,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+
+        if (iteration.cancellationEffectObserved === true) {
+            if (!databasePhaseObserved && databaseWorkers.length === 0) {
+                notApplicableMeasuredRuns.push({
+                    reason: 'operation-cancelled-before-database-phase',
+                    runId: iteration.runId,
+                });
+                continue;
+            }
+
+            applicableMeasuredRunCount += 1;
+            invalidMeasuredRuns.push({
+                databaseWorkerCount: databaseWorkers.length,
+                reason: WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.DATABASE_WORKER_UNEXPECTED_ACTIVITY,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+
+        if (databaseWorkers.length === 0) {
+            applicableMeasuredRunCount += 1;
+            invalidMeasuredRuns.push({
+                databaseWorkerCount: 0,
+                reason: WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.DATABASE_WORKER_MISSING,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+
+        applicableMeasuredRunCount += 1;
+        if (databaseWorkers.length !== 1) {
+            invalidMeasuredRuns.push({
+                databaseWorkerCount: databaseWorkers.length,
+                reason: WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.MULTIPLE_DATABASE_WORKERS,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+
+        const worker = databaseWorkers[0] as DatabaseWorkerPostGcValidityWorker;
+        const heap = worker.postGcHeapUsedBytes;
+        const reason = worker.postGcHeapUnavailableReason;
+        if (
+            Number.isSafeInteger(heap) &&
+            Number(heap) >= 0 &&
+            reason === null
+        ) {
+            validMeasuredRunCount += 1;
+            continue;
+        }
+
+        invalidMeasuredRuns.push({
+            databaseWorkerCount: 1,
+            reason:
+                heap === null &&
+                typeof reason === 'string' &&
+                UNAVAILABLE_REASONS.has(reason)
+                    ? reason
+                    : WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.INVALID_CAPTURE,
+            runId: iteration.runId,
+        });
+    }
+
+    return Object.freeze({
+        applicableMeasuredRunCount,
+        invalidMeasuredRuns: Object.freeze(invalidMeasuredRuns),
+        measuredRunCount: measured.length,
+        notApplicableMeasuredRuns: Object.freeze(notApplicableMeasuredRuns),
+        validForBenchmark:
+            measured.length > 0 && invalidMeasuredRuns.length === 0,
+        validForComparison:
+            measured.length > 0 &&
+            applicableMeasuredRunCount === measured.length &&
+            validMeasuredRunCount === measured.length &&
+            invalidMeasuredRuns.length === 0,
+        validMeasuredRunCount,
+    });
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.spec.ts b/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.spec.ts
new file mode 100644
index 000000000..0b88917c6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.spec.ts
@@ -0,0 +1,127 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import {
+    assessDatabaseWorkerRequestMetricsValidity,
+    DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON,
+} from './database-worker-request-metrics-validity';
+import { createCompleteTestMainCapture } from './m3u-import-report.test-helpers';
+import type {
+    WorkerCaptureMetrics,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+
+describe('database worker request-metrics validity', () => {
+    it('requires exactly two complete request samples in every measured run', () => {
+        const worker = completeWorker();
+        const validity = assessDatabaseWorkerRequestMetricsValidity([
+            iteration('warmup', 'warmup', [worker]),
+            iteration('run-01', 'measured', [worker]),
+            iteration('run-02', 'measured', [worker]),
+            iteration('diagnostic', 'diagnostic', [worker]),
+        ]);
+
+        assert.deepEqual(validity, {
+            expectedRequestCount: 4,
+            invalidRequests: [],
+            measuredRunCount: 2,
+            validForComparison: true,
+            validMeasuredRunCount: 2,
+            validRequestCount: 4,
+        });
+    });
+
+    it('fails each measured run with missing ELD, ELU, CPU, or raw capture metrics', () => {
+        const validity = assessDatabaseWorkerRequestMetricsValidity([
+            invalidRequestIteration('run-eld', {
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    'event-loop-delay-capture-unavailable',
+                histogramFlushedEpochMs: null,
+            }),
+            invalidRequestIteration('run-elu', {
+                eventLoopUtilization: null,
+                eventLoopUtilizationUnavailableReason:
+                    'event-loop-utilization-unavailable',
+            }),
+            invalidRequestIteration('run-cpu', {
+                threadCpuSystemMicros: null,
+                threadCpuUnavailableReason: 'thread-cpu-usage-unavailable',
+                threadCpuUserMicros: null,
+            }),
+            invalidRequestIteration('run-capture', {
+                performanceCaptureUnavailableReason:
+                    'worker-performance-capture-invalid',
+            }),
+        ]);
+
+        assert.equal(validity.expectedRequestCount, 8);
+        assert.equal(validity.validRequestCount, 4);
+        assert.equal(validity.validMeasuredRunCount, 0);
+        assert.equal(validity.validForComparison, false);
+        assert.deepEqual(
+            validity.invalidRequests.map(({ reason }) => reason),
+            [
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.EVENT_LOOP_DELAY_INVALID,
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.EVENT_LOOP_UTILIZATION_INVALID,
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.THREAD_CPU_INVALID,
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.WORKER_CAPTURE_INVALID,
+            ]
+        );
+    });
+
+    it('fails closed for missing, multiple, and wrong request sets', () => {
+        const worker = completeWorker();
+        const validity = assessDatabaseWorkerRequestMetricsValidity([
+            iteration('missing', 'measured', []),
+            iteration('multiple', 'measured', [worker, worker]),
+            iteration('wrong-requests', 'measured', [
+                {
+                    ...worker,
+                    requests: worker.requests.slice(0, 1),
+                },
+            ]),
+        ]);
+
+        assert.equal(validity.expectedRequestCount, 6);
+        assert.equal(validity.validRequestCount, 0);
+        assert.equal(validity.validForComparison, false);
+        assert.deepEqual(
+            validity.invalidRequests.map(({ reason }) => reason),
+            [
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.DATABASE_WORKER_MISSING,
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.MULTIPLE_DATABASE_WORKERS,
+                DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.REQUEST_SET_INVALID,
+            ]
+        );
+    });
+});
+
+function completeWorker(): WorkerCaptureMetrics {
+    const worker = createCompleteTestMainCapture().workers[0];
+    assert.ok(worker);
+    return worker;
+}
+
+function invalidRequestIteration(
+    runId: string,
+    updates: Partial<WorkerRequestPerformanceMetrics>
+) {
+    const worker = completeWorker();
+    const get = worker.requests[1];
+    assert.ok(get);
+    return iteration(runId, 'measured', [
+        {
+            ...worker,
+            requests: [worker.requests[0], { ...get, ...updates }],
+        },
+    ]);
+}
+
+function iteration(
+    runId: string,
+    kind: string,
+    workers: readonly WorkerCaptureMetrics[]
+) {
+    return { kind, main: { workers }, runId };
+}
diff --git a/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.ts b/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.ts
new file mode 100644
index 000000000..5a924854b
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/database-worker-request-metrics-validity.ts
@@ -0,0 +1,197 @@
+import type {
+    WorkerCaptureMetrics,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import {
+    PERFORMANCE_ITERATION_KIND,
+    PERFORMANCE_WORKER_KIND,
+} from './m3u-refresh-cancellation-contract';
+
+export const DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON = {
+    DATABASE_WORKER_MISSING: 'database-worker-missing',
+    EVENT_LOOP_DELAY_INVALID: 'event-loop-delay-invalid',
+    EVENT_LOOP_UTILIZATION_INVALID: 'event-loop-utilization-invalid',
+    MULTIPLE_DATABASE_WORKERS: 'multiple-database-workers',
+    REQUEST_SET_INVALID: 'initial-import-request-set-invalid',
+    THREAD_CPU_INVALID: 'thread-cpu-invalid',
+    WORKER_CAPTURE_INVALID: 'worker-performance-capture-invalid',
+} as const;
+
+export type DatabaseWorkerRequestMetricsInvalidReason =
+    (typeof DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON)[keyof typeof DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON];
+
+export interface DatabaseWorkerRequestMetricsValidity {
+    readonly expectedRequestCount: number;
+    readonly invalidRequests: readonly {
+        readonly operation: string | null;
+        readonly reason: DatabaseWorkerRequestMetricsInvalidReason;
+        readonly runId: string;
+    }[];
+    readonly measuredRunCount: number;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+    readonly validRequestCount: number;
+}
+
+interface RequestMetricsIteration {
+    readonly kind: string;
+    readonly main: {
+        readonly workers: readonly WorkerCaptureMetrics[];
+    };
+    readonly runId: string;
+}
+
+export function assessDatabaseWorkerRequestMetricsValidity(
+    iterations: readonly RequestMetricsIteration[]
+): DatabaseWorkerRequestMetricsValidity {
+    const measured = iterations.filter(
+        (iteration) =>
+            iteration.kind === PERFORMANCE_ITERATION_KIND.MEASURED
+    );
+    const invalidRequests: {
+        operation: string | null;
+        reason: DatabaseWorkerRequestMetricsInvalidReason;
+        runId: string;
+    }[] = [];
+    let validMeasuredRunCount = 0;
+    let validRequestCount = 0;
+
+    for (const iteration of measured) {
+        const workers = iteration.main.workers.filter(
+            (worker) => worker.kind === PERFORMANCE_WORKER_KIND.DATABASE
+        );
+        if (workers.length === 0) {
+            invalidRequests.push({
+                operation: null,
+                reason: DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.DATABASE_WORKER_MISSING,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+        const worker = workers.length === 1 ? workers[0] : null;
+        if (!worker) {
+            invalidRequests.push({
+                operation: null,
+                reason: DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.MULTIPLE_DATABASE_WORKERS,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+        const requests = requireInitialImportRequestPair(worker);
+        if (requests === null) {
+            invalidRequests.push({
+                operation: null,
+                reason: DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.REQUEST_SET_INVALID,
+                runId: iteration.runId,
+            });
+            continue;
+        }
+
+        let runIsValid = true;
+        for (const request of requests) {
+            const reason = assessRequest(request);
+            if (reason === null) {
+                validRequestCount += 1;
+            } else {
+                runIsValid = false;
+                invalidRequests.push({
+                    operation: request.operation,
+                    reason,
+                    runId: iteration.runId,
+                });
+            }
+        }
+        if (runIsValid) {
+            validMeasuredRunCount += 1;
+        }
+    }
+
+    const expectedRequestCount = measured.length * 2;
+    return Object.freeze({
+        expectedRequestCount,
+        invalidRequests: Object.freeze(invalidRequests),
+        measuredRunCount: measured.length,
+        validForComparison:
+            measured.length > 0 &&
+            validMeasuredRunCount === measured.length &&
+            validRequestCount === expectedRequestCount,
+        validMeasuredRunCount,
+        validRequestCount,
+    });
+}
+
+function requireInitialImportRequestPair(
+    worker: WorkerCaptureMetrics
+): readonly [
+    WorkerRequestPerformanceMetrics,
+    WorkerRequestPerformanceMetrics,
+] | null {
+    const upserts = worker.requests.filter(
+        (request) =>
+            request.operation === 'DB_UPSERT_APP_PLAYLIST' && request.success
+    );
+    const gets = worker.requests.filter(
+        (request) =>
+            request.operation === 'DB_GET_APP_PLAYLIST' && request.success
+    );
+    return worker.requests.length === 2 &&
+        upserts.length === 1 &&
+        upserts[0] &&
+        gets.length === 1 &&
+        gets[0]
+        ? [upserts[0], gets[0]]
+        : null;
+}
+
+function assessRequest(
+    request: WorkerRequestPerformanceMetrics
+): DatabaseWorkerRequestMetricsInvalidReason | null {
+    if (
+        request.performanceCaptureUnavailableReason !== null ||
+        request.invalidReason !== null
+    ) {
+        return DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.WORKER_CAPTURE_INVALID;
+    }
+    if (
+        request.eventLoopDelayUnavailableReason !== null ||
+        request.histogramFlushedEpochMs === null ||
+        !isEventLoopDelay(request.eventLoopDelay)
+    ) {
+        return DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.EVENT_LOOP_DELAY_INVALID;
+    }
+    if (
+        request.eventLoopUtilizationUnavailableReason !== null ||
+        !isUtilization(request.eventLoopUtilization)
+    ) {
+        return DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.EVENT_LOOP_UTILIZATION_INVALID;
+    }
+    if (
+        request.threadCpuUnavailableReason !== null ||
+        !isFiniteNonNegative(request.threadCpuSystemMicros) ||
+        !isFiniteNonNegative(request.threadCpuUserMicros)
+    ) {
+        return DATABASE_WORKER_REQUEST_METRICS_INVALID_REASON.THREAD_CPU_INVALID;
+    }
+    return null;
+}
+
+function isEventLoopDelay(
+    value: WorkerRequestPerformanceMetrics['eventLoopDelay']
+): value is NonNullable<WorkerRequestPerformanceMetrics['eventLoopDelay']> {
+    return (
+        value !== null &&
+        isFiniteNonNegative(value.maxMs) &&
+        isFiniteNonNegative(value.p95Ms) &&
+        isFiniteNonNegative(value.p99Ms) &&
+        value.p95Ms <= value.p99Ms &&
+        value.p99Ms <= value.maxMs
+    );
+}
+
+function isUtilization(value: number | null): value is number {
+    return isFiniteNonNegative(value) && value <= 1;
+}
+
+function isFiniteNonNegative(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
diff --git a/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.spec.ts b/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.spec.ts
new file mode 100644
index 000000000..f8fdc7434
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.spec.ts
@@ -0,0 +1,193 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+
+import type { MainCaptureMetrics } from './m3u-refresh-cancellation-contract';
+
+interface DiagnosticCaptureModule {
+    validateDiagnosticPlaylistWorkerCapture?: (
+        main: MainCaptureMetrics,
+        iterationDirectory: string
+    ) => Promise<void>;
+}
+
+const diagnosticCaptureModulePromise = import(
+    new URL('./diagnostic-playlist-worker-capture.ts', import.meta.url).href
+)
+    .then((module) => module as DiagnosticCaptureModule)
+    .catch(() => null);
+
+function mainCapture(input: {
+    readonly profilePath: string | null;
+    readonly snapshotPath?: string | null;
+    readonly timelineType?: string;
+}): MainCaptureMetrics {
+    return {
+        timeline: input.timelineType
+            ? [{ epochMs: 1, type: input.timelineType }]
+            : [],
+        workers: [
+            {
+                kind: 'playlist-refresh.worker',
+                ordinal: 2,
+                postGcHeapUnavailableReason:
+                    'worker-force-terminated-before-gc',
+                postGcHeapUsedBytes: null,
+                profilePath: input.profilePath,
+                snapshotPath: input.snapshotPath ?? null,
+                terminatedEpochMs: 2,
+            },
+        ],
+    } as unknown as MainCaptureMetrics;
+}
+
+test('accepts one parseable diagnostic playlist-worker profile inside the iteration directory', async () => {
+    const module = await diagnosticCaptureModulePromise;
+    assert.ok(
+        module,
+        'diagnostic playlist worker capture validator must exist'
+    );
+    const validate = module.validateDiagnosticPlaylistWorkerCapture;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-diagnostic-worker-')
+    );
+
+    try {
+        const profilePath = join(
+            directory,
+            'playlist-refresh.worker-2.cpuprofile'
+        );
+        await writeFile(
+            profilePath,
+            JSON.stringify({ nodes: [{ id: 1 }], samples: [1] })
+        );
+        await assert.doesNotReject(() =>
+            validate?.(mainCapture({ profilePath }), directory)
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('fails closed for missing, escaped, malformed, or contaminated diagnostic artifacts', async () => {
+    const module = await diagnosticCaptureModulePromise;
+    assert.ok(module);
+    const validate = module.validateDiagnosticPlaylistWorkerCapture;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-diagnostic-worker-invalid-')
+    );
+
+    try {
+        await assert.rejects(
+            () => validate?.(mainCapture({ profilePath: null }), directory),
+            /diagnostic-playlist-worker-profile-missing/
+        );
+        await assert.rejects(
+            () =>
+                validate?.(
+                    mainCapture({
+                        profilePath: join(
+                            directory,
+                            '..',
+                            'escaped.cpuprofile'
+                        ),
+                    }),
+                    directory
+                ),
+            /diagnostic-playlist-worker-profile-path-invalid/
+        );
+        const malformedPath = join(
+            directory,
+            'playlist-refresh.worker-2.cpuprofile'
+        );
+        await writeFile(malformedPath, '{"nodes":[]}');
+        await assert.rejects(
+            () =>
+                validate?.(
+                    mainCapture({ profilePath: malformedPath }),
+                    directory
+                ),
+            /diagnostic-playlist-worker-profile-invalid/
+        );
+        await assert.rejects(
+            () =>
+                validate?.(
+                    mainCapture({
+                        profilePath: malformedPath,
+                        timelineType:
+                            'worker-artifact-error:profile-stop:failed',
+                    }),
+                    directory
+                ),
+            /diagnostic-playlist-worker-artifact-error/
+        );
+        await assert.rejects(
+            () =>
+                validate?.(
+                    mainCapture({
+                        profilePath: malformedPath,
+                        snapshotPath: join(
+                            directory,
+                            'playlist-refresh.worker-2.heapsnapshot'
+                        ),
+                    }),
+                    directory
+                ),
+            /diagnostic-playlist-worker-snapshot-unexpected/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('the benchmark persists diagnostic raw metrics before requiring a parseable playlist-worker profile', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const resultWrite = source.indexOf(
+        "writeJson(join(iterationDirectory, 'result.json'), result)"
+    );
+    const summaryWrite = source.indexOf(
+        "writeJson(join(config.outputDirectory, 'summary.json'), summary)"
+    );
+    const diagnosticValidation = source.indexOf(
+        'await validateDiagnosticPlaylistWorkerCapture('
+    );
+
+    assert.ok(resultWrite >= 0);
+    assert.ok(summaryWrite >= 0);
+    assert.ok(diagnosticValidation > summaryWrite);
+});
+
+test('the benchmark requires the diagnostic worker profile to come from an observed cancellation', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const summaryWrite = source.indexOf(
+        "writeJson(join(config.outputDirectory, 'summary.json'), summary)"
+    );
+    const diagnosticCancellationGuard = source.indexOf(
+        'if (!diagnosticIteration.cancellationEffectObserved)'
+    );
+    const diagnosticValidation = source.indexOf(
+        'await validateDiagnosticPlaylistWorkerCapture('
+    );
+
+    assert.ok(summaryWrite >= 0);
+    assert.ok(
+        diagnosticCancellationGuard > summaryWrite,
+        'raw manifest and summary must remain durable when the diagnostic cancellation is invalid'
+    );
+    assert.ok(
+        diagnosticCancellationGuard < diagnosticValidation,
+        'the cancellation guard must reject a normal-completion worker profile before artifact validation'
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.ts b/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.ts
new file mode 100644
index 000000000..855931ed4
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/diagnostic-playlist-worker-capture.ts
@@ -0,0 +1,72 @@
+import { readFile } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+
+import type { MainCaptureMetrics } from './m3u-refresh-cancellation-contract';
+
+interface CpuProfile {
+    readonly nodes?: unknown;
+    readonly samples?: unknown;
+}
+
+export async function validateDiagnosticPlaylistWorkerCapture(
+    main: MainCaptureMetrics,
+    iterationDirectory: string
+): Promise<void> {
+    if (
+        main.timeline.some((record) =>
+            record.type.startsWith('worker-artifact-error:')
+        )
+    ) {
+        throw new Error('diagnostic-playlist-worker-artifact-error');
+    }
+
+    const workers = main.workers.filter(
+        (worker) => worker.kind === 'playlist-refresh.worker'
+    );
+    if (workers.length !== 1) {
+        throw new Error('diagnostic-playlist-worker-cardinality-invalid');
+    }
+    const worker = workers[0];
+    if (!worker) {
+        throw new Error('diagnostic-playlist-worker-cardinality-invalid');
+    }
+    if (worker.snapshotPath !== null) {
+        throw new Error('diagnostic-playlist-worker-snapshot-unexpected');
+    }
+    if (
+        worker.postGcHeapUsedBytes !== null ||
+        worker.postGcHeapUnavailableReason !==
+            'worker-force-terminated-before-gc' ||
+        worker.terminatedEpochMs === null
+    ) {
+        throw new Error('diagnostic-playlist-worker-termination-invalid');
+    }
+    if (worker.profilePath === null) {
+        throw new Error('diagnostic-playlist-worker-profile-missing');
+    }
+
+    const expectedProfilePath = join(
+        resolve(iterationDirectory),
+        `playlist-refresh.worker-${worker.ordinal}.cpuprofile`
+    );
+    if (resolve(worker.profilePath) !== expectedProfilePath) {
+        throw new Error('diagnostic-playlist-worker-profile-path-invalid');
+    }
+
+    let profile: CpuProfile;
+    try {
+        profile = JSON.parse(
+            await readFile(expectedProfilePath, 'utf8')
+        ) as CpuProfile;
+    } catch {
+        throw new Error('diagnostic-playlist-worker-profile-invalid');
+    }
+    if (
+        !Array.isArray(profile.nodes) ||
+        profile.nodes.length === 0 ||
+        !Array.isArray(profile.samples) ||
+        profile.samples.length === 0
+    ) {
+        throw new Error('diagnostic-playlist-worker-profile-invalid');
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content-validation.ts b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content-validation.ts
new file mode 100644
index 000000000..b162bdafa
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content-validation.ts
@@ -0,0 +1,185 @@
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+export function isCpuProfile(value: unknown): boolean {
+    if (!isRecord(value)) {
+        return false;
+    }
+    const startTime = value['startTime'];
+    const endTime = value['endTime'];
+    const nodes = value['nodes'];
+    const samples = value['samples'];
+    const timeDeltas = value['timeDeltas'];
+    if (
+        !isNonNegativeSafeInteger(startTime) ||
+        !isNonNegativeSafeInteger(endTime) ||
+        endTime <= startTime ||
+        !Array.isArray(nodes) ||
+        nodes.length === 0 ||
+        !Array.isArray(samples) ||
+        samples.length === 0 ||
+        !Array.isArray(timeDeltas) ||
+        timeDeltas.length !== samples.length
+    ) {
+        return false;
+    }
+
+    const nodeIds = new Set<number>();
+    for (const node of nodes) {
+        if (!isCpuProfileNode(node) || nodeIds.has(node['id'])) {
+            return false;
+        }
+        nodeIds.add(node['id']);
+    }
+    if (
+        nodes.some((node) =>
+            (node as Record<string, unknown>)['children'] instanceof Array
+                ? (
+                      (node as Record<string, unknown>)[
+                          'children'
+                      ] as unknown[]
+                  ).some(
+                      (childId) =>
+                          !isNonNegativeSafeInteger(childId) ||
+                          !nodeIds.has(childId)
+                  )
+                : false
+        ) ||
+        samples.some(
+            (sampleId) =>
+                !isNonNegativeSafeInteger(sampleId) ||
+                !nodeIds.has(sampleId)
+        )
+    ) {
+        return false;
+    }
+
+    const duration = endTime - startTime;
+    let elapsed = 0;
+    for (const delta of timeDeltas) {
+        if (!Number.isSafeInteger(delta)) {
+            return false;
+        }
+        elapsed += delta as number;
+        if (
+            !Number.isSafeInteger(elapsed) ||
+            elapsed < 0 ||
+            elapsed > duration
+        ) {
+            return false;
+        }
+    }
+    return elapsed > 0;
+}
+
+export function isHeapSnapshot(value: unknown): boolean {
+    if (
+        !isRecord(value) ||
+        !isRecord(value['snapshot']) ||
+        !isRecord(value['snapshot']['meta'])
+    ) {
+        return false;
+    }
+    const meta = value['snapshot']['meta'];
+    const nodeFields = meta['node_fields'];
+    const nodeTypes = meta['node_types'];
+    const edgeFields = meta['edge_fields'];
+    const edgeTypes = meta['edge_types'];
+    const nodes = value['nodes'];
+    const edges = value['edges'];
+    const strings = value['strings'];
+    return (
+        isNonEmptyStringArray(nodeFields) &&
+        isHeapTypeTable(nodeTypes, nodeFields.length) &&
+        isNonEmptyStringArray(edgeFields) &&
+        isHeapTypeTable(edgeTypes, edgeFields.length) &&
+        Array.isArray(nodes) &&
+        nodes.length > 0 &&
+        nodes.length % nodeFields.length === 0 &&
+        Array.isArray(edges) &&
+        edges.length > 0 &&
+        edges.length % edgeFields.length === 0 &&
+        Array.isArray(strings) &&
+        strings.length > 0
+    );
+}
+
+export function isRendererTrace(value: unknown): boolean {
+    if (!isRecord(value)) {
+        return false;
+    }
+    const events = value['traceEvents'];
+    return (
+        Array.isArray(events) &&
+        events.length > 0 &&
+        events.every(
+            (event) =>
+                isRecord(event) &&
+                isNonEmptyString(event['name']) &&
+                isNonEmptyString(event['ph']) &&
+                isNonNegativeFiniteNumber(event['ts'])
+        )
+    );
+}
+
+function isHeapTypeTable(value: unknown, fieldCount: number): boolean {
+    return (
+        Array.isArray(value) &&
+        value.length === fieldCount &&
+        value.every(
+            (entry) =>
+                isNonEmptyString(entry) || isNonEmptyStringArray(entry)
+        )
+    );
+}
+
+function isCpuProfileNode(
+    value: unknown
+): value is Record<string, unknown> & { readonly id: number } {
+    if (
+        !isRecord(value) ||
+        !isNonNegativeSafeInteger(value['id']) ||
+        !isRecord(value['callFrame'])
+    ) {
+        return false;
+    }
+    const callFrame = value['callFrame'];
+    const scriptId = callFrame['scriptId'];
+    const children = value['children'];
+    const hitCount = value['hitCount'];
+    return (
+        typeof callFrame['functionName'] === 'string' &&
+        (typeof scriptId === 'string' ||
+            isNonNegativeSafeInteger(scriptId)) &&
+        typeof callFrame['url'] === 'string' &&
+        Number.isSafeInteger(callFrame['lineNumber']) &&
+        Number.isSafeInteger(callFrame['columnNumber']) &&
+        (children === undefined ||
+            (Array.isArray(children) &&
+                children.every(isNonNegativeSafeInteger))) &&
+        (hitCount === undefined || isNonNegativeSafeInteger(hitCount))
+    );
+}
+
+function isNonEmptyStringArray(value: unknown): value is readonly string[] {
+    return (
+        Array.isArray(value) &&
+        value.length > 0 &&
+        value.every(isNonEmptyString)
+    );
+}
+
+function isNonEmptyString(value: unknown): value is string {
+    return typeof value === 'string' && value.length > 0;
+}
+
+function isNonNegativeSafeInteger(value: unknown): value is number {
+    return Number.isSafeInteger(value) && (value as number) >= 0;
+}
+
+function isNonNegativeFiniteNumber(value: unknown): value is number {
+    return (
+        typeof value === 'number' && Number.isFinite(value) && value >= 0
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content.spec.ts b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content.spec.ts
new file mode 100644
index 000000000..8a67af360
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifact-content.spec.ts
@@ -0,0 +1,234 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+
+import {
+    type InitialImportDiagnosticCapture,
+    validateInitialImportDiagnosticArtifacts,
+} from './initial-import-diagnostic-artifacts';
+import { CPU_PROFILE } from './initial-import-diagnostic-test-fixtures';
+const HEAP_META = {
+    edge_fields: ['type', 'name_or_index', 'to_node'],
+    edge_types: [['context'], 'string_or_number', 'node'],
+    node_fields: [
+        'type',
+        'name',
+        'id',
+        'self_size',
+        'edge_count',
+        'detachedness',
+    ],
+    node_types: [
+        ['hidden'],
+        'string',
+        'number',
+        'number',
+        'number',
+        'number',
+    ],
+};
+const HEAP_SNAPSHOT = {
+    edges: [0, 0, 0],
+    nodes: [0, 0, 1, 0, 1, 0],
+    snapshot: { meta: HEAP_META },
+    strings: ['', 'root'],
+};
+const TRACE = {
+    traceEvents: [{ name: 'initial-import', ph: 'X', ts: 1 }],
+};
+
+function capture(directory: string): InitialImportDiagnosticCapture {
+    return {
+        main: {
+            cpuProfilePath: join(directory, 'main.cpuprofile'),
+            heapSnapshotPath: join(directory, 'main.heapsnapshot'),
+            workers: [
+                {
+                    kind: 'database.worker',
+                    ordinal: 4,
+                    profilePath: join(
+                        directory,
+                        'database.worker-4.cpuprofile'
+                    ),
+                    snapshotPath: join(
+                        directory,
+                        'database.worker-4.heapsnapshot'
+                    ),
+                },
+            ],
+        },
+        renderer: {
+            cpuProfilePath: join(directory, 'renderer.cpuprofile'),
+            heapSnapshotPath: join(directory, 'renderer.heapsnapshot'),
+            tracePath: join(directory, 'renderer.trace.json'),
+        },
+    };
+}
+
+async function writeArtifacts(directory: string): Promise<void> {
+    const artifacts: Readonly<Record<string, unknown>> = {
+        'database.worker-4.cpuprofile': CPU_PROFILE,
+        'database.worker-4.heapsnapshot': HEAP_SNAPSHOT,
+        'main.cpuprofile': CPU_PROFILE,
+        'main.heapsnapshot': HEAP_SNAPSHOT,
+        'renderer.cpuprofile': CPU_PROFILE,
+        'renderer.heapsnapshot': HEAP_SNAPSHOT,
+        'renderer.trace.json': TRACE,
+    };
+    await Promise.all(
+        Object.entries(artifacts).map(([filename, value]) =>
+            writeFile(join(directory, filename), JSON.stringify(value))
+        )
+    );
+}
+
+async function withArtifacts(
+    run: (directory: string) => Promise<void>
+): Promise<void> {
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-content-')
+    );
+    try {
+        await writeArtifacts(directory);
+        await run(directory);
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+}
+
+test('accepts bounded signed CPU time deltas emitted by Chromium', async () => {
+    await withArtifacts(async (directory) => {
+        await writeFile(
+            join(directory, 'renderer.cpuprofile'),
+            JSON.stringify({
+                ...CPU_PROFILE,
+                endTime: 5_000,
+                samples: [1, 1, 1],
+                timeDeltas: [1_000, -100, 1_000],
+            })
+        );
+        await assert.doesNotReject(() =>
+            validateInitialImportDiagnosticArtifacts(
+                capture(directory),
+                directory
+            )
+        );
+    });
+});
+
+test('rejects CPU profiles without useful bounded samples and stack references', async () => {
+    await withArtifacts(async (directory) => {
+        const invalidProfiles = [
+            { ...CPU_PROFILE, samples: [], timeDeltas: [] },
+            { ...CPU_PROFILE, timeDeltas: undefined },
+            { ...CPU_PROFILE, timeDeltas: [] },
+            {
+                ...CPU_PROFILE,
+                endTime: CPU_PROFILE.startTime,
+            },
+            {
+                ...CPU_PROFILE,
+                samples: [2],
+            },
+            {
+                ...CPU_PROFILE,
+                timeDeltas: [-1],
+            },
+            {
+                ...CPU_PROFILE,
+                timeDeltas: [2_001],
+            },
+            {
+                ...CPU_PROFILE,
+                nodes: [
+                    ...CPU_PROFILE.nodes,
+                    { ...CPU_PROFILE.nodes[0], id: 1 },
+                ],
+            },
+            {
+                ...CPU_PROFILE,
+                nodes: [{ id: 1 }],
+            },
+        ];
+        for (const profile of invalidProfiles) {
+            await writeFile(
+                join(directory, 'main.cpuprofile'),
+                JSON.stringify(profile)
+            );
+            await assert.rejects(
+                () =>
+                    validateInitialImportDiagnosticArtifacts(
+                        capture(directory),
+                        directory
+                    ),
+                /initial-import-diagnostic-artifact-invalid:main-cpu-profile/
+            );
+        }
+    });
+});
+
+test('rejects empty or malformed heap tables and invalid field strides', async () => {
+    await withArtifacts(async (directory) => {
+        const invalidSnapshots = [
+            { snapshot: {}, nodes: [], edges: [], strings: [] },
+            { ...HEAP_SNAPSHOT, nodes: [] },
+            { ...HEAP_SNAPSHOT, edges: [] },
+            { ...HEAP_SNAPSHOT, strings: [] },
+            {
+                ...HEAP_SNAPSHOT,
+                snapshot: {
+                    meta: { ...HEAP_META, node_types: undefined },
+                },
+            },
+            { ...HEAP_SNAPSHOT, nodes: [...HEAP_SNAPSHOT.nodes, 0] },
+            { ...HEAP_SNAPSHOT, edges: [...HEAP_SNAPSHOT.edges, 0] },
+        ];
+        for (const snapshot of invalidSnapshots) {
+            await writeFile(
+                join(directory, 'main.heapsnapshot'),
+                JSON.stringify(snapshot)
+            );
+            await assert.rejects(
+                () =>
+                    validateInitialImportDiagnosticArtifacts(
+                        capture(directory),
+                        directory
+                    ),
+                /initial-import-diagnostic-artifact-invalid:main-heap-snapshot/
+            );
+        }
+    });
+});
+
+test('rejects empty traces and malformed trace events', async () => {
+    await withArtifacts(async (directory) => {
+        const invalidTraces = [
+            { traceEvents: [] },
+            { traceEvents: [null] },
+            { traceEvents: [{ name: '', ph: 'X', ts: 1 }] },
+            { traceEvents: [{ name: 'initial-import', ph: '', ts: 1 }] },
+            {
+                traceEvents: [
+                    { name: 'initial-import', ph: 'X', ts: 'invalid' },
+                ],
+            },
+        ];
+        for (const trace of invalidTraces) {
+            await writeFile(
+                join(directory, 'renderer.trace.json'),
+                JSON.stringify(trace)
+            );
+            await assert.rejects(
+                () =>
+                    validateInitialImportDiagnosticArtifacts(
+                        capture(directory),
+                        directory
+                    ),
+                /initial-import-diagnostic-artifact-invalid:renderer-trace/
+            );
+        }
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.spec.ts b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.spec.ts
new file mode 100644
index 000000000..1270709c3
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.spec.ts
@@ -0,0 +1,394 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { mkdtemp, rm, symlink, unlink, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+
+import { CPU_PROFILE } from './initial-import-diagnostic-test-fixtures';
+
+interface DiagnosticCapture {
+    readonly main: {
+        readonly cpuProfilePath: string | null;
+        readonly heapSnapshotPath: string | null;
+        readonly workers: readonly {
+            readonly kind: string;
+            readonly ordinal: number;
+            readonly profilePath: string | null;
+            readonly snapshotPath: string | null;
+        }[];
+    };
+    readonly renderer: {
+        readonly cpuProfilePath: string | null;
+        readonly heapSnapshotPath: string | null;
+        readonly tracePath: string | null;
+    };
+}
+
+interface DiagnosticArtifactsModule {
+    validateInitialImportDiagnosticArtifacts?: (
+        capture: DiagnosticCapture,
+        iterationDirectory: string
+    ) => Promise<void>;
+}
+
+const diagnosticArtifactsModulePromise = import(
+    new URL('./initial-import-diagnostic-artifacts.ts', import.meta.url).href
+)
+    .then((module) => module as DiagnosticArtifactsModule)
+    .catch(() => null);
+
+const HEAP_SNAPSHOT = {
+    edges: [0, 0, 0],
+    nodes: [0, 0, 1, 0, 1, 0],
+    snapshot: {
+        meta: {
+            edge_fields: ['type', 'name_or_index', 'to_node'],
+            edge_types: [['context'], 'string_or_number', 'node'],
+            node_fields: [
+                'type',
+                'name',
+                'id',
+                'self_size',
+                'edge_count',
+                'detachedness',
+            ],
+            node_types: [
+                ['hidden'],
+                'string',
+                'number',
+                'number',
+                'number',
+                'number',
+            ],
+        },
+    },
+    strings: ['', 'root'],
+};
+const RENDERER_TRACE = {
+    traceEvents: [{ name: 'initial-import', ph: 'X', ts: 1 }],
+};
+
+function capture(directory: string, databaseOrdinal = 4): DiagnosticCapture {
+    return {
+        main: {
+            cpuProfilePath: join(directory, 'main.cpuprofile'),
+            heapSnapshotPath: join(directory, 'main.heapsnapshot'),
+            workers: [
+                {
+                    kind: 'database.worker',
+                    ordinal: databaseOrdinal,
+                    profilePath: join(
+                        directory,
+                        `database.worker-${databaseOrdinal}.cpuprofile`
+                    ),
+                    snapshotPath: join(
+                        directory,
+                        `database.worker-${databaseOrdinal}.heapsnapshot`
+                    ),
+                },
+            ],
+        },
+        renderer: {
+            cpuProfilePath: join(directory, 'renderer.cpuprofile'),
+            heapSnapshotPath: join(directory, 'renderer.heapsnapshot'),
+            tracePath: join(directory, 'renderer.trace.json'),
+        },
+    };
+}
+
+async function writeValidArtifacts(
+    directory: string,
+    databaseOrdinal = 4
+): Promise<void> {
+    await Promise.all([
+        writeFile(
+            join(directory, 'main.cpuprofile'),
+            JSON.stringify(CPU_PROFILE)
+        ),
+        writeFile(
+            join(directory, 'renderer.cpuprofile'),
+            JSON.stringify(CPU_PROFILE)
+        ),
+        writeFile(
+            join(directory, `database.worker-${databaseOrdinal}.cpuprofile`),
+            JSON.stringify(CPU_PROFILE)
+        ),
+        writeFile(
+            join(directory, `database.worker-${databaseOrdinal}.heapsnapshot`),
+            JSON.stringify(HEAP_SNAPSHOT)
+        ),
+        writeFile(
+            join(directory, 'main.heapsnapshot'),
+            JSON.stringify(HEAP_SNAPSHOT)
+        ),
+        writeFile(
+            join(directory, 'renderer.heapsnapshot'),
+            JSON.stringify(HEAP_SNAPSHOT)
+        ),
+        writeFile(
+            join(directory, 'renderer.trace.json'),
+            JSON.stringify(RENDERER_TRACE)
+        ),
+    ]);
+}
+
+test('accepts the complete parseable initial-import diagnostic artifact set', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module, 'initial-import diagnostic validator must exist');
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-diagnostic-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        await assert.doesNotReject(() =>
+            validate?.(capture(directory), directory)
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('fails closed for malformed or missing required process artifacts', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-invalid-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        await writeFile(join(directory, 'renderer.trace.json'), '{');
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-artifact-invalid:renderer-trace/
+        );
+
+        await writeFile(
+            join(directory, 'renderer.trace.json'),
+            JSON.stringify(RENDERER_TRACE)
+        );
+        const missingMainProfile: DiagnosticCapture = {
+            ...capture(directory),
+            main: {
+                ...capture(directory).main,
+                cpuProfilePath: null,
+            },
+        };
+        await assert.rejects(
+            () => validate?.(missingMainProfile, directory),
+            /initial-import-diagnostic-artifact-missing:main-cpu-profile/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('rejects escaped paths and symlinks instead of reading outside the iteration directory', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-contained-')
+    );
+    const outsideDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-outside-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        const escapedCapture: DiagnosticCapture = {
+            ...capture(directory),
+            main: {
+                ...capture(directory).main,
+                cpuProfilePath: join(outsideDirectory, 'main.cpuprofile'),
+            },
+        };
+        await writeFile(
+            join(outsideDirectory, 'main.cpuprofile'),
+            JSON.stringify(CPU_PROFILE)
+        );
+        await assert.rejects(
+            () => validate?.(escapedCapture, directory),
+            /initial-import-diagnostic-artifact-path-invalid:main-cpu-profile/
+        );
+
+        const rendererProfilePath = join(directory, 'renderer.cpuprofile');
+        await unlink(rendererProfilePath);
+        await symlink(
+            join(outsideDirectory, 'main.cpuprofile'),
+            rendererProfilePath
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-artifact-path-invalid:renderer-cpu-profile/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+        await rm(outsideDirectory, { force: true, recursive: true });
+    }
+});
+
+test('requires exactly one database profile and rejects every playlist-worker profile', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-workers-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        await writeFile(
+            join(directory, 'database.worker-9.cpuprofile'),
+            JSON.stringify(CPU_PROFILE)
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-database-profile-cardinality-invalid/
+        );
+
+        await unlink(join(directory, 'database.worker-9.cpuprofile'));
+        await writeFile(
+            join(directory, 'playlist-refresh.worker-2.cpuprofile'),
+            JSON.stringify(CPU_PROFILE)
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-playlist-profile-unexpected/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('requires a structurally valid database worker heap snapshot', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-worker-snapshot-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        const missingSnapshot: DiagnosticCapture = {
+            ...capture(directory),
+            main: {
+                ...capture(directory).main,
+                workers: [
+                    {
+                        ...capture(directory).main.workers[0],
+                        snapshotPath: null,
+                    },
+                ],
+            },
+        };
+        await assert.rejects(
+            () => validate?.(missingSnapshot, directory),
+            /initial-import-diagnostic-artifact-missing:database-heap-snapshot/
+        );
+
+        await writeFile(
+            join(directory, 'database.worker-4.heapsnapshot'),
+            JSON.stringify({ snapshot: {}, nodes: [], edges: [] })
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-artifact-invalid:database-heap-snapshot/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
+
+test('rejects escaped and symlinked database worker heap snapshots', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-worker-contained-')
+    );
+    const outsideDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-worker-outside-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        const outsideSnapshotPath = join(
+            outsideDirectory,
+            'database.worker-4.heapsnapshot'
+        );
+        await writeFile(outsideSnapshotPath, JSON.stringify(HEAP_SNAPSHOT));
+        const escapedSnapshot: DiagnosticCapture = {
+            ...capture(directory),
+            main: {
+                ...capture(directory).main,
+                workers: [
+                    {
+                        ...capture(directory).main.workers[0],
+                        snapshotPath: outsideSnapshotPath,
+                    },
+                ],
+            },
+        };
+        await assert.rejects(
+            () => validate?.(escapedSnapshot, directory),
+            /initial-import-diagnostic-artifact-path-invalid:database-heap-snapshot/
+        );
+
+        const snapshotPath = join(directory, 'database.worker-4.heapsnapshot');
+        await unlink(snapshotPath);
+        await symlink(outsideSnapshotPath, snapshotPath);
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-artifact-path-invalid:database-heap-snapshot/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+        await rm(outsideDirectory, { force: true, recursive: true });
+    }
+});
+
+test('rejects extra database snapshots and every playlist-worker snapshot', async () => {
+    const module = await diagnosticArtifactsModulePromise;
+    assert.ok(module);
+    const validate = module.validateInitialImportDiagnosticArtifacts;
+    assert.equal(typeof validate, 'function');
+    const directory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-initial-import-worker-snapshot-count-')
+    );
+
+    try {
+        await writeValidArtifacts(directory);
+        await writeFile(
+            join(directory, 'database.worker-9.heapsnapshot'),
+            JSON.stringify(HEAP_SNAPSHOT)
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-database-snapshot-cardinality-invalid/
+        );
+
+        await unlink(join(directory, 'database.worker-9.heapsnapshot'));
+        await writeFile(
+            join(directory, 'playlist-refresh.worker-2.heapsnapshot'),
+            JSON.stringify(HEAP_SNAPSHOT)
+        );
+        await assert.rejects(
+            () => validate?.(capture(directory), directory),
+            /initial-import-diagnostic-playlist-snapshot-unexpected/
+        );
+    } finally {
+        await rm(directory, { force: true, recursive: true });
+    }
+});
diff --git a/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.ts b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.ts
new file mode 100644
index 000000000..f9f5cbdb3
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-artifacts.ts
@@ -0,0 +1,262 @@
+import { lstat, readFile, readdir, realpath } from 'node:fs/promises';
+import { isAbsolute, join, relative, resolve, sep } from 'node:path';
+
+import {
+    isCpuProfile,
+    isHeapSnapshot,
+    isRendererTrace,
+} from './initial-import-diagnostic-artifact-content-validation';
+
+interface DiagnosticWorkerArtifact {
+    readonly kind: string;
+    readonly ordinal: number;
+    readonly profilePath: string | null;
+    readonly snapshotPath: string | null;
+}
+
+export interface InitialImportDiagnosticCapture {
+    readonly main: {
+        readonly cpuProfilePath: string | null;
+        readonly heapSnapshotPath: string | null;
+        readonly workers: readonly DiagnosticWorkerArtifact[];
+    };
+    readonly renderer: {
+        readonly cpuProfilePath: string | null;
+        readonly heapSnapshotPath: string | null;
+        readonly tracePath: string | null;
+    };
+}
+
+type ArtifactLabel =
+    | 'database-cpu-profile'
+    | 'database-heap-snapshot'
+    | 'main-cpu-profile'
+    | 'main-heap-snapshot'
+    | 'renderer-cpu-profile'
+    | 'renderer-heap-snapshot'
+    | 'renderer-trace';
+
+interface ArtifactDescription {
+    readonly filename: string;
+    readonly label: ArtifactLabel;
+    readonly path: string | null;
+    readonly validate: (value: unknown) => boolean;
+}
+
+export async function validateInitialImportDiagnosticArtifacts(
+    capture: InitialImportDiagnosticCapture,
+    iterationDirectory: string
+): Promise<void> {
+    const directory = resolve(iterationDirectory);
+    let realDirectory: string;
+    try {
+        realDirectory = await realpath(directory);
+    } catch {
+        throw new Error(
+            'initial-import-diagnostic-artifact-path-invalid:iteration-directory'
+        );
+    }
+
+    const databaseWorker = requireExactDatabaseWorker(capture.main.workers);
+    await assertWorkerArtifactCardinality(directory);
+
+    const artifacts: readonly ArtifactDescription[] = [
+        {
+            filename: 'main.cpuprofile',
+            label: 'main-cpu-profile',
+            path: capture.main.cpuProfilePath,
+            validate: isCpuProfile,
+        },
+        {
+            filename: 'renderer.cpuprofile',
+            label: 'renderer-cpu-profile',
+            path: capture.renderer.cpuProfilePath,
+            validate: isCpuProfile,
+        },
+        {
+            filename: 'renderer.trace.json',
+            label: 'renderer-trace',
+            path: capture.renderer.tracePath,
+            validate: isRendererTrace,
+        },
+        {
+            filename: 'main.heapsnapshot',
+            label: 'main-heap-snapshot',
+            path: capture.main.heapSnapshotPath,
+            validate: isHeapSnapshot,
+        },
+        {
+            filename: 'renderer.heapsnapshot',
+            label: 'renderer-heap-snapshot',
+            path: capture.renderer.heapSnapshotPath,
+            validate: isHeapSnapshot,
+        },
+        {
+            filename: `database.worker-${databaseWorker.ordinal}.cpuprofile`,
+            label: 'database-cpu-profile',
+            path: databaseWorker.profilePath,
+            validate: isCpuProfile,
+        },
+        {
+            filename: `database.worker-${databaseWorker.ordinal}.heapsnapshot`,
+            label: 'database-heap-snapshot',
+            path: databaseWorker.snapshotPath,
+            validate: isHeapSnapshot,
+        },
+    ];
+
+    for (const artifact of artifacts) {
+        await validateJsonArtifact(directory, realDirectory, artifact);
+    }
+}
+
+function requireExactDatabaseWorker(
+    workers: readonly DiagnosticWorkerArtifact[]
+): DiagnosticWorkerArtifact {
+    if (
+        workers.some(
+            (worker) =>
+                worker.kind === 'playlist-refresh.worker' &&
+                worker.profilePath !== null
+        )
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-playlist-profile-unexpected'
+        );
+    }
+    if (
+        workers.some(
+            (worker) =>
+                worker.kind === 'playlist-refresh.worker' &&
+                worker.snapshotPath !== null
+        )
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-playlist-snapshot-unexpected'
+        );
+    }
+    const databaseWorkers = workers.filter(
+        (worker) => worker.kind === 'database.worker'
+    );
+    const worker = databaseWorkers[0];
+    if (
+        databaseWorkers.length !== 1 ||
+        !worker ||
+        !Number.isSafeInteger(worker.ordinal) ||
+        worker.ordinal < 0
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-database-profile-cardinality-invalid'
+        );
+    }
+    return worker;
+}
+
+async function assertWorkerArtifactCardinality(
+    directory: string
+): Promise<void> {
+    let entries: readonly string[];
+    try {
+        entries = await readdir(directory);
+    } catch {
+        throw new Error(
+            'initial-import-diagnostic-artifact-path-invalid:iteration-directory'
+        );
+    }
+    if (
+        entries.some((entry) =>
+            /^playlist-refresh\.worker-\d+\.cpuprofile$/u.test(entry)
+        )
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-playlist-profile-unexpected'
+        );
+    }
+    if (
+        entries.filter((entry) =>
+            /^database\.worker-\d+\.cpuprofile$/u.test(entry)
+        ).length !== 1
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-database-profile-cardinality-invalid'
+        );
+    }
+    if (
+        entries.some((entry) =>
+            /^playlist-refresh\.worker-\d+\.heapsnapshot$/u.test(entry)
+        )
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-playlist-snapshot-unexpected'
+        );
+    }
+    if (
+        entries.filter((entry) =>
+            /^database\.worker-\d+\.heapsnapshot$/u.test(entry)
+        ).length !== 1
+    ) {
+        throw new Error(
+            'initial-import-diagnostic-database-snapshot-cardinality-invalid'
+        );
+    }
+}
+
+async function validateJsonArtifact(
+    directory: string,
+    realDirectory: string,
+    artifact: ArtifactDescription
+): Promise<void> {
+    if (artifact.path === null) {
+        throw new Error(
+            `initial-import-diagnostic-artifact-missing:${artifact.label}`
+        );
+    }
+    const expectedPath = join(directory, artifact.filename);
+    if (resolve(artifact.path) !== expectedPath) {
+        throw new Error(
+            `initial-import-diagnostic-artifact-path-invalid:${artifact.label}`
+        );
+    }
+
+    let value: unknown;
+    try {
+        const stats = await lstat(expectedPath);
+        if (!stats.isFile() || stats.isSymbolicLink()) {
+            throw new Error('unsafe-artifact-type');
+        }
+        const realArtifactPath = await realpath(expectedPath);
+        if (!isContained(realDirectory, realArtifactPath)) {
+            throw new Error('escaped-artifact');
+        }
+        value = JSON.parse(await readFile(realArtifactPath, 'utf8')) as unknown;
+    } catch (error) {
+        if (
+            error instanceof Error &&
+            (error.message === 'unsafe-artifact-type' ||
+                error.message === 'escaped-artifact')
+        ) {
+            throw new Error(
+                `initial-import-diagnostic-artifact-path-invalid:${artifact.label}`
+            );
+        }
+        throw new Error(
+            `initial-import-diagnostic-artifact-invalid:${artifact.label}`
+        );
+    }
+
+    if (!artifact.validate(value)) {
+        throw new Error(
+            `initial-import-diagnostic-artifact-invalid:${artifact.label}`
+        );
+    }
+}
+
+function isContained(directory: string, artifactPath: string): boolean {
+    const relativePath = relative(directory, artifactPath);
+    return (
+        relativePath.length > 0 &&
+        !isAbsolute(relativePath) &&
+        relativePath !== '..' &&
+        !relativePath.startsWith(`..${sep}`)
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-test-fixtures.ts b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-test-fixtures.ts
new file mode 100644
index 000000000..1746c9335
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/initial-import-diagnostic-test-fixtures.ts
@@ -0,0 +1,19 @@
+export const CPU_PROFILE = Object.freeze({
+    endTime: 3_000,
+    nodes: Object.freeze([
+        Object.freeze({
+            callFrame: Object.freeze({
+                columnNumber: -1,
+                functionName: '(root)',
+                lineNumber: -1,
+                scriptId: '0',
+                url: '',
+            }),
+            hitCount: 1,
+            id: 1,
+        }),
+    ]),
+    samples: Object.freeze([1]),
+    startTime: 1_000,
+    timeDeltas: Object.freeze([1_000]),
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.spec.ts
new file mode 100644
index 000000000..21c4aadc4
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.spec.ts
@@ -0,0 +1,115 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import { PERFORMANCE_ITERATION_KIND } from './m3u-refresh-cancellation-contract';
+import {
+    assertSyntheticM3uImportUrl,
+    createM3uImportIterationDefinitions,
+    listM3uImportScenarios,
+    M3U_IMPORT_SCENARIO_ID,
+} from './m3u-import-benchmark-contract';
+
+describe('formal M3U import benchmark contract', () => {
+    it('defines the exact 10k, 50k, and 100k synthetic scenarios', () => {
+        assert.deepEqual(listM3uImportScenarios(), [
+            {
+                channelCount: 10_000,
+                id: M3U_IMPORT_SCENARIO_ID.IMPORT_10K,
+            },
+            {
+                channelCount: 50_000,
+                id: M3U_IMPORT_SCENARIO_ID.IMPORT_50K,
+            },
+            {
+                channelCount: 100_000,
+                id: M3U_IMPORT_SCENARIO_ID.IMPORT_100K,
+            },
+        ]);
+    });
+
+    it('schedules one warm-up, five measured runs, and one diagnostic per size', () => {
+        const definitions = createM3uImportIterationDefinitions(false);
+
+        assert.equal(definitions.length, 21);
+        for (const scenario of listM3uImportScenarios()) {
+            const scenarioRuns = definitions.filter(
+                (definition) => definition.scenarioId === scenario.id
+            );
+            assert.deepEqual(
+                scenarioRuns.map(({ kind, runId }) => ({ kind, runId })),
+                [
+                    {
+                        kind: PERFORMANCE_ITERATION_KIND.WARMUP,
+                        runId: 'warmup-01',
+                    },
+                    ...Array.from({ length: 5 }, (_, index) => ({
+                        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+                        runId: `run-${String(index + 1).padStart(2, '0')}`,
+                    })),
+                    {
+                        kind: PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+                        runId: 'diagnostic',
+                    },
+                ]
+            );
+            assert.ok(
+                scenarioRuns.every(
+                    (definition) =>
+                        definition.channelCount === scenario.channelCount
+                )
+            );
+        }
+    });
+
+    it('keeps fixture sizes unchanged while smoke mode reduces measured runs to one', () => {
+        const definitions = createM3uImportIterationDefinitions(true);
+
+        assert.equal(definitions.length, 9);
+        for (const scenario of listM3uImportScenarios()) {
+            assert.deepEqual(
+                definitions
+                    .filter(
+                        (definition) => definition.scenarioId === scenario.id
+                    )
+                    .map(({ kind, runId }) => ({ kind, runId })),
+                [
+                    {
+                        kind: PERFORMANCE_ITERATION_KIND.WARMUP,
+                        runId: 'warmup-01',
+                    },
+                    {
+                        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+                        runId: 'run-01',
+                    },
+                    {
+                        kind: PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+                        runId: 'diagnostic',
+                    },
+                ]
+            );
+        }
+    });
+
+    it('accepts only the exact credential-free loopback fixture URL', () => {
+        assert.doesNotThrow(() =>
+            assertSyntheticM3uImportUrl(
+                'http://127.0.0.1:43210/synthetic-performance.m3u'
+            )
+        );
+
+        for (const unsafe of [
+            'https://127.0.0.1:43210/synthetic-performance.m3u',
+            'http://localhost:43210/synthetic-performance.m3u',
+            'http://127.0.0.1/synthetic-performance.m3u',
+            'http://user:pass@127.0.0.1:43210/synthetic-performance.m3u',
+            'http://127.0.0.1:43210/other.m3u',
+            'http://127.0.0.1:43210/synthetic-performance.m3u?token=secret',
+            'http://127.0.0.1:43210/synthetic-performance.m3u#fragment',
+        ]) {
+            assert.throws(
+                () => assertSyntheticM3uImportUrl(unsafe),
+                /exact synthetic HTTP loopback URL/
+            );
+        }
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.ts b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.ts
new file mode 100644
index 000000000..6740be17f
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-contract.ts
@@ -0,0 +1,118 @@
+import {
+    PERFORMANCE_ITERATION_KIND,
+    type PerformanceIterationKind,
+} from './m3u-refresh-cancellation-contract';
+import { SYNTHETIC_M3U_RESOURCE_PATH } from './synthetic-m3u-server';
+import type { SyntheticM3uChannelCount } from './synthetic-m3u';
+
+export const M3U_IMPORT_SCENARIO_ID = {
+    IMPORT_10K: 'm3u-import-10k',
+    IMPORT_50K: 'm3u-import-50k',
+    IMPORT_100K: 'm3u-import-100k',
+} as const;
+
+export type M3uImportScenarioId =
+    (typeof M3U_IMPORT_SCENARIO_ID)[keyof typeof M3U_IMPORT_SCENARIO_ID];
+
+export interface M3uImportScenario {
+    readonly channelCount: SyntheticM3uChannelCount;
+    readonly id: M3uImportScenarioId;
+}
+
+export interface M3uImportIterationDefinition {
+    readonly channelCount: SyntheticM3uChannelCount;
+    readonly kind: PerformanceIterationKind;
+    readonly runId: string;
+    readonly scenarioId: M3uImportScenarioId;
+}
+
+const SCENARIOS: readonly M3uImportScenario[] = Object.freeze([
+    Object.freeze({
+        channelCount: 10_000,
+        id: M3U_IMPORT_SCENARIO_ID.IMPORT_10K,
+    }),
+    Object.freeze({
+        channelCount: 50_000,
+        id: M3U_IMPORT_SCENARIO_ID.IMPORT_50K,
+    }),
+    Object.freeze({
+        channelCount: 100_000,
+        id: M3U_IMPORT_SCENARIO_ID.IMPORT_100K,
+    }),
+]);
+
+export function listM3uImportScenarios(): readonly M3uImportScenario[] {
+    return SCENARIOS;
+}
+
+export function createM3uImportIterationDefinitions(
+    smoke: boolean
+): readonly M3uImportIterationDefinition[] {
+    const measuredRuns = smoke ? 1 : 5;
+    const definitions: M3uImportIterationDefinition[] = [];
+
+    for (const scenario of SCENARIOS) {
+        definitions.push(
+            iteration(scenario, PERFORMANCE_ITERATION_KIND.WARMUP, 'warmup-01')
+        );
+        for (let index = 1; index <= measuredRuns; index += 1) {
+            definitions.push(
+                iteration(
+                    scenario,
+                    PERFORMANCE_ITERATION_KIND.MEASURED,
+                    `run-${String(index).padStart(2, '0')}`
+                )
+            );
+        }
+        definitions.push(
+            iteration(
+                scenario,
+                PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+                'diagnostic'
+            )
+        );
+    }
+
+    return Object.freeze(definitions);
+}
+
+export function assertSyntheticM3uImportUrl(value: string): void {
+    let url: URL;
+    try {
+        url = new URL(value);
+    } catch {
+        throw invalidSyntheticUrl();
+    }
+
+    if (
+        url.protocol !== 'http:' ||
+        url.hostname !== '127.0.0.1' ||
+        url.port.length === 0 ||
+        url.username.length > 0 ||
+        url.password.length > 0 ||
+        url.pathname !== SYNTHETIC_M3U_RESOURCE_PATH ||
+        url.search.length > 0 ||
+        url.hash.length > 0
+    ) {
+        throw invalidSyntheticUrl();
+    }
+}
+
+function iteration(
+    scenario: M3uImportScenario,
+    kind: PerformanceIterationKind,
+    runId: string
+): M3uImportIterationDefinition {
+    return Object.freeze({
+        channelCount: scenario.channelCount,
+        kind,
+        runId,
+        scenarioId: scenario.id,
+    });
+}
+
+function invalidSyntheticUrl(): Error {
+    return new Error(
+        'M3U performance fixture must use the exact synthetic HTTP loopback URL'
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-lifecycle.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-lifecycle.spec.ts
new file mode 100644
index 000000000..f1dcd053a
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-lifecycle.spec.ts
@@ -0,0 +1,184 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { mkdir, mkdtemp, rm, symlink } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join, resolve } from 'node:path';
+import { describe, it } from 'node:test';
+
+import {
+    assertM3uImportOutputPathHasNoSymlinks,
+    assertM3uImportSourceState,
+    M3U_IMPORT_RENDERER_CDP_PORT,
+    resolveM3uImportRendererCdpPort,
+    resolveM3uImportOutputLayout,
+} from './m3u-import-benchmark-support';
+import { assertM3uImportRequestDelta } from './m3u-import.benchmark';
+
+describe('initial M3U import benchmark lifecycle', () => {
+    it('keeps requested output and variant strictly below dist/performance', () => {
+        const workspaceRoot = resolve('/workspace/iptvnator');
+        const outputRoot = resolve(
+            workspaceRoot,
+            'dist/performance/20260727T040000Z-m3u-import'
+        );
+        assert.deepEqual(
+            resolveM3uImportOutputLayout(workspaceRoot, outputRoot, 'baseline'),
+            {
+                outputRoot,
+                variantDirectory: resolve(outputRoot, 'baseline'),
+            }
+        );
+
+        for (const requestedRoot of [
+            'dist/performance/run',
+            resolve(workspaceRoot, 'dist/performance'),
+            resolve(workspaceRoot, 'dist/performance-sibling/run'),
+            resolve(workspaceRoot, '../outside'),
+        ]) {
+            assert.throws(
+                () =>
+                    resolveM3uImportOutputLayout(
+                        workspaceRoot,
+                        requestedRoot,
+                        'baseline'
+                    ),
+                /absolute path below dist\/performance/
+            );
+        }
+        assert.throws(
+            () =>
+                resolveM3uImportOutputLayout(
+                    workspaceRoot,
+                    outputRoot,
+                    '../escape'
+                ),
+            /variant is invalid/i
+        );
+    });
+
+    it('requires a clean source tree for formal runs but permits dirty smoke evidence', () => {
+        const dirtyState = {
+            commit: 'a'.repeat(40),
+            diffSha256: 'b'.repeat(64),
+            dirty: true,
+        };
+
+        assert.throws(
+            () => assertM3uImportSourceState(false, dirtyState),
+            /Formal performance runs require a clean Git worktree/
+        );
+        assert.doesNotThrow(() => assertM3uImportSourceState(true, dirtyState));
+        assert.doesNotThrow(() =>
+            assertM3uImportSourceState(false, {
+                ...dirtyState,
+                dirty: false,
+            })
+        );
+    });
+
+    it('rejects an existing output ancestor symlink before artifact creation', async () => {
+        const fixtureRoot = await mkdtemp(
+            join(tmpdir(), 'iptvnator-m3u-output-path-')
+        );
+        const repositoryRoot = join(fixtureRoot, 'repository');
+        const performanceRoot = join(
+            repositoryRoot,
+            'dist',
+            'performance'
+        );
+        const outside = join(fixtureRoot, 'outside');
+        await mkdir(performanceRoot, { recursive: true });
+        await mkdir(outside);
+        await symlink(outside, join(performanceRoot, 'redirect'));
+
+        try {
+            await assert.rejects(
+                assertM3uImportOutputPathHasNoSymlinks(
+                    repositoryRoot,
+                    join(performanceRoot, 'redirect', 'run')
+                ),
+                /Performance output path contains a symbolic link/
+            );
+            await assert.doesNotReject(
+                assertM3uImportOutputPathHasNoSymlinks(
+                    repositoryRoot,
+                    join(performanceRoot, 'ordinary', 'run')
+                )
+            );
+        } finally {
+            await rm(fixtureRoot, { force: true, recursive: true });
+        }
+    });
+
+    it('keeps formal CDP capture on 9222 while allowing an isolated smoke port', () => {
+        assert.equal(
+            resolveM3uImportRendererCdpPort(false, undefined),
+            M3U_IMPORT_RENDERER_CDP_PORT
+        );
+        assert.equal(
+            resolveM3uImportRendererCdpPort(false, '9222'),
+            M3U_IMPORT_RENDERER_CDP_PORT
+        );
+        assert.equal(resolveM3uImportRendererCdpPort(true, '9322'), 9322);
+
+        assert.throws(
+            () => resolveM3uImportRendererCdpPort(false, '9322'),
+            /Formal performance runs require CDP port 9222/
+        );
+        for (const invalid of ['0', '1023', '65536', '9222.5', 'not-a-port']) {
+            assert.throws(
+                () => resolveM3uImportRendererCdpPort(true, invalid),
+                /IPTVNATOR_PERF_CDP_PORT is invalid/
+            );
+        }
+    });
+
+    it('fails closed unless one and only one app GET occurs', () => {
+        assert.doesNotThrow(() => assertM3uImportRequestDelta(3, 4));
+        assert.throws(
+            () => assertM3uImportRequestDelta(3, 3),
+            /exactly one application GET/
+        );
+        assert.throws(
+            () => assertM3uImportRequestDelta(3, 5),
+            /exactly one application GET/
+        );
+    });
+
+    it('waits for the exact upsert plus route-reload GET sequence', () => {
+        const source = readFileSync(
+            resolve(
+                process.cwd(),
+                'src/performance/m3u-import.benchmark.ts'
+            ),
+            'utf8'
+        );
+
+        assert.match(source, /status\.databaseRequests\s*===\s*2/);
+        assert.match(source, /status\.databaseUpsertsCompleted\s*===\s*1/);
+        assert.match(source, /status\.databaseGetsCompleted\s*===\s*1/);
+        assert.match(source, /status\.databasePending\s*===\s*0/);
+        assert.match(source, /status\.preloadSuccessMarkers\s*===\s*2/);
+    });
+
+    it('always disposes renderer capture before closing Electron on iteration failure', () => {
+        const source = readFileSync(
+            resolve(
+                process.cwd(),
+                'src/performance/m3u-import.benchmark.ts'
+            ),
+            'utf8'
+        );
+        const runIteration = source.indexOf('async function runIteration');
+        const finallyBlock = source.indexOf('} finally {', runIteration);
+        const rendererDispose = source.indexOf(
+            'await renderer.dispose()',
+            finallyBlock
+        );
+        const appClose = source.indexOf('await closeElectronApp(app)', finallyBlock);
+
+        assert.ok(finallyBlock > runIteration);
+        assert.ok(rendererDispose > finallyBlock);
+        assert.ok(appClose > rendererDispose);
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-support.ts b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-support.ts
new file mode 100644
index 000000000..c153a3581
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-benchmark-support.ts
@@ -0,0 +1,300 @@
+import { execFileSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { access, lstat, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { createServer as createTcpServer } from 'node:net';
+import { isAbsolute, join, relative, resolve, sep } from 'node:path';
+
+import { expect, type Page } from '@playwright/test';
+
+import {
+    type LaunchedElectronApp,
+    workspaceRoot,
+} from '../electron-test-fixtures';
+import { assertPerformanceArtifactCapacity } from './performance-artifact-preflight';
+import type { RendererWindowIdentity } from './renderer-window-rss-session';
+
+const OUTPUT_VARIANT_PATTERN = /^[a-z][a-z0-9-]{0,31}$/;
+export const M3U_IMPORT_RENDERER_CDP_PORT = 9222;
+
+export interface M3uImportGitSourceState {
+    readonly commit: string;
+    readonly diffSha256: string;
+    readonly dirty: boolean;
+}
+
+export interface M3uImportOutputLayout {
+    readonly outputRoot: string;
+    readonly variantDirectory: string;
+}
+
+export interface M3uImportBenchmarkConfiguration extends M3uImportOutputLayout {
+    readonly electronVersion: string;
+    readonly measuredRuns: number;
+    readonly rendererCdpPort: number;
+    readonly smoke: boolean;
+    readonly sourceState: M3uImportGitSourceState;
+    readonly variant: string;
+}
+
+export async function resolveM3uImportBenchmarkConfiguration(): Promise<M3uImportBenchmarkConfiguration> {
+    const requestedRoot = process.env['IPTVNATOR_PERF_OUTPUT_DIR'];
+    if (!requestedRoot) {
+        throw new Error('IPTVNATOR_PERF_OUTPUT_DIR is required');
+    }
+    const variant = process.env['IPTVNATOR_PERF_VARIANT'] ?? 'baseline';
+    const layout = resolveM3uImportOutputLayout(
+        workspaceRoot,
+        requestedRoot,
+        variant
+    );
+    const smoke = process.env['IPTVNATOR_PERF_SMOKE'] === '1';
+    const rendererCdpPort = resolveM3uImportRendererCdpPort(
+        smoke,
+        process.env['IPTVNATOR_PERF_CDP_PORT']
+    );
+    const sourceState = readGitSourceState(workspaceRoot);
+    assertM3uImportSourceState(smoke, sourceState);
+    const electronPackage = JSON.parse(
+        await readFile(
+            join(workspaceRoot, 'node_modules', 'electron', 'package.json'),
+            'utf8'
+        )
+    ) as { version?: unknown };
+    if (typeof electronPackage.version !== 'string') {
+        throw new Error('Unable to resolve the Electron runtime version');
+    }
+    await assertM3uImportOutputPathHasNoSymlinks(
+        workspaceRoot,
+        layout.outputRoot
+    );
+    await assertMissing(layout.variantDirectory);
+    await assertPerformanceArtifactCapacity(layout.variantDirectory);
+    await mkdir(layout.variantDirectory, { recursive: true });
+    return Object.freeze({
+        ...layout,
+        electronVersion: electronPackage.version,
+        measuredRuns: smoke ? 1 : 5,
+        rendererCdpPort,
+        smoke,
+        sourceState,
+        variant,
+    });
+}
+
+export function resolveM3uImportOutputLayout(
+    repositoryRoot: string,
+    requestedRoot: string,
+    variant: string
+): M3uImportOutputLayout {
+    const performanceRoot = resolve(repositoryRoot, 'dist', 'performance');
+    const outputRoot = resolve(requestedRoot);
+    if (
+        !isAbsolute(requestedRoot) ||
+        !isStrictDescendant(performanceRoot, outputRoot)
+    ) {
+        throw new Error(
+            'Performance output must be an absolute path below dist/performance'
+        );
+    }
+    if (!OUTPUT_VARIANT_PATTERN.test(variant)) {
+        throw new Error('IPTVNATOR_PERF_VARIANT is invalid');
+    }
+    const variantDirectory = resolve(outputRoot, variant);
+    if (!isStrictDescendant(outputRoot, variantDirectory)) {
+        throw new Error('IPTVNATOR_PERF_VARIANT is invalid');
+    }
+    return Object.freeze({ outputRoot, variantDirectory });
+}
+
+export async function assertM3uImportOutputPathHasNoSymlinks(
+    repositoryRoot: string,
+    outputRoot: string
+): Promise<void> {
+    const root = resolve(repositoryRoot);
+    const output = resolve(outputRoot);
+    if (!isStrictDescendant(root, output)) {
+        throw new Error('Performance output path escapes the repository');
+    }
+    const components = relative(root, output).split(sep);
+    let current = root;
+
+    for (const component of ['', ...components]) {
+        current = component === '' ? current : join(current, component);
+        try {
+            const stats = await lstat(current);
+            if (stats.isSymbolicLink()) {
+                throw new Error(
+                    `Performance output path contains a symbolic link: ${current}`
+                );
+            }
+        } catch (error) {
+            if (isMissingPath(error)) {
+                return;
+            }
+            throw error;
+        }
+    }
+}
+
+export function assertM3uImportSourceState(
+    smoke: boolean,
+    state: M3uImportGitSourceState
+): void {
+    if (!smoke && state.dirty) {
+        throw new Error(
+            'Formal performance runs require a clean Git worktree; commit or stash changes first'
+        );
+    }
+}
+
+export function resolveM3uImportRendererCdpPort(
+    smoke: boolean,
+    requestedPort: string | undefined
+): number {
+    const port =
+        requestedPort === undefined
+            ? M3U_IMPORT_RENDERER_CDP_PORT
+            : Number(requestedPort);
+    if (
+        (requestedPort !== undefined && !/^[1-9]\d*$/.test(requestedPort)) ||
+        !Number.isSafeInteger(port) ||
+        port < 1024 ||
+        port > 65_535
+    ) {
+        throw new Error('IPTVNATOR_PERF_CDP_PORT is invalid');
+    }
+    if (!smoke && port !== M3U_IMPORT_RENDERER_CDP_PORT) {
+        throw new Error(
+            `Formal performance runs require CDP port ${M3U_IMPORT_RENDERER_CDP_PORT}`
+        );
+    }
+    return port;
+}
+
+export async function resolveRendererWindowIdentity(
+    app: LaunchedElectronApp
+): Promise<RendererWindowIdentity> {
+    const handle = await app.electronApp.browserWindow(app.mainWindow);
+    try {
+        return await handle.evaluate((browserWindow) => {
+            const exactWindow = browserWindow as unknown as {
+                readonly id: number;
+                readonly webContents: { readonly id: number };
+            };
+            return {
+                browserWindowId: exactWindow.id,
+                webContentsId: exactWindow.webContents.id,
+            };
+        });
+    } finally {
+        await handle.dispose();
+    }
+}
+
+export async function assertTcpPortAvailable(port: number): Promise<void> {
+    const server = createTcpServer();
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.once('error', rejectPromise);
+        server.listen(
+            { exclusive: true, host: '127.0.0.1', port },
+            resolvePromise
+        );
+    });
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.close((error) =>
+            error ? rejectPromise(error) : resolvePromise()
+        );
+    });
+}
+
+export async function assertRendererCdpTarget(
+    page: Page,
+    port: number
+): Promise<void> {
+    await expect
+        .poll(
+            async () => {
+                try {
+                    const response = await fetch(
+                        `http://127.0.0.1:${port}/json/list`
+                    );
+                    const targets = response.ok
+                        ? ((await response.json()) as unknown)
+                        : null;
+                    return (
+                        Array.isArray(targets) &&
+                        targets.some(
+                            (target) =>
+                                typeof target === 'object' &&
+                                target !== null &&
+                                (target as Record<string, unknown>)['type'] ===
+                                    'page' &&
+                                (target as Record<string, unknown>)['url'] ===
+                                    page.url()
+                        )
+                    );
+                } catch {
+                    return false;
+                }
+            },
+            { timeout: 10_000 }
+        )
+        .toBe(true);
+}
+
+export async function writeM3uImportJson(
+    path: string,
+    value: unknown
+): Promise<void> {
+    await writeFile(path, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
+}
+
+function readGitSourceState(repositoryRoot: string): M3uImportGitSourceState {
+    const git = (args: readonly string[]): string =>
+        execFileSync('git', [...args], {
+            cwd: repositoryRoot,
+            encoding: 'utf8',
+        });
+    const commit = git(['rev-parse', 'HEAD']).trim();
+    const status = git(['status', '--porcelain=v1', '--untracked-files=all']);
+    const diffSha256 = createHash('sha256')
+        .update(status)
+        .update('\0')
+        .update(git(['diff', '--binary', 'HEAD']))
+        .update('\0')
+        .update(git(['diff', '--binary', '--cached', 'HEAD']))
+        .digest('hex');
+    return Object.freeze({
+        commit,
+        diffSha256,
+        dirty: status.trim().length > 0,
+    });
+}
+
+function isStrictDescendant(parent: string, candidate: string): boolean {
+    const pathFromParent = relative(resolve(parent), resolve(candidate));
+    return (
+        pathFromParent.length > 0 &&
+        pathFromParent !== '..' &&
+        !pathFromParent.startsWith(`..${sep}`) &&
+        !isAbsolute(pathFromParent)
+    );
+}
+
+async function assertMissing(path: string): Promise<void> {
+    try {
+        await access(path);
+    } catch {
+        return;
+    }
+    throw new Error(`Performance output already exists: ${path}`);
+}
+
+function isMissingPath(error: unknown): boolean {
+    return (
+        typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        error.code === 'ENOENT'
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-ipc-attribution.ts b/apps/electron-backend-e2e/src/performance/m3u-import-ipc-attribution.ts
new file mode 100644
index 000000000..29e17edb6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-ipc-attribution.ts
@@ -0,0 +1,250 @@
+import type {
+    MainTimelineRecord,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+
+type InitialImportDatabaseOperation =
+    | 'DB_GET_APP_PLAYLIST'
+    | 'DB_UPSERT_APP_PLAYLIST';
+
+export interface M3uImportIpcAttribution {
+    readonly databaseWorkerToMainCloneProxyMs: number;
+    readonly ipcStructuredCloneProxyMs: number;
+    readonly mainToDatabaseWorkerCloneProxyMs: number;
+    readonly mainToRendererCloneProxyMs: number;
+    readonly rendererToMainCloneProxyMs: number;
+}
+
+interface RequestBoundaryAttribution {
+    readonly mainToDatabaseWorkerMs: number;
+    readonly mainToRendererMs: number;
+    readonly rendererToMainMs: number;
+    readonly successEpochMs: number;
+    readonly workerToMainMs: number;
+}
+
+export function deriveM3uImportIpcAttribution(input: {
+    readonly get: WorkerRequestPerformanceMetrics;
+    readonly getReadStartedEpochMs: number;
+    readonly importDispatchEndedEpochMs: number;
+    readonly importDispatchStartedEpochMs: number;
+    readonly normalizeEndedEpochMs: number;
+    readonly playlistId: string;
+    readonly publishChannelsStartedEpochMs: number;
+    readonly serializeStartedEpochMs: number;
+    readonly timeline: readonly MainTimelineRecord[];
+    readonly upsert: WorkerRequestPerformanceMetrics;
+}): M3uImportIpcAttribution {
+    requireOrdered(
+        input.normalizeEndedEpochMs,
+        input.importDispatchStartedEpochMs
+    );
+    requireOrdered(
+        input.importDispatchStartedEpochMs,
+        input.importDispatchEndedEpochMs
+    );
+
+    const upsert = deriveRequestBoundaryAttribution({
+        operation: 'DB_UPSERT_APP_PLAYLIST',
+        playlistId: input.playlistId,
+        request: input.upsert,
+        timeline: input.timeline,
+        workPhaseStartedEpochMs: input.serializeStartedEpochMs,
+    });
+    requireOrdered(input.importDispatchEndedEpochMs, requireSource(input.upsert));
+
+    const get = deriveRequestBoundaryAttribution({
+        operation: 'DB_GET_APP_PLAYLIST',
+        playlistId: input.playlistId,
+        request: input.get,
+        timeline: input.timeline,
+        workPhaseStartedEpochMs: input.getReadStartedEpochMs,
+    });
+    requireOrdered(upsert.successEpochMs, requireSource(input.get));
+    requireOrdered(
+        get.successEpochMs,
+        input.publishChannelsStartedEpochMs
+    );
+
+    const initialMainToRendererMs = difference(
+        input.importDispatchStartedEpochMs,
+        input.normalizeEndedEpochMs
+    );
+    const mainToRendererCloneProxyMs =
+        initialMainToRendererMs +
+        upsert.mainToRendererMs +
+        get.mainToRendererMs;
+    const rendererToMainCloneProxyMs =
+        upsert.rendererToMainMs + get.rendererToMainMs;
+    const mainToDatabaseWorkerCloneProxyMs =
+        upsert.mainToDatabaseWorkerMs + get.mainToDatabaseWorkerMs;
+    const databaseWorkerToMainCloneProxyMs =
+        upsert.workerToMainMs + get.workerToMainMs;
+
+    return Object.freeze({
+        databaseWorkerToMainCloneProxyMs,
+        ipcStructuredCloneProxyMs:
+            mainToRendererCloneProxyMs +
+            rendererToMainCloneProxyMs +
+            mainToDatabaseWorkerCloneProxyMs +
+            databaseWorkerToMainCloneProxyMs,
+        mainToDatabaseWorkerCloneProxyMs,
+        mainToRendererCloneProxyMs,
+        rendererToMainCloneProxyMs,
+    });
+}
+
+function deriveRequestBoundaryAttribution(input: {
+    readonly operation: InitialImportDatabaseOperation;
+    readonly playlistId: string;
+    readonly request: WorkerRequestPerformanceMetrics;
+    readonly timeline: readonly MainTimelineRecord[];
+    readonly workPhaseStartedEpochMs: number;
+}): RequestBoundaryAttribution {
+    requireInitialImportPreloadIdentity(input.request, input.operation);
+    const requestTimeline = requireTimelineRecord(
+        input.timeline,
+        'db-request',
+        input.request,
+        input.operation,
+        input.playlistId
+    );
+    requireTimelineRecord(
+        input.timeline,
+        'db-response',
+        input.request,
+        input.operation,
+        input.playlistId
+    );
+    const successTimeline = requireTimelineRecord(
+        input.timeline,
+        'preload-performance-success',
+        input.request,
+        input.operation,
+        input.playlistId
+    );
+    const sourceEpochMs = requireSource(input.request);
+    const requestReceivedEpochMs = requireTimestamp(
+        input.request.requestReceivedEpochMs
+    );
+    const workStartedEpochMs = requireTimestamp(
+        input.request.workStartedEpochMs
+    );
+    const workEndedEpochMs = requireTimestamp(input.request.workEndedEpochMs);
+    const responsePostedEpochMs = requireTimestamp(
+        input.request.responsePostedEpochMs
+    );
+    const responseEpochMs = requireTimestamp(input.request.responseEpochMs);
+    const successEpochMs = requireTimestamp(successTimeline.sourceEpochMs);
+
+    requireOrdered(sourceEpochMs, requestTimeline.epochMs);
+    requireOrdered(requestTimeline.epochMs, requestReceivedEpochMs);
+    requireOrdered(requestReceivedEpochMs, workStartedEpochMs);
+    requireOrdered(workStartedEpochMs, input.workPhaseStartedEpochMs);
+    requireOrdered(input.workPhaseStartedEpochMs, workEndedEpochMs);
+    requireOrdered(workEndedEpochMs, responsePostedEpochMs);
+    requireOrdered(responsePostedEpochMs, responseEpochMs);
+    requireOrdered(responseEpochMs, successEpochMs);
+
+    return {
+        mainToDatabaseWorkerMs: difference(
+            requestReceivedEpochMs,
+            requestTimeline.epochMs
+        ),
+        mainToRendererMs: difference(successEpochMs, responseEpochMs),
+        rendererToMainMs: difference(requestTimeline.epochMs, sourceEpochMs),
+        successEpochMs,
+        workerToMainMs: difference(responseEpochMs, responsePostedEpochMs),
+    };
+}
+
+function requireTimelineRecord(
+    timeline: readonly MainTimelineRecord[],
+    type: 'db-request' | 'db-response' | 'preload-performance-success',
+    request: WorkerRequestPerformanceMetrics,
+    operation: InitialImportDatabaseOperation,
+    playlistId: string
+): MainTimelineRecord {
+    if (!request.requestId || !Number.isSafeInteger(request.ipcCallId)) {
+        throw new Error('database-request-identity-missing');
+    }
+    const matches = timeline.filter((record) => {
+        if (
+            record.type !== type ||
+            record.operation !== operation ||
+            record.playlistId !== playlistId
+        ) {
+            return false;
+        }
+        if (type === 'preload-performance-success') {
+            return (
+                record.ipcCallId === request.ipcCallId &&
+                record.sourceEpochMs !== undefined &&
+                record.success === true
+            );
+        }
+        return (
+            record.requestId === request.requestId &&
+            (type !== 'db-response' || record.success === true)
+        );
+    });
+    if (matches.length !== 1 || !matches[0]) {
+        throw new Error(`database-${type}-timeline-correlation`);
+    }
+    const record = matches[0];
+    if (
+        type === 'db-request' &&
+        (record.ipcCallId !== request.ipcCallId ||
+            record.sourceEpochMs !== request.sourceEpochMs)
+    ) {
+        throw new Error('database-request-timeline-identity');
+    }
+    return record;
+}
+
+function requireInitialImportPreloadIdentity(
+    request: WorkerRequestPerformanceMetrics,
+    operation: InitialImportDatabaseOperation
+): void {
+    if (
+        request.operation !== operation ||
+        !request.success ||
+        request.performanceCaptureUnavailableReason !== null ||
+        !Number.isSafeInteger(request.ipcCallId) ||
+        Number(request.ipcCallId) < 1 ||
+        typeof request.sourceEpochMs !== 'number' ||
+        !Number.isFinite(request.sourceEpochMs) ||
+        request.sourceEpochMs < 0 ||
+        request.operationId !== null ||
+        request.operationIdUnavailableReason !==
+            'preload-performance-marker-uncorrelated'
+    ) {
+        throw new Error('database-request-preload-identity');
+    }
+}
+
+function requireSource(request: WorkerRequestPerformanceMetrics): number {
+    return requireTimestamp(request.sourceEpochMs);
+}
+
+function requireTimestamp(value: number | null | undefined): number {
+    if (typeof value !== 'number' || !Number.isFinite(value) || value < 0) {
+        throw new Error('database-request-timestamp-missing');
+    }
+    return value;
+}
+
+function requireOrdered(startEpochMs: number, endEpochMs: number): void {
+    if (
+        !Number.isFinite(startEpochMs) ||
+        !Number.isFinite(endEpochMs) ||
+        endEpochMs < startEpochMs
+    ) {
+        throw new Error('phase-order');
+    }
+}
+
+function difference(endEpochMs: number, startEpochMs: number): number {
+    requireOrdered(startEpochMs, endEpochMs);
+    return endEpochMs - startEpochMs;
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-renderer-artifacts.ts b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-artifacts.ts
new file mode 100644
index 000000000..fa8f198cb
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-artifacts.ts
@@ -0,0 +1,181 @@
+import { once } from 'node:events';
+import { createWriteStream } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+import type { CDPSession } from '@playwright/test';
+
+interface TraceData {
+    readonly value: readonly unknown[];
+}
+
+export interface RendererArtifactCapture {
+    beginTraceOutput(): void;
+    readonly cpuProfilePath: string | null;
+    finishTraceOutput(): Promise<void>;
+    readonly heapSnapshotPath: string | null;
+    readonly onTraceComplete: () => void;
+    readonly onTraceData: (data: TraceData) => void;
+    readonly traceComplete: Promise<void>;
+    readonly tracePath: string | null;
+}
+
+export function createRendererArtifactCapture(options: {
+    readonly diagnostic: boolean;
+    readonly outputDirectory: string;
+}): RendererArtifactCapture {
+    const tracePath = options.diagnostic
+        ? join(options.outputDirectory, 'renderer.trace.json')
+        : null;
+    const traceOutput = tracePath ? createWriteStream(tracePath) : null;
+    let traceOutputOpened = false;
+    let traceOutputFinish: Promise<void> | null = null;
+    let traceFirstEvent = true;
+    let completeTrace: (() => void) | null = null;
+    const traceComplete = new Promise<void>((resolve) => {
+        completeTrace = resolve;
+    });
+    return {
+        beginTraceOutput: () => {
+            if (
+                traceOutput &&
+                !traceOutputOpened &&
+                traceOutputFinish === null
+            ) {
+                traceOutput.write('{"traceEvents":[');
+                traceOutputOpened = true;
+            }
+        },
+        cpuProfilePath: options.diagnostic
+            ? join(options.outputDirectory, 'renderer.cpuprofile')
+            : null,
+        finishTraceOutput: () => {
+            traceOutputFinish ??= (async () => {
+                if (!traceOutput) {
+                    return;
+                }
+                if (!traceOutputOpened) {
+                    traceOutput.write('{"traceEvents":[');
+                    traceOutputOpened = true;
+                }
+                if (!traceOutput.writableEnded) {
+                    traceOutput.write(']}');
+                    traceOutput.end();
+                }
+                if (!traceOutput.writableFinished) {
+                    await once(traceOutput, 'finish');
+                }
+            })();
+            return traceOutputFinish;
+        },
+        heapSnapshotPath: options.diagnostic
+            ? join(options.outputDirectory, 'renderer.heapsnapshot')
+            : null,
+        onTraceComplete: () => {
+            completeTrace?.();
+            completeTrace = null;
+        },
+        onTraceData: (data) => {
+            if (!traceOutputOpened || traceOutput?.writableEnded) {
+                return;
+            }
+            for (const event of data.value) {
+                traceOutput?.write(
+                    `${traceFirstEvent ? '' : ','}${JSON.stringify(event)}`
+                );
+                traceFirstEvent = false;
+            }
+        },
+        traceComplete,
+        tracePath,
+    };
+}
+
+export async function startRendererDiagnosticCapture(
+    session: CDPSession,
+    artifacts: RendererArtifactCapture
+): Promise<void> {
+    await session.send('Profiler.enable');
+    await session.send('Profiler.start');
+    artifacts.beginTraceOutput();
+    session.on('Tracing.dataCollected', artifacts.onTraceData);
+    session.on('Tracing.tracingComplete', artifacts.onTraceComplete);
+    await session.send('Tracing.start', {
+        categories: [
+            'blink.user_timing',
+            'devtools.timeline',
+            'disabled-by-default-devtools.timeline',
+            'disabled-by-default-v8.cpu_profiler',
+            'v8',
+        ].join(','),
+        options: 'sampling-frequency=1000',
+        transferMode: 'ReportEvents',
+    });
+}
+
+export async function stopRendererDiagnosticCapture(
+    session: CDPSession,
+    artifacts: RendererArtifactCapture
+): Promise<void> {
+    try {
+        const cpuProfile = await session.send('Profiler.stop');
+        await writeFile(
+            requirePath(artifacts.cpuProfilePath, 'renderer CPU profile'),
+            JSON.stringify(cpuProfile['profile']),
+            'utf8'
+        );
+        await session.send('Tracing.end');
+        await artifacts.traceComplete;
+    } finally {
+        disposeRendererDiagnosticListeners(session, artifacts);
+        await artifacts.finishTraceOutput();
+    }
+}
+
+export async function disposeRendererDiagnosticCapture(
+    session: CDPSession,
+    artifacts: RendererArtifactCapture
+): Promise<void> {
+    disposeRendererDiagnosticListeners(session, artifacts);
+    await artifacts.finishTraceOutput();
+}
+
+export async function takeRendererHeapSnapshot(
+    session: CDPSession,
+    path: string | null
+): Promise<void> {
+    const output = createWriteStream(
+        requirePath(path, 'renderer heap snapshot')
+    );
+    const onChunk = ({ chunk }: { readonly chunk: string }): void => {
+        output.write(chunk);
+    };
+    session.on('HeapProfiler.addHeapSnapshotChunk', onChunk);
+    try {
+        await session.send('HeapProfiler.takeHeapSnapshot', {
+            reportProgress: false,
+        });
+    } finally {
+        session.off('HeapProfiler.addHeapSnapshotChunk', onChunk);
+        output.end();
+        if (!output.writableFinished) {
+            await once(output, 'finish');
+        }
+    }
+}
+
+function disposeRendererDiagnosticListeners(
+    session: CDPSession,
+    artifacts: RendererArtifactCapture
+): void {
+    session.off('Tracing.dataCollected', artifacts.onTraceData);
+    session.off('Tracing.tracingComplete', artifacts.onTraceComplete);
+    artifacts.onTraceComplete();
+}
+
+function requirePath(value: string | null, label: string): string {
+    if (value === null) {
+        throw new Error(`${label} path is unavailable`);
+    }
+    return value;
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture-lifecycle.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture-lifecycle.spec.ts
new file mode 100644
index 000000000..d2121babd
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture-lifecycle.spec.ts
@@ -0,0 +1,313 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based lifecycle test. */
+import { RENDERER_PERFORMANCE_PHASE_HOOK_KEY } from '@iptvnator/shared/logging';
+import assert from 'node:assert/strict';
+import { EventEmitter } from 'node:events';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+
+import { startM3uImportRendererCapture } from './m3u-import-renderer-capture';
+import { M3U_IMPORT_RENDERER_STATE_KEY } from './m3u-import-renderer-probe';
+
+test('idempotently disposes failed-iteration timers, probe, trace stream, listeners, and CDP session', async () => {
+    const browser = installFakeProbeEnvironment();
+    const outputDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-renderer-capture-dispose-')
+    );
+    const session = new FakeCdpSession();
+    const control = {
+        click: async () => undefined,
+        fill: async () => undefined,
+        first: () => control,
+        getByRole: () => control,
+        isDisabled: async () => false,
+        last: () => control,
+        waitFor: async () => undefined,
+    };
+    const page = {
+        ...browser.page,
+        context: () => ({
+            newCDPSession: async () => session,
+        }),
+        getByRole: () => control,
+        locator: () => control,
+    };
+
+    try {
+        const capture = await startM3uImportRendererCapture(
+            page as never,
+            {
+                diagnostic: true,
+                outputDirectory,
+                playlistTitle: 'Synthetic',
+                playlistUrl:
+                    'http://127.0.0.1:43210/synthetic-performance.m3u',
+            }
+        );
+        assert.equal(session.listenerCount('Tracing.dataCollected'), 1);
+        assert.equal(session.listenerCount('Tracing.tracingComplete'), 1);
+
+        await capture.dispose();
+        await capture.dispose();
+
+        assert.equal(session.detachCount, 1);
+        assert.equal(session.listenerCount('Tracing.dataCollected'), 0);
+        assert.equal(session.listenerCount('Tracing.tracingComplete'), 0);
+        assert.equal(browser.readState(), undefined);
+        const heapSamplesAfterDispose = session.heapUsageCalls;
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        assert.equal(session.heapUsageCalls, heapSamplesAfterDispose);
+        assert.deepEqual(
+            JSON.parse(
+                await readFile(
+                    join(outputDirectory, 'renderer.trace.json'),
+                    'utf8'
+                )
+            ),
+            { traceEvents: [] }
+        );
+    } finally {
+        browser.cleanup();
+        await rm(outputDirectory, { force: true, recursive: true });
+    }
+});
+
+test('failed-iteration disposal does not await a wedged renderer or CDP detach', async () => {
+    const browser = installFakeProbeEnvironment();
+    const outputDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-renderer-capture-wedged-')
+    );
+    const session = new FakeCdpSession({ hangDetach: true });
+    let evaluateCalls = 0;
+    const page = createFakePage(browser, session, async (callback, argument) => {
+        evaluateCalls += 1;
+        if (evaluateCalls > 1) {
+            return new Promise<never>(() => undefined);
+        }
+        return browser.page.evaluate(callback, argument);
+    });
+
+    try {
+        const capture = await startM3uImportRendererCapture(page as never, {
+            diagnostic: false,
+            outputDirectory,
+            playlistTitle: 'Synthetic',
+            playlistUrl:
+                'http://127.0.0.1:43210/synthetic-performance.m3u',
+        });
+        const outcome = await Promise.race([
+            capture.dispose().then(() => 'disposed'),
+            new Promise<'timeout'>((resolve) =>
+                setTimeout(() => resolve('timeout'), 150)
+            ),
+        ]);
+
+        assert.equal(outcome, 'disposed');
+        assert.equal(session.detachCount, 1);
+        const heapSamplesAfterDispose = session.heapUsageCalls;
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        assert.equal(session.heapUsageCalls, heapSamplesAfterDispose);
+    } finally {
+        browser.cleanup();
+        await rm(outputDirectory, { force: true, recursive: true });
+    }
+});
+
+test('rolls back partially started capture when Chromium tracing rejects', async () => {
+    const browser = installFakeProbeEnvironment();
+    const outputDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-renderer-capture-startup-')
+    );
+    const session = new FakeCdpSession({ failMethod: 'Tracing.start' });
+    const intervalToken = Object.freeze({});
+    const setIntervalDescriptor = Object.getOwnPropertyDescriptor(
+        globalThis,
+        'setInterval'
+    );
+    const clearIntervalDescriptor = Object.getOwnPropertyDescriptor(
+        globalThis,
+        'clearInterval'
+    );
+    let clearIntervalCalls = 0;
+    Object.defineProperty(globalThis, 'setInterval', {
+        configurable: true,
+        value: () => intervalToken,
+        writable: true,
+    });
+    Object.defineProperty(globalThis, 'clearInterval', {
+        configurable: true,
+        value: (token: unknown) => {
+            if (token === intervalToken) {
+                clearIntervalCalls += 1;
+            }
+        },
+        writable: true,
+    });
+
+    try {
+        await assert.rejects(
+            startM3uImportRendererCapture(
+                createFakePage(browser, session) as never,
+                {
+                    diagnostic: true,
+                    outputDirectory,
+                    playlistTitle: 'Synthetic',
+                    playlistUrl:
+                        'http://127.0.0.1:43210/synthetic-performance.m3u',
+                }
+            ),
+            /synthetic Tracing\.start failure/
+        );
+
+        assert.equal(clearIntervalCalls, 1);
+        assert.equal(session.detachCount, 1);
+        assert.equal(session.listenerCount('Tracing.dataCollected'), 0);
+        assert.equal(session.listenerCount('Tracing.tracingComplete'), 0);
+        assert.equal(browser.readState(), undefined);
+        assert.deepEqual(
+            JSON.parse(
+                await readFile(
+                    join(outputDirectory, 'renderer.trace.json'),
+                    'utf8'
+                )
+            ),
+            { traceEvents: [] }
+        );
+    } finally {
+        restoreGlobal('setInterval', setIntervalDescriptor);
+        restoreGlobal('clearInterval', clearIntervalDescriptor);
+        browser.cleanup();
+        await rm(outputDirectory, { force: true, recursive: true });
+    }
+});
+
+class FakeCdpSession extends EventEmitter {
+    detachCount = 0;
+    heapUsageCalls = 0;
+
+    constructor(
+        private readonly options: {
+            readonly failMethod?: string;
+            readonly hangDetach?: boolean;
+        } = {}
+    ) {
+        super();
+    }
+
+    async detach(): Promise<void> {
+        this.detachCount += 1;
+        if (this.options.hangDetach) {
+            return new Promise<never>(() => undefined);
+        }
+    }
+
+    async send(method: string): Promise<Record<string, unknown>> {
+        if (method === this.options.failMethod) {
+            throw new Error(`synthetic ${method} failure`);
+        }
+        if (method === 'Runtime.getHeapUsage') {
+            this.heapUsageCalls += 1;
+            return { usedSize: 1_024 };
+        }
+        return {};
+    }
+}
+
+function installFakeProbeEnvironment() {
+    const descriptors = new Map<string, PropertyDescriptor | undefined>();
+    let nextFrameId = 1;
+    const replaceGlobal = (key: string, value: unknown): void => {
+        descriptors.set(key, Object.getOwnPropertyDescriptor(globalThis, key));
+        Object.defineProperty(globalThis, key, {
+            configurable: true,
+            value,
+            writable: true,
+        });
+    };
+    class FakePerformanceObserver {
+        static readonly supportedEntryTypes = ['longtask'];
+
+        disconnect(): undefined {
+            return undefined;
+        }
+        observe(): undefined {
+            return undefined;
+        }
+        takeRecords(): PerformanceEntry[] {
+            return [];
+        }
+    }
+    replaceGlobal('performance', { now: () => 0, timeOrigin: 0 });
+    replaceGlobal('PerformanceObserver', FakePerformanceObserver);
+    replaceGlobal('cancelAnimationFrame', () => undefined);
+    replaceGlobal('requestAnimationFrame', () => nextFrameId++);
+    replaceGlobal('location', { pathname: '/' });
+    replaceGlobal('document', { querySelector: () => null });
+
+    return {
+        cleanup: () => {
+            for (const [key, descriptor] of descriptors) {
+                if (descriptor) {
+                    Object.defineProperty(globalThis, key, descriptor);
+                } else {
+                    Reflect.deleteProperty(globalThis, key);
+                }
+            }
+            Reflect.deleteProperty(
+                globalThis,
+                Symbol.for(RENDERER_PERFORMANCE_PHASE_HOOK_KEY)
+            );
+            Reflect.deleteProperty(
+                globalThis,
+                M3U_IMPORT_RENDERER_STATE_KEY
+            );
+        },
+        page: {
+            evaluate: async (
+                callback: (argument: never) => unknown,
+                argument: never
+            ) => callback(argument),
+        },
+        readState: () =>
+            (globalThis as Record<string, unknown>)[
+                M3U_IMPORT_RENDERER_STATE_KEY
+            ],
+    };
+}
+
+function createFakePage(
+    browser: ReturnType<typeof installFakeProbeEnvironment>,
+    session: FakeCdpSession,
+    evaluate = browser.page.evaluate
+) {
+    const control = {
+        click: async () => undefined,
+        fill: async () => undefined,
+        first: () => control,
+        getByRole: () => control,
+        isDisabled: async () => false,
+        last: () => control,
+        waitFor: async () => undefined,
+    };
+    return {
+        ...browser.page,
+        context: () => ({
+            newCDPSession: async () => session,
+        }),
+        evaluate,
+        getByRole: () => control,
+        locator: () => control,
+    };
+}
+
+function restoreGlobal(
+    key: 'clearInterval' | 'setInterval',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(globalThis, key, descriptor);
+    } else {
+        Reflect.deleteProperty(globalThis, key);
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.spec.ts
new file mode 100644
index 000000000..a409caf69
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.spec.ts
@@ -0,0 +1,389 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import { RENDERER_PERFORMANCE_PHASE_HOOK_KEY } from '@iptvnator/shared/logging';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+interface ImportProbe {
+    firstChannelVisibleEpochMs: number | null;
+    frameGapsMs: readonly number[];
+    heartbeatDelaysMs: readonly number[];
+    longTasksMs: readonly number[];
+    operationStartEpochMs: number;
+    performancePhaseEvents: readonly unknown[];
+    playlistId: string | null;
+    routeReadyEpochMs: number | null;
+    terminalEpochMs: number | null;
+    uiPaintedEpochMs: number | null;
+}
+
+interface RendererCaptureModule {
+    advanceM3uImportHeartbeatDeadline?: (
+        deadlineEpochMs: number,
+        nowEpochMs: number
+    ) => number;
+    assertCompleteM3uImportRendererProbe?: (probe: ImportProbe) => void;
+    startM3uImportRendererCapture?: unknown;
+}
+
+interface RendererProbeModule {
+    M3U_IMPORT_RENDERER_STATE_KEY?: string;
+    installM3uImportRendererProbe?: (page: unknown) => Promise<void>;
+    recordM3uImportHeartbeat?: (
+        page: unknown,
+        deadlineEpochMs: number
+    ) => Promise<void>;
+    stopM3uImportRendererProbe?: (page: unknown) => Promise<ImportProbe>;
+}
+
+interface FakeProbeState {
+    frameGapsMs: number[];
+    heartbeatDelaysMs: number[];
+    operationStartEpochMs: number;
+    operationStartMonotonicMs: number;
+    terminalEpochMs: number | null;
+}
+
+const captureUrl = new URL('./m3u-import-renderer-capture.ts', import.meta.url);
+const artifactsUrl = new URL(
+    './m3u-import-renderer-artifacts.ts',
+    import.meta.url
+);
+const probeUrl = new URL('./m3u-import-renderer-probe.ts', import.meta.url);
+const captureModulePromise = import(captureUrl.href)
+    .then((module) => module as RendererCaptureModule)
+    .catch(() => null);
+const probeModulePromise = import(probeUrl.href)
+    .then((module) => module as unknown as RendererProbeModule)
+    .catch(() => null);
+
+function installFakeBrowserEnvironment() {
+    const descriptors = new Map<string, PropertyDescriptor | undefined>();
+    const frames = new Map<number, (timestamp: number) => void>();
+    let nextFrameId = 1;
+    let nowMs = 0;
+    let observerRecords: PerformanceEntry[] | null = null;
+
+    const replaceGlobal = (key: string, value: unknown): void => {
+        descriptors.set(key, Object.getOwnPropertyDescriptor(globalThis, key));
+        Object.defineProperty(globalThis, key, {
+            configurable: true,
+            value,
+            writable: true,
+        });
+    };
+    class FakePerformanceObserver {
+        static readonly supportedEntryTypes = ['longtask'];
+
+        constructor() {
+            observerRecords = [];
+        }
+
+        disconnect(): undefined {
+            return undefined;
+        }
+        observe(): undefined {
+            return undefined;
+        }
+        takeRecords(): PerformanceEntry[] {
+            return observerRecords?.splice(0) ?? [];
+        }
+    }
+    replaceGlobal('performance', { now: () => nowMs, timeOrigin: 0 });
+    replaceGlobal('PerformanceObserver', FakePerformanceObserver);
+    replaceGlobal('cancelAnimationFrame', (requestId: number) => {
+        frames.delete(requestId);
+    });
+    replaceGlobal(
+        'requestAnimationFrame',
+        (callback: (timestamp: number) => void) => {
+            const requestId = nextFrameId++;
+            frames.set(requestId, callback);
+            return requestId;
+        }
+    );
+    replaceGlobal('location', { pathname: '/' });
+    replaceGlobal('document', { querySelector: () => null });
+
+    return {
+        cleanup: () => {
+            for (const [key, descriptor] of descriptors) {
+                if (descriptor) {
+                    Object.defineProperty(globalThis, key, descriptor);
+                } else {
+                    Reflect.deleteProperty(globalThis, key);
+                }
+            }
+            Reflect.deleteProperty(
+                globalThis,
+                Symbol.for(RENDERER_PERFORMANCE_PHASE_HOOK_KEY)
+            );
+        },
+        getObserver: () => observerRecords,
+        page: {
+            evaluate: async (
+                callback: (argument: unknown) => unknown,
+                argument: unknown
+            ) => callback(argument),
+        },
+        readState: (stateKey: string) =>
+            (globalThis as Record<string, unknown>)[stateKey] as FakeProbeState,
+        runFrame: (timestamp: number) => {
+            nowMs = timestamp;
+            for (const [requestId, callback] of [...frames]) {
+                if (frames.delete(requestId)) {
+                    callback(timestamp);
+                }
+            }
+        },
+        setNow: (value: number) => {
+            nowMs = value;
+        },
+        showTerminal: () => {
+            (
+                globalThis as unknown as {
+                    location: { pathname: string };
+                }
+            ).location.pathname =
+                '/Users/test/iptvnator/dist/apps/web/workspace/playlists/synthetic-id/all';
+            Object.defineProperty(globalThis, 'document', {
+                configurable: true,
+                value: { querySelector: () => ({}) },
+                writable: true,
+            });
+        },
+    };
+}
+
+function readSource(url: URL): string | null {
+    try {
+        return readFileSync(url, 'utf8');
+    } catch {
+        return null;
+    }
+}
+
+function completeProbe(): ImportProbe {
+    return {
+        firstChannelVisibleEpochMs: 130,
+        frameGapsMs: [16, 48],
+        heartbeatDelaysMs: [0, 12],
+        longTasksMs: [72],
+        operationStartEpochMs: 100,
+        performancePhaseEvents: [],
+        playlistId: 'synthetic-id',
+        routeReadyEpochMs: 120,
+        terminalEpochMs: 150,
+        uiPaintedEpochMs: 150,
+    };
+}
+
+test('exports the formal M3U import renderer collector', async () => {
+    const module = await captureModulePromise;
+
+    assert.ok(module, 'M3U import renderer capture module must exist');
+    assert.equal(typeof module.startM3uImportRendererCapture, 'function');
+    assert.equal(
+        typeof module.assertCompleteM3uImportRendererProbe,
+        'function'
+    );
+});
+
+test('prepares the URL dialog before starting any measured capture', () => {
+    const source = readSource(captureUrl);
+    assert.ok(source, 'M3U import renderer capture source must exist');
+
+    const dialogPreparation = source.indexOf(
+        'await prepareM3uImportDialog(page, options)'
+    );
+    const cdpSession = source.indexOf('newCDPSession(page)');
+    const initialHeapSample = source.indexOf('await sampleHeap()');
+
+    assert.ok(dialogPreparation >= 0);
+    assert.ok(cdpSession > dialogPreparation);
+    assert.ok(initialHeapSample > cdpSession);
+});
+
+test('captures heap samples in every run and raw CPU, trace, and heap artifacts only in diagnostics', () => {
+    const source = readSource(captureUrl);
+    const artifactSource = readSource(artifactsUrl);
+    assert.ok(source);
+    assert.ok(artifactSource);
+
+    assert.match(source, /setInterval\(\(\) => void sampleHeap\(\), 20\)/);
+    assert.match(source, /Runtime\.getHeapUsage/);
+    assert.match(source, /HeapProfiler\.collectGarbage/);
+    assert.match(
+        artifactSource,
+        /cpuProfilePath: options\.diagnostic[\s\S]*renderer\.cpuprofile/
+    );
+    assert.match(artifactSource, /Profiler\.start/);
+    assert.match(artifactSource, /Tracing\.start/);
+    assert.match(artifactSource, /HeapProfiler\.takeHeapSnapshot/);
+});
+
+test('clips drained long tasks and heartbeat samples to the operation window', async () => {
+    const module = await probeModulePromise;
+    assert.ok(module);
+    assert.equal(typeof module.installM3uImportRendererProbe, 'function');
+    assert.equal(typeof module.recordM3uImportHeartbeat, 'function');
+    assert.equal(typeof module.stopM3uImportRendererProbe, 'function');
+    assert.equal(typeof module.M3U_IMPORT_RENDERER_STATE_KEY, 'string');
+    const browser = installFakeBrowserEnvironment();
+
+    try {
+        await module.installM3uImportRendererProbe?.(browser.page);
+        const state = browser.readState(
+            module.M3U_IMPORT_RENDERER_STATE_KEY ?? ''
+        );
+        state.operationStartEpochMs = 100;
+        state.operationStartMonotonicMs = 100;
+        state.terminalEpochMs = 200;
+        const observerRecords = browser.getObserver();
+        assert.ok(observerRecords);
+        observerRecords.push(
+            { duration: 40, startTime: 80 } as PerformanceEntry,
+            { duration: 30, startTime: 190 } as PerformanceEntry,
+            { duration: 30, startTime: 210 } as PerformanceEntry
+        );
+
+        browser.setNow(250);
+        await module.recordM3uImportHeartbeat?.(browser.page, 90);
+        await module.recordM3uImportHeartbeat?.(browser.page, 150);
+        await module.recordM3uImportHeartbeat?.(browser.page, 210);
+        const metrics = await module.stopM3uImportRendererProbe?.(browser.page);
+
+        assert.deepEqual(metrics?.heartbeatDelaysMs, [50]);
+        assert.deepEqual(metrics?.longTasksMs, [20, 10]);
+    } finally {
+        browser.cleanup();
+    }
+});
+
+test('records the terminal animation-frame gap exactly once', async () => {
+    const module = await probeModulePromise;
+    assert.ok(module?.installM3uImportRendererProbe);
+    assert.equal(typeof module.M3U_IMPORT_RENDERER_STATE_KEY, 'string');
+    const browser = installFakeBrowserEnvironment();
+
+    try {
+        await module.installM3uImportRendererProbe(browser.page);
+        browser.runFrame(80);
+        const state = browser.readState(
+            module.M3U_IMPORT_RENDERER_STATE_KEY ?? ''
+        );
+        state.operationStartEpochMs = 100;
+        state.operationStartMonotonicMs = 100;
+        browser.showTerminal();
+        browser.runFrame(120);
+        browser.runFrame(140);
+        browser.runFrame(160);
+
+        assert.equal(state.terminalEpochMs, 160);
+        assert.deepEqual(state.frameGapsMs, [20, 20, 20]);
+        await module.stopM3uImportRendererProbe?.(browser.page);
+    } finally {
+        browser.cleanup();
+    }
+});
+
+test('advances the external heartbeat on its fixed 50ms deadline grid', async () => {
+    const module = await captureModulePromise;
+    assert.ok(module);
+    const advance = module.advanceM3uImportHeartbeatDeadline;
+    assert.equal(typeof advance, 'function');
+
+    assert.equal(advance?.(1_000, 1_005), 1_050);
+    assert.equal(advance?.(1_000, 1_060), 1_100);
+    assert.equal(advance?.(1_000, 1_200), 1_250);
+});
+
+test('installs the production renderer phase hook and returns its raw events', () => {
+    const source = readSource(probeUrl);
+    assert.ok(source);
+
+    assert.match(source, /RENDERER_PERFORMANCE_PHASE_HOOK_KEY/);
+    assert.match(source, /Symbol\.for\(hookKey\)/);
+    assert.match(source, /performancePhaseEvents\.push\(event\)/);
+    assert.match(
+        source,
+        /performancePhaseEvents: \[\.\.\.state\.performancePhaseEvents\]/
+    );
+    assert.match(source, /delete target\[hookSymbol\]/);
+});
+
+test('timestamps the click immediately before final Add and requires route, first item, and two animation frames', () => {
+    const source = readSource(probeUrl);
+    assert.ok(source);
+
+    const operationStart = source.indexOf(
+        'state.operationStartMonotonicMs = performance.now()'
+    );
+    const click = source.indexOf('button.click()', operationStart);
+    assert.ok(operationStart >= 0);
+    assert.ok(click > operationStart);
+    assert.ok(source.includes('/\\/workspace\\/playlists\\/([^/]+)\\/all$/'));
+    assert.match(source, /\[data-test-id="channel-item"\]/);
+    const firstPaintFrame = source.indexOf(
+        'state.uiPaintFrameRequestId = requestAnimationFrame'
+    );
+    const secondPaintFrame = source.indexOf(
+        'state.uiPaintFrameRequestId = requestAnimationFrame',
+        firstPaintFrame + 1
+    );
+    assert.ok(firstPaintFrame >= 0);
+    assert.ok(secondPaintFrame > firstPaintFrame);
+    for (const phase of [
+        'operationStartEpochMs',
+        'routeReadyEpochMs',
+        'firstChannelVisibleEpochMs',
+        'uiPaintedEpochMs',
+        'terminalEpochMs',
+    ]) {
+        assert.match(source, new RegExp(phase));
+    }
+});
+
+test('fails closed when any terminal proof or the probe itself is missing', async () => {
+    const module = await captureModulePromise;
+    assert.ok(module);
+    const assertComplete = module.assertCompleteM3uImportRendererProbe;
+    assert.equal(typeof assertComplete, 'function');
+
+    assert.doesNotThrow(() => assertComplete?.(completeProbe()));
+    for (const field of [
+        'playlistId',
+        'routeReadyEpochMs',
+        'firstChannelVisibleEpochMs',
+        'uiPaintedEpochMs',
+        'terminalEpochMs',
+    ] as const) {
+        const incomplete = { ...completeProbe(), [field]: null };
+        assert.throws(
+            () => assertComplete?.(incomplete),
+            /m3u-import-renderer-probe-incomplete/
+        );
+    }
+    assert.throws(
+        () =>
+            assertComplete?.({
+                ...completeProbe(),
+                operationStartEpochMs: 0,
+            }),
+        /m3u-import-renderer-probe-incomplete/
+    );
+});
+
+test('clears the harness heap sampler even when the renderer probe is missing', () => {
+    const source = readSource(captureUrl);
+    assert.ok(source);
+    const backgroundStop = source.indexOf(
+        'await stopBackgroundWork()',
+        source.indexOf('const stopCapture')
+    );
+    const probeStop = source.indexOf('probe = await stopProbe()', backgroundStop);
+
+    assert.match(source, /clearInterval\(heapSampleTimer\)/);
+    assert.ok(backgroundStop >= 0);
+    assert.ok(probeStop > backgroundStop);
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.ts b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.ts
new file mode 100644
index 000000000..db5bd80bf
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-capture.ts
@@ -0,0 +1,366 @@
+import type { CDPSession, Page } from '@playwright/test';
+
+import type { NumericDistribution } from './m3u-refresh-cancellation-contract';
+import {
+    createRendererArtifactCapture,
+    disposeRendererDiagnosticCapture,
+    type RendererArtifactCapture,
+    startRendererDiagnosticCapture,
+    stopRendererDiagnosticCapture,
+    takeRendererHeapSnapshot,
+} from './m3u-import-renderer-artifacts';
+import {
+    installM3uImportRendererProbe,
+    type M3uImportRendererProbeMetrics,
+    prepareM3uImportDialog,
+    recordM3uImportHeartbeat,
+    stopM3uImportRendererProbe,
+    triggerM3uImport,
+    waitForM3uImportTerminal,
+} from './m3u-import-renderer-probe';
+import { summarizeNumbers } from './performance-statistics';
+
+const HEARTBEAT_INTERVAL_MS = 50;
+
+export interface M3uImportRendererCaptureStartOptions {
+    readonly diagnostic: boolean;
+    readonly outputDirectory: string;
+    readonly playlistTitle: string;
+    readonly playlistUrl: string;
+}
+
+export interface M3uImportRendererPhaseTimestamps {
+    readonly firstChannelVisibleEpochMs: number;
+    readonly operationStartEpochMs: number;
+    readonly routeReadyEpochMs: number;
+    readonly terminalEpochMs: number;
+    readonly uiPaintedEpochMs: number;
+}
+
+export interface M3uImportRendererCaptureMetrics {
+    readonly cpuProfilePath: string | null;
+    readonly frameGap: NumericDistribution;
+    readonly heapSnapshotPath: string | null;
+    readonly heartbeatDelay: NumericDistribution;
+    readonly longTask: NumericDistribution;
+    readonly peakHeapUsedBytes: number;
+    readonly phaseTimestamps: M3uImportRendererPhaseTimestamps;
+    readonly postGcHeapUsedBytes: number;
+    readonly probe: M3uImportRendererProbeMetrics;
+    readonly tracePath: string | null;
+}
+
+export interface RunningM3uImportRendererCapture {
+    readonly session: CDPSession;
+    dispose(): Promise<void>;
+    stop(): Promise<M3uImportRendererCaptureMetrics>;
+    triggerImport(): Promise<number>;
+    waitForTerminal(): Promise<void>;
+}
+
+interface HeapUsageResult {
+    readonly usedSize: number;
+}
+
+export async function startM3uImportRendererCapture(
+    page: Page,
+    options: M3uImportRendererCaptureStartOptions
+): Promise<RunningM3uImportRendererCapture> {
+    await prepareM3uImportDialog(page, options);
+    const session = await page.context().newCDPSession(page);
+    let probeInstalled = false;
+    let heapSampleTimer: NodeJS.Timeout | null = null;
+    let artifacts: RendererArtifactCapture | null = null;
+    const heapSamples: number[] = [];
+    let heapSampleError: unknown = null;
+    let heapSamplePromise: Promise<void> | null = null;
+    const sampleHeap = (): Promise<void> => {
+        heapSamplePromise ??= (async () => {
+            try {
+                const sample = (await session.send(
+                    'Runtime.getHeapUsage'
+                )) as HeapUsageResult;
+                if (Number.isFinite(sample.usedSize)) {
+                    heapSamples.push(sample.usedSize);
+                }
+            } catch (error) {
+                heapSampleError ??= error;
+            } finally {
+                heapSamplePromise = null;
+            }
+        })();
+        return heapSamplePromise;
+    };
+
+    try {
+        await session.send('Runtime.enable');
+        await session.send('Performance.enable');
+        await installM3uImportRendererProbe(page);
+        probeInstalled = true;
+        await sampleHeap();
+        throwCaptureError(heapSampleError, 'Renderer heap sampling failed');
+        heapSampleTimer = setInterval(() => void sampleHeap(), 20);
+        artifacts = createRendererArtifactCapture(options);
+        if (options.diagnostic) {
+            await startRendererDiagnosticCapture(session, artifacts);
+        }
+    } catch (error) {
+        if (heapSampleTimer) {
+            clearInterval(heapSampleTimer);
+            heapSampleTimer = null;
+        }
+        if (artifacts && options.diagnostic) {
+            await disposeRendererDiagnosticCapture(
+                session,
+                artifacts
+            ).catch(() => undefined);
+        }
+        if (probeInstalled) {
+            continueBestEffort(() => stopM3uImportRendererProbe(page));
+        }
+        continueBestEffort(() => session.detach());
+        throw error;
+    }
+    if (!artifacts || !heapSampleTimer) {
+        throw new Error('M3U import renderer capture initialization failed');
+    }
+
+    let heartbeatDeadlineEpochMs: number | null = null;
+    let heartbeatError: unknown = null;
+    let heartbeatInFlight: Promise<void> | null = null;
+    let heartbeatTimer: NodeJS.Timeout | null = null;
+    let stopped = false;
+    let backgroundStopPromise: Promise<void> | null = null;
+    let probeStopPromise: Promise<M3uImportRendererProbeMetrics> | null = null;
+    let sessionDetachPromise: Promise<void> | null = null;
+    let abortPromise: Promise<void> | null = null;
+    let stopPromise: Promise<M3uImportRendererCaptureMetrics> | null = null;
+    let stopRequested = false;
+    let disposeRequested = false;
+    const stopSchedulingBackgroundWork = (): void => {
+        stopped = true;
+        if (heartbeatTimer) {
+            clearTimeout(heartbeatTimer);
+            heartbeatTimer = null;
+        }
+        if (heapSampleTimer) {
+            clearInterval(heapSampleTimer);
+            heapSampleTimer = null;
+        }
+    };
+    const scheduleHeartbeat = (): void => {
+        if (stopped || heartbeatDeadlineEpochMs === null) {
+            return;
+        }
+        const deadline = heartbeatDeadlineEpochMs;
+        heartbeatTimer = setTimeout(
+            () => {
+                heartbeatTimer = null;
+                heartbeatInFlight = recordM3uImportHeartbeat(page, deadline)
+                    .catch((error: unknown) => {
+                        heartbeatError ??= error;
+                    })
+                    .finally(() => {
+                        heartbeatInFlight = null;
+                        if (stopped) {
+                            return;
+                        }
+                        heartbeatDeadlineEpochMs =
+                            advanceM3uImportHeartbeatDeadline(
+                                deadline,
+                                Date.now()
+                            );
+                        scheduleHeartbeat();
+                    });
+            },
+            Math.max(0, deadline - Date.now())
+        );
+    };
+    const stopBackgroundWork = (): Promise<void> => {
+        backgroundStopPromise ??= (async () => {
+            stopSchedulingBackgroundWork();
+            await heartbeatInFlight;
+            await heapSamplePromise;
+            await sampleHeap();
+        })();
+        return backgroundStopPromise;
+    };
+    const stopProbe = (): Promise<M3uImportRendererProbeMetrics> => {
+        probeStopPromise ??= stopM3uImportRendererProbe(page);
+        return probeStopPromise;
+    };
+    const detachSession = (): Promise<void> => {
+        sessionDetachPromise ??= session.detach();
+        return sessionDetachPromise;
+    };
+    const abortResources = (): Promise<void> => {
+        abortPromise ??= (async () => {
+            stopSchedulingBackgroundWork();
+            continueBestEffort(() => heartbeatInFlight ?? Promise.resolve());
+            continueBestEffort(() => heapSamplePromise ?? Promise.resolve());
+            continueBestEffort(stopProbe);
+            if (options.diagnostic) {
+                await disposeRendererDiagnosticCapture(
+                    session,
+                    artifacts
+                ).catch(() => undefined);
+            }
+            continueBestEffort(detachSession);
+        })();
+        return abortPromise;
+    };
+    const stopCapture =
+        async (): Promise<M3uImportRendererCaptureMetrics> => {
+            try {
+                await stopBackgroundWork();
+                let probe: M3uImportRendererProbeMetrics | null = null;
+                let probeError: unknown = null;
+                try {
+                    probe = await stopProbe();
+                } catch (error) {
+                    probeError = error;
+                }
+
+                if (options.diagnostic) {
+                    await stopRendererDiagnosticCapture(session, artifacts);
+                }
+                await session.send('HeapProfiler.enable');
+                await session.send('HeapProfiler.collectGarbage');
+                const postGc = (await session.send(
+                    'Runtime.getHeapUsage'
+                )) as HeapUsageResult;
+                if (options.diagnostic) {
+                    await takeRendererHeapSnapshot(
+                        session,
+                        artifacts.heapSnapshotPath
+                    );
+                }
+                await detachSession();
+                throwCaptureError(
+                    heapSampleError,
+                    'Renderer heap sampling failed'
+                );
+                throwCaptureError(heartbeatError, 'Renderer heartbeat failed');
+                throwCaptureError(probeError, 'Renderer probe stop failed');
+                assertCompleteM3uImportRendererProbe(probe);
+                return Object.freeze({
+                    cpuProfilePath: artifacts.cpuProfilePath,
+                    frameGap: summarizeNumbers(probe.frameGapsMs),
+                    heapSnapshotPath: artifacts.heapSnapshotPath,
+                    heartbeatDelay: summarizeNumbers(
+                        probe.heartbeatDelaysMs
+                    ),
+                    longTask: summarizeNumbers(probe.longTasksMs),
+                    peakHeapUsedBytes: Math.max(0, ...heapSamples),
+                    phaseTimestamps: Object.freeze({
+                        firstChannelVisibleEpochMs:
+                            probe.firstChannelVisibleEpochMs,
+                        operationStartEpochMs: probe.operationStartEpochMs,
+                        routeReadyEpochMs: probe.routeReadyEpochMs,
+                        terminalEpochMs: probe.terminalEpochMs,
+                        uiPaintedEpochMs: probe.uiPaintedEpochMs,
+                    }),
+                    postGcHeapUsedBytes: postGc.usedSize,
+                    probe,
+                    tracePath: artifacts.tracePath,
+                });
+            } catch (error) {
+                await abortResources();
+                throw error;
+            }
+        };
+
+    return Object.freeze({
+        dispose: async () => {
+            disposeRequested = true;
+            if (stopPromise) {
+                continueBestEffort(() => stopPromise as Promise<unknown>);
+            }
+            await abortResources();
+        },
+        session,
+        stop: () => {
+            if (stopRequested || disposeRequested) {
+                return Promise.reject(
+                    new Error('M3U import renderer capture already stopped')
+                );
+            }
+            stopRequested = true;
+            stopPromise = stopCapture();
+            return stopPromise;
+        },
+        triggerImport: async () => {
+            const operationStartEpochMs = await triggerM3uImport(page);
+            heartbeatDeadlineEpochMs =
+                operationStartEpochMs + HEARTBEAT_INTERVAL_MS;
+            scheduleHeartbeat();
+            return operationStartEpochMs;
+        },
+        waitForTerminal: () => waitForM3uImportTerminal(page),
+    });
+}
+
+export function advanceM3uImportHeartbeatDeadline(
+    deadlineEpochMs: number,
+    nowEpochMs: number
+): number {
+    const nextDeadline = deadlineEpochMs + HEARTBEAT_INTERVAL_MS;
+    if (nextDeadline > nowEpochMs) {
+        return nextDeadline;
+    }
+    const missedIntervals =
+        Math.floor((nowEpochMs - nextDeadline) / HEARTBEAT_INTERVAL_MS) + 1;
+    return nextDeadline + missedIntervals * HEARTBEAT_INTERVAL_MS;
+}
+
+export function assertCompleteM3uImportRendererProbe(
+    probe: M3uImportRendererProbeMetrics | null | undefined
+): asserts probe is M3uImportRendererProbeMetrics & {
+    readonly firstChannelVisibleEpochMs: number;
+    readonly playlistId: string;
+    readonly routeReadyEpochMs: number;
+    readonly terminalEpochMs: number;
+    readonly uiPaintedEpochMs: number;
+} {
+    if (
+        !probe ||
+        typeof probe.playlistId !== 'string' ||
+        probe.playlistId.length === 0 ||
+        !isPositiveFinite(probe.operationStartEpochMs) ||
+        !isPositiveFinite(probe.routeReadyEpochMs) ||
+        !isPositiveFinite(probe.firstChannelVisibleEpochMs) ||
+        !isPositiveFinite(probe.uiPaintedEpochMs) ||
+        !isPositiveFinite(probe.terminalEpochMs)
+    ) {
+        throw new Error('m3u-import-renderer-probe-incomplete');
+    }
+    if (
+        probe.routeReadyEpochMs < probe.operationStartEpochMs ||
+        probe.firstChannelVisibleEpochMs < probe.routeReadyEpochMs ||
+        probe.uiPaintedEpochMs < probe.firstChannelVisibleEpochMs ||
+        probe.terminalEpochMs < probe.uiPaintedEpochMs
+    ) {
+        throw new Error('m3u-import-renderer-probe-incomplete');
+    }
+}
+
+function throwCaptureError(error: unknown, label: string): void {
+    if (error instanceof Error) {
+        throw error;
+    }
+    if (error !== null) {
+        throw new Error(`${label}: ${String(error)}`);
+    }
+}
+
+function continueBestEffort(work: () => Promise<unknown>): void {
+    try {
+        void work().catch(() => undefined);
+    } catch {
+        // The owning Electron app is closed immediately after abort cleanup.
+    }
+}
+
+function isPositiveFinite(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value > 0;
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-renderer-probe.ts b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-probe.ts
new file mode 100644
index 000000000..599abb88a
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-renderer-probe.ts
@@ -0,0 +1,378 @@
+import type { Page } from '@playwright/test';
+import {
+    RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+    type RendererPerformancePhaseEvent,
+    type RendererPerformancePhaseHook,
+} from '@iptvnator/shared/logging';
+
+export const M3U_IMPORT_RENDERER_STATE_KEY =
+    '__iptvnatorM3uImportRendererCapture';
+
+export interface M3uImportDialogOptions {
+    readonly playlistTitle: string;
+    readonly playlistUrl: string;
+}
+
+export interface M3uImportRendererProbeMetrics {
+    readonly firstChannelVisibleEpochMs: number | null;
+    readonly frameGapsMs: readonly number[];
+    readonly heartbeatDelaysMs: readonly number[];
+    readonly longTasksMs: readonly number[];
+    readonly operationStartEpochMs: number;
+    readonly performancePhaseEvents: readonly RendererPerformancePhaseEvent[];
+    readonly playlistId: string | null;
+    readonly routeReadyEpochMs: number | null;
+    readonly terminalEpochMs: number | null;
+    readonly uiPaintedEpochMs: number | null;
+}
+
+export async function prepareM3uImportDialog(
+    page: Page,
+    options: M3uImportDialogOptions
+): Promise<void> {
+    await page.getByRole('button', { name: 'Add playlist' }).first().click();
+    const dialog = page.locator('mat-dialog-container').last();
+    await dialog.waitFor({ state: 'visible' });
+    await dialog
+        .getByRole('textbox', { name: 'Playlist URL (m3u, m3u8)' })
+        .fill(options.playlistUrl);
+    await dialog
+        .getByRole('textbox', { name: 'Playlist title' })
+        .fill(options.playlistTitle);
+    const submit = dialog.getByRole('button', { name: 'Add playlist' }).last();
+    await submit.waitFor({ state: 'visible' });
+    if (await submit.isDisabled()) {
+        throw new Error('m3u-import-final-add-disabled');
+    }
+}
+
+export async function installM3uImportRendererProbe(page: Page): Promise<void> {
+    await page.evaluate(
+        ({ hookKey, stateKey }) => {
+            interface ProbeState {
+                firstChannelVisibleEpochMs: number | null;
+                frameGapsMs: number[];
+                frameRequestId: number;
+                heartbeatDelaysMs: number[];
+                lastFrameAt: number | null;
+                longTaskObserver: PerformanceObserver | null;
+                longTasksMs: number[];
+                operationStartEpochMs: number;
+                operationStartMonotonicMs: number;
+                performancePhaseEvents: RendererPerformancePhaseEvent[];
+                playlistId: string | null;
+                recordFrameGap(timestamp: number): void;
+                recordLongTask(entry: PerformanceEntry): void;
+                routeReadyEpochMs: number | null;
+                terminalEpochMs: number | null;
+                uiPaintFrameRequestId: number | null;
+                uiPaintedEpochMs: number | null;
+            }
+            const target = globalThis as unknown as Record<
+                PropertyKey,
+                unknown
+            >;
+            const hookSymbol = Symbol.for(hookKey);
+            if (
+                target[stateKey] !== undefined ||
+                target[hookSymbol] !== undefined
+            ) {
+                throw new Error('m3u-import-renderer-probe-already-installed');
+            }
+            const epoch = (): number =>
+                performance.timeOrigin + performance.now();
+            const state: ProbeState = {
+                firstChannelVisibleEpochMs: null,
+                frameGapsMs: [],
+                frameRequestId: 0,
+                heartbeatDelaysMs: [],
+                lastFrameAt: null,
+                longTaskObserver: null,
+                longTasksMs: [],
+                operationStartEpochMs: 0,
+                operationStartMonotonicMs: 0,
+                performancePhaseEvents: [],
+                playlistId: null,
+                recordFrameGap: (timestamp) => {
+                    const previousFrameAt = state.lastFrameAt;
+                    state.lastFrameAt = timestamp;
+                    if (
+                        previousFrameAt === null ||
+                        state.operationStartEpochMs <= 0 ||
+                        state.terminalEpochMs !== null
+                    ) {
+                        return;
+                    }
+                    const measuredFrameStart = Math.max(
+                        previousFrameAt,
+                        state.operationStartMonotonicMs
+                    );
+                    if (timestamp > measuredFrameStart) {
+                        state.frameGapsMs.push(timestamp - measuredFrameStart);
+                    }
+                },
+                recordLongTask: (entry) => {
+                    const entryEpochMs =
+                        performance.timeOrigin + entry.startTime;
+                    const measuredStartEpochMs = Math.max(
+                        entryEpochMs,
+                        state.operationStartEpochMs
+                    );
+                    const measuredEndEpochMs = Math.min(
+                        entryEpochMs + entry.duration,
+                        state.terminalEpochMs ?? Number.POSITIVE_INFINITY
+                    );
+                    if (
+                        state.operationStartEpochMs > 0 &&
+                        measuredEndEpochMs > measuredStartEpochMs
+                    ) {
+                        state.longTasksMs.push(
+                            measuredEndEpochMs - measuredStartEpochMs
+                        );
+                    }
+                },
+                routeReadyEpochMs: null,
+                terminalEpochMs: null,
+                uiPaintFrameRequestId: null,
+                uiPaintedEpochMs: null,
+            };
+            const performancePhaseHook: RendererPerformancePhaseHook = (
+                event
+            ) => {
+                state.performancePhaseEvents.push(event);
+            };
+            target[hookSymbol] = performancePhaseHook;
+            const terminalTarget = (): string | null => {
+                const route = location.pathname.match(
+                    /\/workspace\/playlists\/([^/]+)\/all$/
+                );
+                if (
+                    !route ||
+                    !document.querySelector('[data-test-id="channel-item"]')
+                ) {
+                    return null;
+                }
+                return route[1] ?? null;
+            };
+            const inspectTerminal = (): void => {
+                if (
+                    state.operationStartEpochMs <= 0 ||
+                    state.terminalEpochMs !== null
+                ) {
+                    return;
+                }
+                const route = location.pathname.match(
+                    /\/workspace\/playlists\/([^/]+)\/all$/
+                );
+                if (!route) {
+                    return;
+                }
+                state.routeReadyEpochMs ??= epoch();
+                if (!document.querySelector('[data-test-id="channel-item"]')) {
+                    return;
+                }
+                state.firstChannelVisibleEpochMs ??= epoch();
+                if (state.uiPaintFrameRequestId !== null) {
+                    return;
+                }
+                state.uiPaintFrameRequestId = requestAnimationFrame(() => {
+                    state.uiPaintFrameRequestId = requestAnimationFrame(
+                        (terminalFrameAt) => {
+                            state.uiPaintFrameRequestId = null;
+                            const playlistId = terminalTarget();
+                            if (playlistId === null) {
+                                return;
+                            }
+                            state.recordFrameGap(terminalFrameAt);
+                            state.playlistId = playlistId;
+                            state.uiPaintedEpochMs = epoch();
+                            state.terminalEpochMs = state.uiPaintedEpochMs;
+                            cancelAnimationFrame(state.frameRequestId);
+                            state.frameRequestId = 0;
+                            for (const entry of state.longTaskObserver?.takeRecords() ??
+                                []) {
+                                state.recordLongTask(entry);
+                            }
+                            state.longTaskObserver?.disconnect();
+                            state.longTaskObserver = null;
+                        }
+                    );
+                });
+            };
+            const frame = (timestamp: number): void => {
+                state.recordFrameGap(timestamp);
+                if (state.operationStartEpochMs > 0) {
+                    inspectTerminal();
+                }
+                state.frameRequestId =
+                    state.terminalEpochMs === null
+                        ? requestAnimationFrame(frame)
+                        : 0;
+            };
+            state.frameRequestId = requestAnimationFrame(frame);
+            if (
+                typeof PerformanceObserver === 'function' &&
+                PerformanceObserver.supportedEntryTypes.includes('longtask')
+            ) {
+                state.longTaskObserver = new PerformanceObserver((list) => {
+                    for (const entry of list.getEntries()) {
+                        state.recordLongTask(entry);
+                    }
+                });
+                state.longTaskObserver.observe({ entryTypes: ['longtask'] });
+            }
+            target[stateKey] = state;
+        },
+        {
+            hookKey: RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+            stateKey: M3U_IMPORT_RENDERER_STATE_KEY,
+        }
+    );
+}
+
+export async function triggerM3uImport(page: Page): Promise<number> {
+    return page.evaluate((stateKey) => {
+        const target = globalThis as unknown as Record<string, unknown>;
+        const state = target[stateKey] as
+            | {
+                  operationStartEpochMs: number;
+                  operationStartMonotonicMs: number;
+              }
+            | undefined;
+        if (!state || state.operationStartEpochMs > 0) {
+            throw new Error('m3u-import-renderer-probe-unavailable');
+        }
+        const dialogs = Array.from(
+            document.querySelectorAll('mat-dialog-container')
+        );
+        const dialog = dialogs.at(-1);
+        const button = Array.from(dialog?.querySelectorAll('button') ?? [])
+            .reverse()
+            .find(
+                (candidate) =>
+                    candidate.textContent?.trim() === 'Add playlist' &&
+                    !candidate.disabled
+            );
+        if (!(button instanceof HTMLButtonElement)) {
+            throw new Error('m3u-import-final-add-unavailable');
+        }
+        state.operationStartMonotonicMs = performance.now();
+        state.operationStartEpochMs =
+            performance.timeOrigin + state.operationStartMonotonicMs;
+        button.click();
+        return state.operationStartEpochMs;
+    }, M3U_IMPORT_RENDERER_STATE_KEY);
+}
+
+export async function recordM3uImportHeartbeat(
+    page: Page,
+    deadlineEpochMs: number
+): Promise<void> {
+    await page.evaluate(
+        ({ deadlineEpochMs, stateKey }) => {
+            const target = globalThis as unknown as Record<string, unknown>;
+            const state = target[stateKey] as
+                | {
+                      heartbeatDelaysMs: number[];
+                      operationStartEpochMs: number;
+                      terminalEpochMs: number | null;
+                  }
+                | undefined;
+            if (!state || state.operationStartEpochMs <= 0) {
+                throw new Error('m3u-import-renderer-probe-unavailable');
+            }
+            if (
+                deadlineEpochMs >= state.operationStartEpochMs &&
+                (state.terminalEpochMs === null ||
+                    deadlineEpochMs <= state.terminalEpochMs)
+            ) {
+                const receivedEpochMs =
+                    performance.timeOrigin + performance.now();
+                const measuredEpochMs =
+                    state.terminalEpochMs === null
+                        ? receivedEpochMs
+                        : Math.min(receivedEpochMs, state.terminalEpochMs);
+                state.heartbeatDelaysMs.push(
+                    Math.max(0, measuredEpochMs - deadlineEpochMs)
+                );
+            }
+        },
+        { deadlineEpochMs, stateKey: M3U_IMPORT_RENDERER_STATE_KEY }
+    );
+}
+
+export async function waitForM3uImportTerminal(page: Page): Promise<void> {
+    await page
+        .waitForFunction(
+            (stateKey) => {
+                const target = globalThis as unknown as Record<string, unknown>;
+                const state = target[stateKey] as
+                    { terminalEpochMs: number | null } | undefined;
+                return typeof state?.terminalEpochMs === 'number';
+            },
+            M3U_IMPORT_RENDERER_STATE_KEY,
+            { timeout: 120_000 }
+        )
+        .then(() => undefined);
+}
+
+export async function stopM3uImportRendererProbe(
+    page: Page
+): Promise<M3uImportRendererProbeMetrics> {
+    return page.evaluate(
+        ({ hookKey, stateKey }) => {
+            const target = globalThis as unknown as Record<
+                PropertyKey,
+                unknown
+            >;
+            const hookSymbol = Symbol.for(hookKey);
+            const state = target[stateKey] as
+                | {
+                      firstChannelVisibleEpochMs: number | null;
+                      frameGapsMs: number[];
+                      frameRequestId: number;
+                      heartbeatDelaysMs: number[];
+                      longTaskObserver: PerformanceObserver | null;
+                      longTasksMs: number[];
+                      operationStartEpochMs: number;
+                      performancePhaseEvents: RendererPerformancePhaseEvent[];
+                      playlistId: string | null;
+                      recordLongTask(entry: PerformanceEntry): void;
+                      routeReadyEpochMs: number | null;
+                      terminalEpochMs: number | null;
+                      uiPaintFrameRequestId: number | null;
+                      uiPaintedEpochMs: number | null;
+                  }
+                | undefined;
+            if (!state) {
+                throw new Error('m3u-import-renderer-probe-unavailable');
+            }
+            cancelAnimationFrame(state.frameRequestId);
+            if (state.uiPaintFrameRequestId !== null) {
+                cancelAnimationFrame(state.uiPaintFrameRequestId);
+            }
+            for (const entry of state.longTaskObserver?.takeRecords() ?? []) {
+                state.recordLongTask(entry);
+            }
+            state.longTaskObserver?.disconnect();
+            delete target[stateKey];
+            delete target[hookSymbol];
+            return {
+                firstChannelVisibleEpochMs: state.firstChannelVisibleEpochMs,
+                frameGapsMs: [...state.frameGapsMs],
+                heartbeatDelaysMs: [...state.heartbeatDelaysMs],
+                longTasksMs: [...state.longTasksMs],
+                operationStartEpochMs: state.operationStartEpochMs,
+                performancePhaseEvents: [...state.performancePhaseEvents],
+                playlistId: state.playlistId,
+                routeReadyEpochMs: state.routeReadyEpochMs,
+                terminalEpochMs: state.terminalEpochMs,
+                uiPaintedEpochMs: state.uiPaintedEpochMs,
+            };
+        },
+        {
+            hookKey: RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+            stateKey: M3U_IMPORT_RENDERER_STATE_KEY,
+        }
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-report.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-report.spec.ts
new file mode 100644
index 000000000..951030aed
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-report.spec.ts
@@ -0,0 +1,338 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import type { MainCaptureMetrics } from './m3u-refresh-cancellation-contract';
+import { deriveM3uImportPhaseMetrics } from './m3u-import-report';
+import {
+    createTestMainCapture,
+    createTestRendererCapture,
+    TEST_M3U_CHANNEL_COUNT,
+    TEST_M3U_FIXTURE_BYTES,
+} from './m3u-import-report.test-helpers';
+
+describe('formal M3U import phase report', () => {
+    it('attributes every required phase without presenting indexes as zero work', () => {
+        const phases = deriveM3uImportPhaseMetrics({
+            channelCount: TEST_M3U_CHANNEL_COUNT,
+            fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+            main: createTestMainCapture(),
+            renderer: createTestRendererCapture(),
+        });
+
+        assert.deepEqual(phases, {
+            angularRenderingMs: 10,
+            dataAcquireMs: 20,
+            databaseWorkerToMainCloneProxyMs: 12,
+            indexAndCommitMs: null,
+            indexAndCommitUnavailableReason:
+                'indexes-not-created-during-import;sqlite-autocommit-included-in-sqlite-write',
+            ipcStructuredCloneProxyMs: 44,
+            mainToDatabaseWorkerCloneProxyMs: 2,
+            mainToRendererCloneProxyMs: 28,
+            m3uParsingMs: 40,
+            normalizationMs: 10,
+            playlistDeserializationMs: 12,
+            playlistSerializationMs: 20,
+            rendererToMainCloneProxyMs: 2,
+            sqliteReadMs: 5,
+            sqliteWriteMs: 30,
+            storeImportDispatchMs: 2,
+            storePublishChannelsMs: 10,
+            storeUpdateMs: 12,
+            totalMs: 215,
+        });
+        assert.equal(
+            phases.ipcStructuredCloneProxyMs,
+            phases.mainToRendererCloneProxyMs +
+                phases.rendererToMainCloneProxyMs +
+                phases.mainToDatabaseWorkerCloneProxyMs +
+                phases.databaseWorkerToMainCloneProxyMs
+        );
+    });
+
+    it('fails closed when any structured-clone boundary is missing, ambiguous, or out of order', () => {
+        const main = createTestMainCapture();
+        const databaseWorker = main.workers[0];
+        const upsert = databaseWorker?.requests[0];
+        assert.ok(databaseWorker);
+        assert.ok(upsert);
+
+        for (const invalidMain of [
+            {
+                ...main,
+                timeline: main.timeline.filter(
+                    (event) => event.type !== 'db-request'
+                ),
+            },
+            {
+                ...main,
+                timeline: [
+                    ...main.timeline,
+                    main.timeline.find((event) => event.type === 'db-request'),
+                ].filter(
+                    (event): event is (typeof main.timeline)[number] =>
+                        event !== undefined
+                ),
+            },
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: [
+                            {
+                                ...upsert,
+                                sourceEpochMs: 1080,
+                            },
+                            ...databaseWorker.requests.slice(1),
+                        ],
+                    },
+                ],
+            },
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: [
+                            {
+                                ...upsert,
+                                requestReceivedEpochMs: 1078,
+                            },
+                            ...databaseWorker.requests.slice(1),
+                        ],
+                    },
+                ],
+            },
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: [
+                            {
+                                ...upsert,
+                                ipcCallId: null,
+                                operationIdUnavailableReason:
+                                    'preload-performance-marker-missing',
+                                sourceEpochMs: null,
+                            },
+                            ...databaseWorker.requests.slice(1),
+                        ],
+                    },
+                ],
+            },
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: [
+                            {
+                                ...upsert,
+                                workStartedEpochMs: 1079,
+                            },
+                            ...databaseWorker.requests.slice(1),
+                        ],
+                    },
+                ],
+            },
+        ]) {
+            assert.throws(
+                () =>
+                    deriveM3uImportPhaseMetrics({
+                        channelCount: TEST_M3U_CHANNEL_COUNT,
+                        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                        main: invalidMain,
+                        renderer: createTestRendererCapture(),
+                    }),
+                /m3u-import-phase-attribution-invalid/
+            );
+        }
+    });
+
+    it('fails closed when a required phase, worker identity, or fixture count is ambiguous', () => {
+        const missingNormalize = createTestMainCapture();
+        const missingTimeline = missingNormalize.timeline.filter(
+            (event) => event.phase !== 'normalize'
+        );
+        assert.throws(
+            () =>
+                deriveM3uImportPhaseMetrics({
+                    channelCount: TEST_M3U_CHANNEL_COUNT,
+                    fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                    main: {
+                        ...missingNormalize,
+                        timeline: missingTimeline,
+                    },
+                    renderer: createTestRendererCapture(),
+                }),
+            /m3u-import-phase-attribution-invalid/
+        );
+
+        assert.throws(
+            () =>
+                deriveM3uImportPhaseMetrics({
+                    channelCount: TEST_M3U_CHANNEL_COUNT,
+                    fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                    main: {
+                        ...createTestMainCapture(),
+                        workers: [
+                            ...createTestMainCapture().workers,
+                            {
+                                ...createTestMainCapture().workers[0],
+                                ordinal: 2,
+                            },
+                        ],
+                    },
+                    renderer: createTestRendererCapture(),
+                }),
+            /m3u-import-phase-attribution-invalid/
+        );
+
+        const wrongBytes = createTestMainCapture();
+        assert.throws(
+            () =>
+                deriveM3uImportPhaseMetrics({
+                    channelCount: TEST_M3U_CHANNEL_COUNT,
+                    fixtureBytes: TEST_M3U_FIXTURE_BYTES + 1,
+                    main: wrongBytes,
+                    renderer: createTestRendererCapture(),
+                }),
+            /m3u-import-phase-attribution-invalid/
+        );
+    });
+
+    it('requires the route-reload GET and both worker-to-renderer return paths', () => {
+        const main = createTestMainCapture();
+        const databaseWorker = main.workers[0];
+        const upsert = databaseWorker?.requests[0];
+        const get = databaseWorker?.requests[1];
+        assert.ok(databaseWorker);
+        assert.ok(upsert);
+        assert.ok(get);
+
+        const invalidCaptures: MainCaptureMetrics[] = [
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: databaseWorker.requests.slice(0, 1),
+                    },
+                ],
+            },
+            {
+                ...main,
+                timeline: main.timeline.filter(
+                    (event) =>
+                        !(
+                            event.type === 'preload-performance-success' &&
+                            event.operation === 'DB_GET_APP_PLAYLIST'
+                        )
+                ),
+            },
+            {
+                ...main,
+                timeline: main.timeline.filter(
+                    (event) =>
+                        !(
+                            event.type === 'preload-performance-success' &&
+                            event.operation === 'DB_UPSERT_APP_PLAYLIST'
+                        )
+                ),
+            },
+            {
+                ...main,
+                timeline: main.timeline.map((event) =>
+                    event.type === 'preload-performance-success' &&
+                    event.operation === 'DB_GET_APP_PLAYLIST'
+                        ? {
+                              ...event,
+                              sourceEpochMs: 1196,
+                          }
+                        : event
+                ),
+            },
+            {
+                ...main,
+                workers: [
+                    {
+                        ...databaseWorker,
+                        requests: [
+                            upsert,
+                            {
+                                ...get,
+                                responsePostedEpochMs: 1175,
+                            },
+                        ],
+                    },
+                ],
+            },
+        ];
+
+        for (const invalidMain of invalidCaptures) {
+            assert.throws(
+                () =>
+                    deriveM3uImportPhaseMetrics({
+                        channelCount: TEST_M3U_CHANNEL_COUNT,
+                        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                        main: invalidMain,
+                        renderer: createTestRendererCapture(),
+                    }),
+                /m3u-import-phase-attribution-invalid/
+            );
+        }
+    });
+
+    it('rejects playlist workers and cross-playlist database writes', () => {
+        assert.throws(
+            () =>
+                deriveM3uImportPhaseMetrics({
+                    channelCount: TEST_M3U_CHANNEL_COUNT,
+                    fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                    main: {
+                        ...createTestMainCapture(),
+                        workers: [
+                            ...createTestMainCapture().workers,
+                            {
+                                kind: 'playlist-refresh.worker',
+                                requests: [],
+                            },
+                        ],
+                    } as MainCaptureMetrics,
+                    renderer: createTestRendererCapture(),
+                }),
+            /m3u-import-phase-attribution-invalid/
+        );
+
+        const main = createTestMainCapture();
+        const databaseWorker = main.workers[0];
+        assert.ok(databaseWorker);
+        const upsert = databaseWorker.requests[0];
+        assert.ok(upsert);
+        assert.throws(
+            () =>
+                deriveM3uImportPhaseMetrics({
+                    channelCount: TEST_M3U_CHANNEL_COUNT,
+                    fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+                    main: {
+                        ...main,
+                        workers: [
+                            {
+                                ...databaseWorker,
+                                requests: [
+                                    {
+                                        ...upsert,
+                                        playlistId: 'other-playlist',
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                    renderer: createTestRendererCapture(),
+                }),
+            /m3u-import-phase-attribution-invalid/
+        );
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-report.test-helpers.ts b/apps/electron-backend-e2e/src/performance/m3u-import-report.test-helpers.ts
new file mode 100644
index 000000000..e00b7e637
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-report.test-helpers.ts
@@ -0,0 +1,458 @@
+/* eslint-disable max-lines -- The deterministic fixture keeps the full production-shaped import sequence visible. */
+import type { M3uImportRendererCaptureMetrics } from './m3u-import-renderer-capture';
+import type { MainCaptureMetrics } from './m3u-refresh-cancellation-contract';
+import type { M3uImportBenchmarkManifest } from './m3u-import-summary';
+
+export const TEST_M3U_CHANNEL_COUNT = 10_000;
+export const TEST_M3U_FIXTURE_BYTES = 1_024_000;
+
+export function createTestMainCapture(): MainCaptureMetrics {
+    return {
+        timeline: [
+            mainPhase('start', 'data.acquire', 1001, null),
+            mainPhase('end', 'data.acquire', 1021, 20, {
+                byteCount: TEST_M3U_FIXTURE_BYTES,
+            }),
+            mainPhase('start', 'parse.m3u', 1021, null),
+            mainPhase('end', 'parse.m3u', 1061, 40, {
+                itemCount: TEST_M3U_CHANNEL_COUNT,
+            }),
+            mainPhase('start', 'normalize', 1061, null),
+            mainPhase('end', 'normalize', 1071, 10, {
+                itemCount: TEST_M3U_CHANNEL_COUNT,
+            }),
+            {
+                epochMs: 1080,
+                ipcCallId: 7,
+                operation: 'DB_UPSERT_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                requestId: 'db-request-1',
+                sourceEpochMs: 1079,
+                type: 'db-request',
+            },
+            {
+                epochMs: 1137,
+                operation: 'DB_UPSERT_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                requestId: 'db-request-1',
+                success: true,
+                type: 'db-response',
+            },
+            {
+                epochMs: 1140,
+                ipcCallId: 7,
+                operation: 'DB_UPSERT_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                sourceEpochMs: 1140,
+                success: true,
+                type: 'preload-performance-success',
+            },
+            {
+                epochMs: 1142,
+                ipcCallId: 8,
+                operation: 'DB_GET_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                requestId: 'db-request-2',
+                sourceEpochMs: 1141,
+                type: 'db-request',
+            },
+            {
+                epochMs: 1174,
+                operation: 'DB_GET_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                requestId: 'db-request-2',
+                success: true,
+                type: 'db-response',
+            },
+            {
+                epochMs: 1194,
+                ipcCallId: 8,
+                operation: 'DB_GET_APP_PLAYLIST',
+                playlistId: 'playlist-1',
+                sourceEpochMs: 1194,
+                success: true,
+                type: 'preload-performance-success',
+            },
+        ],
+        workers: [
+            {
+                kind: 'database.worker',
+                requests: [
+                    {
+                        ipcCallId: 7,
+                        operation: 'DB_UPSERT_APP_PLAYLIST',
+                        operationId: null,
+                        operationIdUnavailableReason:
+                            'preload-performance-marker-uncorrelated',
+                        performanceCaptureUnavailableReason: null,
+                        phaseEvents: [
+                            workerPhase(
+                                'start',
+                                'serialize.playlist',
+                                1082,
+                                null,
+                                'db-request-1'
+                            ),
+                            workerPhase(
+                                'end',
+                                'serialize.playlist',
+                                1102,
+                                20,
+                                'db-request-1',
+                                {
+                                    itemCount: TEST_M3U_CHANNEL_COUNT,
+                                }
+                            ),
+                            workerPhase(
+                                'start',
+                                'sqlite.write',
+                                1102,
+                                null,
+                                'db-request-1'
+                            ),
+                            workerPhase(
+                                'end',
+                                'sqlite.write',
+                                1132,
+                                30,
+                                'db-request-1',
+                                {
+                                    itemCount: 1,
+                                }
+                            ),
+                        ],
+                        playlistId: 'playlist-1',
+                        requestId: 'db-request-1',
+                        requestReceivedEpochMs: 1081,
+                        responseEpochMs: 1137,
+                        responsePostedEpochMs: 1135,
+                        sourceEpochMs: 1079,
+                        success: true,
+                        workEndedEpochMs: 1133,
+                        workStartedEpochMs: 1082,
+                    },
+                    {
+                        ipcCallId: 8,
+                        operation: 'DB_GET_APP_PLAYLIST',
+                        operationId: null,
+                        operationIdUnavailableReason:
+                            'preload-performance-marker-uncorrelated',
+                        performanceCaptureUnavailableReason: null,
+                        phaseEvents: [
+                            workerPhase(
+                                'start',
+                                'sqlite.read',
+                                1144,
+                                null,
+                                'db-request-2'
+                            ),
+                            workerPhase(
+                                'end',
+                                'sqlite.read',
+                                1149,
+                                5,
+                                'db-request-2',
+                                {
+                                    itemCount: 1,
+                                }
+                            ),
+                            workerPhase(
+                                'start',
+                                'deserialize.playlist',
+                                1149,
+                                null,
+                                'db-request-2'
+                            ),
+                            workerPhase(
+                                'end',
+                                'deserialize.playlist',
+                                1161,
+                                12,
+                                'db-request-2',
+                                {
+                                    itemCount: TEST_M3U_CHANNEL_COUNT,
+                                }
+                            ),
+                        ],
+                        playlistId: 'playlist-1',
+                        requestId: 'db-request-2',
+                        requestReceivedEpochMs: 1143,
+                        responseEpochMs: 1174,
+                        responsePostedEpochMs: 1164,
+                        sourceEpochMs: 1141,
+                        success: true,
+                        workEndedEpochMs: 1162,
+                        workStartedEpochMs: 1144,
+                    },
+                ],
+            },
+        ],
+    } as unknown as MainCaptureMetrics;
+}
+
+export function createTestRendererCapture(): M3uImportRendererCaptureMetrics {
+    return {
+        phaseTimestamps: {
+            firstChannelVisibleEpochMs: 1210,
+            operationStartEpochMs: 1000,
+            routeReadyEpochMs: 1140,
+            terminalEpochMs: 1215,
+            uiPaintedEpochMs: 1215,
+        },
+        probe: {
+            performancePhaseEvents: [
+                rendererPhase(
+                    'start',
+                    'store.m3u-import-dispatch',
+                    'renderer-1',
+                    1076,
+                    76
+                ),
+                rendererPhase(
+                    'end',
+                    'store.m3u-import-dispatch',
+                    'renderer-1',
+                    1078,
+                    78
+                ),
+                rendererPhase(
+                    'start',
+                    'store.m3u-publish-channels',
+                    'renderer-2',
+                    1195,
+                    195,
+                    TEST_M3U_CHANNEL_COUNT
+                ),
+                rendererPhase(
+                    'end',
+                    'store.m3u-publish-channels',
+                    'renderer-2',
+                    1205,
+                    205,
+                    TEST_M3U_CHANNEL_COUNT
+                ),
+            ],
+            playlistId: 'playlist-1',
+        },
+    } as unknown as M3uImportRendererCaptureMetrics;
+}
+
+export function createCompleteTestMainCapture(
+    overrides: { mainRss?: number; rendererRss?: number } = {}
+): MainCaptureMetrics {
+    const base = createTestMainCapture();
+    const databaseWorker = base.workers[0];
+    const upsert = databaseWorker?.requests[0];
+    const get = databaseWorker?.requests[1];
+    if (!databaseWorker || !upsert || !get) {
+        throw new Error('invalid-test-main-capture');
+    }
+    return {
+        ...base,
+        cpuProfilePath: null,
+        cpuSystemMicros: 20,
+        cpuUserMicros: 30,
+        eventLoopDelay: { maxMs: 3, p95Ms: 1, p99Ms: 2 },
+        eventLoopUtilization: null,
+        eventLoopUtilizationUnavailableReason:
+            'electron-main-embedded-event-loop',
+        heapSnapshotPath: null,
+        memory: {
+            peakHeapUsedBytes: 2_000,
+            peakRssBytes: overrides.mainRss ?? 5_000,
+            postGcHeapUsedBytes: 1_000,
+            postGcRssBytes: 4_500,
+        },
+        rendererWindow: {
+            responsiveEvents: 0,
+            rss: {
+                identity: { creationTime: 100, pid: 42 },
+                missingSampleCount: 0,
+                peakRssBytes: overrides.rendererRss ?? 4_000,
+                unavailableReason: null,
+                validSampleCount: 5,
+            },
+            unresponsiveEvents: 0,
+            windowIdentity: {
+                browserWindowId: 1,
+                webContentsId: 2,
+            },
+        },
+        rssScope:
+            'electron-main-process-including-worker-threads-and-native-memory',
+        workers: [
+            {
+                ...databaseWorker,
+                externalMemorySampleCount: 4,
+                heapUsedSampleCount: 4,
+                peakExternalBytes: 600,
+                peakExternalUnavailableReason: null,
+                peakHeapUsedBytes: 1_500,
+                peakHeapUsedUnavailableReason: null,
+                postGcHeapUnavailableReason: null,
+                postGcHeapUsedBytes: 900,
+                requests: [
+                    {
+                        ...upsert,
+                        eventLoopDelay: { maxMs: 6, p95Ms: 4, p99Ms: 5 },
+                        eventLoopDelayUnavailableReason: null,
+                        eventLoopUtilization: 0.8,
+                        eventLoopUtilizationUnavailableReason: null,
+                        histogramFlushedEpochMs: 1134,
+                        invalidReason: null,
+                        threadCpuSystemMicros: 40,
+                        threadCpuUnavailableReason: null,
+                        threadCpuUserMicros: 50,
+                    },
+                    {
+                        ...get,
+                        eventLoopDelay: { maxMs: 9, p95Ms: 7, p99Ms: 8 },
+                        eventLoopDelayUnavailableReason: null,
+                        eventLoopUtilization: 0.9,
+                        eventLoopUtilizationUnavailableReason: null,
+                        histogramFlushedEpochMs: 1163,
+                        invalidReason: null,
+                        threadCpuSystemMicros: 60,
+                        threadCpuUnavailableReason: null,
+                        threadCpuUserMicros: 70,
+                    },
+                ],
+            },
+        ],
+    };
+}
+
+export function createCompleteTestRendererCapture(
+    overrides: { rendererHeap?: number } = {}
+): M3uImportRendererCaptureMetrics {
+    const base = createTestRendererCapture();
+    return {
+        ...base,
+        cpuProfilePath: null,
+        frameGap: distribution([16, 40]),
+        heapSnapshotPath: null,
+        heartbeatDelay: distribution([0, 5]),
+        longTask: distribution([60]),
+        peakHeapUsedBytes: overrides.rendererHeap ?? 3_000,
+        postGcHeapUsedBytes: 1_100,
+        probe: {
+            ...base.probe,
+            firstChannelVisibleEpochMs: 1210,
+            frameGapsMs: [16, 40],
+            heartbeatDelaysMs: [0, 5],
+            longTasksMs: [60],
+            operationStartEpochMs: 1000,
+            routeReadyEpochMs: 1140,
+            terminalEpochMs: 1215,
+            uiPaintedEpochMs: 1215,
+        },
+        tracePath: null,
+    };
+}
+
+export function createTestM3uImportManifest(): M3uImportBenchmarkManifest {
+    return {
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        fixtureSha256: 'fixture-sha',
+        gitCommit: 'commit',
+        gitDiffSha256: 'diff',
+        gitDirty: false,
+        measuredRuns: 1,
+        memoryAccounting: {
+            databaseWorkerRss: 'unavailable-per-worker-thread',
+            mainRss:
+                'electron-main-process-including-worker-threads-and-native-memory',
+            nativeAndSqliteMemory:
+                'included-in-main-rss-not-separately-attributable',
+            rendererRss: 'separate-renderer-process',
+            workerJsHeap: 'separate-v8-isolate',
+        },
+        runtime: {
+            arch: 'arm64',
+            cdpPort: 9222,
+            electronVersion: '1',
+            harnessNodeVersion: '1',
+            platform: 'darwin',
+        },
+        scenario: 'm3u-import-10k',
+        syntheticSeed: 240_724,
+        variant: 'baseline',
+        warmupRuns: 1,
+    };
+}
+
+function mainPhase(
+    boundary: 'end' | 'start',
+    phase: string,
+    epochMs: number,
+    durationMs: number | null,
+    metadata: { byteCount?: number; itemCount?: number } = {}
+) {
+    return {
+        boundary,
+        durationMs,
+        epochMs,
+        ...metadata,
+        phase,
+        requestId: 'main-request-1',
+        type: 'm3u-import-phase',
+    };
+}
+
+function workerPhase(
+    boundary: 'end' | 'start',
+    phase:
+        | 'deserialize.playlist'
+        | 'serialize.playlist'
+        | 'sqlite.read'
+        | 'sqlite.write',
+    epochMs: number,
+    durationMs: number | null,
+    requestId: string,
+    metadata?: { byteCount?: number; itemCount?: number }
+) {
+    return {
+        boundary,
+        durationMs,
+        epochMs,
+        ...(metadata ? { metadata } : {}),
+        phase,
+        requestId,
+    };
+}
+
+function rendererPhase(
+    boundary: 'end' | 'start',
+    phase: 'store.m3u-import-dispatch' | 'store.m3u-publish-channels',
+    phaseId: string,
+    epochMs: number,
+    monotonicMs: number,
+    items?: number
+) {
+    return {
+        boundary,
+        epochMs,
+        ...(items === undefined ? {} : { metadata: { items } }),
+        monotonicMs,
+        ...(boundary === 'end' ? { outcome: 'success' as const } : {}),
+        phase,
+        phaseId,
+        schemaVersion: 1 as const,
+    };
+}
+
+function distribution(values: readonly number[]) {
+    const min = Math.min(...values);
+    const max = Math.max(...values);
+    const mean = values.reduce((sum, value) => sum + value, 0) / values.length;
+    return {
+        count: values.length,
+        max,
+        mean,
+        median: mean,
+        min,
+        p95: values.length === 1 ? max : min + (max - min) * 0.95,
+        p99: values.length === 1 ? max : min + (max - min) * 0.99,
+    };
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-report.ts b/apps/electron-backend-e2e/src/performance/m3u-import-report.ts
new file mode 100644
index 000000000..9fb2fe9a3
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-report.ts
@@ -0,0 +1,367 @@
+import {
+    APP_PLAYLIST_GET_PERFORMANCE_PHASE,
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    M3U_IMPORT_PERFORMANCE_PHASE,
+} from '@iptvnator/shared/interfaces';
+
+import type { M3uImportRendererCaptureMetrics } from './m3u-import-renderer-capture';
+import type {
+    MainCaptureMetrics,
+    MainTimelineRecord,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import { deriveM3uImportIpcAttribution } from './m3u-import-ipc-attribution';
+import {
+    pairPerformancePhaseEvents,
+    requirePerformancePhase,
+    type PairedPerformancePhase,
+} from './performance-phase-events';
+import {
+    pairRendererPerformancePhaseEvents,
+    requireRendererPerformancePhase,
+} from './renderer-performance-phase-events';
+
+export const M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON =
+    'indexes-not-created-during-import;sqlite-autocommit-included-in-sqlite-write';
+
+export interface M3uImportPhaseMetrics {
+    readonly angularRenderingMs: number;
+    readonly dataAcquireMs: number;
+    readonly databaseWorkerToMainCloneProxyMs: number;
+    readonly indexAndCommitMs: null;
+    readonly indexAndCommitUnavailableReason: typeof M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON;
+    readonly ipcStructuredCloneProxyMs: number;
+    readonly mainToDatabaseWorkerCloneProxyMs: number;
+    readonly mainToRendererCloneProxyMs: number;
+    readonly m3uParsingMs: number;
+    readonly normalizationMs: number;
+    readonly playlistDeserializationMs: number;
+    readonly playlistSerializationMs: number;
+    readonly rendererToMainCloneProxyMs: number;
+    readonly sqliteReadMs: number;
+    readonly sqliteWriteMs: number;
+    readonly storeImportDispatchMs: number;
+    readonly storePublishChannelsMs: number;
+    readonly storeUpdateMs: number;
+    readonly totalMs: number;
+}
+
+export interface M3uImportPhaseDerivationInput {
+    readonly channelCount: number;
+    readonly fixtureBytes: number;
+    readonly main: MainCaptureMetrics;
+    readonly renderer: M3uImportRendererCaptureMetrics;
+}
+
+export function deriveM3uImportPhaseMetrics(
+    input: M3uImportPhaseDerivationInput
+): M3uImportPhaseMetrics {
+    try {
+        return deriveM3uImportPhaseMetricsStrict(input);
+    } catch (error: unknown) {
+        const detail = error instanceof Error ? error.message : String(error);
+        throw new Error(`m3u-import-phase-attribution-invalid:${detail}`);
+    }
+}
+
+function deriveM3uImportPhaseMetricsStrict(
+    input: M3uImportPhaseDerivationInput
+): M3uImportPhaseMetrics {
+    requirePositiveSafeCount(input.channelCount, 'channel-count');
+    requirePositiveSafeCount(input.fixtureBytes, 'fixture-bytes');
+
+    const mainPhases = pairPerformancePhaseEvents(
+        input.main.timeline
+            .filter((event) => event.type === 'm3u-import-phase')
+            .map(toPerformancePhaseEvent)
+    );
+    if (mainPhases.length !== 3) {
+        throw new Error('main-phase-cardinality');
+    }
+    const mainRequestIds = new Set(mainPhases.map((phase) => phase.requestId));
+    if (mainRequestIds.size !== 1) {
+        throw new Error('main-request-correlation');
+    }
+    const mainRequestId = mainPhases[0]?.requestId;
+    if (!mainRequestId) {
+        throw new Error('main-request-missing');
+    }
+    const dataAcquire = requirePerformancePhase(
+        mainPhases,
+        mainRequestId,
+        M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE
+    );
+    const parseM3u = requirePerformancePhase(
+        mainPhases,
+        mainRequestId,
+        M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U
+    );
+    const normalize = requirePerformancePhase(
+        mainPhases,
+        mainRequestId,
+        M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE
+    );
+    requireMetadataCount(
+        dataAcquire,
+        'byteCount',
+        input.fixtureBytes,
+        'data-acquire-bytes'
+    );
+    requireMetadataCount(
+        parseM3u,
+        'itemCount',
+        input.channelCount,
+        'parse-items'
+    );
+    requireMetadataCount(
+        normalize,
+        'itemCount',
+        input.channelCount,
+        'normalize-items'
+    );
+    requireOrdered(dataAcquire.endedEpochMs, parseM3u.startedEpochMs);
+    requireOrdered(parseM3u.endedEpochMs, normalize.startedEpochMs);
+
+    const rendererEvents = (
+        input.renderer.probe as typeof input.renderer.probe & {
+            readonly performancePhaseEvents?: readonly unknown[];
+        }
+    ).performancePhaseEvents;
+    if (!rendererEvents) {
+        throw new Error('renderer-phase-events-missing');
+    }
+    const rendererPhases = pairRendererPerformancePhaseEvents(rendererEvents);
+    if (rendererPhases.length !== 2) {
+        throw new Error('renderer-phase-cardinality');
+    }
+    const importDispatch = requireRendererPerformancePhase(
+        rendererPhases,
+        'store.m3u-import-dispatch'
+    );
+    const publishChannels = requireRendererPerformancePhase(
+        rendererPhases,
+        'store.m3u-publish-channels'
+    );
+    requireRendererItems(
+        publishChannels.metadata?.items,
+        input.channelCount,
+        'publish-channels-items'
+    );
+
+    const playlistId = input.renderer.probe.playlistId;
+    if (typeof playlistId !== 'string' || playlistId.length === 0) {
+        throw new Error('renderer-playlist-id-missing');
+    }
+    const databaseWorkers = input.main.workers.filter(
+        (worker) => worker.kind === 'database.worker'
+    );
+    if (
+        databaseWorkers.length !== 1 ||
+        input.main.workers.some(
+            (worker) => worker.kind === 'playlist-refresh.worker'
+        )
+    ) {
+        throw new Error('worker-cardinality');
+    }
+    const databaseWorker = databaseWorkers[0];
+    if (!databaseWorker) {
+        throw new Error('database-worker-missing');
+    }
+    const upserts = databaseWorker.requests.filter(
+        (request) =>
+            request.operation === 'DB_UPSERT_APP_PLAYLIST' &&
+            request.playlistId === playlistId &&
+            request.success
+    );
+    if (upserts.length !== 1 || !upserts[0]) {
+        throw new Error('database-upsert-correlation');
+    }
+    const upsert = upserts[0];
+    const gets = databaseWorker.requests.filter(
+        (request) =>
+            request.operation === 'DB_GET_APP_PLAYLIST' &&
+            request.playlistId === playlistId &&
+            request.success
+    );
+    if (
+        gets.length !== 1 ||
+        !gets[0] ||
+        databaseWorker.requests.length !== 2
+    ) {
+        throw new Error('database-get-correlation');
+    }
+    const get = gets[0];
+    const databasePhases = pairPerformancePhaseEvents(upsert.phaseEvents);
+    if (
+        databasePhases.length !== 2 ||
+        !upsert.requestId ||
+        databasePhases.some((phase) => phase.requestId !== upsert.requestId)
+    ) {
+        throw new Error('database-phase-cardinality');
+    }
+    const serializePlaylist = requireDatabasePhase(
+        databasePhases,
+        upsert,
+        APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST
+    );
+    const sqliteWrite = requireDatabasePhase(
+        databasePhases,
+        upsert,
+        APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE
+    );
+    requireMetadataCount(
+        serializePlaylist,
+        'itemCount',
+        input.channelCount,
+        'serialization-items'
+    );
+    requireMetadataCount(sqliteWrite, 'itemCount', 1, 'sqlite-row-count');
+    const getPhases = pairPerformancePhaseEvents(get.phaseEvents);
+    if (
+        getPhases.length !== 2 ||
+        !get.requestId ||
+        getPhases.some((phase) => phase.requestId !== get.requestId)
+    ) {
+        throw new Error('database-get-phase-cardinality');
+    }
+    const sqliteRead = requireDatabasePhase(
+        getPhases,
+        get,
+        APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ
+    );
+    const deserializePlaylist = requireDatabasePhase(
+        getPhases,
+        get,
+        APP_PLAYLIST_GET_PERFORMANCE_PHASE.DESERIALIZE_PLAYLIST
+    );
+    requireMetadataCount(sqliteRead, 'itemCount', 1, 'sqlite-read-row-count');
+    requireMetadataCount(
+        deserializePlaylist,
+        'itemCount',
+        input.channelCount,
+        'deserialization-items'
+    );
+
+    const operationStart = input.renderer.phaseTimestamps.operationStartEpochMs;
+    const uiPainted = input.renderer.phaseTimestamps.uiPaintedEpochMs;
+    const terminal = input.renderer.phaseTimestamps.terminalEpochMs;
+    requireOrdered(operationStart, dataAcquire.startedEpochMs);
+    requireOrdered(serializePlaylist.endedEpochMs, sqliteWrite.startedEpochMs);
+    requireOrdered(sqliteWrite.endedEpochMs, sqliteRead.startedEpochMs);
+    requireOrdered(sqliteRead.endedEpochMs, deserializePlaylist.startedEpochMs);
+    requireOrdered(
+        deserializePlaylist.endedEpochMs,
+        publishChannels.startedEpochMs
+    );
+    requireOrdered(publishChannels.endedEpochMs, uiPainted);
+    requireOrdered(uiPainted, terminal);
+
+    const ipc = deriveM3uImportIpcAttribution({
+        get,
+        getReadStartedEpochMs: sqliteRead.startedEpochMs,
+        importDispatchEndedEpochMs: importDispatch.endedEpochMs,
+        importDispatchStartedEpochMs: importDispatch.startedEpochMs,
+        normalizeEndedEpochMs: normalize.endedEpochMs,
+        playlistId,
+        publishChannelsStartedEpochMs: publishChannels.startedEpochMs,
+        serializeStartedEpochMs: serializePlaylist.startedEpochMs,
+        timeline: input.main.timeline,
+        upsert,
+    });
+    const angularRenderingMs = difference(
+        uiPainted,
+        publishChannels.endedEpochMs
+    );
+    const totalMs = difference(terminal, operationStart);
+
+    return Object.freeze({
+        angularRenderingMs,
+        dataAcquireMs: dataAcquire.durationMs,
+        indexAndCommitMs: null,
+        indexAndCommitUnavailableReason:
+            M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON,
+        ...ipc,
+        m3uParsingMs: parseM3u.durationMs,
+        normalizationMs: normalize.durationMs,
+        playlistDeserializationMs: deserializePlaylist.durationMs,
+        playlistSerializationMs: serializePlaylist.durationMs,
+        sqliteReadMs: sqliteRead.durationMs,
+        sqliteWriteMs: sqliteWrite.durationMs,
+        storeImportDispatchMs: importDispatch.durationMs,
+        storePublishChannelsMs: publishChannels.durationMs,
+        storeUpdateMs: importDispatch.durationMs + publishChannels.durationMs,
+        totalMs,
+    });
+}
+
+function toPerformancePhaseEvent(event: MainTimelineRecord): unknown {
+    const metadata = {
+        ...(event.byteCount === undefined
+            ? {}
+            : { byteCount: event.byteCount }),
+        ...(event.itemCount === undefined
+            ? {}
+            : { itemCount: event.itemCount }),
+    };
+    return {
+        boundary: event.boundary,
+        durationMs: event.durationMs,
+        epochMs: event.epochMs,
+        ...(Object.keys(metadata).length === 0 ? {} : { metadata }),
+        phase: event.phase,
+        requestId: event.requestId,
+    };
+}
+
+function requireDatabasePhase(
+    phases: readonly PairedPerformancePhase[],
+    request: WorkerRequestPerformanceMetrics,
+    phase: string
+): PairedPerformancePhase {
+    if (!request.requestId) {
+        throw new Error('database-request-id-missing');
+    }
+    return requirePerformancePhase(phases, request.requestId, phase);
+}
+
+function requireMetadataCount(
+    phase: PairedPerformancePhase,
+    key: 'byteCount' | 'itemCount',
+    expected: number,
+    label: string
+): void {
+    if (phase.metadata?.[key] !== expected) {
+        throw new Error(label);
+    }
+}
+
+function requireRendererItems(
+    value: number | undefined,
+    expected: number,
+    label: string
+): void {
+    if (value !== expected) {
+        throw new Error(label);
+    }
+}
+
+function requirePositiveSafeCount(value: number, label: string): void {
+    if (!Number.isSafeInteger(value) || value <= 0) {
+        throw new Error(label);
+    }
+}
+
+function requireOrdered(startEpochMs: number, endEpochMs: number): void {
+    if (
+        !Number.isFinite(startEpochMs) ||
+        !Number.isFinite(endEpochMs) ||
+        endEpochMs < startEpochMs
+    ) {
+        throw new Error('phase-order');
+    }
+}
+
+function difference(endEpochMs: number, startEpochMs: number): number {
+    requireOrdered(startEpochMs, endEpochMs);
+    return endEpochMs - startEpochMs;
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-summary-contract.ts b/apps/electron-backend-e2e/src/performance/m3u-import-summary-contract.ts
new file mode 100644
index 000000000..6f843f8b2
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-summary-contract.ts
@@ -0,0 +1,131 @@
+import type { DatabaseWorkerPeakMemoryValidity } from './database-worker-peak-memory-validity';
+import type { DatabaseWorkerRequestMetricsValidity } from './database-worker-request-metrics-validity';
+import type { M3uImportScenarioId } from './m3u-import-benchmark-contract';
+import type { M3uImportRendererCaptureMetrics } from './m3u-import-renderer-capture';
+import {
+    M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON,
+    type M3uImportPhaseMetrics,
+} from './m3u-import-report';
+import type {
+    DatabaseWorkerPostGcValidity,
+    MainCaptureMetrics,
+    NumericDistribution,
+    PerformanceIterationKind,
+} from './m3u-refresh-cancellation-contract';
+import type { RendererRssValidity } from './renderer-rss-validity';
+
+export interface M3uImportIterationResult {
+    readonly channelCount: number;
+    readonly fixtureBytes: number;
+    readonly kind: PerformanceIterationKind;
+    readonly main: MainCaptureMetrics;
+    readonly phases: M3uImportPhaseMetrics;
+    readonly renderer: M3uImportRendererCaptureMetrics;
+    readonly runId: string;
+    readonly scenarioId: M3uImportScenarioId;
+}
+
+export interface M3uImportBenchmarkManifest {
+    readonly channelCount: number;
+    readonly fixtureBytes: number;
+    readonly fixtureSha256: string;
+    readonly gitCommit: string;
+    readonly gitDiffSha256: string;
+    readonly gitDirty: boolean;
+    readonly measuredRuns: number;
+    readonly memoryAccounting: {
+        readonly databaseWorkerRss: 'unavailable-per-worker-thread';
+        readonly mainRss: 'electron-main-process-including-worker-threads-and-native-memory';
+        readonly nativeAndSqliteMemory: 'included-in-main-rss-not-separately-attributable';
+        readonly rendererRss: 'separate-renderer-process';
+        readonly workerJsHeap: 'separate-v8-isolate';
+    };
+    readonly runtime: {
+        readonly arch: string;
+        readonly cdpPort: number;
+        readonly electronVersion: string;
+        readonly harnessNodeVersion: string;
+        readonly platform: string;
+    };
+    readonly scenario: M3uImportScenarioId;
+    readonly syntheticSeed: number;
+    readonly variant: string;
+    readonly warmupRuns: number;
+}
+
+export interface M3uImportMeasuredSummary {
+    readonly angularRenderingMs: NumericDistribution;
+    readonly dataAcquireMs: NumericDistribution;
+    readonly databaseWorkerGetEventLoopDelayMaxMs: NumericDistribution;
+    readonly databaseWorkerGetEventLoopDelayP95Ms: NumericDistribution;
+    readonly databaseWorkerGetEventLoopDelayP99Ms: NumericDistribution;
+    readonly databaseWorkerGetEventLoopUtilization: NumericDistribution;
+    readonly databaseWorkerGetThreadCpuSystemMicros: NumericDistribution;
+    readonly databaseWorkerGetThreadCpuUserMicros: NumericDistribution;
+    readonly databaseWorkerEventLoopDelayMaxMs: NumericDistribution;
+    readonly databaseWorkerEventLoopDelayP95Ms: NumericDistribution;
+    readonly databaseWorkerEventLoopDelayP99Ms: NumericDistribution;
+    readonly databaseWorkerEventLoopUtilization: NumericDistribution;
+    readonly databaseWorkerExternalPeakBytes: NumericDistribution;
+    readonly databaseWorkerHeapPeakBytes: NumericDistribution;
+    readonly databaseWorkerPostGcHeapBytes: NumericDistribution;
+    readonly databaseWorkerThreadCpuSystemMicros: NumericDistribution;
+    readonly databaseWorkerThreadCpuUserMicros: NumericDistribution;
+    readonly databaseWorkerToMainCloneProxyMs: NumericDistribution;
+    readonly databaseWorkerUpsertEventLoopDelayMaxMs: NumericDistribution;
+    readonly databaseWorkerUpsertEventLoopDelayP95Ms: NumericDistribution;
+    readonly databaseWorkerUpsertEventLoopDelayP99Ms: NumericDistribution;
+    readonly databaseWorkerUpsertEventLoopUtilization: NumericDistribution;
+    readonly databaseWorkerUpsertThreadCpuSystemMicros: NumericDistribution;
+    readonly databaseWorkerUpsertThreadCpuUserMicros: NumericDistribution;
+    readonly ipcStructuredCloneProxyMs: NumericDistribution;
+    readonly mainToDatabaseWorkerCloneProxyMs: NumericDistribution;
+    readonly mainToRendererCloneProxyMs: NumericDistribution;
+    readonly m3uParsingMs: NumericDistribution;
+    readonly mainEventLoopDelayMaxMs: NumericDistribution;
+    readonly mainEventLoopDelayP95Ms: NumericDistribution;
+    readonly mainEventLoopDelayP99Ms: NumericDistribution;
+    readonly mainEventLoopUtilization: NumericDistribution;
+    readonly mainHeapPeakBytes: NumericDistribution;
+    readonly mainHeapPostGcBytes: NumericDistribution;
+    readonly mainRssPeakBytes: NumericDistribution;
+    readonly mainRssPostGcBytes: NumericDistribution;
+    readonly normalizationMs: NumericDistribution;
+    readonly playlistDeserializationMs: NumericDistribution;
+    readonly playlistSerializationMs: NumericDistribution;
+    readonly rendererFrameGapMs: NumericDistribution;
+    readonly rendererHeartbeatDelayMs: NumericDistribution;
+    readonly rendererHeapPeakBytes: NumericDistribution;
+    readonly rendererHeapPostGcBytes: NumericDistribution;
+    readonly rendererLongTaskCount: number;
+    readonly rendererLongTaskMs: NumericDistribution;
+    readonly rendererRssPeakBytes: NumericDistribution;
+    readonly rendererToMainCloneProxyMs: NumericDistribution;
+    readonly responsiveEvents: number;
+    readonly sqliteReadMs: NumericDistribution;
+    readonly sqliteWriteMs: NumericDistribution;
+    readonly storeImportDispatchMs: NumericDistribution;
+    readonly storePublishChannelsMs: NumericDistribution;
+    readonly storeUpdateMs: NumericDistribution;
+    readonly totalMs: NumericDistribution;
+    readonly unresponsiveEvents: number;
+}
+
+export interface M3uImportBenchmarkSummary {
+    readonly iterations: readonly M3uImportIterationResult[];
+    readonly manifest: M3uImportBenchmarkManifest;
+    readonly measured: M3uImportMeasuredSummary;
+    readonly notApplicable: {
+        readonly cancelAcknowledgementLatencyMs: 'scenario-has-no-cancellation';
+        readonly databaseWorkerRss: 'unavailable-per-worker-thread';
+        readonly indexAndCommitMs: typeof M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON;
+        readonly nativeAndSqliteMemory: 'included-in-main-rss-not-separately-attributable';
+        readonly playlistRefreshWorker: 'not-used-by-initial-import';
+    };
+    readonly validity: {
+        readonly databaseWorkerPeakMemory: DatabaseWorkerPeakMemoryValidity;
+        readonly databaseWorkerPostGc: DatabaseWorkerPostGcValidity;
+        readonly databaseWorkerRequestMetrics: DatabaseWorkerRequestMetricsValidity;
+        readonly rendererRss: RendererRssValidity;
+    };
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-summary.spec.ts b/apps/electron-backend-e2e/src/performance/m3u-import-summary.spec.ts
new file mode 100644
index 000000000..558b33365
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-summary.spec.ts
@@ -0,0 +1,247 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { it } from 'node:test';
+
+import { PERFORMANCE_ITERATION_KIND } from './m3u-refresh-cancellation-contract';
+import {
+    createM3uImportBenchmarkSummary,
+    createM3uImportIterationResult,
+    type M3uImportBenchmarkSummary,
+} from './m3u-import-summary';
+import { assertM3uImportComparisonValidity } from './m3u-import.benchmark';
+import {
+    createCompleteTestMainCapture,
+    createCompleteTestRendererCapture,
+    createTestM3uImportManifest,
+    TEST_M3U_CHANNEL_COUNT,
+    TEST_M3U_FIXTURE_BYTES,
+} from './m3u-import-report.test-helpers';
+
+it('keeps summary aggregation below the hard line limit without a suppression', () => {
+    const source = readFileSync(
+        resolve(process.cwd(), 'src/performance/m3u-import-summary.ts'),
+        'utf8'
+    );
+
+    assert.doesNotMatch(source, /eslint-disable max-lines/);
+    assert.ok(source.split(/\r?\n/).length <= 400);
+});
+
+it('summarizes measured runs only while preserving per-process memory boundaries', () => {
+    const warmup = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.WARMUP,
+        main: createCompleteTestMainCapture(),
+        renderer: createCompleteTestRendererCapture(),
+        runId: 'warmup-01',
+        scenarioId: 'm3u-import-10k',
+    });
+    const measured = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: createCompleteTestMainCapture(),
+        renderer: createCompleteTestRendererCapture(),
+        runId: 'run-01',
+        scenarioId: 'm3u-import-10k',
+    });
+    const diagnostic = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+        main: createCompleteTestMainCapture({
+            mainRss: 9_999,
+            rendererRss: 8_888,
+        }),
+        renderer: createCompleteTestRendererCapture({
+            rendererHeap: 7_777,
+        }),
+        runId: 'diagnostic',
+        scenarioId: 'm3u-import-10k',
+    });
+    const summary = createM3uImportBenchmarkSummary(
+        createTestM3uImportManifest(),
+        [warmup, measured, diagnostic]
+    );
+
+    assert.equal(summary.measured.totalMs.count, 1);
+    assert.equal(summary.measured.totalMs.mean, 215);
+    assert.equal(summary.measured.ipcStructuredCloneProxyMs.mean, 44);
+    assert.equal(summary.measured.mainToDatabaseWorkerCloneProxyMs.mean, 2);
+    assert.equal(summary.measured.databaseWorkerToMainCloneProxyMs.mean, 12);
+    assert.equal(summary.measured.mainToRendererCloneProxyMs.mean, 28);
+    assert.equal(summary.measured.rendererToMainCloneProxyMs.mean, 2);
+    assert.equal(summary.measured.sqliteReadMs.mean, 5);
+    assert.equal(summary.measured.playlistDeserializationMs.mean, 12);
+    assert.equal(summary.measured.databaseWorkerThreadCpuSystemMicros.mean, 100);
+    assert.equal(summary.measured.databaseWorkerThreadCpuUserMicros.mean, 120);
+    assert.equal(
+        summary.measured.databaseWorkerUpsertEventLoopDelayP95Ms.mean,
+        4
+    );
+    assert.equal(
+        summary.measured.databaseWorkerGetEventLoopDelayP95Ms.mean,
+        7
+    );
+    assert.equal(summary.measured.mainRssPeakBytes.mean, 5_000);
+    assert.equal(summary.measured.mainHeapPeakBytes.mean, 2_000);
+    assert.equal(summary.measured.rendererRssPeakBytes.mean, 4_000);
+    assert.equal(summary.measured.rendererHeapPeakBytes.mean, 3_000);
+    assert.equal(summary.measured.databaseWorkerHeapPeakBytes.mean, 1_500);
+    assert.equal(summary.measured.databaseWorkerPostGcHeapBytes.mean, 900);
+    assert.equal(summary.measured.rendererLongTaskCount, 1);
+    assert.equal(summary.measured.unresponsiveEvents, 0);
+    assert.deepEqual(summary.notApplicable, {
+        cancelAcknowledgementLatencyMs: 'scenario-has-no-cancellation',
+        databaseWorkerRss: 'unavailable-per-worker-thread',
+        indexAndCommitMs:
+            'indexes-not-created-during-import;sqlite-autocommit-included-in-sqlite-write',
+        nativeAndSqliteMemory:
+            'included-in-main-rss-not-separately-attributable',
+        playlistRefreshWorker: 'not-used-by-initial-import',
+    });
+    assert.equal(summary.validity.rendererRss.validForComparison, true);
+    assert.equal(
+        summary.validity.databaseWorkerPeakMemory.validForComparison,
+        true
+    );
+    assert.equal(
+        summary.validity.databaseWorkerPostGc.validForComparison,
+        true
+    );
+    assert.doesNotThrow(() => assertM3uImportComparisonValidity(summary));
+
+    const databaseWorker = measured.main.workers[0];
+    assert.ok(databaseWorker);
+    const invalidMeasured = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: {
+            ...measured.main,
+            workers: [
+                {
+                    ...databaseWorker,
+                    externalMemorySampleCount: 0,
+                    heapUsedSampleCount: 0,
+                    peakExternalBytes: null,
+                    peakExternalUnavailableReason:
+                        'worker-external-memory-samples-missing',
+                    peakHeapUsedBytes: null,
+                    peakHeapUsedUnavailableReason:
+                        'worker-heap-used-samples-missing',
+                },
+            ],
+        },
+        renderer: measured.renderer,
+        runId: 'run-01',
+        scenarioId: 'm3u-import-10k',
+    });
+    const invalidPeakSummary = createM3uImportBenchmarkSummary(
+        createTestM3uImportManifest(),
+        [warmup, invalidMeasured, diagnostic]
+    );
+    assert.equal(
+        invalidPeakSummary.validity.databaseWorkerPeakMemory.validForComparison,
+        false
+    );
+    assert.equal(
+        invalidPeakSummary.measured.databaseWorkerHeapPeakBytes.count,
+        0
+    );
+    assert.throws(
+        () =>
+            assertM3uImportComparisonValidity(
+                invalidPeakSummary as M3uImportBenchmarkSummary
+            ),
+        /Database worker peak-memory capture is invalid/
+    );
+    assert.throws(
+        () =>
+            createM3uImportBenchmarkSummary(createTestM3uImportManifest(), [
+                measured,
+                diagnostic,
+            ]),
+        /m3u-import-summary-schedule-invalid/
+    );
+});
+
+it('fails comparison when any measured worker request omits mandatory event-loop or CPU metrics', () => {
+    const completeMain = createCompleteTestMainCapture();
+    const databaseWorker = completeMain.workers[0];
+    const get = databaseWorker?.requests[1];
+    assert.ok(databaseWorker);
+    assert.ok(get);
+    const invalidMain = {
+        ...completeMain,
+        workers: [
+            {
+                ...databaseWorker,
+                requests: [
+                    databaseWorker.requests[0],
+                    {
+                        ...get,
+                        eventLoopDelay: null,
+                        eventLoopDelayUnavailableReason:
+                            'event-loop-delay-capture-unavailable',
+                        histogramFlushedEpochMs: null,
+                    },
+                ],
+            },
+        ],
+    };
+    const warmup = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.WARMUP,
+        main: createCompleteTestMainCapture(),
+        renderer: createCompleteTestRendererCapture(),
+        runId: 'warmup-01',
+        scenarioId: 'm3u-import-10k',
+    });
+    const measured = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: invalidMain,
+        renderer: createCompleteTestRendererCapture(),
+        runId: 'run-01',
+        scenarioId: 'm3u-import-10k',
+    });
+    const diagnostic = createM3uImportIterationResult({
+        channelCount: TEST_M3U_CHANNEL_COUNT,
+        fixtureBytes: TEST_M3U_FIXTURE_BYTES,
+        kind: PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+        main: createCompleteTestMainCapture(),
+        renderer: createCompleteTestRendererCapture(),
+        runId: 'diagnostic',
+        scenarioId: 'm3u-import-10k',
+    });
+    const summary = createM3uImportBenchmarkSummary(
+        createTestM3uImportManifest(),
+        [warmup, measured, diagnostic]
+    );
+
+    assert.equal(
+        summary.validity.databaseWorkerRequestMetrics.validForComparison,
+        false
+    );
+    assert.equal(
+        summary.validity.databaseWorkerRequestMetrics.expectedRequestCount,
+        2
+    );
+    assert.equal(
+        summary.validity.databaseWorkerRequestMetrics.validRequestCount,
+        1
+    );
+    assert.equal(
+        summary.measured.databaseWorkerGetEventLoopDelayP95Ms.count,
+        0
+    );
+    assert.throws(
+        () => assertM3uImportComparisonValidity(summary),
+        /Database worker request metrics are invalid/
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import-summary.ts b/apps/electron-backend-e2e/src/performance/m3u-import-summary.ts
new file mode 100644
index 000000000..5a81e0a87
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import-summary.ts
@@ -0,0 +1,382 @@
+import type { M3uImportRendererCaptureMetrics } from './m3u-import-renderer-capture';
+import type { M3uImportScenarioId } from './m3u-import-benchmark-contract';
+import type {
+    MainCaptureMetrics,
+    NumericDistribution,
+    PerformanceIterationKind,
+    WorkerCaptureMetrics,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import {
+    PERFORMANCE_ITERATION_KIND,
+    PERFORMANCE_WORKER_KIND,
+} from './m3u-refresh-cancellation-contract';
+import {
+    deriveM3uImportPhaseMetrics,
+    M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON,
+} from './m3u-import-report';
+import { summarizeNumbers } from './performance-statistics';
+import { assessDatabaseWorkerPeakMemoryValidity } from './database-worker-peak-memory-validity';
+import { assessDatabaseWorkerPostGcValidity } from './database-worker-post-gc-validity';
+import { assessDatabaseWorkerRequestMetricsValidity } from './database-worker-request-metrics-validity';
+import { assessRendererRssValidity } from './renderer-rss-validity';
+import type {
+    M3uImportBenchmarkManifest,
+    M3uImportBenchmarkSummary,
+    M3uImportIterationResult,
+} from './m3u-import-summary-contract';
+
+export type {
+    M3uImportBenchmarkManifest,
+    M3uImportBenchmarkSummary,
+    M3uImportIterationResult,
+    M3uImportMeasuredSummary,
+} from './m3u-import-summary-contract';
+
+export function createM3uImportIterationResult(input: {
+    readonly channelCount: number;
+    readonly fixtureBytes: number;
+    readonly kind: PerformanceIterationKind;
+    readonly main: MainCaptureMetrics;
+    readonly renderer: M3uImportRendererCaptureMetrics;
+    readonly runId: string;
+    readonly scenarioId: M3uImportScenarioId;
+}): M3uImportIterationResult {
+    return Object.freeze({
+        channelCount: input.channelCount,
+        fixtureBytes: input.fixtureBytes,
+        kind: input.kind,
+        main: input.main,
+        phases: deriveM3uImportPhaseMetrics(input),
+        renderer: input.renderer,
+        runId: input.runId,
+        scenarioId: input.scenarioId,
+    });
+}
+
+export function createM3uImportBenchmarkSummary(
+    manifest: M3uImportBenchmarkManifest,
+    iterations: readonly M3uImportIterationResult[]
+): M3uImportBenchmarkSummary {
+    validateIterationSchedule(manifest, iterations);
+    const measured = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.MEASURED
+    );
+    validateMeasuredIterations(manifest, measured);
+    const values = (
+        select: (iteration: M3uImportIterationResult) => number | null
+    ): NumericDistribution => summarizeNumbers(measured.map(select));
+    const rendererSamples = (
+        select: (
+            probe: M3uImportRendererCaptureMetrics['probe']
+        ) => readonly number[]
+    ): NumericDistribution =>
+        summarizeNumbers(
+            measured.flatMap((iteration) => [
+                ...select(iteration.renderer.probe),
+            ])
+        );
+    const databaseWorkers = measured.map(requireDatabaseWorker);
+    const databaseRequestPairs = databaseWorkers.map(
+        requireInitialImportRequests
+    );
+    const databaseUpserts = databaseRequestPairs.map((pair) => pair.upsert);
+    const databaseGets = databaseRequestPairs.map((pair) => pair.get);
+    const databaseRequests = databaseRequestPairs.flatMap((pair) => [
+        pair.upsert,
+        pair.get,
+    ]);
+
+    return Object.freeze({
+        iterations: Object.freeze([...iterations]),
+        manifest,
+        measured: Object.freeze({
+            angularRenderingMs: values(
+                (iteration) => iteration.phases.angularRenderingMs
+            ),
+            dataAcquireMs: values(
+                (iteration) => iteration.phases.dataAcquireMs
+            ),
+            databaseWorkerGetEventLoopDelayMaxMs: summarizeNumbers(
+                databaseGets.map((request) => request.eventLoopDelay?.maxMs)
+            ),
+            databaseWorkerGetEventLoopDelayP95Ms: summarizeNumbers(
+                databaseGets.map((request) => request.eventLoopDelay?.p95Ms)
+            ),
+            databaseWorkerGetEventLoopDelayP99Ms: summarizeNumbers(
+                databaseGets.map((request) => request.eventLoopDelay?.p99Ms)
+            ),
+            databaseWorkerGetEventLoopUtilization: summarizeNumbers(
+                databaseGets.map((request) => request.eventLoopUtilization)
+            ),
+            databaseWorkerGetThreadCpuSystemMicros: summarizeNumbers(
+                databaseGets.map((request) => request.threadCpuSystemMicros)
+            ),
+            databaseWorkerGetThreadCpuUserMicros: summarizeNumbers(
+                databaseGets.map((request) => request.threadCpuUserMicros)
+            ),
+            databaseWorkerEventLoopDelayMaxMs: summarizeNumbers(
+                databaseRequests.map((request) => request.eventLoopDelay?.maxMs)
+            ),
+            databaseWorkerEventLoopDelayP95Ms: summarizeNumbers(
+                databaseRequests.map((request) => request.eventLoopDelay?.p95Ms)
+            ),
+            databaseWorkerEventLoopDelayP99Ms: summarizeNumbers(
+                databaseRequests.map((request) => request.eventLoopDelay?.p99Ms)
+            ),
+            databaseWorkerEventLoopUtilization: summarizeNumbers(
+                databaseRequests.map((request) => request.eventLoopUtilization)
+            ),
+            databaseWorkerExternalPeakBytes: summarizeNumbers(
+                databaseWorkers.map((worker) => worker.peakExternalBytes)
+            ),
+            databaseWorkerHeapPeakBytes: summarizeNumbers(
+                databaseWorkers.map((worker) => worker.peakHeapUsedBytes)
+            ),
+            databaseWorkerPostGcHeapBytes: summarizeNumbers(
+                databaseWorkers.map((worker) => worker.postGcHeapUsedBytes)
+            ),
+            databaseWorkerThreadCpuSystemMicros: summarizeNumbers(
+                databaseRequestPairs.map((pair) =>
+                    sumRequestMetric(
+                        pair.upsert.threadCpuSystemMicros,
+                        pair.get.threadCpuSystemMicros
+                    )
+                )
+            ),
+            databaseWorkerThreadCpuUserMicros: summarizeNumbers(
+                databaseRequestPairs.map((pair) =>
+                    sumRequestMetric(
+                        pair.upsert.threadCpuUserMicros,
+                        pair.get.threadCpuUserMicros
+                    )
+                )
+            ),
+            databaseWorkerToMainCloneProxyMs: values(
+                (iteration) =>
+                    iteration.phases.databaseWorkerToMainCloneProxyMs
+            ),
+            databaseWorkerUpsertEventLoopDelayMaxMs: summarizeNumbers(
+                databaseUpserts.map((request) => request.eventLoopDelay?.maxMs)
+            ),
+            databaseWorkerUpsertEventLoopDelayP95Ms: summarizeNumbers(
+                databaseUpserts.map((request) => request.eventLoopDelay?.p95Ms)
+            ),
+            databaseWorkerUpsertEventLoopDelayP99Ms: summarizeNumbers(
+                databaseUpserts.map((request) => request.eventLoopDelay?.p99Ms)
+            ),
+            databaseWorkerUpsertEventLoopUtilization: summarizeNumbers(
+                databaseUpserts.map((request) => request.eventLoopUtilization)
+            ),
+            databaseWorkerUpsertThreadCpuSystemMicros: summarizeNumbers(
+                databaseUpserts.map(
+                    (request) => request.threadCpuSystemMicros
+                )
+            ),
+            databaseWorkerUpsertThreadCpuUserMicros: summarizeNumbers(
+                databaseUpserts.map((request) => request.threadCpuUserMicros)
+            ),
+            ipcStructuredCloneProxyMs: values(
+                (iteration) => iteration.phases.ipcStructuredCloneProxyMs
+            ),
+            mainToDatabaseWorkerCloneProxyMs: values(
+                (iteration) => iteration.phases.mainToDatabaseWorkerCloneProxyMs
+            ),
+            mainToRendererCloneProxyMs: values(
+                (iteration) => iteration.phases.mainToRendererCloneProxyMs
+            ),
+            m3uParsingMs: values((iteration) => iteration.phases.m3uParsingMs),
+            mainEventLoopDelayMaxMs: values(
+                (iteration) => iteration.main.eventLoopDelay.maxMs
+            ),
+            mainEventLoopDelayP95Ms: values(
+                (iteration) => iteration.main.eventLoopDelay.p95Ms
+            ),
+            mainEventLoopDelayP99Ms: values(
+                (iteration) => iteration.main.eventLoopDelay.p99Ms
+            ),
+            mainEventLoopUtilization: values(
+                (iteration) => iteration.main.eventLoopUtilization
+            ),
+            mainHeapPeakBytes: values(
+                (iteration) => iteration.main.memory.peakHeapUsedBytes
+            ),
+            mainHeapPostGcBytes: values(
+                (iteration) => iteration.main.memory.postGcHeapUsedBytes
+            ),
+            mainRssPeakBytes: values(
+                (iteration) => iteration.main.memory.peakRssBytes
+            ),
+            mainRssPostGcBytes: values(
+                (iteration) => iteration.main.memory.postGcRssBytes
+            ),
+            normalizationMs: values(
+                (iteration) => iteration.phases.normalizationMs
+            ),
+            playlistDeserializationMs: values(
+                (iteration) => iteration.phases.playlistDeserializationMs
+            ),
+            playlistSerializationMs: values(
+                (iteration) => iteration.phases.playlistSerializationMs
+            ),
+            rendererFrameGapMs: rendererSamples((probe) => probe.frameGapsMs),
+            rendererHeartbeatDelayMs: rendererSamples(
+                (probe) => probe.heartbeatDelaysMs
+            ),
+            rendererHeapPeakBytes: values(
+                (iteration) => iteration.renderer.peakHeapUsedBytes
+            ),
+            rendererHeapPostGcBytes: values(
+                (iteration) => iteration.renderer.postGcHeapUsedBytes
+            ),
+            rendererLongTaskCount: measured.reduce(
+                (total, iteration) =>
+                    total + iteration.renderer.probe.longTasksMs.length,
+                0
+            ),
+            rendererLongTaskMs: rendererSamples((probe) => probe.longTasksMs),
+            rendererRssPeakBytes: values(
+                (iteration) => iteration.main.rendererWindow.rss.peakRssBytes
+            ),
+            rendererToMainCloneProxyMs: values(
+                (iteration) => iteration.phases.rendererToMainCloneProxyMs
+            ),
+            responsiveEvents: measured.reduce(
+                (total, iteration) =>
+                    total + iteration.main.rendererWindow.responsiveEvents,
+                0
+            ),
+            sqliteReadMs: values((iteration) => iteration.phases.sqliteReadMs),
+            sqliteWriteMs: values(
+                (iteration) => iteration.phases.sqliteWriteMs
+            ),
+            storeImportDispatchMs: values(
+                (iteration) => iteration.phases.storeImportDispatchMs
+            ),
+            storePublishChannelsMs: values(
+                (iteration) => iteration.phases.storePublishChannelsMs
+            ),
+            storeUpdateMs: values(
+                (iteration) => iteration.phases.storeUpdateMs
+            ),
+            totalMs: values((iteration) => iteration.phases.totalMs),
+            unresponsiveEvents: measured.reduce(
+                (total, iteration) =>
+                    total + iteration.main.rendererWindow.unresponsiveEvents,
+                0
+            ),
+        }),
+        notApplicable: Object.freeze({
+            cancelAcknowledgementLatencyMs: 'scenario-has-no-cancellation',
+            databaseWorkerRss: 'unavailable-per-worker-thread',
+            indexAndCommitMs: M3U_IMPORT_INDEX_COMMIT_UNAVAILABLE_REASON,
+            nativeAndSqliteMemory:
+                'included-in-main-rss-not-separately-attributable',
+            playlistRefreshWorker: 'not-used-by-initial-import',
+        }),
+        validity: Object.freeze({
+            databaseWorkerPeakMemory:
+                assessDatabaseWorkerPeakMemoryValidity(iterations),
+            databaseWorkerPostGc:
+                assessDatabaseWorkerPostGcValidity(iterations),
+            databaseWorkerRequestMetrics:
+                assessDatabaseWorkerRequestMetricsValidity(iterations),
+            rendererRss: assessRendererRssValidity(iterations),
+        }),
+    });
+}
+
+function validateIterationSchedule(
+    manifest: M3uImportBenchmarkManifest,
+    iterations: readonly M3uImportIterationResult[]
+): void {
+    const warmupCount = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.WARMUP
+    ).length;
+    const measuredCount = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.MEASURED
+    ).length;
+    const diagnosticCount = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.DIAGNOSTIC
+    ).length;
+    if (
+        warmupCount !== manifest.warmupRuns ||
+        measuredCount !== manifest.measuredRuns ||
+        diagnosticCount !== 1 ||
+        iterations.length !== warmupCount + measuredCount + diagnosticCount ||
+        new Set(iterations.map((iteration) => iteration.runId)).size !==
+            iterations.length ||
+        iterations.some(
+            (iteration) =>
+                iteration.channelCount !== manifest.channelCount ||
+                iteration.fixtureBytes !== manifest.fixtureBytes ||
+                iteration.scenarioId !== manifest.scenario
+        )
+    ) {
+        throw new Error('m3u-import-summary-schedule-invalid');
+    }
+}
+
+function validateMeasuredIterations(
+    manifest: M3uImportBenchmarkManifest,
+    measured: readonly M3uImportIterationResult[]
+): void {
+    if (
+        measured.length !== manifest.measuredRuns ||
+        new Set(measured.map((iteration) => iteration.runId)).size !==
+            measured.length ||
+        measured.some(
+            (iteration) =>
+                iteration.channelCount !== manifest.channelCount ||
+                iteration.fixtureBytes !== manifest.fixtureBytes ||
+                iteration.scenarioId !== manifest.scenario
+        )
+    ) {
+        throw new Error('m3u-import-summary-measured-runs-invalid');
+    }
+}
+
+function requireDatabaseWorker(
+    iteration: M3uImportIterationResult
+): WorkerCaptureMetrics {
+    const databaseWorkers = iteration.main.workers.filter(
+        (worker) => worker.kind === PERFORMANCE_WORKER_KIND.DATABASE
+    );
+    if (databaseWorkers.length !== 1 || !databaseWorkers[0]) {
+        throw new Error('m3u-import-summary-database-worker-invalid');
+    }
+    return databaseWorkers[0];
+}
+
+function requireInitialImportRequests(
+    worker: WorkerCaptureMetrics
+): {
+    readonly get: WorkerRequestPerformanceMetrics;
+    readonly upsert: WorkerRequestPerformanceMetrics;
+} {
+    const upserts = worker.requests.filter(
+        (request) =>
+            request.operation === 'DB_UPSERT_APP_PLAYLIST' && request.success
+    );
+    const gets = worker.requests.filter(
+        (request) =>
+            request.operation === 'DB_GET_APP_PLAYLIST' && request.success
+    );
+    if (
+        worker.requests.length !== 2 ||
+        upserts.length !== 1 ||
+        !upserts[0] ||
+        gets.length !== 1 ||
+        !gets[0]
+    ) {
+        throw new Error('m3u-import-summary-database-request-invalid');
+    }
+    return { get: gets[0], upsert: upserts[0] };
+}
+
+function sumRequestMetric(
+    first: number | null,
+    second: number | null
+): number | null {
+    return first === null || second === null ? null : first + second;
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-import.benchmark.ts b/apps/electron-backend-e2e/src/performance/m3u-import.benchmark.ts
new file mode 100644
index 000000000..dab027bc9
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-import.benchmark.ts
@@ -0,0 +1,341 @@
+import { mkdir, mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import {
+    closeElectronApp,
+    expect,
+    launchElectronApp,
+    type LaunchedElectronApp,
+} from '../electron-test-fixtures';
+import { validateInitialImportDiagnosticArtifacts } from './initial-import-diagnostic-artifacts';
+import {
+    assertRendererCdpTarget,
+    assertTcpPortAvailable,
+    type M3uImportBenchmarkConfiguration,
+    resolveM3uImportBenchmarkConfiguration,
+    resolveRendererWindowIdentity,
+    writeM3uImportJson as writeJson,
+} from './m3u-import-benchmark-support';
+import {
+    assertSyntheticM3uImportUrl,
+    createM3uImportIterationDefinitions,
+    listM3uImportScenarios,
+    type M3uImportIterationDefinition,
+    type M3uImportScenario,
+} from './m3u-import-benchmark-contract';
+import {
+    createM3uImportBenchmarkSummary,
+    createM3uImportIterationResult,
+    type M3uImportBenchmarkManifest,
+    type M3uImportBenchmarkSummary,
+    type M3uImportIterationResult,
+} from './m3u-import-summary';
+import {
+    startM3uImportRendererCapture,
+    type RunningM3uImportRendererCapture,
+} from './m3u-import-renderer-capture';
+import {
+    installMainCapture,
+    readMainCaptureStatus,
+    startMainCapture,
+    stopMainCapture,
+} from './m3u-refresh-main-capture';
+import { PERFORMANCE_ITERATION_KIND } from './m3u-refresh-cancellation-contract';
+import { assertPerformanceArtifactCapacity } from './performance-artifact-preflight';
+import {
+    startSyntheticM3uServer,
+    type SyntheticM3uServer,
+} from './synthetic-m3u-server';
+import {
+    createSyntheticM3uFixture,
+    SYNTHETIC_M3U_SEED,
+    type SyntheticM3uFixture,
+} from './synthetic-m3u';
+
+export async function runM3uImportBenchmark(): Promise<void> {
+    const config = await resolveM3uImportBenchmarkConfiguration();
+    const definitions = createM3uImportIterationDefinitions(config.smoke);
+
+    for (const scenario of listM3uImportScenarios()) {
+        await runScenario(
+            config,
+            scenario,
+            definitions.filter(
+                (definition) => definition.scenarioId === scenario.id
+            )
+        );
+    }
+}
+
+async function runScenario(
+    config: M3uImportBenchmarkConfiguration,
+    scenario: M3uImportScenario,
+    definitions: readonly M3uImportIterationDefinition[]
+): Promise<void> {
+    const fixture = createSyntheticM3uFixture(scenario.channelCount);
+    const server = await startSyntheticM3uServer(fixture);
+    const scenarioDirectory = join(config.variantDirectory, scenario.id);
+    const iterations: M3uImportIterationResult[] = [];
+
+    try {
+        assertSyntheticM3uImportUrl(server.resourceUrl);
+        await server.prime();
+        await assertPerformanceArtifactCapacity(scenarioDirectory);
+        await mkdir(scenarioDirectory, { recursive: false });
+        for (const definition of definitions) {
+            console.log(
+                `[performance] ${config.variant}/${scenario.id}/${definition.runId} starting`
+            );
+            const result = await runIteration(
+                config,
+                definition,
+                fixture,
+                server,
+                scenarioDirectory
+            );
+            iterations.push(result);
+            console.log(
+                `[performance] ${definition.runId} total=${result.phases.totalMs.toFixed(3)}ms`
+            );
+        }
+    } finally {
+        await server.close();
+    }
+
+    if (server.requestCount() !== definitions.length + 1) {
+        throw new Error('Synthetic M3U server request total is invalid');
+    }
+    const manifest = createManifest(config, scenario, fixture);
+    const summary = createM3uImportBenchmarkSummary(manifest, iterations);
+    await writeJson(join(scenarioDirectory, 'manifest.json'), manifest);
+    await writeJson(join(scenarioDirectory, 'summary.json'), summary);
+    const diagnostic = requireDiagnosticIteration(iterations);
+    await validateInitialImportDiagnosticArtifacts(
+        { main: diagnostic.main, renderer: diagnostic.renderer },
+        join(scenarioDirectory, diagnostic.runId)
+    );
+    assertM3uImportComparisonValidity(summary);
+    console.log(
+        `[performance] completed: ${join(scenarioDirectory, 'summary.json')}`
+    );
+}
+
+export function assertM3uImportComparisonValidity(
+    summary: M3uImportBenchmarkSummary
+): void {
+    if (!summary.validity.rendererRss.validForComparison) {
+        throw new Error(
+            `Renderer RSS capture is invalid for comparison: ${JSON.stringify(
+                summary.validity.rendererRss.invalidMeasuredRuns
+            )}`
+        );
+    }
+    if (!summary.validity.databaseWorkerPostGc.validForComparison) {
+        throw new Error(
+            `Database worker post-GC capture is invalid for comparison: ${JSON.stringify(
+                summary.validity.databaseWorkerPostGc.invalidMeasuredRuns
+            )}`
+        );
+    }
+    if (!summary.validity.databaseWorkerPeakMemory.validForComparison) {
+        throw new Error(
+            `Database worker peak-memory capture is invalid for comparison: ${JSON.stringify(
+                summary.validity.databaseWorkerPeakMemory.invalidMeasuredRuns
+            )}`
+        );
+    }
+    if (!summary.validity.databaseWorkerRequestMetrics.validForComparison) {
+        throw new Error(
+            `Database worker request metrics are invalid for comparison: ${JSON.stringify(
+                summary.validity.databaseWorkerRequestMetrics.invalidRequests
+            )}`
+        );
+    }
+}
+
+async function runIteration(
+    config: M3uImportBenchmarkConfiguration,
+    definition: M3uImportIterationDefinition,
+    fixture: SyntheticM3uFixture,
+    server: SyntheticM3uServer,
+    scenarioDirectory: string
+): Promise<M3uImportIterationResult> {
+    const iterationDirectory = join(scenarioDirectory, definition.runId);
+    await assertPerformanceArtifactCapacity(iterationDirectory);
+    await mkdir(iterationDirectory, { recursive: false });
+    const dataDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-m3u-import-performance-')
+    );
+    let app: LaunchedElectronApp | null = null;
+    let renderer: RunningM3uImportRendererCapture | null = null;
+
+    try {
+        await assertTcpPortAvailable(config.rendererCdpPort);
+        app = await launchElectronApp(dataDirectory, {
+            args: [
+                '--js-flags=--expose-gc',
+                '--remote-debugging-address=127.0.0.1',
+                `--remote-debugging-port=${config.rendererCdpPort}`,
+                `--user-data-dir=${join(dataDirectory, 'user-data')}`,
+            ],
+            env: {
+                IPTVNATOR_DB_WORKER_BATCH_DELAY_MS: '0',
+                IPTVNATOR_PERF_CAPTURE: '1',
+                IPTVNATOR_PERF_WORKER_PROFILING: '1',
+                IPTVNATOR_TRACE_RENDERER_CONSOLE:
+                    process.env['IPTVNATOR_TRACE_RENDERER_CONSOLE'] ?? '0',
+            },
+        });
+        app.mainWindow.setDefaultTimeout(120_000);
+        await assertRendererCdpTarget(
+            app.mainWindow,
+            config.rendererCdpPort
+        );
+        await installMainCapture(app.electronApp);
+        const rendererWindowIdentity = await resolveRendererWindowIdentity(app);
+        const requestsBefore = server.requestCount();
+        const diagnostic =
+            definition.kind === PERFORMANCE_ITERATION_KIND.DIAGNOSTIC;
+        renderer = await startM3uImportRendererCapture(app.mainWindow, {
+            diagnostic,
+            outputDirectory: iterationDirectory,
+            playlistTitle: `Synthetic M3U import ${definition.channelCount}`,
+            playlistUrl: server.resourceUrl,
+        });
+
+        await startMainCapture(app.electronApp, {
+            diagnostic,
+            outputDirectory: iterationDirectory,
+            rendererWindowIdentity,
+        });
+        await renderer.triggerImport();
+        await renderer.waitForTerminal();
+        await waitForDatabaseSettlement(app);
+        assertM3uImportRequestDelta(requestsBefore, server.requestCount());
+
+        const [rendererMetrics, mainMetrics] = await Promise.all([
+            renderer.stop(),
+            stopMainCapture(app.electronApp),
+        ]);
+        await Promise.all([
+            writeJson(
+                join(iterationDirectory, 'main-capture.json'),
+                mainMetrics
+            ),
+            writeJson(
+                join(iterationDirectory, 'renderer-capture.json'),
+                rendererMetrics
+            ),
+        ]);
+        const result = createM3uImportIterationResult({
+            channelCount: definition.channelCount,
+            fixtureBytes: fixture.bytes,
+            kind: definition.kind,
+            main: mainMetrics,
+            renderer: rendererMetrics,
+            runId: definition.runId,
+            scenarioId: definition.scenarioId,
+        });
+        await writeJson(join(iterationDirectory, 'result.json'), result);
+        return result;
+    } finally {
+        if (renderer) {
+            await renderer.dispose().catch((error: unknown) => {
+                console.error(
+                    '[performance] Renderer capture cleanup failed',
+                    error
+                );
+            });
+        }
+        if (app) {
+            await closeElectronApp(app).catch((error: unknown) => {
+                console.error('[performance] Electron cleanup failed', error);
+            });
+        }
+        await rm(dataDirectory, { force: true, recursive: true });
+    }
+}
+
+async function waitForDatabaseSettlement(
+    app: LaunchedElectronApp
+): Promise<void> {
+    await expect
+        .poll(
+            async () => {
+                const status = await readMainCaptureStatus(app.electronApp);
+                return (
+                    status.databaseRequests === 2 &&
+                    status.databaseUpsertsCompleted === 1 &&
+                    status.databaseGetsCompleted === 1 &&
+                    status.databasePending === 0 &&
+                    status.preloadSuccessMarkers === 2
+                );
+            },
+            { timeout: 120_000 }
+        )
+        .toBe(true);
+}
+
+function createManifest(
+    config: M3uImportBenchmarkConfiguration,
+    scenario: M3uImportScenario,
+    fixture: SyntheticM3uFixture
+): M3uImportBenchmarkManifest {
+    return Object.freeze({
+        channelCount: fixture.channelCount,
+        fixtureBytes: fixture.bytes,
+        fixtureSha256: fixture.sha256,
+        gitCommit: config.sourceState.commit,
+        gitDiffSha256: config.sourceState.diffSha256,
+        gitDirty: config.sourceState.dirty,
+        measuredRuns: config.measuredRuns,
+        memoryAccounting: Object.freeze({
+            databaseWorkerRss: 'unavailable-per-worker-thread',
+            mainRss:
+                'electron-main-process-including-worker-threads-and-native-memory',
+            nativeAndSqliteMemory:
+                'included-in-main-rss-not-separately-attributable',
+            rendererRss: 'separate-renderer-process',
+            workerJsHeap: 'separate-v8-isolate',
+        }),
+        runtime: Object.freeze({
+            arch: process.arch,
+            cdpPort: config.rendererCdpPort,
+            electronVersion: config.electronVersion,
+            harnessNodeVersion: process.versions.node,
+            platform: process.platform,
+        }),
+        scenario: scenario.id,
+        syntheticSeed: SYNTHETIC_M3U_SEED,
+        variant: config.variant,
+        warmupRuns: 1,
+    });
+}
+
+function requireDiagnosticIteration(
+    iterations: readonly M3uImportIterationResult[]
+): M3uImportIterationResult {
+    const diagnostic = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.DIAGNOSTIC
+    );
+    if (diagnostic.length !== 1 || !diagnostic[0]) {
+        throw new Error('M3U import diagnostic iteration is missing');
+    }
+    return diagnostic[0];
+}
+
+export function assertM3uImportRequestDelta(
+    before: number,
+    after: number
+): void {
+    const oneRequest =
+        Number.isSafeInteger(before) &&
+        Number.isSafeInteger(after) &&
+        after === before + 1;
+    if (!oneRequest) {
+        throw new Error(
+            'Synthetic M3U import must issue exactly one application GET'
+        );
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-contract.ts b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-contract.ts
new file mode 100644
index 000000000..a89f95dc8
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-contract.ts
@@ -0,0 +1,344 @@
+import type { RendererProcessRssCapture } from './renderer-process-rss-capture';
+import type { RendererRssValidity } from './renderer-rss-validity';
+import type {
+    AppPlaylistPerformancePhase,
+    PerformancePhaseEvent,
+} from '@iptvnator/shared/interfaces';
+
+export const PERFORMANCE_ITERATION_KIND = {
+    DIAGNOSTIC: 'diagnostic',
+    MEASURED: 'measured',
+    WARMUP: 'warmup',
+} as const;
+
+export type PerformanceIterationKind =
+    (typeof PERFORMANCE_ITERATION_KIND)[keyof typeof PERFORMANCE_ITERATION_KIND];
+
+export const PERFORMANCE_WORKER_KIND = {
+    DATABASE: 'database.worker',
+    PLAYLIST_REFRESH: 'playlist-refresh.worker',
+} as const;
+
+export type PerformanceWorkerKind =
+    (typeof PERFORMANCE_WORKER_KIND)[keyof typeof PERFORMANCE_WORKER_KIND];
+
+export const WORKER_POST_GC_HEAP_UNAVAILABLE_REASON = {
+    CAPTURE_FAILED: 'capture-failed',
+    DATABASE_WORKER_ACTIVITY_AFTER_CUTOFF:
+        'database-worker-activity-after-cutoff',
+    DATABASE_WORKER_MISSING: 'database-worker-missing',
+    DATABASE_WORKER_NOT_IDLE: 'database-worker-not-idle',
+    DATABASE_WORKER_UNEXPECTED_ACTIVITY: 'database-worker-unexpected-activity',
+    GC_UNAVAILABLE: 'gc-unavailable',
+    INVALID_CAPTURE: 'post-gc-capture-invalid',
+    MULTIPLE_DATABASE_WORKERS: 'multiple-database-workers',
+    PROBE_INVALID_RESPONSE: 'post-gc-probe-invalid-response',
+    PROBE_MESSAGE_ERROR: 'post-gc-probe-message-error',
+    PROBE_NOT_RUN: 'post-gc-probe-not-run',
+    PROBE_PORT_CLOSED: 'post-gc-probe-port-closed',
+    PROBE_POST_FAILED: 'post-gc-probe-post-failed',
+    PROBE_TIMEOUT: 'post-gc-probe-timeout',
+    PROFILING_DISABLED: 'profiling-disabled',
+    WORKER_BUSY: 'worker-busy',
+    WORKER_FORCE_TERMINATED: 'worker-force-terminated-before-gc',
+} as const;
+
+export type WorkerPostGcHeapUnavailableReason =
+    (typeof WORKER_POST_GC_HEAP_UNAVAILABLE_REASON)[keyof typeof WORKER_POST_GC_HEAP_UNAVAILABLE_REASON];
+
+export type WorkerPostGcHeapCapture =
+    | {
+          readonly postGcHeapUnavailableReason: null;
+          readonly postGcHeapUsedBytes: number;
+      }
+    | {
+          readonly postGcHeapUnavailableReason: WorkerPostGcHeapUnavailableReason;
+          readonly postGcHeapUsedBytes: null;
+      };
+
+export const WORKER_PEAK_MEMORY_UNAVAILABLE_REASON = {
+    EXTERNAL_MEMORY_SAMPLES_MISSING:
+        'worker-external-memory-samples-missing',
+    HEAP_USED_SAMPLES_MISSING: 'worker-heap-used-samples-missing',
+} as const;
+
+export interface NumericDistribution {
+    readonly count: number;
+    readonly max: number | null;
+    readonly mean: number | null;
+    readonly median: number | null;
+    readonly min: number | null;
+    readonly p95: number | null;
+    readonly p99: number | null;
+}
+
+export interface EventLoopDelayMetrics {
+    readonly maxMs: number;
+    readonly p95Ms: number;
+    readonly p99Ms: number;
+}
+
+export interface ProcessMemoryMetrics {
+    readonly peakHeapUsedBytes: number;
+    readonly peakRssBytes: number;
+    readonly postGcHeapUsedBytes: number | null;
+    readonly postGcRssBytes: number | null;
+}
+
+export interface MainTimelineRecord {
+    readonly boundary?: 'end' | 'start';
+    readonly byteCount?: number;
+    readonly durationMs?: number | null;
+    readonly epochMs: number;
+    readonly ipcCallId?: number;
+    readonly itemCount?: number;
+    readonly operation?: string;
+    readonly operationId?: string;
+    readonly phase?: string;
+    readonly playlistId?: string;
+    readonly requestId?: string;
+    readonly success?: boolean;
+    readonly sourceEpochMs?: number;
+    readonly type: string;
+}
+
+export interface WorkerRequestPerformanceMetrics {
+    readonly eventLoopDelay: EventLoopDelayMetrics | null;
+    readonly eventLoopDelayUnavailableReason: string | null;
+    readonly eventLoopUtilization: number | null;
+    readonly eventLoopUtilizationUnavailableReason: string | null;
+    readonly histogramFlushedEpochMs: number | null;
+    readonly ipcCallId: number | null;
+    readonly invalidReason: string | null;
+    readonly operation: string | null;
+    readonly operationId: string | null;
+    readonly operationIdUnavailableReason: string | null;
+    readonly performanceCaptureUnavailableReason: string | null;
+    readonly phaseEvents: readonly PerformancePhaseEvent<AppPlaylistPerformancePhase>[];
+    readonly playlistId: string | null;
+    readonly requestId: string | null;
+    readonly requestReceivedEpochMs: number | null;
+    readonly responseEpochMs: number;
+    readonly responsePostedEpochMs: number | null;
+    readonly sourceEpochMs: number | null;
+    readonly success: boolean;
+    readonly threadCpuSystemMicros: number | null;
+    readonly threadCpuUnavailableReason: string | null;
+    readonly threadCpuUserMicros: number | null;
+    readonly workEndedEpochMs: number | null;
+    readonly workStartedEpochMs: number | null;
+}
+
+export type WorkerCaptureMetrics = {
+    readonly cancelPostedEpochMs: number | null;
+    readonly cpuSystemMicros: number | null;
+    readonly cpuUserMicros: number | null;
+    readonly eventLoopDelay: EventLoopDelayMetrics | null;
+    readonly eventLoopDelayUnavailableReason: string | null;
+    readonly eventLoopUtilization: number | null;
+    readonly externalMemorySampleCount: number;
+    readonly heapUsedSampleCount: number;
+    readonly kind: PerformanceWorkerKind;
+    readonly operationId: string | null;
+    readonly ordinal: number;
+    readonly peakExternalBytes: number | null;
+    readonly peakExternalUnavailableReason:
+        | typeof WORKER_PEAK_MEMORY_UNAVAILABLE_REASON.EXTERNAL_MEMORY_SAMPLES_MISSING
+        | null;
+    readonly peakHeapUsedBytes: number | null;
+    readonly peakHeapUsedUnavailableReason:
+        | typeof WORKER_PEAK_MEMORY_UNAVAILABLE_REASON.HEAP_USED_SAMPLES_MISSING
+        | null;
+    readonly playlistId: string | null;
+    readonly profilePath: string | null;
+    readonly requests: readonly WorkerRequestPerformanceMetrics[];
+    readonly responseEpochMs: number | null;
+    readonly snapshotPath: string | null;
+    readonly terminatedEpochMs: number | null;
+} & WorkerPostGcHeapCapture;
+
+export interface MainCaptureMetrics {
+    readonly cpuProfilePath: string | null;
+    readonly cpuSystemMicros: number;
+    readonly cpuUserMicros: number;
+    readonly eventLoopDelay: EventLoopDelayMetrics;
+    readonly eventLoopUtilization: number | null;
+    readonly eventLoopUtilizationUnavailableReason: string | null;
+    readonly heapSnapshotPath: string | null;
+    readonly memory: ProcessMemoryMetrics;
+    readonly rendererWindow: {
+        readonly responsiveEvents: number;
+        readonly rss: RendererProcessRssCapture;
+        readonly unresponsiveEvents: number;
+        readonly windowIdentity: {
+            readonly browserWindowId: number;
+            readonly webContentsId: number;
+        };
+    };
+    readonly rssScope: 'electron-main-process-including-worker-threads-and-native-memory';
+    readonly timeline: readonly MainTimelineRecord[];
+    readonly workers: readonly WorkerCaptureMetrics[];
+}
+
+export interface PlaylistRefreshProbeEvent {
+    readonly operationId: string;
+    readonly phase: string | null;
+    readonly receivedEpochMs: number;
+    readonly status: string;
+}
+
+export interface RendererProbeMetrics {
+    readonly cancelButtonFound: boolean;
+    readonly cancelClickEpochMs: number | null;
+    readonly events: readonly PlaylistRefreshProbeEvent[];
+    readonly frameGapsMs: readonly number[];
+    readonly heartbeatDelaysMs: readonly number[];
+    readonly longTasksMs: readonly number[];
+    readonly operationStartEpochMs: number;
+    readonly terminalEpochMs: number | null;
+    readonly uiPaintedEpochMs: number | null;
+    readonly uiPhaseEpochMs: Readonly<Record<string, number>>;
+    readonly uiSettledEpochMs: number | null;
+}
+
+export interface RendererCaptureMetrics {
+    readonly cpuProfilePath: string | null;
+    readonly frameGap: NumericDistribution;
+    readonly heapSnapshotPath: string | null;
+    readonly heartbeatDelay: NumericDistribution;
+    readonly longTask: NumericDistribution;
+    readonly peakHeapUsedBytes: number;
+    readonly postGcHeapUsedBytes: number | null;
+    readonly probe: RendererProbeMetrics;
+    readonly tracePath: string | null;
+}
+
+export interface CancellationPhaseMetrics {
+    readonly cancelAcknowledgementLatencyMs: number | null;
+    readonly cancelToDurableTerminalMs: number | null;
+    readonly cancelToWorkerTerminatedMs: number | null;
+    readonly cancelTransportLatencyMs: number | null;
+    readonly dataFetchMs: number | null;
+    readonly dbCommitProxyMs: number | null;
+    readonly ipcStoreDispatchProxyMs: number | null;
+    readonly parseNormalizeCloneProxyMs: number | null;
+    readonly persistencePreparationProxyMs: number | null;
+    readonly totalMs: number | null;
+    readonly uiSettlementToPaintMs: number | null;
+    readonly visibleTotalMs: number | null;
+}
+
+export interface CancellationIterationResult {
+    readonly cancellationEffectObserved: boolean;
+    readonly kind: PerformanceIterationKind;
+    readonly main: MainCaptureMetrics;
+    readonly phases: CancellationPhaseMetrics;
+    readonly renderer: RendererCaptureMetrics;
+    readonly runId: string;
+}
+
+export interface CancellationBenchmarkManifest {
+    readonly channelCount: number;
+    readonly fixtureBytes: number;
+    readonly fixtureSha256: string;
+    readonly gitCommit: string;
+    readonly gitDiffSha256: string;
+    readonly gitDirty: boolean;
+    readonly measuredRuns: number;
+    readonly memoryAccounting: {
+        readonly mainRss: 'electron-main-process-including-worker-threads-and-native-memory';
+        readonly rendererRss: 'separate-renderer-process';
+        readonly workerJsHeap: 'separate-v8-isolate';
+        readonly workerRss: 'unavailable-per-thread';
+    };
+    readonly scenario: 'm3u-refresh-cancel';
+    readonly syntheticSeed: number;
+    readonly runtime: {
+        readonly arch: string;
+        readonly electronVersion: string;
+        readonly harnessNodeVersion: string;
+        readonly platform: string;
+    };
+    readonly variant: string;
+    readonly warmupRuns: number;
+}
+
+export interface InvalidDatabaseWorkerPostGcMeasuredRun {
+    readonly databaseWorkerCount: number;
+    readonly reason: string;
+    readonly runId: string;
+}
+
+export interface NotApplicableDatabaseWorkerPostGcMeasuredRun {
+    readonly reason: 'operation-cancelled-before-database-phase';
+    readonly runId: string;
+}
+
+export interface DatabaseWorkerPostGcValidity {
+    readonly applicableMeasuredRunCount: number;
+    readonly invalidMeasuredRuns: readonly InvalidDatabaseWorkerPostGcMeasuredRun[];
+    readonly measuredRunCount: number;
+    readonly notApplicableMeasuredRuns: readonly NotApplicableDatabaseWorkerPostGcMeasuredRun[];
+    readonly validForBenchmark: boolean;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+}
+
+export interface CancellationBenchmarkSummary {
+    readonly cancellationEffectRate: number;
+    readonly iterations: readonly CancellationIterationResult[];
+    readonly manifest: CancellationBenchmarkManifest;
+    readonly measured: {
+        readonly cancelAcknowledgementLatencyMs: NumericDistribution;
+        readonly cancelToDurableTerminalMs: NumericDistribution;
+        readonly cancelToWorkerTerminatedMs: NumericDistribution;
+        readonly cancelTransportLatencyMs: NumericDistribution;
+        readonly databaseWorkerExternalPeakBytes: NumericDistribution;
+        readonly databaseWorkerHeapPeakBytes: NumericDistribution;
+        readonly databaseWorkerPostGcHeapBytes: NumericDistribution;
+        readonly databaseWorkerRequestEventLoopDelayMaxMs: NumericDistribution;
+        readonly databaseWorkerRequestEventLoopDelayP95Ms: NumericDistribution;
+        readonly databaseWorkerRequestEventLoopDelayP99Ms: NumericDistribution;
+        readonly databaseWorkerRequestEventLoopUtilization: NumericDistribution;
+        readonly databaseWorkerRequestThreadCpuSystemMicros: NumericDistribution;
+        readonly databaseWorkerRequestThreadCpuUserMicros: NumericDistribution;
+        readonly dataFetchMs: NumericDistribution;
+        readonly dbCommitProxyMs: NumericDistribution;
+        readonly ipcStoreDispatchProxyMs: NumericDistribution;
+        readonly mainEventLoopDelayMaxMs: NumericDistribution;
+        readonly mainEventLoopDelayP95Ms: NumericDistribution;
+        readonly mainEventLoopDelayP99Ms: NumericDistribution;
+        readonly mainEventLoopUtilization: NumericDistribution;
+        readonly mainHeapPeakBytes: NumericDistribution;
+        readonly mainHeapPostGcBytes: NumericDistribution;
+        readonly mainRssPeakBytes: NumericDistribution;
+        readonly mainRssPostGcBytes: NumericDistribution;
+        readonly parseNormalizeCloneProxyMs: NumericDistribution;
+        readonly persistencePreparationProxyMs: NumericDistribution;
+        readonly playlistWorkerExternalPeakBytes: NumericDistribution;
+        readonly playlistWorkerHeapPeakBytes: NumericDistribution;
+        readonly playlistWorkerPostGcHeapBytes: NumericDistribution;
+        readonly playlistWorkerRequestEventLoopDelayMaxMs: NumericDistribution;
+        readonly playlistWorkerRequestEventLoopDelayP95Ms: NumericDistribution;
+        readonly playlistWorkerRequestEventLoopDelayP99Ms: NumericDistribution;
+        readonly playlistWorkerRequestEventLoopUtilization: NumericDistribution;
+        readonly playlistWorkerRequestThreadCpuSystemMicros: NumericDistribution;
+        readonly playlistWorkerRequestThreadCpuUserMicros: NumericDistribution;
+        readonly rendererFrameGapMs: NumericDistribution;
+        readonly rendererHeartbeatDelayMs: NumericDistribution;
+        readonly rendererHeapPeakBytes: NumericDistribution;
+        readonly rendererHeapPostGcBytes: NumericDistribution;
+        readonly rendererLongTaskCount: number;
+        readonly rendererLongTaskMs: NumericDistribution;
+        readonly rendererRssPeakBytes: NumericDistribution;
+        readonly responsiveEvents: number;
+        readonly totalMs: NumericDistribution;
+        readonly uiSettlementToPaintMs: NumericDistribution;
+        readonly unresponsiveEvents: number;
+        readonly visibleTotalMs: NumericDistribution;
+    };
+    readonly validity: {
+        readonly databaseWorkerPostGc: DatabaseWorkerPostGcValidity;
+        readonly rendererRss: RendererRssValidity;
+    };
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-report.ts b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-report.ts
new file mode 100644
index 000000000..f95d075e6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation-report.ts
@@ -0,0 +1,461 @@
+/* eslint-disable max-lines -- Summary distributions and correlated phase derivation share one auditable schema mapping. */
+import type {
+    CancellationBenchmarkManifest,
+    CancellationBenchmarkSummary,
+    CancellationIterationResult,
+    CancellationPhaseMetrics,
+    MainCaptureMetrics,
+    MainTimelineRecord,
+    NumericDistribution,
+    PerformanceWorkerKind,
+    RendererCaptureMetrics,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import {
+    PERFORMANCE_ITERATION_KIND,
+    PERFORMANCE_WORKER_KIND,
+} from './m3u-refresh-cancellation-contract';
+import {
+    nonNegativeDifference,
+    summarizeNumbers,
+} from './performance-statistics';
+import { assessDatabaseWorkerPostGcValidity } from './database-worker-post-gc-validity';
+import { assessRendererRssValidity } from './renderer-rss-validity';
+
+export function createCancellationIterationResult(input: {
+    readonly kind: CancellationIterationResult['kind'];
+    readonly main: MainCaptureMetrics;
+    readonly renderer: RendererCaptureMetrics;
+    readonly runId: string;
+}): CancellationIterationResult {
+    const { main, renderer } = input;
+    const phases = derivePhases(main, renderer);
+    const cancellationEffectObserved = renderer.probe.events.some(
+        (event) => event.status === 'cancelled'
+    );
+
+    return Object.freeze({
+        cancellationEffectObserved,
+        kind: input.kind,
+        main,
+        phases,
+        renderer,
+        runId: input.runId,
+    });
+}
+
+export function createCancellationBenchmarkSummary(
+    manifest: CancellationBenchmarkManifest,
+    iterations: readonly CancellationIterationResult[]
+): CancellationBenchmarkSummary {
+    const measured = iterations.filter(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.MEASURED
+    );
+    const flattenRenderer = (
+        select: (iteration: CancellationIterationResult) => readonly number[]
+    ): number[] => measured.flatMap((iteration) => [...select(iteration)]);
+    const workerMetric = (
+        kind: PerformanceWorkerKind,
+        select: (worker: MainCaptureMetrics['workers'][number]) => number | null
+    ): NumericDistribution =>
+        summarizeNumbers(
+            measured.flatMap((iteration) =>
+                iteration.main.workers
+                    .filter((worker) => worker.kind === kind)
+                    .map((worker) => select(worker))
+            )
+        );
+    const workerRequestMetric = (
+        kind: PerformanceWorkerKind,
+        select: (request: WorkerRequestPerformanceMetrics) => number | null
+    ): NumericDistribution =>
+        summarizeNumbers(
+            measured.flatMap((iteration) =>
+                iteration.main.workers
+                    .filter((worker) => worker.kind === kind)
+                    .flatMap((worker) =>
+                        worker.requests.map((request) => select(request))
+                    )
+            )
+        );
+    const workerRequestEventLoopDelayMetric = (
+        kind: PerformanceWorkerKind,
+        percentile: keyof NonNullable<
+            WorkerRequestPerformanceMetrics['eventLoopDelay']
+        >
+    ): NumericDistribution =>
+        workerRequestMetric(
+            kind,
+            (request) => request.eventLoopDelay?.[percentile] ?? null
+        );
+
+    return Object.freeze({
+        cancellationEffectRate:
+            measured.length === 0
+                ? 0
+                : measured.filter(
+                      (iteration) => iteration.cancellationEffectObserved
+                  ).length / measured.length,
+        iterations: Object.freeze([...iterations]),
+        manifest,
+        measured: Object.freeze({
+            cancelAcknowledgementLatencyMs: summarizeNumbers(
+                measured.map(
+                    (iteration) =>
+                        iteration.phases.cancelAcknowledgementLatencyMs
+                )
+            ),
+            cancelToDurableTerminalMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.cancelToDurableTerminalMs
+                )
+            ),
+            cancelToWorkerTerminatedMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.cancelToWorkerTerminatedMs
+                )
+            ),
+            cancelTransportLatencyMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.cancelTransportLatencyMs
+                )
+            ),
+            databaseWorkerExternalPeakBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (worker) => worker.peakExternalBytes
+            ),
+            databaseWorkerHeapPeakBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (worker) => worker.peakHeapUsedBytes
+            ),
+            databaseWorkerPostGcHeapBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (worker) => worker.postGcHeapUsedBytes
+            ),
+            databaseWorkerRequestEventLoopDelayMaxMs:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.DATABASE,
+                    'maxMs'
+                ),
+            databaseWorkerRequestEventLoopDelayP95Ms:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.DATABASE,
+                    'p95Ms'
+                ),
+            databaseWorkerRequestEventLoopDelayP99Ms:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.DATABASE,
+                    'p99Ms'
+                ),
+            databaseWorkerRequestEventLoopUtilization: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (request) => request.eventLoopUtilization
+            ),
+            databaseWorkerRequestThreadCpuSystemMicros: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (request) => request.threadCpuSystemMicros
+            ),
+            databaseWorkerRequestThreadCpuUserMicros: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.DATABASE,
+                (request) => request.threadCpuUserMicros
+            ),
+            dataFetchMs: summarizeNumbers(
+                measured.map((iteration) => iteration.phases.dataFetchMs)
+            ),
+            dbCommitProxyMs: summarizeNumbers(
+                measured.map((iteration) => iteration.phases.dbCommitProxyMs)
+            ),
+            ipcStoreDispatchProxyMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.ipcStoreDispatchProxyMs
+                )
+            ),
+            mainEventLoopDelayMaxMs: summarizeNumbers(
+                measured.map((iteration) => iteration.main.eventLoopDelay.maxMs)
+            ),
+            mainEventLoopDelayP95Ms: summarizeNumbers(
+                measured.map((iteration) => iteration.main.eventLoopDelay.p95Ms)
+            ),
+            mainEventLoopDelayP99Ms: summarizeNumbers(
+                measured.map((iteration) => iteration.main.eventLoopDelay.p99Ms)
+            ),
+            mainEventLoopUtilization: summarizeNumbers(
+                measured.map((iteration) => iteration.main.eventLoopUtilization)
+            ),
+            mainHeapPeakBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.main.memory.peakHeapUsedBytes
+                )
+            ),
+            mainHeapPostGcBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.main.memory.postGcHeapUsedBytes
+                )
+            ),
+            mainRssPeakBytes: summarizeNumbers(
+                measured.map((iteration) => iteration.main.memory.peakRssBytes)
+            ),
+            mainRssPostGcBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.main.memory.postGcRssBytes
+                )
+            ),
+            parseNormalizeCloneProxyMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.parseNormalizeCloneProxyMs
+                )
+            ),
+            persistencePreparationProxyMs: summarizeNumbers(
+                measured.map(
+                    (iteration) =>
+                        iteration.phases.persistencePreparationProxyMs
+                )
+            ),
+            playlistWorkerExternalPeakBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (worker) => worker.peakExternalBytes
+            ),
+            playlistWorkerHeapPeakBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (worker) => worker.peakHeapUsedBytes
+            ),
+            playlistWorkerPostGcHeapBytes: workerMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (worker) => worker.postGcHeapUsedBytes
+            ),
+            playlistWorkerRequestEventLoopDelayMaxMs:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                    'maxMs'
+                ),
+            playlistWorkerRequestEventLoopDelayP95Ms:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                    'p95Ms'
+                ),
+            playlistWorkerRequestEventLoopDelayP99Ms:
+                workerRequestEventLoopDelayMetric(
+                    PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                    'p99Ms'
+                ),
+            playlistWorkerRequestEventLoopUtilization: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (request) => request.eventLoopUtilization
+            ),
+            playlistWorkerRequestThreadCpuSystemMicros: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (request) => request.threadCpuSystemMicros
+            ),
+            playlistWorkerRequestThreadCpuUserMicros: workerRequestMetric(
+                PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+                (request) => request.threadCpuUserMicros
+            ),
+            rendererFrameGapMs: summarizeNumbers(
+                flattenRenderer(
+                    (iteration) => iteration.renderer.probe.frameGapsMs
+                )
+            ),
+            rendererHeartbeatDelayMs: summarizeNumbers(
+                flattenRenderer(
+                    (iteration) => iteration.renderer.probe.heartbeatDelaysMs
+                )
+            ),
+            rendererHeapPeakBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.renderer.peakHeapUsedBytes
+                )
+            ),
+            rendererHeapPostGcBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.renderer.postGcHeapUsedBytes
+                )
+            ),
+            rendererLongTaskCount: measured.reduce(
+                (sum, iteration) =>
+                    sum + iteration.renderer.probe.longTasksMs.length,
+                0
+            ),
+            rendererLongTaskMs: summarizeNumbers(
+                flattenRenderer(
+                    (iteration) => iteration.renderer.probe.longTasksMs
+                )
+            ),
+            rendererRssPeakBytes: summarizeNumbers(
+                measured.map(
+                    (iteration) =>
+                        iteration.main.rendererWindow.rss.peakRssBytes
+                )
+            ),
+            responsiveEvents: measured.reduce(
+                (sum, iteration) =>
+                    sum + iteration.main.rendererWindow.responsiveEvents,
+                0
+            ),
+            totalMs: summarizeNumbers(
+                measured.map((iteration) => iteration.phases.totalMs)
+            ),
+            uiSettlementToPaintMs: summarizeNumbers(
+                measured.map(
+                    (iteration) => iteration.phases.uiSettlementToPaintMs
+                )
+            ),
+            unresponsiveEvents: measured.reduce(
+                (sum, iteration) =>
+                    sum + iteration.main.rendererWindow.unresponsiveEvents,
+                0
+            ),
+            visibleTotalMs: summarizeNumbers(
+                measured.map((iteration) => iteration.phases.visibleTotalMs)
+            ),
+        }),
+        validity: Object.freeze({
+            databaseWorkerPostGc:
+                assessDatabaseWorkerPostGcValidity(iterations),
+            rendererRss: assessRendererRssValidity(iterations),
+        }),
+    });
+}
+
+function derivePhases(
+    main: MainCaptureMetrics,
+    renderer: RendererCaptureMetrics
+): CancellationPhaseMetrics {
+    const started = findTimeline(
+        main.timeline,
+        'playlist-event:started:fetching'
+    );
+    const parsing = findTimeline(
+        main.timeline,
+        'playlist-event:progress:parsing'
+    );
+    const response = findTimeline(main.timeline, 'playlist-response');
+    const playlistRequest = findTimeline(main.timeline, 'playlist-request');
+    const playlistId = playlistRequest?.playlistId;
+    const dbGetRequest = findPlaylistDbRecord(
+        main.timeline,
+        'db-request',
+        response?.epochMs,
+        'DB_GET_APP_PLAYLIST',
+        playlistId
+    );
+    const dbGetResponse = findResponse(main.timeline, dbGetRequest);
+    const dbUpsertRequest = findPlaylistDbRecord(
+        main.timeline,
+        'db-request',
+        dbGetResponse?.epochMs ?? dbGetRequest?.epochMs ?? response?.epochMs,
+        'DB_UPSERT_APP_PLAYLIST',
+        playlistId
+    );
+    const dbUpsertResponse = findResponse(main.timeline, dbUpsertRequest);
+    const playlistWorker = main.workers.find(
+        (worker) => worker.kind === 'playlist-refresh.worker'
+    );
+    const cancelClick = renderer.probe.cancelClickEpochMs;
+    const uiPainted =
+        renderer.probe.uiPaintedEpochMs ?? renderer.probe.terminalEpochMs;
+    const cancelledEvent = renderer.probe.events.find(
+        (event) => event.status === 'cancelled'
+    );
+    const terminal = maxEpoch(
+        uiPainted,
+        dbUpsertResponse?.epochMs,
+        cancelledEvent?.receivedEpochMs,
+        response?.epochMs,
+        playlistWorker?.terminatedEpochMs
+    );
+
+    return Object.freeze({
+        cancelAcknowledgementLatencyMs: nonNegativeDifference(
+            cancelledEvent?.receivedEpochMs,
+            cancelClick
+        ),
+        cancelToDurableTerminalMs: nonNegativeDifference(terminal, cancelClick),
+        cancelToWorkerTerminatedMs: nonNegativeDifference(
+            playlistWorker?.terminatedEpochMs,
+            cancelClick
+        ),
+        cancelTransportLatencyMs: nonNegativeDifference(
+            playlistWorker?.cancelPostedEpochMs,
+            cancelClick
+        ),
+        dataFetchMs: nonNegativeDifference(parsing?.epochMs, started?.epochMs),
+        dbCommitProxyMs: nonNegativeDifference(
+            dbUpsertResponse?.epochMs,
+            dbUpsertRequest?.epochMs
+        ),
+        ipcStoreDispatchProxyMs: nonNegativeDifference(
+            dbGetRequest?.epochMs,
+            response?.epochMs
+        ),
+        parseNormalizeCloneProxyMs: nonNegativeDifference(
+            response?.epochMs,
+            parsing?.epochMs
+        ),
+        persistencePreparationProxyMs: nonNegativeDifference(
+            dbUpsertRequest?.epochMs,
+            dbGetResponse?.epochMs
+        ),
+        totalMs: nonNegativeDifference(
+            terminal,
+            renderer.probe.operationStartEpochMs
+        ),
+        uiSettlementToPaintMs: nonNegativeDifference(
+            uiPainted,
+            renderer.probe.uiSettledEpochMs
+        ),
+        visibleTotalMs: nonNegativeDifference(
+            uiPainted,
+            renderer.probe.operationStartEpochMs
+        ),
+    });
+}
+
+function findTimeline(
+    timeline: readonly MainTimelineRecord[],
+    type: string
+): MainTimelineRecord | undefined {
+    return timeline.find((record) => record.type === type);
+}
+
+function findPlaylistDbRecord(
+    timeline: readonly MainTimelineRecord[],
+    type: string,
+    afterEpochMs: number | undefined,
+    operation: string,
+    playlistId: string | undefined
+): MainTimelineRecord | undefined {
+    if (afterEpochMs === undefined) {
+        return undefined;
+    }
+    return timeline.find(
+        (record) =>
+            record.type === type &&
+            record.epochMs >= afterEpochMs &&
+            record.operation === operation &&
+            (playlistId === undefined || record.playlistId === playlistId)
+    );
+}
+
+function findResponse(
+    timeline: readonly MainTimelineRecord[],
+    request: MainTimelineRecord | undefined
+): MainTimelineRecord | undefined {
+    if (request?.requestId === undefined) {
+        return undefined;
+    }
+    return timeline.find(
+        (record) =>
+            record.type === 'db-response' &&
+            record.requestId === request.requestId
+    );
+}
+
+function maxEpoch(
+    ...values: readonly (number | null | undefined)[]
+): number | null {
+    const finite = values.filter(
+        (value): value is number =>
+            typeof value === 'number' && Number.isFinite(value)
+    );
+    return finite.length === 0 ? null : Math.max(...finite);
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation.benchmark.ts b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation.benchmark.ts
new file mode 100644
index 000000000..243803989
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation.benchmark.ts
@@ -0,0 +1,629 @@
+/* eslint-disable max-lines -- Benchmark lifecycle, local fixture server, and artifact safeguards stay auditable in one entry point. */
+import { execFileSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { once } from 'node:events';
+import {
+    access,
+    mkdir,
+    mkdtemp,
+    readFile,
+    rm,
+    writeFile,
+} from 'node:fs/promises';
+import { createServer, type Server } from 'node:http';
+import { createServer as createTcpServer } from 'node:net';
+import { tmpdir } from 'node:os';
+import { isAbsolute, join, relative, resolve, sep } from 'node:path';
+
+import { expect, type ConsoleMessage, type Page } from '@playwright/test';
+
+import {
+    closeElectronApp,
+    launchElectronApp,
+    openSources,
+    sourceRowByTitle,
+    waitForM3uCatalog,
+    type LaunchedElectronApp,
+} from '../electron-test-fixtures';
+import type {
+    CancellationBenchmarkManifest,
+    CancellationIterationResult,
+    PerformanceIterationKind,
+} from './m3u-refresh-cancellation-contract';
+import { PERFORMANCE_ITERATION_KIND } from './m3u-refresh-cancellation-contract';
+import {
+    createCancellationBenchmarkSummary,
+    createCancellationIterationResult,
+} from './m3u-refresh-cancellation-report';
+import { validateDiagnosticPlaylistWorkerCapture } from './diagnostic-playlist-worker-capture';
+import { assertPerformanceArtifactCapacity } from './performance-artifact-preflight';
+import {
+    installMainCapture,
+    readMainCaptureStatus,
+    rolloverMainCapture,
+    startMainCapture,
+    stopMainCapture,
+} from './m3u-refresh-main-capture';
+import { startRendererCapture } from './m3u-refresh-renderer-capture';
+import type { RendererWindowIdentity } from './renderer-window-rss-session';
+import {
+    createSyntheticM3uFixture,
+    SYNTHETIC_M3U_CHANNEL_COUNT,
+    SYNTHETIC_M3U_SEED,
+    type SyntheticM3uFixture,
+} from './synthetic-m3u';
+
+const SCENARIO = 'm3u-refresh-cancel';
+const SOURCE_TITLE = 'Synthetic M3U cancellation 100k';
+const RESOURCE_PATH = '/synthetic-performance.m3u';
+const DEFAULT_MEASURED_RUNS = 5;
+const DEFAULT_WARMUP_RUNS = 1;
+const OUTPUT_VARIANT_PATTERN = /^[a-z][a-z0-9-]{0,31}$/;
+const RENDERER_CDP_PORT = 9222;
+
+interface SyntheticServer {
+    readonly resourceUrl: string;
+    close(): Promise<void>;
+    serveLargeFixture(): void;
+    serveSeedFixture(): void;
+}
+
+interface BenchmarkConfiguration {
+    readonly electronVersion: string;
+    readonly gitCommit: string;
+    readonly gitDiffSha256: string;
+    readonly gitDirty: boolean;
+    readonly measuredRuns: number;
+    readonly outputDirectory: string;
+    readonly variant: string;
+    readonly warmupRuns: number;
+    readonly workspaceRoot: string;
+}
+
+interface IterationDefinition {
+    readonly kind: PerformanceIterationKind;
+    readonly runId: string;
+}
+
+export async function runM3uRefreshCancellationBenchmark(): Promise<void> {
+    const config = await resolveConfiguration();
+    const fixture = createSyntheticM3uFixture();
+    const server = await startSyntheticServer(fixture);
+    const iterations: CancellationIterationResult[] = [];
+
+    try {
+        for (const definition of createIterationDefinitions(config)) {
+            console.log(
+                `[performance] ${config.variant}/${definition.runId} starting`
+            );
+            const result = await runIteration(config, definition, server);
+            iterations.push(result);
+            console.log(
+                `[performance] ${definition.runId} total=${
+                    result.phases.totalMs?.toFixed(3) ?? 'n/a'
+                }ms cancelEffect=${result.cancellationEffectObserved}`
+            );
+        }
+    } finally {
+        await server.close();
+    }
+
+    const manifest: CancellationBenchmarkManifest = Object.freeze({
+        channelCount: SYNTHETIC_M3U_CHANNEL_COUNT,
+        fixtureBytes: fixture.bytes,
+        fixtureSha256: fixture.sha256,
+        gitCommit: config.gitCommit,
+        gitDiffSha256: config.gitDiffSha256,
+        gitDirty: config.gitDirty,
+        measuredRuns: config.measuredRuns,
+        memoryAccounting: Object.freeze({
+            mainRss:
+                'electron-main-process-including-worker-threads-and-native-memory',
+            rendererRss: 'separate-renderer-process',
+            workerJsHeap: 'separate-v8-isolate',
+            workerRss: 'unavailable-per-thread',
+        }),
+        scenario: SCENARIO,
+        syntheticSeed: SYNTHETIC_M3U_SEED,
+        runtime: Object.freeze({
+            arch: process.arch,
+            electronVersion: config.electronVersion,
+            harnessNodeVersion: process.versions.node,
+            platform: process.platform,
+        }),
+        variant: config.variant,
+        warmupRuns: config.warmupRuns,
+    });
+    const summary = createCancellationBenchmarkSummary(manifest, iterations);
+    await writeJson(join(config.outputDirectory, 'manifest.json'), manifest);
+    await writeJson(join(config.outputDirectory, 'summary.json'), summary);
+    const diagnosticIteration = iterations.find(
+        (iteration) => iteration.kind === PERFORMANCE_ITERATION_KIND.DIAGNOSTIC
+    );
+    if (!diagnosticIteration) {
+        throw new Error('Diagnostic iteration is missing');
+    }
+    if (!diagnosticIteration.cancellationEffectObserved) {
+        throw new Error(
+            'Cancellation effect was not observed in the diagnostic run'
+        );
+    }
+    await validateDiagnosticPlaylistWorkerCapture(
+        diagnosticIteration.main,
+        join(config.outputDirectory, diagnosticIteration.runId)
+    );
+    if (summary.cancellationEffectRate !== 1) {
+        throw new Error(
+            `Cancellation effect was not observed in every measured run: ${summary.cancellationEffectRate}`
+        );
+    }
+    if (!summary.validity.rendererRss.validForBenchmark) {
+        throw new Error(
+            `Renderer RSS capture is invalid: ${JSON.stringify(
+                summary.validity.rendererRss.invalidMeasuredRuns
+            )}`
+        );
+    }
+    if (!summary.validity.databaseWorkerPostGc.validForBenchmark) {
+        throw new Error(
+            `Database worker post-GC capture is invalid: ${JSON.stringify(
+                summary.validity.databaseWorkerPostGc.invalidMeasuredRuns
+            )}`
+        );
+    }
+    console.log(
+        `[performance] completed: ${join(
+            config.outputDirectory,
+            'summary.json'
+        )}`
+    );
+}
+
+async function runIteration(
+    config: BenchmarkConfiguration,
+    definition: IterationDefinition,
+    server: SyntheticServer
+): Promise<CancellationIterationResult> {
+    const iterationDirectory = join(config.outputDirectory, definition.runId);
+    await assertPerformanceArtifactCapacity(iterationDirectory);
+    await mkdir(iterationDirectory, { recursive: false });
+    const dataDirectory = await mkdtemp(
+        join(tmpdir(), 'iptvnator-m3u-performance-')
+    );
+    let app: LaunchedElectronApp | null = null;
+    let rendererConsoleListener: ((message: ConsoleMessage) => void) | null =
+        null;
+
+    try {
+        await assertTcpPortAvailable(RENDERER_CDP_PORT);
+        server.serveSeedFixture();
+        app = await launchElectronApp(dataDirectory, {
+            args: [
+                '--js-flags=--expose-gc',
+                '--remote-debugging-address=127.0.0.1',
+                `--remote-debugging-port=${RENDERER_CDP_PORT}`,
+                `--user-data-dir=${join(dataDirectory, 'user-data')}`,
+            ],
+            env: {
+                IPTVNATOR_DB_WORKER_BATCH_DELAY_MS: '0',
+                IPTVNATOR_PERF_CAPTURE: '1',
+                IPTVNATOR_PERF_WORKER_PROFILING: '1',
+                IPTVNATOR_TRACE_RENDERER_CONSOLE:
+                    process.env['IPTVNATOR_TRACE_RENDERER_CONSOLE'] ?? '0',
+            },
+        });
+        await assertRendererCdpTarget(app.mainWindow);
+        app.mainWindow.setDefaultTimeout(120_000);
+        await installMainCapture(app.electronApp);
+        const rendererWindowIdentity = await resolveRendererWindowIdentity(app);
+        await startMainCapture(app.electronApp, {
+            diagnostic: false,
+            outputDirectory: iterationDirectory,
+            rendererWindowIdentity,
+        });
+        await seedPlaylist(app.mainWindow, server.resourceUrl);
+        await waitForSeedSettlement(app);
+        server.serveLargeFixture();
+        const rendererRefreshErrors: string[] = [];
+        rendererConsoleListener = (message) => {
+            if (
+                message.type() === 'error' &&
+                message.text().includes('Error refreshing playlist:')
+            ) {
+                rendererRefreshErrors.push(message.text());
+            }
+        };
+        app.mainWindow.on('console', rendererConsoleListener);
+
+        const diagnostic =
+            definition.kind === PERFORMANCE_ITERATION_KIND.DIAGNOSTIC;
+        const seedRollover = await rolloverMainCapture(app.electronApp, {
+            diagnostic,
+            outputDirectory: iterationDirectory,
+            rendererWindowIdentity,
+        });
+        await writeJson(
+            join(iterationDirectory, 'seed-main-capture.json'),
+            seedRollover.completedCapture
+        );
+        if (!seedRollover.nextCaptureStarted) {
+            throw new Error(
+                `Seed capture could not atomically arm the measured generation: ${seedRollover.nextCaptureUnavailableReason}`
+            );
+        }
+        const renderer = await startRendererCapture(app.mainWindow, {
+            diagnostic,
+            outputDirectory: iterationDirectory,
+            sourceTitle: SOURCE_TITLE,
+        });
+
+        await renderer.markOperationStart();
+        const row = sourceRowByTitle(app.mainWindow, SOURCE_TITLE).first();
+        await row.locator('.refresh-btn').click();
+        await renderer.waitForCancelClick();
+        await Promise.all([
+            renderer.waitForTerminal(),
+            waitForOperationSettlement(app),
+        ]);
+        expect(rendererRefreshErrors).toEqual([]);
+
+        const [rendererMetrics, mainMetrics] = await Promise.all([
+            renderer.stop(),
+            stopMainCapture(app.electronApp),
+        ]);
+        const result = createCancellationIterationResult({
+            kind: definition.kind,
+            main: mainMetrics,
+            renderer: rendererMetrics,
+            runId: definition.runId,
+        });
+        await writeJson(join(iterationDirectory, 'result.json'), result);
+        return result;
+    } finally {
+        if (app) {
+            if (rendererConsoleListener) {
+                app.mainWindow.off('console', rendererConsoleListener);
+            }
+            await closeElectronApp(app).catch((error: unknown) => {
+                console.error('[performance] Electron cleanup failed', error);
+            });
+        }
+        await rm(dataDirectory, { force: true, recursive: true });
+    }
+}
+
+async function resolveRendererWindowIdentity(
+    app: LaunchedElectronApp
+): Promise<RendererWindowIdentity> {
+    const browserWindowHandle = await app.electronApp.browserWindow(
+        app.mainWindow
+    );
+    try {
+        return await browserWindowHandle.evaluate((browserWindow) => {
+            const exactWindow = browserWindow as unknown as {
+                readonly id: number;
+                readonly webContents: { readonly id: number };
+            };
+            return {
+                browserWindowId: exactWindow.id,
+                webContentsId: exactWindow.webContents.id,
+            };
+        });
+    } finally {
+        await browserWindowHandle.dispose();
+    }
+}
+
+async function seedPlaylist(page: Page, playlistUrl: string): Promise<void> {
+    await page.getByRole('button', { name: 'Add playlist' }).first().click();
+    const dialog = page.locator('mat-dialog-container').last();
+    await expect(
+        dialog.getByRole('heading', { name: 'Add playlist' })
+    ).toBeVisible();
+    await dialog
+        .getByRole('textbox', { name: 'Playlist URL (m3u, m3u8)' })
+        .fill(playlistUrl);
+    await dialog
+        .getByRole('textbox', { name: 'Playlist title' })
+        .fill(SOURCE_TITLE);
+    await dialog.getByRole('button', { name: 'Add playlist' }).last().click();
+    await expect(dialog).toBeHidden();
+    await waitForM3uCatalog(page);
+    await openSources(page);
+    await expect(sourceRowByTitle(page, SOURCE_TITLE).first()).toBeVisible();
+    await waitForTwoAnimationFrames(page);
+}
+
+async function waitForSeedSettlement(app: LaunchedElectronApp): Promise<void> {
+    await expect
+        .poll(
+            async () => {
+                const status = await readMainCaptureStatus(app.electronApp);
+                return (
+                    status.databaseRequests > 0 &&
+                    status.databaseUpsertsCompleted > 0 &&
+                    status.databasePending === 0
+                );
+            },
+            { timeout: 120_000 }
+        )
+        .toBe(true);
+    await waitForTwoAnimationFrames(app.mainWindow);
+}
+
+async function waitForOperationSettlement(
+    app: LaunchedElectronApp
+): Promise<void> {
+    await expect
+        .poll(
+            async () => {
+                const status = await readMainCaptureStatus(app.electronApp);
+                if (status.playlistResponsesSucceeded > 0) {
+                    return (
+                        status.databaseUpsertsCompleted > 0 &&
+                        status.databasePending === 0
+                    );
+                }
+                return (
+                    status.playlistTerminated > 0 &&
+                    (status.playlistResponses === 0 ||
+                        status.playlistResponsesFailed > 0)
+                );
+            },
+            { timeout: 120_000 }
+        )
+        .toBe(true);
+}
+
+async function waitForTwoAnimationFrames(page: Page): Promise<void> {
+    await page.evaluate(
+        () =>
+            new Promise<void>((resolvePromise) => {
+                requestAnimationFrame(() =>
+                    requestAnimationFrame(() => resolvePromise())
+                );
+            })
+    );
+}
+
+function createIterationDefinitions(
+    config: BenchmarkConfiguration
+): readonly IterationDefinition[] {
+    const definitions: IterationDefinition[] = [];
+    for (let index = 0; index < config.warmupRuns; index += 1) {
+        definitions.push({
+            kind: PERFORMANCE_ITERATION_KIND.WARMUP,
+            runId: `warmup-${String(index + 1).padStart(2, '0')}`,
+        });
+    }
+    for (let index = 0; index < config.measuredRuns; index += 1) {
+        definitions.push({
+            kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+            runId: `run-${String(index + 1).padStart(2, '0')}`,
+        });
+    }
+    definitions.push({
+        kind: PERFORMANCE_ITERATION_KIND.DIAGNOSTIC,
+        runId: 'diagnostic',
+    });
+    return Object.freeze(definitions);
+}
+
+async function resolveConfiguration(): Promise<BenchmarkConfiguration> {
+    const workspaceRoot = resolve(__dirname, '../../../..');
+    const performanceRoot = join(workspaceRoot, 'dist', 'performance');
+    const requestedRoot = process.env['IPTVNATOR_PERF_OUTPUT_DIR'];
+    if (!requestedRoot) {
+        throw new Error('IPTVNATOR_PERF_OUTPUT_DIR is required');
+    }
+    const outputRoot = resolve(requestedRoot);
+    if (
+        !isAbsolute(requestedRoot) ||
+        !isStrictDescendant(performanceRoot, outputRoot)
+    ) {
+        throw new Error(
+            'Performance output must be an absolute path below dist/performance'
+        );
+    }
+    const variant = process.env['IPTVNATOR_PERF_VARIANT'] ?? 'baseline';
+    if (!OUTPUT_VARIANT_PATTERN.test(variant)) {
+        throw new Error('IPTVNATOR_PERF_VARIANT is invalid');
+    }
+    const smoke = process.env['IPTVNATOR_PERF_SMOKE'] === '1';
+    const sourceState = readGitSourceState(workspaceRoot);
+    if (!smoke && sourceState.dirty) {
+        throw new Error(
+            'Formal performance runs require a clean Git worktree; commit or stash changes first'
+        );
+    }
+    const electronPackage = JSON.parse(
+        await readFile(
+            join(workspaceRoot, 'node_modules', 'electron', 'package.json'),
+            'utf8'
+        )
+    ) as { version?: unknown };
+    if (typeof electronPackage.version !== 'string') {
+        throw new Error('Unable to resolve the Electron runtime version');
+    }
+    const outputDirectory = join(outputRoot, variant);
+    await assertMissing(outputDirectory);
+    await assertPerformanceArtifactCapacity(outputDirectory);
+    await mkdir(outputDirectory, { recursive: true });
+    return Object.freeze({
+        electronVersion: electronPackage.version,
+        gitCommit: sourceState.commit,
+        gitDiffSha256: sourceState.diffSha256,
+        gitDirty: sourceState.dirty,
+        measuredRuns: smoke ? 1 : DEFAULT_MEASURED_RUNS,
+        outputDirectory,
+        variant,
+        warmupRuns: DEFAULT_WARMUP_RUNS,
+        workspaceRoot,
+    });
+}
+
+function readGitSourceState(workspaceRoot: string): {
+    readonly commit: string;
+    readonly diffSha256: string;
+    readonly dirty: boolean;
+} {
+    const git = (args: readonly string[]): string =>
+        execFileSync('git', [...args], {
+            cwd: workspaceRoot,
+            encoding: 'utf8',
+        });
+    const commit = git(['rev-parse', 'HEAD']).trim();
+    const status = git(['status', '--porcelain=v1', '--untracked-files=all']);
+    const trackedDiff = git(['diff', '--binary', 'HEAD']);
+    const stagedDiff = git(['diff', '--binary', '--cached', 'HEAD']);
+    const diffSha256 = createHash('sha256')
+        .update(status)
+        .update('\0')
+        .update(trackedDiff)
+        .update('\0')
+        .update(stagedDiff)
+        .digest('hex');
+    return Object.freeze({
+        commit,
+        diffSha256,
+        dirty: status.trim().length > 0,
+    });
+}
+
+function isStrictDescendant(parent: string, candidate: string): boolean {
+    const pathFromParent = relative(resolve(parent), resolve(candidate));
+    return (
+        pathFromParent.length > 0 &&
+        pathFromParent !== '..' &&
+        !pathFromParent.startsWith(`..${sep}`) &&
+        !isAbsolute(pathFromParent)
+    );
+}
+
+async function assertTcpPortAvailable(port: number): Promise<void> {
+    const server = createTcpServer();
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.once('error', rejectPromise);
+        server.listen(
+            { exclusive: true, host: '127.0.0.1', port },
+            resolvePromise
+        );
+    });
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.close((error) =>
+            error ? rejectPromise(error) : resolvePromise()
+        );
+    });
+}
+
+async function assertRendererCdpTarget(page: Page): Promise<void> {
+    await expect
+        .poll(
+            async () => {
+                try {
+                    const response = await fetch(
+                        `http://127.0.0.1:${RENDERER_CDP_PORT}/json/list`
+                    );
+                    if (!response.ok) {
+                        return false;
+                    }
+                    const targets = (await response.json()) as unknown;
+                    return (
+                        Array.isArray(targets) &&
+                        targets.some(
+                            (target) =>
+                                typeof target === 'object' &&
+                                target !== null &&
+                                (target as Record<string, unknown>)['type'] ===
+                                    'page' &&
+                                (target as Record<string, unknown>)['url'] ===
+                                    page.url()
+                        )
+                    );
+                } catch {
+                    return false;
+                }
+            },
+            { timeout: 10_000 }
+        )
+        .toBe(true);
+}
+
+async function assertMissing(path: string): Promise<void> {
+    try {
+        await access(path);
+    } catch {
+        return;
+    }
+    throw new Error(`Performance output already exists: ${path}`);
+}
+
+async function startSyntheticServer(
+    fixture: SyntheticM3uFixture
+): Promise<SyntheticServer> {
+    const seedBody = createSeedPlaylistBody();
+    let body = seedBody;
+    const server = createServer((request, response) => {
+        if (
+            request.method !== 'GET' ||
+            new URL(request.url ?? '/', 'http://127.0.0.1').pathname !==
+                RESOURCE_PATH
+        ) {
+            response.writeHead(404, { 'Content-Length': '0' });
+            response.end();
+            return;
+        }
+        const bytes = Buffer.byteLength(body, 'utf8');
+        response.writeHead(200, {
+            'Cache-Control': 'no-store',
+            'Content-Length': String(bytes),
+            'Content-Type': 'application/vnd.apple.mpegurl; charset=utf-8',
+        });
+        response.end(body);
+    });
+    server.listen({ exclusive: true, host: '127.0.0.1', port: 0 });
+    await once(server, 'listening');
+    const address = server.address();
+    if (!address || typeof address === 'string') {
+        await closeServer(server);
+        throw new Error('Synthetic M3U server did not bind IPv4 loopback');
+    }
+    return Object.freeze({
+        close: () => closeServer(server),
+        resourceUrl: `http://127.0.0.1:${address.port}${RESOURCE_PATH}`,
+        serveLargeFixture: () => {
+            body = fixture.body;
+        },
+        serveSeedFixture: () => {
+            body = seedBody;
+        },
+    });
+}
+
+function createSeedPlaylistBody(): string {
+    const lines = ['#EXTM3U'];
+    for (let index = 1; index <= 100; index += 1) {
+        lines.push(
+            `#EXTINF:-1 group-title="Synthetic Seed",Synthetic Seed ${String(
+                index
+            ).padStart(3, '0')}`
+        );
+        lines.push(`http://127.0.0.1/seed/${index}`);
+    }
+    return `${lines.join('\n')}\n`;
+}
+
+async function closeServer(server: Server): Promise<void> {
+    if (!server.listening) {
+        return;
+    }
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.close((error) =>
+            error ? rejectPromise(error) : resolvePromise()
+        );
+    });
+}
+
+async function writeJson(path: string, value: unknown): Promise<void> {
+    await writeFile(path, `${JSON.stringify(value, null, 2)}\n`, 'utf8');
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-refresh-main-capture.ts b/apps/electron-backend-e2e/src/performance/m3u-refresh-main-capture.ts
new file mode 100644
index 000000000..2c4536f8e
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-refresh-main-capture.ts
@@ -0,0 +1,1554 @@
+/* eslint-disable max-lines -- The injected main-process protocol must remain self-contained for Playwright serialization. */
+import type { ElectronApplication } from '@playwright/test';
+import {
+    M3U_IMPORT_PERFORMANCE_PHASE,
+    M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL,
+} from '@iptvnator/shared/interfaces';
+
+import {
+    DATABASE_REQUEST_IDENTITY_CAPTURE_STATE_KEY,
+    installDatabaseRequestIdentityCapture,
+    type DatabaseRequestIdentity,
+    type DatabaseRequestIdentityCaptureApi,
+} from './database-request-identity-capture';
+import {
+    createDatabaseWorkerPostGcCutoffApi,
+    type DatabaseWorkerPostGcCutoffApi,
+} from './database-worker-post-gc-cutoff';
+import {
+    createDatabaseWorkerPostGcFinalizationApi,
+    type DatabaseWorkerPostGcAncillaryFailureStage,
+    type DatabaseWorkerPostGcFinalizationApi,
+} from './database-worker-post-gc-finalization';
+import {
+    createDatabaseWorkerPostGcProbeApi,
+    type DatabaseWorkerPostGcProbeApi,
+} from './database-worker-post-gc-probe';
+import {
+    createDatabaseWorkerPostGcSelectionApi,
+    type DatabaseWorkerPostGcSelectionApi,
+    type DatabaseWorkerPostGcUnavailableReason,
+} from './database-worker-post-gc-selection';
+import type {
+    MainCaptureMetrics,
+    WorkerPostGcHeapUnavailableReason,
+} from './m3u-refresh-cancellation-contract';
+import {
+    selectMainCaptureGeneration,
+    type MainCaptureGenerationTransport,
+} from './worker-request-performance';
+import {
+    createWorkerTerminationGenerationApi,
+    type WorkerTerminationGenerationApi,
+} from './worker-termination-generation';
+import {
+    createRendererProcessRssCaptureApi,
+    type RendererProcessRssCaptureApi,
+} from './renderer-process-rss-capture';
+import {
+    createRendererWindowRssSessionApi,
+    type RendererWindowIdentity,
+    type RendererWindowRssSession,
+    type RendererWindowRssSessionApi,
+    type RendererWindowRssSessionMetrics,
+} from './renderer-window-rss-session';
+
+const MAIN_CAPTURE_STATE_KEY = '__iptvnatorM3uRefreshMainCapture';
+
+export interface MainCaptureStartOptions {
+    readonly diagnostic: boolean;
+    readonly outputDirectory: string;
+    readonly rendererWindowIdentity: RendererWindowIdentity;
+}
+
+export interface MainCaptureStatus {
+    readonly databaseGetsCompleted: number;
+    readonly databasePending: number;
+    readonly databaseRequests: number;
+    readonly databaseUpsertsCompleted: number;
+    readonly playlistTerminated: number;
+    readonly playlistResponsesFailed: number;
+    readonly playlistResponses: number;
+    readonly playlistResponsesSucceeded: number;
+    readonly preloadSuccessMarkers: number;
+}
+
+export interface MainCaptureRolloverResult {
+    readonly completedCapture: MainCaptureMetrics;
+    readonly nextCaptureStarted: boolean;
+    readonly nextCaptureUnavailableReason: string | null;
+}
+
+interface MainCaptureRolloverStatus {
+    readonly nextCaptureStarted: boolean;
+    readonly nextCaptureUnavailableReason: string | null;
+}
+
+type MainCaptureStopTransport = MainCaptureGenerationTransport & {
+    readonly rollover: MainCaptureRolloverStatus | null;
+};
+
+export async function installMainCapture(
+    electronApp: ElectronApplication
+): Promise<void> {
+    await installDatabaseRequestIdentityCapture(electronApp);
+    const captureStateKeys = {
+        databaseRequestIdentityStateKey:
+            DATABASE_REQUEST_IDENTITY_CAPTURE_STATE_KEY,
+        databaseWorkerPostGcCutoffApiFactorySource:
+            createDatabaseWorkerPostGcCutoffApi.toString(),
+        databaseWorkerPostGcFinalizationApiFactorySource:
+            createDatabaseWorkerPostGcFinalizationApi.toString(),
+        databaseWorkerPostGcProbeApiFactorySource:
+            createDatabaseWorkerPostGcProbeApi.toString(),
+        databaseWorkerPostGcSelectionApiFactorySource:
+            createDatabaseWorkerPostGcSelectionApi.toString(),
+        rendererProcessRssApiFactorySource:
+            createRendererProcessRssCaptureApi.toString(),
+        rendererWindowRssSessionApiFactorySource:
+            createRendererWindowRssSessionApi.toString(),
+        m3uImportPerformancePhaseEventChannel:
+            M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL,
+        m3uImportPerformancePhases: Object.values(M3U_IMPORT_PERFORMANCE_PHASE),
+        stateKey: MAIN_CAPTURE_STATE_KEY,
+        workerTerminationGenerationApiFactorySource:
+            createWorkerTerminationGenerationApi.toString(),
+    };
+    await electronApp.evaluate(async ({ app, BrowserWindow }, input) => {
+        type JsonRecord = Record<string, unknown>;
+        type WorkerTransferable = import('node:worker_threads').Transferable;
+        interface CpuProfileHandle {
+            stop(): Promise<unknown>;
+        }
+        interface WorkerHeapStatistics {
+            external_memory?: number;
+            used_heap_size?: number;
+        }
+        interface WorkerCpuUsage {
+            system: number;
+            user: number;
+        }
+        interface WorkerElu {
+            active: number;
+            idle: number;
+            utilization: number;
+        }
+        interface WorkerRequestPerformance {
+            identity: DatabaseRequestIdentity;
+            operation: string | null;
+            performanceCapture: unknown;
+            playlistId: string | null;
+            requestId: string | null;
+            responseEpochMs: number;
+            success: boolean;
+        }
+        interface InstrumentedWorker {
+            cpuUsage?(): Promise<WorkerCpuUsage>;
+            getHeapSnapshot?(): Promise<NodeJS.ReadableStream>;
+            getHeapStatistics?(): Promise<WorkerHeapStatistics>;
+            on(event: 'message', listener: (message: unknown) => void): this;
+            performance?: {
+                eventLoopUtilization(
+                    utilization1?: WorkerElu,
+                    utilization2?: WorkerElu
+                ): WorkerElu;
+            };
+            postMessage(
+                message: unknown,
+                transferList?: readonly WorkerTransferable[]
+            ): void;
+            startCpuProfile?(): Promise<CpuProfileHandle>;
+            terminate(): Promise<number>;
+        }
+        interface WorkerRecord {
+            cancelPostedEpochMs: number | null;
+            captureGeneration: number | null;
+            cpuFirst: WorkerCpuUsage | null;
+            cpuLast: WorkerCpuUsage | null;
+            elu: number | null;
+            eluStart: WorkerElu | null;
+            externalMemorySampleCount: number;
+            externalPeak: number;
+            finalized: boolean;
+            finalizationKey: object;
+            finalizationTimedOut: boolean;
+            finalizing: Promise<void> | null;
+            heapPeak: number;
+            heapUsedSampleCount: number;
+            kind: 'database.worker' | 'playlist-refresh.worker';
+            operationId: string | null;
+            ordinal: number;
+            pendingCount: number;
+            playlistId: string | null;
+            postGcHeapUnavailableReason: WorkerPostGcHeapUnavailableReason | null;
+            postGcHeapUsed: number | null;
+            profileHandle: Promise<CpuProfileHandle> | null;
+            profileCaptureKey: object;
+            profilePath: string | null;
+            profileResult: unknown | null;
+            resolvedProfileHandle: CpuProfileHandle | null;
+            requestPerformance: WorkerRequestPerformance[];
+            responseEpochMs: number | null;
+            samplePromise: Promise<void> | null;
+            sampleTimer: NodeJS.Timeout | null;
+            snapshotPath: string | null;
+            terminatedEpochMs: number | null;
+            worker: InstrumentedWorker;
+        }
+        interface TimelineRecord {
+            readonly boundary?: 'end' | 'start';
+            readonly byteCount?: number;
+            readonly durationMs?: number | null;
+            readonly epochMs: number;
+            readonly ipcCallId?: number;
+            readonly itemCount?: number;
+            readonly operation?: string;
+            readonly operationId?: string;
+            readonly phase?: string;
+            readonly playlistId?: string;
+            readonly requestId?: string;
+            readonly success?: boolean;
+            readonly sourceEpochMs?: number;
+            readonly type: string;
+        }
+
+        const target = globalThis as unknown as Record<string, unknown>;
+        if (target[input.stateKey] !== undefined) {
+            return;
+        }
+        const databaseRequestIdentityCapture = target[
+            input.databaseRequestIdentityStateKey
+        ] as DatabaseRequestIdentityCaptureApi;
+        const restoreFactory = <T>(source: string): T => {
+            const factory = new Function(
+                `"use strict"; return (${source});`
+            )() as () => T;
+            return factory();
+        };
+        const databaseWorkerPostGcCutoffApi =
+            restoreFactory<DatabaseWorkerPostGcCutoffApi>(
+                input.databaseWorkerPostGcCutoffApiFactorySource
+            );
+        const databaseWorkerPostGcFinalizationApi =
+            restoreFactory<DatabaseWorkerPostGcFinalizationApi>(
+                input.databaseWorkerPostGcFinalizationApiFactorySource
+            );
+        const databaseWorkerPostGcProbeApi =
+            restoreFactory<DatabaseWorkerPostGcProbeApi>(
+                input.databaseWorkerPostGcProbeApiFactorySource
+            );
+        const databaseWorkerPostGcSelectionApi =
+            restoreFactory<DatabaseWorkerPostGcSelectionApi>(
+                input.databaseWorkerPostGcSelectionApiFactorySource
+            );
+        const rendererProcessRssApi =
+            restoreFactory<RendererProcessRssCaptureApi>(
+                input.rendererProcessRssApiFactorySource
+            );
+        const rendererWindowRssSessionApi =
+            restoreFactory<RendererWindowRssSessionApi>(
+                input.rendererWindowRssSessionApiFactorySource
+            );
+        const workerTerminationGenerationApi =
+            restoreFactory<WorkerTerminationGenerationApi>(
+                input.workerTerminationGenerationApiFactorySource
+            );
+
+        const runtimeProcess = process as typeof process & {
+            getBuiltinModule(id: string): unknown;
+        };
+        const fs = runtimeProcess.getBuiltinModule(
+            'node:fs'
+        ) as typeof import('node:fs');
+        const inspector = runtimeProcess.getBuiltinModule(
+            'node:inspector'
+        ) as typeof import('node:inspector');
+        const diagnosticsChannel = runtimeProcess.getBuiltinModule(
+            'node:diagnostics_channel'
+        ) as typeof import('node:diagnostics_channel');
+        const path = runtimeProcess.getBuiltinModule(
+            'node:path'
+        ) as typeof import('node:path');
+        const perfHooks = runtimeProcess.getBuiltinModule(
+            'node:perf_hooks'
+        ) as typeof import('node:perf_hooks');
+        const streamPromises = runtimeProcess.getBuiltinModule(
+            'node:stream/promises'
+        ) as typeof import('node:stream/promises');
+        const workerThreads = runtimeProcess.getBuiltinModule(
+            'node:worker_threads'
+        ) as typeof import('node:worker_threads');
+        const WorkerClass = workerThreads.Worker;
+        const originalPostMessage = WorkerClass.prototype.postMessage;
+        const originalTerminate = WorkerClass.prototype.terminate;
+        const records = new Map<InstrumentedWorker, WorkerRecord>();
+        let nextWorkerOrdinal = 1;
+        const operationWorkers = new Map<string, WorkerRecord>();
+        const dbRequests = new Map<
+            string,
+            {
+                identity: DatabaseRequestIdentity;
+                operation: string;
+                playlistId: string | null;
+                record: WorkerRecord;
+            }
+        >();
+
+        const state = {
+            active: false,
+            captureGeneration: 0,
+            cpuStart: null as NodeJS.CpuUsage | null,
+            diagnostic: false,
+            eventLoopDelay: null as ReturnType<
+                typeof perfHooks.monitorEventLoopDelay
+            > | null,
+            eventLoopStart: null as ReturnType<
+                typeof perfHooks.performance.eventLoopUtilization
+            > | null,
+            inspectorSession: null as import('node:inspector').Session | null,
+            mainPeakHeap: 0,
+            mainPeakRss: 0,
+            mainProfilePath: null as string | null,
+            mainSnapshotPath: null as string | null,
+            outputDirectory: '',
+            postGcHeap: null as number | null,
+            postGcRss: null as number | null,
+            rendererWindowSession: null as RendererWindowRssSession | null,
+            sampleTimer: null as NodeJS.Timeout | null,
+            stopping: false,
+            timeline: [] as TimelineRecord[],
+        };
+
+        const nowEpochMs = (): number =>
+            perfHooks.performance.timeOrigin + perfHooks.performance.now();
+        const recordTimeline = (
+            record: Omit<TimelineRecord, 'epochMs'>
+        ): void => {
+            if (state.active || state.stopping) {
+                state.timeline.push({ epochMs: nowEpochMs(), ...record });
+            }
+        };
+        const m3uImportPhases = new Set<string>(
+            input.m3uImportPerformancePhases
+        );
+        diagnosticsChannel
+            .channel(input.m3uImportPerformancePhaseEventChannel)
+            .subscribe((incoming: unknown) => {
+                if (!state.active && !state.stopping) {
+                    return;
+                }
+                if (typeof incoming !== 'object' || incoming === null) {
+                    return;
+                }
+                const event = incoming as JsonRecord;
+                const boundary = event['boundary'];
+                const durationMs = event['durationMs'];
+                const epochMs = event['epochMs'];
+                const metadata =
+                    typeof event['metadata'] === 'object' &&
+                    event['metadata'] !== null
+                        ? (event['metadata'] as JsonRecord)
+                        : null;
+                const phase = event['phase'];
+                const requestId = event['requestId'];
+                if (
+                    (boundary !== 'start' && boundary !== 'end') ||
+                    typeof epochMs !== 'number' ||
+                    !Number.isFinite(epochMs) ||
+                    typeof phase !== 'string' ||
+                    !m3uImportPhases.has(phase) ||
+                    typeof requestId !== 'string' ||
+                    requestId.length === 0 ||
+                    (boundary === 'start' && durationMs !== null) ||
+                    (boundary === 'end' &&
+                        (typeof durationMs !== 'number' ||
+                            !Number.isFinite(durationMs) ||
+                            durationMs < 0))
+                ) {
+                    return;
+                }
+                const byteCount = metadata?.['byteCount'];
+                const itemCount = metadata?.['itemCount'];
+                state.timeline.push({
+                    boundary,
+                    ...(isCount(byteCount) ? { byteCount } : {}),
+                    durationMs: durationMs as number | null,
+                    epochMs,
+                    ...(isCount(itemCount) ? { itemCount } : {}),
+                    phase,
+                    requestId,
+                    type: 'm3u-import-phase',
+                });
+            });
+        const isCount = (value: unknown): value is number =>
+            Number.isSafeInteger(value) && Number(value) >= 0;
+        const classifyRequest = (
+            message: JsonRecord
+        ): 'database.worker' | 'playlist-refresh.worker' | null => {
+            if (typeof message['operation'] === 'string') {
+                return 'database.worker';
+            }
+            const payload = message['payload'];
+            return typeof payload === 'object' &&
+                payload !== null &&
+                typeof (payload as JsonRecord)['operationId'] === 'string' &&
+                typeof (payload as JsonRecord)['playlistId'] === 'string'
+                ? 'playlist-refresh.worker'
+                : null;
+        };
+        const readDatabasePlaylistId = (message: JsonRecord): string | null => {
+            const payload = message['payload'];
+            if (typeof payload !== 'object' || payload === null) {
+                return null;
+            }
+            const value = payload as JsonRecord;
+            const playlistId = value['playlistId'] ?? value['_id'];
+            return typeof playlistId === 'string' ? playlistId : null;
+        };
+        const isCurrentCaptureRecord = (record: WorkerRecord): boolean =>
+            state.active &&
+            record.captureGeneration === state.captureGeneration;
+        const createWorkerRecord = (
+            worker: InstrumentedWorker,
+            kind: WorkerRecord['kind']
+        ): WorkerRecord => {
+            const existing = records.get(worker);
+            if (existing) {
+                return existing;
+            }
+            const record: WorkerRecord = {
+                cancelPostedEpochMs: null,
+                captureGeneration: null,
+                cpuFirst: null,
+                cpuLast: null,
+                elu: null,
+                eluStart: null,
+                externalMemorySampleCount: 0,
+                externalPeak: 0,
+                finalized: false,
+                finalizationKey: {},
+                finalizationTimedOut: false,
+                finalizing: null,
+                heapPeak: 0,
+                heapUsedSampleCount: 0,
+                kind,
+                operationId: null,
+                ordinal: nextWorkerOrdinal,
+                pendingCount: 0,
+                playlistId: null,
+                postGcHeapUnavailableReason: 'post-gc-probe-not-run',
+                postGcHeapUsed: null,
+                profileHandle: null,
+                profileCaptureKey: {},
+                profilePath: null,
+                profileResult: null,
+                resolvedProfileHandle: null,
+                requestPerformance: [],
+                responseEpochMs: null,
+                samplePromise: null,
+                sampleTimer: null,
+                snapshotPath: null,
+                terminatedEpochMs: null,
+                worker,
+            };
+            nextWorkerOrdinal += 1;
+            records.set(worker, record);
+            worker.on('message', (incoming) => {
+                if (typeof incoming !== 'object' || incoming === null) {
+                    return;
+                }
+                const message = incoming as JsonRecord;
+                if (!isCurrentCaptureRecord(record)) {
+                    return;
+                }
+                if (record.kind === 'playlist-refresh.worker') {
+                    if (message['type'] === 'event') {
+                        const event = message['event'] as
+                            JsonRecord | undefined;
+                        recordTimeline({
+                            operationId: record.operationId ?? undefined,
+                            playlistId: record.playlistId ?? undefined,
+                            type: `playlist-event:${String(
+                                event?.['status'] ?? 'unknown'
+                            )}:${String(event?.['phase'] ?? 'none')}`,
+                        });
+                    } else if (message['type'] === 'response') {
+                        const responseEpochMs = nowEpochMs();
+                        record.responseEpochMs = responseEpochMs;
+                        record.requestPerformance.push({
+                            identity: {
+                                ipcCallId: null,
+                                operationId: record.operationId,
+                                operationIdUnavailableReason: null,
+                                sourceEpochMs: null,
+                            },
+                            operation: null,
+                            performanceCapture: message['performance'] ?? null,
+                            playlistId: record.playlistId,
+                            requestId: null,
+                            responseEpochMs,
+                            success: message['success'] === true,
+                        });
+                        recordTimeline({
+                            operationId: record.operationId ?? undefined,
+                            playlistId: record.playlistId ?? undefined,
+                            success: message['success'] === true,
+                            type: 'playlist-response',
+                        });
+                    }
+                    return;
+                }
+                if (
+                    message['type'] === 'response' &&
+                    typeof message['requestId'] === 'string'
+                ) {
+                    const request = dbRequests.get(message['requestId']);
+                    if (request) {
+                        request.record.pendingCount = Math.max(
+                            0,
+                            request.record.pendingCount - 1
+                        );
+                        record.requestPerformance.push({
+                            identity: request.identity,
+                            operation: request.operation,
+                            performanceCapture: message['performance'] ?? null,
+                            playlistId: request.playlistId,
+                            requestId: message['requestId'],
+                            responseEpochMs: nowEpochMs(),
+                            success: message['success'] === true,
+                        });
+                    }
+                    if (request) {
+                        dbRequests.delete(message['requestId']);
+                        recordTimeline({
+                            operation: request.operation,
+                            operationId:
+                                request.identity.operationId ?? undefined,
+                            playlistId: request.playlistId ?? undefined,
+                            requestId: message['requestId'],
+                            success: message['success'] === true,
+                            type: 'db-response',
+                        });
+                    }
+                }
+            });
+            return record;
+        };
+        const sampleWorker = (record: WorkerRecord): Promise<void> => {
+            if (record.finalized) {
+                return Promise.resolve();
+            }
+            if (record.samplePromise) {
+                return record.samplePromise;
+            }
+            record.samplePromise = (async () => {
+                try {
+                    const stats = await record.worker.getHeapStatistics?.();
+                    if (stats) {
+                        const heapUsedSample = stats.used_heap_size;
+                        if (
+                            typeof heapUsedSample === 'number' &&
+                            Number.isFinite(heapUsedSample) &&
+                            heapUsedSample >= 0
+                        ) {
+                            record.heapUsedSampleCount += 1;
+                            record.heapPeak = Math.max(
+                                record.heapPeak,
+                                heapUsedSample
+                            );
+                        }
+                        const externalMemorySample = stats.external_memory;
+                        if (
+                            typeof externalMemorySample === 'number' &&
+                            Number.isFinite(externalMemorySample) &&
+                            externalMemorySample >= 0
+                        ) {
+                            record.externalMemorySampleCount += 1;
+                            record.externalPeak = Math.max(
+                                record.externalPeak,
+                                externalMemorySample
+                            );
+                        }
+                    }
+                    const cpu = await record.worker.cpuUsage?.();
+                    if (cpu) {
+                        record.cpuFirst ??= cpu;
+                        record.cpuLast = cpu;
+                    }
+                    const elu = record.worker.performance?.eventLoopUtilization(
+                        record.eluStart ?? undefined
+                    );
+                    if (elu) {
+                        record.elu = elu.utilization;
+                    }
+                } catch {
+                    // A one-shot worker may terminate between sampling calls.
+                }
+            })().finally(() => {
+                record.samplePromise = null;
+            });
+            return record.samplePromise;
+        };
+        const resetWorkerForCapture = (record: WorkerRecord): void => {
+            if (record.sampleTimer) {
+                clearInterval(record.sampleTimer);
+            }
+            record.cancelPostedEpochMs = null;
+            record.captureGeneration = state.captureGeneration;
+            record.cpuFirst = null;
+            record.cpuLast = null;
+            record.elu = null;
+            record.eluStart = null;
+            record.externalMemorySampleCount = 0;
+            record.externalPeak = 0;
+            record.finalized = false;
+            record.finalizationKey = {};
+            record.finalizationTimedOut = false;
+            record.finalizing = null;
+            record.heapPeak = 0;
+            record.heapUsedSampleCount = 0;
+            record.operationId = null;
+            record.pendingCount = 0;
+            record.playlistId = null;
+            record.postGcHeapUnavailableReason = 'post-gc-probe-not-run';
+            record.postGcHeapUsed = null;
+            record.profileHandle = null;
+            record.profileCaptureKey = {};
+            record.profilePath = null;
+            record.profileResult = null;
+            record.resolvedProfileHandle = null;
+            record.requestPerformance = [];
+            record.responseEpochMs = null;
+            record.samplePromise = null;
+            record.sampleTimer = null;
+            record.snapshotPath = null;
+            record.terminatedEpochMs = null;
+        };
+        const startWorker = (record: WorkerRecord): void => {
+            if (!state.active) {
+                return;
+            }
+            if (record.captureGeneration !== state.captureGeneration) {
+                resetWorkerForCapture(record);
+            }
+            if (record.sampleTimer !== null) {
+                return;
+            }
+            record.elu = null;
+            record.eluStart =
+                record.worker.performance?.eventLoopUtilization() ?? null;
+            void sampleWorker(record);
+            record.sampleTimer = setInterval(
+                () => void sampleWorker(record),
+                20
+            );
+            if (
+                state.diagnostic &&
+                typeof record.worker.startCpuProfile === 'function'
+            ) {
+                record.profilePath = path.join(
+                    state.outputDirectory,
+                    `${record.kind}-${record.ordinal}.cpuprofile`
+                );
+                const profileHandle = record.worker.startCpuProfile();
+                const profileCaptureKey = record.profileCaptureKey;
+                record.profileHandle = profileHandle;
+                void profileHandle.then(
+                    (handle) => {
+                        if (
+                            record.profileCaptureKey === profileCaptureKey &&
+                            record.profileHandle === profileHandle
+                        ) {
+                            record.resolvedProfileHandle = handle;
+                        }
+                    },
+                    () => undefined
+                );
+            }
+        };
+        const stopWorkerSampling = (record: WorkerRecord): void => {
+            if (record.sampleTimer) {
+                clearInterval(record.sampleTimer);
+                record.sampleTimer = null;
+            }
+        };
+        const joinFinalWorkerSample = async (
+            record: WorkerRecord
+        ): Promise<void> => {
+            if (record.samplePromise) {
+                await record.samplePromise;
+            }
+            await sampleWorker(record);
+        };
+        const stopWorkerProfile = async (
+            record: WorkerRecord,
+            waitForHandle = true
+        ): Promise<void> => {
+            const profileCaptureKey = record.profileCaptureKey;
+            const profileHandle = record.profileHandle;
+            if (!profileHandle || !record.profilePath) {
+                return;
+            }
+            const handle =
+                record.resolvedProfileHandle ??
+                (waitForHandle ? await profileHandle : null);
+            if (!handle) {
+                throw new Error(
+                    'cpu-profile-handle-not-ready-before-worker-termination'
+                );
+            }
+            const profileResult = await handle.stop();
+            if (
+                record.profileCaptureKey !== profileCaptureKey ||
+                record.finalizationTimedOut
+            ) {
+                return;
+            }
+            record.profileResult = profileResult;
+        };
+        const writeWorkerProfile = (record: WorkerRecord): void => {
+            if (!record.profileHandle || !record.profilePath) {
+                return;
+            }
+            if (record.profileResult === null) {
+                throw new Error('worker-cpu-profile-result-missing');
+            }
+            fs.writeFileSync(
+                record.profilePath,
+                JSON.stringify(normalizeWorkerCpuProfile(record.profileResult))
+            );
+            record.profileHandle = null;
+            record.profileResult = null;
+            record.resolvedProfileHandle = null;
+        };
+        const flushWorkerProfiles = (workerRecords: WorkerRecord[]): void => {
+            for (const record of workerRecords) {
+                try {
+                    writeWorkerProfile(record);
+                } catch (error: unknown) {
+                    reportWorkerArtifactFailure(record, 'profile-write', error);
+                }
+            }
+        };
+        const takeWorkerHeapSnapshot = async (
+            record: WorkerRecord
+        ): Promise<void> => {
+            if (typeof record.worker.getHeapSnapshot !== 'function') {
+                return;
+            }
+            record.snapshotPath = path.join(
+                state.outputDirectory,
+                `${record.kind}-${record.ordinal}.heapsnapshot`
+            );
+            const snapshot = await record.worker.getHeapSnapshot();
+            await streamPromises.pipeline(
+                snapshot,
+                fs.createWriteStream(record.snapshotPath)
+            );
+        };
+        const reportWorkerArtifactFailure = (
+            record: WorkerRecord,
+            stage: DatabaseWorkerPostGcAncillaryFailureStage,
+            error: unknown
+        ): void => {
+            if (stage === 'heap-snapshot') {
+                record.snapshotPath = null;
+            } else if (stage === 'profile-stop' || stage === 'profile-write') {
+                record.profilePath = null;
+                record.profileResult = null;
+                record.profileHandle = null;
+                record.resolvedProfileHandle = null;
+            }
+            recordTimeline({
+                type: `worker-artifact-error:${stage}:${
+                    error instanceof Error
+                        ? error.message.slice(0, 160)
+                        : String(error).slice(0, 160)
+                }`,
+            });
+        };
+        const finalizeDatabaseWorker = (
+            record: WorkerRecord,
+            selectionUnavailableReason: DatabaseWorkerPostGcUnavailableReason | null
+        ): Promise<void> => {
+            record.finalizing ??= databaseWorkerPostGcFinalizationApi
+                .finalize({
+                    finalizationKey: record.finalizationKey,
+                    joinFinalSample: () => joinFinalWorkerSample(record),
+                    probePostGc: () =>
+                        selectionUnavailableReason === null
+                            ? databaseWorkerPostGcProbeApi.probe({
+                                  createMessageChannel: () =>
+                                      new workerThreads.MessageChannel(),
+                                  worker: {
+                                      postMessage(
+                                          message: unknown,
+                                          transferList: readonly unknown[]
+                                      ): void {
+                                          record.worker.postMessage(
+                                              message,
+                                              transferList as readonly WorkerTransferable[]
+                                          );
+                                      },
+                                  },
+                              })
+                            : Promise.resolve({
+                                  postGcHeapUsedBytes: null,
+                                  unavailableReason: selectionUnavailableReason,
+                              }),
+                    reportAncillaryFailure: (stage, error) =>
+                        reportWorkerArtifactFailure(record, stage, error),
+                    stopProfile: () => stopWorkerProfile(record),
+                    stopSampling: () => stopWorkerSampling(record),
+                    ...(state.diagnostic
+                        ? {
+                              takeHeapSnapshot: () =>
+                                  takeWorkerHeapSnapshot(record),
+                          }
+                        : {}),
+                })
+                .then((outcome) => {
+                    record.postGcHeapUsed = outcome.postGcHeapUsedBytes;
+                    record.postGcHeapUnavailableReason =
+                        outcome.unavailableReason;
+                    record.finalized = true;
+                })
+                .catch((error: unknown) => {
+                    record.postGcHeapUsed = null;
+                    record.postGcHeapUnavailableReason = 'capture-failed';
+                    reportWorkerArtifactFailure(record, 'post-gc-probe', error);
+                    record.finalized = true;
+                });
+            return record.finalizing;
+        };
+        const finalizeTerminatingWorker = (
+            record: WorkerRecord,
+            waitForProfileHandle: boolean
+        ): Promise<void> => {
+            if (record.finalizing) {
+                return record.finalizing;
+            }
+            const finalizationKey = record.finalizationKey;
+            record.finalizing = (async () => {
+                stopWorkerSampling(record);
+                record.postGcHeapUsed = null;
+                record.postGcHeapUnavailableReason =
+                    'worker-force-terminated-before-gc';
+                try {
+                    await stopWorkerProfile(record, waitForProfileHandle);
+                } catch (error: unknown) {
+                    if (
+                        record.finalizationKey === finalizationKey &&
+                        !record.finalizationTimedOut
+                    ) {
+                        reportWorkerArtifactFailure(
+                            record,
+                            'profile-stop',
+                            error
+                        );
+                    }
+                }
+                if (record.finalizationKey === finalizationKey) {
+                    record.finalized = true;
+                }
+            })();
+            return record.finalizing;
+        };
+        const waitForTerminatingWorkerFinalization = async (
+            record: WorkerRecord
+        ): Promise<void> => {
+            if (!record.finalizing || record.finalizationTimedOut) {
+                return;
+            }
+            let timeout: NodeJS.Timeout | null = null;
+            let timedOut = false;
+            await Promise.race([
+                record.finalizing,
+                new Promise<void>((resolve) => {
+                    timeout = setTimeout(() => {
+                        timedOut = true;
+                        resolve();
+                    }, 5_000);
+                }),
+            ]);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            if (timedOut) {
+                record.finalizationTimedOut = true;
+                record.profileCaptureKey = {};
+                reportWorkerArtifactFailure(
+                    record,
+                    'profile-stop',
+                    new Error('worker-profile-finalization-timeout')
+                );
+            }
+        };
+
+        WorkerClass.prototype.postMessage = function (
+            this: InstrumentedWorker,
+            message: unknown,
+            transferList?: readonly WorkerTransferable[]
+        ): void {
+            if (typeof message === 'object' && message !== null) {
+                const value = message as JsonRecord;
+                if (value['type'] === 'request') {
+                    const kind = classifyRequest(value);
+                    if (kind) {
+                        const requestDisposition =
+                            kind === 'database.worker'
+                                ? databaseWorkerPostGcCutoffApi.observeDatabaseRequest()
+                                : null;
+                        if (requestDisposition === 'after-cutoff') {
+                            state.timeline.push({
+                                epochMs: nowEpochMs(),
+                                operation:
+                                    typeof value['operation'] === 'string'
+                                        ? value['operation']
+                                        : undefined,
+                                playlistId:
+                                    readDatabasePlaylistId(value) ?? undefined,
+                                requestId:
+                                    typeof value['requestId'] === 'string'
+                                        ? value['requestId']
+                                        : undefined,
+                                type: 'db-request-after-capture-cutoff',
+                            });
+                            originalPostMessage.call(
+                                this,
+                                message,
+                                transferList
+                            );
+                            return;
+                        }
+                        const record = createWorkerRecord(this, kind);
+                        startWorker(record);
+                        if (
+                            isCurrentCaptureRecord(record) &&
+                            kind === 'playlist-refresh.worker'
+                        ) {
+                            const payload = value['payload'] as JsonRecord;
+                            record.operationId = String(payload['operationId']);
+                            record.playlistId = String(payload['playlistId']);
+                            operationWorkers.set(record.operationId, record);
+                            recordTimeline({
+                                operationId: record.operationId,
+                                playlistId: record.playlistId,
+                                type: 'playlist-request',
+                            });
+                        } else if (
+                            isCurrentCaptureRecord(record) &&
+                            typeof value['requestId'] === 'string' &&
+                            typeof value['operation'] === 'string'
+                        ) {
+                            const payload = value['payload'];
+                            const payloadOperationId =
+                                typeof payload === 'object' &&
+                                payload !== null &&
+                                typeof (payload as JsonRecord)[
+                                    'operationId'
+                                ] === 'string' &&
+                                String((payload as JsonRecord)['operationId'])
+                                    .length > 0
+                                    ? String(
+                                          (payload as JsonRecord)['operationId']
+                                      )
+                                    : null;
+                            const identity =
+                                payloadOperationId === null
+                                    ? databaseRequestIdentityCapture.matchDatabaseRequest(
+                                          value
+                                      )
+                                    : {
+                                          ipcCallId: null,
+                                          operationId: payloadOperationId,
+                                          operationIdUnavailableReason: null,
+                                          sourceEpochMs: null,
+                                      };
+                            record.pendingCount += 1;
+                            dbRequests.set(value['requestId'], {
+                                identity,
+                                operation: value['operation'],
+                                playlistId: readDatabasePlaylistId(value),
+                                record,
+                            });
+                            recordTimeline({
+                                ipcCallId: identity.ipcCallId ?? undefined,
+                                operation: value['operation'],
+                                operationId: identity.operationId ?? undefined,
+                                playlistId:
+                                    readDatabasePlaylistId(value) ?? undefined,
+                                requestId: value['requestId'],
+                                sourceEpochMs:
+                                    identity.sourceEpochMs ?? undefined,
+                                type: 'db-request',
+                            });
+                        }
+                    }
+                } else if (
+                    value['type'] === 'cancel' &&
+                    typeof value['operationId'] === 'string'
+                ) {
+                    const record = operationWorkers.get(value['operationId']);
+                    if (record) {
+                        record.cancelPostedEpochMs = nowEpochMs();
+                        recordTimeline({
+                            operationId: value['operationId'],
+                            type: 'playlist-cancel-posted',
+                        });
+                    }
+                }
+            }
+            originalPostMessage.call(this, message, transferList);
+        };
+        WorkerClass.prototype.terminate = function (
+            this: InstrumentedWorker
+        ): Promise<number> {
+            const record = records.get(this);
+            if (!record || !isCurrentCaptureRecord(record)) {
+                return originalTerminate.call(this);
+            }
+            const terminationGeneration = record.captureGeneration;
+            const markTerminated = (code: number): number => {
+                if (
+                    !workerTerminationGenerationApi.isCurrent({
+                        capturedGeneration: terminationGeneration,
+                        currentGeneration: state.captureGeneration,
+                        recordGeneration: record.captureGeneration,
+                    })
+                ) {
+                    return code;
+                }
+                record.terminatedEpochMs = nowEpochMs();
+                record.finalized = true;
+                recordTimeline({
+                    operationId: record.operationId ?? undefined,
+                    playlistId: record.playlistId ?? undefined,
+                    type: `${record.kind}-terminated`,
+                });
+                return code;
+            };
+            if (state.diagnostic) {
+                const diagnosticTermination = (async (): Promise<number> => {
+                    void finalizeTerminatingWorker(record, true);
+                    await waitForTerminatingWorkerFinalization(record);
+                    return originalTerminate.call(this);
+                })();
+                return diagnosticTermination.then(markTerminated);
+            }
+            const termination = originalTerminate.call(this);
+            void finalizeTerminatingWorker(record, false);
+            return termination.then(markTerminated);
+        };
+
+        const inspectorPost = (
+            session: import('node:inspector').Session,
+            method: string,
+            params: JsonRecord = {}
+        ): Promise<JsonRecord> =>
+            new Promise((resolve, reject) => {
+                session.post(method, params, (error, result) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        resolve((result ?? {}) as JsonRecord);
+                    }
+                });
+            });
+        const normalizeWorkerCpuProfile = (profile: unknown): unknown => {
+            if (typeof profile !== 'string') {
+                return profile;
+            }
+            try {
+                return JSON.parse(profile) as unknown;
+            } catch {
+                // Node 24's Worker CPU profiler can leave quotes inside
+                // RegExp pseudo-frame names unescaped. Repair only those
+                // generated frame names, then require the full JSON to parse.
+                const fieldPrefix = '"functionName":"RegExp: ';
+                const fieldSuffix = '","lineNumber":';
+                const valuePrefixLength = '"functionName":"'.length;
+                let cursor = 0;
+                let repaired = '';
+                while (true) {
+                    const fieldStart = profile.indexOf(fieldPrefix, cursor);
+                    if (fieldStart < 0) {
+                        repaired += profile.slice(cursor);
+                        break;
+                    }
+                    const valueStart = fieldStart + valuePrefixLength;
+                    const valueEnd = profile.indexOf(fieldSuffix, valueStart);
+                    if (valueEnd < 0) {
+                        throw new Error(
+                            'Worker CPU profile has an unterminated RegExp frame'
+                        );
+                    }
+                    repaired +=
+                        profile.slice(cursor, fieldStart) +
+                        '"functionName":' +
+                        JSON.stringify(profile.slice(valueStart, valueEnd));
+                    cursor = valueEnd + 1;
+                }
+                return JSON.parse(repaired) as unknown;
+            }
+        };
+        const sampleMain = (): void => {
+            const memory = process.memoryUsage();
+            state.mainPeakHeap = Math.max(state.mainPeakHeap, memory.heapUsed);
+            state.mainPeakRss = Math.max(state.mainPeakRss, memory.rss);
+            state.rendererWindowSession?.sample();
+        };
+        const startCapture = async (
+            options: MainCaptureStartOptions
+        ): Promise<void> => {
+            state.rendererWindowSession?.detach();
+            state.rendererWindowSession = null;
+            const rendererWindowSession = rendererWindowRssSessionApi.create({
+                browserWindowFromId: (browserWindowId) =>
+                    BrowserWindow.fromId(browserWindowId),
+                browserWindowId: options.rendererWindowIdentity.browserWindowId,
+                getAppMetrics: () => app.getAppMetrics(),
+                rendererRssApi: rendererProcessRssApi,
+                webContentsId: options.rendererWindowIdentity.webContentsId,
+            });
+            state.stopping = false;
+            state.captureGeneration += 1;
+            state.active = true;
+            databaseRequestIdentityCapture.start();
+            dbRequests.clear();
+            operationWorkers.clear();
+            state.diagnostic = options.diagnostic;
+            state.outputDirectory = options.outputDirectory;
+            state.timeline = [];
+            state.mainPeakHeap = 0;
+            state.mainPeakRss = 0;
+            state.mainProfilePath = null;
+            state.mainSnapshotPath = null;
+            state.postGcHeap = null;
+            state.postGcRss = null;
+            state.rendererWindowSession = rendererWindowSession;
+            state.cpuStart = process.cpuUsage();
+            state.eventLoopStart = perfHooks.performance.eventLoopUtilization();
+            state.eventLoopDelay = perfHooks.monitorEventLoopDelay({
+                resolution: 1,
+            });
+            state.eventLoopDelay.enable();
+            sampleMain();
+            state.sampleTimer = setInterval(sampleMain, 20);
+            if (state.diagnostic) {
+                const session = new inspector.Session();
+                session.connect();
+                state.inspectorSession = session;
+                await inspectorPost(session, 'Profiler.enable');
+                await inspectorPost(session, 'Profiler.start');
+                state.mainProfilePath = path.join(
+                    state.outputDirectory,
+                    'main.cpuprofile'
+                );
+                state.mainSnapshotPath = path.join(
+                    state.outputDirectory,
+                    'main.heapsnapshot'
+                );
+            }
+        };
+
+        const api = {
+            status: (): MainCaptureStatus => ({
+                databaseGetsCompleted: state.timeline.filter(
+                    (entry) =>
+                        entry['type'] === 'db-response' &&
+                        entry['operation'] === 'DB_GET_APP_PLAYLIST' &&
+                        entry['success'] === true
+                ).length,
+                databasePending: dbRequests.size,
+                databaseRequests: state.timeline.filter(
+                    (entry) => entry['type'] === 'db-request'
+                ).length,
+                databaseUpsertsCompleted: state.timeline.filter(
+                    (entry) =>
+                        entry['type'] === 'db-response' &&
+                        entry['operation'] === 'DB_UPSERT_APP_PLAYLIST' &&
+                        entry['success'] === true
+                ).length,
+                playlistTerminated: [...records.values()].filter(
+                    (record) =>
+                        isCurrentCaptureRecord(record) &&
+                        record.kind === 'playlist-refresh.worker' &&
+                        record.terminatedEpochMs !== null
+                ).length,
+                playlistResponsesFailed: state.timeline.filter(
+                    (entry) =>
+                        entry['type'] === 'playlist-response' &&
+                        entry['success'] === false
+                ).length,
+                playlistResponses: state.timeline.filter(
+                    (entry) => entry['type'] === 'playlist-response'
+                ).length,
+                playlistResponsesSucceeded: state.timeline.filter(
+                    (entry) =>
+                        entry['type'] === 'playlist-response' &&
+                        entry['success'] === true
+                ).length,
+                preloadSuccessMarkers:
+                    databaseRequestIdentityCapture.successMarkerCount(),
+            }),
+            start: async (options: MainCaptureStartOptions): Promise<void> => {
+                databaseWorkerPostGcCutoffApi.beginCapture();
+                await startCapture(options);
+            },
+            stop: async (
+                nextOptions?: MainCaptureStartOptions
+            ): Promise<MainCaptureStopTransport> => {
+                databaseWorkerPostGcCutoffApi.beginStop();
+                state.stopping = true;
+                state.active = false;
+                for (const marker of databaseRequestIdentityCapture.takeSuccessMarkers()) {
+                    state.timeline.push({
+                        epochMs: marker.sourceEpochMs,
+                        ipcCallId: marker.ipcCallId,
+                        operation: marker.operation,
+                        operationId: marker.operationId ?? undefined,
+                        playlistId: marker.playlistId,
+                        sourceEpochMs: marker.sourceEpochMs,
+                        success: true,
+                        type: 'preload-performance-success',
+                    });
+                }
+                databaseRequestIdentityCapture.stop();
+                if (state.sampleTimer) {
+                    clearInterval(state.sampleTimer);
+                    state.sampleTimer = null;
+                }
+                const currentWorkerRecords = [...records.values()].filter(
+                    (record) =>
+                        record.captureGeneration === state.captureGeneration
+                );
+                for (const record of currentWorkerRecords) {
+                    stopWorkerSampling(record);
+                }
+                state.eventLoopDelay?.disable();
+                sampleMain();
+                const rendererWindow: RendererWindowRssSessionMetrics | null =
+                    state.rendererWindowSession?.snapshot() ?? null;
+                state.rendererWindowSession?.detach();
+                state.rendererWindowSession = null;
+                if (rendererWindow === null) {
+                    throw new Error('renderer-window-session-missing');
+                }
+                const cpu = process.cpuUsage(state.cpuStart ?? undefined);
+                const eluEnd = perfHooks.performance.eventLoopUtilization();
+                const elu = perfHooks.performance.eventLoopUtilization(
+                    state.eventLoopStart ?? undefined
+                );
+                const eventLoopUtilization =
+                    perfHooks.performance.nodeTiming.loopStart < 0 ||
+                    (elu.active === 0 &&
+                        elu.idle === 0 &&
+                        eluEnd.active === 0 &&
+                        eluEnd.idle === 0)
+                        ? null
+                        : elu.utilization;
+                const delay = state.eventLoopDelay;
+                const session =
+                    state.inspectorSession ?? new inspector.Session();
+                if (!state.inspectorSession) {
+                    session.connect();
+                }
+                if (state.diagnostic && state.mainProfilePath) {
+                    const result = await inspectorPost(
+                        session,
+                        'Profiler.stop'
+                    );
+                    fs.writeFileSync(
+                        state.mainProfilePath,
+                        JSON.stringify(result['profile'])
+                    );
+                }
+                await Promise.all(
+                    currentWorkerRecords
+                        .filter(
+                            (record) =>
+                                record.kind === 'playlist-refresh.worker' &&
+                                record.finalizing !== null
+                        )
+                        .map((record) =>
+                            waitForTerminatingWorkerFinalization(record)
+                        )
+                );
+                const databaseSelection =
+                    databaseWorkerPostGcSelectionApi.select(
+                        currentWorkerRecords,
+                        state.captureGeneration
+                    );
+                const currentDatabaseRecords = currentWorkerRecords.filter(
+                    (record) => record.kind === 'database.worker'
+                );
+                if (databaseSelection.selected) {
+                    await finalizeDatabaseWorker(
+                        databaseSelection.selected,
+                        null
+                    );
+                } else if (databaseSelection.unavailableReason !== null) {
+                    await Promise.all(
+                        currentDatabaseRecords.map((record) =>
+                            finalizeDatabaseWorker(
+                                record,
+                                databaseSelection.unavailableReason
+                            )
+                        )
+                    );
+                }
+                flushWorkerProfiles(currentWorkerRecords);
+                await inspectorPost(session, 'HeapProfiler.enable');
+                await inspectorPost(session, 'HeapProfiler.collectGarbage');
+                const postGc = process.memoryUsage();
+                state.postGcHeap = postGc.heapUsed;
+                state.postGcRss = postGc.rss;
+                if (state.diagnostic && state.mainSnapshotPath) {
+                    const output = fs.createWriteStream(state.mainSnapshotPath);
+                    const onChunk = (message: { params: { chunk: string } }) =>
+                        output.write(message.params.chunk);
+                    session.on('HeapProfiler.addHeapSnapshotChunk', onChunk);
+                    await inspectorPost(
+                        session,
+                        'HeapProfiler.takeHeapSnapshot',
+                        { reportProgress: false }
+                    );
+                    session.off('HeapProfiler.addHeapSnapshotChunk', onChunk);
+                    output.end();
+                    await new Promise<void>((resolve, reject) => {
+                        output.once('finish', resolve);
+                        output.once('error', reject);
+                    });
+                }
+                session.disconnect();
+                state.inspectorSession = null;
+                const cutoff = databaseWorkerPostGcCutoffApi.snapshot();
+                if (cutoff.lateRequestCount > 0) {
+                    for (const record of currentDatabaseRecords) {
+                        record.postGcHeapUsed = null;
+                        record.postGcHeapUnavailableReason =
+                            'database-worker-activity-after-cutoff';
+                    }
+                }
+
+                const workers = currentWorkerRecords
+                    .filter(
+                        (record) =>
+                            record.kind === 'database.worker' ||
+                            record.kind === 'playlist-refresh.worker'
+                    )
+                    .map((record) => ({
+                        captureGeneration: record.captureGeneration,
+                        metrics: {
+                            cancelPostedEpochMs: record.cancelPostedEpochMs,
+                            cpuSystemMicros:
+                                record.cpuFirst && record.cpuLast
+                                    ? record.cpuLast.system -
+                                      record.cpuFirst.system
+                                    : null,
+                            cpuUserMicros:
+                                record.cpuFirst && record.cpuLast
+                                    ? record.cpuLast.user - record.cpuFirst.user
+                                    : null,
+                            eventLoopUtilization: record.elu,
+                            externalMemorySampleCount:
+                                record.externalMemorySampleCount,
+                            heapUsedSampleCount: record.heapUsedSampleCount,
+                            kind: record.kind,
+                            operationId: record.operationId,
+                            ordinal: record.ordinal,
+                            peakExternalBytes:
+                                record.externalMemorySampleCount > 0
+                                    ? record.externalPeak
+                                    : null,
+                            peakExternalUnavailableReason:
+                                record.externalMemorySampleCount > 0
+                                    ? null
+                                    : 'worker-external-memory-samples-missing',
+                            peakHeapUsedBytes:
+                                record.heapUsedSampleCount > 0
+                                    ? record.heapPeak
+                                    : null,
+                            peakHeapUsedUnavailableReason:
+                                record.heapUsedSampleCount > 0
+                                    ? null
+                                    : 'worker-heap-used-samples-missing',
+                            playlistId: record.playlistId,
+                            postGcHeapUnavailableReason:
+                                record.postGcHeapUnavailableReason,
+                            postGcHeapUsedBytes: record.postGcHeapUsed,
+                            profilePath: record.profilePath,
+                            responseEpochMs: record.responseEpochMs,
+                            snapshotPath: record.snapshotPath,
+                            terminatedEpochMs: record.terminatedEpochMs,
+                        },
+                        requests: record.requestPerformance.map((request) => ({
+                            ipcCallId: request.identity.ipcCallId,
+                            operation: request.operation,
+                            operationId: request.identity.operationId,
+                            operationIdUnavailableReason:
+                                request.identity.operationIdUnavailableReason,
+                            performanceCapture: request.performanceCapture,
+                            playlistId: request.playlistId,
+                            requestId: request.requestId,
+                            responseEpochMs: request.responseEpochMs,
+                            sourceEpochMs: request.identity.sourceEpochMs,
+                            success: request.success,
+                        })),
+                    }));
+                const transport: MainCaptureGenerationTransport = {
+                    captureGeneration: state.captureGeneration,
+                    metrics: {
+                        cpuProfilePath: state.mainProfilePath,
+                        cpuSystemMicros: cpu.system,
+                        cpuUserMicros: cpu.user,
+                        eventLoopDelay: {
+                            maxMs: Number(delay?.max ?? 0) / 1e6,
+                            p95Ms: Number(delay?.percentile(95) ?? 0) / 1e6,
+                            p99Ms: Number(delay?.percentile(99) ?? 0) / 1e6,
+                        },
+                        // Electron's Chromium-owned main message pump currently
+                        // leaves Node's libuv ELU counters at zero. Preserve that
+                        // as unavailable instead of reporting a misleading 0%.
+                        eventLoopUtilization,
+                        eventLoopUtilizationUnavailableReason:
+                            eventLoopUtilization === null
+                                ? 'electron-main-embedded-event-loop'
+                                : null,
+                        heapSnapshotPath: state.mainSnapshotPath,
+                        memory: {
+                            peakHeapUsedBytes: state.mainPeakHeap,
+                            peakRssBytes: state.mainPeakRss,
+                            postGcHeapUsedBytes: state.postGcHeap,
+                            postGcRssBytes: state.postGcRss,
+                        },
+                        rendererWindow,
+                        rssScope:
+                            'electron-main-process-including-worker-threads-and-native-memory',
+                        timeline: state.timeline,
+                    },
+                    workers,
+                };
+                let rollover: MainCaptureRolloverStatus | null = null;
+                if (nextOptions) {
+                    const databaseRecord =
+                        currentDatabaseRecords.length === 1
+                            ? currentDatabaseRecords[0]
+                            : null;
+                    const nextCaptureUnavailableReason =
+                        cutoff.lateRequestCount > 0
+                            ? 'database-worker-activity-after-cutoff'
+                            : dbRequests.size > 0
+                              ? 'database-worker-not-idle'
+                              : currentDatabaseRecords.length === 0
+                                ? 'database-worker-missing'
+                                : currentDatabaseRecords.length > 1
+                                  ? 'multiple-database-workers'
+                                  : !databaseRecord ||
+                                      !Number.isSafeInteger(
+                                          databaseRecord.postGcHeapUsed
+                                      ) ||
+                                      Number(databaseRecord.postGcHeapUsed) <
+                                          0 ||
+                                      databaseRecord.postGcHeapUnavailableReason !==
+                                          null
+                                    ? (databaseRecord?.postGcHeapUnavailableReason ??
+                                      'post-gc-capture-invalid')
+                                    : null;
+                    if (nextCaptureUnavailableReason === null) {
+                        databaseWorkerPostGcCutoffApi.rolloverCapture();
+                        await startCapture(nextOptions);
+                        rollover = {
+                            nextCaptureStarted: true,
+                            nextCaptureUnavailableReason: null,
+                        };
+                    } else {
+                        databaseWorkerPostGcCutoffApi.finishStop();
+                        state.stopping = false;
+                        rollover = {
+                            nextCaptureStarted: false,
+                            nextCaptureUnavailableReason,
+                        };
+                    }
+                } else {
+                    databaseWorkerPostGcCutoffApi.finishStop();
+                    state.stopping = false;
+                }
+                return { ...transport, rollover };
+            },
+        };
+        target[input.stateKey] = api;
+    }, captureStateKeys);
+}
+
+export async function startMainCapture(
+    electronApp: ElectronApplication,
+    options: MainCaptureStartOptions
+): Promise<void> {
+    await electronApp.evaluate(
+        async (_electron, input) => {
+            const target = globalThis as unknown as Record<string, unknown>;
+            const api = target[input.stateKey] as {
+                start(options: MainCaptureStartOptions): Promise<void>;
+            };
+            await api.start(input.options);
+        },
+        { options, stateKey: MAIN_CAPTURE_STATE_KEY }
+    );
+}
+
+export async function readMainCaptureStatus(
+    electronApp: ElectronApplication
+): Promise<MainCaptureStatus> {
+    return electronApp.evaluate(async (_electron, stateKey) => {
+        const target = globalThis as unknown as Record<string, unknown>;
+        const api = target[stateKey] as {
+            status(): MainCaptureStatus;
+        };
+        return api.status();
+    }, MAIN_CAPTURE_STATE_KEY);
+}
+
+export async function rolloverMainCapture(
+    electronApp: ElectronApplication,
+    options: MainCaptureStartOptions
+): Promise<MainCaptureRolloverResult> {
+    const transport = await electronApp.evaluate(
+        async (_electron, input) => {
+            const target = globalThis as unknown as Record<string, unknown>;
+            const api = target[input.stateKey] as {
+                stop(
+                    nextOptions?: MainCaptureStartOptions
+                ): Promise<MainCaptureStopTransport>;
+            };
+            return api.stop(input.options);
+        },
+        { options, stateKey: MAIN_CAPTURE_STATE_KEY }
+    );
+    if (transport.rollover === null) {
+        throw new Error('main-capture-rollover-status-missing');
+    }
+    return Object.freeze({
+        completedCapture: selectMainCaptureGeneration(transport),
+        nextCaptureStarted: transport.rollover.nextCaptureStarted,
+        nextCaptureUnavailableReason:
+            transport.rollover.nextCaptureUnavailableReason,
+    });
+}
+
+export async function stopMainCapture(
+    electronApp: ElectronApplication
+): Promise<MainCaptureMetrics> {
+    const transport = await electronApp.evaluate(
+        async (_electron, stateKey) => {
+            const target = globalThis as unknown as Record<string, unknown>;
+            const api = target[stateKey] as {
+                stop(): Promise<MainCaptureStopTransport>;
+            };
+            return api.stop();
+        },
+        MAIN_CAPTURE_STATE_KEY
+    );
+    return selectMainCaptureGeneration(transport);
+}
diff --git a/apps/electron-backend-e2e/src/performance/m3u-refresh-renderer-capture.ts b/apps/electron-backend-e2e/src/performance/m3u-refresh-renderer-capture.ts
new file mode 100644
index 000000000..a759db490
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/m3u-refresh-renderer-capture.ts
@@ -0,0 +1,508 @@
+/* eslint-disable max-lines -- Renderer CDP and injected-page lifecycle are kept together so raw artifact boundaries stay auditable. */
+import { once } from 'node:events';
+import { createWriteStream } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+import type { CDPSession, Page } from '@playwright/test';
+
+import type {
+    RendererCaptureMetrics,
+    RendererProbeMetrics,
+} from './m3u-refresh-cancellation-contract';
+import { summarizeNumbers } from './performance-statistics';
+
+const RENDERER_CAPTURE_STATE_KEY = '__iptvnatorM3uRefreshRendererCapture';
+const HEARTBEAT_INTERVAL_MS = 50;
+
+export interface RendererCaptureStartOptions {
+    readonly diagnostic: boolean;
+    readonly outputDirectory: string;
+    readonly sourceTitle: string;
+}
+
+export interface RunningRendererCapture {
+    readonly session: CDPSession;
+    markOperationStart(): Promise<number>;
+    stop(): Promise<RendererCaptureMetrics>;
+    waitForCancelClick(): Promise<void>;
+    waitForTerminal(): Promise<void>;
+}
+
+interface HeapUsageResult {
+    readonly usedSize: number;
+}
+
+interface TraceData {
+    readonly value: readonly unknown[];
+}
+
+export async function startRendererCapture(
+    page: Page,
+    options: RendererCaptureStartOptions
+): Promise<RunningRendererCapture> {
+    const session = await page.context().newCDPSession(page);
+    await session.send('Runtime.enable');
+    await session.send('Performance.enable');
+    await installRendererProbe(page, options.sourceTitle);
+
+    const heapSamples: number[] = [];
+    let heapSampleBusy = false;
+    let heapSampleError: unknown = null;
+    const sampleHeap = async (): Promise<void> => {
+        if (heapSampleBusy) {
+            return;
+        }
+        heapSampleBusy = true;
+        try {
+            const result = (await session.send(
+                'Runtime.getHeapUsage'
+            )) as HeapUsageResult;
+            if (Number.isFinite(result.usedSize)) {
+                heapSamples.push(result.usedSize);
+            }
+        } catch (error) {
+            heapSampleError ??= error;
+        } finally {
+            heapSampleBusy = false;
+        }
+    };
+    await sampleHeap();
+    throwHeapSampleError(heapSampleError);
+    const heapSampleTimer = setInterval(() => void sampleHeap(), 20);
+
+    const cpuProfilePath = options.diagnostic
+        ? join(options.outputDirectory, 'renderer.cpuprofile')
+        : null;
+    const heapSnapshotPath = options.diagnostic
+        ? join(options.outputDirectory, 'renderer.heapsnapshot')
+        : null;
+    const tracePath = options.diagnostic
+        ? join(options.outputDirectory, 'renderer.trace.json')
+        : null;
+    let traceOutput: ReturnType<typeof createWriteStream> | null = null;
+    let traceFirstEvent = true;
+    let resolveTraceComplete: (() => void) | null = null;
+    const traceComplete = new Promise<void>((resolve) => {
+        resolveTraceComplete = resolve;
+    });
+    const onTraceData = (data: TraceData): void => {
+        if (!traceOutput) {
+            return;
+        }
+        for (const event of data.value) {
+            traceOutput.write(
+                `${traceFirstEvent ? '' : ','}${JSON.stringify(event)}`
+            );
+            traceFirstEvent = false;
+        }
+    };
+    const onTraceComplete = (): void => {
+        resolveTraceComplete?.();
+        resolveTraceComplete = null;
+    };
+
+    if (options.diagnostic) {
+        await session.send('Profiler.enable');
+        await session.send('Profiler.start');
+        traceOutput = createWriteStream(
+            requireArtifactPath(tracePath, 'renderer trace')
+        );
+        traceOutput.write('{"traceEvents":[');
+        session.on('Tracing.dataCollected', onTraceData);
+        session.on('Tracing.tracingComplete', onTraceComplete);
+        await session.send('Tracing.start', {
+            categories: [
+                'blink.user_timing',
+                'devtools.timeline',
+                'disabled-by-default-devtools.timeline',
+                'disabled-by-default-v8.cpu_profiler',
+                'v8',
+            ].join(','),
+            options: 'sampling-frequency=1000',
+            transferMode: 'ReportEvents',
+        });
+    }
+
+    let stopped = false;
+    return Object.freeze({
+        session,
+        markOperationStart: () => markRendererOperationStart(page),
+        stop: async () => {
+            if (stopped) {
+                throw new Error('Renderer capture was already stopped');
+            }
+            stopped = true;
+            const probe = await stopRendererProbe(page);
+            clearInterval(heapSampleTimer);
+            await sampleHeap();
+            throwHeapSampleError(heapSampleError);
+
+            if (options.diagnostic) {
+                const cpuProfile = await session.send('Profiler.stop');
+                await writeFile(
+                    requireArtifactPath(cpuProfilePath, 'renderer CPU profile'),
+                    JSON.stringify(cpuProfile['profile']),
+                    'utf8'
+                );
+                await session.send('Tracing.end');
+                await traceComplete;
+                session.off('Tracing.dataCollected', onTraceData);
+                session.off('Tracing.tracingComplete', onTraceComplete);
+                traceOutput?.write(']}');
+                traceOutput?.end();
+                if (traceOutput) {
+                    await once(traceOutput, 'finish');
+                }
+            }
+
+            await session.send('HeapProfiler.enable');
+            await session.send('HeapProfiler.collectGarbage');
+            const postGc = (await session.send(
+                'Runtime.getHeapUsage'
+            )) as HeapUsageResult;
+
+            if (options.diagnostic) {
+                const output = createWriteStream(
+                    requireArtifactPath(
+                        heapSnapshotPath,
+                        'renderer heap snapshot'
+                    )
+                );
+                const onSnapshotChunk = (message: {
+                    readonly chunk: string;
+                }): void => {
+                    output.write(message.chunk);
+                };
+                session.on(
+                    'HeapProfiler.addHeapSnapshotChunk',
+                    onSnapshotChunk
+                );
+                await session.send('HeapProfiler.takeHeapSnapshot', {
+                    reportProgress: false,
+                });
+                session.off(
+                    'HeapProfiler.addHeapSnapshotChunk',
+                    onSnapshotChunk
+                );
+                output.end();
+                await once(output, 'finish');
+            }
+
+            await session.detach();
+            return Object.freeze({
+                cpuProfilePath,
+                frameGap: summarizeNumbers(probe.frameGapsMs),
+                heapSnapshotPath,
+                heartbeatDelay: summarizeNumbers(probe.heartbeatDelaysMs),
+                longTask: summarizeNumbers(probe.longTasksMs),
+                peakHeapUsedBytes: Math.max(0, ...heapSamples),
+                postGcHeapUsedBytes: postGc.usedSize,
+                probe,
+                tracePath,
+            });
+        },
+        waitForCancelClick: () =>
+            page
+                .waitForFunction(
+                    (stateKey) => {
+                        const target = globalThis as unknown as Record<
+                            string,
+                            unknown
+                        >;
+                        const state = target[stateKey] as
+                            | { cancelClickEpochMs: number | null }
+                            | undefined;
+                        return typeof state?.cancelClickEpochMs === 'number';
+                    },
+                    RENDERER_CAPTURE_STATE_KEY,
+                    { timeout: 60_000 }
+                )
+                .then(() => undefined),
+        waitForTerminal: () =>
+            page
+                .waitForFunction(
+                    (stateKey) => {
+                        const target = globalThis as unknown as Record<
+                            string,
+                            unknown
+                        >;
+                        const state = target[stateKey] as
+                            | { uiPaintedEpochMs: number | null }
+                            | undefined;
+                        return typeof state?.uiPaintedEpochMs === 'number';
+                    },
+                    RENDERER_CAPTURE_STATE_KEY,
+                    { timeout: 120_000 }
+                )
+                .then(() => undefined),
+    });
+}
+
+function throwHeapSampleError(error: unknown): void {
+    if (error instanceof Error) {
+        throw error;
+    }
+    if (error !== null) {
+        throw new Error(`Renderer heap sampling failed: ${String(error)}`);
+    }
+}
+
+function requireArtifactPath(value: string | null, label: string): string {
+    if (value === null) {
+        throw new Error(`${label} path is unavailable`);
+    }
+    return value;
+}
+
+async function installRendererProbe(
+    page: Page,
+    sourceTitle: string
+): Promise<void> {
+    await page.evaluate(
+        ({ heartbeatIntervalMs, sourceTitle: title, stateKey }) => {
+            interface PlaylistRefreshEvent {
+                readonly operationId: string;
+                readonly phase?: string;
+                readonly status: string;
+            }
+            interface ElectronApi {
+                onPlaylistRefreshEvent(
+                    callback: (event: PlaylistRefreshEvent) => void
+                ): (() => void) | undefined;
+            }
+            interface ProbeState {
+                cancelButtonFound: boolean;
+                cancelClickEpochMs: number | null;
+                events: {
+                    operationId: string;
+                    phase: string | null;
+                    receivedEpochMs: number;
+                    status: string;
+                }[];
+                frameGapsMs: number[];
+                frameRequestId: number;
+                heartbeatDelaysMs: number[];
+                heartbeatTimer: number;
+                lastFrameAt: number | null;
+                lastHeartbeatAt: number;
+                longTaskObserver: PerformanceObserver | null;
+                longTasksMs: number[];
+                mutationObserver: MutationObserver;
+                operationId: string | null;
+                operationStartEpochMs: number;
+                terminalEpochMs: number | null;
+                uiPaintFrameRequestId: number | null;
+                uiPaintedEpochMs: number | null;
+                uiPhaseEpochMs: Record<string, number>;
+                uiSettledEpochMs: number | null;
+                unsubscribe: () => void;
+            }
+            const target = globalThis as unknown as Record<string, unknown>;
+            const epoch = (): number =>
+                performance.timeOrigin + performance.now();
+            const sourceRow = (): Element | undefined =>
+                Array.from(document.querySelectorAll('app-playlist-item')).find(
+                    (element) => element.textContent?.includes(title)
+                );
+            const state = {
+                cancelButtonFound: false,
+                cancelClickEpochMs: null,
+                events: [],
+                frameGapsMs: [],
+                frameRequestId: 0,
+                heartbeatDelaysMs: [],
+                heartbeatTimer: 0,
+                lastFrameAt: null,
+                lastHeartbeatAt: performance.now(),
+                longTaskObserver: null,
+                longTasksMs: [],
+                mutationObserver: null,
+                operationId: null,
+                operationStartEpochMs: 0,
+                terminalEpochMs: null,
+                uiPaintFrameRequestId: null,
+                uiPaintedEpochMs: null,
+                uiPhaseEpochMs: Object.create(null) as Record<string, number>,
+                uiSettledEpochMs: null,
+                unsubscribe: () => undefined,
+            } as unknown as ProbeState;
+            const inspectUi = (): void => {
+                const row = sourceRow();
+                const message =
+                    row
+                        ?.querySelector('.busy-state__message')
+                        ?.textContent?.trim()
+                        .toLowerCase() ?? '';
+                for (const phase of ['fetch', 'pars', 'sav']) {
+                    if (
+                        message.includes(phase) &&
+                        state.uiPhaseEpochMs[phase] === undefined
+                    ) {
+                        state.uiPhaseEpochMs[phase] = epoch();
+                    }
+                }
+                if (
+                    state.cancelClickEpochMs !== null &&
+                    state.uiSettledEpochMs === null &&
+                    row !== undefined &&
+                    row.querySelector('.busy-state__message') === null &&
+                    row.querySelector('.action-spinner') === null &&
+                    row.querySelector('.cancel-btn') === null
+                ) {
+                    state.uiSettledEpochMs = epoch();
+                    state.uiPaintFrameRequestId = requestAnimationFrame(() => {
+                        state.uiPaintFrameRequestId = requestAnimationFrame(
+                            () => {
+                                state.uiPaintedEpochMs = epoch();
+                                state.terminalEpochMs = state.uiPaintedEpochMs;
+                                state.uiPaintFrameRequestId = null;
+                            }
+                        );
+                    });
+                }
+            };
+            const frame = (timestamp: number): void => {
+                if (state.lastFrameAt !== null) {
+                    state.frameGapsMs.push(timestamp - state.lastFrameAt);
+                }
+                state.lastFrameAt = timestamp;
+                state.frameRequestId = requestAnimationFrame(frame);
+            };
+            state.frameRequestId = requestAnimationFrame(frame);
+            state.heartbeatTimer = window.setInterval(() => {
+                const now = performance.now();
+                state.heartbeatDelaysMs.push(
+                    Math.max(
+                        0,
+                        now - state.lastHeartbeatAt - heartbeatIntervalMs
+                    )
+                );
+                state.lastHeartbeatAt = now;
+            }, heartbeatIntervalMs);
+            if (
+                typeof PerformanceObserver === 'function' &&
+                PerformanceObserver.supportedEntryTypes.includes('longtask')
+            ) {
+                state.longTaskObserver = new PerformanceObserver((list) => {
+                    for (const entry of list.getEntries()) {
+                        state.longTasksMs.push(entry.duration);
+                    }
+                });
+                state.longTaskObserver.observe({ entryTypes: ['longtask'] });
+            }
+            state.mutationObserver = new MutationObserver(inspectUi);
+            state.mutationObserver.observe(document.documentElement, {
+                attributes: true,
+                childList: true,
+                subtree: true,
+            });
+            const electron = (
+                globalThis as unknown as { electron?: ElectronApi }
+            ).electron;
+            if (!electron?.onPlaylistRefreshEvent) {
+                throw new Error('Playlist refresh event bridge is unavailable');
+            }
+            const unsubscribe = electron.onPlaylistRefreshEvent((event) => {
+                const receivedEpochMs = epoch();
+                if (state.operationId === null && event.status === 'started') {
+                    state.operationId = event.operationId;
+                }
+                if (state.operationId !== event.operationId) {
+                    return;
+                }
+                state.events.push({
+                    operationId: event.operationId,
+                    phase: event.phase ?? null,
+                    receivedEpochMs,
+                    status: event.status,
+                });
+                if (
+                    event.status === 'progress' &&
+                    event.phase === 'parsing' &&
+                    state.cancelClickEpochMs === null
+                ) {
+                    const button = sourceRow()?.querySelector('.cancel-btn');
+                    state.cancelButtonFound =
+                        button instanceof HTMLButtonElement;
+                    if (button instanceof HTMLButtonElement) {
+                        state.cancelClickEpochMs = epoch();
+                        button.click();
+                    }
+                }
+            });
+            state.unsubscribe =
+                typeof unsubscribe === 'function'
+                    ? unsubscribe
+                    : () => undefined;
+            target[stateKey] = state;
+            inspectUi();
+        },
+        {
+            heartbeatIntervalMs: HEARTBEAT_INTERVAL_MS,
+            sourceTitle,
+            stateKey: RENDERER_CAPTURE_STATE_KEY,
+        }
+    );
+}
+
+async function markRendererOperationStart(page: Page): Promise<number> {
+    return page.evaluate((stateKey) => {
+        const target = globalThis as unknown as Record<string, unknown>;
+        const state = target[stateKey] as { operationStartEpochMs: number };
+        state.operationStartEpochMs =
+            performance.timeOrigin + performance.now();
+        return state.operationStartEpochMs;
+    }, RENDERER_CAPTURE_STATE_KEY);
+}
+
+async function stopRendererProbe(page: Page): Promise<RendererProbeMetrics> {
+    return page.evaluate((stateKey) => {
+        const target = globalThis as unknown as Record<string, unknown>;
+        const state = target[stateKey] as {
+            cancelButtonFound: boolean;
+            cancelClickEpochMs: number | null;
+            events: RendererProbeMetrics['events'];
+            frameGapsMs: number[];
+            frameRequestId: number;
+            heartbeatDelaysMs: number[];
+            heartbeatTimer: number;
+            longTaskObserver: PerformanceObserver | null;
+            longTasksMs: number[];
+            mutationObserver: MutationObserver;
+            operationStartEpochMs: number;
+            terminalEpochMs: number | null;
+            uiPaintFrameRequestId: number | null;
+            uiPaintedEpochMs: number | null;
+            uiPhaseEpochMs: Record<string, number>;
+            uiSettledEpochMs: number | null;
+            unsubscribe: () => void;
+        };
+        cancelAnimationFrame(state.frameRequestId);
+        if (state.uiPaintFrameRequestId !== null) {
+            cancelAnimationFrame(state.uiPaintFrameRequestId);
+        }
+        clearInterval(state.heartbeatTimer);
+        for (const entry of state.longTaskObserver?.takeRecords() ?? []) {
+            state.longTasksMs.push(entry.duration);
+        }
+        state.longTaskObserver?.disconnect();
+        state.mutationObserver.disconnect();
+        state.unsubscribe();
+        const result: RendererProbeMetrics = {
+            cancelButtonFound: state.cancelButtonFound,
+            cancelClickEpochMs: state.cancelClickEpochMs,
+            events: [...state.events],
+            frameGapsMs: [...state.frameGapsMs],
+            heartbeatDelaysMs: [...state.heartbeatDelaysMs],
+            longTasksMs: [...state.longTasksMs],
+            operationStartEpochMs: state.operationStartEpochMs,
+            terminalEpochMs: state.terminalEpochMs,
+            uiPaintedEpochMs: state.uiPaintedEpochMs,
+            uiPhaseEpochMs: { ...state.uiPhaseEpochMs },
+            uiSettledEpochMs: state.uiSettledEpochMs,
+        };
+        delete target[stateKey];
+        return result;
+    }, RENDERER_CAPTURE_STATE_KEY);
+}
diff --git a/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.spec.ts b/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.spec.ts
new file mode 100644
index 000000000..4ca080932
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.spec.ts
@@ -0,0 +1,124 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+import { dirname, resolve } from 'node:path';
+
+import {
+    assertPerformanceArtifactCapacity,
+    MIN_PERFORMANCE_ARTIFACT_FREE_BYTES,
+} from './performance-artifact-preflight';
+
+test('checks the nearest existing ancestor using available blocks', async () => {
+    const requestedPath = resolve(
+        '/workspace/dist/performance/2026-07-26/baseline'
+    );
+    const checkedPaths: string[] = [];
+    const existingAncestor = dirname(dirname(requestedPath));
+
+    const result = await assertPerformanceArtifactCapacity(requestedPath, {
+        statfs: async (path) => {
+            checkedPaths.push(path);
+            if (path !== existingAncestor) {
+                throw Object.assign(new Error('missing'), { code: 'ENOENT' });
+            }
+            return {
+                bavail: 4_194_304n,
+                bsize: 1_024n,
+            };
+        },
+    });
+
+    assert.deepEqual(checkedPaths, [
+        requestedPath,
+        dirname(requestedPath),
+        existingAncestor,
+    ]);
+    assert.deepEqual(result, {
+        availableBytes: 4_294_967_296n,
+        checkedPath: existingAncestor,
+        minimumBytes: MIN_PERFORMANCE_ARTIFACT_FREE_BYTES,
+    });
+});
+
+test('accepts exactly two GiB of available capacity', async () => {
+    const result = await assertPerformanceArtifactCapacity('/existing', {
+        statfs: async () => ({
+            bavail: 2_097_152n,
+            bsize: 1_024n,
+        }),
+    });
+
+    assert.equal(result.availableBytes, MIN_PERFORMANCE_ARTIFACT_FREE_BYTES);
+});
+
+test('fails before artifact creation when available capacity is below two GiB', async () => {
+    await assert.rejects(
+        assertPerformanceArtifactCapacity('/existing', {
+            statfs: async () => ({
+                bavail: 2_097_151n,
+                bsize: 1_024n,
+            }),
+        }),
+        /requires at least 2147483648 available bytes.*2147482624/
+    );
+});
+
+test('does not substitute free blocks that are unavailable to the process', async () => {
+    await assert.rejects(
+        assertPerformanceArtifactCapacity('/existing', {
+            statfs: async () => ({
+                bavail: 1n,
+                bfree: 9_999_999_999n,
+                bsize: 1_024n,
+            }),
+        }),
+        /performance-artifact-space-insufficient/
+    );
+});
+
+test('does not hide filesystem errors other than a missing path', async () => {
+    const denied = Object.assign(new Error('denied'), { code: 'EACCES' });
+    let calls = 0;
+
+    await assert.rejects(
+        assertPerformanceArtifactCapacity('/denied/child', {
+            statfs: async () => {
+                calls += 1;
+                throw denied;
+            },
+        }),
+        denied
+    );
+    assert.equal(calls, 1);
+});
+
+test('the benchmark preflights capacity before creating output directories', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const runIteration = source.slice(
+        source.indexOf('async function runIteration('),
+        source.indexOf('async function seedPlaylist(')
+    );
+    const resolveConfiguration = source.slice(
+        source.indexOf('async function resolveConfiguration('),
+        source.indexOf('function readGitSourceState(')
+    );
+
+    for (const [name, section] of [
+        ['iteration', runIteration],
+        ['variant', resolveConfiguration],
+    ] as const) {
+        const preflight = section.indexOf(
+            'await assertPerformanceArtifactCapacity('
+        );
+        const createDirectory = section.indexOf('await mkdir(');
+        assert.ok(preflight >= 0, `${name} preflight is missing`);
+        assert.ok(
+            preflight < createDirectory,
+            `${name} preflight must run before mkdir`
+        );
+    }
+});
diff --git a/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.ts b/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.ts
new file mode 100644
index 000000000..7c0433854
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-artifact-preflight.ts
@@ -0,0 +1,76 @@
+import { statfs } from 'node:fs/promises';
+import { dirname, resolve } from 'node:path';
+
+export const MIN_PERFORMANCE_ARTIFACT_FREE_BYTES =
+    2n * 1_024n * 1_024n * 1_024n;
+
+interface FileSystemCapacity {
+    readonly bavail: bigint;
+    readonly bsize: bigint;
+}
+
+interface PerformanceArtifactPreflightDependencies {
+    readonly statfs?: (path: string) => Promise<FileSystemCapacity>;
+}
+
+export interface PerformanceArtifactCapacity {
+    readonly availableBytes: bigint;
+    readonly checkedPath: string;
+    readonly minimumBytes: bigint;
+}
+
+async function readFileSystemCapacity(
+    path: string
+): Promise<FileSystemCapacity> {
+    const capacity = await statfs(path, { bigint: true });
+    return {
+        bavail: capacity.bavail,
+        bsize: capacity.bsize,
+    };
+}
+
+function isMissingPath(error: unknown): boolean {
+    return (
+        typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        error.code === 'ENOENT'
+    );
+}
+
+export async function assertPerformanceArtifactCapacity(
+    targetPath: string,
+    dependencies: PerformanceArtifactPreflightDependencies = {}
+): Promise<PerformanceArtifactCapacity> {
+    const readCapacity = dependencies.statfs ?? readFileSystemCapacity;
+    let checkedPath = resolve(targetPath);
+
+    while (true) {
+        try {
+            const capacity = await readCapacity(checkedPath);
+            const availableBytes = capacity.bavail * capacity.bsize;
+            if (availableBytes < MIN_PERFORMANCE_ARTIFACT_FREE_BYTES) {
+                throw new Error(
+                    `performance-artifact-space-insufficient: benchmark requires at least ${MIN_PERFORMANCE_ARTIFACT_FREE_BYTES} available bytes; ${availableBytes} available at ${checkedPath}`
+                );
+            }
+            return Object.freeze({
+                availableBytes,
+                checkedPath,
+                minimumBytes: MIN_PERFORMANCE_ARTIFACT_FREE_BYTES,
+            });
+        } catch (error) {
+            if (!isMissingPath(error)) {
+                throw error;
+            }
+            const parent = dirname(checkedPath);
+            if (parent === checkedPath) {
+                throw new Error(
+                    `performance-artifact-space-unavailable: no existing ancestor for ${targetPath}`,
+                    { cause: error }
+                );
+            }
+            checkedPath = parent;
+        }
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/performance-build-config.spec.ts b/apps/electron-backend-e2e/src/performance/performance-build-config.spec.ts
new file mode 100644
index 000000000..34f157d5a
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-build-config.spec.ts
@@ -0,0 +1,303 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based configuration contract tests. */
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import test from 'node:test';
+import { join } from 'node:path';
+
+interface TargetConfiguration {
+    configurations?: Record<string, Record<string, unknown>>;
+    dependsOn?: unknown;
+    executor?: unknown;
+    options?: Record<string, unknown>;
+}
+
+interface ProjectConfiguration {
+    targets: Record<string, TargetConfiguration>;
+}
+
+interface NxGraphTask {
+    outputs?: string[];
+    target: {
+        project: string;
+        target: string;
+    };
+}
+
+interface NxGraph {
+    tasks: {
+        tasks: Record<string, NxGraphTask>;
+    };
+}
+
+const workspaceRoot = fileURLToPath(new URL('../../../../', import.meta.url));
+
+function readProject(relativePath: string): ProjectConfiguration {
+    return JSON.parse(
+        readFileSync(join(workspaceRoot, relativePath), 'utf8')
+    ) as ProjectConfiguration;
+}
+
+function readResolvedWebBuildTask(): NxGraphTask | undefined {
+    const environment = {
+        ...process.env,
+        FORCE_COLOR: '0',
+        NX_DAEMON: 'false',
+    };
+    delete environment['NO_COLOR'];
+
+    const graph = JSON.parse(
+        execFileSync(
+            process.execPath,
+            [
+                join(workspaceRoot, 'node_modules/nx/dist/bin/nx.js'),
+                'run',
+                'web:build',
+                '--graph=stdout',
+            ],
+            {
+                cwd: workspaceRoot,
+                encoding: 'utf8',
+                env: environment,
+            }
+        )
+    ) as NxGraph;
+
+    return Object.values(graph.tasks.tasks).find(
+        (task) =>
+            task.target.project === 'web' && task.target.target === 'build'
+    );
+}
+
+const e2eProject = readProject('apps/electron-backend-e2e/project.json');
+const electronProject = readProject('apps/electron-backend/project.json');
+const remoteControlProject = readProject(
+    'apps/remote-control-web/project.json'
+);
+const webProject = readProject('apps/web/project.json');
+
+test('the performance harness target runs only Node performance specs', () => {
+    const target = e2eProject.targets['test-performance-harness'];
+
+    assert.ok(
+        target,
+        'electron-backend-e2e must define test-performance-harness'
+    );
+    assert.equal(target.executor, 'nx:run-commands');
+    assert.equal(target.options?.['cwd'], 'apps/electron-backend-e2e');
+    assert.equal(
+        target.options?.['command'],
+        'pnpm exec tsx --test src/performance/*.spec.ts'
+    );
+});
+
+test('the web performance build keeps production renderer behavior with profiling source maps', () => {
+    const build = webProject.targets['build'];
+    const production = build.configurations?.['production'];
+    const performance = build.configurations?.['electron-performance'];
+
+    assert.ok(production, 'web:build must define production');
+    assert.ok(performance, 'web:build must define electron-performance');
+    assert.equal(performance['baseHref'], './');
+    assert.equal(performance['serviceWorker'], false);
+    assert.deepEqual(performance['optimization'], production['optimization']);
+    assert.equal(performance['outputHashing'], production['outputHashing']);
+    assert.deepEqual(
+        performance['fileReplacements'],
+        production['fileReplacements']
+    );
+    assert.equal(performance['sourceMap'], true);
+});
+
+test('the resolved web build cache output is the renderer directory', () => {
+    const task = readResolvedWebBuildTask();
+
+    assert.ok(task, 'the Nx graph must include web:build');
+    assert.deepEqual(task.outputs, ['dist/apps/web']);
+});
+
+test('the remote-control performance build keeps optimized hashed output with profiling source maps', () => {
+    const build = remoteControlProject.targets['build'];
+    const production = build.configurations?.['production'];
+    const performance = build.configurations?.['electron-performance'];
+
+    assert.ok(production, 'remote-control-web:build must define production');
+    assert.ok(
+        performance,
+        'remote-control-web:build must define electron-performance'
+    );
+    assert.equal(performance['optimization'], true);
+    assert.equal(performance['outputHashing'], production['outputHashing']);
+    assert.equal(performance['sourceMap'], true);
+});
+
+test('the Electron performance build keeps production main-process behavior with profiling source maps', () => {
+    const build = electronProject.targets['build'];
+    const production = build.configurations?.['production'];
+    const performance = build.configurations?.['electron-performance'];
+
+    assert.ok(production, 'electron-backend:build must define production');
+    assert.ok(
+        performance,
+        'electron-backend:build must define electron-performance'
+    );
+    assert.equal(performance['optimization'], production['optimization']);
+    assert.equal(performance['inspect'], production['inspect']);
+    assert.deepEqual(
+        performance['fileReplacements'],
+        production['fileReplacements']
+    );
+    assert.equal(performance['sourceMap'], true);
+});
+
+test('the regular Electron build keeps its existing renderer dependency contract', () => {
+    const build = electronProject.targets['build'];
+    const dependencies = build.dependsOn as Array<
+        Record<string, unknown> | string
+    >;
+    const rendererBuild = dependencies.find(
+        (dependency): dependency is Record<string, unknown> =>
+            typeof dependency === 'object' &&
+            dependency !== null &&
+            dependency['target'] === 'build'
+    );
+
+    assert.deepEqual(rendererBuild, {
+        projects: ['web', 'remote-control-web'],
+        target: 'build',
+    });
+});
+
+test('the web performance wrapper selects the profiling configuration', () => {
+    const target = webProject.targets['build-performance'];
+
+    assert.ok(target, 'web must define build-performance');
+    assert.equal(target.executor, 'nx:run-commands');
+    assert.equal(
+        target.options?.['command'],
+        'pnpm nx run web:build:electron-performance'
+    );
+});
+
+test('the remote-control performance wrapper selects the profiling configuration', () => {
+    const target = remoteControlProject.targets['build-performance'];
+
+    assert.ok(target, 'remote-control-web must define build-performance');
+    assert.equal(target.executor, 'nx:run-commands');
+    assert.equal(
+        target.options?.['command'],
+        'pnpm nx run remote-control-web:build:electron-performance'
+    );
+});
+
+test('the Electron performance wrapper owns build dependencies before its profiled build', () => {
+    const target = electronProject.targets['build-performance'];
+
+    assert.ok(target, 'electron-backend must define build-performance');
+    assert.equal(target.executor, 'nx:run-commands');
+    assert.deepEqual(target.dependsOn, [
+        'electron-backend:build-worker-performance',
+        'electron-backend:build-embedded-mpv',
+        {
+            projects: ['web', 'remote-control-web'],
+            target: 'build-performance',
+        },
+    ]);
+    assert.equal(
+        target.options?.['command'],
+        'pnpm nx run electron-backend:build:electron-performance --excludeTaskDependencies'
+    );
+});
+
+test('the Electron performance wrapper builds optimized source-mapped workers', () => {
+    const target = electronProject.targets['build-worker-performance'];
+    const source = readFileSync(
+        join(workspaceRoot, 'apps/electron-backend/build-worker.js'),
+        'utf8'
+    );
+
+    assert.ok(target, 'electron-backend must define build-worker-performance');
+    assert.equal(target.executor, 'nx:run-commands');
+    assert.equal(
+        target.options?.['command'],
+        'node apps/electron-backend/build-worker.js --performance'
+    );
+    assert.match(
+        source,
+        /const isPerformance = process\.argv\.includes\('--performance'\)/
+    );
+    assert.match(source, /minify: isProduction \|\| isPerformance/);
+    assert.match(source, /sourcemap: isPerformance \|\| !isProduction/);
+});
+
+test('the cancellation benchmark uses the production-equivalent performance build', () => {
+    const target = e2eProject.targets['benchmark-m3u-refresh-cancellation'];
+
+    assert.deepEqual(target.dependsOn, ['electron-backend:build-performance']);
+});
+
+test('the cancellation benchmark command is pinned to its Playwright test file', () => {
+    const target = e2eProject.targets['benchmark-m3u-refresh-cancellation'];
+
+    assert.equal(
+        target.options?.['command'],
+        'pnpm exec playwright test --config=playwright.performance.config.ts src/m3u-refresh-cancellation.performance.ts'
+    );
+});
+
+test('the cancellation benchmark enables preload performance capture', () => {
+    const source = readFileSync(
+        join(
+            workspaceRoot,
+            'apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation.benchmark.ts'
+        ),
+        'utf8'
+    );
+
+    assert.match(source, /IPTVNATOR_PERF_CAPTURE:\s*'1'/);
+});
+
+test('the cancellation benchmark exposes GC to Electron worker isolates', () => {
+    const source = readFileSync(
+        join(
+            workspaceRoot,
+            'apps/electron-backend-e2e/src/performance/m3u-refresh-cancellation.benchmark.ts'
+        ),
+        'utf8'
+    );
+
+    assert.match(source, /'--js-flags=--expose-gc'/);
+    assert.doesNotMatch(source, /execArgv/);
+});
+
+test('the initial M3U import benchmark uses the production-equivalent performance build', () => {
+    const target = e2eProject.targets['benchmark-m3u-import'];
+
+    assert.ok(target, 'electron-backend-e2e must define benchmark-m3u-import');
+    assert.deepEqual(target.dependsOn, ['electron-backend:build-performance']);
+});
+
+test('the initial M3U import benchmark command is pinned to its Playwright test file', () => {
+    const target = e2eProject.targets['benchmark-m3u-import'];
+
+    assert.equal(
+        target.options?.['command'],
+        'pnpm exec playwright test --config=playwright.performance.config.ts src/m3u-import.performance.ts'
+    );
+});
+
+test('the initial M3U import benchmark enables opt-in capture and worker GC', () => {
+    const source = readFileSync(
+        join(
+            workspaceRoot,
+            'apps/electron-backend-e2e/src/performance/m3u-import.benchmark.ts'
+        ),
+        'utf8'
+    );
+
+    assert.match(source, /IPTVNATOR_PERF_CAPTURE:\s*'1'/);
+    assert.match(source, /IPTVNATOR_PERF_WORKER_PROFILING:\s*'1'/);
+    assert.match(source, /'--js-flags=--expose-gc'/);
+    assert.doesNotMatch(source, /execArgv/);
+});
diff --git a/apps/electron-backend-e2e/src/performance/performance-phase-events.spec.ts b/apps/electron-backend-e2e/src/performance/performance-phase-events.spec.ts
new file mode 100644
index 000000000..dd471db9b
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-phase-events.spec.ts
@@ -0,0 +1,158 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import {
+    pairPerformancePhaseEvents,
+    requirePerformancePhase,
+} from './performance-phase-events';
+
+describe('performance phase event pairing', () => {
+    it('pairs request-scoped boundaries and preserves end metadata', () => {
+        const phases = pairPerformancePhaseEvents([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 100,
+                phase: 'data.acquire',
+                requestId: 'request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 12.5,
+                epochMs: 113,
+                metadata: { byteCount: 2048, itemCount: 10 },
+                phase: 'data.acquire',
+                requestId: 'request-1',
+            },
+        ]);
+
+        assert.deepEqual(phases, [
+            {
+                durationMs: 12.5,
+                endedEpochMs: 113,
+                metadata: { byteCount: 2048, itemCount: 10 },
+                phase: 'data.acquire',
+                requestId: 'request-1',
+                startedEpochMs: 100,
+            },
+        ]);
+        assert.deepEqual(
+            requirePerformancePhase(phases, 'request-1', 'data.acquire'),
+            phases[0]
+        );
+    });
+
+    it('pairs interleaved requests without cross-correlating them', () => {
+        const phases = pairPerformancePhaseEvents([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 100,
+                phase: 'serialize.playlist',
+                requestId: 'request-a',
+            },
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 101,
+                phase: 'serialize.playlist',
+                requestId: 'request-b',
+            },
+            {
+                boundary: 'end',
+                durationMs: 3,
+                epochMs: 104,
+                phase: 'serialize.playlist',
+                requestId: 'request-b',
+            },
+            {
+                boundary: 'end',
+                durationMs: 8,
+                epochMs: 108,
+                phase: 'serialize.playlist',
+                requestId: 'request-a',
+            },
+        ]);
+
+        assert.deepEqual(
+            phases.map(({ durationMs, requestId }) => ({
+                durationMs,
+                requestId,
+            })),
+            [
+                { durationMs: 8, requestId: 'request-a' },
+                { durationMs: 3, requestId: 'request-b' },
+            ]
+        );
+    });
+
+    it('fails closed for orphaned, duplicate, malformed, or reversed boundaries', () => {
+        const validStart = {
+            boundary: 'start',
+            durationMs: null,
+            epochMs: 100,
+            phase: 'normalize',
+            requestId: 'request-1',
+        } as const;
+        const validEnd = {
+            boundary: 'end',
+            durationMs: 2,
+            epochMs: 102,
+            phase: 'normalize',
+            requestId: 'request-1',
+        } as const;
+
+        for (const invalid of [
+            [validStart],
+            [validStart, validStart, validEnd],
+            [validStart, { ...validEnd, durationMs: null }],
+            [validStart, { ...validEnd, epochMs: 99 }],
+            [{ ...validStart, durationMs: 0 }, validEnd],
+            [
+                validStart,
+                {
+                    ...validEnd,
+                    metadata: { byteCount: -1 },
+                },
+            ],
+        ]) {
+            assert.throws(
+                () => pairPerformancePhaseEvents(invalid),
+                /performance-phase-events-invalid/
+            );
+        }
+    });
+
+    it('requires one exact request and phase match', () => {
+        const phases = pairPerformancePhaseEvents([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 100,
+                phase: 'normalize',
+                requestId: 'request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 2,
+                epochMs: 102,
+                phase: 'normalize',
+                requestId: 'request-1',
+            },
+        ]);
+
+        assert.throws(
+            () => requirePerformancePhase(phases, 'request-2', 'normalize'),
+            /performance-phase-missing:request-2:normalize/
+        );
+        assert.throws(
+            () =>
+                requirePerformancePhase(
+                    [...phases, ...phases],
+                    'request-1',
+                    'normalize'
+                ),
+            /performance-phase-ambiguous:request-1:normalize/
+        );
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/performance-phase-events.ts b/apps/electron-backend-e2e/src/performance/performance-phase-events.ts
new file mode 100644
index 000000000..15468b018
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-phase-events.ts
@@ -0,0 +1,166 @@
+import type { PerformancePhaseMetadata } from '@iptvnator/shared/interfaces';
+
+export interface PairedPerformancePhase {
+    readonly durationMs: number;
+    readonly endedEpochMs: number;
+    readonly metadata: PerformancePhaseMetadata | null;
+    readonly phase: string;
+    readonly requestId: string;
+    readonly startedEpochMs: number;
+}
+
+interface ParsedPerformancePhaseEvent {
+    readonly boundary: 'end' | 'start';
+    readonly durationMs: number | null;
+    readonly epochMs: number;
+    readonly metadata: PerformancePhaseMetadata | null;
+    readonly phase: string;
+    readonly requestId: string;
+}
+
+export function pairPerformancePhaseEvents(
+    input: readonly unknown[]
+): readonly PairedPerformancePhase[] {
+    const grouped = new Map<string, ParsedPerformancePhaseEvent[]>();
+
+    for (const value of input) {
+        const event = parsePerformancePhaseEvent(value);
+        const key = `${event.requestId}\u0000${event.phase}`;
+        const events = grouped.get(key) ?? [];
+        events.push(event);
+        if (events.length > 2) {
+            throw invalidPhaseEvents();
+        }
+        grouped.set(key, events);
+    }
+
+    const paired: PairedPerformancePhase[] = [];
+    for (const events of grouped.values()) {
+        const start = events.find((event) => event.boundary === 'start');
+        const end = events.find((event) => event.boundary === 'end');
+        if (
+            events.length !== 2 ||
+            !start ||
+            !end ||
+            start.durationMs !== null ||
+            start.metadata !== null ||
+            end.durationMs === null ||
+            end.epochMs < start.epochMs
+        ) {
+            throw invalidPhaseEvents();
+        }
+        paired.push(
+            Object.freeze({
+                durationMs: end.durationMs,
+                endedEpochMs: end.epochMs,
+                metadata: end.metadata,
+                phase: start.phase,
+                requestId: start.requestId,
+                startedEpochMs: start.epochMs,
+            })
+        );
+    }
+
+    paired.sort(
+        (left, right) =>
+            left.startedEpochMs - right.startedEpochMs ||
+            left.endedEpochMs - right.endedEpochMs ||
+            left.requestId.localeCompare(right.requestId) ||
+            left.phase.localeCompare(right.phase)
+    );
+    return Object.freeze(paired);
+}
+
+export function requirePerformancePhase(
+    phases: readonly PairedPerformancePhase[],
+    requestId: string,
+    phase: string
+): PairedPerformancePhase {
+    const matches = phases.filter(
+        (candidate) =>
+            candidate.requestId === requestId && candidate.phase === phase
+    );
+    if (matches.length === 0) {
+        throw new Error(`performance-phase-missing:${requestId}:${phase}`);
+    }
+    if (matches.length !== 1 || !matches[0]) {
+        throw new Error(`performance-phase-ambiguous:${requestId}:${phase}`);
+    }
+    return matches[0];
+}
+
+function parsePerformancePhaseEvent(
+    value: unknown
+): ParsedPerformancePhaseEvent {
+    if (!isRecord(value)) {
+        throw invalidPhaseEvents();
+    }
+    const boundary = value['boundary'];
+    const durationMs = value['durationMs'];
+    const epochMs = value['epochMs'];
+    const phase = value['phase'];
+    const requestId = value['requestId'];
+    if (
+        (boundary !== 'start' && boundary !== 'end') ||
+        (durationMs !== null && !isFiniteNonNegativeNumber(durationMs)) ||
+        !isFiniteNonNegativeNumber(epochMs) ||
+        typeof phase !== 'string' ||
+        phase.length === 0 ||
+        typeof requestId !== 'string' ||
+        requestId.length === 0
+    ) {
+        throw invalidPhaseEvents();
+    }
+
+    return {
+        boundary,
+        durationMs,
+        epochMs,
+        metadata: parseMetadata(value['metadata']),
+        phase,
+        requestId,
+    };
+}
+
+function parseMetadata(value: unknown): PerformancePhaseMetadata | null {
+    if (value === undefined) {
+        return null;
+    }
+    if (!isRecord(value)) {
+        throw invalidPhaseEvents();
+    }
+    const keys = Object.keys(value);
+    if (
+        keys.some((key) => key !== 'byteCount' && key !== 'itemCount') ||
+        keys.some((key) => !isSafeCount(value[key]))
+    ) {
+        throw invalidPhaseEvents();
+    }
+    return Object.freeze({
+        ...(value['byteCount'] === undefined
+            ? {}
+            : { byteCount: Number(value['byteCount']) }),
+        ...(value['itemCount'] === undefined
+            ? {}
+            : { itemCount: Number(value['itemCount']) }),
+    });
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isFiniteNonNegativeNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+
+function isSafeCount(value: unknown): boolean {
+    return (
+        value === undefined ||
+        (Number.isSafeInteger(value) && Number(value) >= 0)
+    );
+}
+
+function invalidPhaseEvents(): Error {
+    return new Error('performance-phase-events-invalid');
+}
diff --git a/apps/electron-backend-e2e/src/performance/performance-statistics.ts b/apps/electron-backend-e2e/src/performance/performance-statistics.ts
new file mode 100644
index 000000000..ab7d53140
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/performance-statistics.ts
@@ -0,0 +1,64 @@
+import type { NumericDistribution } from './m3u-refresh-cancellation-contract';
+
+export function summarizeNumbers(
+    values: readonly (number | null | undefined)[]
+): NumericDistribution {
+    const samples = values
+        .filter(
+            (value): value is number => value !== null && value !== undefined
+        )
+        .filter((value) => Number.isFinite(value) && value >= 0)
+        .sort((left, right) => left - right);
+
+    if (samples.length === 0) {
+        return Object.freeze({
+            count: 0,
+            max: null,
+            mean: null,
+            median: null,
+            min: null,
+            p95: null,
+            p99: null,
+        });
+    }
+
+    const total = samples.reduce((sum, value) => sum + value, 0);
+    return Object.freeze({
+        count: samples.length,
+        max: samples.at(-1) ?? null,
+        mean: total / samples.length,
+        median: percentile(samples, 50),
+        min: samples[0] ?? null,
+        p95: percentile(samples, 95),
+        p99: percentile(samples, 99),
+    });
+}
+
+export function nonNegativeDifference(
+    endEpochMs: number | null | undefined,
+    startEpochMs: number | null | undefined
+): number | null {
+    if (
+        endEpochMs === null ||
+        endEpochMs === undefined ||
+        startEpochMs === null ||
+        startEpochMs === undefined
+    ) {
+        return null;
+    }
+    const difference = endEpochMs - startEpochMs;
+    return Number.isFinite(difference) && difference >= 0 ? difference : null;
+}
+
+function percentile(sortedValues: readonly number[], rank: number): number {
+    if (sortedValues.length === 1) {
+        return sortedValues[0] ?? 0;
+    }
+
+    const position = ((sortedValues.length - 1) * rank) / 100;
+    const lowerIndex = Math.floor(position);
+    const upperIndex = Math.ceil(position);
+    const lower = sortedValues[lowerIndex] ?? 0;
+    const upper = sortedValues[upperIndex] ?? lower;
+    return lower + (upper - lower) * (position - lowerIndex);
+}
diff --git a/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.spec.ts b/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.spec.ts
new file mode 100644
index 000000000..10c078015
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.spec.ts
@@ -0,0 +1,133 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import {
+    pairRendererPerformancePhaseEvents,
+    requireRendererPerformancePhase,
+} from './renderer-performance-phase-events';
+
+describe('renderer performance phase event pairing', () => {
+    it('pairs a successful renderer phase using monotonic duration', () => {
+        const phases = pairRendererPerformancePhaseEvents([
+            {
+                boundary: 'start',
+                epochMs: 100,
+                metadata: { items: 10_000 },
+                monotonicMs: 20,
+                phase: 'store.m3u-publish-channels',
+                phaseId: 'phase-1',
+                schemaVersion: 1,
+            },
+            {
+                boundary: 'end',
+                epochMs: 106,
+                metadata: { items: 10_000 },
+                monotonicMs: 25.5,
+                outcome: 'success',
+                phase: 'store.m3u-publish-channels',
+                phaseId: 'phase-1',
+                schemaVersion: 1,
+            },
+        ]);
+
+        assert.deepEqual(phases, [
+            {
+                durationMs: 5.5,
+                endedEpochMs: 106,
+                metadata: { items: 10_000 },
+                outcome: 'success',
+                phase: 'store.m3u-publish-channels',
+                phaseId: 'phase-1',
+                startedEpochMs: 100,
+            },
+        ]);
+        assert.deepEqual(
+            requireRendererPerformancePhase(
+                phases,
+                'store.m3u-publish-channels'
+            ),
+            phases[0]
+        );
+    });
+
+    it('fails closed for inconsistent identity, metadata, outcome, and clocks', () => {
+        const start = {
+            boundary: 'start',
+            epochMs: 100,
+            metadata: { items: 50_000 },
+            monotonicMs: 20,
+            phase: 'store.m3u-import-dispatch',
+            phaseId: 'phase-1',
+            schemaVersion: 1,
+        } as const;
+        const end = {
+            boundary: 'end',
+            epochMs: 102,
+            metadata: { items: 50_000 },
+            monotonicMs: 22,
+            outcome: 'success',
+            phase: 'store.m3u-import-dispatch',
+            phaseId: 'phase-1',
+            schemaVersion: 1,
+        } as const;
+
+        for (const invalid of [
+            [start],
+            [start, start, end],
+            [start, { ...end, phase: 'store.m3u-publish-channels' }],
+            [start, { ...end, metadata: { items: 10_000 } }],
+            [{ ...start, outcome: 'success' }, end],
+            [start, { ...end, outcome: undefined }],
+            [start, { ...end, epochMs: 99 }],
+            [start, { ...end, monotonicMs: 19 }],
+            [start, { ...end, metadata: { items: -1 } }],
+        ]) {
+            assert.throws(
+                () => pairRendererPerformancePhaseEvents(invalid),
+                /renderer-performance-phase-events-invalid/
+            );
+        }
+    });
+
+    it('requires exactly one successful event for a named phase', () => {
+        const successful = {
+            durationMs: 2,
+            endedEpochMs: 102,
+            metadata: { items: 10_000 },
+            outcome: 'success',
+            phase: 'store.m3u-import-dispatch',
+            phaseId: 'phase-1',
+            startedEpochMs: 100,
+        } as const;
+        const failed = {
+            ...successful,
+            outcome: 'error',
+            phaseId: 'phase-2',
+        } as const;
+
+        assert.throws(
+            () =>
+                requireRendererPerformancePhase(
+                    [successful],
+                    'store.m3u-publish-channels'
+                ),
+            /renderer-performance-phase-missing:store.m3u-publish-channels/
+        );
+        assert.throws(
+            () =>
+                requireRendererPerformancePhase(
+                    [successful, successful],
+                    'store.m3u-import-dispatch'
+                ),
+            /renderer-performance-phase-ambiguous:store.m3u-import-dispatch/
+        );
+        assert.throws(
+            () =>
+                requireRendererPerformancePhase(
+                    [failed],
+                    'store.m3u-import-dispatch'
+                ),
+            /renderer-performance-phase-failed:store.m3u-import-dispatch/
+        );
+    });
+});
diff --git a/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.ts b/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.ts
new file mode 100644
index 000000000..23cb976e8
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-performance-phase-events.ts
@@ -0,0 +1,163 @@
+export interface PairedRendererPerformancePhase {
+    readonly durationMs: number;
+    readonly endedEpochMs: number;
+    readonly metadata: Readonly<{ items: number }> | null;
+    readonly outcome: 'error' | 'success';
+    readonly phase: string;
+    readonly phaseId: string;
+    readonly startedEpochMs: number;
+}
+
+interface ParsedRendererPerformancePhaseEvent {
+    readonly boundary: 'end' | 'start';
+    readonly epochMs: number;
+    readonly metadata: Readonly<{ items: number }> | null;
+    readonly monotonicMs: number;
+    readonly outcome: 'error' | 'success' | null;
+    readonly phase: string;
+    readonly phaseId: string;
+}
+
+export function pairRendererPerformancePhaseEvents(
+    input: readonly unknown[]
+): readonly PairedRendererPerformancePhase[] {
+    const grouped = new Map<string, ParsedRendererPerformancePhaseEvent[]>();
+
+    for (const value of input) {
+        const event = parseRendererPerformancePhaseEvent(value);
+        const events = grouped.get(event.phaseId) ?? [];
+        events.push(event);
+        if (events.length > 2) {
+            throw invalidRendererEvents();
+        }
+        grouped.set(event.phaseId, events);
+    }
+
+    const paired: PairedRendererPerformancePhase[] = [];
+    for (const events of grouped.values()) {
+        const start = events.find((event) => event.boundary === 'start');
+        const end = events.find((event) => event.boundary === 'end');
+        if (
+            events.length !== 2 ||
+            !start ||
+            !end ||
+            start.outcome !== null ||
+            end.outcome === null ||
+            start.phase !== end.phase ||
+            !sameMetadata(start.metadata, end.metadata) ||
+            end.epochMs < start.epochMs ||
+            end.monotonicMs < start.monotonicMs
+        ) {
+            throw invalidRendererEvents();
+        }
+        paired.push(
+            Object.freeze({
+                durationMs: end.monotonicMs - start.monotonicMs,
+                endedEpochMs: end.epochMs,
+                metadata: end.metadata,
+                outcome: end.outcome,
+                phase: end.phase,
+                phaseId: end.phaseId,
+                startedEpochMs: start.epochMs,
+            })
+        );
+    }
+
+    paired.sort(
+        (left, right) =>
+            left.startedEpochMs - right.startedEpochMs ||
+            left.endedEpochMs - right.endedEpochMs ||
+            left.phaseId.localeCompare(right.phaseId)
+    );
+    return Object.freeze(paired);
+}
+
+export function requireRendererPerformancePhase(
+    phases: readonly PairedRendererPerformancePhase[],
+    phase: string
+): PairedRendererPerformancePhase {
+    const matches = phases.filter((candidate) => candidate.phase === phase);
+    if (matches.length === 0) {
+        throw new Error(`renderer-performance-phase-missing:${phase}`);
+    }
+    if (matches.length !== 1 || !matches[0]) {
+        throw new Error(`renderer-performance-phase-ambiguous:${phase}`);
+    }
+    if (matches[0].outcome !== 'success') {
+        throw new Error(`renderer-performance-phase-failed:${phase}`);
+    }
+    return matches[0];
+}
+
+function parseRendererPerformancePhaseEvent(
+    value: unknown
+): ParsedRendererPerformancePhaseEvent {
+    if (!isRecord(value) || value['schemaVersion'] !== 1) {
+        throw invalidRendererEvents();
+    }
+    const boundary = value['boundary'];
+    const epochMs = value['epochMs'];
+    const monotonicMs = value['monotonicMs'];
+    const outcome = value['outcome'];
+    const phase = value['phase'];
+    const phaseId = value['phaseId'];
+    if (
+        (boundary !== 'start' && boundary !== 'end') ||
+        !isFiniteNonNegativeNumber(epochMs) ||
+        !isFiniteNonNegativeNumber(monotonicMs) ||
+        typeof phase !== 'string' ||
+        phase.length === 0 ||
+        typeof phaseId !== 'string' ||
+        phaseId.length === 0 ||
+        (boundary === 'start' && outcome !== undefined) ||
+        (boundary === 'end' && outcome !== 'success' && outcome !== 'error')
+    ) {
+        throw invalidRendererEvents();
+    }
+
+    return {
+        boundary,
+        epochMs,
+        metadata: parseMetadata(value['metadata']),
+        monotonicMs,
+        outcome: outcome === 'success' || outcome === 'error' ? outcome : null,
+        phase,
+        phaseId,
+    };
+}
+
+function parseMetadata(value: unknown): Readonly<{ items: number }> | null {
+    if (value === undefined) {
+        return null;
+    }
+    if (
+        !isRecord(value) ||
+        Object.keys(value).length !== 1 ||
+        !Number.isSafeInteger(value['items']) ||
+        Number(value['items']) < 0
+    ) {
+        throw invalidRendererEvents();
+    }
+    return Object.freeze({ items: Number(value['items']) });
+}
+
+function sameMetadata(
+    left: Readonly<{ items: number }> | null,
+    right: Readonly<{ items: number }> | null
+): boolean {
+    return left === null || right === null
+        ? left === right
+        : left.items === right.items;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isFiniteNonNegativeNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+
+function invalidRendererEvents(): Error {
+    return new Error('renderer-performance-phase-events-invalid');
+}
diff --git a/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.spec.ts b/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.spec.ts
new file mode 100644
index 000000000..ec335bc73
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.spec.ts
@@ -0,0 +1,309 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import * as rendererProcessRssCaptureModule from './renderer-process-rss-capture';
+import {
+    captureRendererProcessRssSample,
+    createRendererProcessRssCapture,
+    type RendererProcessRssCapture,
+    type RendererProcessRssUnavailableReason,
+} from './renderer-process-rss-capture';
+
+const RENDERER_PID = 42;
+const RENDERER_CREATION_TIME = 1_721_234_567_890;
+
+test('exposes a self-contained factory for the Electron main-process injection boundary', () => {
+    const factory = (
+        rendererProcessRssCaptureModule as unknown as Record<string, unknown>
+    )['createRendererProcessRssCaptureApi'];
+
+    assert.equal(typeof factory, 'function');
+    const source = (factory as () => unknown).toString();
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => {
+        create(
+            webContentsOsPid: unknown,
+            processMetrics: readonly unknown[]
+        ): RendererProcessRssCapture;
+    };
+
+    assert.deepEqual(restoredFactory().create(RENDERER_PID, [metric()]), {
+        identity: {
+            creationTime: RENDERER_CREATION_TIME,
+            pid: RENDERER_PID,
+        },
+        missingSampleCount: 0,
+        peakRssBytes: 1_263_616,
+        unavailableReason: null,
+        validSampleCount: 1,
+    });
+});
+
+interface MetricOverrides {
+    readonly creationTime?: unknown;
+    readonly pid?: unknown;
+    readonly type?: unknown;
+    readonly workingSetSize?: unknown;
+}
+
+function metric(overrides: MetricOverrides = {}): unknown {
+    return {
+        creationTime:
+            overrides.creationTime === undefined
+                ? RENDERER_CREATION_TIME
+                : overrides.creationTime,
+        memory: {
+            workingSetSize:
+                overrides.workingSetSize === undefined
+                    ? 1_234
+                    : overrides.workingSetSize,
+        },
+        pid: overrides.pid === undefined ? RENDERER_PID : overrides.pid,
+        type: overrides.type === undefined ? 'Tab' : overrides.type,
+    };
+}
+
+function assertUnavailable(
+    capture: RendererProcessRssCapture,
+    unavailableReason: RendererProcessRssUnavailableReason,
+    expected: {
+        readonly identity: RendererProcessRssCapture['identity'];
+        readonly missingSampleCount?: number;
+        readonly validSampleCount?: number;
+    }
+): void {
+    assert.deepEqual(capture, {
+        identity: expected.identity,
+        missingSampleCount: expected.missingSampleCount ?? 0,
+        peakRssBytes: null,
+        unavailableReason,
+        validSampleCount: expected.validSampleCount ?? 0,
+    });
+}
+
+test('binds only the exact BrowserWindow renderer identity and converts KiB to bytes once', () => {
+    const capture = createRendererProcessRssCapture(RENDERER_PID, [
+        metric({
+            creationTime: RENDERER_CREATION_TIME + 1,
+            pid: 900,
+            type: 'Renderer',
+            workingSetSize: 9_999_999,
+        }),
+        metric(),
+    ]);
+
+    assert.deepEqual(capture, {
+        identity: {
+            creationTime: RENDERER_CREATION_TIME,
+            pid: RENDERER_PID,
+        },
+        missingSampleCount: 0,
+        peakRssBytes: 1_263_616,
+        unavailableReason: null,
+        validSampleCount: 1,
+    });
+});
+
+test('accepts only exact Tab or Renderer process types and tracks the peak without mutating prior state', () => {
+    const initial = createRendererProcessRssCapture(RENDERER_PID, [
+        metric({ type: 'Tab', workingSetSize: 2_000 }),
+    ]);
+    const lower = captureRendererProcessRssSample(initial, RENDERER_PID, [
+        metric({ type: 'Renderer', workingSetSize: 1_500 }),
+        metric({
+            pid: 777,
+            type: 'Renderer',
+            workingSetSize: 8_000_000,
+        }),
+    ]);
+
+    assert.equal(initial.validSampleCount, 1);
+    assert.equal(initial.peakRssBytes, 2_048_000);
+    assert.deepEqual(lower, {
+        identity: {
+            creationTime: RENDERER_CREATION_TIME,
+            pid: RENDERER_PID,
+        },
+        missingSampleCount: 0,
+        peakRssBytes: 2_048_000,
+        unavailableReason: null,
+        validSampleCount: 2,
+    });
+
+    const higher = captureRendererProcessRssSample(lower, RENDERER_PID, [
+        metric({ workingSetSize: 2_500 }),
+    ]);
+    assert.equal(higher.peakRssBytes, 2_560_000);
+    assert.equal(higher.validSampleCount, 3);
+});
+
+test('fails closed when the BrowserWindow OS process id is invalid', () => {
+    for (const invalidPid of [0, -1, 1.5, Number.NaN, '42'] as const) {
+        assertUnavailable(
+            createRendererProcessRssCapture(invalidPid, [metric()]),
+            'renderer-os-pid-invalid',
+            { identity: null }
+        );
+    }
+});
+
+test('fails closed when the initial target metric is missing or ambiguous', () => {
+    assertUnavailable(
+        createRendererProcessRssCapture(RENDERER_PID, [
+            metric({ pid: 99, workingSetSize: 99_999 }),
+        ]),
+        'renderer-process-metric-missing-at-start',
+        {
+            identity: null,
+            missingSampleCount: 1,
+        }
+    );
+
+    assertUnavailable(
+        createRendererProcessRssCapture(RENDERER_PID, [
+            metric(),
+            metric({ type: 'Renderer', workingSetSize: 2_000 }),
+        ]),
+        'renderer-process-metric-ambiguous',
+        { identity: null }
+    );
+});
+
+test('fails closed for invalid initial type, creation time, or working set', () => {
+    const cases: ReadonlyArray<{
+        readonly metric: unknown;
+        readonly reason: RendererProcessRssUnavailableReason;
+    }> = [
+        {
+            metric: metric({ type: 'RendererHelper' }),
+            reason: 'renderer-process-metric-type-invalid',
+        },
+        {
+            metric: metric({ creationTime: '1721234567890' }),
+            reason: 'renderer-process-metric-creation-time-invalid',
+        },
+        {
+            metric: metric({ workingSetSize: Number.POSITIVE_INFINITY }),
+            reason: 'renderer-process-metric-working-set-invalid',
+        },
+        {
+            metric: metric({ workingSetSize: 0 }),
+            reason: 'renderer-process-metric-working-set-invalid',
+        },
+    ];
+
+    for (const testCase of cases) {
+        assertUnavailable(
+            createRendererProcessRssCapture(RENDERER_PID, [testCase.metric]),
+            testCase.reason,
+            { identity: null }
+        );
+    }
+});
+
+test('invalidates the capture when the bound renderer is missing and never recovers', () => {
+    const initial = createRendererProcessRssCapture(RENDERER_PID, [metric()]);
+    const missing = captureRendererProcessRssSample(initial, RENDERER_PID, [
+        metric({ pid: 700, workingSetSize: 9_999_999 }),
+    ]);
+
+    assertUnavailable(
+        missing,
+        'renderer-process-metric-missing-during-capture',
+        {
+            identity: initial.identity,
+            missingSampleCount: 1,
+            validSampleCount: 1,
+        }
+    );
+
+    const laterValid = captureRendererProcessRssSample(missing, RENDERER_PID, [
+        metric({ workingSetSize: 5_000 }),
+    ]);
+    assert.deepEqual(laterValid, missing);
+});
+
+test('invalidates the capture when the BrowserWindow or process metric identity changes', () => {
+    const initial = createRendererProcessRssCapture(RENDERER_PID, [metric()]);
+
+    assertUnavailable(
+        captureRendererProcessRssSample(initial, 43, [
+            metric({
+                creationTime: RENDERER_CREATION_TIME + 1,
+                pid: 43,
+            }),
+        ]),
+        'renderer-process-identity-changed',
+        {
+            identity: initial.identity,
+            validSampleCount: 1,
+        }
+    );
+
+    assertUnavailable(
+        captureRendererProcessRssSample(initial, RENDERER_PID, [
+            metric({ creationTime: RENDERER_CREATION_TIME + 1 }),
+        ]),
+        'renderer-process-identity-changed',
+        {
+            identity: initial.identity,
+            validSampleCount: 1,
+        }
+    );
+});
+
+test('fails closed for invalid or ambiguous metrics after binding', () => {
+    const initial = createRendererProcessRssCapture(RENDERER_PID, [metric()]);
+    const cases: ReadonlyArray<{
+        readonly metrics: readonly unknown[];
+        readonly reason: RendererProcessRssUnavailableReason;
+    }> = [
+        {
+            metrics: [metric(), metric({ type: 'Renderer' })],
+            reason: 'renderer-process-metric-ambiguous',
+        },
+        {
+            metrics: [metric({ type: 'RendererHelper' })],
+            reason: 'renderer-process-metric-type-invalid',
+        },
+        {
+            metrics: [metric({ creationTime: Number.NaN })],
+            reason: 'renderer-process-metric-creation-time-invalid',
+        },
+        {
+            metrics: [metric({ workingSetSize: -1 })],
+            reason: 'renderer-process-metric-working-set-invalid',
+        },
+    ];
+
+    for (const testCase of cases) {
+        assertUnavailable(
+            captureRendererProcessRssSample(
+                initial,
+                RENDERER_PID,
+                testCase.metrics
+            ),
+            testCase.reason,
+            {
+                identity: initial.identity,
+                validSampleCount: 1,
+            }
+        );
+    }
+});
+
+test('keeps invalid renderer PIDs sticky after binding', () => {
+    const initial = createRendererProcessRssCapture(RENDERER_PID, [metric()]);
+    const invalid = captureRendererProcessRssSample(initial, 0, [metric()]);
+
+    assertUnavailable(invalid, 'renderer-os-pid-invalid', {
+        identity: initial.identity,
+        validSampleCount: 1,
+    });
+    assert.deepEqual(
+        captureRendererProcessRssSample(invalid, RENDERER_PID, [metric()]),
+        invalid
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.ts b/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.ts
new file mode 100644
index 000000000..3e18a76c8
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-process-rss-capture.ts
@@ -0,0 +1,267 @@
+export type RendererProcessRssUnavailableReason =
+    | 'renderer-os-pid-invalid'
+    | 'renderer-process-identity-changed'
+    | 'renderer-process-metric-ambiguous'
+    | 'renderer-process-metric-creation-time-invalid'
+    | 'renderer-process-metric-missing-at-start'
+    | 'renderer-process-metric-missing-during-capture'
+    | 'renderer-process-metric-type-invalid'
+    | 'renderer-process-metric-working-set-invalid';
+
+export interface RendererProcessIdentity {
+    readonly creationTime: number;
+    readonly pid: number;
+}
+
+export interface RendererProcessRssCapture {
+    readonly identity: RendererProcessIdentity | null;
+    readonly missingSampleCount: number;
+    readonly peakRssBytes: number | null;
+    readonly unavailableReason: RendererProcessRssUnavailableReason | null;
+    readonly validSampleCount: number;
+}
+
+export interface RendererProcessRssCaptureApi {
+    readonly create: (
+        webContentsOsPid: unknown,
+        processMetrics: readonly unknown[]
+    ) => RendererProcessRssCapture;
+    readonly sample: (
+        capture: RendererProcessRssCapture,
+        webContentsOsPid: unknown,
+        processMetrics: readonly unknown[]
+    ) => RendererProcessRssCapture;
+}
+
+export function createRendererProcessRssCaptureApi(): RendererProcessRssCaptureApi {
+    type JsonRecord = Record<string, unknown>;
+
+    const KIBIBYTE_BYTES = 1_024;
+    const MAX_WORKING_SET_KIB = Math.floor(
+        Number.MAX_SAFE_INTEGER / KIBIBYTE_BYTES
+    );
+
+    const helpers = {
+        readRecord(value: unknown): JsonRecord | null {
+            return typeof value === 'object' && value !== null
+                ? (value as JsonRecord)
+                : null;
+        },
+
+        isValidOsPid(value: unknown): value is number {
+            return Number.isSafeInteger(value) && Number(value) > 0;
+        },
+
+        findPidCandidates(
+            processMetrics: readonly unknown[],
+            pid: number
+        ): JsonRecord[] {
+            return processMetrics
+                .map((metric) => helpers.readRecord(metric))
+                .filter(
+                    (metric): metric is JsonRecord =>
+                        metric !== null && metric['pid'] === pid
+                );
+        },
+
+        readMetric(metric: JsonRecord):
+            | {
+                  readonly creationTime: number;
+                  readonly rssBytes: number;
+              }
+            | RendererProcessRssUnavailableReason {
+            if (metric['type'] !== 'Tab' && metric['type'] !== 'Renderer') {
+                return 'renderer-process-metric-type-invalid';
+            }
+
+            const creationTime = metric['creationTime'];
+            if (
+                typeof creationTime !== 'number' ||
+                !Number.isFinite(creationTime) ||
+                creationTime < 0
+            ) {
+                return 'renderer-process-metric-creation-time-invalid';
+            }
+
+            const memory = helpers.readRecord(metric['memory']);
+            const workingSetSize = memory?.['workingSetSize'];
+            if (
+                !Number.isSafeInteger(workingSetSize) ||
+                Number(workingSetSize) <= 0 ||
+                Number(workingSetSize) > MAX_WORKING_SET_KIB
+            ) {
+                return 'renderer-process-metric-working-set-invalid';
+            }
+
+            return {
+                creationTime,
+                rssBytes: Number(workingSetSize) * KIBIBYTE_BYTES,
+            };
+        },
+
+        unavailableCapture(
+            unavailableReason: RendererProcessRssUnavailableReason,
+            options: {
+                readonly identity?: RendererProcessIdentity | null;
+                readonly missingSampleCount?: number;
+                readonly validSampleCount?: number;
+            } = {}
+        ): RendererProcessRssCapture {
+            return Object.freeze({
+                identity: options.identity ?? null,
+                missingSampleCount: options.missingSampleCount ?? 0,
+                peakRssBytes: null,
+                unavailableReason,
+                validSampleCount: options.validSampleCount ?? 0,
+            });
+        },
+
+        invalidateCapture(
+            capture: RendererProcessRssCapture,
+            unavailableReason: RendererProcessRssUnavailableReason,
+            missingSampleCount = capture.missingSampleCount
+        ): RendererProcessRssCapture {
+            return helpers.unavailableCapture(unavailableReason, {
+                identity: capture.identity,
+                missingSampleCount,
+                validSampleCount: capture.validSampleCount,
+            });
+        },
+
+        create(
+            webContentsOsPid: unknown,
+            processMetrics: readonly unknown[]
+        ): RendererProcessRssCapture {
+            if (!helpers.isValidOsPid(webContentsOsPid)) {
+                return helpers.unavailableCapture('renderer-os-pid-invalid');
+            }
+
+            const candidates = helpers.findPidCandidates(
+                processMetrics,
+                webContentsOsPid
+            );
+            if (candidates.length === 0) {
+                return helpers.unavailableCapture(
+                    'renderer-process-metric-missing-at-start',
+                    {
+                        missingSampleCount: 1,
+                    }
+                );
+            }
+            if (candidates.length !== 1) {
+                return helpers.unavailableCapture(
+                    'renderer-process-metric-ambiguous'
+                );
+            }
+
+            const metric = helpers.readMetric(candidates[0] as JsonRecord);
+            if (typeof metric === 'string') {
+                return helpers.unavailableCapture(metric);
+            }
+
+            return Object.freeze({
+                identity: Object.freeze({
+                    creationTime: metric.creationTime,
+                    pid: webContentsOsPid,
+                }),
+                missingSampleCount: 0,
+                peakRssBytes: metric.rssBytes,
+                unavailableReason: null,
+                validSampleCount: 1,
+            });
+        },
+
+        sample(
+            capture: RendererProcessRssCapture,
+            webContentsOsPid: unknown,
+            processMetrics: readonly unknown[]
+        ): RendererProcessRssCapture {
+            if (capture.unavailableReason !== null) {
+                return capture;
+            }
+            if (!helpers.isValidOsPid(webContentsOsPid)) {
+                return helpers.invalidateCapture(
+                    capture,
+                    'renderer-os-pid-invalid'
+                );
+            }
+
+            const identity = capture.identity;
+            if (identity === null || webContentsOsPid !== identity.pid) {
+                return helpers.invalidateCapture(
+                    capture,
+                    'renderer-process-identity-changed'
+                );
+            }
+
+            const candidates = helpers.findPidCandidates(
+                processMetrics,
+                webContentsOsPid
+            );
+            if (candidates.length === 0) {
+                return helpers.invalidateCapture(
+                    capture,
+                    'renderer-process-metric-missing-during-capture',
+                    capture.missingSampleCount + 1
+                );
+            }
+            if (candidates.length !== 1) {
+                return helpers.invalidateCapture(
+                    capture,
+                    'renderer-process-metric-ambiguous'
+                );
+            }
+
+            const metric = helpers.readMetric(candidates[0] as JsonRecord);
+            if (typeof metric === 'string') {
+                return helpers.invalidateCapture(capture, metric);
+            }
+            if (metric.creationTime !== identity.creationTime) {
+                return helpers.invalidateCapture(
+                    capture,
+                    'renderer-process-identity-changed'
+                );
+            }
+
+            return Object.freeze({
+                identity,
+                missingSampleCount: capture.missingSampleCount,
+                peakRssBytes: Math.max(
+                    capture.peakRssBytes ?? metric.rssBytes,
+                    metric.rssBytes
+                ),
+                unavailableReason: null,
+                validSampleCount: capture.validSampleCount + 1,
+            });
+        },
+    };
+
+    return Object.freeze({
+        create: helpers.create,
+        sample: helpers.sample,
+    });
+}
+
+const rendererProcessRssCaptureApi = createRendererProcessRssCaptureApi();
+
+export function createRendererProcessRssCapture(
+    webContentsOsPid: unknown,
+    processMetrics: readonly unknown[]
+): RendererProcessRssCapture {
+    return rendererProcessRssCaptureApi.create(
+        webContentsOsPid,
+        processMetrics
+    );
+}
+
+export function captureRendererProcessRssSample(
+    capture: RendererProcessRssCapture,
+    webContentsOsPid: unknown,
+    processMetrics: readonly unknown[]
+): RendererProcessRssCapture {
+    return rendererProcessRssCaptureApi.sample(
+        capture,
+        webContentsOsPid,
+        processMetrics
+    );
+}
diff --git a/apps/electron-backend-e2e/src/performance/renderer-rss-validity.spec.ts b/apps/electron-backend-e2e/src/performance/renderer-rss-validity.spec.ts
new file mode 100644
index 000000000..2e94cee01
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-rss-validity.spec.ts
@@ -0,0 +1,172 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+interface TestIteration {
+    readonly kind: 'diagnostic' | 'measured' | 'warmup';
+    readonly main: {
+        readonly rendererWindow: {
+            readonly rss: {
+                readonly identity: {
+                    readonly creationTime: number;
+                    readonly pid: number;
+                } | null;
+                readonly missingSampleCount: number;
+                readonly peakRssBytes: number | null;
+                readonly unavailableReason: string | null;
+                readonly validSampleCount: number;
+            };
+        };
+    };
+    readonly runId: string;
+}
+
+interface RendererRssValidity {
+    readonly invalidMeasuredRuns: readonly {
+        readonly missingSampleCount: number;
+        readonly reason: string;
+        readonly runId: string;
+        readonly validSampleCount: number;
+    }[];
+    readonly measuredRunCount: number;
+    readonly validForBenchmark: boolean;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+}
+
+interface RendererRssValidityModule {
+    assessRendererRssValidity?: (
+        iterations: readonly TestIteration[]
+    ) => RendererRssValidity;
+}
+
+const validityModulePromise = import(
+    new URL('./renderer-rss-validity.ts', import.meta.url).href
+)
+    .then((module) => module as RendererRssValidityModule)
+    .catch(() => null);
+
+function iteration(
+    runId: string,
+    kind: TestIteration['kind'],
+    input: Partial<TestIteration['main']['rendererWindow']['rss']> = {}
+): TestIteration {
+    return {
+        kind,
+        main: {
+            rendererWindow: {
+                rss: {
+                    identity: {
+                        creationTime: 1_721_234_567_890,
+                        pid: 42,
+                    },
+                    missingSampleCount: 0,
+                    peakRssBytes: 4_096,
+                    unavailableReason: null,
+                    validSampleCount: 3,
+                    ...input,
+                },
+            },
+        },
+        runId,
+    };
+}
+
+test('validates only measured renderer RSS runs and preserves the exact summary shape', async () => {
+    const module = await validityModulePromise;
+    assert.ok(module, 'generic renderer RSS validity helper must exist');
+    const assess = module.assessRendererRssValidity;
+    assert.equal(typeof assess, 'function');
+
+    const result = assess([
+        iteration('warmup-invalid', 'warmup', { identity: null }),
+        iteration('run-01', 'measured'),
+        iteration('diagnostic-invalid', 'diagnostic', {
+            unavailableReason: 'renderer-process-gone',
+        }),
+    ]);
+
+    assert.deepEqual(result, {
+        invalidMeasuredRuns: [],
+        measuredRunCount: 1,
+        validForBenchmark: true,
+        validForComparison: true,
+        validMeasuredRunCount: 1,
+    });
+    assert.ok(Object.isFrozen(result));
+    assert.ok(Object.isFrozen(result.invalidMeasuredRuns));
+});
+
+test('fails every incomplete measured capture without losing its raw reason and counts', async () => {
+    const module = await validityModulePromise;
+    assert.ok(module);
+    const assess = module.assessRendererRssValidity;
+    assert.equal(typeof assess, 'function');
+
+    const result = assess([
+        iteration('run-no-identity', 'measured', { identity: null }),
+        iteration('run-missing-sample', 'measured', {
+            missingSampleCount: 1,
+            peakRssBytes: null,
+            unavailableReason: 'renderer-process-metric-missing-during-capture',
+            validSampleCount: 2,
+        }),
+        iteration('run-zero-peak', 'measured', { peakRssBytes: 0 }),
+    ]);
+
+    assert.deepEqual(result, {
+        invalidMeasuredRuns: [
+            {
+                missingSampleCount: 0,
+                reason: 'renderer-rss-capture-invalid',
+                runId: 'run-no-identity',
+                validSampleCount: 3,
+            },
+            {
+                missingSampleCount: 1,
+                reason: 'renderer-process-metric-missing-during-capture',
+                runId: 'run-missing-sample',
+                validSampleCount: 2,
+            },
+            {
+                missingSampleCount: 0,
+                reason: 'renderer-rss-capture-invalid',
+                runId: 'run-zero-peak',
+                validSampleCount: 3,
+            },
+        ],
+        measuredRunCount: 3,
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+});
+
+test('requires at least one measured run', async () => {
+    const module = await validityModulePromise;
+    assert.ok(module);
+    const assess = module.assessRendererRssValidity;
+    assert.equal(typeof assess, 'function');
+
+    assert.deepEqual(assess([iteration('warmup-01', 'warmup')]), {
+        invalidMeasuredRuns: [],
+        measuredRunCount: 0,
+        validForBenchmark: false,
+        validForComparison: false,
+        validMeasuredRunCount: 0,
+    });
+});
+
+test('the cancellation report delegates renderer RSS validity to the generic helper', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation-report.ts', import.meta.url),
+        'utf8'
+    );
+
+    assert.match(
+        source,
+        /import \{ assessRendererRssValidity \} from '\.\/renderer-rss-validity';/
+    );
+    assert.doesNotMatch(source, /function assessRendererRssValidity\(/);
+});
diff --git a/apps/electron-backend-e2e/src/performance/renderer-rss-validity.ts b/apps/electron-backend-e2e/src/performance/renderer-rss-validity.ts
new file mode 100644
index 000000000..ccab61639
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-rss-validity.ts
@@ -0,0 +1,72 @@
+import type { RendererProcessRssCapture } from './renderer-process-rss-capture';
+
+export interface RendererRssValidityIteration {
+    readonly kind: string;
+    readonly main: {
+        readonly rendererWindow: {
+            readonly rss: RendererProcessRssCapture;
+        };
+    };
+    readonly runId: string;
+}
+
+export interface InvalidRendererRssMeasuredRun {
+    readonly missingSampleCount: number;
+    readonly reason:
+        | Exclude<RendererProcessRssCapture['unavailableReason'], null>
+        | 'renderer-rss-capture-invalid';
+    readonly runId: string;
+    readonly validSampleCount: number;
+}
+
+export interface RendererRssValidity {
+    readonly invalidMeasuredRuns: readonly InvalidRendererRssMeasuredRun[];
+    readonly measuredRunCount: number;
+    readonly validForBenchmark: boolean;
+    readonly validForComparison: boolean;
+    readonly validMeasuredRunCount: number;
+}
+
+export function assessRendererRssValidity(
+    iterations: readonly RendererRssValidityIteration[]
+): RendererRssValidity {
+    const measured = iterations.filter(
+        (iteration) => iteration.kind === 'measured'
+    );
+    const invalidMeasuredRuns: RendererRssValidity['invalidMeasuredRuns'][number][] =
+        [];
+    let validMeasuredRunCount = 0;
+
+    for (const iteration of measured) {
+        const rss = iteration.main.rendererWindow.rss;
+        if (
+            rss.identity !== null &&
+            Number.isSafeInteger(rss.peakRssBytes) &&
+            Number(rss.peakRssBytes) > 0 &&
+            rss.unavailableReason === null &&
+            rss.missingSampleCount === 0 &&
+            Number.isSafeInteger(rss.validSampleCount) &&
+            rss.validSampleCount > 0
+        ) {
+            validMeasuredRunCount += 1;
+            continue;
+        }
+
+        invalidMeasuredRuns.push({
+            missingSampleCount: rss.missingSampleCount,
+            reason: rss.unavailableReason ?? 'renderer-rss-capture-invalid',
+            runId: iteration.runId,
+            validSampleCount: rss.validSampleCount,
+        });
+    }
+
+    const valid =
+        measured.length > 0 && validMeasuredRunCount === measured.length;
+    return Object.freeze({
+        invalidMeasuredRuns: Object.freeze(invalidMeasuredRuns),
+        measuredRunCount: measured.length,
+        validForBenchmark: valid,
+        validForComparison: valid,
+        validMeasuredRunCount,
+    });
+}
diff --git a/apps/electron-backend-e2e/src/performance/renderer-window-rss-report.spec.ts b/apps/electron-backend-e2e/src/performance/renderer-window-rss-report.spec.ts
new file mode 100644
index 000000000..a6f0c2b21
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-window-rss-report.spec.ts
@@ -0,0 +1,153 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+import {
+    type CancellationBenchmarkManifest,
+    type CancellationIterationResult,
+    PERFORMANCE_ITERATION_KIND,
+} from './m3u-refresh-cancellation-contract';
+import { createCancellationBenchmarkSummary } from './m3u-refresh-cancellation-report';
+import type { RendererProcessRssCapture } from './renderer-process-rss-capture';
+
+function measuredIteration(
+    rss: RendererProcessRssCapture,
+    responsiveEvents: number,
+    unresponsiveEvents: number,
+    runId: string
+): CancellationIterationResult {
+    return {
+        cancellationEffectObserved: true,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: {
+            eventLoopDelay: { maxMs: 0, p95Ms: 0, p99Ms: 0 },
+            eventLoopUtilization: null,
+            memory: {
+                peakHeapUsedBytes: 0,
+                peakRssBytes: 0,
+                postGcHeapUsedBytes: null,
+                postGcRssBytes: null,
+            },
+            rendererPeakRssBytes: 999_999_999,
+            rendererWindow: {
+                responsiveEvents,
+                rss,
+                unresponsiveEvents,
+                windowIdentity: {
+                    browserWindowId: 7,
+                    webContentsId: 11,
+                },
+            },
+            responsiveEvents: 100,
+            unresponsiveEvents: 100,
+            workers: [],
+        },
+        phases: {},
+        renderer: {
+            peakHeapUsedBytes: 0,
+            postGcHeapUsedBytes: null,
+            probe: {
+                frameGapsMs: [],
+                heartbeatDelaysMs: [],
+                longTasksMs: [],
+            },
+        },
+        runId,
+    } as unknown as CancellationIterationResult;
+}
+
+test('summary uses only exact target-window RSS and scoped responsiveness events', () => {
+    const summary = createCancellationBenchmarkSummary(
+        {} as CancellationBenchmarkManifest,
+        [
+            measuredIteration(
+                {
+                    identity: {
+                        creationTime: 1_721_234_567_890,
+                        pid: 42,
+                    },
+                    missingSampleCount: 0,
+                    peakRssBytes: 2_048,
+                    unavailableReason: null,
+                    validSampleCount: 3,
+                },
+                1,
+                2,
+                'run-01'
+            ),
+            measuredIteration(
+                {
+                    identity: {
+                        creationTime: 1_721_234_567_890,
+                        pid: 43,
+                    },
+                    missingSampleCount: 1,
+                    peakRssBytes: null,
+                    unavailableReason:
+                        'renderer-process-metric-missing-during-capture',
+                    validSampleCount: 2,
+                },
+                3,
+                4,
+                'run-02'
+            ),
+        ]
+    );
+
+    assert.deepEqual(summary.measured.rendererRssPeakBytes, {
+        count: 1,
+        max: 2_048,
+        mean: 2_048,
+        median: 2_048,
+        min: 2_048,
+        p95: 2_048,
+        p99: 2_048,
+    });
+    assert.equal(summary.measured.responsiveEvents, 4);
+    assert.equal(summary.measured.unresponsiveEvents, 6);
+    assert.deepEqual(
+        (
+            summary as unknown as {
+                readonly validity: {
+                    readonly rendererRss: unknown;
+                };
+            }
+        ).validity.rendererRss,
+        {
+            invalidMeasuredRuns: [
+                {
+                    missingSampleCount: 1,
+                    reason: 'renderer-process-metric-missing-during-capture',
+                    runId: 'run-02',
+                    validSampleCount: 2,
+                },
+            ],
+            measuredRunCount: 2,
+            validForBenchmark: false,
+            validForComparison: false,
+            validMeasuredRunCount: 1,
+        }
+    );
+});
+
+test('benchmark preserves raw artifacts before rejecting incomplete renderer RSS', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const summaryWrite = source.indexOf(
+        "writeJson(join(config.outputDirectory, 'summary.json'), summary)"
+    );
+    const validityGuard = source.indexOf(
+        'summary.validity.rendererRss.validForBenchmark'
+    );
+
+    assert.ok(summaryWrite >= 0, 'summary artifact write must exist');
+    assert.ok(validityGuard >= 0, 'renderer RSS validity guard must exist');
+    assert.ok(
+        summaryWrite < validityGuard,
+        'raw summary must be durable before the renderer RSS guard fails'
+    );
+    assert.match(source, /Renderer RSS capture is invalid/);
+});
diff --git a/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.spec.ts b/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.spec.ts
new file mode 100644
index 000000000..3aa641215
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.spec.ts
@@ -0,0 +1,323 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import { EventEmitter } from 'node:events';
+import test from 'node:test';
+
+import {
+    createRendererProcessRssCaptureApi,
+    type RendererProcessRssCapture,
+    type RendererProcessRssCaptureApi,
+} from './renderer-process-rss-capture';
+
+interface RendererWindowIdentity {
+    readonly browserWindowId: number;
+    readonly webContentsId: number;
+}
+
+interface RendererWindowRssSessionMetrics {
+    readonly responsiveEvents: number;
+    readonly rss: RendererProcessRssCapture;
+    readonly unresponsiveEvents: number;
+    readonly windowIdentity: RendererWindowIdentity;
+}
+
+interface RendererWindowRssSession {
+    detach(): void;
+    sample(): RendererWindowRssSessionMetrics;
+    snapshot(): RendererWindowRssSessionMetrics;
+}
+
+interface RendererWindowRssSessionFactory {
+    create(input: {
+        readonly browserWindowFromId: (
+            browserWindowId: number
+        ) => FakeBrowserWindow | null;
+        readonly browserWindowId: number;
+        readonly getAppMetrics: () => readonly unknown[];
+        readonly rendererRssApi: RendererProcessRssCaptureApi;
+        readonly webContentsId: number;
+    }): RendererWindowRssSession;
+}
+
+interface RendererWindowRssSessionModule {
+    createRendererWindowRssSessionApi?: () => RendererWindowRssSessionFactory;
+}
+
+class FakeWebContents {
+    pidReads = 0;
+    throwOnPidRead = false;
+
+    constructor(
+        readonly id: number,
+        public pid: number
+    ) {}
+
+    getOSProcessId(): number {
+        this.pidReads += 1;
+        if (this.throwOnPidRead) {
+            throw new Error('renderer unavailable');
+        }
+        return this.pid;
+    }
+}
+
+class FakeBrowserWindow extends EventEmitter {
+    constructor(
+        readonly id: number,
+        readonly webContents: FakeWebContents
+    ) {
+        super();
+    }
+}
+
+const BROWSER_WINDOW_ID = 7;
+const WEB_CONTENTS_ID = 70;
+const RENDERER_PID = 700;
+const CREATION_TIME = 1_721_234_567_890;
+
+const sessionModulePromise = import(
+    new URL('./renderer-window-rss-session.ts', import.meta.url).href
+)
+    .then((module) => module as RendererWindowRssSessionModule)
+    .catch(() => null);
+
+function processMetric(
+    pid: number,
+    workingSetSize: number,
+    creationTime = CREATION_TIME
+): unknown {
+    return {
+        creationTime,
+        memory: { workingSetSize },
+        pid,
+        type: 'Tab',
+    };
+}
+
+async function restoreSerializableFactory(): Promise<RendererWindowRssSessionFactory> {
+    const module = await sessionModulePromise;
+    assert.ok(module, 'renderer window RSS session module must exist');
+    const factory = module.createRendererWindowRssSessionApi;
+    assert.equal(typeof factory, 'function');
+
+    const source = factory.toString();
+    const restoredFactory = Function(
+        `"use strict"; return (${source});`
+    )() as () => RendererWindowRssSessionFactory;
+    return restoredFactory();
+}
+
+test('scopes renderer RSS and window events to the exact BrowserWindow', async () => {
+    const api = await restoreSerializableFactory();
+    const targetWebContents = new FakeWebContents(
+        WEB_CONTENTS_ID,
+        RENDERER_PID
+    );
+    const targetWindow = new FakeBrowserWindow(
+        BROWSER_WINDOW_ID,
+        targetWebContents
+    );
+    const decoyWebContents = new FakeWebContents(71, 701);
+    const decoyWindow = new FakeBrowserWindow(8, decoyWebContents);
+    let targetExternalEvents = 0;
+    let decoyExternalEvents = 0;
+    targetWindow.on('unresponsive', () => {
+        targetExternalEvents += 1;
+    });
+    decoyWindow.on('unresponsive', () => {
+        decoyExternalEvents += 1;
+    });
+
+    let appMetricReads = 0;
+    const targetWorkingSets = [1_000, 1_500];
+    const session = api.create({
+        browserWindowFromId: (id) =>
+            id === BROWSER_WINDOW_ID ? targetWindow : decoyWindow,
+        browserWindowId: BROWSER_WINDOW_ID,
+        getAppMetrics: () => {
+            const targetWorkingSet = targetWorkingSets[
+                Math.min(appMetricReads, 1)
+            ] as number;
+            appMetricReads += 1;
+            return [
+                processMetric(701, 9_999_999, CREATION_TIME + 1),
+                processMetric(RENDERER_PID, targetWorkingSet),
+            ];
+        },
+        rendererRssApi: createRendererProcessRssCaptureApi(),
+        webContentsId: WEB_CONTENTS_ID,
+    });
+
+    decoyWindow.emit('unresponsive');
+    decoyWindow.emit('responsive');
+    targetWindow.emit('unresponsive');
+    targetWindow.emit('responsive');
+    const sampled = session.sample();
+
+    assert.deepEqual(sampled, {
+        rss: {
+            identity: {
+                creationTime: CREATION_TIME,
+                pid: RENDERER_PID,
+            },
+            missingSampleCount: 0,
+            peakRssBytes: 1_536_000,
+            unavailableReason: null,
+            validSampleCount: 2,
+        },
+        responsiveEvents: 1,
+        unresponsiveEvents: 1,
+        windowIdentity: {
+            browserWindowId: BROWSER_WINDOW_ID,
+            webContentsId: WEB_CONTENTS_ID,
+        },
+    });
+    assert.equal(targetWebContents.pidReads, 2);
+    assert.equal(decoyWebContents.pidReads, 0);
+    assert.equal(appMetricReads, 2);
+    assert.equal(targetExternalEvents, 1);
+    assert.equal(decoyExternalEvents, 1);
+    assert.equal(targetWindow.listenerCount('unresponsive'), 2);
+    assert.equal(decoyWindow.listenerCount('unresponsive'), 1);
+
+    session.detach();
+    assert.equal(targetWindow.listenerCount('unresponsive'), 1);
+    assert.equal(targetWindow.listenerCount('responsive'), 0);
+    assert.equal(decoyWindow.listenerCount('unresponsive'), 1);
+    targetWindow.emit('unresponsive');
+    decoyWindow.emit('unresponsive');
+    assert.equal(session.snapshot().unresponsiveEvents, 1);
+    assert.equal(targetExternalEvents, 2);
+    assert.equal(decoyExternalEvents, 2);
+});
+
+test('rejects a missing or mismatched BrowserWindow before attaching listeners', async () => {
+    const api = await restoreSerializableFactory();
+    const targetWindow = new FakeBrowserWindow(
+        BROWSER_WINDOW_ID,
+        new FakeWebContents(WEB_CONTENTS_ID, RENDERER_PID)
+    );
+    let appMetricReads = 0;
+    const baseInput = {
+        browserWindowId: BROWSER_WINDOW_ID,
+        getAppMetrics: () => {
+            appMetricReads += 1;
+            return [processMetric(RENDERER_PID, 1_000)];
+        },
+        rendererRssApi: createRendererProcessRssCaptureApi(),
+        webContentsId: WEB_CONTENTS_ID,
+    };
+
+    assert.throws(
+        () =>
+            api.create({
+                ...baseInput,
+                browserWindowFromId: () => null,
+            }),
+        /renderer-browser-window-missing/
+    );
+    assert.throws(
+        () =>
+            api.create({
+                ...baseInput,
+                browserWindowFromId: () =>
+                    new FakeBrowserWindow(
+                        BROWSER_WINDOW_ID + 1,
+                        targetWindow.webContents
+                    ),
+            }),
+        /renderer-browser-window-identity-mismatch/
+    );
+    assert.throws(
+        () =>
+            api.create({
+                ...baseInput,
+                browserWindowFromId: () =>
+                    new FakeBrowserWindow(
+                        BROWSER_WINDOW_ID,
+                        new FakeWebContents(WEB_CONTENTS_ID + 1, RENDERER_PID)
+                    ),
+            }),
+        /renderer-web-contents-identity-mismatch/
+    );
+    assert.equal(targetWindow.listenerCount('unresponsive'), 0);
+    assert.equal(targetWindow.listenerCount('responsive'), 0);
+    assert.equal(targetWindow.webContents.pidReads, 0);
+    assert.equal(appMetricReads, 0);
+});
+
+test('keeps PID and metric failures sticky while sampling the exact target every time', async () => {
+    const api = await restoreSerializableFactory();
+    const targetWebContents = new FakeWebContents(
+        WEB_CONTENTS_ID,
+        RENDERER_PID
+    );
+    const targetWindow = new FakeBrowserWindow(
+        BROWSER_WINDOW_ID,
+        targetWebContents
+    );
+    let appMetricReads = 0;
+    let metrics: readonly unknown[] = [processMetric(RENDERER_PID, 1_000)];
+    const session = api.create({
+        browserWindowFromId: () => targetWindow,
+        browserWindowId: BROWSER_WINDOW_ID,
+        getAppMetrics: () => {
+            appMetricReads += 1;
+            return metrics;
+        },
+        rendererRssApi: createRendererProcessRssCaptureApi(),
+        webContentsId: WEB_CONTENTS_ID,
+    });
+
+    targetWebContents.pid = RENDERER_PID + 1;
+    metrics = [processMetric(RENDERER_PID + 1, 5_000, CREATION_TIME + 1)];
+    const invalid = session.sample();
+    assert.deepEqual(invalid.rss, {
+        identity: {
+            creationTime: CREATION_TIME,
+            pid: RENDERER_PID,
+        },
+        missingSampleCount: 0,
+        peakRssBytes: null,
+        unavailableReason: 'renderer-process-identity-changed',
+        validSampleCount: 1,
+    });
+
+    targetWebContents.pid = RENDERER_PID;
+    metrics = [processMetric(RENDERER_PID, 10_000)];
+    assert.deepEqual(session.sample().rss, invalid.rss);
+    assert.equal(targetWebContents.pidReads, 3);
+    assert.equal(appMetricReads, 3);
+
+    const missingMetricSession = api.create({
+        browserWindowFromId: () => targetWindow,
+        browserWindowId: BROWSER_WINDOW_ID,
+        getAppMetrics: () => [],
+        rendererRssApi: createRendererProcessRssCaptureApi(),
+        webContentsId: WEB_CONTENTS_ID,
+    });
+    assert.deepEqual(missingMetricSession.snapshot().rss, {
+        identity: null,
+        missingSampleCount: 1,
+        peakRssBytes: null,
+        unavailableReason: 'renderer-process-metric-missing-at-start',
+        validSampleCount: 0,
+    });
+
+    targetWebContents.throwOnPidRead = true;
+    const invalidPidSession = api.create({
+        browserWindowFromId: () => targetWindow,
+        browserWindowId: BROWSER_WINDOW_ID,
+        getAppMetrics: () => [processMetric(RENDERER_PID, 1_000)],
+        rendererRssApi: createRendererProcessRssCaptureApi(),
+        webContentsId: WEB_CONTENTS_ID,
+    });
+    assert.equal(
+        invalidPidSession.snapshot().rss.unavailableReason,
+        'renderer-os-pid-invalid'
+    );
+
+    session.detach();
+    missingMetricSession.detach();
+    invalidPidSession.detach();
+});
diff --git a/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.ts b/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.ts
new file mode 100644
index 000000000..bef34fc32
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/renderer-window-rss-session.ts
@@ -0,0 +1,174 @@
+import type {
+    RendererProcessRssCapture,
+    RendererProcessRssCaptureApi,
+} from './renderer-process-rss-capture';
+
+export interface RendererWindowIdentity {
+    readonly browserWindowId: number;
+    readonly webContentsId: number;
+}
+
+export interface RendererWindowRssSessionMetrics {
+    readonly responsiveEvents: number;
+    readonly rss: RendererProcessRssCapture;
+    readonly unresponsiveEvents: number;
+    readonly windowIdentity: RendererWindowIdentity;
+}
+
+export interface RendererWindowWebContents {
+    readonly id: number;
+    getOSProcessId(): number;
+}
+
+export interface RendererWindow {
+    readonly id: number;
+    readonly webContents: RendererWindowWebContents;
+    off(event: 'responsive' | 'unresponsive', listener: () => void): unknown;
+    on(event: 'responsive' | 'unresponsive', listener: () => void): unknown;
+}
+
+export interface RendererWindowRssSession {
+    detach(): void;
+    sample(): RendererWindowRssSessionMetrics;
+    snapshot(): RendererWindowRssSessionMetrics;
+}
+
+export interface RendererWindowRssSessionCreateInput {
+    readonly browserWindowFromId: (
+        browserWindowId: number
+    ) => RendererWindow | null;
+    readonly browserWindowId: number;
+    readonly getAppMetrics: () => readonly unknown[];
+    readonly rendererRssApi: RendererProcessRssCaptureApi;
+    readonly webContentsId: number;
+}
+
+export interface RendererWindowRssSessionApi {
+    create(
+        input: RendererWindowRssSessionCreateInput
+    ): RendererWindowRssSession;
+}
+
+export function createRendererWindowRssSessionApi(): RendererWindowRssSessionApi {
+    const helpers = {
+        isValidIdentityId(value: unknown): value is number {
+            return Number.isSafeInteger(value) && Number(value) > 0;
+        },
+
+        create(
+            input: RendererWindowRssSessionCreateInput
+        ): RendererWindowRssSession {
+            if (!helpers.isValidIdentityId(input.browserWindowId)) {
+                throw new Error('renderer-browser-window-id-invalid');
+            }
+            if (!helpers.isValidIdentityId(input.webContentsId)) {
+                throw new Error('renderer-web-contents-id-invalid');
+            }
+
+            let browserWindow: RendererWindow | null = null;
+            try {
+                browserWindow = input.browserWindowFromId(
+                    input.browserWindowId
+                );
+            } catch {
+                throw new Error('renderer-browser-window-missing');
+            }
+            if (browserWindow === null) {
+                throw new Error('renderer-browser-window-missing');
+            }
+            if (browserWindow.id !== input.browserWindowId) {
+                throw new Error('renderer-browser-window-identity-mismatch');
+            }
+            const webContents = browserWindow.webContents;
+            if (
+                webContents === null ||
+                typeof webContents !== 'object' ||
+                webContents.id !== input.webContentsId
+            ) {
+                throw new Error('renderer-web-contents-identity-mismatch');
+            }
+
+            const windowIdentity = Object.freeze({
+                browserWindowId: input.browserWindowId,
+                webContentsId: input.webContentsId,
+            });
+            let rendererRss = input.rendererRssApi.create(
+                helpers.readOsProcessId(webContents),
+                helpers.readAppMetrics(input.getAppMetrics)
+            );
+            let responsiveEvents = 0;
+            let unresponsiveEvents = 0;
+            let detached = false;
+            const callbacks = {
+                onResponsive(): void {
+                    if (!detached) {
+                        responsiveEvents += 1;
+                    }
+                },
+                onUnresponsive(): void {
+                    if (!detached) {
+                        unresponsiveEvents += 1;
+                    }
+                },
+                snapshot(): RendererWindowRssSessionMetrics {
+                    return Object.freeze({
+                        responsiveEvents,
+                        rss: rendererRss,
+                        unresponsiveEvents,
+                        windowIdentity,
+                    });
+                },
+            };
+            browserWindow.on('unresponsive', callbacks.onUnresponsive);
+            try {
+                browserWindow.on('responsive', callbacks.onResponsive);
+            } catch (error) {
+                browserWindow.off('unresponsive', callbacks.onUnresponsive);
+                throw error;
+            }
+
+            return Object.freeze({
+                detach(): void {
+                    if (detached) {
+                        return;
+                    }
+                    detached = true;
+                    browserWindow.off('unresponsive', callbacks.onUnresponsive);
+                    browserWindow.off('responsive', callbacks.onResponsive);
+                },
+                sample(): RendererWindowRssSessionMetrics {
+                    if (!detached) {
+                        rendererRss = input.rendererRssApi.sample(
+                            rendererRss,
+                            helpers.readOsProcessId(webContents),
+                            helpers.readAppMetrics(input.getAppMetrics)
+                        );
+                    }
+                    return callbacks.snapshot();
+                },
+                snapshot: callbacks.snapshot,
+            });
+        },
+
+        readAppMetrics(
+            getAppMetrics: () => readonly unknown[]
+        ): readonly unknown[] {
+            try {
+                const metrics = getAppMetrics();
+                return Array.isArray(metrics) ? metrics : [];
+            } catch {
+                return [];
+            }
+        },
+
+        readOsProcessId(webContents: RendererWindowWebContents): unknown {
+            try {
+                return webContents.getOSProcessId();
+            } catch {
+                return null;
+            }
+        },
+    };
+
+    return Object.freeze({ create: helpers.create });
+}
diff --git a/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.spec.ts b/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.spec.ts
new file mode 100644
index 000000000..2d6e87a49
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.spec.ts
@@ -0,0 +1,49 @@
+/* eslint-disable playwright/expect-expect -- Node assertions define the loopback-only fixture server contract. */
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { createSyntheticM3uFixture } from './synthetic-m3u';
+import { startSyntheticM3uServer } from './synthetic-m3u-server';
+
+test('serves and primes only the deterministic fixture on ephemeral IPv4 loopback', async () => {
+    const fixture = createSyntheticM3uFixture(10_000);
+    const server = await startSyntheticM3uServer(fixture);
+
+    try {
+        const url = new URL(server.resourceUrl);
+        assert.equal(url.protocol, 'http:');
+        assert.equal(url.hostname, '127.0.0.1');
+        assert.notEqual(url.port, '');
+        assert.equal(url.username, '');
+        assert.equal(url.password, '');
+        assert.equal(server.requestCount(), 0);
+
+        await server.prime();
+        assert.equal(server.requestCount(), 1);
+
+        const response = await fetch(server.resourceUrl);
+        assert.equal(response.status, 200);
+        assert.equal(
+            response.headers.get('content-length'),
+            String(fixture.bytes)
+        );
+        assert.equal(await response.text(), fixture.body);
+        assert.equal(server.requestCount(), 2);
+
+        const missing = await fetch(`${server.origin}/not-the-fixture.m3u`);
+        assert.equal(missing.status, 404);
+        assert.equal(server.requestCount(), 2);
+    } finally {
+        await server.close();
+    }
+});
+
+test('closes idempotently and rejects priming after close', async () => {
+    const server = await startSyntheticM3uServer(
+        createSyntheticM3uFixture(10_000)
+    );
+
+    await server.close();
+    await server.close();
+    await assert.rejects(server.prime(), /closed/i);
+});
diff --git a/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.ts b/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.ts
new file mode 100644
index 000000000..269c27f45
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/synthetic-m3u-server.ts
@@ -0,0 +1,114 @@
+import { once } from 'node:events';
+import { createServer, type Server } from 'node:http';
+
+import type { SyntheticM3uFixture } from './synthetic-m3u';
+
+export const SYNTHETIC_M3U_RESOURCE_PATH = '/synthetic-performance.m3u';
+
+export interface SyntheticM3uServer {
+    readonly origin: string;
+    readonly resourceUrl: string;
+    close(): Promise<void>;
+    prime(): Promise<void>;
+    requestCount(): number;
+}
+
+export async function startSyntheticM3uServer(
+    fixture: SyntheticM3uFixture
+): Promise<SyntheticM3uServer> {
+    let successfulRequestCount = 0;
+    const server = createServer((request, response) => {
+        const requestUrl = new URL(request.url ?? '/', 'http://127.0.0.1');
+        if (
+            request.method !== 'GET' ||
+            requestUrl.pathname !== SYNTHETIC_M3U_RESOURCE_PATH ||
+            requestUrl.search.length > 0
+        ) {
+            response.writeHead(404, {
+                'Content-Length': '0',
+                'Content-Type': 'text/plain; charset=utf-8',
+            });
+            response.end();
+            return;
+        }
+
+        successfulRequestCount += 1;
+        response.writeHead(200, {
+            'Cache-Control': 'no-store',
+            'Content-Length': String(fixture.bytes),
+            'Content-Type': 'application/vnd.apple.mpegurl; charset=utf-8',
+        });
+        response.end(fixture.body);
+    });
+    server.listen({
+        exclusive: true,
+        host: '127.0.0.1',
+        port: 0,
+    });
+    try {
+        await once(server, 'listening');
+    } catch (error: unknown) {
+        await closeServer(server).catch(() => undefined);
+        throw error;
+    }
+
+    const address = server.address();
+    if (
+        address === null ||
+        typeof address === 'string' ||
+        address.address !== '127.0.0.1' ||
+        !Number.isSafeInteger(address.port) ||
+        address.port <= 0
+    ) {
+        await closeServer(server);
+        throw new Error(
+            'Synthetic M3U server did not bind exact IPv4 loopback'
+        );
+    }
+
+    const origin = `http://127.0.0.1:${address.port}`;
+    const resourceUrl = `${origin}${SYNTHETIC_M3U_RESOURCE_PATH}`;
+    let closePromise: Promise<void> | null = null;
+
+    return Object.freeze({
+        origin,
+        resourceUrl,
+        close: () => {
+            closePromise ??= closeServer(server);
+            return closePromise;
+        },
+        prime: async () => {
+            if (closePromise !== null) {
+                throw new Error('Synthetic M3U server is closed');
+            }
+            const response = await fetch(resourceUrl);
+            const body = await response.arrayBuffer();
+            if (
+                response.status !== 200 ||
+                Number(response.headers.get('content-length')) !==
+                    fixture.bytes ||
+                body.byteLength !== fixture.bytes
+            ) {
+                throw new Error(
+                    'Synthetic M3U server priming response was invalid'
+                );
+            }
+        },
+        requestCount: () => successfulRequestCount,
+    });
+}
+
+async function closeServer(server: Server): Promise<void> {
+    if (!server.listening) {
+        return;
+    }
+    await new Promise<void>((resolvePromise, rejectPromise) => {
+        server.close((error) => {
+            if (error) {
+                rejectPromise(error);
+                return;
+            }
+            resolvePromise();
+        });
+    });
+}
diff --git a/apps/electron-backend-e2e/src/performance/synthetic-m3u.spec.ts b/apps/electron-backend-e2e/src/performance/synthetic-m3u.spec.ts
new file mode 100644
index 000000000..094f4f80d
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/synthetic-m3u.spec.ts
@@ -0,0 +1,68 @@
+import assert from 'node:assert/strict';
+import { createHash } from 'node:crypto';
+import { describe, it } from 'node:test';
+
+import {
+    createSyntheticM3uFixture,
+    SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS,
+    SYNTHETIC_M3U_SEED,
+} from './synthetic-m3u';
+
+const GOLDEN_SHA256 = {
+    10_000: '1d151ab2a878db8818f2bbfbdd689007cbe390182cdd1520c316bd163b7e7db3',
+    50_000: '4a5336a5d1c66b8b706752784815617a012499cb7a231ab35c88df9bd55ee78a',
+    100_000: '2ffe912f61ea106ba8de3414b0a927cdaa3264ac637d44c4b219f199eb94c353',
+} as const;
+
+describe('synthetic M3U performance fixture', () => {
+    it('generates each supported catalog deterministically with exact metadata', () => {
+        assert.deepEqual(
+            SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS,
+            [10_000, 50_000, 100_000]
+        );
+        assert.equal(SYNTHETIC_M3U_SEED, 240_724);
+
+        for (const channelCount of SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS) {
+            const fixture = createSyntheticM3uFixture(channelCount);
+            const lines = fixture.body.trimEnd().split('\n');
+
+            assert.equal(fixture.channelCount, channelCount);
+            assert.equal(
+                fixture.bytes,
+                Buffer.byteLength(fixture.body, 'utf8')
+            );
+            assert.equal(
+                fixture.sha256,
+                createHash('sha256').update(fixture.body, 'utf8').digest('hex')
+            );
+            assert.equal(fixture.sha256, GOLDEN_SHA256[channelCount]);
+            assert.equal(lines[0], '#EXTM3U');
+            assert.equal(lines.length, 1 + channelCount * 2);
+            assert.equal(
+                lines.filter((line) => line.startsWith('#EXTINF:')).length,
+                channelCount
+            );
+            assert.doesNotMatch(fixture.body, /\b(?:tvg-|logo|provider)\b/i);
+            assertOnlyLoopbackUrls(fixture.body);
+        }
+    });
+
+    it('rejects unsupported channel counts', () => {
+        assert.throws(
+            () => createSyntheticM3uFixture(9_999),
+            /Unsupported synthetic M3U channel count/
+        );
+    });
+});
+
+function assertOnlyLoopbackUrls(body: string): void {
+    const urls = body.match(/https?:\/\/[^\s"]+/g) ?? [];
+
+    for (const rawUrl of urls) {
+        const url = new URL(rawUrl);
+        assert.equal(url.protocol, 'http:');
+        assert.equal(url.hostname, '127.0.0.1');
+        assert.equal(url.username, '');
+        assert.equal(url.password, '');
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/synthetic-m3u.ts b/apps/electron-backend-e2e/src/performance/synthetic-m3u.ts
new file mode 100644
index 000000000..1cdf8d18b
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/synthetic-m3u.ts
@@ -0,0 +1,65 @@
+import { createHash } from 'node:crypto';
+
+export const SYNTHETIC_M3U_SEED = 240_724;
+export const SYNTHETIC_M3U_CHANNEL_COUNT = 100_000;
+export const SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS = [
+    10_000,
+    50_000,
+    SYNTHETIC_M3U_CHANNEL_COUNT,
+] as const;
+
+export type SyntheticM3uChannelCount =
+    (typeof SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS)[number];
+
+export interface SyntheticM3uFixture {
+    readonly body: string;
+    readonly bytes: number;
+    readonly channelCount: SyntheticM3uChannelCount;
+    readonly sha256: string;
+}
+
+export function createSyntheticM3uFixture(
+    channelCount: number = SYNTHETIC_M3U_CHANNEL_COUNT
+): SyntheticM3uFixture {
+    assertSupportedChannelCount(channelCount);
+    const lines = new Array<string>(1 + channelCount * 2);
+    lines[0] = '#EXTM3U';
+
+    for (let offset = 0; offset < channelCount; offset += 1) {
+        const index = offset + 1;
+        const group = (offset % 100) + 1;
+        const lineOffset = 1 + offset * 2;
+        const stableIndex = String(index).padStart(6, '0');
+
+        lines[lineOffset] = `#EXTINF:-1 group-title="Synthetic Group ${String(
+            group
+        ).padStart(
+            3,
+            '0'
+        )}",Synthetic Channel ${SYNTHETIC_M3U_SEED}-${stableIndex}`;
+        lines[lineOffset + 1] =
+            `http://127.0.0.1/stream/${SYNTHETIC_M3U_SEED}/${index}`;
+    }
+
+    const body = `${lines.join('\n')}\n`;
+    return Object.freeze({
+        body,
+        bytes: Buffer.byteLength(body, 'utf8'),
+        channelCount,
+        sha256: createHash('sha256').update(body, 'utf8').digest('hex'),
+    });
+}
+
+function assertSupportedChannelCount(
+    channelCount: number
+): asserts channelCount is SyntheticM3uChannelCount {
+    if (
+        !SUPPORTED_SYNTHETIC_M3U_CHANNEL_COUNTS.some(
+            (supported) => supported === channelCount
+        )
+    ) {
+        throw new Error(
+            `Unsupported synthetic M3U channel count: ${channelCount}`
+        );
+    }
+}
diff --git a/apps/electron-backend-e2e/src/performance/worker-performance-phase-events.ts b/apps/electron-backend-e2e/src/performance/worker-performance-phase-events.ts
new file mode 100644
index 000000000..1423da627
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-performance-phase-events.ts
@@ -0,0 +1,149 @@
+import {
+    APP_PLAYLIST_GET_PERFORMANCE_PHASE,
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    type AppPlaylistPerformancePhase,
+    type PerformancePhaseEvent,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+
+const PHASE_SEQUENCES = {
+    DB_GET_APP_PLAYLIST: [
+        APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+        APP_PLAYLIST_GET_PERFORMANCE_PHASE.DESERIALIZE_PLAYLIST,
+    ],
+    DB_UPSERT_APP_PLAYLIST: [
+        APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+        APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+    ],
+} as const satisfies Readonly<
+    Record<string, readonly AppPlaylistPerformancePhase[]>
+>;
+const EVENT_KEYS = new Set([
+    'boundary',
+    'durationMs',
+    'epochMs',
+    'metadata',
+    'phase',
+    'requestId',
+]);
+
+export function parseWorkerPerformancePhaseEvents(
+    operation: string | null,
+    input: unknown,
+    workStartedEpochMs: number,
+    workEndedEpochMs: number
+): readonly PerformancePhaseEvent<AppPlaylistPerformancePhase>[] | null {
+    const phaseSequence = getPhaseSequence(operation);
+    if (phaseSequence.length === 0) {
+        return input === undefined ||
+            (Array.isArray(input) && input.length === 0)
+            ? []
+            : null;
+    }
+    if (
+        !Array.isArray(input) ||
+        input.length !== phaseSequence.length * 2
+    ) {
+        return null;
+    }
+
+    const parsed: PerformancePhaseEvent<AppPlaylistPerformancePhase>[] =
+        [];
+    let lastEpochMs = workStartedEpochMs;
+    for (let index = 0; index < input.length; index += 1) {
+        const raw = input[index];
+        if (
+            !isRecord(raw) ||
+            Object.keys(raw).some((key) => !EVENT_KEYS.has(key))
+        ) {
+            return null;
+        }
+
+        const boundary = raw['boundary'];
+        const durationMs = raw['durationMs'];
+        const epochMs = raw['epochMs'];
+        const metadata = parseMetadata(raw['metadata']);
+        const phase = raw['phase'];
+        const requestId = raw['requestId'];
+        if (
+            boundary !== (index % 2 === 0 ? 'start' : 'end') ||
+            phase !== phaseSequence[Math.floor(index / 2)] ||
+            typeof requestId !== 'string' ||
+            requestId.length === 0 ||
+            !isFiniteNonNegativeNumber(epochMs) ||
+            epochMs < lastEpochMs ||
+            epochMs > workEndedEpochMs ||
+            (boundary === 'start' &&
+                (durationMs !== null || metadata !== undefined)) ||
+            (boundary === 'end' && !isFiniteNonNegativeNumber(durationMs)) ||
+            metadata === null ||
+            (parsed.length > 0 && parsed[0]?.requestId !== requestId)
+        ) {
+            return null;
+        }
+
+        parsed.push({
+            boundary: boundary as 'end' | 'start',
+            durationMs: durationMs as number | null,
+            epochMs,
+            ...(metadata === undefined ? {} : { metadata }),
+            phase: phase as AppPlaylistPerformancePhase,
+            requestId,
+        });
+        lastEpochMs = epochMs;
+    }
+    return parsed;
+}
+
+function getPhaseSequence(
+    operation: string | null
+): readonly AppPlaylistPerformancePhase[] {
+    if (operation === 'DB_GET_APP_PLAYLIST') {
+        return PHASE_SEQUENCES.DB_GET_APP_PLAYLIST;
+    }
+    if (operation === 'DB_UPSERT_APP_PLAYLIST') {
+        return PHASE_SEQUENCES.DB_UPSERT_APP_PLAYLIST;
+    }
+    return [];
+}
+
+function parseMetadata(
+    input: unknown
+): PerformancePhaseMetadata | undefined | null {
+    if (input === undefined) {
+        return undefined;
+    }
+    if (
+        !isRecord(input) ||
+        Object.keys(input).some(
+            (key) => key !== 'byteCount' && key !== 'itemCount'
+        )
+    ) {
+        return null;
+    }
+
+    const byteCount = input['byteCount'];
+    const itemCount = input['itemCount'];
+    if (
+        (byteCount !== undefined && !isSafeCount(byteCount)) ||
+        (itemCount !== undefined && !isSafeCount(itemCount))
+    ) {
+        return null;
+    }
+    return {
+        ...(byteCount === undefined ? {} : { byteCount: Number(byteCount) }),
+        ...(itemCount === undefined ? {} : { itemCount: Number(itemCount) }),
+    };
+}
+
+function isRecord(input: unknown): input is Record<string, unknown> {
+    return typeof input === 'object' && input !== null && !Array.isArray(input);
+}
+
+function isFiniteNonNegativeNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+
+function isSafeCount(value: unknown): boolean {
+    return Number.isSafeInteger(value) && Number(value) >= 0;
+}
diff --git a/apps/electron-backend-e2e/src/performance/worker-request-performance-envelope.spec.ts b/apps/electron-backend-e2e/src/performance/worker-request-performance-envelope.spec.ts
new file mode 100644
index 000000000..59bc4ecc6
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-request-performance-envelope.spec.ts
@@ -0,0 +1,327 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import type { WorkerRequestPerformanceMetrics } from './m3u-refresh-cancellation-contract';
+import { normalizeWorkerRequestPerformanceOutcome } from './worker-request-performance';
+
+const validCapture = {
+    eventLoopDelay: { maxMs: 6, p95Ms: 5, p99Ms: 5.5 },
+    eventLoopDelayUnavailableReason: null,
+    eventLoopUtilization: 0.5,
+    eventLoopUtilizationUnavailableReason: null,
+    histogramFlushedEpochMs: 1_050,
+    invalidReason: null,
+    requestReceivedEpochMs: 1_000,
+    responsePostedEpochMs: 1_055,
+    threadCpuSystemMicros: 50,
+    threadCpuUnavailableReason: null,
+    threadCpuUserMicros: 100,
+    workEndedEpochMs: 1_040,
+    workStartedEpochMs: 1_010,
+} as const;
+
+function normalizeForOperation(
+    operation: string,
+    performanceCapture: unknown
+) {
+    return normalizeWorkerRequestPerformanceOutcome({
+        ipcCallId: 2,
+        operation,
+        operationId: 'operation-42',
+        operationIdUnavailableReason: null,
+        performanceCapture,
+        playlistId: 'playlist-1',
+        requestId: 'request-1',
+        responseEpochMs: 1_060,
+        sourceEpochMs: 990,
+        success: true,
+    });
+}
+
+function normalize(performanceCapture: unknown) {
+    return normalizeForOperation('DB_GET_CONTENT', performanceCapture);
+}
+
+function assertClosedCapture(
+    capture: WorkerRequestPerformanceMetrics,
+    reason: string
+): void {
+    assert.equal(capture.performanceCaptureUnavailableReason, reason);
+    assert.equal(capture.operationId, 'operation-42');
+    for (const value of [
+        capture.eventLoopDelay,
+        capture.eventLoopDelayUnavailableReason,
+        capture.eventLoopUtilization,
+        capture.eventLoopUtilizationUnavailableReason,
+        capture.histogramFlushedEpochMs,
+        capture.invalidReason,
+        capture.requestReceivedEpochMs,
+        capture.responsePostedEpochMs,
+        capture.threadCpuSystemMicros,
+        capture.threadCpuUnavailableReason,
+        capture.threadCpuUserMicros,
+        capture.workEndedEpochMs,
+        capture.workStartedEpochMs,
+    ]) {
+        assert.equal(value, null);
+    }
+    assert.deepEqual(capture.phaseEvents, []);
+}
+
+test('absent captures are missing while present non-record captures are invalid', () => {
+    for (const missing of [undefined, null]) {
+        assertClosedCapture(
+            normalize(missing),
+            'worker-performance-capture-missing'
+        );
+    }
+    for (const malformed of [42, [], 'capture']) {
+        assertClosedCapture(
+            normalize(malformed),
+            'worker-performance-capture-invalid'
+        );
+    }
+});
+
+test('malformed nested fields and cross-field invariants fail the whole capture closed', () => {
+    const malformed = [
+        { ...validCapture, eventLoopDelay: [] },
+        {
+            ...validCapture,
+            eventLoopDelay: { maxMs: 6, p95Ms: 'bad', p99Ms: 5.5 },
+        },
+        {
+            ...validCapture,
+            eventLoopDelay: { maxMs: 5, p95Ms: 6, p99Ms: 5.5 },
+        },
+        { ...validCapture, eventLoopDelayUnavailableReason: 42 },
+        {
+            ...validCapture,
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason: null,
+            histogramFlushedEpochMs: null,
+        },
+        {
+            ...validCapture,
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason:
+                'event-loop-delay-capture-unavailable',
+        },
+        { ...validCapture, eventLoopUtilization: 1.01 },
+        {
+            ...validCapture,
+            eventLoopUtilization: null,
+            eventLoopUtilizationUnavailableReason: null,
+        },
+        { ...validCapture, threadCpuSystemMicros: null },
+        {
+            ...validCapture,
+            threadCpuSystemMicros: null,
+            threadCpuUnavailableReason: null,
+            threadCpuUserMicros: null,
+        },
+        { ...validCapture, threadCpuUnavailableReason: 'unavailable' },
+        { ...validCapture, histogramFlushedEpochMs: null },
+        {
+            ...validCapture,
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason: 'event-loop-delay-invalid',
+            histogramFlushedEpochMs: null,
+        },
+        { ...validCapture, histogramFlushedEpochMs: 1_039 },
+        { ...validCapture, responsePostedEpochMs: undefined },
+        { ...validCapture, responsePostedEpochMs: 1_039 },
+        { ...validCapture, responsePostedEpochMs: 1_061 },
+        { ...validCapture, workStartedEpochMs: 999 },
+        {
+            ...validCapture,
+            invalidReason: 'overlapping-database-worker-requests',
+        },
+        { ...validCapture, threadCpuUserMicros: undefined },
+    ];
+    for (const performanceCapture of malformed) {
+        assertClosedCapture(
+            normalize(performanceCapture),
+            'worker-performance-capture-invalid'
+        );
+    }
+});
+
+test('coherent metric-unavailable and invalid worker results remain valid raw captures', () => {
+    const unavailable = {
+        ...validCapture,
+        eventLoopDelay: null,
+        eventLoopDelayUnavailableReason: 'event-loop-delay-capture-unavailable',
+        eventLoopUtilization: null,
+        eventLoopUtilizationUnavailableReason:
+            'event-loop-utilization-unavailable',
+        histogramFlushedEpochMs: null,
+        threadCpuSystemMicros: null,
+        threadCpuUnavailableReason: 'thread-cpu-usage-unavailable',
+        threadCpuUserMicros: null,
+    };
+    for (const capture of [
+        unavailable,
+        {
+            ...validCapture,
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason: 'event-loop-delay-invalid',
+        },
+    ]) {
+        const accepted = normalize(capture);
+        assert.equal(accepted.performanceCaptureUnavailableReason, null);
+        assert.equal(accepted.requestReceivedEpochMs, 1_000);
+    }
+
+    const invalidReason = 'overlapping-database-worker-requests';
+    const legitimateInvalid = normalize({
+        ...unavailable,
+        eventLoopDelayUnavailableReason: invalidReason,
+        eventLoopUtilizationUnavailableReason: invalidReason,
+        invalidReason,
+        threadCpuUnavailableReason: invalidReason,
+    });
+    assert.equal(legitimateInvalid.performanceCaptureUnavailableReason, null);
+    assert.equal(legitimateInvalid.invalidReason, invalidReason);
+});
+
+test('requires the exact operation-specific worker phase sequence', () => {
+    const upsertPhaseEvents = [
+        {
+            boundary: 'start',
+            durationMs: null,
+            epochMs: 1_015,
+            phase: 'serialize.playlist',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'end',
+            durationMs: 5,
+            epochMs: 1_020,
+            metadata: { byteCount: 2048, itemCount: 10_000 },
+            phase: 'serialize.playlist',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'start',
+            durationMs: null,
+            epochMs: 1_021,
+            phase: 'sqlite.write',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'end',
+            durationMs: 12,
+            epochMs: 1_033,
+            metadata: { byteCount: 2048, itemCount: 1 },
+            phase: 'sqlite.write',
+            requestId: 'request-1',
+        },
+    ] as const;
+    const getPhaseEvents = [
+        {
+            boundary: 'start',
+            durationMs: null,
+            epochMs: 1_015,
+            phase: 'sqlite.read',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'end',
+            durationMs: 5,
+            epochMs: 1_020,
+            metadata: { itemCount: 1 },
+            phase: 'sqlite.read',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'start',
+            durationMs: null,
+            epochMs: 1_021,
+            phase: 'deserialize.playlist',
+            requestId: 'request-1',
+        },
+        {
+            boundary: 'end',
+            durationMs: 12,
+            epochMs: 1_033,
+            metadata: { itemCount: 10_000 },
+            phase: 'deserialize.playlist',
+            requestId: 'request-1',
+        },
+    ] as const;
+
+    assert.deepEqual(
+        normalizeForOperation('DB_UPSERT_APP_PLAYLIST', {
+            ...validCapture,
+            phaseEvents: upsertPhaseEvents,
+        }).phaseEvents,
+        upsertPhaseEvents
+    );
+    assert.deepEqual(
+        normalizeForOperation('DB_GET_APP_PLAYLIST', {
+            ...validCapture,
+            phaseEvents: getPhaseEvents,
+        }).phaseEvents,
+        getPhaseEvents
+    );
+
+    for (const invalidPhaseEvents of [
+        getPhaseEvents.slice(0, 2),
+        getPhaseEvents.slice(1),
+        [...getPhaseEvents].reverse(),
+        getPhaseEvents.map((event) => ({
+            ...event,
+            requestId: 'other-request',
+        })),
+        [
+            getPhaseEvents[0],
+            {
+                ...getPhaseEvents[1],
+                metadata: { itemCount: 1, secret: 'not allowed' },
+            },
+        ],
+        [
+            getPhaseEvents[0],
+            {
+                ...getPhaseEvents[1],
+                phase: 'arbitrary.phase',
+            },
+        ],
+    ]) {
+        assertClosedCapture(
+            normalizeForOperation('DB_GET_APP_PLAYLIST', {
+                ...validCapture,
+                phaseEvents: invalidPhaseEvents,
+            }),
+            'worker-performance-capture-invalid'
+        );
+    }
+
+    for (const [operation, phaseEvents] of [
+        ['DB_GET_APP_PLAYLIST', upsertPhaseEvents],
+        ['DB_UPSERT_APP_PLAYLIST', getPhaseEvents],
+        ['DB_GET_CONTENT', getPhaseEvents],
+    ] as const) {
+        assertClosedCapture(
+            normalizeForOperation(operation, {
+                ...validCapture,
+                phaseEvents,
+            }),
+            'worker-performance-capture-invalid'
+        );
+    }
+
+    for (const operation of [
+        'DB_GET_APP_PLAYLIST',
+        'DB_UPSERT_APP_PLAYLIST',
+    ]) {
+        assertClosedCapture(
+            normalizeForOperation(operation, validCapture),
+            'worker-performance-capture-invalid'
+        );
+    }
+
+    assert.deepEqual(normalize(validCapture).phaseEvents, []);
+});
diff --git a/apps/electron-backend-e2e/src/performance/worker-request-performance.spec.ts b/apps/electron-backend-e2e/src/performance/worker-request-performance.spec.ts
new file mode 100644
index 000000000..e5149e442
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-request-performance.spec.ts
@@ -0,0 +1,397 @@
+/* eslint-disable playwright/expect-expect -- These are Node assertion-based performance contract tests. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+import {
+    type CancellationBenchmarkManifest,
+    type CancellationIterationResult,
+    PERFORMANCE_ITERATION_KIND,
+    PERFORMANCE_WORKER_KIND,
+    type WorkerCaptureMetrics,
+    type WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import {
+    type MainCaptureGenerationTransport,
+    normalizeWorkerRequestPerformanceOutcome,
+    selectMainCaptureGeneration,
+} from './worker-request-performance';
+import { createCancellationBenchmarkSummary } from './m3u-refresh-cancellation-report';
+
+type RequestPerformanceFixture = WorkerRequestPerformanceMetrics;
+function requestPerformance(
+    requestId: string,
+    p95Ms: number,
+    threadCpuUserMicros: number
+): RequestPerformanceFixture {
+    return normalizeWorkerRequestPerformanceOutcome(
+        requestTransport(
+            {
+                eventLoopDelay: {
+                    maxMs: p95Ms + 1,
+                    p95Ms,
+                    p99Ms: p95Ms + 0.5,
+                },
+                eventLoopDelayUnavailableReason: null,
+                eventLoopUtilization: p95Ms / 100,
+                eventLoopUtilizationUnavailableReason: null,
+                histogramFlushedEpochMs: 1_050,
+                invalidReason: null,
+                requestReceivedEpochMs: 1_000,
+                responsePostedEpochMs: 1_055,
+                threadCpuSystemMicros: threadCpuUserMicros / 2,
+                threadCpuUnavailableReason: null,
+                threadCpuUserMicros,
+                workEndedEpochMs: 1_040,
+                workStartedEpochMs: 1_010,
+            },
+            requestId
+        )
+    );
+}
+function requestTransport(
+    performanceCapture: unknown,
+    requestId = 'request-1'
+) {
+    return {
+        ipcCallId: 7,
+        operation: 'DB_GET_CONTENT',
+        operationId: 'operation-42',
+        operationIdUnavailableReason: null,
+        performanceCapture,
+        playlistId: 'playlist-1',
+        requestId,
+        responseEpochMs: 1_060,
+        sourceEpochMs: 990,
+        success: true,
+    } as const;
+}
+function assertClosedCapture(
+    capture: WorkerRequestPerformanceMetrics,
+    reason: string
+): void {
+    assert.equal(capture.performanceCaptureUnavailableReason, reason);
+    assert.equal(capture.operationId, 'operation-42');
+    for (const value of [
+        capture.eventLoopDelay,
+        capture.eventLoopDelayUnavailableReason,
+        capture.eventLoopUtilization,
+        capture.eventLoopUtilizationUnavailableReason,
+        capture.histogramFlushedEpochMs,
+        capture.invalidReason,
+        capture.requestReceivedEpochMs,
+        capture.responsePostedEpochMs,
+        capture.threadCpuSystemMicros,
+        capture.threadCpuUnavailableReason,
+        capture.threadCpuUserMicros,
+        capture.workEndedEpochMs,
+        capture.workStartedEpochMs,
+    ]) {
+        assert.equal(value, null);
+    }
+}
+function databaseWorker(
+    requests: readonly RequestPerformanceFixture[]
+): WorkerCaptureMetrics {
+    return {
+        kind: PERFORMANCE_WORKER_KIND.DATABASE,
+        operationId: null,
+        peakExternalBytes: 0,
+        peakHeapUsedBytes: 0,
+        playlistId: null,
+        postGcHeapUsedBytes: null,
+        requests,
+        responseEpochMs: null,
+        terminatedEpochMs: null,
+    } as WorkerCaptureMetrics;
+}
+function playlistWorker(
+    request: RequestPerformanceFixture,
+    operationId: string,
+    terminatedEpochMs: number
+): WorkerCaptureMetrics {
+    return {
+        ...databaseWorker([request]),
+        kind: PERFORMANCE_WORKER_KIND.PLAYLIST_REFRESH,
+        operationId,
+        playlistId: request.playlistId,
+        responseEpochMs: request.responseEpochMs,
+        terminatedEpochMs,
+    };
+}
+
+function measuredIteration(
+    workers: readonly WorkerCaptureMetrics[]
+): CancellationIterationResult {
+    return {
+        cancellationEffectObserved: true,
+        kind: PERFORMANCE_ITERATION_KIND.MEASURED,
+        main: {
+            eventLoopDelay: { maxMs: 0, p95Ms: 0, p99Ms: 0 },
+            eventLoopUtilization: null,
+            memory: {
+                peakHeapUsedBytes: 0,
+                peakRssBytes: 0,
+                postGcHeapUsedBytes: null,
+                postGcRssBytes: null,
+            },
+            rendererWindow: {
+                responsiveEvents: 0,
+                rss: {
+                    identity: {
+                        creationTime: 1_721_234_567_890,
+                        pid: 42,
+                    },
+                    missingSampleCount: 0,
+                    peakRssBytes: 0,
+                    unavailableReason: null,
+                    validSampleCount: 1,
+                },
+                unresponsiveEvents: 0,
+                windowIdentity: {
+                    browserWindowId: 7,
+                    webContentsId: 11,
+                },
+            },
+            workers,
+        } as CancellationIterationResult['main'],
+        phases: {} as CancellationIterationResult['phases'],
+        renderer: {
+            peakHeapUsedBytes: 0,
+            postGcHeapUsedBytes: null,
+            probe: {
+                frameGapsMs: [],
+                heartbeatDelaysMs: [],
+                longTasksMs: [],
+            },
+        } as CancellationIterationResult['renderer'],
+        runId: 'measured-1',
+    };
+}
+
+test('summary distributions use every request capture instead of a worker-level percentile maximum', () => {
+    const requests = [
+        requestPerformance('request-1', 5, 100),
+        requestPerformance('request-2', 15, 300),
+    ];
+    const summary = createCancellationBenchmarkSummary(
+        {} as CancellationBenchmarkManifest,
+        [measuredIteration([databaseWorker(requests)])]
+    );
+    const measured = summary.measured as unknown as Record<
+        string,
+        { count: number; max: number | null; min: number | null }
+    >;
+
+    assert.deepEqual(
+        summary.measured.databaseWorkerRequestEventLoopDelayP95Ms,
+        {
+            count: 2,
+            max: 15,
+            mean: 10,
+            median: 10,
+            min: 5,
+            p95: 14.5,
+            p99: 14.9,
+        }
+    );
+    assert.deepEqual(measured['databaseWorkerRequestThreadCpuUserMicros'], {
+        count: 2,
+        max: 300,
+        mean: 200,
+        median: 200,
+        min: 100,
+        p95: 290,
+        p99: 298,
+    });
+    assert.equal(
+        summary.iterations[0]?.main.workers[0]?.requests[0]?.operationId,
+        'operation-42'
+    );
+    assert.equal(
+        'databaseWorkerEventLoopDelayP95Ms' in summary.measured,
+        false,
+        'request-percentile distributions must not look like an operation-wide percentile'
+    );
+});
+
+test('main capture retains raw request identity, timestamps, metrics, and reasons', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+
+    assert.match(source, /requestPerformance: \[\]/);
+    assert.match(source, /record\.requestPerformance\.map/);
+    assert.match(source, /operationId: request\.identity\.operationId/);
+    assert.match(source, /ipcCallId: request\.identity\.ipcCallId/);
+    assert.match(source, /identity: request\.identity/);
+    assert.match(source, /performanceCapture:\s+message\['performance'\]/);
+    assert.match(source, /sourceEpochMs: request\.identity\.sourceEpochMs/);
+    assert.match(source, /captureGeneration: state\.captureGeneration/);
+    assert.doesNotMatch(
+        source,
+        /record\.eventLoopDelay = record\.eventLoopDelay/
+    );
+});
+
+test('normalized raw request metrics retain the exact preload IPC call identity', () => {
+    const capture = requestPerformance('request-1', 5, 100);
+
+    assert.equal(capture.ipcCallId, 7);
+    assert.equal(capture.sourceEpochMs, 990);
+});
+
+test('benchmark resolves one exact BrowserWindow and main capture never scans all windows', () => {
+    const benchmarkSource = readFileSync(
+        new URL('./m3u-refresh-cancellation.benchmark.ts', import.meta.url),
+        'utf8'
+    );
+    const mainCaptureSource = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+
+    assert.match(
+        benchmarkSource,
+        /electronApp\.browserWindow\(\s*app\.mainWindow\s*\)/
+    );
+    assert.match(benchmarkSource, /rendererWindowIdentity/);
+    assert.doesNotMatch(mainCaptureSource, /BrowserWindow\.getAllWindows/);
+    assert.doesNotMatch(mainCaptureSource, /type\.includes\('renderer'\)/);
+    assert.doesNotMatch(mainCaptureSource, /type\.includes\('tab'\)/);
+});
+
+test('capture-generation selection excludes a pre-start seed worker', () => {
+    const seed = playlistWorker(
+        requestPerformance('seed-request', 999, 999),
+        'seed-operation',
+        1_100
+    );
+    const measured = playlistWorker(
+        {
+            ...requestPerformance('measured-request', 8, 80),
+            success: false,
+        },
+        'measured-cancel-operation',
+        2_100
+    );
+
+    const mainMetrics = measuredIteration([]).main;
+    const toTransportWorker = (
+        captureGeneration: number | null,
+        worker: WorkerCaptureMetrics
+    ) => ({
+        captureGeneration,
+        metrics: worker,
+        requests: worker.requests.map((request) => ({
+            ...requestTransport(request, request.requestId ?? undefined),
+            success: request.success,
+        })),
+    });
+    const selected = selectMainCaptureGeneration({
+        captureGeneration: 2,
+        metrics: mainMetrics,
+        workers: [
+            toTransportWorker(null, seed),
+            toTransportWorker(2, measured),
+        ],
+    });
+
+    assert.equal(selected.workers.length, 1);
+    assert.equal(
+        selected.workers[0]?.requests[0]?.requestId,
+        'measured-request'
+    );
+    assert.equal(selected.workers[0]?.operationId, 'measured-cancel-operation');
+    assert.equal(selected.workers[0]?.terminatedEpochMs, 2_100);
+});
+
+test('fails closed for incoherent worker post-GC metrics at the Electron boundary', () => {
+    const invalidOutcomes = [
+        {
+            postGcHeapUnavailableReason: 'gc-unavailable',
+            postGcHeapUsedBytes: 100,
+        },
+        {
+            postGcHeapUnavailableReason: null,
+            postGcHeapUsedBytes: null,
+        },
+        {
+            postGcHeapUnavailableReason: null,
+            postGcHeapUsedBytes: -1,
+        },
+        {
+            postGcHeapUnavailableReason: 'unknown-reason',
+            postGcHeapUsedBytes: null,
+        },
+    ] as const;
+
+    for (const outcome of invalidOutcomes) {
+        const selected = selectMainCaptureGeneration({
+            captureGeneration: 3,
+            metrics: measuredIteration([]).main,
+            workers: [
+                {
+                    captureGeneration: 3,
+                    metrics: {
+                        ...databaseWorker([]),
+                        ...outcome,
+                    },
+                    requests: [],
+                },
+            ],
+        } as unknown as MainCaptureGenerationTransport);
+        const worker = selected.workers[0] as WorkerCaptureMetrics & {
+            readonly postGcHeapUnavailableReason: string | null;
+        };
+
+        assert.equal(worker.postGcHeapUsedBytes, null);
+        assert.equal(
+            worker.postGcHeapUnavailableReason,
+            'post-gc-capture-invalid'
+        );
+    }
+});
+
+test('raw outcomes retain missing and malformed captures while summaries exclude their null metrics', () => {
+    const valid = normalizeWorkerRequestPerformanceOutcome(
+        requestTransport(requestPerformance('request-1', 5, 100))
+    );
+    const missing = normalizeWorkerRequestPerformanceOutcome(
+        requestTransport(null, 'request-2')
+    );
+    const malformed = normalizeWorkerRequestPerformanceOutcome(
+        requestTransport(
+            {
+                requestReceivedEpochMs: 'invalid',
+                workEndedEpochMs: 1_080,
+                workStartedEpochMs: 1_075,
+            },
+            'request-3'
+        )
+    );
+    const worker = databaseWorker([valid, missing, malformed]);
+    const summary = createCancellationBenchmarkSummary(
+        {} as CancellationBenchmarkManifest,
+        [measuredIteration([worker])]
+    );
+
+    assert.equal(worker.requests.length, 3);
+    assertClosedCapture(
+        worker.requests[1] as WorkerRequestPerformanceMetrics,
+        'worker-performance-capture-missing'
+    );
+    assertClosedCapture(
+        worker.requests[2] as WorkerRequestPerformanceMetrics,
+        'worker-performance-capture-invalid'
+    );
+    assert.equal(
+        summary.measured.databaseWorkerRequestEventLoopDelayP95Ms.count,
+        1
+    );
+    assert.equal(
+        summary.measured.databaseWorkerRequestThreadCpuUserMicros.count,
+        1
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/worker-request-performance.ts b/apps/electron-backend-e2e/src/performance/worker-request-performance.ts
new file mode 100644
index 000000000..4a5cc00ac
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-request-performance.ts
@@ -0,0 +1,385 @@
+import type {
+    EventLoopDelayMetrics,
+    MainCaptureMetrics,
+    WorkerCaptureMetrics,
+    WorkerPostGcHeapCapture,
+    WorkerRequestPerformanceMetrics,
+} from './m3u-refresh-cancellation-contract';
+import { WORKER_POST_GC_HEAP_UNAVAILABLE_REASON } from './m3u-refresh-cancellation-contract';
+import { parseWorkerPerformancePhaseEvents } from './worker-performance-phase-events';
+
+export interface WorkerRequestPerformanceOutcomeTransport {
+    readonly ipcCallId: number | null;
+    readonly operation: string | null;
+    readonly operationId: string | null;
+    readonly operationIdUnavailableReason: string | null;
+    readonly performanceCapture: unknown;
+    readonly playlistId: string | null;
+    readonly requestId: string | null;
+    readonly responseEpochMs: number;
+    readonly sourceEpochMs: number | null;
+    readonly success: boolean;
+}
+
+export interface MainCaptureGenerationTransport {
+    readonly captureGeneration: number;
+    readonly metrics: Omit<MainCaptureMetrics, 'workers'>;
+    readonly workers: readonly {
+        readonly captureGeneration: number | null;
+        readonly metrics: Omit<
+            WorkerCaptureMetrics,
+            'eventLoopDelay' | 'eventLoopDelayUnavailableReason' | 'requests'
+        >;
+        readonly requests: readonly WorkerRequestPerformanceOutcomeTransport[];
+    }[];
+}
+
+type ParsedWorkerPerformanceCapture = Pick<
+    WorkerRequestPerformanceMetrics,
+    | 'eventLoopDelay'
+    | 'eventLoopDelayUnavailableReason'
+    | 'eventLoopUtilization'
+    | 'eventLoopUtilizationUnavailableReason'
+    | 'histogramFlushedEpochMs'
+    | 'invalidReason'
+    | 'phaseEvents'
+    | 'requestReceivedEpochMs'
+    | 'responsePostedEpochMs'
+    | 'threadCpuSystemMicros'
+    | 'threadCpuUnavailableReason'
+    | 'threadCpuUserMicros'
+    | 'workEndedEpochMs'
+    | 'workStartedEpochMs'
+>;
+
+const INVALID_REASONS = new Set(['overlapping-database-worker-requests']);
+const EVENT_LOOP_DELAY_REASONS = new Set([
+    ...INVALID_REASONS,
+    'event-loop-delay-arm-timeout',
+    'event-loop-delay-capture-unavailable',
+    'event-loop-delay-flush-timeout',
+    'event-loop-delay-invalid',
+]);
+const EVENT_LOOP_UTILIZATION_REASONS = new Set([
+    ...INVALID_REASONS,
+    'event-loop-utilization-unavailable',
+]);
+const THREAD_CPU_REASONS = new Set([
+    ...INVALID_REASONS,
+    'thread-cpu-usage-invalid',
+    'thread-cpu-usage-unavailable',
+]);
+const WORKER_POST_GC_HEAP_UNAVAILABLE_REASONS = new Set<string>(
+    Object.values(WORKER_POST_GC_HEAP_UNAVAILABLE_REASON)
+);
+
+function isRecord(input: unknown): input is Record<string, unknown> {
+    return typeof input === 'object' && input !== null && !Array.isArray(input);
+}
+
+function isFiniteNonNegativeNumber(value: unknown): value is number {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+
+function isNullableFiniteNonNegativeNumber(
+    value: unknown
+): value is number | null {
+    return value === null || isFiniteNonNegativeNumber(value);
+}
+
+function isNullableReason(
+    value: unknown,
+    allowed: ReadonlySet<string>
+): value is string | null {
+    return value === null || (typeof value === 'string' && allowed.has(value));
+}
+
+function normalizeWorkerPostGcHeapCapture(
+    input: Record<string, unknown>
+): WorkerPostGcHeapCapture {
+    const postGcHeapUnavailableReason = input['postGcHeapUnavailableReason'];
+    const postGcHeapUsedBytes = input['postGcHeapUsedBytes'];
+    if (
+        Number.isSafeInteger(postGcHeapUsedBytes) &&
+        Number(postGcHeapUsedBytes) >= 0 &&
+        postGcHeapUnavailableReason === null
+    ) {
+        return {
+            postGcHeapUnavailableReason: null,
+            postGcHeapUsedBytes: Number(postGcHeapUsedBytes),
+        };
+    }
+    if (
+        postGcHeapUsedBytes === null &&
+        typeof postGcHeapUnavailableReason === 'string' &&
+        WORKER_POST_GC_HEAP_UNAVAILABLE_REASONS.has(postGcHeapUnavailableReason)
+    ) {
+        return {
+            postGcHeapUnavailableReason,
+            postGcHeapUsedBytes: null,
+        } as WorkerPostGcHeapCapture;
+    }
+    return {
+        postGcHeapUnavailableReason:
+            WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.INVALID_CAPTURE,
+        postGcHeapUsedBytes: null,
+    };
+}
+
+function parseEventLoopDelay(
+    input: unknown
+): EventLoopDelayMetrics | null | undefined {
+    if (input === null) {
+        return null;
+    }
+    if (!isRecord(input)) {
+        return undefined;
+    }
+    const maxMs = input['maxMs'];
+    const p95Ms = input['p95Ms'];
+    const p99Ms = input['p99Ms'];
+    if (
+        !isFiniteNonNegativeNumber(maxMs) ||
+        !isFiniteNonNegativeNumber(p95Ms) ||
+        !isFiniteNonNegativeNumber(p99Ms) ||
+        p95Ms > p99Ms ||
+        p99Ms > maxMs
+    ) {
+        return undefined;
+    }
+    return { maxMs, p95Ms, p99Ms };
+}
+
+function parseWorkerPerformanceCapture(
+    input: unknown,
+    operation: string | null
+): ParsedWorkerPerformanceCapture | null {
+    if (!isRecord(input)) {
+        return null;
+    }
+
+    const eventLoopDelay = parseEventLoopDelay(input['eventLoopDelay']);
+    const eventLoopDelayUnavailableReason =
+        input['eventLoopDelayUnavailableReason'];
+    const eventLoopUtilization = input['eventLoopUtilization'];
+    const eventLoopUtilizationUnavailableReason =
+        input['eventLoopUtilizationUnavailableReason'];
+    const histogramFlushedEpochMs = input['histogramFlushedEpochMs'];
+    const invalidReason = input['invalidReason'];
+    const requestReceivedEpochMs = input['requestReceivedEpochMs'];
+    const responsePostedEpochMs = input['responsePostedEpochMs'];
+    const threadCpuSystemMicros = input['threadCpuSystemMicros'];
+    const threadCpuUnavailableReason = input['threadCpuUnavailableReason'];
+    const threadCpuUserMicros = input['threadCpuUserMicros'];
+    const workEndedEpochMs = input['workEndedEpochMs'];
+    const workStartedEpochMs = input['workStartedEpochMs'];
+
+    if (
+        eventLoopDelay === undefined ||
+        !isNullableReason(
+            eventLoopDelayUnavailableReason,
+            EVENT_LOOP_DELAY_REASONS
+        ) ||
+        !isNullableFiniteNonNegativeNumber(eventLoopUtilization) ||
+        (eventLoopUtilization !== null && eventLoopUtilization > 1) ||
+        !isNullableReason(
+            eventLoopUtilizationUnavailableReason,
+            EVENT_LOOP_UTILIZATION_REASONS
+        ) ||
+        !isNullableFiniteNonNegativeNumber(histogramFlushedEpochMs) ||
+        !isNullableReason(invalidReason, INVALID_REASONS) ||
+        !isFiniteNonNegativeNumber(requestReceivedEpochMs) ||
+        !isFiniteNonNegativeNumber(responsePostedEpochMs) ||
+        !isNullableFiniteNonNegativeNumber(threadCpuSystemMicros) ||
+        !isNullableReason(threadCpuUnavailableReason, THREAD_CPU_REASONS) ||
+        !isNullableFiniteNonNegativeNumber(threadCpuUserMicros) ||
+        !isFiniteNonNegativeNumber(workEndedEpochMs) ||
+        !isFiniteNonNegativeNumber(workStartedEpochMs)
+    ) {
+        return null;
+    }
+
+    const phaseEvents = parseWorkerPerformancePhaseEvents(
+        operation,
+        input['phaseEvents'],
+        workStartedEpochMs,
+        workEndedEpochMs
+    );
+    if (phaseEvents === null) {
+        return null;
+    }
+
+    const timestampsAreOrdered =
+        requestReceivedEpochMs <= workStartedEpochMs &&
+        workStartedEpochMs <= workEndedEpochMs &&
+        workEndedEpochMs <= responsePostedEpochMs &&
+        (histogramFlushedEpochMs === null ||
+            (workEndedEpochMs <= histogramFlushedEpochMs &&
+                histogramFlushedEpochMs <= responsePostedEpochMs));
+    const eventLoopDelayIsCoherent =
+        eventLoopDelay === null
+            ? eventLoopDelayUnavailableReason !== null &&
+              (eventLoopDelayUnavailableReason === 'event-loop-delay-invalid'
+                  ? histogramFlushedEpochMs !== null
+                  : histogramFlushedEpochMs === null)
+            : eventLoopDelayUnavailableReason === null &&
+              histogramFlushedEpochMs !== null;
+    const eventLoopUtilizationIsCoherent =
+        eventLoopUtilization === null
+            ? eventLoopUtilizationUnavailableReason !== null
+            : eventLoopUtilizationUnavailableReason === null;
+    const threadCpuIsCoherent =
+        threadCpuSystemMicros === null && threadCpuUserMicros === null
+            ? threadCpuUnavailableReason !== null
+            : threadCpuSystemMicros !== null &&
+              threadCpuUserMicros !== null &&
+              threadCpuUnavailableReason === null;
+    const invalidCaptureIsCoherent =
+        invalidReason === null ||
+        (eventLoopDelay === null &&
+            eventLoopDelayUnavailableReason === invalidReason &&
+            eventLoopUtilization === null &&
+            eventLoopUtilizationUnavailableReason === invalidReason &&
+            histogramFlushedEpochMs === null &&
+            threadCpuSystemMicros === null &&
+            threadCpuUnavailableReason === invalidReason &&
+            threadCpuUserMicros === null);
+    if (
+        !timestampsAreOrdered ||
+        !eventLoopDelayIsCoherent ||
+        !eventLoopUtilizationIsCoherent ||
+        !threadCpuIsCoherent ||
+        !invalidCaptureIsCoherent
+    ) {
+        return null;
+    }
+
+    return {
+        eventLoopDelay,
+        eventLoopDelayUnavailableReason,
+        eventLoopUtilization,
+        eventLoopUtilizationUnavailableReason,
+        histogramFlushedEpochMs,
+        invalidReason,
+        phaseEvents,
+        requestReceivedEpochMs,
+        responsePostedEpochMs,
+        threadCpuSystemMicros,
+        threadCpuUnavailableReason,
+        threadCpuUserMicros,
+        workEndedEpochMs,
+        workStartedEpochMs,
+    };
+}
+
+export function normalizeWorkerRequestPerformanceOutcome(
+    input: WorkerRequestPerformanceOutcomeTransport
+): WorkerRequestPerformanceMetrics {
+    const identity = {
+        ipcCallId: input.ipcCallId,
+        operation: input.operation,
+        operationId: input.operationId,
+        operationIdUnavailableReason: input.operationIdUnavailableReason,
+        playlistId: input.playlistId,
+        requestId: input.requestId,
+        responseEpochMs: input.responseEpochMs,
+        sourceEpochMs: input.sourceEpochMs,
+        success: input.success,
+    };
+    const unavailable = (
+        reason:
+            | 'worker-performance-capture-invalid'
+            | 'worker-performance-capture-missing'
+    ): WorkerRequestPerformanceMetrics => ({
+        eventLoopDelay: null,
+        eventLoopDelayUnavailableReason: null,
+        eventLoopUtilization: null,
+        eventLoopUtilizationUnavailableReason: null,
+        histogramFlushedEpochMs: null,
+        invalidReason: null,
+        ...identity,
+        performanceCaptureUnavailableReason: reason,
+        phaseEvents: [],
+        requestReceivedEpochMs: null,
+        responsePostedEpochMs: null,
+        threadCpuSystemMicros: null,
+        threadCpuUnavailableReason: null,
+        threadCpuUserMicros: null,
+        workEndedEpochMs: null,
+        workStartedEpochMs: null,
+    });
+
+    if (
+        input.performanceCapture === undefined ||
+        input.performanceCapture === null
+    ) {
+        return unavailable('worker-performance-capture-missing');
+    }
+
+    const performanceCapture = parseWorkerPerformanceCapture(
+        input.performanceCapture,
+        input.operation
+    );
+    if (!performanceCapture) {
+        return unavailable('worker-performance-capture-invalid');
+    }
+    if (
+        !isFiniteNonNegativeNumber(input.responseEpochMs) ||
+        performanceCapture.responsePostedEpochMs > input.responseEpochMs
+    ) {
+        return unavailable('worker-performance-capture-invalid');
+    }
+    if (
+        performanceCapture.phaseEvents.length > 0 &&
+        (input.requestId === null ||
+            performanceCapture.phaseEvents.some(
+                (event) => event.requestId !== input.requestId
+            ))
+    ) {
+        return unavailable('worker-performance-capture-invalid');
+    }
+
+    return {
+        ...performanceCapture,
+        ...identity,
+        performanceCaptureUnavailableReason: null,
+    };
+}
+
+export function selectMainCaptureGeneration(
+    input: MainCaptureGenerationTransport
+): MainCaptureMetrics {
+    const workers = input.workers
+        .filter(
+            (worker) => worker.captureGeneration === input.captureGeneration
+        )
+        .map((worker): WorkerCaptureMetrics => {
+            const requests = worker.requests.map(
+                normalizeWorkerRequestPerformanceOutcome
+            );
+            const onlyRequest =
+                requests.length === 1 ? (requests[0] ?? null) : null;
+            const postGcHeap = normalizeWorkerPostGcHeapCapture(
+                worker.metrics as unknown as Record<string, unknown>
+            );
+            return {
+                ...worker.metrics,
+                ...postGcHeap,
+                eventLoopDelay: onlyRequest?.eventLoopDelay ?? null,
+                eventLoopDelayUnavailableReason: onlyRequest
+                    ? (onlyRequest.eventLoopDelayUnavailableReason ??
+                      onlyRequest.performanceCaptureUnavailableReason ??
+                      'worker-self-profile-result-unavailable')
+                    : requests.length > 1
+                      ? 'multiple-request-scoped-captures'
+                      : worker.metrics.terminatedEpochMs !== null
+                        ? 'worker-terminated-before-profile-flush'
+                        : 'worker-self-profile-result-unavailable',
+                requests,
+            };
+        });
+    return {
+        ...input.metrics,
+        workers,
+    };
+}
diff --git a/apps/electron-backend-e2e/src/performance/worker-termination-generation.spec.ts b/apps/electron-backend-e2e/src/performance/worker-termination-generation.spec.ts
new file mode 100644
index 000000000..f1ac4d93a
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-termination-generation.spec.ts
@@ -0,0 +1,102 @@
+/* eslint-disable playwright/expect-expect -- This is a Node assertion-based performance contract test. */
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+interface WorkerTerminationGenerationApi {
+    isCurrent(input: {
+        readonly capturedGeneration: number | null;
+        readonly currentGeneration: number;
+        readonly recordGeneration: number | null;
+    }): boolean;
+}
+
+interface WorkerTerminationGenerationModule {
+    createWorkerTerminationGenerationApi?: () => WorkerTerminationGenerationApi;
+}
+
+const modulePromise = import(
+    new URL('./worker-termination-generation.ts', import.meta.url).href
+)
+    .then((module) => module as WorkerTerminationGenerationModule)
+    .catch(() => null);
+
+test('rejects a delayed termination completion after capture rollover or record reuse', async () => {
+    const module = await modulePromise;
+    assert.ok(module, 'worker termination generation guard must exist');
+    const api = module.createWorkerTerminationGenerationApi?.();
+    assert.ok(api);
+
+    assert.equal(
+        api.isCurrent({
+            capturedGeneration: 4,
+            currentGeneration: 4,
+            recordGeneration: 4,
+        }),
+        true
+    );
+    assert.equal(
+        api.isCurrent({
+            capturedGeneration: 4,
+            currentGeneration: 5,
+            recordGeneration: 4,
+        }),
+        false,
+        'a late completion must not write into the next global capture generation'
+    );
+    assert.equal(
+        api.isCurrent({
+            capturedGeneration: 4,
+            currentGeneration: 5,
+            recordGeneration: 5,
+        }),
+        false,
+        'a reused record must not be finalized by the prior termination promise'
+    );
+});
+
+test('fails closed for missing or invalid generation identities', async () => {
+    const module = await modulePromise;
+    assert.ok(module);
+    const api = module.createWorkerTerminationGenerationApi?.();
+    assert.ok(api);
+
+    for (const capturedGeneration of [null, 0, -1, 1.5, Number.NaN]) {
+        assert.equal(
+            api.isCurrent({
+                capturedGeneration,
+                currentGeneration: 1,
+                recordGeneration: 1,
+            }),
+            false
+        );
+    }
+});
+
+test('the Electron termination callback applies the generation guard before mutating capture state', () => {
+    const source = readFileSync(
+        new URL('./m3u-refresh-main-capture.ts', import.meta.url),
+        'utf8'
+    );
+    const terminateStart = source.indexOf(
+        'WorkerClass.prototype.terminate = function'
+    );
+    const terminateEnd = source.indexOf('const inspectorPost', terminateStart);
+    const terminateBlock = source.slice(terminateStart, terminateEnd);
+    const terminationGeneration = terminateBlock.indexOf(
+        'const terminationGeneration = record.captureGeneration'
+    );
+    const generationGuard = terminateBlock.indexOf(
+        'workerTerminationGenerationApi.isCurrent'
+    );
+    const terminationMutation = terminateBlock.indexOf(
+        'record.terminatedEpochMs = nowEpochMs()'
+    );
+
+    assert.ok(
+        terminationGeneration >= 0 &&
+            terminationGeneration < generationGuard &&
+            generationGuard < terminationMutation,
+        'late termination completion must be generation-gated before mutating the record or timeline'
+    );
+});
diff --git a/apps/electron-backend-e2e/src/performance/worker-termination-generation.ts b/apps/electron-backend-e2e/src/performance/worker-termination-generation.ts
new file mode 100644
index 000000000..68f77efbd
--- /dev/null
+++ b/apps/electron-backend-e2e/src/performance/worker-termination-generation.ts
@@ -0,0 +1,24 @@
+export interface WorkerTerminationGenerationInput {
+    readonly capturedGeneration: number | null;
+    readonly currentGeneration: number;
+    readonly recordGeneration: number | null;
+}
+
+export interface WorkerTerminationGenerationApi {
+    isCurrent(input: WorkerTerminationGenerationInput): boolean;
+}
+
+export function createWorkerTerminationGenerationApi(): WorkerTerminationGenerationApi {
+    const isCaptureGeneration = (value: number | null): value is number =>
+        Number.isSafeInteger(value) && Number(value) > 0;
+
+    return Object.freeze({
+        isCurrent(input: WorkerTerminationGenerationInput): boolean {
+            return (
+                isCaptureGeneration(input.capturedGeneration) &&
+                input.capturedGeneration === input.currentGeneration &&
+                input.capturedGeneration === input.recordGeneration
+            );
+        },
+    });
+}
diff --git a/apps/electron-backend-e2e/src/playlist-auto-refresh.e2e.ts b/apps/electron-backend-e2e/src/playlist-auto-refresh.e2e.ts
new file mode 100644
index 000000000..f50fbf8b8
--- /dev/null
+++ b/apps/electron-backend-e2e/src/playlist-auto-refresh.e2e.ts
@@ -0,0 +1,113 @@
+import type { Locator, Page } from '@playwright/test';
+import {
+    closeElectronApp,
+    createMutableTextServer,
+    expect,
+    importM3uPlaylistFromUrl,
+    launchElectronApp,
+    openSourceEditor,
+    openSources,
+    restartElectronApp,
+    saveSourceDialog,
+    sourceRowByTitle,
+    test,
+    updateSourceDialog,
+    waitForM3uCatalog,
+} from './electron-test-fixtures';
+
+const autoRefreshSourceName = 'auto-refresh-source.m3u';
+
+function buildAutoRefreshM3u(channelName: string): string {
+    return `#EXTM3U
+#EXTINF:-1 group-title="News",${channelName}
+https://streams.example.test/${channelName.toLowerCase().replace(/\s+/g, '-')}.m3u8
+`;
+}
+
+function snackBarLabel(page: Page, text: string): Locator {
+    return page
+        .locator('.mat-mdc-snack-bar-label')
+        .filter({ hasText: text })
+        .last();
+}
+
+async function openAutoRefreshPlaylistCatalog(page: Page): Promise<void> {
+    await openSources(page);
+    await sourceRowByTitle(page, autoRefreshSourceName).first().click();
+    await waitForM3uCatalog(page);
+}
+
+test.describe('Electron startup playlist auto-refresh', () => {
+    test('reports failed playlists instead of an unconditional success toast', async ({
+        dataDir,
+    }) => {
+        const urlServer = await createMutableTextServer(
+            buildAutoRefreshM3u('Original Auto Channel'),
+            {
+                contentType: 'application/vnd.apple.mpegurl',
+                resourcePath: `/${autoRefreshSourceName}`,
+            }
+        );
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            await importM3uPlaylistFromUrl(
+                app.mainWindow,
+                urlServer.resourceUrl
+            );
+            await openSources(app.mainWindow);
+            const dialog = await openSourceEditor(
+                app.mainWindow,
+                autoRefreshSourceName
+            );
+            await updateSourceDialog(dialog, { autoRefresh: true });
+            await saveSourceDialog(app.mainWindow, dialog);
+
+            // Reachable source: the startup run really refreshes the playlist.
+            // Asserted through the persisted catalog rather than the 2s success
+            // toast, which is too short-lived to poll for reliably.
+            urlServer.setBody(buildAutoRefreshM3u('Refreshed Auto Channel'));
+            const successfulRestart = await restartElectronApp(app, dataDir);
+            app.electronApp = successfulRestart.electronApp;
+            app.mainWindow = successfulRestart.mainWindow;
+
+            await openAutoRefreshPlaylistCatalog(app.mainWindow);
+            await expect(
+                app.mainWindow.getByTestId('channel-item').filter({
+                    hasText: 'Refreshed Auto Channel',
+                })
+            ).toHaveCount(1);
+
+            // Unreachable source: the backend drops the playlist from its
+            // result, so the startup toast must say so instead of claiming
+            // everything was updated.
+            await urlServer.close();
+
+            const failedRestart = await restartElectronApp(app, dataDir);
+            app.electronApp = failedRestart.electronApp;
+            app.mainWindow = failedRestart.mainWindow;
+
+            await expect(
+                snackBarLabel(app.mainWindow, 'Playlist auto-refresh failed')
+            ).toBeVisible({ timeout: 30000 });
+            await expect(
+                app.mainWindow.locator('.mat-mdc-snack-bar-label').filter({
+                    hasText: 'The playlists were successfully updated',
+                })
+            ).toHaveCount(0);
+
+            // A failed refresh must not wipe the previously imported channels.
+            await openAutoRefreshPlaylistCatalog(app.mainWindow);
+            await expect(
+                app.mainWindow.getByTestId('channel-item').filter({
+                    hasText: 'Refreshed Auto Channel',
+                })
+            ).toHaveCount(1);
+        } finally {
+            await closeElectronApp(app);
+            // The test closes the server mid-run to make the source
+            // unreachable; a second close rejects with ERR_SERVER_NOT_RUNNING.
+            await urlServer.close().catch(() => undefined);
+        }
+    });
+});
diff --git a/apps/electron-backend-e2e/src/search.e2e.ts b/apps/electron-backend-e2e/src/search.e2e.ts
index 9be5dd110..dc96e4b45 100644
--- a/apps/electron-backend-e2e/src/search.e2e.ts
+++ b/apps/electron-backend-e2e/src/search.e2e.ts
@@ -6,8 +6,8 @@ import {
     closeElectronApp,
     defaultStalkerMacAddress,
     expect,
+    expectNoWorkspaceSearchStatus,
     expectWorkspaceSearchScope,
-    expectWorkspaceSearchStatus,
     fillWorkspaceSearch,
     goToDashboard,
     importM3uPlaylistFromNativeDialog,
@@ -987,7 +987,7 @@ test.describe('Electron Workspace Search', () => {
         }
     });
 
-    test('@search @stalker shows loaded-only scope and filters channels on ITV routes', async ({
+    test('@search @stalker searches the complete channel list on ITV routes', async ({
         dataDir,
         request,
     }) => {
@@ -1030,26 +1030,22 @@ test.describe('Electron Workspace Search', () => {
                 app.mainWindow,
                 `Live TV / ${sample.categoryName}`
             );
-            await expectWorkspaceSearchStatus(
-                app.mainWindow,
-                'Loaded channels only'
-            );
+            // Entering Live TV preloads the COMPLETE channel list (Ministra
+            // get_all_channels), so search runs locally over every channel:
+            // no portal-side search request, and no "Loaded channels only"
+            // degraded hint.
             await waitForPortalDebugEvent(app.mainWindow, {
                 provider: 'stalker',
-                operation: 'get_ordered_list',
+                operation: 'get_all_channels',
                 predicate: (event) => {
                     const requestPayload = event.request as {
                         params?: Record<string, string | number>;
                     };
 
-                    return (
-                        requestPayload.params?.['type'] === 'itv' &&
-                        String(requestPayload.params?.['category']) ===
-                            sample.categoryId &&
-                        requestPayload.params?.['search'] === itvQuery
-                    );
+                    return requestPayload.params?.['type'] === 'itv';
                 },
             });
+            await expectNoWorkspaceSearchStatus(app.mainWindow);
             await expect(
                 channelItemByTitle(app.mainWindow, sample.targetTitle).first()
             ).toBeVisible();
diff --git a/apps/electron-backend-e2e/src/settings.e2e.ts b/apps/electron-backend-e2e/src/settings.e2e.ts
index 532d62d38..c803ab8ed 100644
--- a/apps/electron-backend-e2e/src/settings.e2e.ts
+++ b/apps/electron-backend-e2e/src/settings.e2e.ts
@@ -169,6 +169,11 @@ test.describe('Electron Settings', () => {
                 'select-video-player',
                 'html5'
             );
+            const sharedControlsCheckbox = firstLaunch.mainWindow
+                .getByTestId('web-player-shared-controls-setting')
+                .locator('input[type="checkbox"]');
+            await expect(sharedControlsCheckbox).toBeVisible();
+            await sharedControlsCheckbox.check();
             await selectSettingsOption(
                 firstLaunch.mainWindow,
                 'select-stream-format',
@@ -206,6 +211,11 @@ test.describe('Electron Settings', () => {
             await expect(
                 secondLaunch.mainWindow.getByTestId('select-video-player')
             ).toContainText(/HTML5/i);
+            await expect(
+                secondLaunch.mainWindow
+                    .getByTestId('web-player-shared-controls-setting')
+                    .locator('input[type="checkbox"]')
+            ).toBeChecked();
             await expect(
                 secondLaunch.mainWindow.getByTestId('select-stream-format')
             ).toContainText('ts');
@@ -231,6 +241,171 @@ test.describe('Electron Settings', () => {
         }
     });
 
+    test('@settings @playback @electron applies shared controls to the next HTML5 session', async ({
+        dataDir,
+    }) => {
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            await openSettings(app.mainWindow);
+            await selectSettingsOption(
+                app.mainWindow,
+                'select-video-player',
+                'html5'
+            );
+            const sharedControlsCheckbox = app.mainWindow
+                .getByTestId('web-player-shared-controls-setting')
+                .locator('input[type="checkbox"]');
+            await expect(sharedControlsCheckbox).toBeVisible();
+            await sharedControlsCheckbox.check();
+            await saveSettings(app.mainWindow);
+
+            await goToDashboard(app.mainWindow);
+            await importM3uPlaylistFromNativeDialog(app, m3uFixturePath);
+            await app.mainWindow.waitForURL(/\/workspace\/playlists\/.+/);
+            await app.mainWindow.route(
+                'https://example.channels/path-to-file/1.m3u8',
+                () => {
+                    // Keep the synthetic stream pending so its network failure
+                    // cannot replace the shared controls with a diagnostic.
+                }
+            );
+
+            const firstChannel = channelItemByTitle(
+                app.mainWindow,
+                'Channel 1'
+            ).first();
+
+            await expect(firstChannel).toBeVisible({ timeout: 20000 });
+            await firstChannel.click();
+            const video = app.mainWindow.locator(
+                'app-html-video-player video'
+            );
+            await expect(video).toBeAttached();
+            await video.evaluate<void, HTMLVideoElement>((video) => {
+                const ownerDocument = video.ownerDocument;
+                let activePictureInPictureElement: Element | null = null;
+                video.dataset['pictureInPictureRequestCount'] = '0';
+                video.dataset['pictureInPictureExitCount'] = '0';
+
+                Object.defineProperty(
+                    ownerDocument,
+                    'pictureInPictureEnabled',
+                    {
+                        configurable: true,
+                        value: true,
+                    }
+                );
+                Object.defineProperty(
+                    ownerDocument,
+                    'pictureInPictureElement',
+                    {
+                        configurable: true,
+                        get: () => activePictureInPictureElement,
+                    }
+                );
+                Object.defineProperty(ownerDocument, 'exitPictureInPicture', {
+                    configurable: true,
+                    value: async (): Promise<void> => {
+                        video.dataset['pictureInPictureExitCount'] = String(
+                            Number(
+                                video.dataset['pictureInPictureExitCount'] ??
+                                    '0'
+                            ) + 1
+                        );
+                        const previousOwner = activePictureInPictureElement;
+                        activePictureInPictureElement = null;
+                        previousOwner?.dispatchEvent(
+                            new Event('leavepictureinpicture')
+                        );
+                    },
+                });
+                Object.defineProperty(video, 'requestPictureInPicture', {
+                    configurable: true,
+                    value: async (): Promise<PictureInPictureWindow> => {
+                        video.dataset['pictureInPictureRequestCount'] = String(
+                            Number(
+                                video.dataset['pictureInPictureRequestCount'] ??
+                                    '0'
+                            ) + 1
+                        );
+                        activePictureInPictureElement = video;
+                        video.dispatchEvent(new Event('enterpictureinpicture'));
+
+                        const pictureInPictureWindow: PictureInPictureWindow =
+                            Object.assign(new EventTarget(), {
+                                height: video.videoHeight,
+                                onresize: null,
+                                width: video.videoWidth,
+                            });
+                        return pictureInPictureWindow;
+                    },
+                });
+                Object.defineProperty(video, 'disablePictureInPicture', {
+                    configurable: true,
+                    value: false,
+                });
+                Object.defineProperty(video, 'readyState', {
+                    configurable: true,
+                    value: HTMLMediaElement.HAVE_METADATA,
+                });
+                video.dispatchEvent(new Event('loadedmetadata'));
+            });
+
+            const playerControls = app.mainWindow.locator(
+                'app-html-video-player app-player-controls'
+            );
+            await expect(playerControls).toBeVisible();
+            await expect(
+                app.mainWindow.locator('app-html-video-player video[controls]')
+            ).toHaveCount(0);
+            const enterPictureInPicture = playerControls.getByRole('button', {
+                name: 'Enter picture-in-picture',
+            });
+
+            await expect(enterPictureInPicture).toBeVisible();
+            await expect(enterPictureInPicture).toBeEnabled();
+            await expect(enterPictureInPicture).toHaveAttribute(
+                'aria-pressed',
+                'false'
+            );
+            await expect(video).toHaveAttribute(
+                'data-picture-in-picture-request-count',
+                '0'
+            );
+            await enterPictureInPicture.click();
+            await expect(video).toHaveAttribute(
+                'data-picture-in-picture-request-count',
+                '1'
+            );
+
+            const exitPictureInPicture = playerControls.getByRole('button', {
+                name: 'Exit picture-in-picture',
+            });
+            await expect(exitPictureInPicture).toBeVisible();
+            await expect(exitPictureInPicture).toHaveAttribute(
+                'aria-pressed',
+                'true'
+            );
+            await expect(video).toHaveAttribute(
+                'data-picture-in-picture-exit-count',
+                '0'
+            );
+            await exitPictureInPicture.click();
+            await expect(video).toHaveAttribute(
+                'data-picture-in-picture-exit-count',
+                '1'
+            );
+            await expect(enterPictureInPicture).toBeVisible();
+            await expect(enterPictureInPicture).toHaveAttribute(
+                'aria-pressed',
+                'false'
+            );
+        } finally {
+            await closeElectronApp(app);
+        }
+    });
+
     test('@settings @persistence @electron persists the EPG view mode across app restart', async ({
         dataDir,
     }) => {
@@ -429,6 +604,57 @@ test.describe('Electron Settings', () => {
             await closeElectronApp(app);
         }
     });
+
+    test('@settings @electron @persistence sizes and clears the TMDB metadata cache', async ({
+        dataDir,
+    }) => {
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            // Seeded through the same preload bridge the enrichment service
+            // uses, so this exercises real IPC -> DB worker -> SQLite.
+            // Enrichment itself cannot run here: it needs a TMDB API key,
+            // which builds outside the release pipeline do not carry.
+            await app.mainWindow.evaluate(async () => {
+                await window.electron.dbSetTmdbMetadata({
+                    mediaType: 'movie',
+                    lookupKey: 'id:603|v2',
+                    language: 'en-US',
+                    tmdbId: 603,
+                    payload: JSON.stringify({ id: 603, title: 'The Matrix' }),
+                    fetchedAt: new Date().toISOString(),
+                });
+            });
+
+            await openSettings(app.mainWindow);
+            await app.mainWindow.getByTestId('settings-section-tmdb').click();
+
+            // Sizing is deferred until this section is the active one
+            await expect(
+                app.mainWindow.getByTestId('tmdb-cache-size')
+            ).toHaveText(/\b1 entries/);
+
+            const clearButton =
+                app.mainWindow.getByTestId('tmdb-clear-cache');
+            await expect(clearButton).toBeEnabled();
+            await clearButton.click();
+
+            // Re-read reports an empty cache, so there is nothing to clear
+            await expect(clearButton).toBeDisabled();
+            await expect(
+                app.mainWindow.getByTestId('tmdb-cache-size')
+            ).toHaveText(/\b0 entries/);
+
+            // ...and the row is gone from the database, not just the panel
+            const remaining = await app.mainWindow.evaluate(() =>
+                window.electron.dbGetTmdbMetadata('movie', 'id:603|v2', 'en-US')
+            );
+            expect(remaining).toBeNull();
+        } finally {
+            await closeElectronApp(app);
+        }
+    });
+
 });
 
 async function selectSettingsOption(
diff --git a/apps/electron-backend-e2e/src/window-controls.e2e.ts b/apps/electron-backend-e2e/src/window-controls.e2e.ts
index 5d4f36c99..d65b463bd 100644
--- a/apps/electron-backend-e2e/src/window-controls.e2e.ts
+++ b/apps/electron-backend-e2e/src/window-controls.e2e.ts
@@ -103,6 +103,67 @@ test.describe('Custom window controls', () => {
         }
     });
 
+    test('@electron controls reappear after leaving HTML element fullscreen', async ({
+        dataDir,
+    }) => {
+        test.skip(
+            isWindowManagerlessCi,
+            'xvfb on Linux CI has no window manager'
+        );
+        const app = await launchElectronApp(dataDir);
+
+        try {
+            const controls = app.mainWindow.locator('app-window-controls');
+            await expect(controls).not.toHaveClass(/is-hidden/);
+
+            // The video players fullscreen their player root through the
+            // HTML element-fullscreen API. That API needs transient user
+            // activation, so trigger it from a real click on a temporary
+            // overlay instead of calling it directly from evaluate().
+            await app.mainWindow.evaluate(() => {
+                const overlay = document.createElement('div');
+                overlay.id = 'e2e-fullscreen-trigger';
+                overlay.style.cssText =
+                    'position: fixed; inset: 0; z-index: 2147483647;';
+                overlay.addEventListener('click', () => {
+                    overlay.remove();
+                    void document.documentElement.requestFullscreen();
+                });
+                document.body.append(overlay);
+            });
+            await app.mainWindow.locator('#e2e-fullscreen-trigger').click();
+
+            const isHtmlFullScreen = () =>
+                app.mainWindow.evaluate(
+                    () => document.fullscreenElement !== null
+                );
+
+            await expect.poll(isHtmlFullScreen, { timeout: 10_000 }).toBe(
+                true
+            );
+            await expect(controls).toHaveClass(/is-hidden/, {
+                timeout: 10_000,
+            });
+
+            await app.mainWindow.evaluate(() => document.exitFullscreen());
+            await expect.poll(isHtmlFullScreen, { timeout: 10_000 }).toBe(
+                false
+            );
+
+            // Regression: the exit push must not carry a stale
+            // isFullScreen=true read mid-transition — the controls have to
+            // come back once fullscreen is left.
+            await expect(controls).not.toHaveClass(/is-hidden/, {
+                timeout: 10_000,
+            });
+            await expect(
+                app.mainWindow.getByTestId('window-minimize')
+            ).toBeVisible();
+        } finally {
+            await closeElectronApp(app);
+        }
+    });
+
     test('@electron minimize button minimizes the window', async ({
         dataDir,
     }) => {
diff --git a/apps/electron-backend/build-embedded-mpv.js b/apps/electron-backend/build-embedded-mpv.js
index eb4b85706..ad7ca63ae 100644
--- a/apps/electron-backend/build-embedded-mpv.js
+++ b/apps/electron-backend/build-embedded-mpv.js
@@ -1,3 +1,4 @@
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
@@ -7,6 +8,28 @@ const {
     patchAddonForBundledRuntime,
     validateNoForbiddenRuntimeLinks,
 } = require('../../tools/packaging/embedded-mpv-packaging.cjs');
+const {
+    removeStaleFrameCopyArtifacts,
+} = require('../../tools/packaging/embedded-mpv-frame-copy-files.cjs');
+const {
+    isLinuxSystemBuildInputManifest,
+    validateLinuxRuntimeManifest,
+    validateLinuxSystemBuildInputManifest,
+} = require('../../tools/embedded-mpv/linux-runtime-manifest.cjs');
+const {
+    SOURCE_ARCHIVE_BINDING_NAME,
+    validateLinuxSourceArchiveBinding,
+} = require('../../tools/embedded-mpv/linux-source-archive-contract.cjs');
+const {
+    resolveLinuxFrameCopyLinkageInputs,
+    resolveVerifiedLinuxLibMpvSoname,
+    runWithCleanup,
+    validateLinuxFrameCopyLinkage,
+} = require('./embedded-mpv-linux-linkage.cjs');
+
+const LINUX_PACKAGE_RUNTIME_MODES = Object.freeze(['system', 'bundled']);
+const LINUX_STAGED_RUNTIME_ORIGIN = 'vendored-lgpl';
+const LINUX_SOURCE_RUNTIME_ORIGIN = 'vendored-lgpl-source-build';
 
 const workspaceRoot = process.cwd();
 const addonRoot = path.join(
@@ -59,6 +82,9 @@ function log(message) {
 function cleanOutput() {
     fs.rmSync(outputFile, { force: true });
     fs.rmSync(outputLibDir, { recursive: true, force: true });
+    // Do not let an optional/skipped rebuild leave frame-copy artifacts that
+    // could make startup treat an incomplete runtime as available.
+    removeStaleFrameCopyArtifacts(outputDir);
     for (const windowsDllName of [
         'mpv-2.dll',
         'libmpv-2.dll',
@@ -103,6 +129,158 @@ function readRuntimeManifest(runtimeRoot) {
     return JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
 }
 
+function readLinuxSourceArchiveBinding(runtimeRoot, errors) {
+    const bindingPath = path.join(runtimeRoot, SOURCE_ARCHIVE_BINDING_NAME);
+    if (!fs.existsSync(bindingPath)) {
+        return null;
+    }
+    let binding;
+    try {
+        const stat = fs.lstatSync(bindingPath);
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error('binding must be a regular file');
+        }
+        binding = JSON.parse(fs.readFileSync(bindingPath, 'utf8'));
+    } catch (error) {
+        errors.push(
+            `source archive binding is invalid: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return null;
+    }
+    errors.push(
+        ...validateLinuxSourceArchiveBinding(binding).map(
+            (error) => `source archive binding is invalid: ${error}`
+        )
+    );
+    return binding;
+}
+
+function validatedLinuxSourceRuntime(runtimeRoot) {
+    const stagedManifest = readRuntimeManifest(runtimeRoot);
+    if (
+        stagedManifest === null ||
+        typeof stagedManifest !== 'object' ||
+        Array.isArray(stagedManifest)
+    ) {
+        throw new Error(
+            `Staged Linux runtime manifest must be an object: ${path.join(
+                runtimeRoot,
+                'runtime-manifest.json'
+            )}`
+        );
+    }
+
+    const envelopeErrors = [];
+    if (stagedManifest.origin !== LINUX_STAGED_RUNTIME_ORIGIN) {
+        envelopeErrors.push(`origin must be "${LINUX_STAGED_RUNTIME_ORIGIN}"`);
+    }
+    if (stagedManifest.platform !== 'linux') {
+        envelopeErrors.push('platform must be "linux"');
+    }
+    if (stagedManifest.arch !== targetArch) {
+        envelopeErrors.push(`arch must be "${targetArch}"`);
+    }
+    if (
+        typeof stagedManifest.stagedAt !== 'string' ||
+        stagedManifest.stagedAt.trim().length === 0
+    ) {
+        envelopeErrors.push('stagedAt must be a non-empty string');
+    }
+    if (!Array.isArray(stagedManifest.runtimeFiles)) {
+        envelopeErrors.push('runtimeFiles must be an array');
+    }
+
+    const systemBuildInputs = isLinuxSystemBuildInputManifest(stagedManifest);
+    let buildInputMode;
+    let sourceArchive = null;
+    let sourceRuntimeManifest;
+    if (systemBuildInputs) {
+        buildInputMode = 'system-build-inputs';
+        sourceRuntimeManifest = {
+            linuxBackend: stagedManifest.linuxBackend,
+            buildInputs: stagedManifest.buildInputs,
+            sourceDistribution: stagedManifest.sourceDistribution,
+        };
+        if (
+            Array.isArray(stagedManifest.runtimeFiles) &&
+            stagedManifest.runtimeFiles.length !== 0
+        ) {
+            envelopeErrors.push(
+                'system build inputs must not declare staged runtime files'
+            );
+        }
+        if (stagedManifest.sourceBuildOrigin !== undefined) {
+            envelopeErrors.push(
+                'system build inputs must not declare sourceBuildOrigin'
+            );
+        }
+    } else {
+        buildInputMode = 'bundled-runtime';
+        sourceArchive = readLinuxSourceArchiveBinding(
+            runtimeRoot,
+            envelopeErrors
+        );
+        const sourceBuildOrigin = stagedManifest.sourceBuildOrigin;
+        const sourceMetadata = { ...stagedManifest };
+        delete sourceMetadata.sourceBuildOrigin;
+        delete sourceMetadata.stagedAt;
+        sourceRuntimeManifest = {
+            ...sourceMetadata,
+            origin: sourceBuildOrigin,
+        };
+        if (sourceBuildOrigin !== LINUX_SOURCE_RUNTIME_ORIGIN) {
+            envelopeErrors.push(
+                `sourceBuildOrigin must be "${LINUX_SOURCE_RUNTIME_ORIGIN}"`
+            );
+        }
+    }
+
+    const sourceManifestErrors =
+        buildInputMode === 'system-build-inputs'
+            ? validateLinuxSystemBuildInputManifest(sourceRuntimeManifest)
+            : validateLinuxRuntimeManifest(sourceRuntimeManifest);
+    const declaredRuntimeFileNames = Array.isArray(
+        sourceRuntimeManifest.runtimeFiles
+    )
+        ? sourceRuntimeManifest.runtimeFiles
+              .map((runtimeFile) => runtimeFile.name)
+              .sort()
+        : [];
+    const stagedRuntimeFileNames = listRuntimeFiles(
+        path.join(runtimeRoot, 'lib'),
+        runtimeFilePredicate
+    )
+        .map((runtimeFile) => path.basename(runtimeFile))
+        .sort();
+    if (
+        JSON.stringify(stagedRuntimeFileNames) !==
+        JSON.stringify(declaredRuntimeFileNames)
+    ) {
+        envelopeErrors.push(
+            'staged lib directory must exactly match manifest runtimeFiles'
+        );
+    }
+
+    const errors = [...envelopeErrors, ...sourceManifestErrors];
+    if (errors.length > 0) {
+        throw new Error(
+            [
+                `Invalid staged Linux runtime at ${runtimeRoot}:`,
+                ...errors.map((error) => `- ${error}`),
+            ].join('\n')
+        );
+    }
+
+    return {
+        buildInputMode,
+        sourceArchive,
+        sourceRuntimeManifest,
+        sourceRuntimeValidated: buildInputMode === 'bundled-runtime',
+    };
+}
+
 function fileExists(filePath) {
     return fs.existsSync(filePath) && fs.statSync(filePath).isFile();
 }
@@ -176,6 +354,23 @@ function findWindowsLibMpv(runtimeRoot) {
     return null;
 }
 
+/* Debian/Ubuntu install linker targets under the multiarch triple dir. The
+ * compiler's built-in search paths cover it for -l resolution either way.
+ * This directory is a link-time input only; the helper runtime intentionally
+ * stays on the sanitized system loader contract. */
+function defaultLinuxSystemLibDir() {
+    const multiarchTriples = {
+        arm: 'arm-linux-gnueabihf',
+        arm64: 'aarch64-linux-gnu',
+        x64: 'x86_64-linux-gnu',
+    };
+    const triple = multiarchTriples[targetArch];
+    if (triple && fs.existsSync(`/usr/lib/${triple}`)) {
+        return `/usr/lib/${triple}`;
+    }
+    return '/usr/lib';
+}
+
 function findLinuxLibMpv(libDir) {
     for (const candidate of ['libmpv.so.2', 'libmpv.so.1', 'libmpv.so']) {
         const candidatePath = path.join(libDir, candidate);
@@ -188,15 +383,19 @@ function findLinuxLibMpv(libDir) {
 }
 
 function resolveRuntime() {
+    const vendoredHeader = path.join(vendoredIncludeDir, 'mpv', 'client.h');
+    const stagedLinuxRuntime =
+        targetPlatform === 'linux' && fs.existsSync(vendoredHeader)
+            ? validatedLinuxSourceRuntime(vendoredRuntimeRoot)
+            : null;
     const vendoredLibMpv =
         targetPlatform === 'darwin'
             ? findLibMpv(vendoredLibDir)
             : targetPlatform === 'win32'
               ? findWindowsLibMpv(vendoredRuntimeRoot)
               : targetPlatform === 'linux'
-                ? true
+                ? stagedLinuxRuntime
                 : null;
-    const vendoredHeader = path.join(vendoredIncludeDir, 'mpv', 'client.h');
 
     if (vendoredLibMpv && fs.existsSync(vendoredHeader)) {
         const windowsImportLib =
@@ -214,9 +413,39 @@ function resolveRuntime() {
             binDir: vendoredBinDir,
             manifest: readRuntimeManifest(vendoredRuntimeRoot),
             windowsImportLib,
+            ...(stagedLinuxRuntime ?? {}),
         };
     }
 
+    if (targetPlatform === 'linux') {
+        // Dev-first Linux flow (frame-copy helper links system libmpv): a
+        // distro libmpv-dev install is a full runtime — no staging needed.
+        // LIBMPV_INCLUDE_DIR overrides the header path.
+        // LINUX_NATIVE_LIBRARY_DIR overrides the link-time library directory,
+        // which must already be visible to the system dynamic loader.
+        const systemIncludeDir =
+            process.env.LIBMPV_INCLUDE_DIR || '/usr/include';
+        if (fs.existsSync(path.join(systemIncludeDir, 'mpv', 'client.h'))) {
+            const sourceRuntimeManifest = {
+                linuxBackend: 'process-isolated mpv --wid',
+                warning: 'Development-only unmanaged system libmpv toolchain.',
+            };
+            return {
+                origin: 'system-dev',
+                includeDir: systemIncludeDir,
+                libDir:
+                    process.env.LINUX_NATIVE_LIBRARY_DIR ||
+                    defaultLinuxSystemLibDir(),
+                binDir: undefined,
+                manifest: sourceRuntimeManifest,
+                buildInputMode: 'system-dev',
+                sourceRuntimeManifest,
+                sourceRuntimeValidated: false,
+                windowsImportLib: null,
+            };
+        }
+    }
+
     if (targetPlatform === 'darwin' && homebrewFallbackEnabled) {
         const homebrewLibMpv = findLibMpv(homebrewLibDir);
         const homebrewHeader = path.join(homebrewIncludeDir, 'mpv', 'client.h');
@@ -241,19 +470,141 @@ function resolveRuntime() {
     return null;
 }
 
-function writeLinuxProcessRuntimeManifest(runtime) {
+function hasStagedLinuxLibMpvLinkerInput(runtime) {
+    return (
+        Array.isArray(runtime.sourceRuntimeManifest?.runtimeFiles) &&
+        runtime.sourceRuntimeManifest.runtimeFiles.some(
+            (runtimeFile) => runtimeFile.name === 'libmpv.so'
+        )
+    );
+}
+
+function assertRequiredLinuxFrameCopyRuntime(runtime) {
+    if (targetPlatform !== 'linux' || !embeddedMpvRequired) {
+        return;
+    }
+
+    if (
+        runtime.buildInputMode !== 'bundled-runtime' ||
+        runtime.sourceRuntimeValidated !== true ||
+        !runtime.sourceArchive ||
+        !hasStagedLinuxLibMpvLinkerInput(runtime)
+    ) {
+        cleanOutput();
+        throw new Error(
+            'Required Linux builds must use the validated bundled source runtime containing staged libmpv.'
+        );
+    }
+}
+
+function copyLinuxRuntimeClosureToNativeBuild(runtime) {
     fs.rmSync(outputLibDir, { recursive: true, force: true });
 
+    const declaredRuntimeFiles =
+        runtime.buildInputMode === 'bundled-runtime'
+            ? runtime.sourceRuntimeManifest.runtimeFiles
+            : [];
+    if (declaredRuntimeFiles.length === 0) {
+        return [];
+    }
+
+    fs.mkdirSync(outputLibDir, { recursive: true });
+    const copiedRuntimeFiles = [];
+    for (const runtimeFile of declaredRuntimeFiles) {
+        const sourcePath = path.join(runtime.libDir, runtimeFile.name);
+        let descriptor;
+        try {
+            descriptor = fs.openSync(
+                sourcePath,
+                fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW
+            );
+            const stat = fs.fstatSync(descriptor);
+            if (!stat.isFile()) {
+                throw new Error(
+                    `Staged Linux runtime path is not a regular file: ${sourcePath}`
+                );
+            }
+
+            const contents = fs.readFileSync(descriptor);
+            if (contents.byteLength !== runtimeFile.size) {
+                throw new Error(
+                    `Size mismatch for staged Linux runtime file ${runtimeFile.name}: expected ${runtimeFile.size}, received ${contents.byteLength}.`
+                );
+            }
+            const actualSha256 = crypto
+                .createHash('sha256')
+                .update(contents)
+                .digest('hex');
+            if (actualSha256 !== runtimeFile.sha256) {
+                throw new Error(
+                    `SHA-256 mismatch for staged Linux runtime file ${runtimeFile.name}: expected ${runtimeFile.sha256}, received ${actualSha256}.`
+                );
+            }
+
+            const destinationPath = path.join(outputLibDir, runtimeFile.name);
+            fs.writeFileSync(destinationPath, contents, { mode: 0o755 });
+            copiedRuntimeFiles.push({ ...runtimeFile });
+        } finally {
+            if (descriptor !== undefined) {
+                fs.closeSync(descriptor);
+            }
+        }
+    }
+
+    return copiedRuntimeFiles;
+}
+
+function writeLinuxFrameCopyBuildManifest(runtime) {
+    const copiedRuntimeFiles = copyLinuxRuntimeClosureToNativeBuild(runtime);
+    const libmpvSoname =
+        runtime.sourceRuntimeValidated === true &&
+        runtime.buildInputMode === 'bundled-runtime' &&
+        copiedRuntimeFiles.length > 0
+            ? resolveVerifiedLinuxLibMpvSoname({
+                  outputLibDir,
+                  runtimeFiles: copiedRuntimeFiles,
+                  runtimeDependencyClosure:
+                      runtime.sourceRuntimeManifest.runtimeDependencyClosure,
+                  readDynamicSection: readLinuxDynamicSection,
+              })
+            : null;
+    const packageRuntimeAvailable =
+        runtime.sourceRuntimeValidated === true &&
+        runtime.buildInputMode === 'bundled-runtime' &&
+        copiedRuntimeFiles.length > 0 &&
+        libmpvSoname !== null;
     const manifest = {
-        ...runtime.manifest,
-        origin: 'external-mpv-process',
+        schemaVersion: 1,
+        origin: 'linux-frame-copy-build',
         generatedAt: new Date().toISOString(),
-        runtimeFiles: [],
-        linuxBackend:
-            runtime.manifest.linuxBackend ?? 'process-isolated mpv --wid',
-        mpvExecutable: 'mpv',
         platform: targetPlatform,
-        targetArch,
+        arch: targetArch,
+        buildInputMode: runtime.buildInputMode,
+        sourceRuntimeValidated: runtime.sourceRuntimeValidated,
+        allowedPackageRuntimeModes: [...LINUX_PACKAGE_RUNTIME_MODES],
+        packageRuntimeAvailability: {
+            system: packageRuntimeAvailable,
+            bundled: packageRuntimeAvailable,
+        },
+        artifacts: {
+            addon: 'embedded_mpv.node',
+            frameReader: 'embedded_mpv_frame_reader.node',
+            helper: 'iptvnator_mpv_helper',
+        },
+        processIsolation: {
+            addonLoadsLibmpv: false,
+            helperLinksLibmpv: true,
+            helperRunpath: ['$ORIGIN/lib'],
+        },
+        nativeViewFallback: 'process-isolated mpv --wid',
+        libmpvSoname,
+        runtimeFiles: copiedRuntimeFiles,
+        runtimeTotalBytes: copiedRuntimeFiles.reduce(
+            (total, runtimeFile) => total + runtimeFile.size,
+            0
+        ),
+        sourceArchive: runtime.sourceArchive ?? null,
+        sourceRuntime: runtime.sourceRuntimeManifest,
     };
 
     fs.writeFileSync(
@@ -326,44 +677,23 @@ function copyGenericRuntimeToNativeBuild(runtime) {
     return manifest;
 }
 
-function resolveElectronNodeGypBin() {
-    const pnpmRoot = path.join(workspaceRoot, 'node_modules', '.pnpm');
-
-    if (!fs.existsSync(pnpmRoot)) {
-        throw new Error('Unable to find node_modules/.pnpm.');
-    }
-
-    const packageDirs = fs
-        .readdirSync(pnpmRoot, { withFileTypes: true })
-        .filter(
-            (entry) =>
-                entry.isDirectory() &&
-                entry.name.startsWith('@electron+node-gyp@')
-        )
-        .map((entry) => entry.name)
-        .sort();
-
-    for (const packageDir of packageDirs) {
-        const candidate = path.join(
-            pnpmRoot,
-            packageDir,
-            'node_modules',
-            '@electron',
-            'node-gyp',
-            'bin',
-            'node-gyp.js'
+// Upstream node-gyp, resolved as a declared devDependency. This used to scan
+// node_modules/.pnpm for the `@electron/node-gyp` fork, which was only ever in
+// the tree as a transitive of `@electron/rebuild` 3 — rebuild 4 moved to
+// upstream `node-gyp` and the scan started throwing. The Electron target is
+// selected through the npm_config_* env below, not by the binary.
+function resolveNodeGypBin() {
+    try {
+        return require.resolve('node-gyp/bin/node-gyp.js');
+    } catch (error) {
+        throw new Error(
+            `Unable to resolve node-gyp. Is it installed? (${error.message})`
         );
-
-        if (fs.existsSync(candidate)) {
-            return candidate;
-        }
     }
-
-    throw new Error('Unable to resolve @electron/node-gyp.');
 }
 
 function runNodeGyp(command, env) {
-    const nodeGypBin = resolveElectronNodeGypBin();
+    const nodeGypBin = resolveNodeGypBin();
     const result = spawnSync(
         process.execPath,
         [nodeGypBin, command, '--directory', addonRoot],
@@ -381,12 +711,33 @@ function runNodeGyp(command, env) {
     }
 }
 
+function readLinuxDynamicSection(filePath) {
+    const result = spawnSync('readelf', ['-d', filePath], {
+        cwd: workspaceRoot,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    if (result.error) {
+        throw new Error(
+            `Unable to run readelf for ${filePath}: ${result.error.message}`
+        );
+    }
+    if (result.status !== 0) {
+        throw new Error(
+            `readelf -d failed for ${filePath} with status ${
+                result.status ?? 1
+            }: ${(result.stderr ?? '').trim()}`
+        );
+    }
+    return result.stdout;
+}
+
 function main() {
     fs.mkdirSync(outputDir, { recursive: true });
     cleanDistNativeOutput();
+    cleanOutput();
 
     if (targetPlatform !== process.platform) {
-        cleanOutput();
         if (embeddedMpvRequired) {
             throw new Error(
                 `Embedded MPV is required for ${targetPlatform}-${targetArch}, but this host is ${process.platform}-${process.arch}.`
@@ -418,73 +769,128 @@ function main() {
         return;
     }
 
-    const runtimeManifest =
-        targetPlatform === 'darwin'
-            ? copyRuntimeToNativeBuild({
-                  runtimeLibDir: runtime.libDir,
-                  outputLibDir,
-                  runtimeOrigin: runtime.origin,
-                  runtimeManifest: {
-                      targetArch,
-                      ...runtime.manifest,
-                  },
-              })
-            : targetPlatform === 'linux'
-              ? writeLinuxProcessRuntimeManifest(runtime)
-              : copyGenericRuntimeToNativeBuild(runtime);
-    fs.rmSync(unavailableMarkerFile, { force: true });
+    assertRequiredLinuxFrameCopyRuntime(runtime);
 
-    const electronPackageJson = require(
-        path.join(workspaceRoot, 'node_modules', 'electron', 'package.json')
-    );
-    const electronVersion = electronPackageJson.version;
-    const env = {
-        ...process.env,
-        npm_config_runtime: 'electron',
-        npm_config_target: electronVersion,
-        npm_config_arch: targetArch,
-        npm_config_disturl: 'https://electronjs.org/headers',
-        npm_config_build_from_source: 'true',
-        npm_config_update_binary: 'false',
-        LIBMPV_INCLUDE_DIR: runtime.includeDir,
-        ...(targetPlatform === 'linux'
-            ? { LINUX_NATIVE_LIBRARY_DIR: runtime.libDir }
-            : { LIBMPV_LIBRARY_DIR: outputLibDir }),
-        ...(runtime.windowsImportLib
-            ? {
-                  LIBMPV_IMPORT_LIB: path.join(
+    const buildNativeArtifacts = () => {
+        const runtimeManifest =
+            targetPlatform === 'darwin'
+                ? copyRuntimeToNativeBuild({
+                      runtimeLibDir: runtime.libDir,
                       outputLibDir,
-                      path.basename(runtime.windowsImportLib)
-                  ),
-              }
-            : {}),
+                      runtimeOrigin: runtime.origin,
+                      runtimeManifest: {
+                          targetArch,
+                          ...runtime.manifest,
+                      },
+                  })
+                : targetPlatform === 'linux'
+                  ? writeLinuxFrameCopyBuildManifest(runtime)
+                  : copyGenericRuntimeToNativeBuild(runtime);
+        const linuxLinkageInputs =
+            targetPlatform === 'linux'
+                ? resolveLinuxFrameCopyLinkageInputs({
+                      buildInputMode: runtime.buildInputMode,
+                      outputLibDir,
+                      packagedLibmpvSoname: runtimeManifest.libmpvSoname,
+                      readDynamicSection: readLinuxDynamicSection,
+                      runtimeLibDir: runtime.libDir,
+                  })
+                : null;
+
+        const electronPackageJson = require(
+            path.join(workspaceRoot, 'node_modules', 'electron', 'package.json')
+        );
+        const electronVersion = electronPackageJson.version;
+        const env = {
+            ...process.env,
+            npm_config_runtime: 'electron',
+            npm_config_target: electronVersion,
+            npm_config_arch: targetArch,
+            npm_config_disturl: 'https://electronjs.org/headers',
+            npm_config_build_from_source: 'true',
+            npm_config_update_binary: 'false',
+            LIBMPV_INCLUDE_DIR: runtime.includeDir,
+            ...(targetPlatform === 'linux'
+                ? {
+                      LINUX_VERIFIED_RUNTIME_LIBRARY_DIR:
+                          linuxLinkageInputs.linkerLibraryDir,
+                  }
+                : { LIBMPV_LIBRARY_DIR: outputLibDir }),
+            ...(runtime.windowsImportLib
+                ? {
+                      LIBMPV_IMPORT_LIB: path.join(
+                          outputLibDir,
+                          path.basename(runtime.windowsImportLib)
+                      ),
+                  }
+                : {}),
+        };
+
+        log(
+            `Building native addon against Electron ${electronVersion} using ${runtime.origin} runtime for ${targetPlatform}-${targetArch}...`
+        );
+        cleanNativeBuildIntermediates();
+        runNodeGyp('configure', env);
+        runNodeGyp('build', env);
+
+        if (!fs.existsSync(outputFile)) {
+            throw new Error(`Build finished without producing ${outputFile}.`);
+        }
+
+        if (targetPlatform === 'linux') {
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: linuxLinkageInputs.expectedLibmpvSoname,
+                outputDir,
+                readDynamicSection: readLinuxDynamicSection,
+            });
+        }
+
+        if (targetPlatform === 'darwin') {
+            patchAddonForBundledRuntime(outputFile, outputLibDir);
+            // The frame-copy helper executable links libmpv too and sits next
+            // to the same lib/ directory, so it gets the identical
+            // dependency-path rewrite + ad-hoc re-sign.
+            const frameHelperFile = path.join(
+                outputDir,
+                'iptvnator_mpv_helper'
+            );
+            if (fs.existsSync(frameHelperFile)) {
+                patchAddonForBundledRuntime(frameHelperFile, outputLibDir);
+            }
+            const forbiddenLinkErrors = validateNoForbiddenRuntimeLinks([
+                outputFile,
+                ...(fs.existsSync(frameHelperFile) ? [frameHelperFile] : []),
+                ...runtimeManifest.dylibs.map((dylib) =>
+                    path.join(outputLibDir, dylib)
+                ),
+            ]);
+            if (
+                runtime.origin === 'vendored-lgpl' &&
+                forbiddenLinkErrors.length > 0
+            ) {
+                throw new Error(forbiddenLinkErrors.join('\n'));
+            }
+        }
+
+        fs.rmSync(unavailableMarkerFile, { force: true });
     };
 
-    log(
-        `Building native addon against Electron ${electronVersion} using ${runtime.origin} runtime for ${targetPlatform}-${targetArch}...`
-    );
-    cleanNativeBuildIntermediates();
-    runNodeGyp('configure', env);
-    runNodeGyp('build', env);
-
-    if (!fs.existsSync(outputFile)) {
-        throw new Error(`Build finished without producing ${outputFile}.`);
-    }
-
-    if (targetPlatform === 'darwin') {
-        patchAddonForBundledRuntime(outputFile, outputLibDir);
-        const forbiddenLinkErrors = validateNoForbiddenRuntimeLinks([
-            outputFile,
-            ...runtimeManifest.dylibs.map((dylib) =>
-                path.join(outputLibDir, dylib)
-            ),
-        ]);
-        if (
-            runtime.origin === 'vendored-lgpl' &&
-            forbiddenLinkErrors.length > 0
-        ) {
-            throw new Error(forbiddenLinkErrors.join('\n'));
+    try {
+        runWithCleanup(buildNativeArtifacts, cleanOutput);
+    } catch (error) {
+        if (!embeddedMpvRequired && runtime.origin === 'system-dev') {
+            // The system-dev fallback triggers on any machine with
+            // libmpv-dev installed; keep the old graceful-skip contract
+            // when the rest of the toolchain (EGL/GL/gbm dev packages) is
+            // missing instead of failing the whole electron build.
+            log(
+                `Embedded MPV native build failed with the system-dev toolchain; continuing without embedded MPV. ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+            return;
         }
+        throw error;
     }
 
     log(`Built ${path.relative(workspaceRoot, outputFile)}.`);
diff --git a/apps/electron-backend/build-worker.js b/apps/electron-backend/build-worker.js
index a80817272..649391365 100644
--- a/apps/electron-backend/build-worker.js
+++ b/apps/electron-backend/build-worker.js
@@ -18,6 +18,12 @@ const nativeModules = [
 ];
 
 const isProduction = process.env.NODE_ENV === 'production';
+const isPerformance = process.argv.includes('--performance');
+const buildMode = isPerformance
+    ? 'performance'
+    : isProduction
+      ? 'production'
+      : 'development';
 
 async function buildWorker() {
     try {
@@ -59,7 +65,7 @@ async function buildWorker() {
 
         for (const worker of workers) {
             console.log(
-                `Building ${worker.label} with esbuild (${isProduction ? 'production' : 'development'})...`
+                `Building ${worker.label} with esbuild (${buildMode})...`
             );
 
             await esbuild.build({
@@ -74,8 +80,8 @@ async function buildWorker() {
                     ...nodeBuiltins,
                     ...nativeModules,
                 ],
-                sourcemap: !isProduction,
-                minify: isProduction,
+                sourcemap: isPerformance || !isProduction,
+                minify: isProduction || isPerformance,
                 alias: {
                     '@iptvnator/shared/interfaces': path.join(
                         __dirname,
diff --git a/apps/electron-backend/embedded-mpv-linux-linkage.cjs b/apps/electron-backend/embedded-mpv-linux-linkage.cjs
new file mode 100644
index 000000000..3cfa0b197
--- /dev/null
+++ b/apps/electron-backend/embedded-mpv-linux-linkage.cjs
@@ -0,0 +1,340 @@
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const VERSIONED_LIBMPV_PATTERN = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+const LIBMPV_NEEDED_PATTERN = /^libmpv\.so(?:\..*)?$/;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+
+const LINUX_FRAME_COPY_ARTIFACTS = Object.freeze([
+    Object.freeze({
+        fileName: 'embedded_mpv.node',
+        label: 'embedded MPV addon',
+        mayLinkLibmpv: false,
+    }),
+    Object.freeze({
+        fileName: 'embedded_mpv_frame_reader.node',
+        label: 'embedded MPV frame reader',
+        mayLinkLibmpv: false,
+    }),
+    Object.freeze({
+        fileName: 'iptvnator_mpv_helper',
+        label: 'embedded MPV frame-copy helper',
+        mayLinkLibmpv: true,
+    }),
+]);
+
+function parseReadelfDynamic(output) {
+    if (typeof output !== 'string') {
+        throw new TypeError('readelf dynamic output must be a string.');
+    }
+
+    const dynamic = {
+        needed: [],
+        rpath: [],
+        runpath: [],
+        soname: [],
+    };
+    const dynamicEntryPattern =
+        /\((NEEDED|RPATH|RUNPATH|SONAME)\)[^[]*\[([^\]]*)\]/g;
+    for (const [, tag, value] of output.matchAll(dynamicEntryPattern)) {
+        if (tag === 'NEEDED') {
+            dynamic.needed.push(value);
+            continue;
+        }
+        if (tag === 'SONAME') {
+            dynamic.soname.push(value);
+            continue;
+        }
+        dynamic[tag.toLowerCase()].push(
+            ...value.split(':').filter((entry) => entry.length > 0)
+        );
+    }
+
+    return dynamic;
+}
+
+function exactlyOneRuntimeFile(runtimeFiles, name) {
+    if (!Array.isArray(runtimeFiles)) {
+        throw new Error('Linux runtimeFiles metadata must be an array.');
+    }
+    const matchingRecords = runtimeFiles.filter(
+        (runtimeFile) => runtimeFile?.name === name
+    );
+    if (matchingRecords.length !== 1) {
+        throw new Error(
+            `Linux runtime must contain exactly one exact runtimeFiles record for ${name}.`
+        );
+    }
+
+    const [runtimeFile] = matchingRecords;
+    if (
+        !Number.isInteger(runtimeFile.size) ||
+        runtimeFile.size <= 0 ||
+        typeof runtimeFile.sha256 !== 'string' ||
+        !SHA256_PATTERN.test(runtimeFile.sha256)
+    ) {
+        throw new Error(
+            `Linux runtimeFiles record for ${name} has invalid size or SHA-256 metadata.`
+        );
+    }
+    return runtimeFile;
+}
+
+function readVerifiedRuntimeFile(filePath, runtimeFile) {
+    let stat;
+    try {
+        stat = fs.lstatSync(filePath);
+    } catch {
+        throw new Error(`Missing copied Linux runtime file: ${filePath}`);
+    }
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        throw new Error(
+            `Copied Linux runtime file must be a regular non-symbolic-link file: ${filePath}`
+        );
+    }
+
+    let descriptor;
+    try {
+        descriptor = fs.openSync(
+            filePath,
+            fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW ?? 0)
+        );
+        const descriptorStat = fs.fstatSync(descriptor);
+        if (!descriptorStat.isFile()) {
+            throw new Error(
+                `Copied Linux runtime path is not a regular file: ${filePath}`
+            );
+        }
+        const contents = fs.readFileSync(descriptor);
+        if (contents.byteLength !== runtimeFile.size) {
+            throw new Error(
+                `Size mismatch for copied Linux runtime file ${runtimeFile.name}: expected ${runtimeFile.size}, received ${contents.byteLength}.`
+            );
+        }
+        const actualSha256 = crypto
+            .createHash('sha256')
+            .update(contents)
+            .digest('hex');
+        if (actualSha256 !== runtimeFile.sha256) {
+            throw new Error(
+                `SHA-256 mismatch for copied Linux runtime file ${runtimeFile.name}: expected ${runtimeFile.sha256}, received ${actualSha256}.`
+            );
+        }
+    } finally {
+        if (descriptor !== undefined) {
+            fs.closeSync(descriptor);
+        }
+    }
+}
+
+function closureLibMpvSoname(runtimeDependencyClosure) {
+    if (!Array.isArray(runtimeDependencyClosure?.entries)) {
+        throw new Error(
+            'Validated Linux runtime dependency closure entries are required.'
+        );
+    }
+
+    const libMpvEntries = runtimeDependencyClosure.entries.filter(
+        (entry) =>
+            entry?.name === 'libmpv.so' ||
+            VERSIONED_LIBMPV_PATTERN.test(entry?.name)
+    );
+    const declaredSonames = libMpvEntries.map((entry) => entry.soname);
+    const uniqueSonames = new Set(declaredSonames);
+    if (
+        declaredSonames.length === 0 ||
+        declaredSonames.some(
+            (soname) =>
+                typeof soname !== 'string' ||
+                !VERSIONED_LIBMPV_PATTERN.test(soname)
+        ) ||
+        uniqueSonames.size !== 1
+    ) {
+        throw new Error(
+            'Validated Linux runtime closure must declare exactly one versioned libmpv SONAME.'
+        );
+    }
+
+    return declaredSonames[0];
+}
+
+function resolveVerifiedLinuxLibMpvSoname({
+    outputLibDir,
+    runtimeFiles,
+    runtimeDependencyClosure,
+    readDynamicSection,
+}) {
+    if (typeof readDynamicSection !== 'function') {
+        throw new TypeError('Linux readelf dynamic reader is required.');
+    }
+
+    const expectedSoname = closureLibMpvSoname(runtimeDependencyClosure);
+    const linkerInputRecord = exactlyOneRuntimeFile(runtimeFiles, 'libmpv.so');
+    const exactSonameRecord = exactlyOneRuntimeFile(
+        runtimeFiles,
+        expectedSoname
+    );
+    const linkerInputPath = path.join(outputLibDir, 'libmpv.so');
+    const exactSonamePath = path.join(outputLibDir, expectedSoname);
+
+    readVerifiedRuntimeFile(linkerInputPath, linkerInputRecord);
+    readVerifiedRuntimeFile(exactSonamePath, exactSonameRecord);
+
+    const dynamic = parseReadelfDynamic(readDynamicSection(linkerInputPath));
+    if (
+        dynamic.soname.length !== 1 ||
+        !VERSIONED_LIBMPV_PATTERN.test(dynamic.soname[0])
+    ) {
+        throw new Error(
+            'Copied Linux libmpv.so must contain exactly one DT_SONAME with a versioned libmpv basename.'
+        );
+    }
+    if (dynamic.soname[0] !== expectedSoname) {
+        throw new Error(
+            `Copied Linux libmpv.so DT_SONAME ${dynamic.soname[0]} does not match validated closure SONAME ${expectedSoname}.`
+        );
+    }
+
+    return expectedSoname;
+}
+
+function resolveLinuxFrameCopyLinkageInputs({
+    buildInputMode,
+    outputLibDir,
+    packagedLibmpvSoname,
+    readDynamicSection,
+    runtimeLibDir,
+}) {
+    const systemDevelopment = buildInputMode === 'system-dev';
+    const linkerLibraryDir = systemDevelopment ? runtimeLibDir : outputLibDir;
+    if (
+        typeof linkerLibraryDir !== 'string' ||
+        linkerLibraryDir.trim().length === 0
+    ) {
+        throw new Error(
+            'Linux frame-copy linkage requires a non-empty linker library directory.'
+        );
+    }
+
+    if (!systemDevelopment) {
+        return {
+            expectedLibmpvSoname: packagedLibmpvSoname,
+            linkerLibraryDir,
+        };
+    }
+    if (typeof readDynamicSection !== 'function') {
+        throw new TypeError('Linux readelf dynamic reader is required.');
+    }
+
+    const linkerInputPath = path.join(linkerLibraryDir, 'libmpv.so');
+    const dynamic = parseReadelfDynamic(readDynamicSection(linkerInputPath));
+    if (
+        dynamic.soname.length !== 1 ||
+        !VERSIONED_LIBMPV_PATTERN.test(dynamic.soname[0])
+    ) {
+        throw new Error(
+            'The system-development libmpv linker input must contain exactly one versioned libmpv SONAME.'
+        );
+    }
+
+    return {
+        expectedLibmpvSoname: dynamic.soname[0],
+        linkerLibraryDir,
+    };
+}
+
+function assertRegularArtifact(filePath, label) {
+    let stat;
+    try {
+        stat = fs.lstatSync(filePath);
+    } catch {
+        throw new Error(`Missing ${label}: ${filePath}`);
+    }
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        throw new Error(
+            `${label} must be a regular non-symbolic-link file: ${filePath}`
+        );
+    }
+}
+
+function validateLinuxFrameCopyLinkage({
+    expectedLibmpvSoname,
+    outputDir,
+    readDynamicSection,
+}) {
+    if (
+        typeof expectedLibmpvSoname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(expectedLibmpvSoname)
+    ) {
+        throw new Error(
+            'Linux frame-copy linkage validation requires an exact versioned libmpv SONAME.'
+        );
+    }
+    if (typeof readDynamicSection !== 'function') {
+        throw new TypeError('Linux readelf dynamic reader is required.');
+    }
+
+    for (const artifact of LINUX_FRAME_COPY_ARTIFACTS) {
+        const artifactPath = path.join(outputDir, artifact.fileName);
+        assertRegularArtifact(artifactPath, artifact.label);
+        const dynamic = parseReadelfDynamic(readDynamicSection(artifactPath));
+        const libMpvDependencies = dynamic.needed.filter((dependency) =>
+            LIBMPV_NEEDED_PATTERN.test(dependency)
+        );
+
+        if (!artifact.mayLinkLibmpv) {
+            if (libMpvDependencies.length > 0) {
+                throw new Error(
+                    `${artifact.label} must not have a direct libmpv DT_NEEDED entry; found ${libMpvDependencies.join(', ')}.`
+                );
+            }
+            continue;
+        }
+
+        if (
+            libMpvDependencies.length !== 1 ||
+            libMpvDependencies[0] !== expectedLibmpvSoname
+        ) {
+            throw new Error(
+                `${artifact.label} DT_NEEDED must contain exactly ${expectedLibmpvSoname}; found ${
+                    libMpvDependencies.join(', ') || '<none>'
+                }.`
+            );
+        }
+        if (dynamic.rpath.length !== 0) {
+            throw new Error(
+                `${artifact.label} must not contain RPATH; found ${dynamic.rpath.join(':')}.`
+            );
+        }
+        if (
+            dynamic.runpath.length !== 1 ||
+            dynamic.runpath[0] !== '$ORIGIN/lib'
+        ) {
+            throw new Error(
+                `${artifact.label} RUNPATH must be exactly $ORIGIN/lib; found ${
+                    dynamic.runpath.join(':') || '<none>'
+                }.`
+            );
+        }
+    }
+}
+
+function runWithCleanup(operation, cleanup) {
+    try {
+        return operation();
+    } catch (error) {
+        cleanup();
+        throw error;
+    }
+}
+
+module.exports = {
+    parseReadelfDynamic,
+    resolveLinuxFrameCopyLinkageInputs,
+    resolveVerifiedLinuxLibMpvSoname,
+    runWithCleanup,
+    validateLinuxFrameCopyLinkage,
+};
diff --git a/apps/electron-backend/native/binding.gyp b/apps/electron-backend/native/binding.gyp
index 7e18d2fca..fa8bd4b2c 100644
--- a/apps/electron-backend/native/binding.gyp
+++ b/apps/electron-backend/native/binding.gyp
@@ -75,6 +75,131 @@
           }
         ]
       ]
+    },
+    {
+      "target_name": "embedded_mpv_frame_reader",
+      "sources": [
+        "src/embedded_mpv_frame_reader.c"
+      ],
+      "include_dirs": [
+        "helper"
+      ],
+      "conditions": [
+        [
+          "OS==\"win\"",
+          {
+            "defines": [
+              "WIN32_LEAN_AND_MEAN",
+              "NOMINMAX"
+            ],
+            "msvs_settings": {
+              "VCCLCompilerTool": {
+                "CompileAs": 2,
+                "ExceptionHandling": 1
+              }
+            }
+          }
+        ]
+      ]
+    },
+    {
+      "target_name": "iptvnator_mpv_helper",
+      "type": "none",
+      "conditions": [
+        [
+          "OS==\"mac\"",
+          {
+            "type": "executable",
+            "sources": [
+              "helper/mpv_frame_helper.cpp"
+            ],
+            "include_dirs": [
+              "<!(node -p \"process.env.LIBMPV_INCLUDE_DIR || '/opt/homebrew/include'\")",
+              "helper"
+            ],
+            "cflags_cc": [
+              "-std=c++17"
+            ],
+            "xcode_settings": {
+              "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
+              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+              "MACOSX_DEPLOYMENT_TARGET": "11.0",
+              "OTHER_LDFLAGS": [
+                "-Wl,-rpath,@executable_path/lib",
+                "-Wl,-rpath,@loader_path/lib"
+              ]
+            },
+            "libraries": [
+              "-framework OpenGL",
+              "<!(node -e \"const path = require('path'); const dir = process.env.LIBMPV_LIBRARY_DIR || '/opt/homebrew/lib'; process.stdout.write(path.join(dir, 'libmpv.2.dylib'))\")"
+            ]
+          }
+        ],
+        [
+          "OS==\"linux\"",
+          {
+            "type": "executable",
+            "sources": [
+              "helper/mpv_frame_helper.cpp"
+            ],
+            "include_dirs": [
+              "<!(node -p \"process.env.LIBMPV_INCLUDE_DIR || '/usr/include'\")",
+              "helper"
+            ],
+            "cflags_cc!": [
+              "-fno-exceptions"
+            ],
+            "cflags_cc": [
+              "-std=c++17",
+              "-fexceptions"
+            ],
+            "cflags": [
+              "-pthread"
+            ],
+            "ldflags": [
+              "-pthread",
+              "-Wl,--enable-new-dtags",
+              "-Wl,-rpath,'$$ORIGIN/lib'"
+            ],
+            "libraries": [
+              "-L<!(node -e \"const dir = process.env.LINUX_VERIFIED_RUNTIME_LIBRARY_DIR; if (!dir) { throw new Error('Missing LINUX_VERIFIED_RUNTIME_LIBRARY_DIR'); } process.stdout.write(dir)\")",
+              "<!(node -e \"const path = require('path'); const dir = process.env.LINUX_VERIFIED_RUNTIME_LIBRARY_DIR; if (!dir) { throw new Error('Missing LINUX_VERIFIED_RUNTIME_LIBRARY_DIR'); } process.stdout.write(path.join(dir, 'libmpv.so'))\")",
+              "-lEGL",
+              "-lGL",
+              "-lgbm",
+              "-ldl"
+            ]
+          }
+        ],
+        [
+          "OS==\"win\"",
+          {
+            "type": "executable",
+            "sources": [
+              "helper/mpv_frame_helper.cpp"
+            ],
+            "include_dirs": [
+              "<!(node -p \"(process.env.LIBMPV_INCLUDE_DIR || process.cwd()).replace(/\\\\\\\\/g, '/')\")",
+              "helper"
+            ],
+            "defines": [
+              "WIN32_LEAN_AND_MEAN",
+              "NOMINMAX"
+            ],
+            "msvs_settings": {
+              "VCCLCompilerTool": {
+                "ExceptionHandling": 1
+              }
+            },
+            "libraries": [
+              "<!(node -e \"const path = require('path'); const dir = process.env.LIBMPV_LIBRARY_DIR || process.cwd(); const lib = process.env.LIBMPV_IMPORT_LIB || path.join(dir, 'mpv.lib'); process.stdout.write(lib.replace(/\\\\\\\\/g, '/'))\")",
+              "opengl32.lib",
+              "gdi32.lib",
+              "user32.lib"
+            ]
+          }
+        ]
+      ]
     }
   ]
 }
diff --git a/apps/electron-backend/native/helper/frame_helper_gl.h b/apps/electron-backend/native/helper/frame_helper_gl.h
new file mode 100644
index 000000000..a0eec7098
--- /dev/null
+++ b/apps/electron-backend/native/helper/frame_helper_gl.h
@@ -0,0 +1,798 @@
+/*
+ * Headless GL context for the frame-copy helper, one implementation per
+ * platform behind the same tiny GlContext surface.
+ *
+ * macOS: accelerated CGL 3.2 core context; GL entry points for mpv come
+ * from the OpenGL framework via dlsym.
+ *
+ * Linux: EGL display candidates are fully probed in order — Mesa's
+ * surfaceless platform (no display server needed), the session's default
+ * display, then a GBM render node. The first hardware renderer wins; an
+ * earlier software renderer is recreated only if no hardware tier works.
+ * Each tier uses a desktop-GL 3.2 core context bound surfaceless (1x1 pbuffer
+ * fallback for drivers without EGL_KHR_surfaceless_context). The helper's
+ * own GL calls resolve at link time through libGL (glvnd); mpv resolves
+ * core symbols from that linked library and falls back to eglGetProcAddress
+ * for extensions.
+ *
+ * Windows: WGL against a hidden 1x1 window (never shown, never pumped —
+ * offscreen FBO rendering only, no SwapBuffers). A legacy context
+ * bootstraps wglCreateContextAttribsARB for a 3.2 core context. opengl32
+ * only exports GL 1.1, so the post-1.1 entry points the render pipeline
+ * needs are declared here as same-named function pointers and resolved via
+ * wglGetProcAddress; mpv resolves its own through the same loader.
+ *
+ * Threading contract: create() runs on the main thread and must leave the
+ * context unbound; the render thread calls makeCurrent() once and owns the
+ * context until destroy().
+ */
+#pragma once
+
+#include <string>
+
+#if defined(__APPLE__)
+
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl3.h>
+
+#include <dlfcn.h>
+
+#elif defined(__linux__)
+
+/* Keep eglplatform.h away from Xlib types: the helper never uses native
+ * window/display handles, so X11 headers are an unnecessary build dep. */
+#define EGL_NO_X11 1
+#define MESA_EGL_NO_X11_HEADERS 1
+#define GL_GLEXT_PROTOTYPES 1
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+
+#include <fcntl.h>
+#include <gbm.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <cctype>
+#include <cstdio>
+#include <dlfcn.h>
+
+#ifndef EGL_PLATFORM_SURFACELESS_MESA
+#define EGL_PLATFORM_SURFACELESS_MESA 0x31DD
+#endif
+#ifndef EGL_PLATFORM_GBM_KHR
+#define EGL_PLATFORM_GBM_KHR 0x31D7
+#endif
+
+#elif defined(_WIN32)
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+
+#include <GL/gl.h>
+
+#include <cstdint>
+#include <cstdio>
+
+/* The Windows SDK ships GL 1.1 headers only; everything newer that the
+ * render pipeline touches is declared below and resolved at runtime. */
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#endif
+#ifndef GL_FRAMEBUFFER
+#define GL_FRAMEBUFFER 0x8D40
+#endif
+#ifndef GL_READ_FRAMEBUFFER
+#define GL_READ_FRAMEBUFFER 0x8CA8
+#endif
+#ifndef GL_COLOR_ATTACHMENT0
+#define GL_COLOR_ATTACHMENT0 0x8CE0
+#endif
+#ifndef GL_FRAMEBUFFER_COMPLETE
+#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
+#endif
+#ifndef GL_PIXEL_PACK_BUFFER
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#endif
+#ifndef GL_STREAM_READ
+#define GL_STREAM_READ 0x88E1
+#endif
+#ifndef GL_MAP_READ_BIT
+#define GL_MAP_READ_BIT 0x0001
+#endif
+
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+
+#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
+#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
+
+#endif
+
+namespace frame_helper {
+
+/* Matches mpv_opengl_init_params.get_proc_address. */
+using GlGetProcAddressFn = void* (*)(void* ctx, const char* name);
+
+#if defined(__APPLE__)
+
+inline void* glDlsymGetProcAddress(void* ctx, const char* name) {
+    return dlsym(ctx, name);
+}
+
+class GlContext {
+public:
+    bool create(std::string& errorOut) {
+        glDylib_ = dlopen(
+            "/System/Library/Frameworks/OpenGL.framework/Versions/Current/"
+            "OpenGL",
+            RTLD_LAZY | RTLD_LOCAL);
+        if (!glDylib_) {
+            errorOut = "failed to open the OpenGL framework";
+            return false;
+        }
+
+        CGLPixelFormatAttribute attrs[] = {
+            kCGLPFAOpenGLProfile,
+            (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core,
+            kCGLPFAAccelerated,
+            kCGLPFAColorSize, (CGLPixelFormatAttribute)24,
+            kCGLPFAAlphaSize, (CGLPixelFormatAttribute)8,
+            (CGLPixelFormatAttribute)0,
+        };
+        CGLPixelFormatObj pixelFormat = nullptr;
+        GLint matched = 0;
+        if (CGLChoosePixelFormat(attrs, &pixelFormat, &matched) !=
+                kCGLNoError ||
+            !pixelFormat) {
+            errorOut = "no accelerated CGL pixel format";
+            return false;
+        }
+        const CGLError contextError =
+            CGLCreateContext(pixelFormat, nullptr, &cgl_);
+        CGLDestroyPixelFormat(pixelFormat);
+        if (contextError != kCGLNoError || !cgl_) {
+            errorOut = "failed to create a headless CGL context";
+            return false;
+        }
+        return true;
+    }
+
+    bool makeCurrent(std::string& errorOut) {
+        if (CGLSetCurrentContext(cgl_) != kCGLNoError) {
+            errorOut = "failed to bind the CGL render context";
+            return false;
+        }
+        return true;
+    }
+
+    void destroy() {
+        CGLSetCurrentContext(nullptr);
+        if (cgl_) CGLDestroyContext(cgl_);
+        cgl_ = nullptr;
+        /* glDylib_ stays mapped: mpv may still resolve symbols during its
+         * own teardown, and the process exits right after anyway. */
+    }
+
+    GlGetProcAddressFn procLoader() const { return glDlsymGetProcAddress; }
+    void* procLoaderCtx() const { return glDylib_; }
+    const char* renderApiName() const { return "cgl"; }
+
+private:
+    CGLContextObj cgl_ = nullptr;
+    void* glDylib_ = nullptr;
+};
+
+#elif defined(__linux__)
+
+inline void* eglWrapGetProcAddress(void* /*ctx*/, const char* name) {
+    if (void* linkedSymbol = dlsym(RTLD_DEFAULT, name)) return linkedSymbol;
+    return reinterpret_cast<void*>(eglGetProcAddress(name));
+}
+
+class GlContext {
+public:
+    bool create(std::string& errorOut) {
+        const DisplayTier tiers[] = {
+            DisplayTier::SurfacelessMesa,
+            DisplayTier::Default,
+            DisplayTier::Gbm,
+        };
+
+        bool hasSoftwareFallback = false;
+        DisplayTier softwareFallback = DisplayTier::SurfacelessMesa;
+        std::string failures;
+
+        for (DisplayTier tier : tiers) {
+            Candidate candidate;
+            std::string candidateError;
+            if (!tryCandidate(tier, candidate, candidateError)) {
+                if (candidateOwnsResources(candidate)) {
+                    errorOut = candidateError +
+                               "; failed to safely tear down rejected EGL "
+                               "candidate";
+                    return false;
+                }
+                appendFailure(failures, candidateError);
+                continue;
+            }
+
+            if (!candidate.softwareRenderer) {
+                adoptCandidate(candidate);
+                std::fprintf(stderr, "egl display: %s\n", tierName(tier));
+                return true;
+            }
+
+            std::fprintf(stderr,
+                         "egl candidate %s uses software renderer %s; "
+                         "trying the next tier\n",
+                         tierName(tier), candidate.renderer.c_str());
+            if (!hasSoftwareFallback) {
+                softwareFallback = tier;
+                hasSoftwareFallback = true;
+            }
+            destroyCandidate(candidate);
+            if (candidateOwnsResources(candidate)) {
+                errorOut = std::string(tierName(tier)) +
+                           ": failed to safely release software EGL "
+                           "candidate";
+                return false;
+            }
+        }
+
+        /* Recreate rather than retain the software context while probing the
+         * remaining tiers: EGL implementations may alias platform displays,
+         * and terminating one alias can invalidate the retained context. */
+        if (hasSoftwareFallback) {
+            Candidate candidate;
+            std::string candidateError;
+            if (tryCandidate(softwareFallback, candidate, candidateError)) {
+                adoptCandidate(candidate);
+                std::fprintf(stderr,
+                             "egl display: %s (software fallback: %s)\n",
+                             tierName(softwareFallback), renderer_.c_str());
+                return true;
+            }
+            if (candidateOwnsResources(candidate)) {
+                errorOut = candidateError +
+                           "; failed to safely tear down software fallback";
+                return false;
+            }
+            appendFailure(failures, candidateError);
+        }
+
+        errorOut = "no usable EGL display (surfaceless/default/GBM)";
+        if (!failures.empty()) errorOut += ": " + failures;
+        return false;
+    }
+
+    bool makeCurrent(std::string& errorOut) {
+        /* eglBindAPI is thread-local. create() runs on the main thread, so the
+         * render thread must select desktop GL for both bind and teardown. */
+        if (eglBindAPI(EGL_OPENGL_API) != EGL_TRUE) {
+            errorOut = "failed to bind the desktop OpenGL EGL API";
+            return false;
+        }
+        if (eglMakeCurrent(display_, surface_, surface_, context_) != EGL_TRUE) {
+            errorOut = "failed to bind the EGL render context";
+            eglReleaseThread();
+            return false;
+        }
+        return true;
+    }
+
+    void destroy() {
+        if (display_ != EGL_NO_DISPLAY) {
+            bool released = true;
+            if (eglBindAPI(EGL_OPENGL_API) != EGL_TRUE) {
+                std::fprintf(stderr,
+                             "egl teardown: failed to bind desktop OpenGL\n");
+                released = false;
+            } else if (eglMakeCurrent(display_, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                                      EGL_NO_CONTEXT) != EGL_TRUE) {
+                std::fprintf(stderr,
+                             "egl teardown: failed to release current "
+                             "context\n");
+                released = false;
+            }
+            if (eglReleaseThread() != EGL_TRUE) {
+                std::fprintf(stderr,
+                             "egl teardown: eglReleaseThread failed\n");
+                released = false;
+            }
+            /* Never tear down the display/GBM device under a context that EGL
+             * may still consider current. The process is already exiting, so
+             * leaking on this exceptional path is safer than use-after-free. */
+            if (!released) return;
+
+            if (surface_ != EGL_NO_SURFACE)
+                eglDestroySurface(display_, surface_);
+            if (context_ != EGL_NO_CONTEXT)
+                eglDestroyContext(display_, context_);
+            eglTerminate(display_);
+        }
+        surface_ = EGL_NO_SURFACE;
+        context_ = EGL_NO_CONTEXT;
+        display_ = EGL_NO_DISPLAY;
+        if (gbmDevice_) {
+            gbm_device_destroy(gbmDevice_);
+            gbmDevice_ = nullptr;
+        }
+        if (gbmFd_ >= 0) {
+            close(gbmFd_);
+            gbmFd_ = -1;
+        }
+    }
+
+    GlGetProcAddressFn procLoader() const { return eglWrapGetProcAddress; }
+    void* procLoaderCtx() const { return nullptr; }
+    const char* renderApiName() const { return "egl"; }
+
+private:
+    enum class DisplayTier { SurfacelessMesa, Default, Gbm };
+
+    struct Candidate {
+        EGLDisplay display = EGL_NO_DISPLAY;
+        EGLContext context = EGL_NO_CONTEXT;
+        EGLSurface surface = EGL_NO_SURFACE;
+        struct gbm_device* gbmDevice = nullptr;
+        int gbmFd = -1;
+        bool initialized = false;
+        bool current = false;
+        bool threadReleased = false;
+        bool softwareRenderer = false;
+        std::string renderer;
+    };
+
+    static const char* tierName(DisplayTier tier) {
+        switch (tier) {
+            case DisplayTier::SurfacelessMesa:
+                return "surfaceless-mesa";
+            case DisplayTier::Default:
+                return "default";
+            case DisplayTier::Gbm:
+                return "gbm render node";
+        }
+        return "unknown";
+    }
+
+    static void appendFailure(std::string& failures,
+                              const std::string& failure) {
+        if (failure.empty()) return;
+        if (!failures.empty()) failures += "; ";
+        failures += failure;
+    }
+
+    static bool candidateOwnsResources(const Candidate& candidate) {
+        return candidate.display != EGL_NO_DISPLAY ||
+               candidate.context != EGL_NO_CONTEXT ||
+               candidate.surface != EGL_NO_SURFACE || candidate.gbmDevice ||
+               candidate.gbmFd >= 0 || candidate.current;
+    }
+
+    static bool isSoftwareRenderer(const std::string& renderer) {
+        std::string normalized = renderer;
+        std::transform(normalized.begin(), normalized.end(), normalized.begin(),
+                       [](unsigned char value) {
+                           return static_cast<char>(std::tolower(value));
+                       });
+        for (const char* marker : {"llvmpipe", "softpipe", "swrast",
+                                   "software rasterizer", "lavapipe"}) {
+            if (normalized.find(marker) != std::string::npos) return true;
+        }
+        return false;
+    }
+
+    static bool openGbmDevice(Candidate& candidate) {
+        for (int node = 128; node <= 131; node++) {
+            char devicePath[32];
+            std::snprintf(devicePath, sizeof(devicePath),
+                          "/dev/dri/renderD%d", node);
+            const int fd = open(devicePath, O_RDWR | O_CLOEXEC);
+            if (fd < 0) continue;
+            struct gbm_device* device = gbm_create_device(fd);
+            if (!device) {
+                close(fd);
+                continue;
+            }
+            candidate.gbmFd = fd;
+            candidate.gbmDevice = device;
+            return true;
+        }
+        return false;
+    }
+
+    static bool chooseConfig(EGLDisplay display, EGLint surfaceType,
+                             EGLConfig* out) {
+        const EGLint attrs[] = {
+            EGL_SURFACE_TYPE, surfaceType,
+            EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+            EGL_RED_SIZE, 8,
+            EGL_GREEN_SIZE, 8,
+            EGL_BLUE_SIZE, 8,
+            EGL_ALPHA_SIZE, 8,
+            EGL_NONE,
+        };
+        EGLint matched = 0;
+        return eglChooseConfig(display, attrs, out, 1, &matched) == EGL_TRUE &&
+               matched > 0;
+    }
+
+    bool tryCandidate(DisplayTier tier, Candidate& candidate,
+                      std::string& errorOut) {
+        const auto fail = [&](const std::string& detail) {
+            errorOut = std::string(tierName(tier)) + ": " + detail;
+            destroyCandidate(candidate);
+            return false;
+        };
+
+        switch (tier) {
+            case DisplayTier::SurfacelessMesa:
+                candidate.display = eglGetPlatformDisplay(
+                    EGL_PLATFORM_SURFACELESS_MESA, nullptr, nullptr);
+                break;
+            case DisplayTier::Default:
+                candidate.display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+                break;
+            case DisplayTier::Gbm:
+                if (!openGbmDevice(candidate)) {
+                    return fail("no accessible DRM render node");
+                }
+                candidate.display = eglGetPlatformDisplay(
+                    EGL_PLATFORM_GBM_KHR, candidate.gbmDevice, nullptr);
+                break;
+        }
+
+        if (candidate.display == EGL_NO_DISPLAY) {
+            return fail("eglGetDisplay returned EGL_NO_DISPLAY");
+        }
+        EGLint major = 0;
+        EGLint minor = 0;
+        if (eglInitialize(candidate.display, &major, &minor) != EGL_TRUE) {
+            return fail("eglInitialize failed");
+        }
+        candidate.initialized = true;
+        if (eglBindAPI(EGL_OPENGL_API) != EGL_TRUE) {
+            return fail("desktop OpenGL API unavailable");
+        }
+
+        EGLConfig config = nullptr;
+        if (!chooseConfig(candidate.display, EGL_PBUFFER_BIT, &config) &&
+            !chooseConfig(candidate.display, 0, &config)) {
+            return fail("no desktop-OpenGL EGLConfig");
+        }
+        const EGLint contextAttrs[] = {
+            EGL_CONTEXT_MAJOR_VERSION,
+            3,
+            EGL_CONTEXT_MINOR_VERSION,
+            2,
+            EGL_CONTEXT_OPENGL_PROFILE_MASK,
+            EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+            EGL_NONE,
+        };
+        candidate.context = eglCreateContext(candidate.display, config,
+                                             EGL_NO_CONTEXT, contextAttrs);
+        if (candidate.context == EGL_NO_CONTEXT) {
+            return fail("failed to create a 3.2 core context");
+        }
+
+        if (eglMakeCurrent(candidate.display, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                           candidate.context) != EGL_TRUE) {
+            const EGLint pbufferAttrs[] = {
+                EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE,
+            };
+            candidate.surface = eglCreatePbufferSurface(
+                candidate.display, config, pbufferAttrs);
+            if (candidate.surface == EGL_NO_SURFACE ||
+                eglMakeCurrent(candidate.display, candidate.surface,
+                               candidate.surface, candidate.context) !=
+                    EGL_TRUE) {
+                return fail(
+                    "eglMakeCurrent failed (surfaceless and pbuffer)");
+            }
+        }
+        candidate.current = true;
+
+        const GLubyte* renderer = glGetString(GL_RENDERER);
+        if (!renderer) return fail("GL_RENDERER unavailable");
+        candidate.renderer = reinterpret_cast<const char*>(renderer);
+        candidate.softwareRenderer = isSoftwareRenderer(candidate.renderer);
+
+        if (eglMakeCurrent(candidate.display, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                           EGL_NO_CONTEXT) != EGL_TRUE) {
+            return fail("failed to unbind the probe context");
+        }
+        candidate.current = false;
+        if (eglReleaseThread() != EGL_TRUE) {
+            return fail("eglReleaseThread failed after probing");
+        }
+        candidate.threadReleased = true;
+        return true;
+    }
+
+    static bool releaseCandidateThread(Candidate& candidate) {
+        if (candidate.threadReleased) return true;
+        if (candidate.current) {
+            if (eglBindAPI(EGL_OPENGL_API) != EGL_TRUE ||
+                eglMakeCurrent(candidate.display, EGL_NO_SURFACE,
+                               EGL_NO_SURFACE, EGL_NO_CONTEXT) != EGL_TRUE) {
+                return false;
+            }
+            candidate.current = false;
+        }
+        if (eglReleaseThread() != EGL_TRUE) return false;
+        candidate.threadReleased = true;
+        return true;
+    }
+
+    static void destroyCandidate(Candidate& candidate) {
+        if (!releaseCandidateThread(candidate)) {
+            std::fprintf(stderr,
+                         "egl candidate teardown skipped: context release "
+                         "failed\n");
+            return;
+        }
+        if (candidate.display != EGL_NO_DISPLAY) {
+            if (candidate.surface != EGL_NO_SURFACE)
+                eglDestroySurface(candidate.display, candidate.surface);
+            if (candidate.context != EGL_NO_CONTEXT)
+                eglDestroyContext(candidate.display, candidate.context);
+            if (candidate.initialized) eglTerminate(candidate.display);
+        }
+        if (candidate.gbmDevice) gbm_device_destroy(candidate.gbmDevice);
+        if (candidate.gbmFd >= 0) close(candidate.gbmFd);
+        candidate = Candidate{};
+    }
+
+    void adoptCandidate(Candidate& candidate) {
+        display_ = candidate.display;
+        context_ = candidate.context;
+        surface_ = candidate.surface;
+        gbmDevice_ = candidate.gbmDevice;
+        gbmFd_ = candidate.gbmFd;
+        renderer_ = candidate.renderer;
+        candidate = Candidate{};
+    }
+
+    EGLDisplay display_ = EGL_NO_DISPLAY;
+    EGLContext context_ = EGL_NO_CONTEXT;
+    EGLSurface surface_ = EGL_NO_SURFACE;
+    struct gbm_device* gbmDevice_ = nullptr;
+    int gbmFd_ = -1;
+    std::string renderer_;
+};
+
+#elif defined(_WIN32)
+
+/* Post-1.1 GL entry points used by frame_helper_render.h, with their real
+ * names so the shared render code compiles unchanged. APIENTRY (stdcall)
+ * must match the driver exports. Single-TU helper; inline for safety. */
+#define FRAME_HELPER_WGL_ENTRY_POINTS(X)                                      \
+    X(void, glGenFramebuffers, (GLsizei n, GLuint* out))                      \
+    X(void, glDeleteFramebuffers, (GLsizei n, const GLuint* ids))             \
+    X(void, glBindFramebuffer, (GLenum target, GLuint fbo))                   \
+    X(void, glFramebufferTexture2D,                                           \
+      (GLenum target, GLenum attachment, GLenum textarget, GLuint texture,    \
+       GLint level))                                                          \
+    X(GLenum, glCheckFramebufferStatus, (GLenum target))                      \
+    X(void, glGenBuffers, (GLsizei n, GLuint* out))                           \
+    X(void, glDeleteBuffers, (GLsizei n, const GLuint* ids))                  \
+    X(void, glBindBuffer, (GLenum target, GLuint buffer))                     \
+    X(void, glBufferData,                                                     \
+      (GLenum target, GLsizeiptr size, const void* data, GLenum usage))       \
+    X(void*, glMapBufferRange,                                                \
+      (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)) \
+    X(GLboolean, glUnmapBuffer, (GLenum target))
+
+#define FRAME_HELPER_WGL_DECLARE(ret, name, args)                             \
+    inline ret(APIENTRY* name) args = nullptr;
+FRAME_HELPER_WGL_ENTRY_POINTS(FRAME_HELPER_WGL_DECLARE)
+#undef FRAME_HELPER_WGL_DECLARE
+
+typedef HGLRC(WINAPI* FrameHelperWglCreateContextAttribsFn)(HDC, HGLRC,
+                                                            const int*);
+
+/* wglGetProcAddress covers post-1.1 symbols but returns sentinel values for
+ * the 1.1 core set, which lives in opengl32.dll instead. */
+inline void* wglLoaderGetProcAddress(void* ctx, const char* name) {
+    PROC proc = wglGetProcAddress(name);
+    const intptr_t sentinel = reinterpret_cast<intptr_t>(proc);
+    if (proc && sentinel != 1 && sentinel != 2 && sentinel != 3 &&
+        sentinel != -1) {
+        return reinterpret_cast<void*>(proc);
+    }
+    return reinterpret_cast<void*>(
+        GetProcAddress(static_cast<HMODULE>(ctx), name));
+}
+
+class GlContext {
+public:
+    bool create(std::string& errorOut) {
+        opengl32_ = GetModuleHandleA("opengl32.dll");
+        if (!opengl32_) {
+            errorOut = "opengl32.dll is not loaded";
+            return false;
+        }
+
+        WNDCLASSA windowClass = {};
+        windowClass.style = CS_OWNDC;
+        windowClass.lpfnWndProc = DefWindowProcA;
+        windowClass.hInstance = GetModuleHandleA(nullptr);
+        windowClass.lpszClassName = "iptvnator_mpv_helper_gl";
+        /* Re-registration fails harmlessly if a previous context leaked the
+         * class; CreateWindow below is the real gate. */
+        RegisterClassA(&windowClass);
+        window_ = CreateWindowExA(0, windowClass.lpszClassName, "", WS_POPUP,
+                                  0, 0, 1, 1, nullptr, nullptr,
+                                  windowClass.hInstance, nullptr);
+        if (!window_) {
+            errorOut = "failed to create the hidden GL window";
+            return false;
+        }
+        dc_ = GetDC(window_);
+        if (!dc_) {
+            errorOut = "failed to get a DC for the hidden GL window";
+            return false;
+        }
+
+        PIXELFORMATDESCRIPTOR descriptor = {};
+        descriptor.nSize = sizeof(descriptor);
+        descriptor.nVersion = 1;
+        descriptor.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
+        descriptor.iPixelType = PFD_TYPE_RGBA;
+        descriptor.cColorBits = 32;
+        descriptor.cAlphaBits = 8;
+        descriptor.iLayerType = PFD_MAIN_PLANE;
+        const int pixelFormat = ChoosePixelFormat(dc_, &descriptor);
+        if (pixelFormat == 0 ||
+            SetPixelFormat(dc_, pixelFormat, &descriptor) != TRUE) {
+            errorOut = "no usable pixel format for the hidden GL window";
+            return false;
+        }
+
+        HGLRC legacy = wglCreateContext(dc_);
+        if (!legacy) {
+            errorOut = "failed to create a legacy WGL context";
+            return false;
+        }
+        if (wglMakeCurrent(dc_, legacy) != TRUE) {
+            if (wglDeleteContext(legacy) != TRUE) {
+                std::fprintf(stderr,
+                             "wgl create: failed to delete unbound legacy "
+                             "context\n");
+            }
+            errorOut = "failed to bind the legacy WGL context";
+            return false;
+        }
+
+        const auto createContextAttribs =
+            reinterpret_cast<FrameHelperWglCreateContextAttribsFn>(
+                wglLoaderGetProcAddress(opengl32_,
+                                        "wglCreateContextAttribsARB"));
+        if (createContextAttribs) {
+            const int attribs[] = {
+                WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
+                WGL_CONTEXT_MINOR_VERSION_ARB, 2,
+                WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+                0,
+            };
+            HGLRC core = createContextAttribs(dc_, nullptr, attribs);
+            if (core) {
+                if (wglMakeCurrent(dc_, core) != TRUE) {
+                    if (wglDeleteContext(core) != TRUE) {
+                        std::fprintf(
+                            stderr,
+                            "wgl create: failed to delete unbound core "
+                            "context\n");
+                    }
+                    if (wglGetCurrentContext() != legacy &&
+                        wglMakeCurrent(dc_, legacy) != TRUE) {
+                        errorOut =
+                            "failed to restore the legacy WGL context";
+                        return false;
+                    }
+                    context_ = legacy;
+                } else {
+                    context_ = core;
+                    if (wglDeleteContext(legacy) != TRUE) {
+                        std::fprintf(
+                            stderr,
+                            "wgl create: failed to delete superseded legacy "
+                            "context\n");
+                    }
+                }
+            } else {
+                /* Pre-3.2 driver: keep the legacy (compatibility) context;
+                 * the entry-point loading below decides adequacy. */
+                context_ = legacy;
+            }
+        } else {
+            context_ = legacy;
+        }
+
+        bool loaded = true;
+        const char* missing = nullptr;
+#define FRAME_HELPER_WGL_LOAD(ret, name, args)                                \
+    name = reinterpret_cast<ret(APIENTRY*) args>(                             \
+        wglLoaderGetProcAddress(opengl32_, #name));                           \
+    if (!name && loaded) {                                                    \
+        loaded = false;                                                       \
+        missing = #name;                                                      \
+    }
+        FRAME_HELPER_WGL_ENTRY_POINTS(FRAME_HELPER_WGL_LOAD)
+#undef FRAME_HELPER_WGL_LOAD
+        if (!loaded) {
+            errorOut = std::string("missing GL entry point: ") + missing;
+            if (wglMakeCurrent(nullptr, nullptr) != TRUE) {
+                errorOut += "; failed to release the WGL context";
+            }
+            return false;
+        }
+
+        /* Unbind before returning — see the threading contract above. */
+        if (wglMakeCurrent(nullptr, nullptr) != TRUE) {
+            errorOut =
+                "failed to release the WGL context for render-thread handoff";
+            return false;
+        }
+        return true;
+    }
+
+    bool makeCurrent(std::string& errorOut) {
+        if (!dc_ || !context_) {
+            errorOut = "WGL render context is unavailable";
+            return false;
+        }
+        if (wglMakeCurrent(dc_, context_) != TRUE) {
+            errorOut = "failed to bind the WGL render context";
+            return false;
+        }
+        return true;
+    }
+
+    void destroy() {
+        if (context_ && wglMakeCurrent(nullptr, nullptr) != TRUE) {
+            std::fprintf(stderr,
+                         "wgl teardown: failed to release current context\n");
+            return;
+        }
+        if (context_ && wglDeleteContext(context_) != TRUE) {
+            std::fprintf(stderr, "wgl teardown: failed to delete context\n");
+            return;
+        }
+        context_ = nullptr;
+        /* The hidden window/class belong to the main thread (DestroyWindow
+         * is thread-affine and this runs on the render thread); the process
+         * exits right after, so they are left to OS teardown. */
+        dc_ = nullptr;
+        window_ = nullptr;
+    }
+
+    GlGetProcAddressFn procLoader() const { return wglLoaderGetProcAddress; }
+    void* procLoaderCtx() const { return opengl32_; }
+    const char* renderApiName() const { return "wgl"; }
+
+private:
+    HWND window_ = nullptr;
+    HDC dc_ = nullptr;
+    HGLRC context_ = nullptr;
+    HMODULE opengl32_ = nullptr;
+};
+
+#else
+#error "frame_helper_gl.h has no GL context implementation for this platform"
+#endif
+
+} // namespace frame_helper
diff --git a/apps/electron-backend/native/helper/frame_helper_io.h b/apps/electron-backend/native/helper/frame_helper_io.h
new file mode 100644
index 000000000..cd116691f
--- /dev/null
+++ b/apps/electron-backend/native/helper/frame_helper_io.h
@@ -0,0 +1,176 @@
+/*
+ * stdio line protocol for the frame-copy helper.
+ *
+ * Inbound commands (stdin): one command per line, tab-separated fields.
+ * The first field is the command name; the rest are `key=value` pairs with
+ * percent-encoded values (%XX for at least '%', TAB, CR, LF). This avoids a
+ * JSON parser in native code — the TypeScript adapter owns serialization.
+ *
+ * Outbound events (stdout): one JSON object per line. Emitting JSON only
+ * needs string escaping, which lives here too.
+ */
+#pragma once
+
+#include <cstdint>
+#include <cstdio>
+#include <mutex>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace frame_helper {
+
+inline int hexValue(char c) {
+    if (c >= '0' && c <= '9') return c - '0';
+    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+    return -1;
+}
+
+inline std::string percentDecode(const std::string& value) {
+    std::string out;
+    out.reserve(value.size());
+    for (size_t i = 0; i < value.size(); i++) {
+        if (value[i] == '%' && i + 2 < value.size() &&
+            hexValue(value[i + 1]) >= 0 && hexValue(value[i + 2]) >= 0) {
+            out.push_back(
+                (char)((hexValue(value[i + 1]) << 4) | hexValue(value[i + 2])));
+            i += 2;
+            continue;
+        }
+        out.push_back(value[i]);
+    }
+    return out;
+}
+
+struct Command {
+    std::string name;
+    std::unordered_map<std::string, std::string> args;
+
+    std::string get(const std::string& key,
+                    const std::string& fallback = "") const {
+        const auto it = args.find(key);
+        return it == args.end() ? fallback : it->second;
+    }
+
+    double getDouble(const std::string& key, double fallback) const {
+        const auto it = args.find(key);
+        if (it == args.end()) return fallback;
+        try {
+            return std::stod(it->second);
+        } catch (...) {
+            return fallback;
+        }
+    }
+};
+
+inline Command parseCommandLine(const std::string& line) {
+    Command command;
+    std::stringstream stream(line);
+    std::string field;
+    bool first = true;
+    while (std::getline(stream, field, '\t')) {
+        if (first) {
+            command.name = field;
+            first = false;
+            continue;
+        }
+        const size_t eq = field.find('=');
+        if (eq == std::string::npos) continue;
+        command.args[field.substr(0, eq)] =
+            percentDecode(field.substr(eq + 1));
+    }
+    return command;
+}
+
+inline std::string jsonEscape(const std::string& value) {
+    std::string out;
+    out.reserve(value.size() + 8);
+    for (const char c : value) {
+        switch (c) {
+            case '"': out += "\\\""; break;
+            case '\\': out += "\\\\"; break;
+            case '\n': out += "\\n"; break;
+            case '\r': out += "\\r"; break;
+            case '\t': out += "\\t"; break;
+            default:
+                if ((unsigned char)c < 0x20) {
+                    char buf[8];
+                    std::snprintf(buf, sizeof(buf), "\\u%04x", c);
+                    out += buf;
+                } else {
+                    out.push_back(c);
+                }
+        }
+    }
+    return out;
+}
+
+/* Minimal JSON writer for flat/one-level-nested event objects. */
+class JsonWriter {
+public:
+    JsonWriter() { buffer_ += '{'; }
+
+    JsonWriter& str(const std::string& key, const std::string& value) {
+        writeKey(key);
+        buffer_ += '"';
+        buffer_ += jsonEscape(value);
+        buffer_ += '"';
+        return *this;
+    }
+
+    JsonWriter& num(const std::string& key, double value) {
+        writeKey(key);
+        char buf[64];
+        std::snprintf(buf, sizeof(buf), "%.6g", value);
+        buffer_ += buf;
+        return *this;
+    }
+
+    JsonWriter& boolean(const std::string& key, bool value) {
+        writeKey(key);
+        buffer_ += value ? "true" : "false";
+        return *this;
+    }
+
+    JsonWriter& nullValue(const std::string& key) {
+        writeKey(key);
+        buffer_ += "null";
+        return *this;
+    }
+
+    JsonWriter& raw(const std::string& key, const std::string& rawJson) {
+        writeKey(key);
+        buffer_ += rawJson;
+        return *this;
+    }
+
+    std::string finish() {
+        buffer_ += '}';
+        return buffer_;
+    }
+
+private:
+    void writeKey(const std::string& key) {
+        if (!first_) buffer_ += ',';
+        first_ = false;
+        buffer_ += '"';
+        buffer_ += jsonEscape(key);
+        buffer_ += "\":";
+    }
+
+    std::string buffer_;
+    bool first_ = true;
+};
+
+/* stdout is shared by every thread that emits events. */
+inline void emitLine(const std::string& jsonLine) {
+    static std::mutex stdoutMutex;
+    std::lock_guard<std::mutex> lock(stdoutMutex);
+    std::fwrite(jsonLine.data(), 1, jsonLine.size(), stdout);
+    std::fputc('\n', stdout);
+    std::fflush(stdout);
+}
+
+} // namespace frame_helper
diff --git a/apps/electron-backend/native/helper/frame_helper_render.h b/apps/electron-backend/native/helper/frame_helper_render.h
new file mode 100644
index 000000000..1f0dcaf32
--- /dev/null
+++ b/apps/electron-backend/native/helper/frame_helper_render.h
@@ -0,0 +1,415 @@
+/*
+ * Offscreen render + readback pipeline for the frame-copy helper.
+ *
+ * Headless GL context (per-platform, see frame_helper_gl.h), mpv render API
+ * into an FBO sized to the viewport, async PBO readback ring, BGRA frames
+ * published into the FrameShm ring. Validated in spikes/mpv-frame-copy
+ * (4K60 sustained on M1 Pro).
+ *
+ * Threading: everything here runs on the render thread except
+ * requestResize()/stop(), which only touch atomics/mutex-guarded state.
+ */
+#pragma once
+
+#include <mpv/client.h>
+#include <mpv/render_gl.h>
+
+#if !defined(_WIN32)
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#endif
+
+#include <atomic>
+#include <chrono>
+#include <condition_variable>
+#include <cstring>
+#include <functional>
+#include <mutex>
+#include <string>
+
+#include "frame_helper_gl.h"
+#include "frame_helper_io.h"
+#include "frame_shm.h"
+
+namespace frame_helper {
+
+inline uint64_t nowNs() { return frame_shm_now_ns(); }
+
+struct ShmRing {
+    FrameShmHeader* header = nullptr;
+    uint8_t* base = nullptr;
+    size_t size = 0;
+    std::string name;
+#if defined(_WIN32)
+    /* Named sections are refcounted: this handle keeps the mapping alive
+     * for the helper's lifetime; readers holding views keep the memory
+     * valid after the helper exits, matching unlinked-POSIX-shm semantics. */
+    HANDLE mapping = nullptr;
+#endif
+
+    bool create(const std::string& shmName, int width, int height,
+                uint32_t generation) {
+        destroy();
+        const uint64_t frameBytes = (uint64_t)width * 4u * (uint64_t)height;
+        const uint64_t dataOffset =
+            (sizeof(FrameShmHeader) + FRAME_SHM_DATA_ALIGN - 1) &
+            ~(uint64_t)(FRAME_SHM_DATA_ALIGN - 1);
+        const size_t total =
+            (size_t)(dataOffset + FRAME_SHM_RING_SLOTS * frameBytes);
+#if defined(_WIN32)
+        char mappingName[256];
+        frame_shm_windows_name(shmName.c_str(), mappingName,
+                               sizeof(mappingName));
+        HANDLE created = CreateFileMappingA(
+            INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE,
+            (DWORD)(total >> 32), (DWORD)(total & 0xffffffffu), mappingName);
+        if (!created) return false;
+        if (GetLastError() == ERROR_ALREADY_EXISTS) {
+            /* Never adopt an existing section: its layout is unknown. The
+             * per-session UUID + generation suffix make collisions mean a
+             * bug, not a retry. */
+            CloseHandle(created);
+            return false;
+        }
+        void* mapped = MapViewOfFile(created, FILE_MAP_ALL_ACCESS, 0, 0, 0);
+        if (!mapped) {
+            CloseHandle(created);
+            return false;
+        }
+        mapping = created;
+#else
+        shm_unlink(shmName.c_str());
+        const int fd = shm_open(shmName.c_str(), O_CREAT | O_EXCL | O_RDWR, 0600);
+        if (fd < 0) return false;
+        if (ftruncate(fd, (off_t)total) != 0) {
+            close(fd);
+            shm_unlink(shmName.c_str());
+            return false;
+        }
+        void* mapped =
+            mmap(nullptr, total, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+        close(fd);
+        if (mapped == MAP_FAILED) {
+            shm_unlink(shmName.c_str());
+            return false;
+        }
+#endif
+        std::memset(mapped, 0, sizeof(FrameShmHeader));
+        auto* hdr = static_cast<FrameShmHeader*>(mapped);
+        hdr->version = FRAME_SHM_VERSION;
+        hdr->width = (uint32_t)width;
+        hdr->height = (uint32_t)height;
+        hdr->stride = (uint32_t)width * 4u;
+        hdr->generation = generation;
+        hdr->frame_bytes = frameBytes;
+        hdr->data_offset = dataOffset;
+        std::atomic_thread_fence(std::memory_order_release);
+        hdr->magic = FRAME_SHM_MAGIC;
+
+        header = hdr;
+        base = static_cast<uint8_t*>(mapped);
+        size = total;
+        name = shmName;
+        return true;
+    }
+
+    uint8_t* slotData(uint64_t seq) const {
+        return base + header->data_offset +
+               (seq % FRAME_SHM_RING_SLOTS) * header->frame_bytes;
+    }
+
+    void destroy() {
+#if defined(_WIN32)
+        if (base) UnmapViewOfFile(base);
+        if (mapping) CloseHandle(mapping);
+        mapping = nullptr;
+#else
+        if (base) {
+            munmap(base, size);
+            shm_unlink(name.c_str());
+        }
+#endif
+        header = nullptr;
+        base = nullptr;
+        size = 0;
+        name.clear();
+    }
+};
+
+class RenderPipeline {
+public:
+    /* Called from the render thread after a resize created a new shm
+     * generation, so the main protocol layer can announce it. */
+    std::function<void(const std::string& name, int width, int height,
+                       uint32_t generation)>
+        onGenerationChanged;
+
+    bool start(mpv_handle* mpv, const std::string& shmBaseName, int width,
+               int height, std::string& errorOut);
+    void requestResize(int width, int height);
+    void stop();
+    void notifyUpdate(); /* mpv render update callback -> wake render loop */
+    void runLoop();      /* render thread body */
+
+    mpv_render_context* renderContext() { return renderContext_; }
+    /* 0 = initializing, 1 = ready, -1 = failed */
+    int initState() const { return initState_.load(); }
+
+private:
+    bool setupGl(std::string& errorOut);
+    bool rebuildTargets(int width, int height);
+    void publishPending();
+    void renderFrame();
+
+    mpv_handle* mpv_ = nullptr;
+    GlContext gl_;
+    mpv_render_context* renderContext_ = nullptr;
+
+    std::string shmBaseName_;
+    ShmRing ring_;
+    uint32_t generation_ = 0;
+
+    int width_ = 0;
+    int height_ = 0;
+    GLuint texture_ = 0;
+    GLuint fbo_ = 0;
+    GLuint pbos_[FRAME_SHM_RING_SLOTS] = {0};
+    int cursor_ = 0;
+    int pendingPbo_ = -1;
+    uint64_t nextSeq_ = 1;
+
+    std::mutex mutex_;
+    std::condition_variable cv_;
+    bool updatePending_ = false;
+    bool stopRequested_ = false;
+    int pendingWidth_ = 0;
+    int pendingHeight_ = 0;
+    std::atomic<int> initState_{0};
+};
+
+inline bool RenderPipeline::start(mpv_handle* mpv,
+                                  const std::string& shmBaseName, int width,
+                                  int height, std::string& errorOut) {
+    mpv_ = mpv;
+    shmBaseName_ = shmBaseName;
+    width_ = width;
+    height_ = height;
+    return gl_.create(errorOut);
+}
+
+inline bool RenderPipeline::setupGl(std::string& errorOut) {
+    if (!gl_.makeCurrent(errorOut)) return false;
+
+    /* Keep the accepted renderer diagnosable. Linux already rejected earlier
+     * software tiers when a later hardware-backed EGL candidate was usable. */
+    const GLubyte* renderer = glGetString(GL_RENDERER);
+    if (renderer) {
+        std::fprintf(stderr, "gl renderer: %s\n",
+                     reinterpret_cast<const char*>(renderer));
+    }
+
+    if (!rebuildTargets(width_, height_)) {
+        errorOut = "framebuffer setup failed";
+        return false;
+    }
+
+    mpv_opengl_init_params glInit = {gl_.procLoader(), gl_.procLoaderCtx()};
+    mpv_render_param params[] = {
+        {MPV_RENDER_PARAM_API_TYPE,
+         const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL)},
+        {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &glInit},
+        {MPV_RENDER_PARAM_INVALID, nullptr},
+    };
+    const int result = mpv_render_context_create(&renderContext_, mpv_, params);
+    if (result < 0) {
+        errorOut = mpv_error_string(result);
+        return false;
+    }
+    return true;
+}
+
+inline bool RenderPipeline::rebuildTargets(int width, int height) {
+    if (texture_) glDeleteTextures(1, &texture_);
+    if (fbo_) glDeleteFramebuffers(1, &fbo_);
+    if (pbos_[0]) glDeleteBuffers(FRAME_SHM_RING_SLOTS, pbos_);
+    pendingPbo_ = -1;
+    cursor_ = 0;
+
+    width_ = width;
+    height_ = height;
+    const GLsizeiptr frameBytes = (GLsizeiptr)width * 4 * height;
+
+    glGenTextures(1, &texture_);
+    glBindTexture(GL_TEXTURE_2D, texture_);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA,
+                 GL_UNSIGNED_BYTE, nullptr);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glGenFramebuffers(1, &fbo_);
+    glBindFramebuffer(GL_FRAMEBUFFER, fbo_);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+                           texture_, 0);
+    glGenBuffers(FRAME_SHM_RING_SLOTS, pbos_);
+    for (GLuint pbo : pbos_) {
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
+        glBufferData(GL_PIXEL_PACK_BUFFER, frameBytes, nullptr, GL_STREAM_READ);
+    }
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+        return false;
+    }
+
+    generation_ += 1;
+    const std::string shmName =
+        shmBaseName_ + "-g" + std::to_string(generation_);
+    if (!ring_.create(shmName, width, height, generation_)) {
+        return false;
+    }
+    if (onGenerationChanged) {
+        onGenerationChanged(shmName, width, height, generation_);
+    }
+    return true;
+}
+
+inline void RenderPipeline::notifyUpdate() {
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        updatePending_ = true;
+    }
+    cv_.notify_all();
+}
+
+inline void RenderPipeline::requestResize(int width, int height) {
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        pendingWidth_ = width;
+        pendingHeight_ = height;
+        updatePending_ = true;
+    }
+    cv_.notify_all();
+}
+
+inline void RenderPipeline::stop() {
+    {
+        std::lock_guard<std::mutex> lock(mutex_);
+        stopRequested_ = true;
+    }
+    cv_.notify_all();
+}
+
+inline void RenderPipeline::publishPending() {
+    if (pendingPbo_ < 0 || !ring_.header) return;
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, pbos_[pendingPbo_]);
+    const void* mapped = glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0,
+                                          (GLsizeiptr)ring_.header->frame_bytes,
+                                          GL_MAP_READ_BIT);
+    if (mapped) {
+        const uint64_t seq = nextSeq_++;
+        FrameShmSlot& slot =
+            ring_.header->slots[seq % FRAME_SHM_RING_SLOTS];
+        slot.seq.store(0, std::memory_order_release);
+        std::memcpy(ring_.slotData(seq), mapped,
+                    (size_t)ring_.header->frame_bytes);
+        slot.produce_time_ns = nowNs();
+        slot.seq.store(seq, std::memory_order_release);
+        ring_.header->latest_seq.store(seq, std::memory_order_release);
+        glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+    }
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+    pendingPbo_ = -1;
+}
+
+inline void RenderPipeline::renderFrame() {
+    mpv_opengl_fbo fbo = {(int)fbo_, width_, height_, 0};
+    int flipY = 1;
+    mpv_render_param params[] = {
+        {MPV_RENDER_PARAM_OPENGL_FBO, &fbo},
+        {MPV_RENDER_PARAM_FLIP_Y, &flipY},
+        {MPV_RENDER_PARAM_INVALID, nullptr},
+    };
+    mpv_render_context_render(renderContext_, params);
+
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_);
+    glReadBuffer(GL_COLOR_ATTACHMENT0);
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
+    glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+    publishPending();
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, pbos_[cursor_]);
+    glReadPixels(0, 0, width_, height_, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+                 nullptr);
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+    pendingPbo_ = cursor_;
+    cursor_ = (cursor_ + 1) % FRAME_SHM_RING_SLOTS;
+    mpv_render_context_report_swap(renderContext_);
+}
+
+inline void RenderPipeline::runLoop() {
+    std::string glError;
+    if (!setupGl(glError)) {
+        emitLine(JsonWriter()
+                     .str("event", "fatal")
+                     .str("error", "render init failed: " + glError)
+                     .finish());
+        initState_.store(-1);
+        gl_.destroy();
+        ring_.destroy();
+        return;
+    }
+    initState_.store(1);
+
+    while (true) {
+        int resizeWidth = 0;
+        int resizeHeight = 0;
+        bool targetsRebuilt = false;
+        {
+            std::unique_lock<std::mutex> lock(mutex_);
+            cv_.wait_for(lock, std::chrono::milliseconds(100), [&] {
+                return updatePending_ || stopRequested_;
+            });
+            if (stopRequested_) break;
+            updatePending_ = false;
+            resizeWidth = pendingWidth_;
+            resizeHeight = pendingHeight_;
+            pendingWidth_ = 0;
+            pendingHeight_ = 0;
+        }
+
+        if (resizeWidth > 0 && resizeHeight > 0 &&
+            (resizeWidth != width_ || resizeHeight != height_)) {
+            if (!rebuildTargets(resizeWidth, resizeHeight)) {
+                emitLine(JsonWriter()
+                             .str("event", "fatal")
+                             .str("error", "resize target rebuild failed")
+                             .finish());
+                break;
+            }
+            targetsRebuilt = true;
+        }
+
+        const uint64_t flags = mpv_render_context_update(renderContext_);
+        /* A resize installs an empty shm ring. Redraw the current frame even
+         * while paused; the async PBO is published on the next loop. */
+        if (targetsRebuilt || (flags & MPV_RENDER_UPDATE_FRAME)) {
+            renderFrame();
+        } else {
+            /* Flush a stranded readback so pause keeps the last frame. */
+            publishPending();
+        }
+        if (ring_.header) {
+            ring_.header->heartbeat_ns.store(nowNs(),
+                                             std::memory_order_relaxed);
+        }
+    }
+
+    mpv_render_context_set_update_callback(renderContext_, nullptr, nullptr);
+    mpv_render_context_free(renderContext_);
+    renderContext_ = nullptr;
+    if (texture_) glDeleteTextures(1, &texture_);
+    if (fbo_) glDeleteFramebuffers(1, &fbo_);
+    if (pbos_[0]) glDeleteBuffers(FRAME_SHM_RING_SLOTS, pbos_);
+    gl_.destroy();
+    ring_.destroy();
+}
+
+} // namespace frame_helper
diff --git a/apps/electron-backend/native/helper/frame_shm.h b/apps/electron-backend/native/helper/frame_shm.h
new file mode 100644
index 000000000..aeb9dd925
--- /dev/null
+++ b/apps/electron-backend/native/helper/frame_shm.h
@@ -0,0 +1,103 @@
+/*
+ * Shared-memory frame ring for the frame-copy embedded MPV helper.
+ *
+ * Same triple-buffer seqlock protocol as spikes/mpv-frame-copy (validated
+ * there on M1 Pro up to 4K60), plus a `generation` field: every viewport
+ * resize creates a fresh shm segment named `<base>-g<generation>` and the
+ * reader re-attaches when the helper announces the new generation.
+ *
+ * Must compile as C11 (reader addon) and C++17 (helper) on POSIX; on
+ * Windows both consumers build as C++ (MSVC's C mode lacks <stdatomic.h>).
+ * POSIX builds use node-gyp's GNU dialects; frame_shm_now_ns() relies on
+ * clock_gettime there, which strict -std=c11 (__STRICT_ANSI__) would hide.
+ */
+#pragma once
+
+#include <stdint.h>
+
+#if defined(_WIN32)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+
+#include <stdio.h>
+#include <string.h>
+#else
+#include <time.h>
+#endif
+
+#ifdef __cplusplus
+#include <atomic>
+typedef std::atomic<uint64_t> frame_shm_atomic_u64;
+#else
+#include <stdatomic.h>
+typedef _Atomic uint64_t frame_shm_atomic_u64;
+#endif
+
+/* Monotonic clock for produce_time_ns/heartbeat_ns. Producer (helper) and
+ * consumer (reader addon) MUST use this same clock so age math stays valid.
+ * POSIX: CLOCK_MONOTONIC (macOS 10.12+, Linux). Windows: QPC, scaled to ns
+ * without overflow by splitting whole seconds from the remainder. */
+static inline uint64_t frame_shm_now_ns(void) {
+#if defined(_WIN32)
+    /* C++11 function-local initialization is synchronized, so the helper's
+     * render/event threads cannot race while caching the boot-stable QPF. */
+    static const uint64_t frequency = []() -> uint64_t {
+        LARGE_INTEGER value;
+        if (QueryPerformanceFrequency(&value) != TRUE ||
+            value.QuadPart <= 0) {
+            return 1;
+        }
+        return (uint64_t)value.QuadPart;
+    }();
+    LARGE_INTEGER counter;
+    QueryPerformanceCounter(&counter);
+    const uint64_t ticks = (uint64_t)counter.QuadPart;
+    return (ticks / frequency) * 1000000000ull +
+           (ticks % frequency) * 1000000000ull / frequency;
+#else
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    return (uint64_t)ts.tv_sec * 1000000000ull + (uint64_t)ts.tv_nsec;
+#endif
+}
+
+#if defined(_WIN32)
+/* The stdio protocol carries POSIX-style names ("/impv-...-gN") on every
+ * platform so the TypeScript layer stays platform-agnostic; on Windows the
+ * helper (create) and reader (open) both derive the actual file-mapping
+ * object name from it: session-local namespace, slashes stripped. */
+static inline void frame_shm_windows_name(const char* posix_name, char* out,
+                                          size_t out_size) {
+    while (*posix_name == '/') posix_name++;
+    snprintf(out, out_size, "Local\\%s", posix_name);
+}
+#endif
+
+#define FRAME_SHM_MAGIC 0x564d5046u /* 'FPMV' */
+#define FRAME_SHM_VERSION 1u
+#define FRAME_SHM_RING_SLOTS 3u
+#define FRAME_SHM_DATA_ALIGN 4096u
+
+typedef struct {
+    frame_shm_atomic_u64 seq; /* 0 while the slot is being (re)written */
+    uint64_t produce_time_ns; /* frame_shm_now_ns() after copy completes */
+} FrameShmSlot;
+
+typedef struct {
+    uint32_t magic; /* written last during init; readers gate on it */
+    uint32_t version;
+    uint32_t width;
+    uint32_t height;
+    uint32_t stride; /* bytes per row, tightly packed BGRA */
+    uint32_t generation;
+    uint64_t frame_bytes;
+    uint64_t data_offset;
+    frame_shm_atomic_u64 latest_seq; /* newest complete frame, 0 = none */
+    frame_shm_atomic_u64 heartbeat_ns;
+    FrameShmSlot slots[FRAME_SHM_RING_SLOTS];
+} FrameShmHeader;
diff --git a/apps/electron-backend/native/helper/mpv_frame_helper.cpp b/apps/electron-backend/native/helper/mpv_frame_helper.cpp
new file mode 100644
index 000000000..99a9f1626
--- /dev/null
+++ b/apps/electron-backend/native/helper/mpv_frame_helper.cpp
@@ -0,0 +1,886 @@
+/*
+ * iptvnator-mpv-helper — frame-copy embedded MPV helper process
+ * (macOS + Linux + Windows; platform GL context in frame_helper_gl.h).
+ *
+ * One process = one playback session. Owns libmpv end to end: decodes,
+ * renders offscreen at viewport size, publishes BGRA frames into a shared
+ * memory ring (frame_shm.h), and plays audio directly through the OS.
+ *
+ * Control protocol: tab-separated commands on stdin, JSON events on stdout
+ * (see frame_helper_io.h). The `snapshot` event mirrors the TypeScript
+ * NativeEmbeddedMpvSessionSnapshot shape so the Electron-side adapter can
+ * cache it verbatim. Status semantics are ported from embedded_mpv.mm:
+ * END_FILE reason mapping, eof-reached => ended (keep-open), pause flag
+ * gated on a loaded path, only fatal/load errors flip the status.
+ *
+ * Usage:
+ *   iptvnator_mpv_helper --shm-base /impv-<id> --width 1280 --height 720
+ *                        [--volume 0..1] [--hwdec auto]
+ */
+#include <mpv/client.h>
+
+#include <algorithm>
+#include <atomic>
+#include <clocale>
+#include <cmath>
+#include <csignal>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <iostream>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
+
+#include "frame_helper_io.h"
+#include "frame_helper_render.h"
+
+namespace {
+
+using frame_helper::Command;
+using frame_helper::emitLine;
+using frame_helper::GlContext;
+using frame_helper::JsonWriter;
+using frame_helper::RenderPipeline;
+
+struct TrackInfo {
+    int64_t id = -1;
+    std::string title;
+    std::string language;
+    bool defaultTrack = false;
+    bool forced = false;
+};
+
+struct SnapshotState {
+    std::string status = "idle";
+    double positionSeconds = 0;
+    double durationSeconds = -1; /* <0 => null */
+    double volume = 1;           /* 0..1 */
+    int64_t videoWidth = 0;      /* mpv dwidth/dheight; 0 = unknown */
+    int64_t videoHeight = 0;
+    std::string streamUrl;
+    std::vector<TrackInfo> audioTracks;
+    int64_t selectedAudioTrackId = -1;
+    std::vector<TrackInfo> subtitleTracks;
+    int64_t selectedSubtitleTrackId = -1;
+    double playbackSpeed = 1;
+    std::string aspectOverride = "no";
+    bool recordingActive = false;
+    std::string recordingTargetPath;
+    std::string recordingStartedAt;
+    std::string recordingError;
+    std::string error;
+};
+
+struct HelperState {
+    mpv_handle* mpv = nullptr;
+    RenderPipeline pipeline;
+
+    std::mutex mutex;
+    SnapshotState snapshot;
+    bool paused = false;
+    bool loadedPath = false;
+    bool dirty = true;
+    std::string lastEmittedStatus;
+    uint64_t lastEmitNs = 0;
+    /* Requested viewport in device pixels; the render target is the
+     * aspect-fit of the video inside it so letterbox bars are never
+     * rendered (and frames stay as small as possible). */
+    int viewportWidth = 0;
+    int viewportHeight = 0;
+
+    std::atomic<bool> running{true};
+};
+
+HelperState g_state;
+
+constexpr uint64_t SNAPSHOT_EMIT_INTERVAL_NS = 250ull * 1000 * 1000;
+
+std::string isoTimestampNow() {
+    char buffer[32];
+    const time_t now = time(nullptr);
+    struct tm utc;
+#if defined(_WIN32)
+    gmtime_s(&utc, &now);
+#else
+    gmtime_r(&now, &utc);
+#endif
+    strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", &utc);
+    return buffer;
+}
+
+std::string tracksJson(const std::vector<TrackInfo>& tracks,
+                       int64_t selectedId) {
+    std::string out = "[";
+    bool first = true;
+    for (const TrackInfo& track : tracks) {
+        JsonWriter writer;
+        writer.num("id", (double)track.id);
+        if (!track.title.empty()) writer.str("title", track.title);
+        if (!track.language.empty()) writer.str("language", track.language);
+        writer.boolean("selected", track.id == selectedId);
+        writer.boolean("defaultTrack", track.defaultTrack);
+        writer.boolean("forced", track.forced);
+        if (!first) out += ',';
+        first = false;
+        out += writer.finish();
+    }
+    out += ']';
+    return out;
+}
+
+/* Compose the snapshot event. Caller holds g_state.mutex. */
+std::string composeSnapshotLocked() {
+    const SnapshotState& s = g_state.snapshot;
+    JsonWriter writer;
+    writer.str("event", "snapshot");
+    writer.str("status", s.status);
+    writer.num("positionSeconds", std::max(0.0, s.positionSeconds));
+    if (s.videoWidth > 0 && s.videoHeight > 0) {
+        writer.num("videoWidth", (double)s.videoWidth);
+        writer.num("videoHeight", (double)s.videoHeight);
+    }
+    if (s.durationSeconds >= 0) {
+        writer.num("durationSeconds", s.durationSeconds);
+    } else {
+        writer.nullValue("durationSeconds");
+    }
+    writer.num("volume", std::clamp(s.volume, 0.0, 1.5));
+    writer.str("streamUrl", s.streamUrl);
+    writer.raw("audioTracks", tracksJson(s.audioTracks, s.selectedAudioTrackId));
+    if (s.selectedAudioTrackId >= 0) {
+        writer.num("selectedAudioTrackId", (double)s.selectedAudioTrackId);
+    } else {
+        writer.nullValue("selectedAudioTrackId");
+    }
+    writer.raw("subtitleTracks",
+               tracksJson(s.subtitleTracks, s.selectedSubtitleTrackId));
+    if (s.selectedSubtitleTrackId >= 0) {
+        writer.num("selectedSubtitleTrackId",
+                   (double)s.selectedSubtitleTrackId);
+    } else {
+        writer.nullValue("selectedSubtitleTrackId");
+    }
+    writer.num("playbackSpeed", s.playbackSpeed);
+    writer.str("aspectOverride", s.aspectOverride);
+    JsonWriter recording;
+    recording.boolean("active", s.recordingActive);
+    if (!s.recordingTargetPath.empty())
+        recording.str("targetPath", s.recordingTargetPath);
+    if (!s.recordingStartedAt.empty())
+        recording.str("startedAt", s.recordingStartedAt);
+    if (!s.recordingError.empty()) recording.str("error", s.recordingError);
+    writer.raw("recording", recording.finish());
+    if (!s.error.empty()) writer.str("error", s.error);
+    return writer.finish();
+}
+
+/* Emit the snapshot when dirty: immediately on status changes, otherwise at
+ * most every SNAPSHOT_EMIT_INTERVAL_NS. Called from the mpv event thread. */
+void maybeEmitSnapshot(bool force = false) {
+    std::string line;
+    {
+        std::lock_guard<std::mutex> lock(g_state.mutex);
+        if (!g_state.dirty && !force) return;
+        const uint64_t now = frame_helper::nowNs();
+        const bool statusChanged =
+            g_state.snapshot.status != g_state.lastEmittedStatus;
+        if (!force && !statusChanged &&
+            now - g_state.lastEmitNs < SNAPSHOT_EMIT_INTERVAL_NS) {
+            return;
+        }
+        g_state.dirty = false;
+        g_state.lastEmitNs = now;
+        g_state.lastEmittedStatus = g_state.snapshot.status;
+        line = composeSnapshotLocked();
+    }
+    emitLine(line);
+}
+
+void markDirtyLocked() { g_state.dirty = true; }
+
+/* Aspect-fit of the current video inside the requested viewport. Caller
+ * holds g_state.mutex. Letterbox bars are handled by the renderer layout,
+ * not baked into frames. */
+std::pair<int, int> computeRenderSizeLocked() {
+    const int vpW = g_state.viewportWidth;
+    const int vpH = g_state.viewportHeight;
+    const int64_t vw = g_state.snapshot.videoWidth;
+    const int64_t vh = g_state.snapshot.videoHeight;
+    if (vw < 16 || vh < 16 || vpW < 16 || vpH < 16) {
+        return {vpW, vpH};
+    }
+    const double scale =
+        std::min(vpW / (double)vw, vpH / (double)vh);
+    const int width =
+        std::max(16, (int)llround((double)vw * scale)) & ~1;
+    const int height =
+        std::max(16, (int)llround((double)vh * scale)) & ~1;
+    return {width, height};
+}
+
+void applyRenderSizeLocked() {
+    const auto [width, height] = computeRenderSizeLocked();
+    if (width >= 16 && height >= 16) {
+        g_state.pipeline.requestResize(width, height);
+    }
+}
+
+/* ---- track-list parsing (ported from embedded_mpv.mm) ------------------- */
+
+void parseTrackNode(const mpv_node& trackNode, const char* wantedType,
+                    std::vector<TrackInfo>& out) {
+    if (trackNode.format != MPV_FORMAT_NODE_MAP || !trackNode.u.list) return;
+    TrackInfo track;
+    bool matchesType = false;
+    const mpv_node_list& map = *trackNode.u.list;
+    for (int i = 0; i < map.num; i++) {
+        const char* key = map.keys[i];
+        const mpv_node& value = map.values[i];
+        if (!key) continue;
+        if (std::strcmp(key, "type") == 0 &&
+            value.format == MPV_FORMAT_STRING && value.u.string) {
+            matchesType = std::strcmp(value.u.string, wantedType) == 0;
+        } else if (std::strcmp(key, "id") == 0 &&
+                   value.format == MPV_FORMAT_INT64) {
+            track.id = value.u.int64;
+        } else if (std::strcmp(key, "title") == 0 &&
+                   value.format == MPV_FORMAT_STRING && value.u.string) {
+            track.title = value.u.string;
+        } else if (std::strcmp(key, "lang") == 0 &&
+                   value.format == MPV_FORMAT_STRING && value.u.string) {
+            track.language = value.u.string;
+        } else if (std::strcmp(key, "default") == 0 &&
+                   value.format == MPV_FORMAT_FLAG) {
+            track.defaultTrack = value.u.flag != 0;
+        } else if (std::strcmp(key, "forced") == 0 &&
+                   value.format == MPV_FORMAT_FLAG) {
+            track.forced = value.u.flag != 0;
+        }
+    }
+    if (matchesType && track.id >= 0) {
+        out.push_back(std::move(track));
+    }
+}
+
+void updateTracksFromNode(const mpv_node& trackListNode) {
+    if (trackListNode.format != MPV_FORMAT_NODE_ARRAY ||
+        !trackListNode.u.list) {
+        return;
+    }
+    std::vector<TrackInfo> audio;
+    std::vector<TrackInfo> subs;
+    for (int i = 0; i < trackListNode.u.list->num; i++) {
+        parseTrackNode(trackListNode.u.list->values[i], "audio", audio);
+        parseTrackNode(trackListNode.u.list->values[i], "sub", subs);
+    }
+    g_state.snapshot.audioTracks = std::move(audio);
+    g_state.snapshot.subtitleTracks = std::move(subs);
+}
+
+bool parseTrackSelection(const char* value, int64_t& out) {
+    if (!value) return false;
+    char* end = nullptr;
+    const long long parsed = strtoll(value, &end, 10);
+    if (end == value || (end && *end != '\0')) return false;
+    out = parsed;
+    return true;
+}
+
+/* ---- mpv event loop (status semantics ported from embedded_mpv.mm) ------ */
+
+void handlePropertyChange(const mpv_event_property& property) {
+    const std::string name = property.name ? property.name : "";
+    SnapshotState& s = g_state.snapshot;
+
+    if (name == "time-pos" && property.format == MPV_FORMAT_DOUBLE &&
+        property.data) {
+        s.positionSeconds = *static_cast<double*>(property.data);
+    } else if (name == "duration" && property.format == MPV_FORMAT_DOUBLE &&
+               property.data) {
+        s.durationSeconds = *static_cast<double*>(property.data);
+    } else if (name == "pause" && property.format == MPV_FORMAT_FLAG &&
+               property.data) {
+        g_state.paused = *static_cast<int*>(property.data) != 0;
+        if (s.status != "loading" && s.status != "ended" &&
+            s.status != "error" && g_state.loadedPath) {
+            s.status = g_state.paused ? "paused" : "playing";
+        }
+    } else if (name == "eof-reached" && property.format == MPV_FORMAT_FLAG &&
+               property.data) {
+        if (*static_cast<int*>(property.data) != 0 && g_state.loadedPath) {
+            s.status = "ended";
+        }
+    } else if (name == "volume" && property.format == MPV_FORMAT_DOUBLE &&
+               property.data) {
+        s.volume = *static_cast<double*>(property.data) / 100.0;
+    } else if (name == "path" && property.format == MPV_FORMAT_STRING &&
+               property.data) {
+        const char* value = *static_cast<char**>(property.data);
+        s.streamUrl = value ? value : "";
+    } else if (name == "track-list" && property.format == MPV_FORMAT_NODE &&
+               property.data) {
+        updateTracksFromNode(*static_cast<mpv_node*>(property.data));
+    } else if (name == "aid" && property.format == MPV_FORMAT_STRING &&
+               property.data) {
+        int64_t selected = -1;
+        if (parseTrackSelection(*static_cast<char**>(property.data),
+                                selected)) {
+            s.selectedAudioTrackId = selected;
+        } else {
+            s.selectedAudioTrackId = -1;
+        }
+    } else if (name == "sid" && property.format == MPV_FORMAT_STRING &&
+               property.data) {
+        int64_t selected = -1;
+        if (parseTrackSelection(*static_cast<char**>(property.data),
+                                selected)) {
+            s.selectedSubtitleTrackId = selected;
+        } else {
+            s.selectedSubtitleTrackId = -1;
+        }
+    } else if (name == "speed" && property.format == MPV_FORMAT_DOUBLE &&
+               property.data) {
+        s.playbackSpeed = *static_cast<double*>(property.data);
+    } else if ((name == "dwidth" || name == "dheight") &&
+               property.format == MPV_FORMAT_INT64 && property.data) {
+        const int64_t value = *static_cast<int64_t*>(property.data);
+        if (name == "dwidth") {
+            s.videoWidth = value;
+        } else {
+            s.videoHeight = value;
+        }
+        applyRenderSizeLocked();
+    } else if (name == "video-aspect-override" &&
+               property.format == MPV_FORMAT_STRING && property.data) {
+        const char* value = *static_cast<char**>(property.data);
+        /* mpv reports the unset override as "-1.000000"; the renderer
+         * contract uses "no" for that state. */
+        s.aspectOverride =
+            value && *value && std::atof(value) > 0 ? value : "no";
+    } else {
+        return;
+    }
+    markDirtyLocked();
+}
+
+void runMpvEventLoop() {
+    while (g_state.running.load()) {
+        mpv_event* event = mpv_wait_event(g_state.mpv, 0.1);
+        if (!event) continue;
+        if (event->event_id == MPV_EVENT_NONE) {
+            maybeEmitSnapshot();
+            continue;
+        }
+
+        {
+            std::lock_guard<std::mutex> lock(g_state.mutex);
+            SnapshotState& s = g_state.snapshot;
+            switch (event->event_id) {
+                case MPV_EVENT_START_FILE:
+                    s.status = "loading";
+                    s.error.clear();
+                    s.audioTracks.clear();
+                    s.selectedAudioTrackId = -1;
+                    s.subtitleTracks.clear();
+                    s.selectedSubtitleTrackId = -1;
+                    g_state.loadedPath = false;
+                    markDirtyLocked();
+                    break;
+                case MPV_EVENT_FILE_LOADED:
+                    g_state.loadedPath = true;
+                    s.status = g_state.paused ? "paused" : "playing";
+                    markDirtyLocked();
+                    break;
+                case MPV_EVENT_END_FILE: {
+                    const auto* endFile =
+                        static_cast<mpv_event_end_file*>(event->data);
+                    if (endFile &&
+                        endFile->reason == MPV_END_FILE_REASON_ERROR) {
+                        s.status = "error";
+                        s.error = endFile->error < 0
+                                      ? mpv_error_string(endFile->error)
+                                      : "Playback failed.";
+                    } else if (endFile &&
+                               endFile->reason == MPV_END_FILE_REASON_EOF &&
+                               g_state.running.load()) {
+                        s.status = "ended";
+                    } else if (endFile &&
+                               endFile->reason ==
+                                   MPV_END_FILE_REASON_REDIRECT &&
+                               g_state.running.load()) {
+                        s.status = "loading";
+                        s.error.clear();
+                        g_state.loadedPath = false;
+                    } else if (g_state.running.load()) {
+                        s.status = "idle";
+                    }
+                    markDirtyLocked();
+                    break;
+                }
+                case MPV_EVENT_PROPERTY_CHANGE: {
+                    const auto* property =
+                        static_cast<mpv_event_property*>(event->data);
+                    if (property) handlePropertyChange(*property);
+                    break;
+                }
+                case MPV_EVENT_LOG_MESSAGE: {
+                    const auto* logMessage =
+                        static_cast<mpv_event_log_message*>(event->data);
+                    if (!logMessage || !logMessage->level ||
+                        !logMessage->text) {
+                        break;
+                    }
+                    const std::string level = logMessage->level;
+                    if (level == "error" || level == "fatal") {
+                        s.error = logMessage->text;
+                        markDirtyLocked();
+                    }
+                    if (level == "fatal") {
+                        s.status = "error";
+                    }
+                    emitLine(JsonWriter()
+                                 .str("event", "log")
+                                 .str("level", level)
+                                 .str("prefix", logMessage->prefix
+                                                    ? logMessage->prefix
+                                                    : "mpv")
+                                 .str("text", logMessage->text)
+                                 .finish());
+                    break;
+                }
+                case MPV_EVENT_SHUTDOWN:
+                    g_state.running.store(false);
+                    s.status = "closed";
+                    markDirtyLocked();
+                    break;
+                default:
+                    break;
+            }
+        }
+        maybeEmitSnapshot();
+    }
+    maybeEmitSnapshot(true);
+}
+
+/* ---- command handling ---------------------------------------------------- */
+
+void setPropertyString(const char* name, const std::string& value) {
+    mpv_set_property_string(g_state.mpv, name, value.c_str());
+}
+
+void handleLoadCommand(const Command& command) {
+    const std::string url = command.get("url");
+    if (url.empty()) return;
+
+    /* Loading a replacement stream stops any active recording first,
+     * mirroring the .mm behavior. */
+    {
+        std::lock_guard<std::mutex> lock(g_state.mutex);
+        if (g_state.snapshot.recordingActive) {
+            setPropertyString("stream-record", "");
+            g_state.snapshot.recordingActive = false;
+            g_state.snapshot.recordingStartedAt.clear();
+        }
+        g_state.snapshot.streamUrl = url;
+        g_state.snapshot.error.clear();
+        g_state.snapshot.status = "loading";
+        g_state.dirty = true;
+    }
+
+    /* Generic pass-through: every `opt.<name>` argument becomes a loadfile
+     * option, so the adapter controls start/user-agent/referrer/headers
+     * without protocol changes. */
+    std::string optionString;
+    for (const auto& [key, value] : command.args) {
+        if (key.rfind("opt.", 0) != 0 || value.empty()) continue;
+        if (!optionString.empty()) optionString += ',';
+        std::string escaped = value;
+        /* loadfile options string uses %len%value quoting to stay safe */
+        optionString += key.substr(4) + "=%" +
+                        std::to_string(escaped.size()) + "%" + escaped;
+    }
+
+    const char* args[] = {"loadfile", url.c_str(), "replace",
+                          optionString.empty() ? nullptr : optionString.c_str(),
+                          nullptr};
+    /* mpv >= 0.38 expects an index argument before options; use the
+     * options-map-free form: loadfile <url> replace [options] */
+    int result;
+    if (optionString.empty()) {
+        const char* plain[] = {"loadfile", url.c_str(), "replace", nullptr};
+        result = mpv_command(g_state.mpv, plain);
+    } else {
+        const char* withOpts[] = {"loadfile", url.c_str(), "replace", "-1",
+                                  optionString.c_str(), nullptr};
+        result = mpv_command(g_state.mpv, withOpts);
+        if (result == MPV_ERROR_INVALID_PARAMETER) {
+            /* Older mpv without the index argument. */
+            result = mpv_command(g_state.mpv, args);
+        }
+    }
+    if (result < 0) {
+        std::lock_guard<std::mutex> lock(g_state.mutex);
+        g_state.snapshot.status = "error";
+        g_state.snapshot.error = mpv_error_string(result);
+        g_state.dirty = true;
+    }
+}
+
+void handleRecordCommand(const Command& command) {
+    const std::string path = command.get("path");
+    const int result = mpv_set_property_string(g_state.mpv, "stream-record",
+                                               path.c_str());
+    std::lock_guard<std::mutex> lock(g_state.mutex);
+    if (result < 0) {
+        g_state.snapshot.recordingError = mpv_error_string(result);
+    } else if (path.empty()) {
+        g_state.snapshot.recordingActive = false;
+        g_state.snapshot.recordingStartedAt.clear();
+        g_state.snapshot.recordingError.clear();
+    } else {
+        g_state.snapshot.recordingActive = true;
+        g_state.snapshot.recordingTargetPath = path;
+        g_state.snapshot.recordingStartedAt = isoTimestampNow();
+        g_state.snapshot.recordingError.clear();
+    }
+    g_state.dirty = true;
+}
+
+void handleCommand(const Command& command) {
+    if (command.name == "load") {
+        handleLoadCommand(command);
+    } else if (command.name == "pause") {
+        const int flag = command.get("value") == "1" ? 1 : 0;
+        mpv_set_property(g_state.mpv, "pause", MPV_FORMAT_FLAG,
+                         const_cast<int*>(&flag));
+    } else if (command.name == "seek") {
+        const double seconds = command.getDouble("seconds", 0);
+        const std::string value = std::to_string(seconds);
+        const char* args[] = {"seek", value.c_str(), "absolute", nullptr};
+        mpv_command(g_state.mpv, args);
+    } else if (command.name == "volume") {
+        double percent =
+            std::clamp(command.getDouble("value", 1) * 100.0, 0.0, 100.0);
+        mpv_set_property(g_state.mpv, "volume", MPV_FORMAT_DOUBLE, &percent);
+    } else if (command.name == "aid" || command.name == "sid") {
+        const std::string value = command.get("value");
+        setPropertyString(command.name.c_str(),
+                          value == "-1" ? "no" : value);
+    } else if (command.name == "speed") {
+        double speed = std::clamp(command.getDouble("value", 1), 0.25, 4.0);
+        mpv_set_property(g_state.mpv, "speed", MPV_FORMAT_DOUBLE, &speed);
+    } else if (command.name == "aspect") {
+        setPropertyString("video-aspect-override", command.get("value", "no"));
+    } else if (command.name == "record") {
+        handleRecordCommand(command);
+    } else if (command.name == "size") {
+        const int width = (int)command.getDouble("width", 0);
+        const int height = (int)command.getDouble("height", 0);
+        if (width >= 16 && height >= 16) {
+            std::lock_guard<std::mutex> lock(g_state.mutex);
+            g_state.viewportWidth = width;
+            g_state.viewportHeight = height;
+            applyRenderSizeLocked();
+        }
+    } else if (command.name == "quit") {
+        g_state.running.store(false);
+        mpv_wakeup(g_state.mpv);
+    }
+}
+
+void runStdinLoop() {
+    std::string line;
+    while (g_state.running.load() && std::getline(std::cin, line)) {
+        if (line.empty()) continue;
+        handleCommand(frame_helper::parseCommandLine(line));
+    }
+    /* stdin EOF => the parent process died or closed us: shut down. */
+    g_state.running.store(false);
+    mpv_wakeup(g_state.mpv);
+}
+
+void onRenderUpdate(void* pipeline) {
+    static_cast<RenderPipeline*>(pipeline)->notifyUpdate();
+}
+
+struct HelperArgs {
+    std::string shmBase = "/impv";
+    std::string hwdec = "auto";
+    std::string audioDelay; /* seconds, mpv audio-delay passthrough */
+    int width = 1280;
+    int height = 720;
+    double volume = 1;
+    bool runtimeProbe = false;
+};
+
+HelperArgs parseArgs(int argc, char** argv) {
+    HelperArgs args;
+    for (int i = 1; i < argc; i++) {
+        const std::string arg = argv[i];
+        auto next = [&]() -> std::string {
+            return i + 1 < argc ? argv[++i] : "";
+        };
+        if (arg == "--shm-base") args.shmBase = next();
+        else if (arg == "--width") args.width = std::atoi(next().c_str());
+        else if (arg == "--height") args.height = std::atoi(next().c_str());
+        else if (arg == "--volume") args.volume = std::atof(next().c_str());
+        else if (arg == "--hwdec") args.hwdec = next();
+        else if (arg == "--audio-delay") args.audioDelay = next();
+        else if (arg == "--runtime-probe") args.runtimeProbe = true;
+    }
+    args.width = std::max(16, args.width);
+    args.height = std::max(16, args.height);
+    return args;
+}
+
+int runtimeProbeFailure(const std::string& reason,
+                        const std::string& detail = "") {
+    JsonWriter writer;
+    writer.num("protocol", 1)
+        .boolean("usable", false)
+        .str("reason", reason);
+    if (!detail.empty()) writer.str("detail", detail);
+    emitLine(writer.finish());
+    return 1;
+}
+
+std::string libmpvClientApiVersion() {
+    const unsigned long version = mpv_client_api_version();
+    return std::to_string(version >> 16) + "." +
+           std::to_string(version & 0xffff);
+}
+
+std::string runtimeProbeShmName() {
+#if defined(_WIN32)
+    const uint64_t processId = (uint64_t)GetCurrentProcessId();
+#else
+    const uint64_t processId = (uint64_t)getpid();
+#endif
+    return "/impv-fc-runtime-probe-" + std::to_string(processId);
+}
+
+/*
+ * Bounded startup capability probe: initialize an idle libmpv client and
+ * create the platform GL + mpv OpenGL render contexts, then create, validate,
+ * and destroy a minimal shared-memory ring. It deliberately does not create
+ * an FBO, open media, or enter either command loop.
+ */
+int runRuntimeProbe() {
+    mpv_handle* mpv = mpv_create();
+    if (!mpv) {
+        return runtimeProbeFailure("mpv-create-failed");
+    }
+
+    mpv_set_option_string(mpv, "vo", "libmpv");
+    mpv_set_option_string(mpv, "idle", "yes");
+    mpv_set_option_string(mpv, "input-default-bindings", "no");
+    mpv_set_option_string(mpv, "osc", "no");
+    const int initializeResult = mpv_initialize(mpv);
+    if (initializeResult < 0) {
+        const std::string error = mpv_error_string(initializeResult);
+        mpv_destroy(mpv);
+        return runtimeProbeFailure("mpv-initialize-failed", error);
+    }
+
+    GlContext gl;
+    std::string error;
+    if (!gl.create(error)) {
+        gl.destroy();
+        mpv_terminate_destroy(mpv);
+        return runtimeProbeFailure("gl-context-create-failed", error);
+    }
+    if (!gl.makeCurrent(error)) {
+        gl.destroy();
+        mpv_terminate_destroy(mpv);
+        return runtimeProbeFailure("gl-context-bind-failed", error);
+    }
+
+    mpv_opengl_init_params glInit = {
+        gl.procLoader(),
+        gl.procLoaderCtx(),
+    };
+    mpv_render_param renderParams[] = {
+        {MPV_RENDER_PARAM_API_TYPE,
+         const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL)},
+        {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &glInit},
+        {MPV_RENDER_PARAM_INVALID, nullptr},
+    };
+    mpv_render_context* renderContext = nullptr;
+    const int renderResult =
+        mpv_render_context_create(&renderContext, mpv, renderParams);
+    if (renderResult < 0 || !renderContext) {
+        const std::string renderError =
+            renderResult < 0 ? mpv_error_string(renderResult)
+                             : "render context unavailable";
+        if (renderContext) mpv_render_context_free(renderContext);
+        gl.destroy();
+        mpv_terminate_destroy(mpv);
+        return runtimeProbeFailure("mpv-render-context-failed", renderError);
+    }
+
+    frame_helper::ShmRing runtimeProbeRing;
+    const std::string shmName = runtimeProbeShmName();
+    if (!runtimeProbeRing.create(shmName, 16, 16, 1)) {
+        runtimeProbeRing.destroy();
+        mpv_render_context_free(renderContext);
+        gl.destroy();
+        mpv_terminate_destroy(mpv);
+        return runtimeProbeFailure("shared-memory-create-failed");
+    }
+    const bool sharedMemoryInitialized =
+        runtimeProbeRing.base != nullptr &&
+        runtimeProbeRing.header != nullptr &&
+        runtimeProbeRing.header->magic == FRAME_SHM_MAGIC &&
+        runtimeProbeRing.header->version == FRAME_SHM_VERSION &&
+        runtimeProbeRing.header->width == 16 &&
+        runtimeProbeRing.header->height == 16 &&
+        runtimeProbeRing.header->generation == 1;
+    runtimeProbeRing.destroy();
+    if (!sharedMemoryInitialized) {
+        mpv_render_context_free(renderContext);
+        gl.destroy();
+        mpv_terminate_destroy(mpv);
+        return runtimeProbeFailure("shared-memory-initialize-failed");
+    }
+
+    const std::string libmpvVersion = libmpvClientApiVersion();
+    mpv_render_context_free(renderContext);
+    gl.destroy();
+    mpv_terminate_destroy(mpv);
+    emitLine(JsonWriter()
+                 .num("protocol", 1)
+                 .boolean("usable", true)
+                 .str("libmpv", libmpvVersion)
+                 .str("renderApi", gl.renderApiName())
+                 .finish());
+    return 0;
+}
+
+} // namespace
+
+int main(int argc, char** argv) {
+    std::setlocale(LC_NUMERIC, "C");
+#if !defined(_WIN32)
+    signal(SIGPIPE, SIG_IGN);
+#endif
+    const HelperArgs args = parseArgs(argc, argv);
+    if (args.runtimeProbe) {
+        return runRuntimeProbe();
+    }
+
+    g_state.mpv = mpv_create();
+    if (!g_state.mpv) {
+        emitLine(JsonWriter()
+                     .str("event", "fatal")
+                     .str("error", "mpv_create failed")
+                     .finish());
+        return 1;
+    }
+
+    mpv_set_option_string(g_state.mpv, "vo", "libmpv");
+    mpv_set_option_string(g_state.mpv, "hwdec", args.hwdec.c_str());
+    mpv_set_option_string(g_state.mpv, "keep-open", "yes");
+    mpv_set_option_string(g_state.mpv, "idle", "yes");
+    mpv_set_option_string(g_state.mpv, "input-default-bindings", "no");
+    mpv_set_option_string(g_state.mpv, "osc", "no");
+    if (!args.audioDelay.empty()) {
+        /* Compensates the frame-copy video-path latency to restore
+         * lip-sync; calibrated per platform, see the architecture doc. */
+        mpv_set_option_string(g_state.mpv, "audio-delay",
+                              args.audioDelay.c_str());
+    }
+    if (mpv_initialize(g_state.mpv) < 0) {
+        emitLine(JsonWriter()
+                     .str("event", "fatal")
+                     .str("error", "mpv_initialize failed")
+                     .finish());
+        return 1;
+    }
+    mpv_request_log_messages(g_state.mpv, "warn");
+
+    double initialVolumePercent =
+        std::clamp(args.volume, 0.0, 1.0) * 100.0;
+    mpv_set_property(g_state.mpv, "volume", MPV_FORMAT_DOUBLE,
+                     &initialVolumePercent);
+
+    mpv_observe_property(g_state.mpv, 1, "time-pos", MPV_FORMAT_DOUBLE);
+    mpv_observe_property(g_state.mpv, 2, "duration", MPV_FORMAT_DOUBLE);
+    mpv_observe_property(g_state.mpv, 3, "pause", MPV_FORMAT_FLAG);
+    mpv_observe_property(g_state.mpv, 4, "volume", MPV_FORMAT_DOUBLE);
+    mpv_observe_property(g_state.mpv, 5, "path", MPV_FORMAT_STRING);
+    mpv_observe_property(g_state.mpv, 6, "track-list", MPV_FORMAT_NODE);
+    mpv_observe_property(g_state.mpv, 7, "aid", MPV_FORMAT_STRING);
+    mpv_observe_property(g_state.mpv, 8, "sid", MPV_FORMAT_STRING);
+    mpv_observe_property(g_state.mpv, 9, "speed", MPV_FORMAT_DOUBLE);
+    mpv_observe_property(g_state.mpv, 10, "video-aspect-override",
+                         MPV_FORMAT_STRING);
+    mpv_observe_property(g_state.mpv, 11, "eof-reached", MPV_FORMAT_FLAG);
+    mpv_observe_property(g_state.mpv, 12, "dwidth", MPV_FORMAT_INT64);
+    mpv_observe_property(g_state.mpv, 13, "dheight", MPV_FORMAT_INT64);
+
+    g_state.pipeline.onGenerationChanged = [](const std::string& name,
+                                              int width, int height,
+                                              uint32_t generation) {
+        emitLine(JsonWriter()
+                     .str("event", "shm")
+                     .str("name", name)
+                     .num("width", width)
+                     .num("height", height)
+                     .num("generation", generation)
+                     .finish());
+    };
+
+    g_state.viewportWidth = args.width;
+    g_state.viewportHeight = args.height;
+
+    std::string startError;
+    if (!g_state.pipeline.start(g_state.mpv, args.shmBase, args.width,
+                                args.height, startError)) {
+        emitLine(JsonWriter()
+                     .str("event", "fatal")
+                     .str("error", startError)
+                     .finish());
+        return 1;
+    }
+
+    std::thread renderThread([] { g_state.pipeline.runLoop(); });
+    /* The render context is created inside the render thread; hook the
+     * update callback once it exists (or bail if GL init failed). */
+    while (g_state.pipeline.initState() == 0) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    }
+    if (g_state.pipeline.initState() < 0) {
+        renderThread.join();
+        mpv_terminate_destroy(g_state.mpv);
+        return 1;
+    }
+    mpv_render_context_set_update_callback(g_state.pipeline.renderContext(),
+                                           onRenderUpdate, &g_state.pipeline);
+
+#if defined(_WIN32)
+    const double helperPid = (double)GetCurrentProcessId();
+#else
+    const double helperPid = (double)getpid();
+#endif
+    emitLine(JsonWriter()
+                 .str("event", "hello")
+                 .num("pid", helperPid)
+                 .num("protocolVersion", 1)
+                 .finish());
+
+    std::thread stdinThread(runStdinLoop);
+    runMpvEventLoop();
+
+    g_state.pipeline.stop();
+    renderThread.join();
+    mpv_terminate_destroy(g_state.mpv);
+    if (stdinThread.joinable()) {
+        /* stdin thread exits on EOF; detach if the pipe is still open. */
+        stdinThread.detach();
+    }
+    emitLine(JsonWriter().str("event", "bye").finish());
+    return 0;
+}
diff --git a/apps/electron-backend/native/src/embedded_mpv_frame_reader.c b/apps/electron-backend/native/src/embedded_mpv_frame_reader.c
new file mode 100644
index 000000000..8a52eeacf
--- /dev/null
+++ b/apps/electron-backend/native/src/embedded_mpv_frame_reader.c
@@ -0,0 +1,265 @@
+/*
+ * embedded_mpv_frame_reader — N-API reader for the frame-copy shm ring.
+ *
+ * Loaded by the Electron preload script; copies the newest complete BGRA
+ * frame from the helper's shared-memory ring (native/helper/frame_shm.h)
+ * into a caller-provided ArrayBuffer. A memcpy is mandatory: Electron's V8
+ * memory cage forbids external ArrayBuffers over foreign memory.
+ *
+ * Plain C N-API (no node-addon-api) so it stays ABI-stable and trivial.
+ * macOS and Linux (POSIX shm) plus Windows (named file mapping; binding.gyp
+ * compiles this file as C++ there because MSVC's C mode has no
+ * <stdatomic.h>) — other platforms export an empty object; the TypeScript
+ * side gates on platform before requiring it.
+ */
+#define NAPI_VERSION 8
+#include <node_api.h>
+
+#if defined(__APPLE__) || defined(__linux__) || defined(_WIN32)
+
+#if defined(_WIN32)
+
+#include <stdint.h>
+#include <string.h>
+
+#include "../helper/frame_shm.h"
+
+/* frame_shm.h typed the fields as std::atomic in C++ mode; keep the shared
+ * atomic_load_explicit call sites below spelling-compatible. */
+using std::atomic_load_explicit;
+using std::memory_order_acquire;
+using std::memory_order_relaxed;
+
+#else
+
+#include <fcntl.h>
+#include <stdatomic.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "../helper/frame_shm.h"
+
+#endif
+
+static FrameShmHeader* g_header = NULL;
+static uint8_t* g_base = NULL;
+static size_t g_size = 0;
+
+/* Same clock as the helper's produce_time_ns/heartbeat_ns writers. */
+static uint64_t now_ns(void) { return frame_shm_now_ns(); }
+
+static void unmap_current(void) {
+    if (g_base) {
+#if defined(_WIN32)
+        UnmapViewOfFile(g_base);
+#else
+        munmap(g_base, g_size);
+#endif
+    }
+    g_base = NULL;
+    g_header = NULL;
+    g_size = 0;
+}
+
+static napi_value throw_error(napi_env env, const char* message) {
+    napi_throw_error(env, NULL, message);
+    return NULL;
+}
+
+static void set_named_double(napi_env env, napi_value target, const char* key,
+                             double value) {
+    napi_value wrapped;
+    napi_create_double(env, value, &wrapped);
+    napi_set_named_property(env, target, key, wrapped);
+}
+
+/* open(name) -> { width, height, stride, frameBytes, generation } */
+static napi_value Open(napi_env env, napi_callback_info info) {
+    size_t argc = 1;
+    napi_value argv[1];
+    napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
+    if (argc < 1) return throw_error(env, "open(name) requires the shm name");
+
+    char name[256];
+    size_t written = 0;
+    if (napi_get_value_string_utf8(env, argv[0], name, sizeof(name),
+                                   &written) != napi_ok) {
+        return throw_error(env, "shm name must be a string");
+    }
+
+#if defined(_WIN32)
+    char mapping_name[280];
+    frame_shm_windows_name(name, mapping_name, sizeof(mapping_name));
+    HANDLE mapping = OpenFileMappingA(FILE_MAP_READ, FALSE, mapping_name);
+    if (!mapping) return throw_error(env, "shm open failed (helper gone?)");
+    void* mapped = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
+    /* The view holds its own reference to the section object. */
+    CloseHandle(mapping);
+    if (!mapped) return throw_error(env, "shm map failed");
+    MEMORY_BASIC_INFORMATION region;
+    if (VirtualQuery(mapped, &region, sizeof(region)) == 0 ||
+        region.RegionSize < sizeof(FrameShmHeader)) {
+        UnmapViewOfFile(mapped);
+        return throw_error(env, "shm segment too small");
+    }
+    const size_t segment_size = (size_t)region.RegionSize;
+#else
+    const int fd = shm_open(name, O_RDONLY, 0);
+    if (fd < 0) return throw_error(env, "shm_open failed (helper gone?)");
+    struct stat segment;
+    if (fstat(fd, &segment) != 0 ||
+        segment.st_size < (off_t)sizeof(FrameShmHeader)) {
+        close(fd);
+        return throw_error(env, "shm segment too small");
+    }
+    void* mapped =
+        mmap(NULL, (size_t)segment.st_size, PROT_READ, MAP_SHARED, fd, 0);
+    close(fd);
+    if (mapped == MAP_FAILED) return throw_error(env, "mmap failed");
+    const size_t segment_size = (size_t)segment.st_size;
+#endif
+
+    FrameShmHeader* header = (FrameShmHeader*)mapped;
+    if (header->magic != FRAME_SHM_MAGIC ||
+        header->version != FRAME_SHM_VERSION) {
+#if defined(_WIN32)
+        UnmapViewOfFile(mapped);
+#else
+        munmap(mapped, segment_size);
+#endif
+        return throw_error(env, "frame ring not initialized yet");
+    }
+
+    unmap_current();
+    g_base = (uint8_t*)mapped;
+    g_size = segment_size;
+    g_header = header;
+
+    napi_value result;
+    napi_create_object(env, &result);
+    set_named_double(env, result, "width", header->width);
+    set_named_double(env, result, "height", header->height);
+    set_named_double(env, result, "stride", header->stride);
+    set_named_double(env, result, "frameBytes", (double)header->frame_bytes);
+    set_named_double(env, result, "generation", header->generation);
+    return result;
+}
+
+/* latestSeq() -> number (0 = no frame yet / not attached) */
+static napi_value LatestSeq(napi_env env, napi_callback_info info) {
+    napi_value result;
+    const uint64_t seq =
+        g_header
+            ? atomic_load_explicit(&g_header->latest_seq, memory_order_acquire)
+            : 0;
+    napi_create_double(env, (double)seq, &result);
+    return result;
+}
+
+/* copyLatest(arrayBuffer) -> { seq, ageMs, torn } | null */
+static napi_value CopyLatest(napi_env env, napi_callback_info info) {
+    size_t argc = 1;
+    napi_value argv[1];
+    napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
+    if (!g_header) return throw_error(env, "call open() first");
+    if (argc < 1) return throw_error(env, "copyLatest(buffer) needs a buffer");
+
+    void* destination = NULL;
+    size_t destination_size = 0;
+    if (napi_get_arraybuffer_info(env, argv[0], &destination,
+                                  &destination_size) != napi_ok) {
+        return throw_error(env, "argument must be an ArrayBuffer");
+    }
+    if (destination_size < g_header->frame_bytes) {
+        return throw_error(env, "buffer smaller than one frame");
+    }
+
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+
+    const uint64_t seq =
+        atomic_load_explicit(&g_header->latest_seq, memory_order_acquire);
+    if (seq == 0) return null_value;
+
+    FrameShmSlot* slot = &g_header->slots[seq % FRAME_SHM_RING_SLOTS];
+    if (atomic_load_explicit(&slot->seq, memory_order_acquire) != seq) {
+        return null_value; /* writer is racing this slot; next tick wins */
+    }
+
+    const uint8_t* source = g_base + g_header->data_offset +
+                            (seq % FRAME_SHM_RING_SLOTS) *
+                                g_header->frame_bytes;
+    memcpy(destination, source, (size_t)g_header->frame_bytes);
+    const uint64_t copied_at = now_ns();
+    const int torn =
+        atomic_load_explicit(&slot->seq, memory_order_acquire) != seq;
+
+    napi_value result;
+    napi_create_object(env, &result);
+    set_named_double(env, result, "seq", (double)seq);
+    set_named_double(env, result, "ageMs",
+                     (double)(copied_at - slot->produce_time_ns) / 1e6);
+    napi_value torn_value;
+    napi_get_boolean(env, torn, &torn_value);
+    napi_set_named_property(env, result, "torn", torn_value);
+    return result;
+}
+
+/* producerAliveMs() -> ms since the helper's last heartbeat (-1 unknown) */
+static napi_value ProducerAliveMs(napi_env env, napi_callback_info info) {
+    napi_value result;
+    double ms = -1;
+    if (g_header) {
+        const uint64_t heartbeat =
+            atomic_load_explicit(&g_header->heartbeat_ns, memory_order_relaxed);
+        if (heartbeat) ms = (double)(now_ns() - heartbeat) / 1e6;
+    }
+    napi_create_double(env, ms, &result);
+    return result;
+}
+
+/* close() -> undefined */
+static napi_value Close(napi_env env, napi_callback_info info) {
+    unmap_current();
+    napi_value undefined;
+    napi_get_undefined(env, &undefined);
+    return undefined;
+}
+
+static napi_value Init(napi_env env, napi_value exports) {
+    const struct {
+        const char* name;
+        napi_callback fn;
+    } exported[] = {
+        {"open", Open},
+        {"latestSeq", LatestSeq},
+        {"copyLatest", CopyLatest},
+        {"producerAliveMs", ProducerAliveMs},
+        {"close", Close},
+    };
+    for (size_t i = 0; i < sizeof(exported) / sizeof(exported[0]); i++) {
+        napi_value fn;
+        napi_create_function(env, exported[i].name, NAPI_AUTO_LENGTH,
+                             exported[i].fn, NULL, &fn);
+        napi_set_named_property(env, exports, exported[i].name, fn);
+    }
+    return exports;
+}
+
+#else /* no frame-copy port for this platform */
+
+static napi_value Init(napi_env env, napi_value exports) {
+    /* Frame-copy is not ported to this platform yet; loading this module
+     * here yields an empty exports object and the TS side treats it as
+     * unsupported. */
+    (void)env;
+    return exports;
+}
+
+#endif
+
+NAPI_MODULE(embedded_mpv_frame_reader, Init)
diff --git a/apps/electron-backend/project.json b/apps/electron-backend/project.json
index a8ff97ef4..291cd7adf 100644
--- a/apps/electron-backend/project.json
+++ b/apps/electron-backend/project.json
@@ -12,6 +12,13 @@
                 "command": "node apps/electron-backend/build-worker.js"
             }
         },
+        "build-worker-performance": {
+            "executor": "nx:run-commands",
+            "outputs": ["{workspaceRoot}/dist/apps/electron-backend/workers"],
+            "options": {
+                "command": "node apps/electron-backend/build-worker.js --performance"
+            }
+        },
         "build-embedded-mpv": {
             "executor": "nx:run-commands",
             "cache": false,
@@ -36,7 +43,11 @@
             "inputs": [
                 "production",
                 "^production",
-                "{workspaceRoot}/apps/electron-backend/native/build/Release/**"
+                "{workspaceRoot}/apps/electron-backend/native/build/Release/**",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts"
             ],
             "options": {
                 "outputPath": "dist/apps/electron-backend",
@@ -52,7 +63,16 @@
                             ".deps/**",
                             "obj.target/**",
                             "**/.deps/**",
-                            "**/obj.target/**"
+                            "**/obj.target/**",
+                            "obj/**",
+                            "**/obj/**",
+                            "**/*.pdb",
+                            "**/*.iobj",
+                            "**/*.ipdb",
+                            "**/*.ilk",
+                            "**/*.exp",
+                            "**/*.lib",
+                            "**/*.dll.a"
                         ]
                     }
                 ]
@@ -68,9 +88,35 @@
                             "with": "apps/electron-backend/src/environments/environment.prod.ts"
                         }
                     ]
+                },
+                "electron-performance": {
+                    "optimization": true,
+                    "extractLicenses": true,
+                    "inspect": false,
+                    "sourceMap": true,
+                    "fileReplacements": [
+                        {
+                            "replace": "apps/electron-backend/src/environments/environment.ts",
+                            "with": "apps/electron-backend/src/environments/environment.prod.ts"
+                        }
+                    ]
                 }
             }
         },
+        "build-performance": {
+            "dependsOn": [
+                "electron-backend:build-worker-performance",
+                "electron-backend:build-embedded-mpv",
+                {
+                    "projects": ["web", "remote-control-web"],
+                    "target": "build-performance"
+                }
+            ],
+            "executor": "nx:run-commands",
+            "options": {
+                "command": "pnpm nx run electron-backend:build:electron-performance --excludeTaskDependencies"
+            }
+        },
         "build-e2e": {
             "dependsOn": [
                 "electron-backend:build-worker",
@@ -89,7 +135,11 @@
             "inputs": [
                 "production",
                 "^production",
-                "{workspaceRoot}/apps/electron-backend/native/build/Release/**"
+                "{workspaceRoot}/apps/electron-backend/native/build/Release/**",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts"
             ],
             "options": {
                 "outputPath": "dist/apps/electron-backend",
@@ -105,7 +155,16 @@
                             ".deps/**",
                             "obj.target/**",
                             "**/.deps/**",
-                            "**/obj.target/**"
+                            "**/obj.target/**",
+                            "obj/**",
+                            "**/obj/**",
+                            "**/*.pdb",
+                            "**/*.iobj",
+                            "**/*.ipdb",
+                            "**/*.ilk",
+                            "**/*.exp",
+                            "**/*.lib",
+                            "**/*.dll.a"
                         ]
                     }
                 ]
@@ -175,11 +234,27 @@
             }
         },
         "lint": {
-            "command": "eslint \"apps/electron-backend/**/*.ts\""
+            "inputs": [
+                "default",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts"
+            ],
+            "command": "eslint \"apps/electron-backend/**/*.ts\" \"apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts\" \"apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/**/*.ts\""
         },
         "test": {
             "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+            "inputs": [
+                "default",
+                "^production",
+                "{workspaceRoot}/jest.preset.js",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts"
+            ],
             "options": {
                 "jestConfig": "apps/electron-backend/jest.config.ts"
             }
diff --git a/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.spec.ts b/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.spec.ts
new file mode 100644
index 000000000..1aa09fad1
--- /dev/null
+++ b/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.spec.ts
@@ -0,0 +1,40 @@
+jest.mock('electron', () => ({
+    ipcRenderer: {
+        invoke: jest.fn(),
+        on: jest.fn(),
+    },
+}));
+
+import { copyStableLatestFrame } from './embedded-mpv-frame-pump';
+
+describe('embedded MPV frame pump', () => {
+    const frame = new ArrayBuffer(16);
+
+    it('drops a torn copy without consuming its sequence so the next tick retries', () => {
+        const reader = {
+            latestSeq: jest.fn(() => 7),
+            copyLatest: jest
+                .fn()
+                .mockReturnValueOnce({ seq: 7, ageMs: 1, torn: true })
+                .mockReturnValueOnce({ seq: 7, ageMs: 1, torn: false }),
+        };
+
+        expect(copyStableLatestFrame(reader, frame, 6)).toBeNull();
+        expect(copyStableLatestFrame(reader, frame, 6)).toEqual({
+            seq: 7,
+            ageMs: 1,
+            torn: false,
+        });
+        expect(reader.copyLatest).toHaveBeenCalledTimes(2);
+    });
+
+    it('does not copy when the producer has no newer sequence', () => {
+        const reader = {
+            latestSeq: jest.fn(() => 6),
+            copyLatest: jest.fn(),
+        };
+
+        expect(copyStableLatestFrame(reader, frame, 6)).toBeNull();
+        expect(reader.copyLatest).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.ts b/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.ts
new file mode 100644
index 000000000..a0b66f8fc
--- /dev/null
+++ b/apps/electron-backend/src/app/api/embedded-mpv-frame-pump.ts
@@ -0,0 +1,317 @@
+/**
+ * Frame pump for the frame-copy embedded MPV engine.
+ *
+ * Runs inside the preload script (isolated world, full Node access — the
+ * frame-copy experiment disables the window sandbox, see
+ * getMainWindowWebPreferences). It loads the shm frame-reader addon, copies
+ * the newest BGRA frame into a reused ArrayBuffer once per rAF, and uploads
+ * it into a WebGL2 texture on the renderer's `<canvas
+ * data-embedded-mpv-frame>` element. No frame data ever crosses the
+ * contextBridge — the bridge only exposes attach/detach lifecycle calls.
+ */
+import { ipcRenderer } from 'electron';
+import {
+    EMBEDDED_MPV_FRAME_SOURCE_CHANGED,
+    EMBEDDED_MPV_GET_FRAME_SOURCE,
+    EmbeddedMpvFrameSource,
+} from '@iptvnator/shared/interfaces';
+
+interface FrameReaderInfo {
+    width: number;
+    height: number;
+    stride: number;
+    frameBytes: number;
+    generation: number;
+}
+
+interface FrameCopyResult {
+    seq: number;
+    ageMs: number;
+    torn: boolean;
+}
+
+interface FrameReaderAddon {
+    open(shmName: string): FrameReaderInfo;
+    latestSeq(): number;
+    copyLatest(buffer: ArrayBuffer): FrameCopyResult | null;
+    producerAliveMs(): number;
+    close(): void;
+}
+
+/* Webpack rewrites bare `require`; the addon must go through the runtime
+ * require so the .node file is loaded by Node itself. */
+declare const __non_webpack_require__: NodeRequire | undefined;
+const nodeRequire: NodeRequire =
+    typeof __non_webpack_require__ === 'function'
+        ? __non_webpack_require__
+        : require;
+
+const CANVAS_SELECTOR = 'canvas[data-embedded-mpv-frame]';
+const ATTACH_TIMEOUT_MS = 5000;
+const ATTACH_POLL_MS = 100;
+
+// Note on orientation: the helper renders with MPV_RENDER_PARAM_FLIP_Y and
+// glReadPixels reads rows bottom-up, so the shm buffer arrives in texture
+// order already — sampling uses the un-flipped uv (a second flip here would
+// show the video upside down).
+const VERTEX_SHADER = `#version 300 es
+out vec2 v_uv;
+void main() {
+    vec2 corner = vec2((gl_VertexID << 1) & 2, gl_VertexID & 2);
+    v_uv = corner;
+    gl_Position = vec4(corner * 2.0 - 1.0, 0.0, 1.0);
+}`;
+
+const FRAGMENT_SHADER = `#version 300 es
+precision mediump float;
+uniform sampler2D u_tex;
+in vec2 v_uv;
+out vec4 o_color;
+void main() {
+    vec4 c = texture(u_tex, v_uv);
+    o_color = vec4(c.b, c.g, c.r, 1.0);
+}`;
+
+interface PumpState {
+    sessionId: string;
+    canvas: HTMLCanvasElement;
+    gl: WebGL2RenderingContext;
+    texture: WebGLTexture;
+    reader: FrameReaderAddon;
+    frame: Uint8Array;
+    width: number;
+    height: number;
+    lastSeq: number;
+    rafHandle: number;
+}
+
+let pump: PumpState | null = null;
+let sourceListenerRegistered = false;
+/**
+ * Monotonic attach epoch: bumped by every attach/detach. Async attach waits
+ * re-check it after each await so a stale attach (for a session that was
+ * replaced meanwhile) can never install itself over the active pump.
+ */
+let attachEpoch = 0;
+
+export function copyStableLatestFrame(
+    reader: Pick<FrameReaderAddon, 'latestSeq' | 'copyLatest'>,
+    buffer: ArrayBuffer,
+    lastSeq: number
+): FrameCopyResult | null {
+    if (reader.latestSeq() <= lastSeq) return null;
+
+    const result = reader.copyLatest(buffer);
+    // A torn memcpy raced the helper overwriting this ring slot. Keep the
+    // previous sequence so the next animation tick retries instead of
+    // uploading partially copied pixels or marking the frame consumed.
+    return result && !result.torn ? result : null;
+}
+
+function delay(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitForCanvas(): Promise<HTMLCanvasElement | null> {
+    const deadline = Date.now() + ATTACH_TIMEOUT_MS;
+    while (Date.now() < deadline) {
+        const canvas = document.querySelector<HTMLCanvasElement>(
+            CANVAS_SELECTOR
+        );
+        if (canvas) return canvas;
+        await delay(ATTACH_POLL_MS);
+    }
+    return null;
+}
+
+async function waitForFrameSource(
+    sessionId: string
+): Promise<EmbeddedMpvFrameSource | null> {
+    const deadline = Date.now() + ATTACH_TIMEOUT_MS;
+    while (Date.now() < deadline) {
+        const source = (await ipcRenderer.invoke(
+            EMBEDDED_MPV_GET_FRAME_SOURCE,
+            sessionId
+        )) as EmbeddedMpvFrameSource | null;
+        if (source?.shmName) return source;
+        await delay(ATTACH_POLL_MS);
+    }
+    return null;
+}
+
+function createGl(
+    canvas: HTMLCanvasElement
+): { gl: WebGL2RenderingContext; texture: WebGLTexture } | null {
+    const gl = canvas.getContext('webgl2', {
+        antialias: false,
+        alpha: false,
+        preserveDrawingBuffer: false,
+    });
+    if (!gl) return null;
+
+    const program = gl.createProgram();
+    for (const [type, source] of [
+        [gl.VERTEX_SHADER, VERTEX_SHADER],
+        [gl.FRAGMENT_SHADER, FRAGMENT_SHADER],
+    ] as const) {
+        const shader = gl.createShader(type);
+        if (!shader) return null;
+        gl.shaderSource(shader, source);
+        gl.compileShader(shader);
+        if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+            console.error(
+                '[embedded-mpv-pump] shader error:',
+                gl.getShaderInfoLog(shader)
+            );
+            return null;
+        }
+        gl.attachShader(program, shader);
+    }
+    gl.linkProgram(program);
+    gl.useProgram(program);
+    const vao = gl.createVertexArray();
+    gl.bindVertexArray(vao);
+
+    const texture = gl.createTexture();
+    gl.bindTexture(gl.TEXTURE_2D, texture);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+    return { gl, texture: texture as WebGLTexture };
+}
+
+function applySource(state: PumpState, source: EmbeddedMpvFrameSource): boolean {
+    try {
+        const info = state.reader.open(source.shmName);
+        state.width = info.width;
+        state.height = info.height;
+        state.frame = new Uint8Array(info.frameBytes);
+        state.lastSeq = 0;
+        state.canvas.width = info.width;
+        state.canvas.height = info.height;
+        state.gl.viewport(0, 0, info.width, info.height);
+        state.gl.texImage2D(
+            state.gl.TEXTURE_2D,
+            0,
+            state.gl.RGBA,
+            info.width,
+            info.height,
+            0,
+            state.gl.RGBA,
+            state.gl.UNSIGNED_BYTE,
+            null
+        );
+        return true;
+    } catch (error) {
+        console.error('[embedded-mpv-pump] failed to open frame ring:', error);
+        return false;
+    }
+}
+
+function pumpTick(): void {
+    if (!pump) return;
+    pump.rafHandle = requestAnimationFrame(pumpTick);
+
+    const { gl, reader, frame } = pump;
+    const result = copyStableLatestFrame(
+        reader,
+        frame.buffer as ArrayBuffer,
+        pump.lastSeq
+    );
+    if (result) {
+        gl.texSubImage2D(
+            gl.TEXTURE_2D,
+            0,
+            0,
+            0,
+            pump.width,
+            pump.height,
+            gl.RGBA,
+            gl.UNSIGNED_BYTE,
+            frame
+        );
+        pump.lastSeq = result.seq;
+        gl.drawArrays(gl.TRIANGLES, 0, 3);
+    }
+}
+
+function ensureSourceListener(): void {
+    if (sourceListenerRegistered) return;
+    sourceListenerRegistered = true;
+    ipcRenderer.on(
+        EMBEDDED_MPV_FRAME_SOURCE_CHANGED,
+        (_event, payload: { sessionId: string; source: EmbeddedMpvFrameSource }) => {
+            if (!pump || payload.sessionId !== pump.sessionId) return;
+            applySource(pump, payload.source);
+        }
+    );
+}
+
+export async function attachEmbeddedMpvFrameView(
+    sessionId: string
+): Promise<boolean> {
+    detachEmbeddedMpvFrameView();
+    const epoch = ++attachEpoch;
+    ensureSourceListener();
+
+    const canvas = await waitForCanvas();
+    if (epoch !== attachEpoch) return false;
+    if (!canvas) {
+        console.error('[embedded-mpv-pump] frame canvas not found in DOM');
+        return false;
+    }
+    const source = await waitForFrameSource(sessionId);
+    if (epoch !== attachEpoch) return false;
+    if (!source) {
+        console.error('[embedded-mpv-pump] no frame source for', sessionId);
+        return false;
+    }
+
+    let reader: FrameReaderAddon;
+    try {
+        reader = nodeRequire(source.readerPath) as FrameReaderAddon;
+    } catch (error) {
+        console.error('[embedded-mpv-pump] failed to load reader:', error);
+        return false;
+    }
+
+    const glSetup = createGl(canvas);
+    if (!glSetup) {
+        console.error('[embedded-mpv-pump] WebGL2 unavailable');
+        return false;
+    }
+
+    const state: PumpState = {
+        sessionId,
+        canvas,
+        gl: glSetup.gl,
+        texture: glSetup.texture,
+        reader,
+        frame: new Uint8Array(0),
+        width: 0,
+        height: 0,
+        lastSeq: 0,
+        rafHandle: 0,
+    };
+    if (!applySource(state, source)) {
+        reader.close();
+        return false;
+    }
+
+    pump = state;
+    pump.rafHandle = requestAnimationFrame(pumpTick);
+    return true;
+}
+
+export function detachEmbeddedMpvFrameView(): void {
+    attachEpoch++; // aborts any attach still waiting on canvas/frame source
+    if (!pump) return;
+    cancelAnimationFrame(pump.rafHandle);
+    try {
+        pump.reader.close();
+    } catch {
+        // reader may already be gone with the helper; nothing to release
+    }
+    pump = null;
+}
diff --git a/apps/electron-backend/src/app/api/main.preload.performance.contract.spec.ts b/apps/electron-backend/src/app/api/main.preload.performance.contract.spec.ts
new file mode 100644
index 000000000..e4dc78a44
--- /dev/null
+++ b/apps/electron-backend/src/app/api/main.preload.performance.contract.spec.ts
@@ -0,0 +1,343 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_MARKER_CHANNEL,
+    PRELOAD_PERFORMANCE_METHOD,
+    type Playlist,
+    type PreloadPerformanceMarker,
+} from '@iptvnator/shared/interfaces';
+import {
+    createPlaylist,
+    createPreloadPerformanceHarness,
+    createRefreshPayload,
+    expectFixedMarkers,
+    PRELOAD_ENVIRONMENT,
+    type PreloadPerformanceHarness,
+} from './main.preload.performance.test-helpers';
+
+describe('main preload performance marker contract', () => {
+    let harness: PreloadPerformanceHarness;
+
+    beforeEach(() => {
+        harness = createPreloadPerformanceHarness();
+    });
+
+    afterEach(() => {
+        harness.cleanup();
+    });
+
+    async function loadPerformancePreload(): Promise<void> {
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: '1',
+        });
+    }
+
+    it('preserves calls while emitting ordered, correlated, fixed, redacted markers', async () => {
+        const secrets = {
+            favorite: 'sentinel-favorite-secret',
+            filePath: '/sentinel/private/playlist.m3u',
+            host: 'sentinel.private.example',
+            item: 'sentinel-item-secret',
+            result: 'sentinel-result-secret',
+            title: 'sentinel-title-secret',
+            url: 'https://sentinel.example/private.m3u?token=secret',
+        };
+        const payload = createRefreshPayload({
+            filePath: secrets.filePath,
+            title: secrets.title,
+            trustedInsecureTlsHosts: [secrets.host],
+            url: secrets.url,
+        });
+        const refreshedPlaylist = createPlaylist(payload.playlistId, {
+            favorites: [secrets.favorite],
+            items: [{ name: secrets.item }],
+            title: secrets.title,
+            url: secrets.url,
+        });
+        const storedPlaylist = createPlaylist(payload.playlistId, {
+            filePath: secrets.filePath,
+            title: secrets.title,
+        });
+        const upsertPlaylist = createPlaylist(payload.playlistId, {
+            favorites: [secrets.favorite],
+            items: [{ name: secrets.item }],
+            title: secrets.title,
+        });
+        const upsertResult = {
+            secretResult: secrets.result,
+            success: true,
+        };
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke
+            .mockResolvedValueOnce(refreshedPlaylist)
+            .mockResolvedValueOnce(storedPlaylist)
+            .mockResolvedValueOnce(upsertResult);
+        const api = harness.getApi();
+
+        await expect(api.refreshPlaylist(payload)).resolves.toBe(
+            refreshedPlaylist
+        );
+        await expect(
+            api.dbGetAppPlaylist(payload.playlistId, payload.operationId)
+        ).resolves.toBe(storedPlaylist);
+        await expect(
+            api.dbUpsertAppPlaylist(upsertPlaylist, payload.operationId)
+        ).resolves.toBe(upsertResult);
+
+        expect(harness.ipcRenderer.invoke.mock.calls).toEqual([
+            ['PLAYLIST:REFRESH', payload],
+            ['DB_GET_APP_PLAYLIST', payload.playlistId],
+            ['DB_UPSERT_APP_PLAYLIST', upsertPlaylist],
+        ]);
+        const markers = harness.getMarkers();
+        expect(markers).toHaveLength(6);
+        expect(
+            markers.map(({ ipcCallId, method, phase }) => [
+                ipcCallId,
+                method,
+                phase,
+            ])
+        ).toEqual([
+            [1, PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST, 'start'],
+            [1, PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST, 'success'],
+            [2, PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST, 'start'],
+            [2, PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST, 'success'],
+            [3, PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST, 'start'],
+            [3, PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST, 'success'],
+        ]);
+        expect(markers.map(({ correlationState }) => correlationState)).toEqual(
+            [
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+            ]
+        );
+        expect(markers.map(({ operationId }) => operationId)).toEqual(
+            Array(6).fill(payload.operationId)
+        );
+        expect(markers.map(({ playlistId }) => playlistId)).toEqual(
+            Array(6).fill(payload.playlistId)
+        );
+        expect(markers.map(({ invalidReason }) => invalidReason)).toEqual(
+            Array(6).fill(null)
+        );
+        expectFixedMarkers(markers);
+
+        const markerSendOrders = harness.ipcRenderer.send.mock.calls.flatMap(
+            ([channel], index) =>
+                channel === PRELOAD_PERFORMANCE_MARKER_CHANNEL
+                    ? [harness.ipcRenderer.send.mock.invocationCallOrder[index]]
+                    : []
+        );
+        const invokeOrders =
+            harness.ipcRenderer.invoke.mock.invocationCallOrder;
+        for (const [index, invokeOrder] of invokeOrders.entries()) {
+            expect(markerSendOrders[index * 2]).toBeLessThan(invokeOrder);
+        }
+
+        const serializedMarkers = JSON.stringify(markers);
+        for (const secret of Object.values(secrets)) {
+            expect(serializedMarkers).not.toContain(secret);
+        }
+    });
+
+    it('preserves rejection identity and emits a redacted error', async () => {
+        const payload = createRefreshPayload({
+            title: 'sentinel-rejection-title',
+            url: 'https://sentinel.example/rejected.m3u',
+        });
+        const rejection = new Error('sentinel-rejection-error');
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke.mockRejectedValueOnce(rejection);
+
+        await expect(harness.getApi().refreshPlaylist(payload)).rejects.toBe(
+            rejection
+        );
+
+        const markers = harness.getMarkers();
+        expect(markerPhases(markers)).toEqual([
+            [1, 'start'],
+            [1, 'error'],
+        ]);
+        expect(markers[1]).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.IPC_ERROR,
+            operationId: payload.operationId,
+            playlistId: payload.playlistId,
+        });
+        expect(JSON.stringify(markers)).not.toContain(rejection.message);
+        expect(JSON.stringify(markers)).not.toContain(payload.title);
+        expect(JSON.stringify(markers)).not.toContain(payload.url);
+    });
+
+    it('preserves synchronous throw identity and emits a redacted error', async () => {
+        const synchronousError = new Error('sentinel-synchronous-error');
+        const payload = createRefreshPayload();
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke.mockImplementationOnce(() => {
+            throw synchronousError;
+        });
+
+        let caughtError: unknown;
+        try {
+            harness.getApi().refreshPlaylist(payload);
+        } catch (error) {
+            caughtError = error;
+        }
+
+        expect(caughtError).toBe(synchronousError);
+        const markers = harness.getMarkers();
+        expect(markerPhases(markers)).toEqual([
+            [1, 'start'],
+            [1, 'error'],
+        ]);
+        expect(markers[1]).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.IPC_ERROR,
+        });
+        expect(JSON.stringify(markers)).not.toContain(synchronousError.message);
+    });
+
+    it('closes a structured refresh cancellation with a fixed reason', async () => {
+        const payload = createRefreshPayload();
+        const cancelledResult = {
+            operationId: payload.operationId,
+            type: 'playlist-refresh-cancelled',
+        } as const;
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke
+            .mockResolvedValueOnce(cancelledResult)
+            .mockResolvedValueOnce(null);
+        const api = harness.getApi();
+
+        await expect(api.refreshPlaylist(payload)).resolves.toBe(
+            cancelledResult
+        );
+        await api.dbGetAppPlaylist(payload.playlistId);
+
+        const markers = harness.getMarkers();
+        expect(markers[1]).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.REFRESH_CANCELLED,
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: payload.operationId,
+            phase: 'success',
+            playlistId: payload.playlistId,
+        });
+        expect(markers[2]).toMatchObject({
+            correlationState:
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: null,
+            phase: 'start',
+        });
+    });
+
+    it('uses the exact upsert _id and keeps one malformed reason in both phases', async () => {
+        const malformedPlaylist = {
+            ...createPlaylist('placeholder'),
+            _id: {
+                secret: 'sentinel-malformed-playlist-id',
+            },
+        } as unknown as Playlist;
+        const result = { success: true };
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke.mockResolvedValueOnce(result);
+
+        await expect(
+            harness.getApi().dbUpsertAppPlaylist(malformedPlaylist)
+        ).resolves.toBe(result);
+        expect(harness.ipcRenderer.invoke).toHaveBeenCalledWith(
+            'DB_UPSERT_APP_PLAYLIST',
+            malformedPlaylist
+        );
+
+        const markers = harness.getMarkers();
+        expect(
+            markers.map(
+                ({ correlationState, invalidReason, phase, playlistId }) => ({
+                    correlationState,
+                    invalidReason,
+                    phase,
+                    playlistId,
+                })
+            )
+        ).toEqual([
+            {
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason:
+                    PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+                phase: 'start',
+                playlistId: null,
+            },
+            {
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason:
+                    PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+                phase: 'success',
+                playlistId: null,
+            },
+        ]);
+        expect(markers[0].ipcCallId).toBe(markers[1].ipcCallId);
+        expect(JSON.stringify(markers)).not.toContain(
+            'sentinel-malformed-playlist-id'
+        );
+    });
+
+    it('poisons correlation after the first marker delivery failure', async () => {
+        const payload = createRefreshPayload();
+        const result = createPlaylist(payload.playlistId);
+        await loadPerformancePreload();
+        harness.ipcRenderer.invoke
+            .mockResolvedValueOnce(result)
+            .mockResolvedValueOnce(result)
+            .mockResolvedValueOnce({ success: true });
+        harness.ipcRenderer.send.mockImplementationOnce((channel: string) => {
+            if (channel === PRELOAD_PERFORMANCE_MARKER_CHANNEL) {
+                throw new Error('marker-send-failed');
+            }
+        });
+
+        await expect(harness.getApi().refreshPlaylist(payload)).resolves.toBe(
+            result
+        );
+        await expect(
+            harness
+                .getApi()
+                .dbGetAppPlaylist(payload.playlistId, payload.operationId)
+        ).resolves.toBe(result);
+        await expect(
+            harness.getApi().dbUpsertAppPlaylist(result, payload.operationId)
+        ).resolves.toEqual({ success: true });
+        expect(
+            harness.ipcRenderer.send.mock.calls.filter(
+                ([channel]) => channel === PRELOAD_PERFORMANCE_MARKER_CHANNEL
+            )
+        ).toHaveLength(1);
+        expect(harness.getMarkers()).toHaveLength(1);
+        expect(harness.getMarkers()[0]).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            phase: 'start',
+        });
+        expect(
+            harness
+                .getMarkers()
+                .some(
+                    ({ correlationState }) =>
+                        correlationState ===
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE
+                )
+        ).toBe(false);
+    });
+});
+
+function markerPhases(
+    markers: PreloadPerformanceMarker[]
+): [number, PreloadPerformanceMarker['phase']][] {
+    return markers.map(({ ipcCallId, phase }) => [ipcCallId, phase]);
+}
diff --git a/apps/electron-backend/src/app/api/main.preload.performance.gates.spec.ts b/apps/electron-backend/src/app/api/main.preload.performance.gates.spec.ts
new file mode 100644
index 000000000..518f9376d
--- /dev/null
+++ b/apps/electron-backend/src/app/api/main.preload.performance.gates.spec.ts
@@ -0,0 +1,247 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_MARKER_CHANNEL,
+    PRELOAD_PERFORMANCE_METHOD,
+    type Settings,
+    Theme,
+} from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
+import { DEBUG_TRACE_EVENT_CHANNEL } from '../services/debug-trace';
+import {
+    createPreloadPerformanceHarness,
+    PRELOAD_ENVIRONMENT,
+    type PreloadPerformanceHarness,
+} from './main.preload.performance.test-helpers';
+
+describe('main preload performance marker gates', () => {
+    let harness: PreloadPerformanceHarness;
+
+    beforeEach(() => {
+        harness = createPreloadPerformanceHarness();
+    });
+
+    afterEach(() => {
+        harness.cleanup();
+        jest.restoreAllMocks();
+    });
+
+    it.each([undefined, '', '0', 'false', 'no', 'off'])(
+        'emits no marker when the performance flag is %s',
+        async (flagValue) => {
+            await harness.load(
+                flagValue === undefined
+                    ? {}
+                    : {
+                          [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: flagValue,
+                      }
+            );
+
+            await harness.getApi().dbGetAppPlaylist('playlist-1');
+
+            expect(harness.getMarkers()).toEqual([]);
+        }
+    );
+
+    it.each(['1', ' TRUE ', 'yes', 'On'])(
+        'accepts the existing true flag value %s',
+        async (flagValue) => {
+            await harness.load({
+                [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: flagValue,
+            });
+
+            await harness.getApi().dbGetAppPlaylist('playlist-1');
+
+            expect(
+                harness.getMarkers().map(({ correlationState, phase }) => ({
+                    correlationState,
+                    phase,
+                }))
+            ).toEqual([
+                {
+                    correlationState:
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+                    phase: 'start',
+                },
+                {
+                    correlationState:
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+                    phase: 'success',
+                },
+            ]);
+        }
+    );
+
+    it('keeps trace-only calls on the existing debug channel', async () => {
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.TRACE_IPC]: '1',
+        });
+
+        await harness.getApi().dbGetAppPlaylist('playlist-1');
+
+        expect(
+            harness
+                .getSentPayloads<
+                    Record<string, unknown>
+                >(DEBUG_TRACE_EVENT_CHANNEL)
+                .map(({ method, phase }) => ({ method, phase }))
+        ).toEqual([
+            {
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'start',
+            },
+            {
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'success',
+            },
+        ]);
+        expect(harness.getMarkers()).toEqual([]);
+    });
+
+    it('keeps debug tracing unchanged when both gates are enabled', async () => {
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: '1',
+            [PRELOAD_ENVIRONMENT.TRACE_IPC]: '1',
+        });
+
+        await harness.getApi().dbGetAppPlaylist('playlist-1');
+
+        expect(
+            harness
+                .getSentPayloads<
+                    Record<string, unknown>
+                >(DEBUG_TRACE_EVENT_CHANNEL)
+                .map(({ method, phase }) => ({ method, phase }))
+        ).toEqual([
+            {
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'start',
+            },
+            {
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'success',
+            },
+        ]);
+        expect(
+            harness.getSentPayloads(PRELOAD_PERFORMANCE_MARKER_CHANNEL).length
+        ).toBe(2);
+    });
+
+    it('does not inspect or mark non-target calls in performance-only mode', async () => {
+        const result = { success: true };
+        const settings = Object.defineProperty({}, 'sentinel', {
+            enumerable: true,
+            get: () => {
+                throw new Error('non-target arguments must stay opaque');
+            },
+        }) as Partial<Settings>;
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: '1',
+        });
+        harness.ipcRenderer.invoke.mockResolvedValueOnce(result);
+
+        await expect(harness.getApi().updateSettings(settings)).resolves.toBe(
+            result
+        );
+
+        expect(harness.ipcRenderer.invoke).toHaveBeenCalledWith(
+            'SETTINGS_UPDATE',
+            settings
+        );
+        expect(harness.getMarkers()).toEqual([]);
+    });
+
+    it('preserves the full legacy trace payload for non-target success', async () => {
+        const settings = {
+            password: 'sentinel-argument-secret',
+            theme: Theme.DarkTheme,
+        } as Partial<Settings>;
+        const result = {
+            password: 'sentinel-result-secret',
+            success: true,
+        };
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.TRACE_IPC]: '1',
+        });
+        jest.spyOn(globalThis.performance, 'now')
+            .mockReturnValueOnce(10)
+            .mockReturnValueOnce(12.34);
+        harness.ipcRenderer.invoke.mockResolvedValueOnce(result);
+
+        await expect(harness.getApi().updateSettings(settings)).resolves.toBe(
+            result
+        );
+
+        const traces = harness.getSentPayloads<Record<string, unknown>>(
+            DEBUG_TRACE_EVENT_CHANNEL
+        );
+        expect(traces).toEqual([
+            {
+                args: {
+                    items: [
+                        {
+                            password: 'sentinel-argument-secret',
+                            theme: Theme.DarkTheme,
+                        },
+                    ],
+                    length: 1,
+                    type: 'array',
+                },
+                method: 'updateSettings',
+                phase: 'start',
+            },
+            {
+                durationMs: 2.3,
+                method: 'updateSettings',
+                phase: 'success',
+                result,
+            },
+        ]);
+        const redacted = JSON.stringify(redactSensitiveData(traces));
+        expect(redacted).not.toContain('sentinel-argument-secret');
+        expect(redacted).not.toContain('sentinel-result-secret');
+        expect(harness.getMarkers()).toEqual([]);
+    });
+
+    it('preserves the full legacy trace payload for non-target errors', async () => {
+        const rejection = new Error('token=sentinel-error-secret');
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.TRACE_IPC]: '1',
+        });
+        jest.spyOn(globalThis.performance, 'now')
+            .mockReturnValueOnce(20)
+            .mockReturnValueOnce(23.26);
+        harness.ipcRenderer.invoke.mockRejectedValueOnce(rejection);
+
+        await expect(
+            harness.getApi().updateSettings({ theme: Theme.LightTheme })
+        ).rejects.toBe(rejection);
+
+        const traces = harness.getSentPayloads<Record<string, unknown>>(
+            DEBUG_TRACE_EVENT_CHANNEL
+        );
+        expect(traces).toEqual([
+            {
+                args: {
+                    items: [{ theme: Theme.LightTheme }],
+                    length: 1,
+                    type: 'array',
+                },
+                method: 'updateSettings',
+                phase: 'start',
+            },
+            {
+                durationMs: 3.3,
+                error: {
+                    message: rejection.message,
+                    name: 'Error',
+                },
+                method: 'updateSettings',
+                phase: 'error',
+            },
+        ]);
+        expect(JSON.stringify(redactSensitiveData(traces))).not.toContain(
+            'sentinel-error-secret'
+        );
+        expect(harness.getMarkers()).toEqual([]);
+    });
+});
diff --git a/apps/electron-backend/src/app/api/main.preload.performance.identity.spec.ts b/apps/electron-backend/src/app/api/main.preload.performance.identity.spec.ts
new file mode 100644
index 000000000..ae6306c18
--- /dev/null
+++ b/apps/electron-backend/src/app/api/main.preload.performance.identity.spec.ts
@@ -0,0 +1,79 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    createPlaylist,
+    createPreloadPerformanceHarness,
+    createRefreshPayload,
+    PRELOAD_ENVIRONMENT,
+    type PreloadPerformanceHarness,
+} from './main.preload.performance.test-helpers';
+
+describe('main preload performance marker identities', () => {
+    let harness: PreloadPerformanceHarness;
+
+    beforeEach(async () => {
+        harness = createPreloadPerformanceHarness();
+        await harness.load({
+            [PRELOAD_ENVIRONMENT.PERF_CAPTURE]: '1',
+        });
+    });
+
+    afterEach(() => {
+        harness.cleanup();
+    });
+
+    it('completes only for database calls carrying the refresh operation ID', async () => {
+        const payload = createRefreshPayload();
+        const playlist = createPlaylist(payload.playlistId);
+        harness.ipcRenderer.invoke.mockResolvedValue(playlist);
+        const api = harness.getApi();
+
+        await api.refreshPlaylist(payload);
+        await api.dbGetAppPlaylist(payload.playlistId);
+        await api.dbUpsertAppPlaylist(playlist);
+        await api.dbGetAppPlaylist(payload.playlistId, 'other-operation');
+        await api.dbUpsertAppPlaylist(playlist, 'other-operation');
+
+        expect(
+            harness
+                .getMarkers()
+                .slice(2)
+                .every(
+                    ({ correlationState }) =>
+                        correlationState ===
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED
+                )
+        ).toBe(true);
+        expect(
+            harness
+                .getMarkers()
+                .some(
+                    ({ correlationState }) =>
+                        correlationState ===
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE
+                )
+        ).toBe(false);
+
+        await api.dbGetAppPlaylist(payload.playlistId, payload.operationId);
+        await api.dbUpsertAppPlaylist(playlist, payload.operationId);
+
+        const markers = harness.getMarkers();
+        expect(markers.at(-1)).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: payload.operationId,
+            playlistId: payload.playlistId,
+        });
+        expect(harness.ipcRenderer.invoke.mock.calls).toEqual([
+            ['PLAYLIST:REFRESH', payload],
+            ['DB_GET_APP_PLAYLIST', payload.playlistId],
+            ['DB_UPSERT_APP_PLAYLIST', playlist],
+            ['DB_GET_APP_PLAYLIST', payload.playlistId],
+            ['DB_UPSERT_APP_PLAYLIST', playlist],
+            ['DB_GET_APP_PLAYLIST', payload.playlistId],
+            ['DB_UPSERT_APP_PLAYLIST', playlist],
+        ]);
+    });
+});
diff --git a/apps/electron-backend/src/app/api/main.preload.performance.test-helpers.ts b/apps/electron-backend/src/app/api/main.preload.performance.test-helpers.ts
new file mode 100644
index 000000000..69c8a7e0f
--- /dev/null
+++ b/apps/electron-backend/src/app/api/main.preload.performance.test-helpers.ts
@@ -0,0 +1,162 @@
+import type {
+    ElectronBridgeApi,
+    Playlist,
+    PlaylistRefreshPayload,
+    PreloadPerformanceMarker,
+} from '@iptvnator/shared/interfaces';
+
+export const PRELOAD_ENVIRONMENT = {
+    PERF_CAPTURE: 'IPTVNATOR_PERF_CAPTURE',
+    TRACE_IPC: 'IPTVNATOR_TRACE_IPC',
+    TRACE_STARTUP: 'IPTVNATOR_TRACE_STARTUP',
+} as const;
+
+type PreloadEnvironmentName =
+    (typeof PRELOAD_ENVIRONMENT)[keyof typeof PRELOAD_ENVIRONMENT];
+
+type PreloadEnvironment = Partial<Record<PreloadEnvironmentName, string>>;
+
+export type ExposedElectronApi = ElectronBridgeApi &
+    Record<string, (...args: unknown[]) => unknown>;
+
+export interface MockIpcRenderer {
+    invoke: jest.Mock;
+    off: jest.Mock;
+    on: jest.Mock;
+    send: jest.Mock;
+}
+
+export interface PreloadPerformanceHarness {
+    cleanup: () => void;
+    getApi: () => ExposedElectronApi;
+    getMarkers: () => PreloadPerformanceMarker[];
+    getSentPayloads: <T>(channel: string) => T[];
+    ipcRenderer: MockIpcRenderer;
+    load: (environment?: PreloadEnvironment) => Promise<void>;
+}
+
+const MARKER_KEYS = [
+    'correlationState',
+    'invalidReason',
+    'ipcCallId',
+    'method',
+    'operationId',
+    'phase',
+    'playlistId',
+    'sourceEpochMs',
+] as const;
+
+export function createPlaylist(
+    playlistId: string,
+    overrides: Partial<Playlist> = {}
+): Playlist {
+    return {
+        _id: playlistId,
+        autoRefresh: false,
+        count: 1,
+        importDate: '2026-07-26T00:00:00.000Z',
+        lastUsage: '2026-07-26T00:00:00.000Z',
+        title: 'Performance fixture',
+        ...overrides,
+    };
+}
+
+export function createRefreshPayload(
+    overrides: Partial<PlaylistRefreshPayload> = {}
+): PlaylistRefreshPayload {
+    return {
+        operationId: 'operation-1',
+        playlistId: 'playlist-1',
+        title: 'Performance fixture',
+        ...overrides,
+    };
+}
+
+export function expectFixedMarkers(markers: PreloadPerformanceMarker[]): void {
+    for (const [index, marker] of markers.entries()) {
+        expect(Object.keys(marker).sort()).toEqual([...MARKER_KEYS].sort());
+        expect(Number.isFinite(marker.sourceEpochMs)).toBe(true);
+        if (index > 0) {
+            expect(marker.sourceEpochMs).toBeGreaterThanOrEqual(
+                markers[index - 1].sourceEpochMs
+            );
+        }
+    }
+}
+
+export function createPreloadPerformanceHarness(): PreloadPerformanceHarness {
+    const originalEnvironment = new Map<
+        PreloadEnvironmentName,
+        string | undefined
+    >(
+        Object.values(PRELOAD_ENVIRONMENT).map((name) => [
+            name,
+            process.env[name],
+        ])
+    );
+    let exposedApi: ExposedElectronApi | null = null;
+    const ipcRenderer: MockIpcRenderer = {
+        invoke: jest.fn(),
+        off: jest.fn(),
+        on: jest.fn(),
+        send: jest.fn(),
+    };
+
+    function getSentPayloads<T>(channel: string): T[] {
+        return ipcRenderer.send.mock.calls
+            .filter(([sentChannel]) => sentChannel === channel)
+            .map(([, payload]) => payload as T);
+    }
+
+    return {
+        cleanup: () => {
+            for (const [name, value] of originalEnvironment) {
+                if (value === undefined) {
+                    delete process.env[name];
+                } else {
+                    process.env[name] = value;
+                }
+            }
+            jest.dontMock('electron');
+        },
+        getApi: () => {
+            if (!exposedApi) {
+                throw new Error('Expected preload API to be exposed');
+            }
+            return exposedApi;
+        },
+        getMarkers: () =>
+            getSentPayloads<PreloadPerformanceMarker>(
+                'IPTVNATOR_PERF_CAPTURE_MARKER'
+            ),
+        getSentPayloads,
+        ipcRenderer,
+        load: async (environment = {}) => {
+            jest.resetModules();
+            for (const name of Object.values(PRELOAD_ENVIRONMENT)) {
+                delete process.env[name];
+            }
+            Object.assign(process.env, environment);
+            exposedApi = null;
+            ipcRenderer.invoke.mockReset().mockResolvedValue({ success: true });
+            ipcRenderer.off.mockReset();
+            ipcRenderer.on.mockReset();
+            ipcRenderer.send.mockReset();
+            jest.doMock('electron', () => ({
+                contextBridge: {
+                    exposeInMainWorld: jest.fn(
+                        (_name: string, api: ExposedElectronApi) => {
+                            exposedApi = api;
+                        }
+                    ),
+                },
+                ipcRenderer,
+                webUtils: {
+                    getPathForFile: jest.fn(),
+                },
+            }));
+
+            await import('./main.preload');
+        },
+    };
+}
diff --git a/apps/electron-backend/src/app/api/main.preload.spec-data.ts b/apps/electron-backend/src/app/api/main.preload.spec-data.ts
index 229524cf8..effaa9c1d 100644
--- a/apps/electron-backend/src/app/api/main.preload.spec-data.ts
+++ b/apps/electron-backend/src/app/api/main.preload.spec-data.ts
@@ -34,7 +34,9 @@ const streams = [{ stream_id: 42, name: 'Channel' }];
 const favorites = [{ contentId: 1, playlistId }];
 const recentlyViewed = [{ contentId: 2, playlistId }];
 const categoryIds = [10, 11];
-const reorderUpdates = [{ content_id: 12, position: 1 }];
+const reorderUpdates = [
+    { content_id: 12, playlist_id: 'playlist-1', position: 1 },
+];
 const recentItemsBatch = [{ contentId: 13, playlistId }];
 const playbackData = {
     contentXtreamId: 42,
@@ -368,6 +370,18 @@ export const dbPreloadCases: PreloadInvokeCase[] = [
         channel: 'DB_SET_TMDB_METADATA',
         forwardedArgs: [tmdbCacheEntry],
     },
+    {
+        method: 'dbGetTmdbCacheStats',
+        args: [],
+        channel: 'DB_GET_TMDB_CACHE_STATS',
+        forwardedArgs: [],
+    },
+    {
+        method: 'dbClearTmdbMetadata',
+        args: [],
+        channel: 'DB_CLEAR_TMDB_METADATA',
+        forwardedArgs: [],
+    },
     {
         method: 'dbMatchTitles',
         args: [[['The Matrix', 'Inception']][0]],
diff --git a/apps/electron-backend/src/app/api/main.preload.spec.ts b/apps/electron-backend/src/app/api/main.preload.spec.ts
index aaf54a94e..54d2ddc9f 100644
--- a/apps/electron-backend/src/app/api/main.preload.spec.ts
+++ b/apps/electron-backend/src/app/api/main.preload.spec.ts
@@ -220,6 +220,29 @@ describe('main preload DB IPC contract', () => {
         );
     });
 
+    it('preserves a structured playlist cancellation result across the context bridge', async () => {
+        const api = getExposedApi();
+        const payload = {
+            operationId: 'playlist-refresh-cancelled',
+            playlistId: 'playlist-1',
+            title: 'Large playlist',
+            url: 'http://127.0.0.1/large.m3u',
+        };
+        const cancelledResult = {
+            operationId: payload.operationId,
+            type: 'playlist-refresh-cancelled',
+        } as const;
+        mockIpcRenderer.invoke.mockResolvedValueOnce(cancelledResult);
+
+        await expect(api.refreshPlaylist(payload)).resolves.toEqual(
+            cancelledResult
+        );
+        expect(mockIpcRenderer.invoke).toHaveBeenLastCalledWith(
+            'PLAYLIST:REFRESH',
+            payload
+        );
+    });
+
     it('keeps the legacy save-content progress bridge scoped to progress events', () => {
         const api = getExposedApi();
         const callback = jest.fn();
diff --git a/apps/electron-backend/src/app/api/main.preload.ts b/apps/electron-backend/src/app/api/main.preload.ts
index 743220410..6f39995da 100644
--- a/apps/electron-backend/src/app/api/main.preload.ts
+++ b/apps/electron-backend/src/app/api/main.preload.ts
@@ -7,6 +7,14 @@ import {
     APP_UPDATE_INSTALL,
     APP_UPDATE_STATUS_CHANGED,
 } from '@iptvnator/shared/interfaces/ipc-commands';
+import {
+    attachEmbeddedMpvFrameView,
+    detachEmbeddedMpvFrameView,
+} from './embedded-mpv-frame-pump';
+import {
+    createPreloadPerformanceCapture,
+    toPreloadPerformanceTargetMethod,
+} from './preload-performance-capture';
 import type {
     EmbeddedMpvBounds,
     EmbeddedMpvRecordingStartOptions,
@@ -44,6 +52,7 @@ import type {
 } from '@iptvnator/shared/interfaces';
 import {
     DEBUG_TRACE_EVENT_CHANNEL,
+    isPerformanceCaptureEnabled,
     isRendererApiTraceEnabled,
     roundTraceDuration,
     summarizeForTrace,
@@ -68,6 +77,11 @@ const dbSaveContentProgressListeners = new Set<
 >();
 
 const shouldTraceRendererApi = isRendererApiTraceEnabled();
+const shouldCapturePerformance = isPerformanceCaptureEnabled();
+const preloadPerformanceCapture = createPreloadPerformanceCapture(
+    shouldCapturePerformance,
+    (channel, marker) => ipcRenderer.send(channel, marker)
+);
 
 function emitRendererTrace(payload: {
     method: string;
@@ -85,7 +99,7 @@ function emitRendererTrace(payload: {
 }
 
 function wrapElectronApi<T extends object>(api: T): T {
-    if (!shouldTraceRendererApi) {
+    if (!shouldTraceRendererApi && !shouldCapturePerformance) {
         return api;
     }
 
@@ -94,7 +108,9 @@ function wrapElectronApi<T extends object>(api: T): T {
             if (
                 typeof value !== 'function' ||
                 name.startsWith('on') ||
-                name.startsWith('remove')
+                name.startsWith('remove') ||
+                (!shouldTraceRendererApi &&
+                    !toPreloadPerformanceTargetMethod(name))
             ) {
                 return [name, value];
             }
@@ -104,13 +120,20 @@ function wrapElectronApi<T extends object>(api: T): T {
             return [
                 name,
                 (...args: unknown[]) => {
-                    const startedAt =
-                        globalThis.performance?.now?.() ?? Date.now();
-                    emitRendererTrace({
-                        args: summarizeForTrace(args),
-                        method: name,
-                        phase: 'start',
-                    });
+                    const startedAt = shouldTraceRendererApi
+                        ? (globalThis.performance?.now?.() ?? Date.now())
+                        : 0;
+                    if (shouldTraceRendererApi) {
+                        emitRendererTrace({
+                            args: summarizeForTrace(args),
+                            method: name,
+                            phase: 'start',
+                        });
+                    }
+                    const performanceCall = preloadPerformanceCapture.start(
+                        name,
+                        args
+                    );
 
                     try {
                         const result = original(...args);
@@ -122,54 +145,74 @@ function wrapElectronApi<T extends object>(api: T): T {
                         ) {
                             return (result as Promise<unknown>)
                                 .then((resolvedValue) => {
-                                    emitRendererTrace({
-                                        durationMs: roundTraceDuration(
-                                            (globalThis.performance?.now?.() ??
-                                                Date.now()) - startedAt
-                                        ),
-                                        method: name,
-                                        phase: 'success',
-                                        result: summarizeForTrace(
-                                            resolvedValue
-                                        ),
-                                    });
+                                    if (shouldTraceRendererApi) {
+                                        emitRendererTrace({
+                                            durationMs: roundTraceDuration(
+                                                (globalThis.performance?.now?.() ??
+                                                    Date.now()) - startedAt
+                                            ),
+                                            method: name,
+                                            phase: 'success',
+                                            result: summarizeForTrace(
+                                                resolvedValue
+                                            ),
+                                        });
+                                    }
+                                    preloadPerformanceCapture.success(
+                                        performanceCall,
+                                        resolvedValue
+                                    );
                                     return resolvedValue;
                                 })
                                 .catch((error: unknown) => {
-                                    emitRendererTrace({
-                                        durationMs: roundTraceDuration(
-                                            (globalThis.performance?.now?.() ??
-                                                Date.now()) - startedAt
-                                        ),
-                                        error: summarizeForTrace(error),
-                                        method: name,
-                                        phase: 'error',
-                                    });
+                                    if (shouldTraceRendererApi) {
+                                        emitRendererTrace({
+                                            durationMs: roundTraceDuration(
+                                                (globalThis.performance?.now?.() ??
+                                                    Date.now()) - startedAt
+                                            ),
+                                            error: summarizeForTrace(error),
+                                            method: name,
+                                            phase: 'error',
+                                        });
+                                    }
+                                    preloadPerformanceCapture.error(
+                                        performanceCall
+                                    );
                                     throw error;
                                 });
                         }
 
-                        emitRendererTrace({
-                            durationMs: roundTraceDuration(
-                                (globalThis.performance?.now?.() ??
-                                    Date.now()) - startedAt
-                            ),
-                            method: name,
-                            phase: 'success',
-                            result: summarizeForTrace(result),
-                        });
+                        if (shouldTraceRendererApi) {
+                            emitRendererTrace({
+                                durationMs: roundTraceDuration(
+                                    (globalThis.performance?.now?.() ??
+                                        Date.now()) - startedAt
+                                ),
+                                method: name,
+                                phase: 'success',
+                                result: summarizeForTrace(result),
+                            });
+                        }
+                        preloadPerformanceCapture.success(
+                            performanceCall,
+                            result
+                        );
 
                         return result;
                     } catch (error) {
-                        emitRendererTrace({
-                            durationMs: roundTraceDuration(
-                                (globalThis.performance?.now?.() ??
-                                    Date.now()) - startedAt
-                            ),
-                            error: summarizeForTrace(error),
-                            method: name,
-                            phase: 'error',
-                        });
+                        if (shouldTraceRendererApi) {
+                            emitRendererTrace({
+                                durationMs: roundTraceDuration(
+                                    (globalThis.performance?.now?.() ??
+                                        Date.now()) - startedAt
+                                ),
+                                error: summarizeForTrace(error),
+                                method: name,
+                                phase: 'error',
+                            });
+                        }
+                        preloadPerformanceCapture.error(performanceCall);
                         throw error;
                     }
                 },
@@ -484,6 +527,9 @@ const electronApi: ElectronBridgeApi = {
         sessionId: string
     ): Promise<EmbeddedMpvSession | null> =>
         ipcRenderer.invoke('EMBEDDED_MPV_DISPOSE_SESSION', sessionId),
+    attachEmbeddedMpvFrameView: (sessionId: string): Promise<boolean> =>
+        attachEmbeddedMpvFrameView(sessionId),
+    detachEmbeddedMpvFrameView: (): void => detachEmbeddedMpvFrameView(),
     autoUpdatePlaylists: (
         playlists: Playlist[],
         options?: ElectronBridgeTrustOptions
@@ -519,6 +565,24 @@ const electronApi: ElectronBridgeApi = {
         ipcRenderer.invoke('EPG_CHECK_FRESHNESS', { urls, maxAgeHours }),
     searchEpgPrograms: (searchTerm: string, limit?: number) =>
         ipcRenderer.invoke('EPG_DB_SEARCH_PROGRAMS', searchTerm, limit),
+    getEpgMapping: (channelKey: string) =>
+        ipcRenderer.invoke('EPG_MAPPING_GET', { channelKey }),
+    getEpgMappingsBatch: (channelKeys: string[]) =>
+        ipcRenderer.invoke('EPG_MAPPING_GET_BATCH', { channelKeys }),
+    setEpgMapping: (
+        channelKey: string,
+        epgChannelId: string,
+        playlistId?: string
+    ) =>
+        ipcRenderer.invoke('EPG_MAPPING_SET', {
+            channelKey,
+            epgChannelId,
+            playlistId,
+        }),
+    deleteEpgMapping: (channelKey: string) =>
+        ipcRenderer.invoke('EPG_MAPPING_DELETE', { channelKey }),
+    searchEpgChannels: (searchTerm: string, limit?: number) =>
+        ipcRenderer.invoke('EPG_CHANNEL_SEARCH', { searchTerm, limit }),
     setMpvPlayerPath: (mpvPlayerPath: string) =>
         ipcRenderer.invoke('SET_MPV_PLAYER_PATH', mpvPlayerPath),
     setVlcPlayerPath: (vlcPlayerPath: string) =>
@@ -554,14 +618,14 @@ const electronApi: ElectronBridgeApi = {
         ipcRenderer.invoke('DB_CREATE_PLAYLIST', playlist),
     dbGetPlaylist: (playlistId: string) =>
         ipcRenderer.invoke('DB_GET_PLAYLIST', playlistId),
-    dbUpsertAppPlaylist: (playlist: Playlist) =>
+    dbUpsertAppPlaylist: (playlist: Playlist, _operationId?: string) =>
         ipcRenderer.invoke('DB_UPSERT_APP_PLAYLIST', playlist),
     dbUpsertAppPlaylists: (playlists: Playlist[]) =>
         ipcRenderer.invoke('DB_UPSERT_APP_PLAYLISTS', playlists),
     dbGetAppPlaylists: () => ipcRenderer.invoke('DB_GET_APP_PLAYLISTS'),
     dbGetAppPlaylistMetas: () =>
         ipcRenderer.invoke('DB_GET_APP_PLAYLIST_METAS'),
-    dbGetAppPlaylist: (playlistId: string) =>
+    dbGetAppPlaylist: (playlistId: string, _operationId?: string) =>
         ipcRenderer.invoke('DB_GET_APP_PLAYLIST', playlistId),
     dbGetAppPlaylistFavoriteChannels: (playlistId: string) =>
         ipcRenderer.invoke('DB_GET_APP_PLAYLIST_FAVORITE_CHANNELS', playlistId),
@@ -710,7 +774,7 @@ const electronApi: ElectronBridgeApi = {
     dbGetAllGlobalFavorites: () =>
         ipcRenderer.invoke('DB_GET_ALL_GLOBAL_FAVORITES'),
     dbReorderGlobalFavorites: (
-        updates: { content_id: number; position: number }[]
+        updates: { content_id: number; playlist_id: string; position: number }[]
     ) => ipcRenderer.invoke('DB_REORDER_GLOBAL_FAVORITES', updates),
     // Recently viewed (playlist-specific)
     dbGetRecentItems: (playlistId: string) =>
@@ -771,6 +835,8 @@ const electronApi: ElectronBridgeApi = {
         ),
     dbSetTmdbMetadata: (entry: TmdbCacheEntry) =>
         ipcRenderer.invoke('DB_SET_TMDB_METADATA', entry),
+    dbGetTmdbCacheStats: () => ipcRenderer.invoke('DB_GET_TMDB_CACHE_STATS'),
+    dbClearTmdbMetadata: () => ipcRenderer.invoke('DB_CLEAR_TMDB_METADATA'),
     dbMatchTitles: (titles: string[]) =>
         ipcRenderer.invoke('DB_MATCH_TITLES', titles),
     // Playback Positions
@@ -825,6 +891,10 @@ const electronApi: ElectronBridgeApi = {
         ipcRenderer.invoke('DOWNLOADS_START', data),
     downloadsCancel: (downloadId: number) =>
         ipcRenderer.invoke('DOWNLOADS_CANCEL', downloadId),
+    downloadsPause: (downloadId: number) =>
+        ipcRenderer.invoke('DOWNLOADS_PAUSE', downloadId),
+    downloadsResume: (downloadId: number, downloadFolder: string) =>
+        ipcRenderer.invoke('DOWNLOADS_RESUME', downloadId, downloadFolder),
     downloadsRetry: (downloadId: number, downloadFolder: string) =>
         ipcRenderer.invoke('DOWNLOADS_RETRY', downloadId, downloadFolder),
     downloadsRemove: (downloadId: number) =>
diff --git a/apps/electron-backend/src/app/api/preload-performance-capture.spec.ts b/apps/electron-backend/src/app/api/preload-performance-capture.spec.ts
new file mode 100644
index 000000000..9d900e13a
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-capture.spec.ts
@@ -0,0 +1,50 @@
+import {
+    PRELOAD_PERFORMANCE_MARKER_CHANNEL,
+    PRELOAD_PERFORMANCE_METHOD,
+    type PreloadPerformanceMarker,
+} from '@iptvnator/shared/interfaces';
+import { createPreloadPerformanceCapture } from './preload-performance-capture';
+
+describe('preload performance capture timestamps', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('uses fractional monotonic time on top of the epoch origin', () => {
+        const markers: PreloadPerformanceMarker[] = [];
+        const monotonicNow = jest
+            .spyOn(globalThis.performance, 'now')
+            .mockReturnValueOnce(10.125)
+            .mockReturnValueOnce(10.375);
+        const capture = createPreloadPerformanceCapture(
+            true,
+            (channel, marker) => {
+                expect(channel).toBe(PRELOAD_PERFORMANCE_MARKER_CHANNEL);
+                markers.push(marker);
+            }
+        );
+
+        const call = capture.start(
+            PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            [
+                {
+                    operationId: 'operation-1',
+                    playlistId: 'playlist-1',
+                },
+            ]
+        );
+        capture.success(call, {});
+
+        expect(monotonicNow).toHaveBeenCalledTimes(2);
+        expect(markers).toHaveLength(2);
+        expect(
+            markers[0].sourceEpochMs - globalThis.performance.timeOrigin
+        ).toBeCloseTo(10.125, 3);
+        expect(
+            markers[1].sourceEpochMs - globalThis.performance.timeOrigin
+        ).toBeCloseTo(10.375, 3);
+        expect(markers[1].sourceEpochMs).toBeGreaterThan(
+            markers[0].sourceEpochMs
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/api/preload-performance-capture.ts b/apps/electron-backend/src/app/api/preload-performance-capture.ts
new file mode 100644
index 000000000..62ae3e25d
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-capture.ts
@@ -0,0 +1,197 @@
+import {
+    isPlaylistRefreshCancelledResult,
+    PRELOAD_PERFORMANCE_MARKER_CHANNEL,
+    PRELOAD_PERFORMANCE_METHOD,
+    type PreloadPerformanceMarker,
+    type PreloadPerformanceMethod,
+    type PreloadPerformancePhase,
+} from '@iptvnator/shared/interfaces';
+import {
+    advancePreloadPerformanceCorrelation,
+    createPreloadPerformanceCorrelationState,
+    normalizePreloadPerformanceIdentifier,
+    type PreloadPerformanceCorrelationState,
+} from './preload-performance-correlation';
+
+export interface PreloadPerformanceCallContext {
+    ipcCallId: number;
+    method: PreloadPerformanceMethod;
+    operationId: string | null;
+    playlistId: string | null;
+}
+
+export interface PreloadPerformanceCapture {
+    error: (call: PreloadPerformanceCallContext | null) => void;
+    start: (
+        methodName: string,
+        args: readonly unknown[]
+    ) => PreloadPerformanceCallContext | null;
+    success: (
+        call: PreloadPerformanceCallContext | null,
+        result: unknown
+    ) => void;
+}
+
+type MarkerSender = (
+    channel: typeof PRELOAD_PERFORMANCE_MARKER_CHANNEL,
+    marker: PreloadPerformanceMarker
+) => void;
+
+function readProperty(value: unknown, property: string): unknown {
+    if (
+        (typeof value !== 'object' || value === null) &&
+        typeof value !== 'function'
+    ) {
+        return undefined;
+    }
+
+    try {
+        return Reflect.get(value, property);
+    } catch {
+        return undefined;
+    }
+}
+
+export function toPreloadPerformanceTargetMethod(
+    methodName: string
+): PreloadPerformanceMethod | null {
+    switch (methodName) {
+        case PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST:
+        case PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST:
+        case PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST:
+            return methodName;
+        default:
+            return null;
+    }
+}
+
+function readHighResolutionEpochMs(): number {
+    const timeOrigin = globalThis.performance?.timeOrigin;
+    const monotonicNow = globalThis.performance?.now?.();
+    const highResolutionEpoch =
+        typeof timeOrigin === 'number' && typeof monotonicNow === 'number'
+            ? timeOrigin + monotonicNow
+            : Number.NaN;
+
+    return Number.isFinite(highResolutionEpoch)
+        ? highResolutionEpoch
+        : Date.now();
+}
+
+function extractIdentifiers(
+    method: PreloadPerformanceMethod,
+    args: readonly unknown[]
+): Pick<PreloadPerformanceCallContext, 'operationId' | 'playlistId'> {
+    if (method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST) {
+        const payload = args[0];
+        return {
+            operationId: normalizePreloadPerformanceIdentifier(
+                readProperty(payload, 'operationId')
+            ),
+            playlistId: normalizePreloadPerformanceIdentifier(
+                readProperty(payload, 'playlistId')
+            ),
+        };
+    }
+
+    if (method === PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST) {
+        return {
+            operationId: normalizePreloadPerformanceIdentifier(args[1]),
+            playlistId: normalizePreloadPerformanceIdentifier(args[0]),
+        };
+    }
+
+    return {
+        operationId: normalizePreloadPerformanceIdentifier(args[1]),
+        playlistId: normalizePreloadPerformanceIdentifier(
+            readProperty(args[0], '_id')
+        ),
+    };
+}
+
+export function createPreloadPerformanceCapture(
+    enabled: boolean,
+    sendMarker: MarkerSender
+): PreloadPerformanceCapture {
+    let correlationState: PreloadPerformanceCorrelationState =
+        createPreloadPerformanceCorrelationState();
+    let markerDeliveryFailed = false;
+    let lastSourceEpochMs = 0;
+    let nextIpcCallId = 1;
+
+    function emit(
+        call: PreloadPerformanceCallContext,
+        phase: PreloadPerformancePhase,
+        refreshCancelled = false
+    ): void {
+        if (markerDeliveryFailed) {
+            return;
+        }
+
+        try {
+            const transition = advancePreloadPerformanceCorrelation(
+                correlationState,
+                {
+                    ...call,
+                    phase,
+                    refreshCancelled,
+                }
+            );
+            const sourceEpochMs = Math.max(
+                readHighResolutionEpochMs(),
+                lastSourceEpochMs
+            );
+            sendMarker(PRELOAD_PERFORMANCE_MARKER_CHANNEL, {
+                ...transition.marker,
+                sourceEpochMs,
+            });
+            correlationState = transition.state;
+            lastSourceEpochMs = sourceEpochMs;
+        } catch {
+            markerDeliveryFailed = true;
+            // Performance instrumentation must never affect the bridge call.
+        }
+    }
+
+    return {
+        error: (call) => {
+            if (call) {
+                emit(call, 'error');
+            }
+        },
+        start: (methodName, args) => {
+            if (!enabled) {
+                return null;
+            }
+
+            const method = toPreloadPerformanceTargetMethod(methodName);
+            if (!method) {
+                return null;
+            }
+
+            const call: PreloadPerformanceCallContext = {
+                ipcCallId: nextIpcCallId,
+                method,
+                ...extractIdentifiers(method, args),
+            };
+            nextIpcCallId += 1;
+            emit(call, 'start');
+            return call;
+        },
+        success: (call, result) => {
+            if (!call) {
+                return;
+            }
+
+            let refreshCancelled = false;
+            if (call.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST) {
+                try {
+                    refreshCancelled = isPlaylistRefreshCancelledResult(result);
+                } catch {
+                    refreshCancelled = false;
+                }
+            }
+            emit(call, 'success', refreshCancelled);
+        },
+    };
+}
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.complete.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.complete.ts
new file mode 100644
index 000000000..e8dc4e699
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.complete.ts
@@ -0,0 +1,246 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    PRELOAD_PERFORMANCE_SEQUENCE_STAGE,
+    closeInvalidPreloadPerformanceSequenceWhenSettled,
+    createPreloadPerformanceMarkerMetadata,
+    invalidatePreloadPerformanceSequence,
+    type PreloadPerformanceCall,
+    type PreloadPerformanceCorrelationEvent,
+    type PreloadPerformanceMarkerMetadata,
+    type PreloadPerformanceSequence,
+} from './preload-performance-correlation.model';
+
+function eventForRememberedCall(
+    event: PreloadPerformanceCorrelationEvent,
+    call: PreloadPerformanceCall
+): PreloadPerformanceCorrelationEvent {
+    return {
+        ...event,
+        method: call.method,
+        operationId: call.operationId,
+        playlistId: call.playlistId,
+    };
+}
+
+function invalidCompletion(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    call: PreloadPerformanceCall
+): PreloadPerformanceMarkerMetadata {
+    const rememberedEvent = eventForRememberedCall(event, call);
+    const invalidSequence =
+        call.playlistId === null
+            ? undefined
+            : invalidatePreloadPerformanceSequence(
+                  calls,
+                  sequences,
+                  call.playlistId,
+                  PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+              );
+    calls.delete(event.ipcCallId);
+    closeInvalidPreloadPerformanceSequenceWhenSettled(
+        calls,
+        sequences,
+        call.playlistId
+    );
+    return createPreloadPerformanceMarkerMetadata(
+        rememberedEvent,
+        call.playlistId,
+        invalidSequence?.operationId ?? call.operationId,
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+        invalidSequence?.invalidReason ??
+            call.invalidReason ??
+            PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+    );
+}
+
+function completeCorrelatedCall(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    call: PreloadPerformanceCall & {
+        operationId: string;
+        playlistId: string;
+    }
+): PreloadPerformanceMarkerMetadata {
+    const sequence = sequences.get(call.playlistId);
+    const expectedStage =
+        call.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST
+            ? PRELOAD_PERFORMANCE_SEQUENCE_STAGE.REFRESH_STARTED
+            : call.method === PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST
+              ? PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_GET_STARTED
+              : PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_UPSERT_STARTED;
+    if (
+        !sequence ||
+        sequence.operationId !== call.operationId ||
+        sequence.stage !== expectedStage
+    ) {
+        return invalidCompletion(calls, sequences, event, call);
+    }
+
+    if (event.phase === 'error') {
+        invalidatePreloadPerformanceSequence(
+            calls,
+            sequences,
+            call.playlistId,
+            PRELOAD_PERFORMANCE_INVALID_REASON.IPC_ERROR
+        );
+        calls.delete(event.ipcCallId);
+        closeInvalidPreloadPerformanceSequenceWhenSettled(
+            calls,
+            sequences,
+            call.playlistId
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            PRELOAD_PERFORMANCE_INVALID_REASON.IPC_ERROR
+        );
+    }
+
+    if (
+        call.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST &&
+        event.refreshCancelled === true
+    ) {
+        calls.delete(event.ipcCallId);
+        sequences.delete(call.playlistId);
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            PRELOAD_PERFORMANCE_INVALID_REASON.REFRESH_CANCELLED
+        );
+    }
+
+    calls.delete(event.ipcCallId);
+    if (call.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST) {
+        sequences.set(call.playlistId, {
+            ...sequence,
+            stage: PRELOAD_PERFORMANCE_SEQUENCE_STAGE.REFRESH_SUCCEEDED,
+        });
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            null
+        );
+    }
+
+    if (call.method === PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST) {
+        sequences.set(call.playlistId, {
+            ...sequence,
+            stage: PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_GET_SUCCEEDED,
+        });
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            null
+        );
+    }
+
+    sequences.delete(call.playlistId);
+    return createPreloadPerformanceMarkerMetadata(
+        event,
+        call.playlistId,
+        call.operationId,
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+        null
+    );
+}
+
+export function completePreloadPerformanceCall(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string | null,
+    operationId: string | null
+): PreloadPerformanceMarkerMetadata {
+    const call = calls.get(event.ipcCallId);
+    if (!call) {
+        const invalidSequence =
+            playlistId === null
+                ? undefined
+                : invalidatePreloadPerformanceSequence(
+                      calls,
+                      sequences,
+                      playlistId,
+                      PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+                  );
+        closeInvalidPreloadPerformanceSequenceWhenSettled(
+            calls,
+            sequences,
+            playlistId
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            playlistId,
+            invalidSequence?.operationId ?? operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidSequence?.invalidReason ??
+                PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+        );
+    }
+
+    const identityMatches =
+        call.method === event.method &&
+        call.operationId === operationId &&
+        call.playlistId === playlistId;
+    if (!identityMatches) {
+        return invalidCompletion(calls, sequences, event, call);
+    }
+
+    const rememberedEvent = eventForRememberedCall(event, call);
+    if (
+        call.correlationState ===
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED
+    ) {
+        calls.delete(event.ipcCallId);
+        return createPreloadPerformanceMarkerMetadata(
+            rememberedEvent,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            null
+        );
+    }
+
+    if (
+        call.correlationState === PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID
+    ) {
+        calls.delete(event.ipcCallId);
+        closeInvalidPreloadPerformanceSequenceWhenSettled(
+            calls,
+            sequences,
+            call.playlistId
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            rememberedEvent,
+            call.playlistId,
+            call.operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            call.invalidReason ??
+                PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+        );
+    }
+
+    return completeCorrelatedCall(
+        calls,
+        sequences,
+        rememberedEvent,
+        call as PreloadPerformanceCall & {
+            operationId: string;
+            playlistId: string;
+        }
+    );
+}
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.completion.spec.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.completion.spec.ts
new file mode 100644
index 000000000..e10251ddd
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.completion.spec.ts
@@ -0,0 +1,311 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    createCorrelationHarness,
+    OPERATION_ONE,
+    OPERATION_TWO,
+    PLAYLIST_ONE,
+    PLAYLIST_TWO,
+    type CorrelationHarness,
+} from './preload-performance-correlation.test-helpers';
+
+function completeDatabaseSequence(
+    advance: CorrelationHarness['advance'],
+    firstCallId: number,
+    playlistId: string,
+    operationId: string
+) {
+    return [
+        advance({
+            ipcCallId: firstCallId,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId,
+            phase: 'start',
+            playlistId,
+        }),
+        advance({
+            ipcCallId: firstCallId,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId,
+            phase: 'success',
+            playlistId,
+        }),
+        advance({
+            ipcCallId: firstCallId + 1,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId,
+            phase: 'start',
+            playlistId,
+        }),
+        advance({
+            ipcCallId: firstCallId + 1,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId,
+            phase: 'success',
+            playlistId,
+        }),
+    ];
+}
+
+describe('preload performance marker correlation completions', () => {
+    let advance: CorrelationHarness['advance'];
+
+    beforeEach(() => {
+        ({ advance } = createCorrelationHarness());
+    });
+
+    it.each(['success', 'error'] as const)(
+        'invalidates only the matching playlist after an unknown call ID %s',
+        (phase) => {
+            advance({
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            });
+            advance({
+                ipcCallId: 10,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_TWO,
+                phase: 'start',
+                playlistId: PLAYLIST_TWO,
+            });
+
+            const unknownCompletion = advance({
+                ipcCallId: 99,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_TWO,
+                phase,
+                playlistId: PLAYLIST_ONE,
+            });
+            const matchingCompletion = advance({
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            });
+            const samePlaylistPersistence = completeDatabaseSequence(
+                advance,
+                20,
+                PLAYLIST_ONE,
+                OPERATION_ONE
+            );
+
+            const unrelatedRefreshCompletion = advance({
+                ipcCallId: 10,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_TWO,
+                phase: 'success',
+                playlistId: PLAYLIST_TWO,
+            });
+            const unrelatedPersistence = completeDatabaseSequence(
+                advance,
+                30,
+                PLAYLIST_TWO,
+                OPERATION_TWO
+            );
+
+            expect(unknownCompletion).toMatchObject({
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+                operationId: OPERATION_ONE,
+                playlistId: PLAYLIST_ONE,
+            });
+            expect(matchingCompletion).toMatchObject({
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+            });
+            expect(
+                [matchingCompletion, ...samePlaylistPersistence].some(
+                    ({ correlationState }) =>
+                        correlationState ===
+                        PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE
+                )
+            ).toBe(false);
+            expect(unrelatedRefreshCompletion.correlationState).toBe(
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED
+            );
+            expect(unrelatedPersistence.at(-1)).toMatchObject({
+                correlationState:
+                    PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+                operationId: OPERATION_TWO,
+                playlistId: PLAYLIST_TWO,
+            });
+        }
+    );
+
+    it('invalidates persistence after a duplicate completion without touching another playlist', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 10,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_TWO,
+        });
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const duplicateCompletion = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        const samePlaylistPersistence = completeDatabaseSequence(
+            advance,
+            20,
+            PLAYLIST_ONE,
+            OPERATION_ONE
+        );
+
+        advance({
+            ipcCallId: 10,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'success',
+            playlistId: PLAYLIST_TWO,
+        });
+        const unrelatedPersistence = completeDatabaseSequence(
+            advance,
+            30,
+            PLAYLIST_TWO,
+            OPERATION_TWO
+        );
+
+        expect(duplicateCompletion).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+            operationId: OPERATION_ONE,
+            playlistId: PLAYLIST_ONE,
+        });
+        expect(
+            samePlaylistPersistence.some(
+                ({ correlationState }) =>
+                    correlationState ===
+                    PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE
+            )
+        ).toBe(false);
+        expect(unrelatedPersistence.at(-1)).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+            operationId: OPERATION_TWO,
+            playlistId: PLAYLIST_TWO,
+        });
+    });
+
+    it('invalidates a correlated sequence when a target call errors', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const error = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'error',
+            playlistId: PLAYLIST_ONE,
+        });
+        const laterUpsert = advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const restart = advance({
+            ipcCallId: 4,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(error).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.IPC_ERROR,
+            operationId: OPERATION_ONE,
+        });
+        expect(laterUpsert).toMatchObject({
+            correlationState:
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            invalidReason: null,
+            operationId: OPERATION_ONE,
+        });
+        expect(restart.correlationState).toBe(
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED
+        );
+    });
+
+    it('closes a cancelled refresh without awaiting database persistence', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const cancelled = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+            refreshCancelled: true,
+        });
+        const laterGet = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(cancelled).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.REFRESH_CANCELLED,
+            operationId: OPERATION_ONE,
+        });
+        expect(laterGet).toMatchObject({
+            correlationState:
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            invalidReason: null,
+            operationId: OPERATION_ONE,
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.identity.spec.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.identity.spec.ts
new file mode 100644
index 000000000..aec9e4c7b
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.identity.spec.ts
@@ -0,0 +1,183 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    createCorrelationHarness,
+    OPERATION_ONE,
+    OPERATION_TWO,
+    PLAYLIST_ONE,
+    PLAYLIST_TWO,
+} from './preload-performance-correlation.test-helpers';
+
+describe('preload performance correlation identities', () => {
+    it('advances only database calls tagged with the refresh operation', () => {
+        const { advance } = createCorrelationHarness();
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const unrelated = [
+            advance({
+                ipcCallId: 2,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: null,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            }),
+            advance({
+                ipcCallId: 2,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: null,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            }),
+            advance({
+                ipcCallId: 3,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                operationId: OPERATION_TWO,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            }),
+            advance({
+                ipcCallId: 3,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                operationId: OPERATION_TWO,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            }),
+        ];
+
+        expect(
+            unrelated.every(
+                ({ correlationState }) =>
+                    correlationState ===
+                    PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED
+            )
+        ).toBe(true);
+
+        for (const event of [
+            {
+                ipcCallId: 4,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'start',
+            },
+            {
+                ipcCallId: 4,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                phase: 'success',
+            },
+            {
+                ipcCallId: 5,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                phase: 'start',
+            },
+        ] as const) {
+            advance({
+                ...event,
+                operationId: OPERATION_ONE,
+                playlistId: PLAYLIST_ONE,
+            });
+        }
+        const complete = advance({
+            ipcCallId: 5,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(complete).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+            operationId: OPERATION_ONE,
+            playlistId: PLAYLIST_ONE,
+        });
+    });
+
+    it.each([
+        {
+            label: 'operation',
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_TWO,
+            playlistId: PLAYLIST_ONE,
+        },
+        {
+            label: 'playlist',
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            playlistId: PLAYLIST_TWO,
+        },
+        {
+            label: 'method',
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            playlistId: PLAYLIST_ONE,
+        },
+    ])(
+        'fails closed when the completion changes the started $label',
+        ({ method, operationId, playlistId }) => {
+            const { advance } = createCorrelationHarness();
+            advance({
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            });
+            advance({
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            });
+            advance({
+                ipcCallId: 2,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            });
+
+            const completion = advance({
+                ipcCallId: 2,
+                method,
+                operationId,
+                phase: 'success',
+                playlistId,
+            });
+            const laterUpsert = advance({
+                ipcCallId: 3,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            });
+
+            expect(completion).toMatchObject({
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                playlistId: PLAYLIST_ONE,
+            });
+            expect(laterUpsert).toMatchObject({
+                correlationState:
+                    PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+                invalidReason: null,
+            });
+        }
+    );
+});
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.model.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.model.ts
new file mode 100644
index 000000000..65c63c3cf
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.model.ts
@@ -0,0 +1,173 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    type PreloadPerformanceCorrelationStateName,
+    type PreloadPerformanceInvalidReason,
+    type PreloadPerformanceMarker,
+    type PreloadPerformanceMethod,
+    type PreloadPerformancePhase,
+} from '@iptvnator/shared/interfaces';
+
+const MAX_IDENTIFIER_LENGTH = 128;
+const SAFE_IDENTIFIER_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]*$/;
+
+export const PRELOAD_PERFORMANCE_SEQUENCE_STAGE = {
+    DB_GET_STARTED: 'db-get-started',
+    DB_GET_SUCCEEDED: 'db-get-succeeded',
+    DB_UPSERT_STARTED: 'db-upsert-started',
+    INVALID: 'invalid',
+    REFRESH_STARTED: 'refresh-started',
+    REFRESH_SUCCEEDED: 'refresh-succeeded',
+} as const;
+
+export type PreloadPerformanceSequenceStage =
+    (typeof PRELOAD_PERFORMANCE_SEQUENCE_STAGE)[keyof typeof PRELOAD_PERFORMANCE_SEQUENCE_STAGE];
+
+export interface PreloadPerformanceSequence {
+    invalidReason: PreloadPerformanceInvalidReason | null;
+    operationId: string;
+    stage: PreloadPerformanceSequenceStage;
+}
+
+export interface PreloadPerformanceCall {
+    correlationState: PreloadPerformanceCorrelationStateName;
+    invalidReason: PreloadPerformanceInvalidReason | null;
+    method: PreloadPerformanceMethod;
+    operationId: string | null;
+    playlistId: string | null;
+}
+
+export interface PreloadPerformanceCorrelationEvent {
+    ipcCallId: number;
+    method: PreloadPerformanceMethod;
+    operationId: unknown;
+    phase: PreloadPerformancePhase;
+    playlistId: unknown;
+    refreshCancelled?: boolean;
+}
+
+export interface PreloadPerformanceCorrelationState {
+    readonly calls: ReadonlyMap<number, PreloadPerformanceCall>;
+    readonly sequences: ReadonlyMap<string, PreloadPerformanceSequence>;
+}
+
+export interface PreloadPerformanceCorrelationResult {
+    marker: PreloadPerformanceMarkerMetadata;
+    state: PreloadPerformanceCorrelationState;
+}
+
+export type PreloadPerformanceMarkerMetadata = Omit<
+    PreloadPerformanceMarker,
+    'sourceEpochMs'
+>;
+
+export function normalizePreloadPerformanceIdentifier(
+    value: unknown
+): string | null {
+    if (
+        typeof value !== 'string' ||
+        value.length === 0 ||
+        value.length > MAX_IDENTIFIER_LENGTH ||
+        value !== value.trim() ||
+        !SAFE_IDENTIFIER_PATTERN.test(value)
+    ) {
+        return null;
+    }
+
+    return value;
+}
+
+export function createPreloadPerformanceMarkerMetadata(
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string | null,
+    operationId: string | null,
+    correlationState: PreloadPerformanceCorrelationStateName,
+    invalidReason: PreloadPerformanceInvalidReason | null
+): PreloadPerformanceMarkerMetadata {
+    return {
+        correlationState,
+        invalidReason,
+        ipcCallId: event.ipcCallId,
+        method: event.method,
+        operationId,
+        phase: event.phase,
+        playlistId,
+    };
+}
+
+export function createInvalidPreloadPerformanceCall(
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string | null,
+    operationId: string | null,
+    invalidReason: PreloadPerformanceInvalidReason
+): PreloadPerformanceCall {
+    return {
+        correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+        invalidReason,
+        method: event.method,
+        operationId,
+        playlistId,
+    };
+}
+
+export function invalidatePreloadPerformanceSequence(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    playlistId: string,
+    reason: PreloadPerformanceInvalidReason
+): PreloadPerformanceSequence | undefined {
+    const sequence = sequences.get(playlistId);
+    if (!sequence) {
+        return undefined;
+    }
+
+    const invalidReason =
+        sequence.stage === PRELOAD_PERFORMANCE_SEQUENCE_STAGE.INVALID
+            ? (sequence.invalidReason ?? reason)
+            : reason;
+    const invalidSequence: PreloadPerformanceSequence = {
+        ...sequence,
+        invalidReason,
+        stage: PRELOAD_PERFORMANCE_SEQUENCE_STAGE.INVALID,
+    };
+    sequences.set(playlistId, invalidSequence);
+
+    for (const [callId, call] of calls) {
+        if (
+            call.playlistId === playlistId &&
+            call.correlationState ===
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED
+        ) {
+            calls.set(callId, {
+                ...call,
+                correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+                invalidReason,
+            });
+        }
+    }
+
+    return invalidSequence;
+}
+
+export function closeInvalidPreloadPerformanceSequenceWhenSettled(
+    calls: ReadonlyMap<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    playlistId: string | null
+): void {
+    if (
+        playlistId === null ||
+        sequences.get(playlistId)?.stage !==
+            PRELOAD_PERFORMANCE_SEQUENCE_STAGE.INVALID
+    ) {
+        return;
+    }
+
+    const hasInvalidCall = Array.from(calls.values()).some(
+        (call) =>
+            call.playlistId === playlistId &&
+            call.correlationState ===
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID
+    );
+    if (!hasInvalidCall) {
+        sequences.delete(playlistId);
+    }
+}
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.sequence.spec.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.sequence.spec.ts
new file mode 100644
index 000000000..c73f50769
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.sequence.spec.ts
@@ -0,0 +1,338 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    createCorrelationHarness,
+    OPERATION_ONE,
+    OPERATION_TWO,
+    PLAYLIST_ONE,
+    PLAYLIST_TWO,
+    type CorrelationEvent,
+    type CorrelationHarness,
+} from './preload-performance-correlation.test-helpers';
+
+describe('preload performance marker correlation sequences', () => {
+    let advance: CorrelationHarness['advance'];
+    let reset: CorrelationHarness['reset'];
+
+    beforeEach(() => {
+        ({ advance, reset } = createCorrelationHarness());
+    });
+
+    it('correlates the successful refresh persistence sequence and propagates its operation ID', () => {
+        const refreshStart = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const refreshSuccess = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        const getStart = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const getSuccess = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        const upsertStart = advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const upsertSuccess = advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(refreshStart).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            invalidReason: null,
+            operationId: OPERATION_ONE,
+            playlistId: PLAYLIST_ONE,
+        });
+        expect(refreshSuccess).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            operationId: OPERATION_ONE,
+        });
+        expect(getStart.operationId).toBe(OPERATION_ONE);
+        expect(getSuccess.operationId).toBe(OPERATION_ONE);
+        expect(upsertStart.operationId).toBe(OPERATION_ONE);
+        expect(upsertSuccess).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.COMPLETE,
+            invalidReason: null,
+            operationId: OPERATION_ONE,
+        });
+    });
+
+    it('fails closed for wrong-order and duplicate targeted database calls', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const wrongOrder = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(wrongOrder).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+            operationId: OPERATION_ONE,
+        });
+
+        reset();
+        advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 4,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const duplicate = advance({
+            ipcCallId: 5,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const originalCompletion = advance({
+            ipcCallId: 4,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(duplicate.invalidReason).toBe(
+            PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+        );
+        expect(originalCompletion).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason: PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER,
+        });
+    });
+
+    it('invalidates concurrent refreshes for the same playlist', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const concurrentStart = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const firstCompletion = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        const concurrentCompletion = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        const restart = advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: 'operation-3',
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(concurrentStart).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.CONCURRENT_REFRESH,
+            operationId: OPERATION_TWO,
+        });
+        expect(concurrentCompletion).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.CONCURRENT_REFRESH,
+            operationId: OPERATION_TWO,
+        });
+        expect(restart.correlationState).toBe(
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED
+        );
+        expect(firstCompletion).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.CONCURRENT_REFRESH,
+        });
+    });
+
+    it('keeps different playlists independent when one sequence invalidates', () => {
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_TWO,
+        });
+        advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'success',
+            playlistId: PLAYLIST_TWO,
+        });
+        advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        const playlistTwoGet = advance({
+            ipcCallId: 4,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_TWO,
+        });
+
+        expect(playlistTwoGet).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            invalidReason: null,
+            operationId: OPERATION_TWO,
+            playlistId: PLAYLIST_TWO,
+        });
+    });
+
+    it('allows a new refresh after the prior sequence completes', () => {
+        const events: CorrelationEvent[] = [
+            {
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            },
+            {
+                ipcCallId: 1,
+                method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            },
+            {
+                ipcCallId: 2,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            },
+            {
+                ipcCallId: 2,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            },
+            {
+                ipcCallId: 3,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'start',
+                playlistId: PLAYLIST_ONE,
+            },
+            {
+                ipcCallId: 3,
+                method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+                operationId: OPERATION_ONE,
+                phase: 'success',
+                playlistId: PLAYLIST_ONE,
+            },
+        ];
+        events.forEach((event) => advance(event));
+
+        const restart = advance({
+            ipcCallId: 4,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_TWO,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(restart).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+            invalidReason: null,
+            operationId: OPERATION_TWO,
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.start.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.start.ts
new file mode 100644
index 000000000..3363ba13c
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.start.ts
@@ -0,0 +1,235 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    PRELOAD_PERFORMANCE_SEQUENCE_STAGE,
+    createInvalidPreloadPerformanceCall,
+    createPreloadPerformanceMarkerMetadata,
+    invalidatePreloadPerformanceSequence,
+    type PreloadPerformanceCall,
+    type PreloadPerformanceCorrelationEvent,
+    type PreloadPerformanceMarkerMetadata,
+    type PreloadPerformanceSequence,
+} from './preload-performance-correlation.model';
+
+function rememberUncorrelatedCall(
+    calls: Map<number, PreloadPerformanceCall>,
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string,
+    operationId: string | null
+): PreloadPerformanceMarkerMetadata {
+    calls.set(event.ipcCallId, {
+        correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+        invalidReason: null,
+        method: event.method,
+        operationId,
+        playlistId,
+    });
+    return createPreloadPerformanceMarkerMetadata(
+        event,
+        playlistId,
+        operationId,
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+        null
+    );
+}
+
+function startRefresh(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string,
+    operationId: string
+): PreloadPerformanceMarkerMetadata {
+    const existing = sequences.get(playlistId);
+    if (existing) {
+        const reason =
+            existing.stage === PRELOAD_PERFORMANCE_SEQUENCE_STAGE.INVALID
+                ? (existing.invalidReason ??
+                  PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER)
+                : PRELOAD_PERFORMANCE_INVALID_REASON.CONCURRENT_REFRESH;
+        const invalidSequence = invalidatePreloadPerformanceSequence(
+            calls,
+            sequences,
+            playlistId,
+            reason
+        );
+        const invalidReason = invalidSequence?.invalidReason ?? reason;
+        calls.set(
+            event.ipcCallId,
+            createInvalidPreloadPerformanceCall(
+                event,
+                playlistId,
+                operationId,
+                invalidReason
+            )
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            playlistId,
+            operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason
+        );
+    }
+
+    sequences.set(playlistId, {
+        invalidReason: null,
+        operationId,
+        stage: PRELOAD_PERFORMANCE_SEQUENCE_STAGE.REFRESH_STARTED,
+    });
+    calls.set(event.ipcCallId, {
+        correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+        invalidReason: null,
+        method: event.method,
+        operationId,
+        playlistId,
+    });
+    return createPreloadPerformanceMarkerMetadata(
+        event,
+        playlistId,
+        operationId,
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+        null
+    );
+}
+
+function startDatabaseCall(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string,
+    operationId: string | null
+): PreloadPerformanceMarkerMetadata {
+    if (operationId === null) {
+        return rememberUncorrelatedCall(calls, event, playlistId, operationId);
+    }
+
+    const sequence = sequences.get(playlistId);
+    if (!sequence || sequence.operationId !== operationId) {
+        return rememberUncorrelatedCall(calls, event, playlistId, operationId);
+    }
+
+    if (sequence.stage === PRELOAD_PERFORMANCE_SEQUENCE_STAGE.INVALID) {
+        const invalidReason =
+            sequence.invalidReason ??
+            PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER;
+        calls.set(
+            event.ipcCallId,
+            createInvalidPreloadPerformanceCall(
+                event,
+                playlistId,
+                operationId,
+                invalidReason
+            )
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            playlistId,
+            operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason
+        );
+    }
+
+    const isGet =
+        event.method === PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST;
+    const expectedStage = isGet
+        ? PRELOAD_PERFORMANCE_SEQUENCE_STAGE.REFRESH_SUCCEEDED
+        : PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_GET_SUCCEEDED;
+    const startedStage = isGet
+        ? PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_GET_STARTED
+        : PRELOAD_PERFORMANCE_SEQUENCE_STAGE.DB_UPSERT_STARTED;
+
+    if (sequence.stage !== expectedStage) {
+        const invalidSequence = invalidatePreloadPerformanceSequence(
+            calls,
+            sequences,
+            playlistId,
+            PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER
+        );
+        const invalidReason =
+            invalidSequence?.invalidReason ??
+            PRELOAD_PERFORMANCE_INVALID_REASON.OUT_OF_ORDER;
+        calls.set(
+            event.ipcCallId,
+            createInvalidPreloadPerformanceCall(
+                event,
+                playlistId,
+                operationId,
+                invalidReason
+            )
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            playlistId,
+            operationId,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason
+        );
+    }
+
+    sequences.set(playlistId, {
+        ...sequence,
+        stage: startedStage,
+    });
+    calls.set(event.ipcCallId, {
+        correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+        invalidReason: null,
+        method: event.method,
+        operationId,
+        playlistId,
+    });
+    return createPreloadPerformanceMarkerMetadata(
+        event,
+        playlistId,
+        operationId,
+        PRELOAD_PERFORMANCE_CORRELATION_STATE.CORRELATED,
+        null
+    );
+}
+
+export function startPreloadPerformanceCall(
+    calls: Map<number, PreloadPerformanceCall>,
+    sequences: Map<string, PreloadPerformanceSequence>,
+    event: PreloadPerformanceCorrelationEvent,
+    playlistId: string | null,
+    operationId: string | null
+): PreloadPerformanceMarkerMetadata {
+    if (
+        playlistId === null ||
+        (event.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST &&
+            operationId === null)
+    ) {
+        if (playlistId !== null) {
+            invalidatePreloadPerformanceSequence(
+                calls,
+                sequences,
+                playlistId,
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER
+            );
+        }
+        calls.set(
+            event.ipcCallId,
+            createInvalidPreloadPerformanceCall(
+                event,
+                playlistId,
+                null,
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER
+            )
+        );
+        return createPreloadPerformanceMarkerMetadata(
+            event,
+            playlistId,
+            null,
+            PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER
+        );
+    }
+
+    return event.method === PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST
+        ? startRefresh(calls, sequences, event, playlistId, operationId)
+        : startDatabaseCall(calls, sequences, event, playlistId, operationId);
+}
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.test-helpers.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.test-helpers.ts
new file mode 100644
index 000000000..bf4d29321
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.test-helpers.ts
@@ -0,0 +1,29 @@
+import {
+    advancePreloadPerformanceCorrelation,
+    createPreloadPerformanceCorrelationState,
+    type PreloadPerformanceCorrelationEvent,
+} from './preload-performance-correlation';
+
+export const PLAYLIST_ONE = 'playlist-1';
+export const PLAYLIST_TWO = 'playlist-2';
+export const OPERATION_ONE = 'operation-1';
+export const OPERATION_TWO = 'operation-2';
+
+export type CorrelationEvent = PreloadPerformanceCorrelationEvent;
+
+export function createCorrelationHarness() {
+    let state = createPreloadPerformanceCorrelationState();
+
+    return {
+        advance: (event: PreloadPerformanceCorrelationEvent) => {
+            const result = advancePreloadPerformanceCorrelation(state, event);
+            state = result.state;
+            return result.marker;
+        },
+        reset: () => {
+            state = createPreloadPerformanceCorrelationState();
+        },
+    };
+}
+
+export type CorrelationHarness = ReturnType<typeof createCorrelationHarness>;
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.ts
new file mode 100644
index 000000000..a42c82749
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.ts
@@ -0,0 +1,58 @@
+import { completePreloadPerformanceCall } from './preload-performance-correlation.complete';
+import {
+    normalizePreloadPerformanceIdentifier,
+    type PreloadPerformanceCorrelationEvent,
+    type PreloadPerformanceCorrelationResult,
+    type PreloadPerformanceCorrelationState,
+} from './preload-performance-correlation.model';
+import { startPreloadPerformanceCall } from './preload-performance-correlation.start';
+
+export type {
+    PreloadPerformanceCorrelationEvent,
+    PreloadPerformanceCorrelationResult,
+    PreloadPerformanceCorrelationState,
+} from './preload-performance-correlation.model';
+export { normalizePreloadPerformanceIdentifier } from './preload-performance-correlation.model';
+
+export function createPreloadPerformanceCorrelationState(): PreloadPerformanceCorrelationState {
+    return {
+        calls: new Map(),
+        sequences: new Map(),
+    };
+}
+
+export function advancePreloadPerformanceCorrelation(
+    state: PreloadPerformanceCorrelationState,
+    event: PreloadPerformanceCorrelationEvent
+): PreloadPerformanceCorrelationResult {
+    const calls = new Map(state.calls);
+    const sequences = new Map(state.sequences);
+    const playlistId = normalizePreloadPerformanceIdentifier(event.playlistId);
+    const operationId = normalizePreloadPerformanceIdentifier(
+        event.operationId
+    );
+    const marker =
+        event.phase === 'start'
+            ? startPreloadPerformanceCall(
+                  calls,
+                  sequences,
+                  event,
+                  playlistId,
+                  operationId
+              )
+            : completePreloadPerformanceCall(
+                  calls,
+                  sequences,
+                  event,
+                  playlistId,
+                  operationId
+              );
+
+    return {
+        marker,
+        state: {
+            calls,
+            sequences,
+        },
+    };
+}
diff --git a/apps/electron-backend/src/app/api/preload-performance-correlation.validation.spec.ts b/apps/electron-backend/src/app/api/preload-performance-correlation.validation.spec.ts
new file mode 100644
index 000000000..9252bf378
--- /dev/null
+++ b/apps/electron-backend/src/app/api/preload-performance-correlation.validation.spec.ts
@@ -0,0 +1,117 @@
+import {
+    PRELOAD_PERFORMANCE_CORRELATION_STATE,
+    PRELOAD_PERFORMANCE_INVALID_REASON,
+    PRELOAD_PERFORMANCE_METHOD,
+} from '@iptvnator/shared/interfaces';
+import {
+    createCorrelationHarness,
+    OPERATION_ONE,
+    OPERATION_TWO,
+    PLAYLIST_ONE,
+    type CorrelationHarness,
+} from './preload-performance-correlation.test-helpers';
+
+describe('preload performance marker correlation validation', () => {
+    let advance: CorrelationHarness['advance'];
+
+    beforeEach(() => {
+        ({ advance } = createCorrelationHarness());
+    });
+
+    it('uses null identifiers and a fixed reason for malformed inputs', () => {
+        const malformedPlaylist = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: 'https://secret.example/private.m3u',
+        });
+        const malformedOperation = advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: { secret: OPERATION_TWO },
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const malformedDbId = advance({
+            ipcCallId: 3,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_UPSERT_APP_PLAYLIST,
+            operationId: null,
+            phase: 'start',
+            playlistId: undefined,
+        });
+        const malformedPlaylistCompletion = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'success',
+            playlistId: 'https://secret.example/private.m3u',
+        });
+
+        expect(malformedPlaylist).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+            operationId: null,
+            playlistId: null,
+        });
+        expect(malformedOperation).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+            operationId: null,
+            playlistId: PLAYLIST_ONE,
+        });
+        expect(malformedDbId).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+            operationId: null,
+            playlistId: null,
+        });
+        expect(malformedPlaylistCompletion).toMatchObject({
+            correlationState: PRELOAD_PERFORMANCE_CORRELATION_STATE.INVALID,
+            invalidReason:
+                PRELOAD_PERFORMANCE_INVALID_REASON.MALFORMED_IDENTIFIER,
+            operationId: null,
+            playlistId: null,
+        });
+    });
+
+    it('keeps targeted database calls outside a sequence visible and uncorrelated', () => {
+        const getStart = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: null,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        advance({
+            ipcCallId: 2,
+            method: PRELOAD_PERFORMANCE_METHOD.REFRESH_PLAYLIST,
+            operationId: OPERATION_ONE,
+            phase: 'start',
+            playlistId: PLAYLIST_ONE,
+        });
+        const getSuccess = advance({
+            ipcCallId: 1,
+            method: PRELOAD_PERFORMANCE_METHOD.DB_GET_APP_PLAYLIST,
+            operationId: null,
+            phase: 'success',
+            playlistId: PLAYLIST_ONE,
+        });
+
+        expect(getStart).toMatchObject({
+            correlationState:
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            invalidReason: null,
+            operationId: null,
+        });
+        expect(getSuccess).toMatchObject({
+            correlationState:
+                PRELOAD_PERFORMANCE_CORRELATION_STATE.UNCORRELATED,
+            invalidReason: null,
+            operationId: null,
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/app-window-state.spec.ts b/apps/electron-backend/src/app/app-window-state.spec.ts
new file mode 100644
index 000000000..f550142df
--- /dev/null
+++ b/apps/electron-backend/src/app/app-window-state.spec.ts
@@ -0,0 +1,242 @@
+/**
+ * Regression coverage for the WINDOW:STATE_CHANGED pushes that drive the
+ * renderer-drawn window controls on Windows/Linux.
+ *
+ * The handlers must never re-read window state at event time: on Windows,
+ * isFullScreen() can still report true while 'leave-full-screen' fires for
+ * HTML-element fullscreen (video player) exits, and isMaximized() reports
+ * false while the window is fullscreen. Polling pushed a stale
+ * `isFullScreen: true` on exit — leaving the custom window controls hidden
+ * forever — and cleared the companion `isMaximized`, sticking the
+ * maximize/restore glyph on the wrong icon. Instead the state is seeded once
+ * at attach time and each event patches only the flag it names.
+ */
+
+jest.mock('electron', () => ({
+    app: {
+        getPath: jest.fn(() => '/tmp'),
+        isPackaged: false,
+        isReady: jest.fn(() => false),
+        on: jest.fn(),
+    },
+    BrowserWindow: jest.fn(),
+    Menu: {
+        buildFromTemplate: jest.fn(),
+    },
+    screen: {
+        getPrimaryDisplay: jest.fn(),
+    },
+    session: {
+        defaultSession: {
+            clearStorageData: jest.fn(),
+        },
+    },
+    shell: {
+        openExternal: jest.fn(),
+    },
+}));
+
+jest.mock('./services/store.service', () => ({
+    store: {
+        get: jest.fn(),
+        set: jest.fn(),
+    },
+    WINDOW_BOUNDS: 'windowBounds',
+}));
+
+import { WINDOW_STATE_CHANGED } from '@iptvnator/shared/interfaces';
+import App from './app';
+
+type MockStateWindow = {
+    isDestroyed: jest.Mock<boolean, []>;
+    isFullScreen: jest.Mock<boolean, []>;
+    isMaximized: jest.Mock<boolean, []>;
+    on: jest.Mock<void, [string, () => void]>;
+    webContents: {
+        send: jest.Mock<void, [string, unknown]>;
+    };
+};
+
+function createMockStateWindow(): MockStateWindow {
+    return {
+        isDestroyed: jest.fn<boolean, []>().mockReturnValue(false),
+        isFullScreen: jest.fn<boolean, []>().mockReturnValue(false),
+        isMaximized: jest.fn<boolean, []>().mockReturnValue(false),
+        on: jest.fn<void, [string, () => void]>(),
+        webContents: {
+            send: jest.fn<void, [string, unknown]>(),
+        },
+    };
+}
+
+function attachWindowStateEvents(win: MockStateWindow): void {
+    (
+        App as unknown as {
+            attachWindowStateEvents: (win: MockStateWindow) => void;
+        }
+    ).attachWindowStateEvents(win);
+}
+
+function fireWindowEvent(win: MockStateWindow, eventName: string): void {
+    const handlers = win.on.mock.calls
+        .filter(([name]) => name === eventName)
+        .map(([, handler]) => handler);
+
+    expect(handlers).toHaveLength(1);
+    handlers[0]();
+}
+
+describe('window state change pushes', () => {
+    const originalPlatform = Object.getOwnPropertyDescriptor(
+        process,
+        'platform'
+    );
+
+    function setProcessPlatform(platform: NodeJS.Platform): void {
+        Object.defineProperty(process, 'platform', {
+            configurable: true,
+            value: platform,
+        });
+    }
+
+    beforeEach(() => {
+        setProcessPlatform('win32');
+    });
+
+    afterEach(() => {
+        if (originalPlatform) {
+            Object.defineProperty(process, 'platform', originalPlatform);
+        }
+    });
+
+    it('registers no window-state listeners on macOS', () => {
+        setProcessPlatform('darwin');
+        const win = createMockStateWindow();
+
+        attachWindowStateEvents(win);
+
+        expect(win.on).not.toHaveBeenCalled();
+    });
+
+    it('pushes isFullScreen=false on leave-full-screen even while the window still reports fullscreen', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+        // Windows still reports the old state while the transition runs.
+        win.isFullScreen.mockReturnValue(true);
+
+        fireWindowEvent(win, 'leave-full-screen');
+
+        expect(win.webContents.send).toHaveBeenCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: false, isFullScreen: false }
+        );
+    });
+
+    it('pushes isFullScreen=false on leave-html-full-screen even while the window still reports fullscreen', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+        win.isFullScreen.mockReturnValue(true);
+
+        fireWindowEvent(win, 'leave-html-full-screen');
+
+        expect(win.webContents.send).toHaveBeenCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: false, isFullScreen: false }
+        );
+    });
+
+    it('pushes isFullScreen=true on enter events before the window reports fullscreen', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+        win.isFullScreen.mockReturnValue(false);
+
+        fireWindowEvent(win, 'enter-full-screen');
+        fireWindowEvent(win, 'enter-html-full-screen');
+
+        expect(win.webContents.send).toHaveBeenCalledTimes(2);
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: false, isFullScreen: true }
+        );
+    });
+
+    it('derives isMaximized from the maximize/unmaximize events instead of polling', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+
+        win.isMaximized.mockReturnValue(false);
+        fireWindowEvent(win, 'maximize');
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: true, isFullScreen: false }
+        );
+
+        win.isMaximized.mockReturnValue(true);
+        fireWindowEvent(win, 'unmaximize');
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: false, isFullScreen: false }
+        );
+    });
+
+    it('keeps the maximized flag across a fullscreen round-trip while the window misreports it', () => {
+        const win = createMockStateWindow();
+        win.isMaximized.mockReturnValue(true);
+        attachWindowStateEvents(win);
+        // Windows reports a fullscreen window as not maximized, so polling
+        // the companion flag here would clear it and leave the glyph on
+        // "maximize" after the controls come back.
+        win.isMaximized.mockReturnValue(false);
+
+        fireWindowEvent(win, 'enter-html-full-screen');
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: true, isFullScreen: true }
+        );
+
+        fireWindowEvent(win, 'leave-html-full-screen');
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: true, isFullScreen: false }
+        );
+    });
+
+    it('keeps the fullscreen flag when a maximize event arrives mid-transition', () => {
+        const win = createMockStateWindow();
+        win.isFullScreen.mockReturnValue(true);
+        attachWindowStateEvents(win);
+        win.isFullScreen.mockReturnValue(false);
+
+        fireWindowEvent(win, 'maximize');
+
+        expect(win.webContents.send).toHaveBeenLastCalledWith(
+            WINDOW_STATE_CHANGED,
+            { isMaximized: true, isFullScreen: true }
+        );
+    });
+
+    it('sends an independent payload per push', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+
+        fireWindowEvent(win, 'enter-full-screen');
+        const firstPayload = win.webContents.send.mock.calls[0][1];
+        fireWindowEvent(win, 'leave-full-screen');
+
+        // The renderer must not see the earlier push mutate under it.
+        expect(firstPayload).toEqual({
+            isMaximized: false,
+            isFullScreen: true,
+        });
+    });
+
+    it('skips pushes for destroyed windows', () => {
+        const win = createMockStateWindow();
+        attachWindowStateEvents(win);
+        win.isDestroyed.mockReturnValue(true);
+
+        fireWindowEvent(win, 'leave-full-screen');
+
+        expect(win.webContents.send).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/app.spec.ts b/apps/electron-backend/src/app/app.spec.ts
index 74ef89642..173c59d60 100644
--- a/apps/electron-backend/src/app/app.spec.ts
+++ b/apps/electron-backend/src/app/app.spec.ts
@@ -1,4 +1,6 @@
 const mockClearStorageData = jest.fn();
+const mockIsFrameCopyRuntimeUsable = jest.fn<boolean, []>();
+const mockIsEmbeddedMpvFeatureEnabled = jest.fn<boolean, []>();
 
 jest.mock('electron', () => ({
     app: {
@@ -32,6 +34,14 @@ jest.mock('./services/store.service', () => ({
     WINDOW_BOUNDS: 'windowBounds',
 }));
 
+jest.mock('./services/embedded-mpv-frame-copy-platform.util', () => ({
+    isFrameCopyRuntimeUsable: mockIsFrameCopyRuntimeUsable,
+}));
+
+jest.mock('./services/embedded-mpv-runtime-policy.util', () => ({
+    isEmbeddedMpvFeatureEnabled: mockIsEmbeddedMpvFeatureEnabled,
+}));
+
 import {
     clearElectronServiceWorkerStorage,
     getMainWindowWebPreferences,
@@ -47,6 +57,10 @@ import { store } from './services/store.service';
 type MockMainWindow = {
     center: jest.Mock<void, []>;
     getNormalBounds: jest.Mock<object, []>;
+    // Read once by attachWindowStateEvents to seed the tracked window
+    // state; only reached off macOS, where the custom controls exist.
+    isFullScreen: jest.Mock<boolean, []>;
+    isMaximized: jest.Mock<boolean, []>;
     loadFile: jest.Mock<Promise<void>, [string]>;
     loadURL: jest.Mock<Promise<void>, [string]>;
     on: jest.Mock<void, [string, (...args: unknown[]) => void]>;
@@ -64,6 +78,8 @@ function createMockMainWindow(): MockMainWindow {
     return {
         center: jest.fn<void, []>(),
         getNormalBounds: jest.fn<object, []>().mockReturnValue({}),
+        isFullScreen: jest.fn<boolean, []>().mockReturnValue(false),
+        isMaximized: jest.fn<boolean, []>().mockReturnValue(false),
         loadFile: jest.fn<Promise<void>, [string]>().mockResolvedValue(),
         loadURL: jest.fn<Promise<void>, [string]>().mockResolvedValue(),
         on: jest.fn<void, [string, (...args: unknown[]) => void]>(),
@@ -95,6 +111,10 @@ describe('Electron app security helpers', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         delete process.env.ELECTRON_IS_DEV;
+        delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+        delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+        mockIsEmbeddedMpvFeatureEnabled.mockReturnValue(false);
+        mockIsFrameCopyRuntimeUsable.mockReturnValue(false);
         const appInternals = getAppInternals();
         appInternals.loadedMainWindow = null;
         appInternals.mainWindow = null;
@@ -119,6 +139,53 @@ describe('Electron app security helpers', () => {
         );
     });
 
+    it('keeps the renderer sandboxed when frame-copy is requested without a usable runtime', () => {
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+        mockIsEmbeddedMpvFeatureEnabled.mockReturnValue(true);
+
+        expect(getMainWindowWebPreferences()?.sandbox).toBe(true);
+        expect(mockIsFrameCopyRuntimeUsable).toHaveBeenCalledTimes(1);
+    });
+
+    it.each([undefined, '0'])(
+        'does not probe frame-copy runtime for an inactive %s opt-in',
+        (explicitFrameCopy) => {
+            mockIsEmbeddedMpvFeatureEnabled.mockReturnValue(true);
+            if (explicitFrameCopy === undefined) {
+                delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+            } else {
+                process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY =
+                    explicitFrameCopy;
+            }
+
+            expect(getMainWindowWebPreferences()?.sandbox).toBe(true);
+            expect(mockIsFrameCopyRuntimeUsable).not.toHaveBeenCalled();
+        }
+    );
+
+    it('probes frame-copy runtime for an explicit opt-in', () => {
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+        mockIsEmbeddedMpvFeatureEnabled.mockReturnValue(true);
+
+        expect(getMainWindowWebPreferences()?.sandbox).toBe(true);
+        expect(mockIsFrameCopyRuntimeUsable).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the renderer sandboxed when frame-copy is requested but embedded MPV is disabled', () => {
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+        mockIsFrameCopyRuntimeUsable.mockReturnValue(true);
+
+        expect(getMainWindowWebPreferences()?.sandbox).toBe(true);
+    });
+
+    it('relaxes the renderer sandbox only when embedded MPV and a usable frame-copy runtime are enabled', () => {
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+        mockIsEmbeddedMpvFeatureEnabled.mockReturnValue(true);
+        mockIsFrameCopyRuntimeUsable.mockReturnValue(true);
+
+        expect(getMainWindowWebPreferences()?.sandbox).toBe(false);
+    });
+
     it('treats only http and https URLs as external browser URLs', () => {
         expect(isExternalBrowserUrl('https://example.com')).toBe(true);
         expect(isExternalBrowserUrl('http://example.com')).toBe(true);
@@ -187,9 +254,9 @@ describe('Electron app security helpers', () => {
         expect(mainWindow.loadFile).toHaveBeenCalledWith(
             expect.stringContaining('index.html')
         );
-        expect(
-            mockClearStorageData.mock.invocationCallOrder[0]
-        ).toBeLessThan(mainWindow.loadFile.mock.invocationCallOrder[0]);
+        expect(mockClearStorageData.mock.invocationCallOrder[0]).toBeLessThan(
+            mainWindow.loadFile.mock.invocationCallOrder[0]
+        );
     });
 
     it('continues packaged renderer loading when Electron service worker cleanup fails', async () => {
diff --git a/apps/electron-backend/src/app/app.ts b/apps/electron-backend/src/app/app.ts
index e46865396..7aef4a9ae 100644
--- a/apps/electron-backend/src/app/app.ts
+++ b/apps/electron-backend/src/app/app.ts
@@ -1,5 +1,8 @@
 import { app, BrowserWindow, Menu, screen, session, shell } from 'electron';
-import { WINDOW_STATE_CHANGED } from '@iptvnator/shared/interfaces';
+import {
+    ElectronBridgeWindowState,
+    WINDOW_STATE_CHANGED,
+} from '@iptvnator/shared/interfaces';
 import { join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { rendererAppName, rendererAppPort } from './constants';
@@ -10,6 +13,8 @@ import {
     trace,
 } from './services/debug-trace';
 import { store, WINDOW_BOUNDS } from './services/store.service';
+import { isFrameCopyRuntimeUsable } from './services/embedded-mpv-frame-copy-platform.util';
+import { isEmbeddedMpvFeatureEnabled } from './services/embedded-mpv-runtime-policy.util';
 
 const externalBrowserProtocols = new Set(['http:', 'https:']);
 const trustedDevRendererHosts = new Set([
@@ -79,10 +84,22 @@ export function isTrustedRendererNavigationUrl(
 }
 
 export function getMainWindowWebPreferences(): Electron.BrowserWindowConstructorOptions['webPreferences'] {
+    // The frame-copy embedded MPV experiment needs the preload script to
+    // load the shm frame-reader native addon, which the renderer sandbox
+    // forbids. Only that opt-in flag relaxes the sandbox; context isolation
+    // and nodeIntegration:false stay on either way, so page code never
+    // gains Node access. Revisit before the engine can become a default.
+    const frameCopyExperiment =
+        isEmbeddedMpvFeatureEnabled() &&
+        ['1', 'true', 'yes', 'on'].includes(
+            (process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY ?? '')
+                .trim()
+                .toLowerCase()
+        ) && isFrameCopyRuntimeUsable();
     return {
         contextIsolation: true,
         nodeIntegration: false,
-        sandbox: true,
+        sandbox: !frameCopyExperiment,
         webSecurity: true,
         backgroundThrottling: false,
         preload: join(__dirname, 'main.preload.js'),
@@ -304,21 +321,44 @@ export default class App {
             return;
         }
 
-        const sendWindowState = () => {
+        // Window state is never re-read at event time: on Windows both
+        // isFullScreen() and isMaximized() can still report the
+        // pre-transition value while the matching event fires (notably for
+        // HTML-element fullscreen, i.e. the video player). Since the
+        // renderer replaces both flags on every push and no later event
+        // corrects a stale one, polling left the controls hidden forever
+        // after leaving fullscreen — and, for the companion flag, the
+        // maximize/restore glyph stuck on the wrong icon.
+        //
+        // Instead the state is seeded once here (window creation, so no
+        // transition is in flight) and each event patches only the flag it
+        // names.
+        const state: ElectronBridgeWindowState = {
+            isMaximized: win.isMaximized(),
+            isFullScreen: win.isFullScreen(),
+        };
+
+        const push = (patch: Partial<ElectronBridgeWindowState>) => {
+            Object.assign(state, patch);
+
             if (win.isDestroyed()) {
                 return;
             }
 
-            win.webContents.send(WINDOW_STATE_CHANGED, {
-                isMaximized: win.isMaximized(),
-                isFullScreen: win.isFullScreen(),
-            });
+            // A copy per push: the renderer must not observe later
+            // mutations of the tracked state.
+            win.webContents.send(WINDOW_STATE_CHANGED, { ...state });
         };
 
-        win.on('maximize', sendWindowState);
-        win.on('unmaximize', sendWindowState);
-        win.on('enter-full-screen', sendWindowState);
-        win.on('leave-full-screen', sendWindowState);
+        win.on('maximize', () => push({ isMaximized: true }));
+        win.on('unmaximize', () => push({ isMaximized: false }));
+        // The html variants cover HTML-element fullscreen; not every
+        // platform/trigger emits both pairs, and duplicate pushes with the
+        // same payload are harmless.
+        win.on('enter-full-screen', () => push({ isFullScreen: true }));
+        win.on('enter-html-full-screen', () => push({ isFullScreen: true }));
+        win.on('leave-full-screen', () => push({ isFullScreen: false }));
+        win.on('leave-html-full-screen', () => push({ isFullScreen: false }));
     }
 
     private static initMainWindow() {
diff --git a/apps/electron-backend/src/app/database/operations/category.operations.spec.ts b/apps/electron-backend/src/app/database/operations/category.operations.spec.ts
index b11405790..2c38e5ab6 100644
--- a/apps/electron-backend/src/app/database/operations/category.operations.spec.ts
+++ b/apps/electron-backend/src/app/database/operations/category.operations.spec.ts
@@ -1,6 +1,23 @@
 import type { AppDatabase } from '../database.types';
 import * as schema from '@iptvnator/shared/database/schema';
-import { getCategories, saveCategories } from './category.operations';
+import {
+    getAllCategories,
+    getCategories,
+    saveCategories,
+} from './category.operations';
+
+// Renderer consumers (XCategoryFromDb/XtreamCategoryFromDb) expect category
+// rows in this snake_case wire shape. A bare select() would return Drizzle's
+// camelCase property names and silently break the playlist backup
+// export/restore (issue #1017).
+const categoryWireShape = {
+    id: schema.categories.id,
+    playlist_id: schema.categories.playlistId,
+    name: schema.categories.name,
+    type: schema.categories.type,
+    xtream_id: schema.categories.xtreamId,
+    hidden: schema.categories.hidden,
+};
 
 function createDbMock(existingCount = 0) {
     const where = jest.fn().mockResolvedValue([{ count: existingCount }]);
@@ -37,6 +54,21 @@ describe('category.operations', () => {
         await getCategories(db, 'playlist-1', 'live');
 
         expect(orderBy).toHaveBeenCalledWith(schema.categories.id);
+        expect(select).toHaveBeenCalledWith(categoryWireShape);
+    });
+
+    it('projects all categories to the snake_case wire shape', async () => {
+        const orderBy = jest.fn().mockResolvedValue([]);
+        const where = jest.fn().mockReturnValue({ orderBy });
+        const from = jest.fn().mockReturnValue({ where });
+        const select = jest.fn().mockReturnValue({ from });
+        const db = {
+            select,
+        } as unknown as AppDatabase;
+
+        await getAllCategories(db, 'playlist-1', 'movies');
+
+        expect(select).toHaveBeenCalledWith(categoryWireShape);
     });
 
     it('restores hidden categories when Xtream API category IDs are strings', async () => {
diff --git a/apps/electron-backend/src/app/database/operations/category.operations.ts b/apps/electron-backend/src/app/database/operations/category.operations.ts
index a22a4a4e2..27bd2cb46 100644
--- a/apps/electron-backend/src/app/database/operations/category.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/category.operations.ts
@@ -7,6 +7,20 @@ type XtreamCategoryInput = {
     category_id: string | number;
 };
 
+// Category rows cross the DB-worker IPC boundary in the snake_case wire
+// shape declared by XCategoryFromDb/XtreamCategoryFromDb. A bare select()
+// would leak Drizzle's camelCase property names (xtreamId, playlistId)
+// instead, silently breaking consumers such as the playlist backup
+// export/restore (issue #1017).
+const categoryWireShape = {
+    id: schema.categories.id,
+    playlist_id: schema.categories.playlistId,
+    name: schema.categories.name,
+    type: schema.categories.type,
+    xtream_id: schema.categories.xtreamId,
+    hidden: schema.categories.hidden,
+};
+
 function normalizeXtreamCategoryId(
     rawCategoryId: string | number
 ): number | null {
@@ -43,7 +57,7 @@ export async function getCategories(
     // If partial category re-inserts are added later, persist a provider
     // sort index instead of relying on the insertion id.
     return db
-        .select()
+        .select(categoryWireShape)
         .from(schema.categories)
         .where(
             and(
@@ -123,7 +137,7 @@ export async function getAllCategories(
     type: 'live' | 'movies' | 'series'
 ) {
     return db
-        .select()
+        .select(categoryWireShape)
         .from(schema.categories)
         .where(
             and(
diff --git a/apps/electron-backend/src/app/database/operations/content-search.util.spec.ts b/apps/electron-backend/src/app/database/operations/content-search.util.spec.ts
new file mode 100644
index 000000000..c668afcf6
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/content-search.util.spec.ts
@@ -0,0 +1,151 @@
+import {
+    buildCompoundFtsMatchQuery,
+    buildCompoundLikePatterns,
+    buildM3uPayloadCompoundPatterns,
+    getCompoundResidualTokenGroups,
+    getCompoundSearchWords,
+    getSearchWordPlans,
+    scoreSearchTextMatch,
+    shouldUseContentTitlePrefixIndex,
+} from './content-search.util';
+
+describe('content-search.util', () => {
+    describe('getCompoundSearchWords', () => {
+        it('extracts punctuation-joined words from the raw search term', () => {
+            expect(getCompoundSearchWords('A&E')).toEqual(['A&E']);
+            expect(getCompoundSearchWords('US A&E HD')).toEqual(['A&E']);
+            expect(getCompoundSearchWords('Spider-Man')).toEqual([
+                'Spider-Man',
+            ]);
+            expect(getCompoundSearchWords("L'Équipe")).toEqual(["L'Équipe"]);
+        });
+
+        it('trims edge punctuation before deciding whether a word is compound', () => {
+            expect(getCompoundSearchWords('(A&E)')).toEqual(['A&E']);
+            expect(getCompoundSearchWords('"A&E:"')).toEqual(['A&E']);
+        });
+
+        it('ignores plain words, standalone punctuation and too-short fragments', () => {
+            expect(getCompoundSearchWords('History')).toEqual([]);
+            expect(getCompoundSearchWords('Tom & Jerry')).toEqual([]);
+            expect(getCompoundSearchWords('a&')).toEqual([]);
+            expect(getCompoundSearchWords('')).toEqual([]);
+            expect(getCompoundSearchWords(undefined)).toEqual([]);
+        });
+
+    });
+
+    describe('getSearchWordPlans', () => {
+        it('keeps each word with its own token groups and compound flag', () => {
+            expect(getSearchWordPlans('A&E HD')).toEqual([
+                { compound: 'A&E', tokenGroups: [['a'], ['e']] },
+                { compound: null, tokenGroups: [['hd']] },
+            ]);
+        });
+
+        it('skips punctuation-only words', () => {
+            expect(getSearchWordPlans('Tom & Jerry')).toEqual([
+                { compound: null, tokenGroups: [['tom']] },
+                { compound: null, tokenGroups: [['jerry']] },
+            ]);
+        });
+    });
+
+    describe('getCompoundResidualTokenGroups', () => {
+        it('returns the token groups of the non-compound words only', () => {
+            expect(getCompoundResidualTokenGroups('A&E HD')).toEqual([['hd']]);
+            expect(getCompoundResidualTokenGroups('A&E')).toEqual([]);
+            expect(getCompoundResidualTokenGroups('History')).toEqual([
+                ['history'],
+            ]);
+        });
+    });
+
+    describe('buildCompoundFtsMatchQuery', () => {
+        it('quotes each compound word as a trigram substring phrase', () => {
+            expect(buildCompoundFtsMatchQuery('A&E')).toBe('"a&e"');
+            expect(buildCompoundFtsMatchQuery('X-Men')).toBe('"x-men"');
+        });
+
+        it('keeps accented and diacritic-stripped variants', () => {
+            expect(buildCompoundFtsMatchQuery("L'Équipe")).toBe(
+                '("l\'équipe" OR "l\'equipe")'
+            );
+        });
+
+        it('joins multiple compound words with AND', () => {
+            expect(buildCompoundFtsMatchQuery('A&E X-Men')).toBe(
+                '"a&e" AND "x-men"'
+            );
+        });
+
+        it('returns an empty query for terms without compound words', () => {
+            expect(buildCompoundFtsMatchQuery('History Channel')).toBe('');
+            expect(buildCompoundFtsMatchQuery('tv')).toBe('');
+        });
+    });
+
+    describe('buildCompoundLikePatterns', () => {
+        it('builds case-variant contains patterns around the intact word', () => {
+            const patterns = buildCompoundLikePatterns('A&E');
+
+            expect(patterns).toContain('%a&e%');
+            expect(patterns).toContain('%A&E%');
+            expect(
+                patterns.every(
+                    (pattern) =>
+                        pattern.startsWith('%') && pattern.endsWith('%')
+                )
+            ).toBe(true);
+        });
+
+        it('escapes LIKE wildcards inside the compound word', () => {
+            expect(buildCompoundLikePatterns('a_b')).toContain('%a\\_b%');
+        });
+    });
+
+    describe('buildM3uPayloadCompoundPatterns', () => {
+        it('scopes compound contains patterns to payload name/title fields', () => {
+            const patterns = buildM3uPayloadCompoundPatterns('A&E');
+
+            expect(patterns).toContain('%"name":"%a&e%"%');
+            expect(patterns).toContain('%"title":"%a&e%"%');
+        });
+    });
+
+    describe('shouldUseContentTitlePrefixIndex', () => {
+        it('still routes compound short-token terms through the prefix index', () => {
+            // The compound FTS lookup supplements the prefix arm instead of
+            // replacing it, so titles starting with "A & E" keep matching.
+            expect(shouldUseContentTitlePrefixIndex('A&E')).toBe(true);
+            expect(shouldUseContentTitlePrefixIndex('Spider-Man')).toBe(false);
+        });
+    });
+
+    describe('scoreSearchTextMatch', () => {
+        it('matches compound words anywhere in the title (issue #1161)', () => {
+            expect(scoreSearchTextMatch('US: A&E', 'A&E')).toBe(40);
+            expect(scoreSearchTextMatch('US | A&E HD', 'A&E HD')).toBe(40);
+            expect(scoreSearchTextMatch('(US) A&E', 'A&E')).toBe(40);
+        });
+
+        it('keeps exact and prefix compound matches ranked above mid-title ones', () => {
+            expect(scoreSearchTextMatch('A&E', 'A&E')).toBe(0);
+            expect(scoreSearchTextMatch('A&E HD', 'A&E')).toBe(10);
+        });
+
+        it('does not match the phrase across word boundaries', () => {
+            expect(scoreSearchTextMatch('Casa e Villa', 'A&E')).toBeNull();
+            expect(scoreSearchTextMatch('Bravo Espana', 'A&E')).toBeNull();
+        });
+
+        it('requires every extra token, not just the compound word', () => {
+            expect(scoreSearchTextMatch('US: A&E', 'A&E HD')).toBeNull();
+        });
+
+        it('keeps single short tokens anchored to the title start', () => {
+            expect(scoreSearchTextMatch('TV Sport News', 'tv')).toBe(10);
+            expect(scoreSearchTextMatch('Test TV', 'tv')).toBeNull();
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/database/operations/content-search.util.ts b/apps/electron-backend/src/app/database/operations/content-search.util.ts
new file mode 100644
index 000000000..dc0d9488b
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/content-search.util.ts
@@ -0,0 +1,370 @@
+/**
+ * Pure text helpers for the content search pipeline (global search,
+ * per-playlist search and M3U payload search). Everything here is
+ * side-effect free and independent of drizzle so it can be unit tested
+ * without database mocks; the SQL condition builders that consume these
+ * helpers live in `content.operations.ts`.
+ */
+
+/** Minimum length the trigram FTS index can match (trigram = 3 chars). */
+const MIN_COMPOUND_WORD_LENGTH = 3;
+
+const WORD_EDGE_PUNCTUATION_REGEXP = /^[^\p{L}\p{N}]+|[^\p{L}\p{N}]+$/gu;
+const INNER_PUNCTUATION_REGEXP = /[^\p{L}\p{N}]/u;
+
+export function escapeLikePattern(term: string): string {
+    return term.replace(/[%_\\]/g, '\\$&');
+}
+
+export function normalizeSearchMatchText(value: unknown): string {
+    return typeof value === 'string'
+        ? value
+              .normalize('NFKD')
+              .replace(/[\u0300-\u036f]/g, '')
+              .toLocaleLowerCase()
+              .replace(/[^\p{L}\p{N}]+/gu, ' ')
+              .trim()
+              .replace(/\s+/g, ' ')
+        : '';
+}
+
+function normalizeSqlSearchText(value: unknown): string {
+    return typeof value === 'string'
+        ? value
+              .toLocaleLowerCase()
+              .replace(/[^\p{L}\p{N}]+/gu, ' ')
+              .trim()
+              .replace(/\s+/g, ' ')
+        : '';
+}
+
+function getSearchTokens(value: unknown): string[] {
+    const normalized = normalizeSearchMatchText(value);
+    return normalized ? normalized.split(' ') : [];
+}
+
+export function getSqlSearchTokenGroups(value: unknown): string[][] {
+    const rawTokens = normalizeSqlSearchText(value).split(' ').filter(Boolean);
+    const normalizedTokens = getSearchTokens(value);
+    const tokenCount = Math.max(rawTokens.length, normalizedTokens.length);
+
+    return Array.from({ length: tokenCount }, (_, index) =>
+        [...new Set([rawTokens[index], normalizedTokens[index]])].filter(
+            Boolean
+        )
+    ).filter((group) => group.length > 0);
+}
+
+export function isShortSearchTokenGroup(tokens: readonly string[]): boolean {
+    return tokens.some((token) => token.length <= 2);
+}
+
+function getSqlSearchTokenVariants(value: unknown): string[] {
+    return [...new Set(getSqlSearchTokenGroups(value).flat())];
+}
+
+export function buildLikePatterns(
+    term: string,
+    mode: 'contains' | 'prefix' = 'contains'
+): string[] {
+    const variants = new Set<string>();
+
+    for (const value of [term, ...getSqlSearchTokenVariants(term)]) {
+        const trimmedValue = value.trim();
+        if (!trimmedValue) {
+            continue;
+        }
+
+        const titleCase =
+            trimmedValue.length > 0
+                ? trimmedValue.charAt(0).toLocaleUpperCase() +
+                  trimmedValue.slice(1).toLocaleLowerCase()
+                : trimmedValue;
+
+        variants.add(trimmedValue);
+        variants.add(trimmedValue.toLocaleLowerCase());
+        variants.add(trimmedValue.toLocaleUpperCase());
+        variants.add(titleCase);
+    }
+
+    return [...variants].map((value) => {
+        const escapedValue = escapeLikePattern(value);
+        return mode === 'prefix' ? `${escapedValue}%` : `%${escapedValue}%`;
+    });
+}
+
+export function buildGlobPrefixPatterns(token: string): string[] {
+    const variants = new Set<string>();
+
+    for (const value of [token, ...getSqlSearchTokenVariants(token)]) {
+        variants.add(value);
+        variants.add(value.toLocaleLowerCase());
+        variants.add(value.toLocaleUpperCase());
+        variants.add(
+            value.charAt(0).toLocaleUpperCase() +
+                value.slice(1).toLocaleLowerCase()
+        );
+    }
+
+    return [...variants].map((value) => `${value}*`);
+}
+
+export function shouldUseContentTitlePrefixIndex(searchTerm: string): boolean {
+    const [firstTokenGroup] = getSqlSearchTokenGroups(searchTerm);
+
+    return !!firstTokenGroup && isShortSearchTokenGroup(firstTokenGroup);
+}
+
+export function buildContentTitleFtsMatchQuery(searchTerm: string): string {
+    return getSqlSearchTokenGroups(searchTerm)
+        .map((tokens) => {
+            const quotedTokens = tokens
+                .filter((token) => token.length >= 3)
+                .map((token) => `"${token.replace(/"/g, '""')}"`);
+
+            if (quotedTokens.length <= 1) {
+                return quotedTokens[0] ?? '';
+            }
+
+            return `(${quotedTokens.join(' OR ')})`;
+        })
+        .filter(Boolean)
+        .join(' AND ');
+}
+
+export function shouldUseContentTitleFts(searchTerm: string): boolean {
+    return (
+        !shouldUseContentTitlePrefixIndex(searchTerm) &&
+        buildContentTitleFtsMatchQuery(searchTerm).length > 0
+    );
+}
+
+/**
+ * Whitespace-delimited words from the raw search term that still contain
+ * internal punctuation after trimming their edges — e.g. `a&e`, `x-men`,
+ * `l'équipe`. Tokenization splits these into (often 1-letter) fragments
+ * whose short-token handling anchors the search to the title start, so the
+ * intact word is preserved as an additional exact-substring search unit
+ * (issue #1161: "A&E" not finding "US: A&E").
+ */
+export function getCompoundSearchWords(value: unknown): string[] {
+    if (typeof value !== 'string') {
+        return [];
+    }
+
+    const words = new Set<string>();
+    for (const rawWord of value.split(/\s+/)) {
+        const word = rawWord.replace(WORD_EDGE_PUNCTUATION_REGEXP, '');
+        if (
+            word.length < MIN_COMPOUND_WORD_LENGTH ||
+            !INNER_PUNCTUATION_REGEXP.test(word)
+        ) {
+            continue;
+        }
+        words.add(word);
+    }
+
+    return [...words];
+}
+
+/**
+ * One whitespace-delimited search word with its token groups. `compound` is
+ * the intact word when it contains internal punctuation (see
+ * `getCompoundSearchWords`), else null. SQL condition builders compose
+ * per-word conditions from this so a compound word's substring arm stays
+ * AND-constrained by the other words of the query — `A&E HD` must not let
+ * plain `A&E` titles flood the SQL candidate window before scoring runs.
+ */
+export interface SearchWordPlan {
+    compound: string | null;
+    tokenGroups: string[][];
+}
+
+export function getSearchWordPlans(value: unknown): SearchWordPlan[] {
+    if (typeof value !== 'string') {
+        return [];
+    }
+
+    const plans: SearchWordPlan[] = [];
+    for (const rawWord of value.split(/\s+/)) {
+        const word = rawWord.replace(WORD_EDGE_PUNCTUATION_REGEXP, '');
+        if (!word) {
+            continue;
+        }
+
+        const tokenGroups = getSqlSearchTokenGroups(word);
+        if (tokenGroups.length === 0) {
+            continue;
+        }
+
+        const isCompound =
+            word.length >= MIN_COMPOUND_WORD_LENGTH &&
+            INNER_PUNCTUATION_REGEXP.test(word);
+        plans.push({ compound: isCompound ? word : null, tokenGroups });
+    }
+
+    return plans;
+}
+
+/**
+ * Token groups of the non-compound words of the term. When the compound FTS
+ * arm looks up `"a&e"` for `A&E HD`, these groups (`hd`) are re-applied as
+ * LIKE conditions so the supplement cannot fill the candidate limit with
+ * titles that match the compound word alone.
+ */
+export function getCompoundResidualTokenGroups(value: unknown): string[][] {
+    return getSearchWordPlans(value)
+        .filter((plan) => plan.compound === null)
+        .flatMap((plan) => plan.tokenGroups);
+}
+
+/** As-typed plus diacritic-stripped forms, both long enough for trigram FTS. */
+function getCompoundWordVariants(word: string): string[] {
+    const stripped = word.normalize('NFKD').replace(/[\u0300-\u036f]/g, '');
+
+    return [...new Set([word, stripped])].filter(
+        (variant) => variant.length >= MIN_COMPOUND_WORD_LENGTH
+    );
+}
+
+/**
+ * Case/diacritic LIKE variants of a compound word as contains patterns
+ * (`%a&e%`). SQLite LIKE is only case-insensitive for ASCII, so the same
+ * lower/upper/title-case expansion as `buildLikePatterns` is applied.
+ */
+export function buildCompoundLikePatterns(word: string): string[] {
+    const variants = new Set<string>();
+
+    for (const value of getCompoundWordVariants(word)) {
+        variants.add(value);
+        variants.add(value.toLocaleLowerCase());
+        variants.add(value.toLocaleUpperCase());
+        variants.add(
+            value.charAt(0).toLocaleUpperCase() +
+                value.slice(1).toLocaleLowerCase()
+        );
+    }
+
+    return [...variants].map((value) => `%${escapeLikePattern(value)}%`);
+}
+
+/**
+ * Trigram FTS match query treating each compound word as a quoted substring
+ * phrase: `"a&e"`, `("café" OR "cafe")`. The trigram tokenizer matches
+ * case-insensitive substrings of >= 3 chars, so this finds the compound word
+ * anywhere in the title without a table scan. Returns '' when the term has
+ * no compound words.
+ */
+export function buildCompoundFtsMatchQuery(searchTerm: string): string {
+    return getCompoundSearchWords(searchTerm)
+        .map((word) => {
+            const quotedVariants = [
+                ...new Set(
+                    getCompoundWordVariants(word).map((variant) =>
+                        variant.toLocaleLowerCase()
+                    )
+                ),
+            ].map((variant) => `"${variant.replace(/"/g, '""')}"`);
+
+            if (quotedVariants.length <= 1) {
+                return quotedVariants[0] ?? '';
+            }
+
+            return `(${quotedVariants.join(' OR ')})`;
+        })
+        .filter(Boolean)
+        .join(' AND ');
+}
+
+export function buildM3uPayloadTextFieldPatterns(
+    token: string,
+    mode: 'contains' | 'prefix'
+): string[] {
+    return buildLikePatterns(token, mode).flatMap((pattern) =>
+        wrapM3uPayloadTextFieldPattern(pattern)
+    );
+}
+
+/** Compound-word contains patterns scoped to M3U payload name/title fields. */
+export function buildM3uPayloadCompoundPatterns(word: string): string[] {
+    return buildCompoundLikePatterns(word).flatMap((pattern) =>
+        wrapM3uPayloadTextFieldPattern(pattern)
+    );
+}
+
+function wrapM3uPayloadTextFieldPattern(pattern: string): string[] {
+    return [
+        `%"name":"${pattern}"%`,
+        `%"name": "${pattern}"%`,
+        `%"title":"${pattern}"%`,
+        `%"title": "${pattern}"%`,
+    ];
+}
+
+export function scoreSearchTextMatch(
+    value: string,
+    searchTerm: string
+): number | null {
+    const candidateText = normalizeSearchMatchText(value);
+    const searchText = normalizeSearchMatchText(searchTerm);
+    if (!candidateText || !searchText) {
+        return null;
+    }
+
+    const searchTokens = searchText.split(' ');
+    const candidateTokens = candidateText.split(' ');
+    const firstSearchToken = searchTokens[0];
+
+    if (
+        firstSearchToken.length <= 2 &&
+        !candidateText.startsWith(firstSearchToken)
+    ) {
+        // Short first tokens stay prefix-anchored to keep one-letter noise
+        // out, but a multi-token phrase ("a e" from "A&E") may still match as
+        // a whole word sequence anywhere in the title ("US: A&E").
+        if (
+            searchTokens.length > 1 &&
+            ` ${candidateText} `.includes(` ${searchText} `)
+        ) {
+            return 40;
+        }
+        return null;
+    }
+
+    if (candidateText === searchText) {
+        return 0;
+    }
+
+    if (
+        candidateText.startsWith(searchText) &&
+        (searchTokens.length > 1 || firstSearchToken.length <= 2)
+    ) {
+        return 10;
+    }
+
+    if (candidateTokens.some((token) => token.startsWith(searchText))) {
+        return 20;
+    }
+
+    if (
+        searchTokens.every((searchToken) =>
+            candidateTokens.some((candidateToken) =>
+                candidateToken.startsWith(searchToken)
+            )
+        )
+    ) {
+        return 30;
+    }
+
+    if (candidateText.includes(searchText)) {
+        return 40;
+    }
+
+    if (
+        searchTokens.every((searchToken) => candidateText.includes(searchToken))
+    ) {
+        return 50;
+    }
+
+    return null;
+}
diff --git a/apps/electron-backend/src/app/database/operations/content.operations.spec.ts b/apps/electron-backend/src/app/database/operations/content.operations.spec.ts
index d3dd2db06..586dfd065 100644
--- a/apps/electron-backend/src/app/database/operations/content.operations.spec.ts
+++ b/apps/electron-backend/src/app/database/operations/content.operations.spec.ts
@@ -12,6 +12,10 @@ const inArrayMock = jest.fn((left: unknown, values: unknown[]) => ({
     left,
     values,
 }));
+const orMock = jest.fn((...conditions: unknown[]) => ({
+    kind: 'or',
+    conditions,
+}));
 const sqlJoinMock = jest.fn((chunks: unknown[], separator?: unknown) => ({
     kind: 'sql.join',
     chunks,
@@ -34,7 +38,7 @@ jest.mock('drizzle-orm', () => ({
     desc: jest.fn(),
     eq: (left: unknown, right: unknown) => eqMock(left, right),
     inArray: (left: unknown, values: unknown[]) => inArrayMock(left, values),
-    or: jest.fn(),
+    or: (...conditions: unknown[]) => orMock(...conditions),
     sql: sqlMock,
 }));
 
@@ -47,6 +51,7 @@ import {
     getGlobalRecentlyAdded,
     saveContent,
     scoreSearchTextMatch,
+    searchContent,
 } from './content.operations';
 
 function createDbMock(result: unknown[] = []) {
@@ -111,6 +116,7 @@ describe('content.operations', () => {
         andMock.mockClear();
         eqMock.mockClear();
         inArrayMock.mockClear();
+        orMock.mockClear();
         sqlJoinMock.mockClear();
         sqlMock.mockClear();
     });
@@ -752,6 +758,299 @@ describe('content.operations', () => {
         ).toBe(true);
     });
 
+    it('finds compound-word channels anywhere in M3U channel names (issue #1161)', () => {
+        const makeChannel = (id: string, name: string) => ({
+            id,
+            url: `https://stream.test/${id}.m3u8`,
+            name,
+            group: { title: 'Entertainment' },
+            tvg: {
+                id,
+                name: '',
+                url: '',
+                logo: '',
+                rec: '',
+            },
+            http: {
+                referrer: '',
+                'user-agent': '',
+                origin: '',
+            },
+            radio: '',
+        });
+
+        const results = buildM3uGlobalSearchResults(
+            [
+                {
+                    id: 'm3u-1',
+                    name: 'M3U One',
+                    payload: JSON.stringify({
+                        playlist: {
+                            items: [
+                                makeChannel('prefixed', 'US: A&E'),
+                                makeChannel('exact', 'A&E'),
+                                makeChannel('noise', 'Casa e Villa'),
+                                makeChannel('other', 'Bravo Espana'),
+                            ],
+                        },
+                    }),
+                },
+            ],
+            'A&E',
+            false
+        );
+
+        expect(results.map((item) => item.title)).toEqual(['A&E', 'US: A&E']);
+    });
+
+    it('finds compound-word titles anywhere via per-playlist search (issue #1161)', async () => {
+        const makeRow = (id: number, title: string) => ({
+            id,
+            category_id: 10,
+            title,
+            rating: '',
+            added: '',
+            poster_url: '',
+            epg_channel_id: '',
+            tv_archive: 0,
+            tv_archive_duration: 0,
+            direct_source: '',
+            xtream_id: id,
+            type: 'live',
+        });
+        const limit = jest
+            .fn()
+            .mockResolvedValue([
+                makeRow(1, 'US: A&E'),
+                makeRow(2, 'Casa e Villa'),
+            ]);
+        const where = jest.fn().mockReturnValue({ limit });
+        const innerJoin = jest.fn().mockReturnValue({ where });
+        const from = jest.fn().mockReturnValue({ innerJoin });
+        const select = jest.fn().mockReturnValue({ from });
+        const db = {
+            select,
+        } as unknown as AppDatabase;
+
+        const results = await searchContent(db, 'playlist-1', 'A&E', ['live']);
+
+        expect(results.map((item) => item.title)).toEqual(['US: A&E']);
+
+        // The intact compound word must reach SQL as a contains pattern and
+        // be OR-combined with the prefix-anchored token conditions.
+        const patterns = sqlMock.mock.calls
+            .flatMap(([, ...values]) => values)
+            .filter((value): value is string => typeof value === 'string');
+        expect(patterns).toContain('%a&e%');
+        expect(where.mock.calls[0][0].conditions).toEqual(
+            expect.arrayContaining([expect.objectContaining({ kind: 'or' })])
+        );
+    });
+
+    it('supplements short compound global searches with a trigram FTS substring lookup', async () => {
+        const makeRow = (id: number, title: string) => ({
+            id,
+            category_id: 10,
+            title,
+            rating: '',
+            added: '',
+            poster_url: '',
+            epg_channel_id: '',
+            tv_archive: 0,
+            tv_archive_duration: 0,
+            direct_source: '',
+            xtream_id: id,
+            type: 'live',
+            playlist_id: 'playlist-1',
+            playlist_name: 'Playlist One',
+        });
+        const all = jest
+            .fn()
+            // Prefix-index arm: titles starting with the short first token.
+            .mockResolvedValueOnce([makeRow(1, 'A&E')])
+            // FTS arm: compound substring matches, overlapping with the
+            // prefix arm to prove candidates are deduplicated.
+            .mockResolvedValueOnce([
+                makeRow(2, 'US: A&E'),
+                makeRow(1, 'A&E'),
+            ]);
+        const select = jest.fn();
+        const db = {
+            all,
+            select,
+        } as unknown as AppDatabase;
+
+        const results = await globalSearch(
+            db,
+            'A&E',
+            ['live'],
+            false,
+            ['xtream'],
+            { limit: 10 }
+        );
+
+        expect(all).toHaveBeenCalledTimes(2);
+        expect(select).not.toHaveBeenCalled();
+
+        const matchSqlCall = sqlMock.mock.calls.find(([strings]) =>
+            Array.from(strings as TemplateStringsArray)
+                .join(' ')
+                .includes('content_title_fts MATCH')
+        );
+        expect(matchSqlCall?.[1]).toBe('"a&e"');
+
+        expect(results.map((item) => item.title)).toEqual(['A&E', 'US: A&E']);
+    });
+
+    it('keeps non-compound tokens as conditions on the compound FTS supplement', async () => {
+        const all = jest.fn().mockResolvedValue([]);
+        const db = {
+            all,
+            select: jest.fn(),
+        } as unknown as AppDatabase;
+
+        await globalSearch(db, 'A&E HD', ['live'], false, ['xtream'], {
+            limit: 10,
+        });
+
+        expect(all).toHaveBeenCalledTimes(2);
+
+        const matchSqlCall = sqlMock.mock.calls.find(([strings]) =>
+            Array.from(strings as TemplateStringsArray)
+                .join(' ')
+                .includes('content_title_fts MATCH')
+        );
+        expect(matchSqlCall?.[1]).toBe('"a&e"');
+
+        // The FTS arm must AND-in the residual "hd" token so plain "A&E"
+        // titles cannot exhaust the candidate limit before scoring runs.
+        const residualPatterns = sqlMock.mock.calls
+            .filter(([strings]) =>
+                Array.from(strings as TemplateStringsArray)
+                    .join(' ')
+                    .includes('c.title LIKE')
+            )
+            .flatMap(([, ...values]) => values)
+            .filter((value): value is string => typeof value === 'string');
+        expect(residualPatterns).toContain('%hd%');
+    });
+
+    it('requires every word of a multi-token compound term in per-playlist SQL conditions', async () => {
+        const limit = jest.fn().mockResolvedValue([]);
+        const where = jest.fn().mockReturnValue({ limit });
+        const innerJoin = jest.fn().mockReturnValue({ where });
+        const from = jest.fn().mockReturnValue({ innerJoin });
+        const select = jest.fn().mockReturnValue({ from });
+        const db = {
+            select,
+        } as unknown as AppDatabase;
+
+        await searchContent(db, 'playlist-1', 'A&E HD', ['live']);
+
+        // One condition per word: the compound "A&E" word (an OR with the
+        // intact-substring arm) plus the plain "hd" word — both AND-ed, so
+        // the compound arm cannot bypass the "hd" requirement.
+        const conditions = where.mock.calls[0][0].conditions as Array<{
+            kind: string;
+        }>;
+        expect(conditions).toHaveLength(4);
+        expect(conditions[2]).toEqual(expect.objectContaining({ kind: 'or' }));
+        expect(conditions[3]).toEqual(expect.objectContaining({ kind: 'and' }));
+
+        const patterns = sqlMock.mock.calls
+            .flatMap(([, ...values]) => values)
+            .filter((value): value is string => typeof value === 'string');
+        expect(patterns).toContain('%a&e%');
+        expect(patterns).toContain('%hd%');
+    });
+
+    it('falls back to a content scan when the compound FTS lookup fails', async () => {
+        const globRow = {
+            id: 1,
+            category_id: 10,
+            title: 'A&E',
+            rating: '',
+            added: '',
+            poster_url: '',
+            epg_channel_id: '',
+            tv_archive: 0,
+            tv_archive_duration: 0,
+            direct_source: '',
+            xtream_id: 1,
+            type: 'live',
+            playlist_id: 'playlist-1',
+            playlist_name: 'Playlist One',
+        };
+        const scanRow = {
+            ...globRow,
+            id: 2,
+            xtream_id: 2,
+            title: 'US: A&E',
+        };
+        const all = jest
+            .fn()
+            .mockResolvedValueOnce([globRow])
+            .mockRejectedValueOnce(new Error('no such table: content_title_fts'));
+        const limit = jest.fn().mockResolvedValue([globRow, scanRow]);
+        const orderBy = jest.fn().mockReturnValue({ limit });
+        const where = jest.fn().mockReturnValue({ orderBy });
+        const innerJoin2 = jest.fn().mockReturnValue({ where });
+        const innerJoin1 = jest.fn().mockReturnValue({ innerJoin: innerJoin2 });
+        const from = jest.fn().mockReturnValue({ innerJoin: innerJoin1 });
+        const select = jest.fn().mockReturnValue({ from });
+        const db = {
+            all,
+            select,
+        } as unknown as AppDatabase;
+
+        const results = await globalSearch(
+            db,
+            'A&E',
+            ['live'],
+            false,
+            ['xtream'],
+            { limit: 10 }
+        );
+
+        expect(all).toHaveBeenCalledTimes(2);
+        expect(select).toHaveBeenCalledTimes(1);
+        expect(results.map((item) => item.title)).toEqual(['A&E', 'US: A&E']);
+    });
+
+    it('adds compound contains patterns to the M3U payload prefilter', async () => {
+        const limit = jest.fn().mockResolvedValue([]);
+        const orderedQuery = {
+            limit,
+            then: (resolve: (value: unknown[]) => void) => resolve([]),
+        };
+        const orderBy = jest.fn().mockReturnValue(orderedQuery);
+        const where = jest.fn().mockReturnValue({ orderBy });
+        const from = jest.fn().mockReturnValue({ where });
+        const select = jest.fn().mockReturnValue({ from });
+        const db = {
+            select,
+        } as unknown as AppDatabase;
+
+        await globalSearch(db, 'A&E', ['live'], false, ['m3u'], {
+            limit: 10,
+        });
+
+        const searchPatterns = sqlMock.mock.calls
+            .flatMap(([, ...values]) => values)
+            .filter(
+                (value): value is string =>
+                    typeof value === 'string' &&
+                    value.toLocaleLowerCase().includes('a&e')
+            );
+
+        expect(searchPatterns).toEqual(
+            expect.arrayContaining([
+                expect.stringContaining('"name":"%a&e%"'),
+                expect.stringContaining('"title":"%a&e%"'),
+            ])
+        );
+    });
+
     it('keeps accented M3U payload text field variants in SQL prefilters', async () => {
         const limit = jest.fn().mockResolvedValue([]);
         const orderedQuery = {
diff --git a/apps/electron-backend/src/app/database/operations/content.operations.ts b/apps/electron-backend/src/app/database/operations/content.operations.ts
index 7319d420b..b2eeaf8c8 100644
--- a/apps/electron-backend/src/app/database/operations/content.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/content.operations.ts
@@ -14,6 +14,23 @@ import {
     XtreamGlobalSearchResult,
 } from '@iptvnator/shared/interfaces';
 import type { AppDatabase } from '../database.types';
+import {
+    buildCompoundFtsMatchQuery,
+    buildCompoundLikePatterns,
+    buildContentTitleFtsMatchQuery,
+    buildGlobPrefixPatterns,
+    buildLikePatterns,
+    buildM3uPayloadCompoundPatterns,
+    buildM3uPayloadTextFieldPatterns,
+    getCompoundResidualTokenGroups,
+    getSearchWordPlans,
+    getSqlSearchTokenGroups,
+    isShortSearchTokenGroup,
+    normalizeSearchMatchText,
+    scoreSearchTextMatch,
+    shouldUseContentTitleFts,
+    shouldUseContentTitlePrefixIndex,
+} from './content-search.util';
 import {
     checkpointOperation,
     chunkValues,
@@ -21,86 +38,7 @@ import {
     reportOperationProgress,
 } from './operation-control';
 
-function escapeLikePattern(term: string): string {
-    return term.replace(/[%_\\]/g, '\\$&');
-}
-
-function normalizeSearchMatchText(value: unknown): string {
-    return typeof value === 'string'
-        ? value
-              .normalize('NFKD')
-              .replace(/[\u0300-\u036f]/g, '')
-              .toLocaleLowerCase()
-              .replace(/[^\p{L}\p{N}]+/gu, ' ')
-              .trim()
-              .replace(/\s+/g, ' ')
-        : '';
-}
-
-function normalizeSqlSearchText(value: unknown): string {
-    return typeof value === 'string'
-        ? value
-              .toLocaleLowerCase()
-              .replace(/[^\p{L}\p{N}]+/gu, ' ')
-              .trim()
-              .replace(/\s+/g, ' ')
-        : '';
-}
-
-function getSearchTokens(value: unknown): string[] {
-    const normalized = normalizeSearchMatchText(value);
-    return normalized ? normalized.split(' ') : [];
-}
-
-function getSqlSearchTokenGroups(value: unknown): string[][] {
-    const rawTokens = normalizeSqlSearchText(value).split(' ').filter(Boolean);
-    const normalizedTokens = getSearchTokens(value);
-    const tokenCount = Math.max(rawTokens.length, normalizedTokens.length);
-
-    return Array.from({ length: tokenCount }, (_, index) =>
-        [...new Set([rawTokens[index], normalizedTokens[index]])].filter(
-            Boolean
-        )
-    ).filter((group) => group.length > 0);
-}
-
-function isShortSearchTokenGroup(tokens: readonly string[]): boolean {
-    return tokens.some((token) => token.length <= 2);
-}
-
-function getSqlSearchTokenVariants(value: unknown): string[] {
-    return [...new Set(getSqlSearchTokenGroups(value).flat())];
-}
-
-function buildLikePatterns(
-    term: string,
-    mode: 'contains' | 'prefix' = 'contains'
-): string[] {
-    const variants = new Set<string>();
-
-    for (const value of [term, ...getSqlSearchTokenVariants(term)]) {
-        const trimmedValue = value.trim();
-        if (!trimmedValue) {
-            continue;
-        }
-
-        const titleCase =
-            trimmedValue.length > 0
-                ? trimmedValue.charAt(0).toLocaleUpperCase() +
-                  trimmedValue.slice(1).toLocaleLowerCase()
-                : trimmedValue;
-
-        variants.add(trimmedValue);
-        variants.add(trimmedValue.toLocaleLowerCase());
-        variants.add(trimmedValue.toLocaleUpperCase());
-        variants.add(titleCase);
-    }
-
-    return [...variants].map((value) => {
-        const escapedValue = escapeLikePattern(value);
-        return mode === 'prefix' ? `${escapedValue}%` : `%${escapedValue}%`;
-    });
-}
+export { scoreSearchTextMatch } from './content-search.util';
 
 const DEFAULT_GLOBAL_SEARCH_LIMIT = 50;
 const MAX_GLOBAL_SEARCH_LIMIT = 500;
@@ -174,65 +112,6 @@ function normalizeGlobalSearchPagination(
     return { limit, offset };
 }
 
-export function scoreSearchTextMatch(
-    value: string,
-    searchTerm: string
-): number | null {
-    const candidateText = normalizeSearchMatchText(value);
-    const searchText = normalizeSearchMatchText(searchTerm);
-    if (!candidateText || !searchText) {
-        return null;
-    }
-
-    const searchTokens = searchText.split(' ');
-    const candidateTokens = candidateText.split(' ');
-    const firstSearchToken = searchTokens[0];
-
-    if (
-        firstSearchToken.length <= 2 &&
-        !candidateText.startsWith(firstSearchToken)
-    ) {
-        return null;
-    }
-
-    if (candidateText === searchText) {
-        return 0;
-    }
-
-    if (
-        candidateText.startsWith(searchText) &&
-        (searchTokens.length > 1 || firstSearchToken.length <= 2)
-    ) {
-        return 10;
-    }
-
-    if (candidateTokens.some((token) => token.startsWith(searchText))) {
-        return 20;
-    }
-
-    if (
-        searchTokens.every((searchToken) =>
-            candidateTokens.some((candidateToken) =>
-                candidateToken.startsWith(searchToken)
-            )
-        )
-    ) {
-        return 30;
-    }
-
-    if (candidateText.includes(searchText)) {
-        return 40;
-    }
-
-    if (
-        searchTokens.every((searchToken) => candidateText.includes(searchToken))
-    ) {
-        return 50;
-    }
-
-    return null;
-}
-
 function compareScoredGlobalSearchResults(
     first: ScoredGlobalSearchResult,
     second: ScoredGlobalSearchResult
@@ -278,73 +157,55 @@ function getGlobalSearchCandidateLimit(): number {
     return MAX_GLOBAL_SEARCH_CANDIDATE_LIMIT;
 }
 
+/**
+ * Per-word title conditions, AND-ed by the caller. A word's condition is the
+ * AND of its token-group LIKE conditions; a punctuation-joined word ("A&E")
+ * additionally matches as an intact contains pattern anywhere in the title
+ * (issue #1161). Composing per word keeps the other words' constraints on
+ * the compound arm, so "A&E HD" cannot fill the SQL candidate limit with
+ * titles that only contain "A&E".
+ */
 function buildContentTitleSearchConditions(searchTerm: string) {
-    const tokenGroups = getSqlSearchTokenGroups(searchTerm);
-    if (tokenGroups.length === 0) {
-        return [];
-    }
+    let groupIndex = 0;
 
-    return tokenGroups
-        .map((tokens, index) => {
-            const mode =
-                index === 0 && isShortSearchTokenGroup(tokens)
-                    ? 'prefix'
-                    : 'contains';
-            const likeConditions = tokens.flatMap((token) =>
-                buildLikePatterns(token, mode).map(
-                    (pattern) =>
-                        sql`${schema.content.title} LIKE ${pattern} ESCAPE '\\'`
-                )
-            );
-            return or(...likeConditions);
-        })
-        .filter((condition) => condition !== undefined);
-}
+    return getSearchWordPlans(searchTerm)
+        .map((plan) => {
+            const tokenConditions = plan.tokenGroups
+                .map((tokens) => {
+                    const mode =
+                        groupIndex === 0 && isShortSearchTokenGroup(tokens)
+                            ? 'prefix'
+                            : 'contains';
+                    groupIndex += 1;
+                    const likeConditions = tokens.flatMap((token) =>
+                        buildLikePatterns(token, mode).map(
+                            (pattern) =>
+                                sql`${schema.content.title} LIKE ${pattern} ESCAPE '\\'`
+                        )
+                    );
+                    return or(...likeConditions);
+                })
+                .filter((condition) => condition !== undefined);
 
-function shouldUseContentTitlePrefixIndex(searchTerm: string): boolean {
-    const [firstTokenGroup] = getSqlSearchTokenGroups(searchTerm);
-
-    return !!firstTokenGroup && isShortSearchTokenGroup(firstTokenGroup);
-}
-
-function buildContentTitleFtsMatchQuery(searchTerm: string): string {
-    return getSqlSearchTokenGroups(searchTerm)
-        .map((tokens) => {
-            const quotedTokens = tokens
-                .filter((token) => token.length >= 3)
-                .map((token) => `"${token.replace(/"/g, '""')}"`);
-
-            if (quotedTokens.length <= 1) {
-                return quotedTokens[0] ?? '';
+            const tokenArm =
+                tokenConditions.length > 0
+                    ? and(...tokenConditions)
+                    : undefined;
+            if (plan.compound === null) {
+                return tokenArm;
             }
 
-            return `(${quotedTokens.join(' OR ')})`;
+            const compoundConditions = buildCompoundLikePatterns(
+                plan.compound
+            ).map(
+                (pattern) =>
+                    sql`${schema.content.title} LIKE ${pattern} ESCAPE '\\'`
+            );
+            return tokenArm === undefined
+                ? or(...compoundConditions)
+                : or(tokenArm, ...compoundConditions);
         })
-        .filter(Boolean)
-        .join(' AND ');
-}
-
-function shouldUseContentTitleFts(searchTerm: string): boolean {
-    return (
-        !shouldUseContentTitlePrefixIndex(searchTerm) &&
-        buildContentTitleFtsMatchQuery(searchTerm).length > 0
-    );
-}
-
-function buildGlobPrefixPatterns(token: string): string[] {
-    const variants = new Set<string>();
-
-    for (const value of [token, ...getSqlSearchTokenVariants(token)]) {
-        variants.add(value);
-        variants.add(value.toLocaleLowerCase());
-        variants.add(value.toLocaleUpperCase());
-        variants.add(
-            value.charAt(0).toLocaleUpperCase() +
-                value.slice(1).toLocaleLowerCase()
-        );
-    }
-
-    return [...variants].map((value) => `${value}*`);
+        .filter((condition) => condition !== undefined);
 }
 
 function buildRawContentTitleSearchSql(searchTerm: string): SQL[] {
@@ -371,6 +232,40 @@ function buildRawContentTitleSearchSql(searchTerm: string): SQL[] {
     });
 }
 
+/**
+ * Contains-mode LIKE conditions for the non-compound words of the term,
+ * applied on top of the compound FTS lookup so `A&E HD` only surfaces
+ * candidates that also contain `hd` (the FTS phrase can only express the
+ * compound word — trigram tokens need >= 3 chars).
+ */
+function buildCompoundResidualTitleSql(searchTerm: string): SQL[] {
+    return getCompoundResidualTokenGroups(searchTerm).map(
+        (tokens) =>
+            sql`(${sql.join(
+                tokens.flatMap((token) =>
+                    buildLikePatterns(token).map(
+                        (pattern) => sql`c.title LIKE ${pattern} ESCAPE '\\'`
+                    )
+                ),
+                sql` OR `
+            )})`
+    );
+}
+
+function dedupeXtreamCandidatesById(
+    candidates: XtreamGlobalSearchCandidate[]
+): XtreamGlobalSearchCandidate[] {
+    const seenIds = new Set<number>();
+
+    return candidates.filter((candidate) => {
+        if (seenIds.has(candidate.id)) {
+            return false;
+        }
+        seenIds.add(candidate.id);
+        return true;
+    });
+}
+
 async function selectXtreamGlobalSearchCandidatesWithTitleIndex(
     db: AppDatabase,
     searchTerm: string,
@@ -415,12 +310,12 @@ async function selectXtreamGlobalSearchCandidatesWithTitleIndex(
 
 async function selectXtreamGlobalSearchCandidatesWithFts(
     db: AppDatabase,
-    searchTerm: string,
+    matchQuery: string,
     types: string[],
     excludeHidden: boolean,
-    candidateLimit: number
+    candidateLimit: number,
+    residualTitleConditions: SQL[] = []
 ): Promise<XtreamGlobalSearchCandidate[]> {
-    const matchQuery = buildContentTitleFtsMatchQuery(searchTerm);
     if (!matchQuery || types.length === 0) {
         return [];
     }
@@ -450,6 +345,11 @@ async function selectXtreamGlobalSearchCandidatesWithFts(
             types.map((type) => sql`${type}`),
             sql`, `
         )})
+        ${
+            residualTitleConditions.length > 0
+                ? sql`AND ${sql.join(residualTitleConditions, sql` AND `)}`
+                : sql``
+        }
         ${excludeHidden ? sql`AND cat.hidden = 0` : sql``}
         ORDER BY rank, c.title
         LIMIT ${candidateLimit}
@@ -495,38 +395,52 @@ async function selectXtreamGlobalSearchCandidatesWithContentScan(
         .limit(candidateLimit);
 }
 
-function buildM3uPayloadTextFieldPatterns(
-    token: string,
-    mode: 'contains' | 'prefix'
-): string[] {
-    return buildLikePatterns(token, mode).flatMap((pattern) => [
-        `%"name":"${pattern}"%`,
-        `%"name": "${pattern}"%`,
-        `%"title":"${pattern}"%`,
-        `%"title": "${pattern}"%`,
-    ]);
-}
-
+/**
+ * Per-word M3U payload prefilter conditions, AND-ed by the caller — the same
+ * compound-word composition as `buildContentTitleSearchConditions`: "A&E"
+ * must reach channel names like "US: A&E" (issue #1161), while the other
+ * words of the query keep constraining the candidate playlists.
+ */
 function buildM3uPayloadSearchConditions(searchTerm: string) {
-    const tokenGroups = getSqlSearchTokenGroups(searchTerm);
-    if (tokenGroups.length === 0) {
-        return [];
-    }
+    let groupIndex = 0;
 
-    return tokenGroups
-        .map((tokens, index) => {
-            const mode =
-                index === 0 && isShortSearchTokenGroup(tokens)
-                    ? 'prefix'
-                    : 'contains';
-            const patterns = tokens.flatMap((token) =>
-                buildM3uPayloadTextFieldPatterns(token, mode)
-            );
-            const likeConditions = patterns.map(
+    return getSearchWordPlans(searchTerm)
+        .map((plan) => {
+            const tokenConditions = plan.tokenGroups
+                .map((tokens) => {
+                    const mode =
+                        groupIndex === 0 && isShortSearchTokenGroup(tokens)
+                            ? 'prefix'
+                            : 'contains';
+                    groupIndex += 1;
+                    const patterns = tokens.flatMap((token) =>
+                        buildM3uPayloadTextFieldPatterns(token, mode)
+                    );
+                    const likeConditions = patterns.map(
+                        (pattern) =>
+                            sql`${schema.playlists.payload} LIKE ${pattern} ESCAPE '\\'`
+                    );
+                    return or(...likeConditions);
+                })
+                .filter((condition) => condition !== undefined);
+
+            const tokenArm =
+                tokenConditions.length > 0
+                    ? and(...tokenConditions)
+                    : undefined;
+            if (plan.compound === null) {
+                return tokenArm;
+            }
+
+            const compoundConditions = buildM3uPayloadCompoundPatterns(
+                plan.compound
+            ).map(
                 (pattern) =>
                     sql`${schema.playlists.payload} LIKE ${pattern} ESCAPE '\\'`
             );
-            return or(...likeConditions);
+            return tokenArm === undefined
+                ? or(...compoundConditions)
+                : or(tokenArm, ...compoundConditions);
         })
         .filter((condition) => condition !== undefined);
 }
@@ -1207,11 +1121,45 @@ export async function globalSearch(
                 excludeHidden,
                 candidateLimit
             );
+
+            // The prefix arm only sees titles that start with the short first
+            // token ("A&E" -> GLOB 'a*'), so a compound word like "a&e" is
+            // additionally looked up as a trigram FTS substring to reach
+            // titles such as "US: A&E" (issue #1161). The non-compound words
+            // of the query stay applied as LIKE conditions so this arm cannot
+            // fill the candidate limit with compound-only matches.
+            const compoundMatchQuery = buildCompoundFtsMatchQuery(searchTerm);
+            if (compoundMatchQuery) {
+                try {
+                    const compoundCandidates =
+                        await selectXtreamGlobalSearchCandidatesWithFts(
+                            db,
+                            compoundMatchQuery,
+                            types,
+                            excludeHidden,
+                            candidateLimit,
+                            buildCompoundResidualTitleSql(searchTerm)
+                        );
+                    candidates = dedupeXtreamCandidatesById([
+                        ...candidates,
+                        ...compoundCandidates,
+                    ]);
+                } catch {
+                    candidates =
+                        await selectXtreamGlobalSearchCandidatesWithContentScan(
+                            db,
+                            searchTerm,
+                            types,
+                            excludeHidden,
+                            candidateLimit
+                        );
+                }
+            }
         } else if (shouldUseContentTitleFts(searchTerm)) {
             try {
                 candidates = await selectXtreamGlobalSearchCandidatesWithFts(
                     db,
-                    searchTerm,
+                    buildContentTitleFtsMatchQuery(searchTerm),
                     types,
                     excludeHidden,
                     candidateLimit
diff --git a/apps/electron-backend/src/app/database/operations/epg-mapping.operations.spec.ts b/apps/electron-backend/src/app/database/operations/epg-mapping.operations.spec.ts
new file mode 100644
index 000000000..337aa8b85
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/epg-mapping.operations.spec.ts
@@ -0,0 +1,223 @@
+const eqMock = jest.fn((left: unknown, right: unknown) => ({
+    kind: 'eq',
+    left,
+    right,
+}));
+const inArrayMock = jest.fn((left: unknown, values: unknown[]) => ({
+    kind: 'inArray',
+    left,
+    values,
+}));
+const orMock = jest.fn((...conditions: unknown[]) => ({
+    kind: 'or',
+    conditions,
+}));
+const sqlMock = jest.fn(
+    (strings: TemplateStringsArray, ...values: unknown[]) => ({
+        kind: 'sql',
+        strings: Array.from(strings),
+        values,
+    })
+);
+
+jest.mock('drizzle-orm', () => ({
+    and: jest.fn(),
+    eq: (left: unknown, right: unknown) => eqMock(left, right),
+    inArray: (left: unknown, values: unknown[]) => inArrayMock(left, values),
+    or: (...conditions: unknown[]) => orMock(...conditions),
+    sql: (strings: TemplateStringsArray, ...values: unknown[]) =>
+        sqlMock(strings, ...values),
+}));
+
+import * as schema from '@iptvnator/shared/database/schema';
+import type { AppDatabase } from '../database.types';
+import {
+    deleteEpgMapping,
+    getEpgMapping,
+    getEpgMappingsBatch,
+    searchEpgChannels,
+    setEpgMapping,
+} from './epg-mapping.operations';
+
+function createSelectChain(result: unknown[]) {
+    const chain: Record<string, unknown> = {};
+    chain['from'] = jest.fn().mockReturnValue(chain);
+    chain['where'] = jest.fn().mockReturnValue(chain);
+    chain['orderBy'] = jest.fn().mockReturnValue(chain);
+    chain['limit'] = jest.fn().mockResolvedValue(result);
+    chain['then'] = (
+        resolve: (value: unknown) => unknown,
+        reject: (reason: unknown) => unknown
+    ) => Promise.resolve(result).then(resolve, reject);
+    return chain;
+}
+
+function createDbMock(selectResult: unknown[] = []) {
+    const chain = createSelectChain(selectResult);
+    const onConflictDoUpdate = jest.fn().mockResolvedValue(undefined);
+    const values = jest.fn().mockReturnValue({ onConflictDoUpdate });
+    const insert = jest.fn().mockReturnValue({ values });
+    const deleteWhere = jest.fn().mockResolvedValue(undefined);
+    const deleteFn = jest.fn().mockReturnValue({ where: deleteWhere });
+    const select = jest.fn().mockReturnValue(chain);
+
+    return {
+        db: {
+            select,
+            insert,
+            delete: deleteFn,
+        } as unknown as AppDatabase,
+        chain,
+        insert,
+        values,
+        onConflictDoUpdate,
+        deleteFn,
+        deleteWhere,
+        select,
+    };
+}
+
+describe('epg-mapping.operations', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    describe('getEpgMapping', () => {
+        it('returns the mapping row when present', async () => {
+            const row = {
+                id: 1,
+                channelKey: 'xtream:pl-1:42',
+                epgChannelId: 'bbc.one.uk',
+                playlistId: 'pl-1',
+            };
+            const { db } = createDbMock([row]);
+
+            await expect(getEpgMapping(db, 'xtream:pl-1:42')).resolves.toEqual(
+                row
+            );
+            expect(eqMock).toHaveBeenCalledWith(
+                schema.epgChannelMappings.channelKey,
+                'xtream:pl-1:42'
+            );
+        });
+
+        it('returns null when no mapping exists', async () => {
+            const { db } = createDbMock([]);
+
+            await expect(getEpgMapping(db, 'missing')).resolves.toBeNull();
+        });
+    });
+
+    describe('getEpgMappingsBatch', () => {
+        it('returns an empty map without querying for an empty input', async () => {
+            const { db, select } = createDbMock();
+
+            const result = await getEpgMappingsBatch(db, []);
+
+            expect(result.size).toBe(0);
+            expect(select).not.toHaveBeenCalled();
+        });
+
+        it('maps channel keys to their EPG channel ids', async () => {
+            const { db } = createDbMock([
+                { channelKey: 'a', epgChannelId: 'epg-a' },
+                { channelKey: 'b', epgChannelId: 'epg-b' },
+            ]);
+
+            const result = await getEpgMappingsBatch(db, ['a', 'b', 'c']);
+
+            expect(result.get('a')).toBe('epg-a');
+            expect(result.get('b')).toBe('epg-b');
+            expect(result.has('c')).toBe(false);
+            expect(inArrayMock).toHaveBeenCalledWith(
+                schema.epgChannelMappings.channelKey,
+                ['a', 'b', 'c']
+            );
+        });
+    });
+
+    describe('setEpgMapping', () => {
+        it('upserts on the channel key', async () => {
+            const { db, insert, values, onConflictDoUpdate } = createDbMock();
+
+            await expect(
+                setEpgMapping(db, 'xtream:pl-1:42', 'bbc.one.uk', 'pl-1')
+            ).resolves.toEqual({ success: true });
+
+            expect(insert).toHaveBeenCalledWith(schema.epgChannelMappings);
+            expect(values).toHaveBeenCalledWith({
+                channelKey: 'xtream:pl-1:42',
+                epgChannelId: 'bbc.one.uk',
+                playlistId: 'pl-1',
+            });
+            expect(onConflictDoUpdate).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    target: schema.epgChannelMappings.channelKey,
+                })
+            );
+        });
+
+        it('stores null when no playlist id is provided', async () => {
+            const { db, values } = createDbMock();
+
+            await setEpgMapping(db, 'bbc.one', 'bbc.one.uk');
+
+            expect(values).toHaveBeenCalledWith(
+                expect.objectContaining({ playlistId: null })
+            );
+        });
+    });
+
+    describe('deleteEpgMapping', () => {
+        it('deletes by channel key', async () => {
+            const { db, deleteFn, deleteWhere } = createDbMock();
+
+            await expect(deleteEpgMapping(db, 'bbc.one')).resolves.toEqual({
+                success: true,
+            });
+
+            expect(deleteFn).toHaveBeenCalledWith(schema.epgChannelMappings);
+            expect(deleteWhere).toHaveBeenCalled();
+            expect(eqMock).toHaveBeenCalledWith(
+                schema.epgChannelMappings.channelKey,
+                'bbc.one'
+            );
+        });
+    });
+
+    describe('searchEpgChannels', () => {
+        it('escapes LIKE wildcards and searches name and id with an ESCAPE clause', async () => {
+            const { db } = createDbMock([]);
+
+            await searchEpgChannels(db, 'HBO%_');
+
+            // sql`${column} LIKE ${pattern} ESCAPE '\\'` — the pattern is the
+            // second interpolated value.
+            const patterns = sqlMock.mock.calls.map((call) => call[2]);
+            expect(patterns).toContain('%HBO\\%\\_%');
+            const templates = sqlMock.mock.calls.map((call) =>
+                Array.from(call[0] as TemplateStringsArray).join('?')
+            );
+            expect(
+                templates.every((template) => template.includes("ESCAPE '\\'"))
+            ).toBe(true);
+        });
+
+        it('escapes backslashes so a trailing "\\" cannot corrupt the pattern', async () => {
+            const { db } = createDbMock([]);
+
+            await searchEpgChannels(db, 'C\\');
+
+            const patterns = sqlMock.mock.calls.map((call) => call[2]);
+            expect(patterns).toContain('%C\\\\%');
+        });
+
+        it('applies the result limit', async () => {
+            const { db, chain } = createDbMock([]);
+
+            await searchEpgChannels(db, 'news', 5);
+
+            expect(chain['limit']).toHaveBeenCalledWith(5);
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/database/operations/epg-mapping.operations.ts b/apps/electron-backend/src/app/database/operations/epg-mapping.operations.ts
new file mode 100644
index 000000000..1f19e7934
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/epg-mapping.operations.ts
@@ -0,0 +1,125 @@
+import { and, eq, inArray, or, sql } from 'drizzle-orm';
+import * as schema from '@iptvnator/shared/database/schema';
+import type { AppDatabase } from '../database.types';
+
+/**
+ * Get a single EPG channel mapping by lookup key.
+ */
+export async function getEpgMapping(
+    db: AppDatabase,
+    channelKey: string
+): Promise<{ id: number; channelKey: string; epgChannelId: string; playlistId: string | null } | null> {
+    const rows = await db
+        .select({
+            id: schema.epgChannelMappings.id,
+            channelKey: schema.epgChannelMappings.channelKey,
+            epgChannelId: schema.epgChannelMappings.epgChannelId,
+            playlistId: schema.epgChannelMappings.playlistId,
+        })
+        .from(schema.epgChannelMappings)
+        .where(eq(schema.epgChannelMappings.channelKey, channelKey))
+        .limit(1);
+
+    return rows[0] ?? null;
+}
+
+/**
+ * Batch lookup of EPG channel mappings for multiple keys.
+ * Returns a Map of channelKey → epgChannelId (only for keys that have mappings).
+ */
+export async function getEpgMappingsBatch(
+    db: AppDatabase,
+    channelKeys: string[]
+): Promise<Map<string, string>> {
+    if (channelKeys.length === 0) {
+        return new Map();
+    }
+
+    const rows = await db
+        .select({
+            channelKey: schema.epgChannelMappings.channelKey,
+            epgChannelId: schema.epgChannelMappings.epgChannelId,
+        })
+        .from(schema.epgChannelMappings)
+        .where(inArray(schema.epgChannelMappings.channelKey, channelKeys));
+
+    const mapping = new Map<string, string>();
+    for (const row of rows) {
+        mapping.set(row.channelKey, row.epgChannelId);
+    }
+    return mapping;
+}
+
+/**
+ * Create or update an EPG channel mapping (upsert).
+ */
+export async function setEpgMapping(
+    db: AppDatabase,
+    channelKey: string,
+    epgChannelId: string,
+    playlistId?: string
+): Promise<{ success: boolean }> {
+    await db
+        .insert(schema.epgChannelMappings)
+        .values({
+            channelKey,
+            epgChannelId,
+            playlistId: playlistId ?? null,
+        })
+        .onConflictDoUpdate({
+            target: schema.epgChannelMappings.channelKey,
+            set: {
+                epgChannelId,
+                playlistId: playlistId ?? null,
+                updatedAt: sql`(datetime('now'))`,
+            },
+        });
+
+    return { success: true };
+}
+
+/**
+ * Remove an EPG channel mapping.
+ */
+export async function deleteEpgMapping(
+    db: AppDatabase,
+    channelKey: string
+): Promise<{ success: boolean }> {
+    await db
+        .delete(schema.epgChannelMappings)
+        .where(eq(schema.epgChannelMappings.channelKey, channelKey));
+
+    return { success: true };
+}
+
+/**
+ * Search EPG channels by display name for the mapping dialog.
+ */
+export async function searchEpgChannels(
+    db: AppDatabase,
+    searchTerm: string,
+    limit = 50
+): Promise<Array<{ id: string; displayName: string; iconUrl: string | null }>> {
+    // Escape the escape character itself and the LIKE wildcards so user
+    // input like "HBO%", "_BC" or a trailing "\" is matched literally —
+    // an unescaped backslash would pair with the following character (or
+    // the closing "%") under the ESCAPE clause and corrupt the pattern.
+    const escaped = searchTerm.trim().replace(/[\\%_]/g, '\\$&');
+    const pattern = `%${escaped}%`;
+
+    return db
+        .select({
+            id: schema.epgChannels.id,
+            displayName: schema.epgChannels.displayName,
+            iconUrl: schema.epgChannels.iconUrl,
+        })
+        .from(schema.epgChannels)
+        .where(
+            or(
+                sql`${schema.epgChannels.displayName} LIKE ${pattern} ESCAPE '\\'`,
+                sql`${schema.epgChannels.id} LIKE ${pattern} ESCAPE '\\'`
+            )
+        )
+        .orderBy(schema.epgChannels.displayName)
+        .limit(limit);
+}
diff --git a/apps/electron-backend/src/app/database/operations/favorites.operations.spec.ts b/apps/electron-backend/src/app/database/operations/favorites.operations.spec.ts
index 6db591360..81a413a59 100644
--- a/apps/electron-backend/src/app/database/operations/favorites.operations.spec.ts
+++ b/apps/electron-backend/src/app/database/operations/favorites.operations.spec.ts
@@ -4,6 +4,10 @@ const eqMock = jest.fn((left: unknown, right: unknown) => ({
     right,
 }));
 const whereMock = jest.fn();
+const placeholderMock = jest.fn((name: string) => ({
+    kind: 'placeholder',
+    name,
+}));
 
 jest.mock('drizzle-orm', () => ({
     and: jest.fn((...conditions: unknown[]) => ({ kind: 'and', conditions })),
@@ -11,11 +15,25 @@ jest.mock('drizzle-orm', () => ({
     desc: jest.fn((value: unknown) => ({ kind: 'desc', value })),
     eq: (left: unknown, right: unknown) => eqMock(left, right),
     inArray: jest.fn(),
-    sql: jest.fn(),
+    sql: Object.assign(
+        jest.fn((strings: TemplateStringsArray, ...values: unknown[]) => ({
+            kind: 'sql',
+            strings: Array.from(strings ?? []),
+            values,
+        })),
+        { placeholder: (name: string) => placeholderMock(name) }
+    ),
 }));
 
+import * as schema from '@iptvnator/shared/database/schema';
 import type { AppDatabase } from '../database.types';
-import { getGlobalFavorites } from './favorites.operations';
+import { createDbMock } from './operations.test-helpers';
+import {
+    getAllGlobalFavorites,
+    getFavorites,
+    getGlobalFavorites,
+    reorderGlobalFavorites,
+} from './favorites.operations';
 
 function createGlobalFavoritesDbMock(rows: unknown[]) {
     const query = {
@@ -48,6 +66,7 @@ describe('favorites.operations', () => {
     beforeEach(() => {
         eqMock.mockClear();
         whereMock.mockClear();
+        placeholderMock.mockClear();
     });
 
     it('filters live global favorites after scanning the small favorites set', async () => {
@@ -76,4 +95,93 @@ describe('favorites.operations', () => {
             }),
         ]);
     });
+
+    // Regression for issue #1138: archive metadata must survive every
+    // favorites projection so catch-up stays available outside Live TV.
+    it('selects archive metadata for playlist favorites', async () => {
+        const { db, select } = createGlobalFavoritesDbMock([]);
+
+        await getFavorites(db, 'playlist-1');
+
+        expect(select).toHaveBeenCalledWith(
+            expect.objectContaining({
+                tv_archive: schema.content.tvArchive,
+                tv_archive_duration: schema.content.tvArchiveDuration,
+            })
+        );
+    });
+
+    it('selects archive metadata for global favorites', async () => {
+        const { db, select } = createGlobalFavoritesDbMock([]);
+
+        await getGlobalFavorites(db);
+        await getAllGlobalFavorites(db);
+
+        expect(select).toHaveBeenCalledTimes(2);
+        for (const [projection] of select.mock.calls) {
+            expect(projection).toEqual(
+                expect.objectContaining({
+                    tv_archive: schema.content.tvArchive,
+                    tv_archive_duration: schema.content.tvArchiveDuration,
+                })
+            );
+        }
+    });
+
+    describe('reorderGlobalFavorites', () => {
+        it('short-circuits without touching the db when there are no updates', async () => {
+            const { db, update, transaction } = createDbMock();
+
+            await expect(reorderGlobalFavorites(db, [])).resolves.toEqual({
+                success: true,
+            });
+
+            expect(update).not.toHaveBeenCalled();
+            expect(transaction).not.toHaveBeenCalled();
+        });
+
+        it('runs (not executes) the prepared position update per favorite inside a transaction', async () => {
+            const { db, updateRun, updateExecute, updatePrepare, transaction } =
+                createDbMock();
+
+            await expect(
+                reorderGlobalFavorites(db, [
+                    { content_id: 30, playlist_id: 'p1', position: 0 },
+                    { content_id: 10, playlist_id: 'p1', position: 1 },
+                    { content_id: 20, playlist_id: 'p2', position: 2 },
+                ])
+            ).resolves.toEqual({ success: true });
+
+            expect(updatePrepare).toHaveBeenCalledTimes(1);
+            expect(placeholderMock).toHaveBeenCalledWith('position');
+            expect(placeholderMock).toHaveBeenCalledWith('contentId');
+            // Regression: favorites are playlist-scoped, so the UPDATE must
+            // filter by playlistId too — otherwise a same-contentId favorite
+            // in another playlist gets its position silently rewritten.
+            expect(placeholderMock).toHaveBeenCalledWith('playlistId');
+            expect(transaction).toHaveBeenCalledTimes(1);
+
+            // Regression (issue #1137): the prepared UPDATE must be dispatched
+            // with synchronous `.run()`. On the better-sqlite3 driver
+            // `.execute()` defers the write to a promise that never settles
+            // inside the synchronous transaction callback, so favorites
+            // positions silently never persist and the custom order is lost.
+            expect(updateExecute).not.toHaveBeenCalled();
+            expect(updateRun).toHaveBeenNthCalledWith(1, {
+                position: 0,
+                contentId: 30,
+                playlistId: 'p1',
+            });
+            expect(updateRun).toHaveBeenNthCalledWith(2, {
+                position: 1,
+                contentId: 10,
+                playlistId: 'p1',
+            });
+            expect(updateRun).toHaveBeenNthCalledWith(3, {
+                position: 2,
+                contentId: 20,
+                playlistId: 'p2',
+            });
+        });
+    });
 });
diff --git a/apps/electron-backend/src/app/database/operations/favorites.operations.ts b/apps/electron-backend/src/app/database/operations/favorites.operations.ts
index c0b402a63..251747d5b 100644
--- a/apps/electron-backend/src/app/database/operations/favorites.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/favorites.operations.ts
@@ -73,6 +73,8 @@ export async function getFavorites(db: AppDatabase, playlistId: string) {
             poster_url: schema.content.posterUrl,
             xtream_id: schema.content.xtreamId,
             type: schema.content.type,
+            tv_archive: schema.content.tvArchive,
+            tv_archive_duration: schema.content.tvArchiveDuration,
             added_at: schema.favorites.addedAt,
             position: schema.favorites.position,
         })
@@ -117,6 +119,8 @@ function selectGlobalFavoriteRows(
                 : {}),
             xtream_id: schema.content.xtreamId,
             type: schema.content.type,
+            tv_archive: schema.content.tvArchive,
+            tv_archive_duration: schema.content.tvArchiveDuration,
             playlist_id: schema.playlists.id,
             playlist_name: schema.playlists.name,
             added_at: schema.favorites.addedAt,
@@ -140,7 +144,7 @@ function selectGlobalFavoriteRows(
 
 export async function reorderGlobalFavorites(
     db: AppDatabase,
-    updates: { content_id: number; position: number }[],
+    updates: { content_id: number; playlist_id: string; position: number }[],
     control?: OperationControl
 ): Promise<{ success: boolean }> {
     if (!Array.isArray(updates) || updates.length === 0) {
@@ -152,20 +156,35 @@ export async function reorderGlobalFavorites(
 
     // Drizzle's .set() doesn't accept a bare Placeholder — wrap it in an
     // sql template so the value resolves to SQL<number> at compile time.
+    // Scope by (contentId, playlistId): the favorites table is
+    // playlist-scoped, so filtering by contentId alone would also rewrite
+    // the position of a same-contentId favorite in another playlist.
     const updateFavoritePosition = db
         .update(schema.favorites)
         .set({ position: sql<number>`${sql.placeholder('position')}` })
-        .where(eq(schema.favorites.contentId, sql.placeholder('contentId')))
+        .where(
+            and(
+                eq(schema.favorites.contentId, sql.placeholder('contentId')),
+                eq(schema.favorites.playlistId, sql.placeholder('playlistId'))
+            )
+        )
         .prepare();
 
     for (const chunk of chunkValues(updates, DEFAULT_BATCH_SIZE)) {
         await checkpointOperation(control);
 
         await db.transaction(() => {
-            for (const { content_id, position } of chunk) {
-                updateFavoritePosition.execute({
+            for (const { content_id, playlist_id, position } of chunk) {
+                // Must be .run() (synchronous), NOT .execute(): on the
+                // better-sqlite3 driver .execute() defers the write to a
+                // resolved promise, which never settles inside this
+                // synchronous transaction callback — the UPDATE would be a
+                // silent no-op and the custom favorites order would never
+                // persist (issue #1137).
+                updateFavoritePosition.run({
                     position,
                     contentId: content_id,
+                    playlistId: playlist_id,
                 });
             }
         });
diff --git a/apps/electron-backend/src/app/database/operations/operations.test-helpers.ts b/apps/electron-backend/src/app/database/operations/operations.test-helpers.ts
index cf6b3c49f..6a9c6904f 100644
--- a/apps/electron-backend/src/app/database/operations/operations.test-helpers.ts
+++ b/apps/electron-backend/src/app/database/operations/operations.test-helpers.ts
@@ -112,14 +112,31 @@ export function createDbMock(selectResultsByCall: unknown[][] = []) {
     const insertValues = jest.fn().mockResolvedValue(undefined);
     const insert = jest.fn().mockReturnValue({ values: insertValues });
 
-    const updateWhere = jest.fn().mockResolvedValue(undefined);
+    // Prepared-statement writes MUST use `.run()` (synchronous) rather than
+    // `.execute()` inside a synchronous `db.transaction()` callback — the
+    // better-sqlite3 driver's `.execute()` defers to a promise that never
+    // settles before COMMIT, silently dropping the write (issue #1137). The
+    // mock exposes both so specs can assert the correct method is used.
+    const updateRun = jest.fn();
+    const updateExecute = jest.fn().mockResolvedValue(undefined);
+    const updatePrepare = jest
+        .fn()
+        .mockReturnValue({ run: updateRun, execute: updateExecute });
+    const updateWhere = jest.fn().mockReturnValue({
+        prepare: updatePrepare,
+        then: (
+            resolve: (value: unknown) => void,
+            reject: (reason: unknown) => void
+        ) => Promise.resolve(undefined).then(resolve, reject),
+    });
     const updateSet = jest.fn().mockReturnValue({ where: updateWhere });
     const update = jest.fn().mockReturnValue({ set: updateSet });
 
+    const deleteRun = jest.fn();
     const deleteExecute = jest.fn().mockResolvedValue(undefined);
     const deletePrepare = jest
         .fn()
-        .mockReturnValue({ execute: deleteExecute });
+        .mockReturnValue({ execute: deleteExecute, run: deleteRun });
     const deleteResult = {
         prepare: deletePrepare,
         then: (
@@ -152,6 +169,7 @@ export function createDbMock(selectResultsByCall: unknown[][] = []) {
         deleteExecute,
         deleteFn,
         deletePrepare,
+        deleteRun,
         deleteWhere,
         insert,
         insertValues,
@@ -159,6 +177,9 @@ export function createDbMock(selectResultsByCall: unknown[][] = []) {
         select,
         transaction,
         update,
+        updatePrepare,
+        updateRun,
+        updateExecute,
         updateSet,
         updateWhere,
     };
diff --git a/apps/electron-backend/src/app/database/operations/playlist-get-performance.spec.ts b/apps/electron-backend/src/app/database/operations/playlist-get-performance.spec.ts
new file mode 100644
index 000000000..d4b6d49b8
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/playlist-get-performance.spec.ts
@@ -0,0 +1,123 @@
+import type {
+    AppPlaylistGetPerformancePhase,
+    PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+import {
+    APP_PLAYLIST_GET_PERFORMANCE_PHASE,
+} from '@iptvnator/shared/interfaces';
+
+import type { AppDatabase } from '../database.types';
+import { getAppPlaylist } from './playlist.operations';
+
+type TestGetPhaseCapture = {
+    captureAsync: <TResult>(
+        phase: AppPlaylistGetPerformancePhase,
+        execute: () => Promise<TResult>,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => Promise<TResult>;
+    captureSync: <TResult>(
+        phase: AppPlaylistGetPerformancePhase,
+        execute: () => TResult,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => TResult;
+};
+
+function createDatabaseMock(rows: unknown[]) {
+    const limit = jest.fn().mockResolvedValue(rows);
+    const where = jest.fn(() => ({ limit }));
+    const from = jest.fn(() => ({ where }));
+    const select = jest.fn(() => ({ from }));
+
+    return {
+        db: { select } as unknown as AppDatabase,
+        from,
+        limit,
+        select,
+        where,
+    };
+}
+
+const playlistRow = {
+    id: 'synthetic-playlist',
+    name: 'Synthetic playlist',
+    type: 'm3u-url',
+    payload: JSON.stringify({
+        _id: 'synthetic-playlist',
+        playlist: {
+            items: [{ id: 'channel-1' }, { id: 'channel-2' }],
+        },
+        title: 'Synthetic playlist',
+    }),
+    favorites: null,
+    recentlyViewed: null,
+} as never;
+
+describe('app playlist GET performance boundaries', () => {
+    it('keeps the default read and parse path unchanged', async () => {
+        const { db, limit, select } = createDatabaseMock([playlistRow]);
+
+        await expect(
+            getAppPlaylist(db, 'synthetic-playlist')
+        ).resolves.toEqual(
+            expect.objectContaining({
+                _id: 'synthetic-playlist',
+                playlist: {
+                    items: [{ id: 'channel-1' }, { id: 'channel-2' }],
+                },
+            })
+        );
+        expect(select).toHaveBeenCalledTimes(1);
+        expect(limit).toHaveBeenCalledWith(1);
+    });
+
+    it('separates the awaited SQLite read from playlist deserialization', async () => {
+        const { db, limit } = createDatabaseMock([playlistRow]);
+        const phases: Array<{
+            metadata: PerformancePhaseMetadata | undefined;
+            phase: AppPlaylistGetPerformancePhase;
+        }> = [];
+        const capture: TestGetPhaseCapture = {
+            async captureAsync(phase, execute, metadata) {
+                const result = await execute();
+                phases.push({
+                    metadata: metadata?.(result),
+                    phase,
+                });
+                return result;
+            },
+            captureSync(phase, execute, metadata) {
+                const result = execute();
+                phases.push({
+                    metadata: metadata?.(result),
+                    phase,
+                });
+                return result;
+            },
+        };
+        const getWithCapture = getAppPlaylist as unknown as (
+            database: AppDatabase,
+            playlistId: string,
+            phaseCapture: TestGetPhaseCapture
+        ) => Promise<Record<string, unknown> | null>;
+
+        await expect(
+            getWithCapture(db, 'synthetic-playlist', capture)
+        ).resolves.toEqual(
+            expect.objectContaining({
+                _id: 'synthetic-playlist',
+            })
+        );
+
+        expect(phases).toEqual([
+            {
+                metadata: { itemCount: 1 },
+                phase: APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+            },
+            {
+                metadata: { itemCount: 2 },
+                phase: APP_PLAYLIST_GET_PERFORMANCE_PHASE.DESERIALIZE_PLAYLIST,
+            },
+        ]);
+        expect(limit).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/database/operations/playlist-upsert-performance.spec.ts b/apps/electron-backend/src/app/database/operations/playlist-upsert-performance.spec.ts
new file mode 100644
index 000000000..278d2bfb6
--- /dev/null
+++ b/apps/electron-backend/src/app/database/operations/playlist-upsert-performance.spec.ts
@@ -0,0 +1,101 @@
+import {
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    type AppPlaylistUpsertPerformancePhase,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+
+import type { AppDatabase } from '../database.types';
+import {
+    type AppPlaylistUpsertPhaseCapture,
+    upsertAppPlaylist,
+} from './playlist.operations';
+
+function createDatabaseMock(runImplementation: () => unknown = () => ({})) {
+    const run = jest.fn(runImplementation);
+    const then = jest.fn(
+        (
+            onFulfilled: (value: unknown) => unknown,
+            onRejected: (error: unknown) => unknown
+        ) => Promise.resolve().then(run).then(onFulfilled, onRejected)
+    );
+    const onConflictDoUpdate = jest.fn(() => ({ run, then }));
+    const values = jest.fn(() => ({ onConflictDoUpdate }));
+    const insert = jest.fn(() => ({ values }));
+
+    return {
+        db: { insert } as unknown as AppDatabase,
+        insert,
+        onConflictDoUpdate,
+        run,
+        values,
+    };
+}
+
+describe('app playlist upsert performance boundaries', () => {
+    const playlist = {
+        _id: 'synthetic-playlist',
+        playlist: {
+            items: [{ id: 'channel-1' }, { id: 'channel-2' }],
+        },
+        title: 'Synthetic playlist',
+        type: 'm3u-url',
+        url: 'http://127.0.0.1:43210/synthetic-performance.m3u',
+    };
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('keeps the default path free of phase hooks and executes one autocommit run', async () => {
+        const { db, run } = createDatabaseMock();
+
+        await expect(upsertAppPlaylist(db, playlist)).resolves.toEqual({
+            success: true,
+        });
+        expect(run).toHaveBeenCalledTimes(1);
+    });
+
+    it('separates row/JSON serialization from SQLite without rescanning the payload for metadata', async () => {
+        const { db, run } = createDatabaseMock();
+        const byteLength = jest.spyOn(Buffer, 'byteLength');
+        const phases: Array<{
+            metadata: PerformancePhaseMetadata | undefined;
+            phase: AppPlaylistUpsertPerformancePhase;
+        }> = [];
+        const capture: AppPlaylistUpsertPhaseCapture = {
+            async captureAsync(phase, execute, metadata) {
+                const result = await execute();
+                phases.push({
+                    metadata: metadata?.(result),
+                    phase,
+                });
+                return result;
+            },
+            captureSync(phase, execute, metadata) {
+                const result = execute();
+                phases.push({
+                    metadata: metadata?.(result),
+                    phase,
+                });
+                return result;
+            },
+        };
+
+        await expect(upsertAppPlaylist(db, playlist, capture)).resolves.toEqual(
+            { success: true }
+        );
+
+        expect(phases).toEqual([
+            {
+                metadata: { itemCount: 2 },
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+            },
+            {
+                metadata: { itemCount: 1 },
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+            },
+        ]);
+        expect(byteLength).not.toHaveBeenCalled();
+        expect(run).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/database/operations/playlist.operations.ts b/apps/electron-backend/src/app/database/operations/playlist.operations.ts
index 5b6333dc9..c8f5843db 100644
--- a/apps/electron-backend/src/app/database/operations/playlist.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/playlist.operations.ts
@@ -1,6 +1,13 @@
 import { eq, inArray } from 'drizzle-orm';
 import * as schema from '@iptvnator/shared/database/schema';
 import type { Channel, M3uFavoriteChannel } from '@iptvnator/shared/interfaces';
+import {
+    APP_PLAYLIST_GET_PERFORMANCE_PHASE,
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    type AppPlaylistGetPerformancePhase,
+    type AppPlaylistUpsertPerformancePhase,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
 import type { AppDatabase } from '../database.types';
 import {
     checkpointOperation,
@@ -19,6 +26,32 @@ const PLAYLIST_TYPES = {
 
 const DEFAULT_BATCH_SIZE = 100;
 
+export interface AppPlaylistUpsertPhaseCapture {
+    captureAsync: <TResult>(
+        phase: AppPlaylistUpsertPerformancePhase,
+        execute: () => Promise<TResult>,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => Promise<TResult>;
+    captureSync: <TResult>(
+        phase: AppPlaylistUpsertPerformancePhase,
+        execute: () => TResult,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => TResult;
+}
+
+export interface AppPlaylistGetPhaseCapture {
+    captureAsync: <TResult>(
+        phase: AppPlaylistGetPerformancePhase,
+        execute: () => Promise<TResult>,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => Promise<TResult>;
+    captureSync: <TResult>(
+        phase: AppPlaylistGetPerformancePhase,
+        execute: () => TResult,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ) => TResult;
+}
+
 type PlaylistType = (typeof PLAYLIST_TYPES)[keyof typeof PLAYLIST_TYPES];
 const PLAYLIST_TYPE_VALUES = new Set<PlaylistType>(
     Object.values(PLAYLIST_TYPES)
@@ -196,6 +229,21 @@ function buildPlaylistRow(
     };
 }
 
+function getPlaylistItemCount(
+    playlist: Record<string, unknown>
+): number | undefined {
+    try {
+        const value = playlist.playlist;
+        if (typeof value !== 'object' || value === null) {
+            return undefined;
+        }
+        const items = Reflect.get(value, 'items');
+        return Array.isArray(items) ? items.length : undefined;
+    } catch {
+        return undefined;
+    }
+}
+
 export function parseAppPlaylist(
     row: schema.Playlist
 ): Record<string, unknown> {
@@ -300,17 +348,42 @@ export async function createPlaylist(
 
 export async function upsertAppPlaylist(
     db: AppDatabase,
-    playlist: Record<string, unknown>
+    playlist: Record<string, unknown>,
+    capturePhase?: AppPlaylistUpsertPhaseCapture
 ): Promise<{ success: boolean }> {
-    const row = buildPlaylistRow(playlist);
+    const row = capturePhase
+        ? capturePhase.captureSync(
+              APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+              () => buildPlaylistRow(playlist),
+              () => ({
+                  itemCount: getPlaylistItemCount(playlist),
+              })
+          )
+        : buildPlaylistRow(playlist);
     if (!row) {
         throw new Error('Playlist ID is required for upsert');
     }
 
-    await db.insert(schema.playlists).values(row).onConflictDoUpdate({
-        target: schema.playlists.id,
-        set: row,
-    });
+    const write = async () => {
+        await db
+            .insert(schema.playlists)
+            .values(row)
+            .onConflictDoUpdate({
+                target: schema.playlists.id,
+                set: row,
+            });
+    };
+    if (capturePhase) {
+        await capturePhase.captureAsync(
+            APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+            write,
+            () => ({
+                itemCount: 1,
+            })
+        );
+    } else {
+        await write();
+    }
 
     return { success: true };
 }
@@ -392,14 +465,38 @@ export async function getAppPlaylistMetas(db: AppDatabase) {
     );
 }
 
-export async function getAppPlaylist(db: AppDatabase, playlistId: string) {
-    const rows = await db
-        .select()
-        .from(schema.playlists)
-        .where(eq(schema.playlists.id, playlistId))
-        .limit(1);
+export async function getAppPlaylist(
+    db: AppDatabase,
+    playlistId: string,
+    capturePhase?: AppPlaylistGetPhaseCapture
+) {
+    const read = () =>
+        db
+            .select()
+            .from(schema.playlists)
+            .where(eq(schema.playlists.id, playlistId))
+            .limit(1);
+    const rows = capturePhase
+        ? await capturePhase.captureAsync(
+              APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+              read,
+              (value) => ({ itemCount: value.length })
+          )
+        : await read();
+    const deserialize = () =>
+        rows[0] ? parseAppPlaylist(rows[0]) : null;
 
-    return rows[0] ? parseAppPlaylist(rows[0]) : null;
+    return capturePhase
+        ? capturePhase.captureSync(
+              APP_PLAYLIST_GET_PERFORMANCE_PHASE.DESERIALIZE_PLAYLIST,
+              deserialize,
+              (value) => ({
+                  itemCount: value
+                      ? (getPlaylistItemCount(value) ?? 0)
+                      : 0,
+              })
+          )
+        : deserialize();
 }
 
 export async function getAppPlaylistFavoriteChannels(
diff --git a/apps/electron-backend/src/app/database/operations/recently-viewed.operations.spec.ts b/apps/electron-backend/src/app/database/operations/recently-viewed.operations.spec.ts
index a1a151a8c..f959cb911 100644
--- a/apps/electron-backend/src/app/database/operations/recently-viewed.operations.spec.ts
+++ b/apps/electron-backend/src/app/database/operations/recently-viewed.operations.spec.ts
@@ -35,7 +35,7 @@ describe('recently-viewed.operations', () => {
                 { id: 2, title: 'Newest', viewed_at: '2026-07-02 10:00:00' },
                 { id: 1, title: 'Older', viewed_at: '2026-07-01 10:00:00' },
             ];
-            const { db, queries } = createDbMock([rows]);
+            const { db, queries, select } = createDbMock([rows]);
 
             await expect(getRecentlyViewed(db)).resolves.toEqual(rows);
 
@@ -47,11 +47,19 @@ describe('recently-viewed.operations', () => {
             );
             expect(queries[0].limit).toHaveBeenCalledWith(100);
             expect(queries[0].innerJoin).toHaveBeenCalledTimes(3);
+            // Regression for issue #1138: archive metadata must survive the
+            // recent projections so catch-up stays available outside Live TV.
+            expect(select).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    tv_archive: schema.content.tvArchive,
+                    tv_archive_duration: schema.content.tvArchiveDuration,
+                })
+            );
         });
 
         it('scopes playlist history to the playlist, newest-first with a 100 cap', async () => {
             const rows = [{ id: 5, title: 'Recent Movie' }];
-            const { db, queries } = createDbMock([rows]);
+            const { db, queries, select } = createDbMock([rows]);
 
             await expect(getRecentItems(db, 'playlist-1')).resolves.toEqual(
                 rows
@@ -65,6 +73,12 @@ describe('recently-viewed.operations', () => {
                 schema.recentlyViewed.viewedAt
             );
             expect(queries[0].limit).toHaveBeenCalledWith(100);
+            expect(select).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    tv_archive: schema.content.tvArchive,
+                    tv_archive_duration: schema.content.tvArchiveDuration,
+                })
+            );
         });
     });
 
@@ -200,8 +214,8 @@ describe('recently-viewed.operations', () => {
             expect(transaction).not.toHaveBeenCalled();
         });
 
-        it('executes one prepared placeholder delete per item inside a transaction', async () => {
-            const { db, deleteExecute, deletePrepare, transaction } =
+        it('runs one prepared placeholder delete per item inside a transaction', async () => {
+            const { db, deleteRun, deleteExecute, deletePrepare, transaction } =
                 createDbMock();
 
             await expect(
@@ -215,11 +229,16 @@ describe('recently-viewed.operations', () => {
             expect(mockDrizzle.sql.placeholder).toHaveBeenCalledWith('contentId');
             expect(mockDrizzle.sql.placeholder).toHaveBeenCalledWith('playlistId');
             expect(transaction).toHaveBeenCalledTimes(1);
-            expect(deleteExecute).toHaveBeenNthCalledWith(1, {
+            // Regression (issue #1137): the prepared delete must be dispatched
+            // with synchronous `.run()`. `.execute()` defers to a promise that
+            // never settles inside the synchronous transaction callback, so the
+            // batch delete would silently no-op.
+            expect(deleteExecute).not.toHaveBeenCalled();
+            expect(deleteRun).toHaveBeenNthCalledWith(1, {
                 contentId: 1,
                 playlistId: 'playlist-1',
             });
-            expect(deleteExecute).toHaveBeenNthCalledWith(2, {
+            expect(deleteRun).toHaveBeenNthCalledWith(2, {
                 contentId: 2,
                 playlistId: 'playlist-2',
             });
diff --git a/apps/electron-backend/src/app/database/operations/recently-viewed.operations.ts b/apps/electron-backend/src/app/database/operations/recently-viewed.operations.ts
index d1df9adff..7a2c06657 100644
--- a/apps/electron-backend/src/app/database/operations/recently-viewed.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/recently-viewed.operations.ts
@@ -15,6 +15,8 @@ export async function getRecentlyViewed(db: AppDatabase) {
             backdrop_url: schema.content.backdropUrl,
             xtream_id: schema.content.xtreamId,
             type: schema.content.type,
+            tv_archive: schema.content.tvArchive,
+            tv_archive_duration: schema.content.tvArchiveDuration,
             playlist_id: schema.categories.playlistId,
             playlist_name: schema.playlists.name,
             viewed_at: schema.recentlyViewed.viewedAt,
@@ -58,6 +60,8 @@ export async function getRecentItems(
             backdrop_url: schema.content.backdropUrl,
             xtream_id: schema.content.xtreamId,
             type: schema.content.type,
+            tv_archive: schema.content.tvArchive,
+            tv_archive_duration: schema.content.tvArchiveDuration,
             viewed_at: schema.recentlyViewed.viewedAt,
         })
         .from(schema.recentlyViewed)
@@ -177,7 +181,12 @@ export async function removeRecentItemsBatch(
 
     await db.transaction(() => {
         for (const { contentId, playlistId } of items) {
-            stmt.execute({ contentId, playlistId });
+            // .run() (synchronous), NOT .execute(): the better-sqlite3
+            // driver's .execute() defers the write to a resolved promise
+            // that never settles inside this synchronous transaction
+            // callback, so the DELETE would silently do nothing. See the
+            // matching note in favorites.operations.ts (issue #1137).
+            stmt.run({ contentId, playlistId });
         }
     });
 
diff --git a/apps/electron-backend/src/app/database/operations/tmdb.operations.spec.ts b/apps/electron-backend/src/app/database/operations/tmdb.operations.spec.ts
index 8b1e6a3d2..94ded9e3e 100644
--- a/apps/electron-backend/src/app/database/operations/tmdb.operations.spec.ts
+++ b/apps/electron-backend/src/app/database/operations/tmdb.operations.spec.ts
@@ -1,6 +1,11 @@
 import type { TmdbCacheEntry } from '@iptvnator/shared/interfaces';
 import type { AppDatabase } from '../database.types';
-import { getTmdbMetadata, setTmdbMetadata } from './tmdb.operations';
+import {
+    clearTmdbMetadata,
+    getTmdbCacheStats,
+    getTmdbMetadata,
+    setTmdbMetadata,
+} from './tmdb.operations';
 
 function createSelectMock(rows: unknown[]) {
     const limit = jest.fn().mockResolvedValue(rows);
@@ -105,3 +110,49 @@ describe('tmdb.operations', () => {
         );
     });
 });
+
+describe('tmdb cache maintenance', () => {
+    function createStatsDb(rows: unknown[]) {
+        const all = jest.fn().mockResolvedValue(rows);
+        const run = jest.fn().mockResolvedValue(undefined);
+        return { db: { all, run } as unknown as AppDatabase, all, run };
+    }
+
+    it('reports entry count and payload bytes', async () => {
+        const { db } = createStatsDb([{ entries: 42, bytes: 123456 }]);
+
+        await expect(getTmdbCacheStats(db)).resolves.toEqual({
+            entries: 42,
+            bytes: 123456,
+        });
+    });
+
+    it('reports zeroes for an empty table', async () => {
+        // COALESCE keeps SUM(NULL) from surfacing as NaN
+        const { db } = createStatsDb([{ entries: 0, bytes: 0 }]);
+
+        await expect(getTmdbCacheStats(db)).resolves.toEqual({
+            entries: 0,
+            bytes: 0,
+        });
+    });
+
+    it('survives a driver returning no stats row at all', async () => {
+        const { db } = createStatsDb([]);
+
+        await expect(getTmdbCacheStats(db)).resolves.toEqual({
+            entries: 0,
+            bytes: 0,
+        });
+    });
+
+    it('deletes every row and reports how many there were', async () => {
+        const { db, run } = createStatsDb([{ entries: 7, bytes: 900 }]);
+
+        await expect(clearTmdbMetadata(db)).resolves.toEqual({
+            success: true,
+            deleted: 7,
+        });
+        expect(run).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/database/operations/tmdb.operations.ts b/apps/electron-backend/src/app/database/operations/tmdb.operations.ts
index 75fc67865..ae0a37c47 100644
--- a/apps/electron-backend/src/app/database/operations/tmdb.operations.ts
+++ b/apps/electron-backend/src/app/database/operations/tmdb.operations.ts
@@ -1,6 +1,10 @@
-import { and, eq } from 'drizzle-orm';
+import { and, eq, sql } from 'drizzle-orm';
 import * as schema from '@iptvnator/shared/database/schema';
-import type { TmdbCacheEntry, TmdbCacheMediaType } from '@iptvnator/shared/interfaces';
+import type {
+    TmdbCacheEntry,
+    TmdbCacheMediaType,
+    TmdbCacheStats,
+} from '@iptvnator/shared/interfaces';
 import type { AppDatabase } from '../database.types';
 
 export async function getTmdbMetadata(
@@ -67,3 +71,37 @@ export async function setTmdbMetadata(
 
     return { success: true };
 }
+
+/**
+ * Row count and payload size for the settings panel. `LENGTH()` on TEXT
+ * counts CHARACTERS, so the cast to BLOB is what makes this bytes.
+ * Negative-match rows have a NULL payload; SUM skips them.
+ */
+export async function getTmdbCacheStats(
+    db: AppDatabase
+): Promise<TmdbCacheStats> {
+    const rows = (await db.all(sql`
+        SELECT
+            COUNT(*) AS entries,
+            COALESCE(SUM(LENGTH(CAST(payload AS BLOB))), 0) AS bytes
+        FROM tmdb_metadata
+    `)) as { entries: number; bytes: number }[];
+
+    return {
+        entries: Number(rows[0]?.entries ?? 0),
+        bytes: Number(rows[0]?.bytes ?? 0),
+    };
+}
+
+/**
+ * Drops the whole cache. Enrichment simply refetches on demand, so this
+ * is always safe. Also the escape hatch when a lookup-key version bump
+ * orphans rows: a bump makes them unreachable, not deleted.
+ */
+export async function clearTmdbMetadata(
+    db: AppDatabase
+): Promise<{ success: boolean; deleted: number }> {
+    const { entries } = await getTmdbCacheStats(db);
+    await db.run(sql`DELETE FROM tmdb_metadata`);
+    return { success: true, deleted: entries };
+}
diff --git a/apps/electron-backend/src/app/database/schema.ts b/apps/electron-backend/src/app/database/schema.ts
index 84dfb64ae..5cbc118ec 100644
--- a/apps/electron-backend/src/app/database/schema.ts
+++ b/apps/electron-backend/src/app/database/schema.ts
@@ -11,6 +11,7 @@ export {
   recentlyViewed,
   favorites,
   epgChannels,
+  epgChannelMappings,
   epgPrograms,
   playbackPositions,
   downloads,
diff --git a/apps/electron-backend/src/app/events/database/download-broadcast.ts b/apps/electron-backend/src/app/events/database/download-broadcast.ts
new file mode 100644
index 000000000..fbd3f1666
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-broadcast.ts
@@ -0,0 +1,13 @@
+import type { BrowserWindow } from 'electron';
+
+let mainWindow: BrowserWindow | null = null;
+
+export function setMainWindow(win: BrowserWindow): void {
+    mainWindow = win;
+}
+
+export function broadcastDownloadUpdate(): void {
+    if (mainWindow && !mainWindow.isDestroyed()) {
+        mainWindow.webContents.send('DOWNLOADS_UPDATE_EVENT');
+    }
+}
diff --git a/apps/electron-backend/src/app/events/database/download-file-path.spec.ts b/apps/electron-backend/src/app/events/database/download-file-path.spec.ts
index 56ef927b2..df7c58ebc 100644
--- a/apps/electron-backend/src/app/events/database/download-file-path.spec.ts
+++ b/apps/electron-backend/src/app/events/database/download-file-path.spec.ts
@@ -1,6 +1,13 @@
+import { mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import {
+    findAvailableFinalPath,
+    getPartialDownloadPath,
+    getPartialDownloadSize,
     removePartialDownload,
+    removePartialDownloadFile,
+    reserveAvailablePartialDownloadFile,
     reserveAvailableDownloadFile,
 } from './download-file-path';
 
@@ -51,6 +58,45 @@ describe('reserveAvailableDownloadFile', () => {
     });
 });
 
+describe('reserveAvailablePartialDownloadFile', () => {
+    it('reserves a .part path while keeping the final path free', () => {
+        const reserveFile = jest.fn();
+
+        expect(
+            reserveAvailablePartialDownloadFile(
+                '/downloads',
+                'movie.mp4',
+                reserveFile,
+                () => false
+            )
+        ).toEqual({
+            filename: 'movie.mp4',
+            partialPath: join('/downloads', 'movie.mp4.part'),
+            path: join('/downloads', 'movie.mp4'),
+        });
+        expect(reserveFile).toHaveBeenCalledWith(
+            join('/downloads', 'movie.mp4.part')
+        );
+    });
+
+    it('skips candidates when the final file already exists', () => {
+        const reserveFile = jest.fn();
+
+        expect(
+            reserveAvailablePartialDownloadFile(
+                '/downloads',
+                'movie.mp4',
+                reserveFile,
+                (filePath) => filePath.endsWith('movie.mp4')
+            )
+        ).toEqual({
+            filename: 'movie (1).mp4',
+            partialPath: join('/downloads', 'movie (1).mp4.part'),
+            path: join('/downloads', 'movie (1).mp4'),
+        });
+    });
+});
+
 describe('removePartialDownload', () => {
     it('removes only the actual partial save path', () => {
         const requestedPath = join('/downloads', 'movie.mp4');
@@ -88,3 +134,73 @@ describe('removePartialDownload', () => {
         expect(removeFile).not.toHaveBeenCalled();
     });
 });
+
+describe('partial download helpers', () => {
+    it('derives, removes, and sizes .part files from the final path', () => {
+        const finalPath = join('/downloads', 'movie.mp4');
+        const partialPath = join('/downloads', 'movie.mp4.part');
+        const removeFile = jest.fn();
+
+        expect(getPartialDownloadPath(finalPath)).toBe(partialPath);
+        expect(
+            removePartialDownloadFile(
+                finalPath,
+                (filePath) => filePath === partialPath,
+                removeFile
+            )
+        ).toBe(true);
+        expect(removeFile).toHaveBeenCalledWith(partialPath);
+        expect(
+            getPartialDownloadSize(finalPath, (filePath) => {
+                expect(filePath).toBe(partialPath);
+                return { size: 128 };
+            })
+        ).toBe(128);
+    });
+
+    it('refuses to size a .part that is not a regular file', () => {
+        const directory = mkdtempSync(join(tmpdir(), 'iptvnator-part-'));
+        const finalPath = join(directory, 'movie.mp4');
+        const partialPath = `${finalPath}.part`;
+
+        try {
+            writeFileSync(join(directory, 'target.bin'), 'attacker');
+            symlinkSync(join(directory, 'target.bin'), partialPath);
+
+            expect(() => getPartialDownloadSize(finalPath)).toThrow(
+                'not a regular file'
+            );
+        } finally {
+            rmSync(directory, { force: true, recursive: true });
+        }
+    });
+
+    it('finds the next numbered destination whose final and partial paths are free', () => {
+        const occupied = new Set([
+            join('/downloads', 'movie.mp4'),
+            join('/downloads', 'movie (1).mp4'),
+            join('/downloads', 'movie (2).mp4.part'),
+        ]);
+
+        expect(
+            findAvailableFinalPath(join('/downloads', 'movie.mp4'), (path) =>
+                occupied.has(path)
+            )
+        ).toEqual({
+            filename: 'movie (3).mp4',
+            path: join('/downloads', 'movie (3).mp4'),
+        });
+    });
+
+    it('reports zero for a missing .part with the default stat reader', () => {
+        const directory = mkdtempSync(join(tmpdir(), 'iptvnator-part-'));
+
+        try {
+            expect(
+                getPartialDownloadSize(join(directory, 'missing.mp4'))
+            ).toBe(0);
+        } finally {
+            rmSync(directory, { force: true, recursive: true });
+        }
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-file-path.ts b/apps/electron-backend/src/app/events/database/download-file-path.ts
index 6bab7324f..0e106f0d5 100644
--- a/apps/electron-backend/src/app/events/database/download-file-path.ts
+++ b/apps/electron-backend/src/app/events/database/download-file-path.ts
@@ -1,16 +1,61 @@
-import { closeSync, existsSync, openSync, unlinkSync } from 'node:fs';
-import { extname, join } from 'node:path';
+import {
+    closeSync,
+    existsSync,
+    lstatSync,
+    openSync,
+    unlinkSync,
+} from 'node:fs';
+import { basename, dirname, extname, join } from 'node:path';
 
 export interface ReservedDownloadFile {
     filename: string;
     path: string;
 }
 
+export interface ReservedPartialDownloadFile extends ReservedDownloadFile {
+    partialPath: string;
+}
+
 function createExclusiveFile(filePath: string): void {
     const descriptor = openSync(filePath, 'wx');
     closeSync(descriptor);
 }
 
+function createExistsError(filePath: string): NodeJS.ErrnoException {
+    const error = new Error(`File already exists: ${filePath}`) as NodeJS.ErrnoException;
+    error.code = 'EEXIST';
+    return error;
+}
+
+export function getPartialDownloadPath(filePath: string): string {
+    return `${filePath}.part`;
+}
+
+/**
+ * Next numbered destination whose final and .part paths are both free. Used
+ * when a retained download's recorded destination got occupied while it was
+ * paused or failed — the occupying file is never inspected or deleted.
+ */
+export function findAvailableFinalPath(
+    filePath: string,
+    pathExists: (candidate: string) => boolean = existsSync
+): { filename: string; path: string } {
+    const directory = dirname(filePath);
+    const extension = extname(filePath);
+    const stem = basename(filePath, extension);
+
+    for (let suffix = 1; ; suffix++) {
+        const filename = `${stem} (${suffix})${extension}`;
+        const candidate = join(directory, filename);
+        if (
+            !pathExists(candidate) &&
+            !pathExists(getPartialDownloadPath(candidate))
+        ) {
+            return { filename, path: candidate };
+        }
+    }
+}
+
 export function reserveAvailableDownloadFile(
     directory: string,
     requestedFilename: string,
@@ -38,6 +83,38 @@ export function reserveAvailableDownloadFile(
     }
 }
 
+export function reserveAvailablePartialDownloadFile(
+    directory: string,
+    requestedFilename: string,
+    reserveFile: (filePath: string) => void = createExclusiveFile,
+    pathExists: (filePath: string) => boolean = existsSync
+): ReservedPartialDownloadFile {
+    const extension = extname(requestedFilename);
+    const stem = extension
+        ? requestedFilename.slice(0, -extension.length)
+        : requestedFilename;
+    let candidate = requestedFilename;
+    let suffix = 1;
+
+    for (;;) {
+        const filePath = join(directory, candidate);
+        const partialPath = getPartialDownloadPath(filePath);
+        try {
+            if (pathExists(filePath)) {
+                throw createExistsError(filePath);
+            }
+            reserveFile(partialPath);
+            return { filename: candidate, partialPath, path: filePath };
+        } catch (error) {
+            if ((error as NodeJS.ErrnoException).code !== 'EEXIST') {
+                throw error;
+            }
+            candidate = `${stem} (${suffix})${extension}`;
+            suffix += 1;
+        }
+    }
+}
+
 export interface DownloadSavePathItem {
     getSavePath(): string;
 }
@@ -55,3 +132,49 @@ export function removePartialDownload(
     removeFile(savePath);
     return true;
 }
+
+export function removePartialDownloadFile(
+    filePath: string | null | undefined,
+    pathExists: (filePath: string) => boolean = existsSync,
+    removeFile: (filePath: string) => void = unlinkSync
+): boolean {
+    if (!filePath) {
+        return false;
+    }
+
+    const partialPath = getPartialDownloadPath(filePath);
+    if (!pathExists(partialPath)) {
+        return false;
+    }
+
+    removeFile(partialPath);
+    return true;
+}
+
+function getRegularFileStats(filePath: string): { size: number } {
+    // lstat + isFile so appending to a retained .part can never follow a
+    // symlink planted in its place while the download was paused.
+    const stats = lstatSync(filePath);
+    if (!stats.isFile()) {
+        throw new Error(`Partial download is not a regular file: ${filePath}`);
+    }
+    return stats;
+}
+
+export function getPartialDownloadSize(
+    filePath: string | null | undefined,
+    getStats: (filePath: string) => { size: number } = getRegularFileStats
+): number {
+    if (!filePath) {
+        return 0;
+    }
+
+    try {
+        return getStats(getPartialDownloadPath(filePath)).size;
+    } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+            throw error;
+        }
+        return 0;
+    }
+}
diff --git a/apps/electron-backend/src/app/events/database/download-finalize.spec.ts b/apps/electron-backend/src/app/events/database/download-finalize.spec.ts
new file mode 100644
index 000000000..c0b261a2d
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-finalize.spec.ts
@@ -0,0 +1,276 @@
+import { PassThrough, Readable } from 'node:stream';
+import {
+    createTask,
+    waitForCallCount,
+    waitForStatus,
+} from './download.test-helpers';
+
+describe('download finalization', () => {
+    it('falls back to copying the completed partial when hard links are unsupported', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn(
+            async () =>
+                ({
+                    data: Readable.from([Buffer.from('full')]),
+                    headers: { 'content-length': '4' },
+                    status: 200,
+                }) as never
+        );
+        const link = jest.fn(async () => {
+            const error = new Error('not supported') as NodeJS.ErrnoException;
+            error.code = 'EXDEV';
+            throw error;
+        });
+        const copyFile = jest.fn(async () => undefined);
+        const unlink = jest.fn(async () => undefined);
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile,
+            link,
+            stat: jest.fn(async () => ({ size: 4 })),
+            unlink,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(
+                (directory: string, filename: string) => ({
+                    filename,
+                    partialPath: `${directory}/${filename}.part`,
+                    path: `${directory}/${filename}`,
+                })
+            ),
+        }));
+
+        const runtime = await import('./download-runtime');
+        runtime.setMainWindow({
+            isDestroyed: () => false,
+            webContents: { send: jest.fn() },
+        } as never);
+
+        runtime.enqueueDownload(createTask());
+        await waitForCallCount(requestWithValidatedRedirects, 1);
+        await waitForStatus(set, 'completed');
+
+        expect(link).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            '/downloads/movie.mp4'
+        );
+        expect(copyFile).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            '/downloads/movie.mp4',
+            expect.any(Number)
+        );
+        expect(unlink).toHaveBeenCalledWith('/downloads/movie.mp4.part');
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 4,
+                filePath: '/downloads/movie.mp4',
+                status: 'completed',
+            })
+        );
+    });
+
+    it('completes when copied output exists but partial cleanup fails', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn(
+            async () =>
+                ({
+                    data: Readable.from([Buffer.from('full')]),
+                    headers: { 'content-length': '4' },
+                    status: 200,
+                }) as never
+        );
+        const link = jest.fn(async () => {
+            const error = new Error('not supported') as NodeJS.ErrnoException;
+            error.code = 'EXDEV';
+            throw error;
+        });
+        const copyFile = jest.fn(async () => undefined);
+        const unlink = jest.fn(async () => {
+            const error = new Error('cleanup denied') as NodeJS.ErrnoException;
+            error.code = 'EACCES';
+            throw error;
+        });
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile,
+            link,
+            stat: jest.fn(async () => ({ size: 4 })),
+            unlink,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(
+                (directory: string, filename: string) => ({
+                    filename,
+                    partialPath: `${directory}/${filename}.part`,
+                    path: `${directory}/${filename}`,
+                })
+            ),
+        }));
+
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        try {
+            const runtime = await import('./download-runtime');
+            runtime.setMainWindow({
+                isDestroyed: () => false,
+                webContents: { send: jest.fn() },
+            } as never);
+
+            runtime.enqueueDownload(createTask());
+            await waitForCallCount(requestWithValidatedRedirects, 1);
+            await waitForStatus(set, 'completed');
+
+            expect(copyFile).toHaveBeenCalledWith(
+                '/downloads/movie.mp4.part',
+                '/downloads/movie.mp4',
+                expect.any(Number)
+            );
+            expect(unlink).toHaveBeenCalledWith('/downloads/movie.mp4.part');
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 4,
+                    errorMessage: null,
+                    fileName: 'movie.mp4',
+                    filePath: '/downloads/movie.mp4',
+                    status: 'completed',
+                    totalBytes: 4,
+                })
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('preserves a completed partial when finalization fails', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn(
+            async () =>
+                ({
+                    data: Readable.from([Buffer.from('full')]),
+                    headers: { 'content-length': '4' },
+                    status: 200,
+                }) as never
+        );
+        const link = jest.fn(async () => {
+            const error = new Error('not supported') as NodeJS.ErrnoException;
+            error.code = 'EXDEV';
+            throw error;
+        });
+        const copyFile = jest.fn(async () => {
+            const error = new Error('disk full') as NodeJS.ErrnoException;
+            error.code = 'ENOSPC';
+            throw error;
+        });
+        const unlink = jest.fn(async () => undefined);
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile,
+            link,
+            stat: jest.fn(async () => ({ size: 4 })),
+            unlink,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(
+                (directory: string, filename: string) => ({
+                    filename,
+                    partialPath: `${directory}/${filename}.part`,
+                    path: `${directory}/${filename}`,
+                })
+            ),
+        }));
+
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        try {
+            const runtime = await import('./download-runtime');
+            runtime.setMainWindow({
+                isDestroyed: () => false,
+                webContents: { send: jest.fn() },
+            } as never);
+
+            runtime.enqueueDownload(createTask());
+            await waitForCallCount(requestWithValidatedRedirects, 1);
+            await waitForStatus(set, 'failed');
+
+            expect(copyFile).toHaveBeenCalledWith(
+                '/downloads/movie.mp4.part',
+                '/downloads/movie.mp4',
+                expect.any(Number)
+            );
+            expect(unlink).not.toHaveBeenCalled();
+            expect(removePartialDownloadFile).not.toHaveBeenCalled();
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 4,
+                    errorMessage: 'disk full',
+                    fileName: 'movie.mp4',
+                    filePath: '/downloads/movie.mp4',
+                    status: 'failed',
+                    totalBytes: 4,
+                })
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-finalize.ts b/apps/electron-backend/src/app/events/database/download-finalize.ts
new file mode 100644
index 000000000..955fe1ac4
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-finalize.ts
@@ -0,0 +1,349 @@
+import { eq, sql } from 'drizzle-orm';
+import { constants, existsSync } from 'node:fs';
+import { copyFile, link, stat, unlink } from 'node:fs/promises';
+import * as schema from '../../database/schema';
+import {
+    getPartialDownloadPath,
+    getPartialDownloadSize,
+    removePartialDownloadFile,
+    type ReservedPartialDownloadFile,
+} from './download-file-path';
+import type {
+    CompletedPartialProgress,
+    DownloadsDatabase,
+    DownloadTask,
+    TransferProgress,
+} from './download-task';
+import { describeError, TruncatedTransferError } from './download-transfer';
+
+/**
+ * Persistence for a failed startDownload() attempt, after its cancel/pause
+ * checkpoints have been ruled out. Chooses between: retaining a truncated
+ * transfer for a Range retry, committing an already-finalized file,
+ * retaining a completed partial, or the generic delete-partial failure.
+ */
+export async function handleDownloadFailure(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    reservation: ReservedPartialDownloadFile | undefined,
+    error: unknown
+): Promise<void> {
+    if (error instanceof TruncatedTransferError && reservation) {
+        // The short response is retained so a retry can continue the
+        // transfer via Range instead of starting over.
+        await persistCompletedPartialFailure(
+            db,
+            task,
+            {
+                bytesDownloaded: error.progress.bytesDownloaded,
+                filePath: reservation.path,
+                totalBytes: error.progress.totalBytes,
+            },
+            error
+        );
+        return;
+    }
+
+    const existingCompletedFileProgress =
+        await getExistingCompletedFileProgress(task);
+    if (existingCompletedFileProgress) {
+        removePartialFile(existingCompletedFileProgress.filePath);
+        await persistCompletion(
+            db,
+            task,
+            task.fileName,
+            existingCompletedFileProgress.filePath,
+            existingCompletedFileProgress.bytesDownloaded,
+            existingCompletedFileProgress.totalBytes
+        );
+        return;
+    }
+
+    const completedPartialProgress = getCompletedPartialProgress(task);
+    if (completedPartialProgress) {
+        await persistCompletedPartialFailure(
+            db,
+            task,
+            completedPartialProgress,
+            error
+        );
+        return;
+    }
+
+    console.error(
+        `[Downloads] Error downloading ${task.fileName}:`,
+        describeError(error)
+    );
+    removePartialFile(task.filePath);
+    await db
+        .update(schema.downloads)
+        .set({
+            errorMessage: describeError(error),
+            filePath: null,
+            resumeValidator: null,
+            status: 'failed',
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, task.id));
+}
+
+export async function completeDownloadFromPartial(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    reservation: ReservedPartialDownloadFile,
+    progress: TransferProgress
+): Promise<void> {
+    let fileSize: number;
+    try {
+        fileSize = await finalizePartialDownload(
+            reservation,
+            progress.bytesDownloaded
+        );
+    } catch (error) {
+        if (task.cancelRequested || task.pauseRequested) {
+            throw error;
+        }
+        await persistFinalizationFailure(
+            db,
+            task,
+            reservation,
+            progress,
+            error
+        );
+        return;
+    }
+
+    await persistCompletion(
+        db,
+        task,
+        reservation.filename,
+        reservation.path,
+        fileSize,
+        progress.totalBytes
+    );
+}
+
+export async function persistCompletion(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    fileName: string,
+    filePath: string,
+    fileSize: number,
+    totalBytes: number | null
+): Promise<void> {
+    console.log(`[Downloads] Completed: ${fileName}`);
+    await db
+        .update(schema.downloads)
+        .set({
+            bytesDownloaded: fileSize,
+            errorMessage: null,
+            fileName,
+            filePath,
+            resumeValidator: null,
+            status: 'completed',
+            totalBytes: totalBytes ?? fileSize,
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, task.id));
+}
+
+async function persistFinalizationFailure(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    reservation: ReservedPartialDownloadFile,
+    progress: TransferProgress,
+    error: unknown
+): Promise<void> {
+    await persistRetainedPartialFailure(
+        db,
+        task,
+        reservation.filename,
+        reservation.path,
+        progress,
+        error,
+        `[Downloads] Error finalizing ${reservation.filename}:`
+    );
+}
+
+export async function persistCompletedPartialFailure(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    progress: CompletedPartialProgress,
+    error: unknown
+): Promise<void> {
+    await persistRetainedPartialFailure(
+        db,
+        task,
+        task.fileName,
+        progress.filePath,
+        progress,
+        error,
+        `[Downloads] Error downloading ${task.fileName}:`
+    );
+}
+
+async function persistRetainedPartialFailure(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    fileName: string,
+    filePath: string,
+    progress: TransferProgress,
+    error: unknown,
+    logMessage: string
+): Promise<void> {
+    console.error(logMessage, describeError(error));
+    const totalBytes = progress.totalBytes ?? progress.bytesDownloaded;
+    task.totalBytes = totalBytes;
+    await db
+        .update(schema.downloads)
+        .set({
+            bytesDownloaded: progress.bytesDownloaded,
+            errorMessage: describeError(error),
+            fileName,
+            filePath,
+            status: 'failed',
+            totalBytes,
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, task.id));
+}
+
+export async function getExistingCompletedFileProgress(
+    task: DownloadTask
+): Promise<CompletedPartialProgress | null> {
+    if (
+        !task.filePath ||
+        task.totalBytes === null ||
+        task.totalBytes === undefined
+    ) {
+        return null;
+    }
+
+    try {
+        const fileStats = await stat(task.filePath);
+        if (fileStats.size !== task.totalBytes) {
+            return null;
+        }
+        return {
+            bytesDownloaded: fileStats.size,
+            filePath: task.filePath,
+            totalBytes: task.totalBytes,
+        };
+    } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+            console.error('[Downloads] Failed to inspect target file:', error);
+        }
+        return null;
+    }
+}
+
+export function getCompletedPartialProgress(
+    task: DownloadTask
+): CompletedPartialProgress | null {
+    if (
+        !task.filePath ||
+        task.totalBytes === null ||
+        task.totalBytes === undefined
+    ) {
+        return null;
+    }
+
+    if (!existsSync(getPartialDownloadPath(task.filePath))) {
+        return null;
+    }
+
+    try {
+        const bytesDownloaded = getPartialDownloadSize(task.filePath);
+        if (bytesDownloaded !== task.totalBytes) {
+            return null;
+        }
+        return {
+            bytesDownloaded,
+            filePath: task.filePath,
+            totalBytes: task.totalBytes,
+        };
+    } catch (error) {
+        console.error('[Downloads] Failed to inspect partial file:', error);
+        return null;
+    }
+}
+
+export function getPausedByteCount(task: DownloadTask): number {
+    try {
+        return getPartialDownloadSize(task.filePath);
+    } catch (error) {
+        console.error('[Downloads] Failed to inspect partial file:', error);
+        return 0;
+    }
+}
+
+async function finalizePartialDownload(
+    reservation: ReservedPartialDownloadFile,
+    expectedFileSize: number
+): Promise<number> {
+    try {
+        await link(reservation.partialPath, reservation.path);
+    } catch (error) {
+        if (!canCopyCompletedPartialAfterLinkFailure(error)) {
+            throw error;
+        }
+        await copyFile(
+            reservation.partialPath,
+            reservation.path,
+            constants.COPYFILE_EXCL
+        );
+    }
+    try {
+        await unlink(reservation.partialPath);
+    } catch (error) {
+        const fileSize = await getExpectedFinalFileSize(
+            reservation.path,
+            expectedFileSize
+        );
+        if (fileSize !== null) {
+            console.error(
+                '[Downloads] Failed to delete completed partial file:',
+                error
+            );
+            return fileSize;
+        }
+        throw error;
+    }
+    const fileStats = await stat(reservation.path);
+    return fileStats.size;
+}
+
+async function getExpectedFinalFileSize(
+    filePath: string,
+    expectedFileSize: number
+): Promise<number | null> {
+    try {
+        const fileStats = await stat(filePath);
+        return fileStats.size === expectedFileSize ? fileStats.size : null;
+    } catch {
+        return null;
+    }
+}
+
+function canCopyCompletedPartialAfterLinkFailure(error: unknown): boolean {
+    const errorCode = (error as NodeJS.ErrnoException).code;
+    return (
+        errorCode === 'EACCES' ||
+        errorCode === 'ENOSYS' ||
+        errorCode === 'ENOTSUP' ||
+        errorCode === 'EOPNOTSUPP' ||
+        errorCode === 'EPERM' ||
+        errorCode === 'EXDEV'
+    );
+}
+
+/** @returns false when a .part exists but could not be deleted. */
+export function removePartialFile(filePath: string | null | undefined): boolean {
+    try {
+        removePartialDownloadFile(filePath);
+        return true;
+    } catch (error) {
+        console.error('[Downloads] Failed to delete partial file:', error);
+        return false;
+    }
+}
diff --git a/apps/electron-backend/src/app/events/database/download-recovery.spec.ts b/apps/electron-backend/src/app/events/database/download-recovery.spec.ts
index 4456b0585..776717c79 100644
--- a/apps/electron-backend/src/app/events/database/download-recovery.spec.ts
+++ b/apps/electron-backend/src/app/events/database/download-recovery.spec.ts
@@ -1,48 +1,397 @@
-import { cleanupStaleDownloadFiles } from './stale-download-files';
+type StatSyncStub = (path: string) => { isFile: () => boolean; size: number };
+let statSyncOverride: StatSyncStub | null = null;
+jest.mock('node:fs', () => ({
+    ...jest.requireActual('node:fs'),
+    statSync: (path: string) =>
+        statSyncOverride
+            ? statSyncOverride(path)
+            : jest.requireActual('node:fs').statSync(path),
+}));
 
-describe('cleanupStaleDownloadFiles', () => {
-    it('removes every persisted partial path and ignores empty paths', () => {
-        const removeFile = jest.fn();
+describe('resetStaleDownloads', () => {
+    it('keeps interrupted partial downloads as paused and pauses queued rows', async () => {
+        jest.resetModules();
 
-        cleanupStaleDownloadFiles(
-            [
-                { filePath: '/downloads/one.mp4' },
-                { filePath: null },
-                { filePath: '/downloads/two.mp4' },
-            ],
-            removeFile
+        const staleDownloads = [
+            {
+                filePath: '/downloads/movie.mp4',
+                id: 1,
+                status: 'downloading',
+                totalBytes: 100,
+            },
+            {
+                filePath: null,
+                id: 2,
+                status: 'queued',
+                totalBytes: null,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(staleDownloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(() => 64),
+            removePartialDownloadFile,
+        }));
+
+        const { resetStaleDownloads } = await import('./download-recovery');
+
+        await resetStaleDownloads();
+
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 64,
+                status: 'paused',
+            })
         );
-
-        expect(removeFile).toHaveBeenCalledTimes(2);
-        expect(removeFile).toHaveBeenNthCalledWith(1, '/downloads/one.mp4');
-        expect(removeFile).toHaveBeenNthCalledWith(2, '/downloads/two.mp4');
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 0,
+                status: 'paused',
+            })
+        );
+        expect(set).not.toHaveBeenCalledWith(
+            expect.objectContaining({ status: 'failed' })
+        );
+        expect(removePartialDownloadFile).not.toHaveBeenCalled();
     });
 
-    it('continues cleaning other stale files after one removal fails', () => {
-        const removeFile = jest.fn((filePath: string) => {
-            if (filePath.endsWith('one.mp4')) {
-                throw new Error('locked');
-            }
+    it('commits a finalized download whose completion was interrupted', async () => {
+        jest.resetModules();
+
+        // Crash happened after finalizePartialDownload() (final file on disk,
+        // .part gone) but before persistCompletion() flipped the row.
+        const staleDownloads = [
+            {
+                filePath: '/downloads/movie.mp4',
+                id: 9,
+                status: 'downloading',
+                totalBytes: 100,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(staleDownloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+
+        statSyncOverride = () => ({ isFile: () => true, size: 100 });
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+        }));
+
+        try {
+            const recovery = await import('./download-recovery');
+            await recovery.resetStaleDownloads();
+        } finally {
+            statSyncOverride = null;
+        }
+
+        expect(set).toHaveBeenCalledTimes(1);
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 100,
+                errorMessage: null,
+                status: 'completed',
+            })
+        );
+        // Any leftover .part from the interrupted commit is cleaned up, and
+        // the final file's path is never cleared or deleted.
+        expect(removePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/movie.mp4'
+        );
+        expect(set).not.toHaveBeenCalledWith(
+            expect.objectContaining({ status: 'failed' })
+        );
+    });
+
+    it('keeps the retained partial of a resumed download that was still queued', async () => {
+        jest.resetModules();
+
+        const staleDownloads = [
+            {
+                filePath: '/downloads/resumed.mp4',
+                id: 7,
+                status: 'queued',
+                totalBytes: 1000,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(staleDownloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(() => 900),
+            removePartialDownloadFile,
+        }));
+
+        const { resetStaleDownloads } = await import('./download-recovery');
+
+        await resetStaleDownloads();
+
+        expect(removePartialDownloadFile).not.toHaveBeenCalled();
+        expect(set).toHaveBeenCalledTimes(1);
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 900,
+                errorMessage: null,
+                status: 'paused',
+                totalBytes: 1000,
+            })
+        );
+    });
+
+    it('removes non-recoverable interrupted partial files before clearing the persisted path', async () => {
+        jest.resetModules();
+
+        const staleDownloads = [
+            {
+                filePath: '/downloads/empty.mp4',
+                id: 1,
+                status: 'downloading',
+                totalBytes: 100,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(staleDownloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+        }));
+
+        const { resetStaleDownloads } = await import('./download-recovery');
+
+        await resetStaleDownloads();
+
+        expect(removePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/empty.mp4'
+        );
+        expect(removePartialDownloadFile.mock.invocationCallOrder[0]).toBeLessThan(
+            set.mock.invocationCallOrder[0]
+        );
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                errorMessage: 'Download interrupted by application restart',
+                filePath: null,
+                status: 'failed',
+            })
+        );
+    });
+
+    it('keeps the persisted path when non-recoverable partial cleanup fails', async () => {
+        jest.resetModules();
+
+        const staleDownloads = [
+            {
+                filePath: '/downloads/locked.mp4',
+                id: 1,
+                status: 'downloading',
+                totalBytes: 100,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(staleDownloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const deleteError = new Error('permission denied');
+        const removePartialDownloadFile = jest.fn(() => {
+            throw deleteError;
         });
         const consoleError = jest
             .spyOn(console, 'error')
             .mockImplementation(() => undefined);
 
-        cleanupStaleDownloadFiles(
-            [
-                { filePath: '/downloads/one.mp4' },
-                { filePath: '/downloads/two.mp4' },
-            ],
-            removeFile
-        );
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+        }));
 
-        expect(removeFile).toHaveBeenCalledTimes(2);
-        expect(consoleError).toHaveBeenCalledWith(
-            '[Downloads] Failed to delete stale partial file:',
-            '/downloads/one.mp4',
-            expect.any(Error)
-        );
+        const { resetStaleDownloads } = await import('./download-recovery');
 
-        consoleError.mockRestore();
+        try {
+            await resetStaleDownloads();
+
+            expect(removePartialDownloadFile).toHaveBeenCalledWith(
+                '/downloads/locked.mp4'
+            );
+            const failedUpdate = (set.mock.calls as unknown[][]).find(
+                ([value]) =>
+                    (value as { status?: string } | undefined)?.status ===
+                    'failed'
+            )?.[0] as Record<string, unknown> | undefined;
+            expect(failedUpdate).toEqual(
+                expect.objectContaining({
+                    errorMessage: 'Download interrupted by application restart',
+                    status: 'failed',
+                })
+            );
+            expect(failedUpdate).not.toHaveProperty('filePath');
+            expect(consoleError).toHaveBeenCalledWith(
+                '[Downloads] Failed to delete interrupted partial file:',
+                '/downloads/locked.mp4',
+                deleteError
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('removes leftover partial files for completed downloads without changing their status', async () => {
+        jest.resetModules();
+
+        const downloads = [
+            {
+                filePath: '/downloads/movie.mp4',
+                id: 1,
+                status: 'completed',
+                totalBytes: 100,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(downloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(),
+            removePartialDownloadFile,
+        }));
+
+        const { resetStaleDownloads } = await import('./download-recovery');
+
+        await resetStaleDownloads();
+
+        expect(removePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/movie.mp4'
+        );
+        expect(set).not.toHaveBeenCalled();
+    });
+
+    it('keeps completed downloads completed when leftover partial cleanup still fails', async () => {
+        jest.resetModules();
+
+        const downloads = [
+            {
+                filePath: '/downloads/movie.mp4',
+                id: 1,
+                status: 'completed',
+                totalBytes: 100,
+            },
+        ];
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(downloads),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const cleanupError = new Error('locked');
+        const removePartialDownloadFile = jest.fn(() => {
+            throw cleanupError;
+        });
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadSize: jest.fn(),
+            removePartialDownloadFile,
+        }));
+
+        const { resetStaleDownloads } = await import('./download-recovery');
+
+        try {
+            await resetStaleDownloads();
+
+            expect(removePartialDownloadFile).toHaveBeenCalledWith(
+                '/downloads/movie.mp4'
+            );
+            expect(set).not.toHaveBeenCalled();
+            expect(consoleError).toHaveBeenCalledWith(
+                '[Downloads] Failed to delete completed partial file:',
+                '/downloads/movie.mp4',
+                cleanupError
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
     });
 });
diff --git a/apps/electron-backend/src/app/events/database/download-recovery.ts b/apps/electron-backend/src/app/events/database/download-recovery.ts
index 09f3fc8f3..227529070 100644
--- a/apps/electron-backend/src/app/events/database/download-recovery.ts
+++ b/apps/electron-backend/src/app/events/database/download-recovery.ts
@@ -1,43 +1,215 @@
 import { inArray, sql } from 'drizzle-orm';
+import { statSync } from 'node:fs';
 import { getDatabase } from '../../database/connection';
 import * as schema from '../../database/schema';
-import { cleanupStaleDownloadFiles } from './stale-download-files';
+import {
+    getPartialDownloadSize,
+    removePartialDownloadFile,
+} from './download-file-path';
+
+interface StaleDownload {
+    filePath: string | null;
+    id: number;
+    status: string;
+    totalBytes: number | null;
+}
+
+function getRecoverablePartialSize(download: StaleDownload): number {
+    if (
+        (download.status !== 'downloading' && download.status !== 'queued') ||
+        !download.filePath
+    ) {
+        return 0;
+    }
+
+    try {
+        return getPartialDownloadSize(download.filePath);
+    } catch (error) {
+        console.error(
+            '[Downloads] Failed to inspect interrupted partial file:',
+            error
+        );
+        return 0;
+    }
+}
+
+/**
+ * A crash between finalizePartialDownload() and persistCompletion() leaves a
+ * 'downloading' row whose .part is gone but whose final file is fully on
+ * disk. Recognize that file (size must match the recorded total) so recovery
+ * commits the completion instead of orphaning the file and re-downloading.
+ */
+function getFinalizedFileSize(download: StaleDownload): number | null {
+    if (
+        download.status !== 'downloading' ||
+        !download.filePath ||
+        download.totalBytes === null
+    ) {
+        return null;
+    }
+
+    try {
+        const stats = statSync(download.filePath);
+        return stats.isFile() && stats.size === download.totalBytes
+            ? stats.size
+            : null;
+    } catch {
+        return null;
+    }
+}
+
+function removeFailedPartial(download: StaleDownload): boolean {
+    if (!download.filePath) {
+        return true;
+    }
+
+    try {
+        removePartialDownloadFile(download.filePath);
+        return true;
+    } catch (error) {
+        console.error(
+            '[Downloads] Failed to delete interrupted partial file:',
+            download.filePath,
+            error
+        );
+        return false;
+    }
+}
+
+function removeCompletedPartial(download: StaleDownload): void {
+    if (!download.filePath) {
+        return;
+    }
+
+    try {
+        removePartialDownloadFile(download.filePath);
+    } catch (error) {
+        console.error(
+            '[Downloads] Failed to delete completed partial file:',
+            download.filePath,
+            error
+        );
+    }
+}
 
 export async function resetStaleDownloads(): Promise<void> {
     try {
         const db = await getDatabase();
-        const staleDownloads = await db
+        const downloads = await db
             .select({
                 filePath: schema.downloads.filePath,
                 id: schema.downloads.id,
+                status: schema.downloads.status,
+                totalBytes: schema.downloads.totalBytes,
             })
             .from(schema.downloads)
-            .where(inArray(schema.downloads.status, ['queued', 'downloading']));
-        const ownedReservations = staleDownloads.filter(
-            (item) => item.filePath
+            .where(
+                inArray(schema.downloads.status, [
+                    'queued',
+                    'downloading',
+                    'completed',
+                ])
+            );
+        const completedDownloads = downloads.filter(
+            (download) => download.status === 'completed'
         );
+        const staleDownloads = downloads.filter(
+            (download) => download.status !== 'completed'
+        );
+        const finalizedDownloads = staleDownloads
+            .map((download) => ({
+                ...download,
+                finalizedSize: getFinalizedFileSize(download),
+            }))
+            .filter((download) => download.finalizedSize !== null);
+        const finalizedIds = new Set(
+            finalizedDownloads.map((download) => download.id)
+        );
+        // Queued rows are recoverable even without partial bytes: a resumed
+        // download waiting behind an active one is persisted as 'queued' with
+        // its retained .part, and a never-started queued row loses nothing by
+        // becoming 'paused' instead of 'failed'.
+        const recoverableDownloads = staleDownloads
+            .filter((download) => !finalizedIds.has(download.id))
+            .map((download) => ({
+                ...download,
+                bytesDownloaded: getRecoverablePartialSize(download),
+            }))
+            .filter(
+                (download) =>
+                    download.status === 'queued' || download.bytesDownloaded > 0
+            );
+        const recoverableIds = new Set(
+            recoverableDownloads.map((download) => download.id)
+        );
+        const failedDownloads = staleDownloads.filter(
+            (download) =>
+                !recoverableIds.has(download.id) &&
+                !finalizedIds.has(download.id)
+        );
+        const cleanupResult = failedDownloads.map((download) => ({
+            ...download,
+            partialRemoved: removeFailedPartial(download),
+        }));
+        const failedIdsWithRemovedPartials = cleanupResult
+            .filter((download) => download.partialRemoved)
+            .map((download) => download.id);
+        const failedIdsWithRetainedPartials = cleanupResult
+            .filter((download) => !download.partialRemoved)
+            .map((download) => download.id);
 
-        cleanupStaleDownloadFiles(ownedReservations);
-        await db
-            .update(schema.downloads)
-            .set({
-                errorMessage: 'Download interrupted by application restart',
-                status: 'failed',
-                updatedAt: sql`CURRENT_TIMESTAMP`,
-            })
-            .where(inArray(schema.downloads.status, ['queued', 'downloading']));
+        completedDownloads.forEach(removeCompletedPartial);
 
-        if (ownedReservations.length > 0) {
+        for (const download of finalizedDownloads) {
+            // The interrupted commit may also have left the .part behind.
+            removeCompletedPartial(download);
             await db
                 .update(schema.downloads)
-                .set({ filePath: null })
-                .where(
-                    inArray(
-                        schema.downloads.id,
-                        ownedReservations.map((item) => item.id)
-                    )
-                );
+                .set({
+                    bytesDownloaded: download.finalizedSize,
+                    errorMessage: null,
+                    status: 'completed',
+                    updatedAt: sql`CURRENT_TIMESTAMP`,
+                })
+                .where(inArray(schema.downloads.id, [download.id]));
         }
+
+        for (const download of recoverableDownloads) {
+            await db
+                .update(schema.downloads)
+                .set({
+                    bytesDownloaded: download.bytesDownloaded,
+                    errorMessage: null,
+                    status: 'paused',
+                    totalBytes: download.totalBytes,
+                    updatedAt: sql`CURRENT_TIMESTAMP`,
+                })
+                .where(inArray(schema.downloads.id, [download.id]));
+        }
+
+        if (failedIdsWithRemovedPartials.length > 0) {
+            await db
+                .update(schema.downloads)
+                .set({
+                    errorMessage: 'Download interrupted by application restart',
+                    filePath: null,
+                    status: 'failed',
+                    updatedAt: sql`CURRENT_TIMESTAMP`,
+                })
+                .where(inArray(schema.downloads.id, failedIdsWithRemovedPartials));
+        }
+
+        if (failedIdsWithRetainedPartials.length > 0) {
+            await db
+                .update(schema.downloads)
+                .set({
+                    errorMessage: 'Download interrupted by application restart',
+                    status: 'failed',
+                    updatedAt: sql`CURRENT_TIMESTAMP`,
+                })
+                .where(inArray(schema.downloads.id, failedIdsWithRetainedPartials));
+        }
+
         console.log('[Downloads] Reset stale downloads');
     } catch (error) {
         console.error('[Downloads] Error resetting stale downloads:', error);
diff --git a/apps/electron-backend/src/app/events/database/download-requests.spec.ts b/apps/electron-backend/src/app/events/database/download-requests.spec.ts
new file mode 100644
index 000000000..68835167e
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-requests.spec.ts
@@ -0,0 +1,351 @@
+import type { DownloadDirectoryAuthorizer } from './download-directory-authorization';
+
+describe('download requests resume', () => {
+    it('enqueues a paused download with stored headers and original target path', async () => {
+        jest.resetModules();
+
+        const row = {
+            filePath: '/downloads/movie.mp4',
+            id: 42,
+            requestHeaders: JSON.stringify({ 'User-Agent': 'IPTVnator' }),
+            resumeValidator: '"etag-9"',
+            status: 'paused',
+            title: 'Movie',
+            totalBytes: 100,
+            url: 'https://example.test/movie.mp4',
+        };
+        const limit = jest.fn().mockResolvedValue([row]);
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({ limit })),
+                })),
+            })),
+            update: jest.fn(() => ({
+                set: jest.fn(() => ({
+                    where: jest.fn().mockResolvedValue(undefined),
+                })),
+            })),
+        };
+        const enqueueDownload = jest.fn();
+        const authorizer = {
+            requireAuthorized: jest.fn(async (directory: string) => directory),
+        } as unknown as DownloadDirectoryAuthorizer;
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../url-safety', () => ({
+            assertRemoteUrlAllowed: jest.fn().mockResolvedValue(undefined),
+        }));
+        jest.doMock('./download-runtime', () => ({
+            enqueueDownload,
+        }));
+
+        const { resumeDownloadRequest } = await import('./download-requests');
+
+        await expect(
+            resumeDownloadRequest(42, '/unused', authorizer)
+        ).resolves.toEqual({ success: true });
+
+        // DB-recorded retained paths stay usable after folder switches.
+        expect(authorizer.requireAuthorized).not.toHaveBeenCalled();
+        expect(enqueueDownload).toHaveBeenCalledWith({
+            directory: '/downloads',
+            fileName: 'movie.mp4',
+            filePath: '/downloads/movie.mp4',
+            headers: { 'User-Agent': 'IPTVnator' },
+            id: 42,
+            resumeValidator: '"etag-9"',
+            totalBytes: 100,
+            url: 'https://example.test/movie.mp4',
+        });
+    });
+
+    it('does not enqueue when a concurrent resume already claimed the row', async () => {
+        jest.resetModules();
+
+        const row = {
+            filePath: '/downloads/movie.mp4',
+            id: 42,
+            requestHeaders: null,
+            resumeValidator: null,
+            status: 'paused',
+            title: 'Movie',
+            totalBytes: 100,
+            url: 'https://example.test/movie.mp4',
+        };
+        const limit = jest.fn().mockResolvedValue([row]);
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({ limit })),
+                })),
+            })),
+            update: jest.fn(() => ({
+                set: jest.fn(() => ({
+                    // The conditional status='paused' claim matched no rows.
+                    where: jest.fn().mockResolvedValue({ changes: 0 }),
+                })),
+            })),
+        };
+        const enqueueDownload = jest.fn();
+        const authorizer = {
+            requireAuthorized: jest.fn(async (directory: string) => directory),
+        } as unknown as DownloadDirectoryAuthorizer;
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../url-safety', () => ({
+            assertRemoteUrlAllowed: jest.fn().mockResolvedValue(undefined),
+        }));
+        jest.doMock('./download-runtime', () => ({
+            enqueueDownload,
+        }));
+
+        const { resumeDownloadRequest } = await import('./download-requests');
+
+        await expect(
+            resumeDownloadRequest(42, '/unused', authorizer)
+        ).resolves.toEqual({
+            error: 'Can only resume paused downloads',
+            success: false,
+        });
+        expect(enqueueDownload).not.toHaveBeenCalled();
+    });
+
+    it('retries a failed download with a retained partial at the original target path', async () => {
+        jest.resetModules();
+
+        const row = {
+            filePath: '/downloads/movie.mp4',
+            id: 42,
+            requestHeaders: JSON.stringify({ 'User-Agent': 'IPTVnator' }),
+            resumeValidator: '"etag-9"',
+            status: 'failed',
+            title: 'Movie',
+            totalBytes: 100,
+            url: 'https://example.test/movie.mp4',
+        };
+        const limit = jest.fn().mockResolvedValue([row]);
+        const set = jest.fn<
+            { where: jest.Mock },
+            [Record<string, unknown>]
+        >(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({ limit })),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const enqueueDownload = jest.fn();
+        const authorizer = {
+            requireAuthorized: jest.fn(async (directory: string) => directory),
+        } as unknown as DownloadDirectoryAuthorizer;
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../url-safety', () => ({
+            assertRemoteUrlAllowed: jest.fn().mockResolvedValue(undefined),
+        }));
+        jest.doMock('./download-runtime', () => ({
+            enqueueDownload,
+        }));
+
+        const { retryDownloadRequest } = await import('./download-requests');
+
+        await expect(
+            retryDownloadRequest(42, '/unused', authorizer)
+        ).resolves.toEqual({ success: true });
+
+        const update = set.mock.calls[0][0];
+        expect(authorizer.requireAuthorized).not.toHaveBeenCalled();
+        expect(update).toEqual(
+            expect.objectContaining({
+                errorMessage: null,
+                fileName: 'movie.mp4',
+                status: 'queued',
+            })
+        );
+        expect(update).not.toHaveProperty('bytesDownloaded');
+        expect(update).not.toHaveProperty('filePath');
+        expect(update).not.toHaveProperty('totalBytes');
+        expect(enqueueDownload).toHaveBeenCalledWith({
+            directory: '/downloads',
+            fileName: 'movie.mp4',
+            filePath: '/downloads/movie.mp4',
+            headers: { 'User-Agent': 'IPTVnator' },
+            id: 42,
+            resumeValidator: '"etag-9"',
+            totalBytes: 100,
+            url: 'https://example.test/movie.mp4',
+        });
+    });
+
+    it('deletes the retained partial before re-downloading a failed row from scratch', async () => {
+        jest.resetModules();
+
+        const failedRow = {
+            contentType: 'vod',
+            filePath: '/downloads/movie.mp4',
+            id: 42,
+            playlistId: 'playlist-1',
+            status: 'failed',
+            title: 'Movie',
+            url: 'https://example.test/movie.mp4',
+            xtreamId: 7,
+        };
+        const limit = jest
+            .fn()
+            .mockResolvedValueOnce([{ id: 'playlist-1' }])
+            .mockResolvedValueOnce([failedRow]);
+        const set = jest.fn<
+            { where: jest.Mock },
+            [Record<string, unknown>]
+        >(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({ limit })),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const enqueueDownload = jest.fn();
+        const removePartialDownloadFile = jest.fn();
+        const authorizer = {
+            requireAuthorized: jest.fn(async (directory: string) => directory),
+        } as unknown as DownloadDirectoryAuthorizer;
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../url-safety', () => ({
+            assertRemoteUrlAllowed: jest.fn().mockResolvedValue(undefined),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            removePartialDownloadFile,
+        }));
+        jest.doMock('./download-runtime', () => ({
+            enqueueDownload,
+        }));
+
+        const { startDownloadRequest } = await import('./download-requests');
+
+        await expect(
+            startDownloadRequest(
+                {
+                    contentType: 'vod',
+                    downloadFolder: '/downloads',
+                    playlistId: 'playlist-1',
+                    title: 'Movie',
+                    url: 'https://example.test/movie.mp4',
+                    xtreamId: 7,
+                },
+                authorizer
+            )
+        ).resolves.toEqual({ id: 42, success: true });
+
+        expect(removePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/movie.mp4'
+        );
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                filePath: null,
+                resumeValidator: null,
+                status: 'queued',
+            })
+        );
+    });
+
+    it('fails the re-download when the retained partial cannot be deleted', async () => {
+        jest.resetModules();
+
+        const failedRow = {
+            contentType: 'vod',
+            filePath: '/downloads/movie.mp4',
+            id: 42,
+            playlistId: 'playlist-1',
+            status: 'failed',
+            title: 'Movie',
+            url: 'https://example.test/movie.mp4',
+            xtreamId: 7,
+        };
+        const limit = jest
+            .fn()
+            .mockResolvedValueOnce([{ id: 'playlist-1' }])
+            .mockResolvedValueOnce([failedRow]);
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({ limit })),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const enqueueDownload = jest.fn();
+        const removePartialDownloadFile = jest.fn(() => {
+            throw new Error('EPERM: locked');
+        });
+        const authorizer = {
+            requireAuthorized: jest.fn(async (directory: string) => directory),
+        } as unknown as DownloadDirectoryAuthorizer;
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../url-safety', () => ({
+            assertRemoteUrlAllowed: jest.fn().mockResolvedValue(undefined),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            removePartialDownloadFile,
+        }));
+        jest.doMock('./download-runtime', () => ({
+            enqueueDownload,
+        }));
+
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        try {
+            const { startDownloadRequest } = await import(
+                './download-requests'
+            );
+
+            await expect(
+                startDownloadRequest(
+                    {
+                        contentType: 'vod',
+                        downloadFolder: '/downloads',
+                        playlistId: 'playlist-1',
+                        title: 'Movie',
+                        url: 'https://example.test/movie.mp4',
+                        xtreamId: 7,
+                    },
+                    authorizer
+                )
+            ).resolves.toEqual({
+                error: 'Could not delete the previous partial file',
+                id: 42,
+                success: false,
+            });
+        } finally {
+            consoleError.mockRestore();
+        }
+
+        // The row keeps its filePath ownership and nothing is enqueued.
+        expect(set).not.toHaveBeenCalled();
+        expect(enqueueDownload).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-requests.ts b/apps/electron-backend/src/app/events/database/download-requests.ts
index deb643ac7..515402aa9 100644
--- a/apps/electron-backend/src/app/events/database/download-requests.ts
+++ b/apps/electron-backend/src/app/events/database/download-requests.ts
@@ -1,9 +1,10 @@
 import { and, eq, sql } from 'drizzle-orm';
-import { extname } from 'node:path';
+import { basename, dirname, extname } from 'node:path';
 import { getDatabase } from '../../database/connection';
 import * as schema from '../../database/schema';
 import { assertRemoteUrlAllowed } from '../url-safety';
 import { DownloadDirectoryAuthorizer } from './download-directory-authorization';
+import { removePartialDownloadFile } from './download-file-path';
 import { enqueueDownload } from './download-runtime';
 
 export interface StartDownloadRequest {
@@ -25,18 +26,21 @@ export interface StartDownloadRequest {
     macAddress?: string;
 }
 
+function sanitizeFilename(name: string): string {
+    return name.replace(/[<>:"/\\|?*]/g, '_').trim();
+}
+
 function getExtensionFromUrl(url: string): string {
     try {
-        return extname(new URL(url).pathname) || '.mp4';
+        // Sanitize too: URL pathnames may legally contain characters like ':'
+        // that would create NTFS alternate data streams on Windows.
+        const extension = sanitizeFilename(extname(new URL(url).pathname));
+        return extension.startsWith('.') ? extension : '.mp4';
     } catch {
         return '.mp4';
     }
 }
 
-function sanitizeFilename(name: string): string {
-    return name.replace(/[<>:"/\\|?*]/g, '_').trim();
-}
-
 function createFileName(title: string, url: string): string {
     return sanitizeFilename(title) + getExtensionFromUrl(url);
 }
@@ -44,13 +48,62 @@ function createFileName(title: string, url: string): string {
 function createHeaders(
     headers: StartDownloadRequest['headers']
 ): Record<string, string> | undefined {
-    return headers
-        ? {
-              'User-Agent': headers.userAgent || '',
-              Origin: headers.origin || '',
-              Referer: headers.referer || '',
-          }
-        : undefined;
+    if (!headers) {
+        return undefined;
+    }
+
+    const result: Record<string, string> = {};
+    if (headers.userAgent) {
+        result['User-Agent'] = headers.userAgent;
+    }
+    if (headers.origin) {
+        result.Origin = headers.origin;
+    }
+    if (headers.referer) {
+        result.Referer = headers.referer;
+    }
+
+    return Object.keys(result).length > 0 ? result : undefined;
+}
+
+function serializeHeaders(
+    headers: Record<string, string> | undefined
+): string | null {
+    return headers ? JSON.stringify(headers) : null;
+}
+
+const STORED_HEADER_ALLOWLIST = ['User-Agent', 'Origin', 'Referer'] as const;
+
+function parseStoredHeaders(
+    value: string | null
+): Record<string, string> | undefined {
+    if (!value) {
+        return undefined;
+    }
+
+    try {
+        const parsed = JSON.parse(value) as unknown;
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return undefined;
+        }
+
+        // Re-apply the write-time allowlist so a tampered or imported
+        // database row cannot smuggle arbitrary headers into requests.
+        const entries = parsed as Record<string, unknown>;
+        const headers = STORED_HEADER_ALLOWLIST.reduce<Record<string, string>>(
+            (acc, key) => {
+                const headerValue = entries[key];
+                if (typeof headerValue === 'string') {
+                    acc[key] = headerValue;
+                }
+                return acc;
+            },
+            {}
+        );
+        return Object.keys(headers).length > 0 ? headers : undefined;
+    } catch {
+        return undefined;
+    }
 }
 
 export async function startDownloadRequest(
@@ -98,6 +151,7 @@ export async function startDownloadRequest(
         )
         .limit(1);
     const fileName = createFileName(data.title, data.url);
+    const headers = createHeaders(data.headers);
 
     if (existing.length > 0) {
         const item = existing[0];
@@ -109,6 +163,26 @@ export async function startDownloadRequest(
             };
         }
 
+        if (item.status === 'failed' && item.filePath) {
+            // A failed row can still reference a retained .part; delete it
+            // before the restart clears filePath, or the file is orphaned.
+            // A locked .part must keep its database owner, so fail the
+            // restart instead of proceeding without the cleanup.
+            try {
+                removePartialDownloadFile(item.filePath);
+            } catch (error) {
+                console.error(
+                    '[Downloads] Failed to delete retained partial before re-download:',
+                    error
+                );
+                return {
+                    error: 'Could not delete the previous partial file',
+                    id: item.id,
+                    success: false,
+                };
+            }
+        }
+
         await db
             .update(schema.downloads)
             .set({
@@ -116,6 +190,8 @@ export async function startDownloadRequest(
                 errorMessage: null,
                 fileName,
                 filePath: null,
+                requestHeaders: serializeHeaders(headers),
+                resumeValidator: null,
                 status: 'queued',
                 totalBytes: null,
                 updatedAt: sql`CURRENT_TIMESTAMP`,
@@ -125,7 +201,7 @@ export async function startDownloadRequest(
         enqueueDownload({
             directory,
             fileName,
-            headers: createHeaders(data.headers),
+            headers,
             id: item.id,
             url: data.url,
         });
@@ -138,6 +214,7 @@ export async function startDownloadRequest(
         fileName,
         playlistId: data.playlistId,
         posterUrl: data.posterUrl,
+        requestHeaders: serializeHeaders(headers),
         seasonNumber: data.seasonNumber,
         seriesXtreamId: data.seriesXtreamId,
         status: 'queued',
@@ -149,7 +226,7 @@ export async function startDownloadRequest(
     enqueueDownload({
         directory,
         fileName,
-        headers: createHeaders(data.headers),
+        headers,
         id: insertedId,
         url: data.url,
     });
@@ -162,7 +239,6 @@ export async function retryDownloadRequest(
     authorizer: DownloadDirectoryAuthorizer
 ): Promise<{ success: boolean; error?: string }> {
     console.log('[Downloads] Retry download:', downloadId);
-    const directory = await authorizer.requireAuthorized(downloadFolder);
     const db = await getDatabase();
     const existing = await db
         .select()
@@ -183,24 +259,127 @@ export async function retryDownloadRequest(
         };
     }
 
-    const fileName = createFileName(item.title, item.url);
+    const retainedFilePath =
+        item.status === 'failed' && item.filePath ? item.filePath : null;
+    // A retained filePath was written by the main process after its folder
+    // was authorized; requiring the folder to still be the CURRENT selection
+    // would strand the retry after the user switches download folders.
+    const directory = retainedFilePath
+        ? dirname(retainedFilePath)
+        : await authorizer.requireAuthorized(downloadFolder);
+    const fileName = retainedFilePath
+        ? basename(retainedFilePath)
+        : createFileName(item.title, item.url);
+    const queuedUpdate = retainedFilePath
+        ? {
+              errorMessage: null,
+              fileName,
+              status: 'queued' as const,
+              updatedAt: sql`CURRENT_TIMESTAMP`,
+          }
+        : {
+              bytesDownloaded: 0,
+              errorMessage: null,
+              fileName,
+              filePath: null,
+              resumeValidator: null,
+              status: 'queued' as const,
+              totalBytes: null,
+              updatedAt: sql`CURRENT_TIMESTAMP`,
+          };
     await db
         .update(schema.downloads)
-        .set({
-            bytesDownloaded: 0,
-            errorMessage: null,
-            fileName,
-            filePath: null,
-            status: 'queued',
-            totalBytes: null,
-            updatedAt: sql`CURRENT_TIMESTAMP`,
-        })
+        .set(queuedUpdate)
         .where(eq(schema.downloads.id, downloadId));
     enqueueDownload({
         directory,
         fileName,
+        filePath: retainedFilePath,
+        headers: parseStoredHeaders(item.requestHeaders),
         id: item.id,
+        resumeValidator: retainedFilePath ? item.resumeValidator : null,
+        totalBytes: retainedFilePath ? item.totalBytes : null,
         url: item.url,
     });
     return { success: true };
 }
+
+export async function resumeDownloadRequest(
+    downloadId: number,
+    downloadFolder: string,
+    authorizer: DownloadDirectoryAuthorizer
+): Promise<{ success: boolean; error?: string }> {
+    console.log('[Downloads] Resume download:', downloadId);
+    const db = await getDatabase();
+    const existing = await db
+        .select()
+        .from(schema.downloads)
+        .where(eq(schema.downloads.id, downloadId))
+        .limit(1);
+
+    if (existing.length === 0) {
+        return { error: 'Download not found', success: false };
+    }
+
+    const item = existing[0];
+    await assertRemoteUrlAllowed(item.url, { allowPrivateNetworks: true });
+    if (item.status !== 'paused') {
+        return {
+            error: 'Can only resume paused downloads',
+            success: false,
+        };
+    }
+
+    // See retryDownloadRequest: DB-recorded retained paths stay usable after
+    // the user switches download folders.
+    const directory = item.filePath
+        ? dirname(item.filePath)
+        : await authorizer.requireAuthorized(downloadFolder);
+    const fileName = item.filePath
+        ? basename(item.filePath)
+        : createFileName(item.title, item.url);
+
+    // Claim the row atomically: a concurrent resume for the same id loses
+    // this conditional update and must not enqueue a second task.
+    const claim = await db
+        .update(schema.downloads)
+        .set({
+            errorMessage: null,
+            fileName,
+            status: 'queued',
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(
+            and(
+                eq(schema.downloads.id, downloadId),
+                eq(schema.downloads.status, 'paused')
+            )
+        );
+    if (hasNoChanges(claim)) {
+        return {
+            error: 'Can only resume paused downloads',
+            success: false,
+        };
+    }
+
+    enqueueDownload({
+        directory,
+        fileName,
+        filePath: item.filePath,
+        headers: parseStoredHeaders(item.requestHeaders),
+        id: item.id,
+        resumeValidator: item.resumeValidator,
+        totalBytes: item.totalBytes,
+        url: item.url,
+    });
+    return { success: true };
+}
+
+function hasNoChanges(result: unknown): boolean {
+    return (
+        typeof result === 'object' &&
+        result !== null &&
+        'changes' in result &&
+        (result as { changes: number }).changes === 0
+    );
+}
diff --git a/apps/electron-backend/src/app/events/database/download-reserve.spec.ts b/apps/electron-backend/src/app/events/database/download-reserve.spec.ts
new file mode 100644
index 000000000..46941058f
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-reserve.spec.ts
@@ -0,0 +1,151 @@
+import { PassThrough, Readable } from 'node:stream';
+import { createTask, waitForStatus } from './download.test-helpers';
+
+describe('destination collision handling', () => {
+    it('redirects a retained partial to a numbered destination instead of unlinking', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = { update: jest.fn(() => ({ set })) };
+        const occupied = new Set([
+            '/downloads/movie.mp4',
+            '/downloads/movie.mp4.part',
+        ]);
+        const renameMock = jest.fn(async () => undefined);
+        const unlinkMock = jest.fn(async () => undefined);
+        const requestWithValidatedRedirects = jest.fn(
+            async () =>
+                ({
+                    data: Readable.from([Buffer.alloc(50, 'r')]),
+                    headers: { 'content-range': 'bytes 50-99/100' },
+                    status: 206,
+                }) as never
+        );
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn((path: string) => occupied.has(path)),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile: jest.fn(async () => undefined),
+            link: jest.fn(async () => undefined),
+            rename: renameMock,
+            stat: jest.fn(async () => ({ size: 100 })),
+            unlink: unlinkMock,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            findAvailableFinalPath: jest.fn(() => ({
+                filename: 'movie (1).mp4',
+                path: '/downloads/movie (1).mp4',
+            })),
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 50),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(),
+        }));
+
+        const runtime = await import('./download-runtime');
+        runtime.setMainWindow({
+            isDestroyed: () => false,
+            webContents: { send: jest.fn() },
+        } as never);
+
+        runtime.enqueueDownload({
+            ...createTask(),
+            filePath: '/downloads/movie.mp4',
+            totalBytes: 100,
+        });
+        await waitForStatus(set, 'completed');
+
+        // The foreign file at the recorded destination is never touched.
+        expect(unlinkMock).not.toHaveBeenCalledWith('/downloads/movie.mp4');
+        expect(renameMock).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            '/downloads/movie (1).mp4.part'
+        );
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                fileName: 'movie (1).mp4',
+                filePath: '/downloads/movie (1).mp4',
+            })
+        );
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                filePath: '/downloads/movie (1).mp4',
+                status: 'completed',
+            })
+        );
+    });
+});
+
+describe('queue deduplication', () => {
+    it('ignores a second enqueue for an id that is already queued', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({
+            where: jest.fn().mockResolvedValue(undefined),
+        }));
+        const db = { update: jest.fn(() => ({ set })) };
+        const removePartialDownloadFile = jest.fn();
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects: jest.fn(
+                () => new Promise(() => undefined)
+            ),
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(
+                (directory: string, filename: string) => ({
+                    filename,
+                    partialPath: `${directory}/${filename}.part`,
+                    path: `${directory}/${filename}`,
+                })
+            ),
+        }));
+
+        const runtime = await import('./download-runtime');
+        runtime.setMainWindow({
+            isDestroyed: () => false,
+            webContents: { send: jest.fn() },
+        } as never);
+
+        // Occupy the active slot, then enqueue id 43 twice (double resume).
+        runtime.enqueueDownload(createTask());
+        runtime.enqueueDownload({ ...createTask(), id: 43 });
+        runtime.enqueueDownload({ ...createTask(), id: 43 });
+
+        // Only one queue entry exists: the first cancel finds it, the second
+        // finds nothing (and no paused DB row backs id 43 in this harness).
+        const dbSelect = jest.fn(() => ({
+            from: jest.fn(() => ({
+                where: jest.fn(() => ({
+                    limit: jest.fn().mockResolvedValue([]),
+                })),
+            })),
+        }));
+        (db as { select?: jest.Mock }).select = dbSelect;
+
+        await expect(runtime.cancelDownload(43)).resolves.toBe(true);
+        await expect(runtime.cancelDownload(43)).resolves.toBe(false);
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-resume.spec.ts b/apps/electron-backend/src/app/events/database/download-resume.spec.ts
new file mode 100644
index 000000000..5688fa4cc
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-resume.spec.ts
@@ -0,0 +1,337 @@
+import { PassThrough, Readable } from 'node:stream';
+import type { DownloadTask } from './download-task';
+
+interface ResumeHarness {
+    createWriteStream: jest.Mock;
+    removePartialDownloadFile: jest.Mock;
+    requestWithValidatedRedirects: jest.Mock;
+    set: jest.Mock;
+    runtime: typeof import('./download-runtime');
+}
+
+interface ResumeHarnessOptions {
+    partialSize: number;
+    response: {
+        data: Readable;
+        headers: Record<string, string>;
+        status: number;
+    };
+    /** 'enoent' makes stat() report a missing target file. */
+    finalSize: number | 'enoent';
+}
+
+function createTask(overrides: Partial<DownloadTask> = {}): DownloadTask {
+    return {
+        directory: '/downloads',
+        fileName: 'movie.mp4',
+        id: 42,
+        url: 'https://example.test/movie.mp4',
+        ...overrides,
+    };
+}
+
+async function waitForStatus(set: jest.Mock, status: string): Promise<void> {
+    for (let attempt = 0; attempt < 20; attempt++) {
+        if (set.mock.calls.some(([value]) => value?.status === status)) {
+            return;
+        }
+        await new Promise<void>((resolve) => setImmediate(resolve));
+    }
+
+    expect(set).toHaveBeenCalledWith(expect.objectContaining({ status }));
+}
+
+async function setupResumeHarness(
+    options: ResumeHarnessOptions
+): Promise<ResumeHarness> {
+    jest.resetModules();
+
+    const set = jest.fn(() => ({
+        where: jest.fn().mockResolvedValue(undefined),
+    }));
+    const db = { update: jest.fn(() => ({ set })) };
+    const requestWithValidatedRedirects = jest.fn(
+        async () => options.response as never
+    );
+    const createWriteStream = jest.fn(() => new PassThrough());
+    const removePartialDownloadFile = jest.fn();
+
+    jest.doMock('../../database/connection', () => ({
+        getDatabase: jest.fn().mockResolvedValue(db),
+    }));
+    jest.doMock('../../util/validated-axios', () => ({
+        requestWithValidatedRedirects,
+    }));
+    jest.doMock('node:fs', () => ({
+        ...jest.requireActual('node:fs'),
+        createWriteStream,
+        existsSync: jest.fn(() => false),
+    }));
+    jest.doMock('node:fs/promises', () => ({
+        copyFile: jest.fn(async () => undefined),
+        link: jest.fn(async () => undefined),
+        stat: jest.fn(async () => {
+            if (options.finalSize === 'enoent') {
+                const error = new Error('missing') as NodeJS.ErrnoException;
+                error.code = 'ENOENT';
+                throw error;
+            }
+            return { size: options.finalSize };
+        }),
+        unlink: jest.fn(async () => undefined),
+    }));
+    jest.doMock('./download-file-path', () => ({
+        getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+        getPartialDownloadSize: jest.fn(() => options.partialSize),
+        removePartialDownloadFile,
+        reserveAvailablePartialDownloadFile: jest.fn(
+            (directory: string, filename: string) => ({
+                filename,
+                partialPath: `${directory}/${filename}.part`,
+                path: `${directory}/${filename}`,
+            })
+        ),
+    }));
+
+    const runtime = await import('./download-runtime');
+    runtime.setMainWindow({
+        isDestroyed: () => false,
+        webContents: { send: jest.fn() },
+    } as never);
+
+    return {
+        createWriteStream,
+        removePartialDownloadFile,
+        requestWithValidatedRedirects,
+        set,
+        runtime,
+    };
+}
+
+describe('download resume validation', () => {
+    it('sends the stored validator as If-Range alongside the Range header', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 54,
+            partialSize: 50,
+            response: {
+                data: Readable.from([Buffer.from('rest')]),
+                headers: { 'content-range': 'bytes 50-53/54' },
+                status: 206,
+            },
+        });
+
+        harness.runtime.enqueueDownload(
+            createTask({
+                filePath: '/downloads/movie.mp4',
+                resumeValidator: '"etag-1"',
+                totalBytes: 54,
+            })
+        );
+        await waitForStatus(harness.set, 'completed');
+
+        expect(harness.requestWithValidatedRedirects).toHaveBeenCalledWith(
+            'https://example.test/movie.mp4',
+            expect.objectContaining({
+                headers: expect.objectContaining({
+                    'If-Range': '"etag-1"',
+                    Range: 'bytes=50-',
+                }),
+            }),
+            { allowPrivateNetworks: true }
+        );
+        expect(harness.createWriteStream).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            { flags: 'a' }
+        );
+    });
+
+    it('restarts from byte zero when a resume request is answered with 200', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 4,
+            partialSize: 50,
+            response: {
+                data: Readable.from([Buffer.from('full')]),
+                headers: { 'content-length': '4', etag: '"etag-2"' },
+                status: 200,
+            },
+        });
+        const consoleWarn = jest
+            .spyOn(console, 'warn')
+            .mockImplementation(() => undefined);
+
+        try {
+            harness.runtime.enqueueDownload(
+                createTask({
+                    filePath: '/downloads/movie.mp4',
+                    resumeValidator: '"etag-1"',
+                    totalBytes: 54,
+                })
+            );
+            await waitForStatus(harness.set, 'completed');
+
+            expect(harness.createWriteStream).toHaveBeenCalledWith(
+                '/downloads/movie.mp4.part',
+                { flags: 'w' }
+            );
+            expect(harness.set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 0,
+                    resumeValidator: '"etag-2"',
+                    totalBytes: 4,
+                })
+            );
+            expect(harness.set).not.toHaveBeenCalledWith(
+                expect.objectContaining({ status: 'failed' })
+            );
+            expect(harness.removePartialDownloadFile).not.toHaveBeenCalled();
+        } finally {
+            consoleWarn.mockRestore();
+        }
+    });
+
+    it('fails the transfer when the 206 response starts at the wrong offset', async () => {
+        const body = new PassThrough();
+        body.write('rest');
+        const harness = await setupResumeHarness({
+            finalSize: 'enoent',
+            partialSize: 50,
+            response: {
+                data: body,
+                headers: { 'content-range': 'bytes 0-53/54' },
+                status: 206,
+            },
+        });
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+
+        try {
+            harness.runtime.enqueueDownload(
+                createTask({
+                    filePath: '/downloads/movie.mp4',
+                    totalBytes: 54,
+                })
+            );
+            await waitForStatus(harness.set, 'failed');
+
+            expect(harness.set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    errorMessage: 'Server returned an invalid resume range',
+                    status: 'failed',
+                })
+            );
+            expect(body.destroyed).toBe(true);
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('retains the partial when a 206 ends before the advertised size', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 'enoent',
+            partialSize: 50,
+            response: {
+                // Only 20 of the 50 remaining bytes arrive before EOF.
+                data: Readable.from([Buffer.alloc(20, 'r')]),
+                headers: { 'content-range': 'bytes 50-99/100' },
+                status: 206,
+            },
+        });
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+
+        try {
+            harness.runtime.enqueueDownload(
+                createTask({
+                    filePath: '/downloads/movie.mp4',
+                    totalBytes: 100,
+                })
+            );
+            await waitForStatus(harness.set, 'failed');
+
+            expect(harness.set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 70,
+                    errorMessage: 'Transfer ended before the advertised size',
+                    filePath: '/downloads/movie.mp4',
+                    status: 'failed',
+                })
+            );
+            expect(harness.removePartialDownloadFile).not.toHaveBeenCalled();
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('captures a strong ETag from the first response for later resumes', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 4,
+            partialSize: 0,
+            response: {
+                data: Readable.from([Buffer.from('full')]),
+                headers: { 'content-length': '4', etag: '"etag-3"' },
+                status: 200,
+            },
+        });
+
+        harness.runtime.enqueueDownload(createTask());
+        await waitForStatus(harness.set, 'completed');
+
+        expect(harness.set).toHaveBeenCalledWith(
+            expect.objectContaining({ resumeValidator: '"etag-3"' })
+        );
+    });
+
+    it('pauses before reservation without a network request or file path', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 4,
+            partialSize: 0,
+            response: {
+                data: Readable.from([Buffer.from('full')]),
+                headers: { 'content-length': '4' },
+                status: 200,
+            },
+        });
+
+        harness.runtime.enqueueDownload({
+            ...createTask(),
+            pauseRequested: true,
+        });
+        await waitForStatus(harness.set, 'paused');
+
+        expect(harness.requestWithValidatedRedirects).not.toHaveBeenCalled();
+        expect(harness.set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 0,
+                filePath: null,
+                status: 'paused',
+            })
+        );
+    });
+
+    it('falls back to Last-Modified when the ETag is weak', async () => {
+        const harness = await setupResumeHarness({
+            finalSize: 4,
+            partialSize: 0,
+            response: {
+                data: Readable.from([Buffer.from('full')]),
+                headers: {
+                    'content-length': '4',
+                    etag: 'W/"weak-etag"',
+                    'last-modified': 'Wed, 01 Jul 2026 10:00:00 GMT',
+                },
+                status: 200,
+            },
+        });
+
+        harness.runtime.enqueueDownload(createTask());
+        await waitForStatus(harness.set, 'completed');
+
+        expect(harness.set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                resumeValidator: 'Wed, 01 Jul 2026 10:00:00 GMT',
+            })
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-retained-partial.spec.ts b/apps/electron-backend/src/app/events/database/download-retained-partial.spec.ts
new file mode 100644
index 000000000..35679e7c9
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-retained-partial.spec.ts
@@ -0,0 +1,154 @@
+import { PassThrough } from 'node:stream';
+import { createTask, waitForStatus } from './download.test-helpers';
+
+describe('retained completed partials', () => {
+    it('finalizes a retained completed partial without another HTTP request', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn();
+        const link = jest.fn(async () => undefined);
+        const unlink = jest.fn(async () => undefined);
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn((filePath: string) =>
+                filePath.endsWith('.part')
+            ),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile: jest.fn(async () => undefined),
+            link,
+            stat: jest.fn(async () => ({ size: 4 })),
+            unlink,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 4),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(),
+        }));
+
+        const runtime = await import('./download-runtime');
+        runtime.setMainWindow({
+            isDestroyed: () => false,
+            webContents: { send: jest.fn() },
+        } as never);
+
+        runtime.enqueueDownload({
+            ...createTask(),
+            filePath: '/downloads/movie.mp4',
+            totalBytes: 4,
+        });
+        await waitForStatus(set, 'completed');
+
+        expect(requestWithValidatedRedirects).not.toHaveBeenCalled();
+        expect(link).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            '/downloads/movie.mp4'
+        );
+        expect(unlink).toHaveBeenCalledWith('/downloads/movie.mp4.part');
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 4,
+                filePath: '/downloads/movie.mp4',
+                status: 'completed',
+                totalBytes: 4,
+            })
+        );
+    });
+
+    it('finalizes a retained completed partial beside an occupied destination without touching it', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn();
+        const link = jest.fn(async () => undefined);
+        const unlink = jest.fn(async () => undefined);
+        const occupied = new Set([
+            '/downloads/movie.mp4',
+            '/downloads/movie.mp4.part',
+        ]);
+        const rename = jest.fn(async (from: string, to: string) => {
+            occupied.delete(from);
+            occupied.add(to);
+        });
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn((filePath: string) => occupied.has(filePath)),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile: jest.fn(async () => undefined),
+            link,
+            rename,
+            stat: jest.fn(async () => ({ size: 4 })),
+            unlink,
+        }));
+        jest.doMock('./download-file-path', () => ({
+            findAvailableFinalPath: jest.fn(() => ({
+                filename: 'movie (1).mp4',
+                path: '/downloads/movie (1).mp4',
+            })),
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 4),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(),
+        }));
+
+        const runtime = await import('./download-runtime');
+        runtime.setMainWindow({
+            isDestroyed: () => false,
+            webContents: { send: jest.fn() },
+        } as never);
+
+        runtime.enqueueDownload({
+            ...createTask(),
+            filePath: '/downloads/movie.mp4',
+            totalBytes: 4,
+        });
+        await waitForStatus(set, 'completed');
+
+        // The occupied destination is never unlinked or overwritten; the
+        // retained partial moves aside and finalizes under a numbered name.
+        expect(requestWithValidatedRedirects).not.toHaveBeenCalled();
+        expect(unlink).not.toHaveBeenCalledWith('/downloads/movie.mp4');
+        expect(rename).toHaveBeenCalledWith(
+            '/downloads/movie.mp4.part',
+            '/downloads/movie (1).mp4.part'
+        );
+        expect(link).toHaveBeenCalledWith(
+            '/downloads/movie (1).mp4.part',
+            '/downloads/movie (1).mp4'
+        );
+        expect(set).toHaveBeenCalledWith(
+            expect.objectContaining({
+                bytesDownloaded: 4,
+                fileName: 'movie (1).mp4',
+                filePath: '/downloads/movie (1).mp4',
+                status: 'completed',
+                totalBytes: 4,
+            })
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/download-runtime.spec.ts b/apps/electron-backend/src/app/events/database/download-runtime.spec.ts
index 64b7bfd2b..9856b8de9 100644
--- a/apps/electron-backend/src/app/events/database/download-runtime.spec.ts
+++ b/apps/electron-backend/src/app/events/database/download-runtime.spec.ts
@@ -1,124 +1,91 @@
-import type { DownloadItem } from 'electron';
+import { PassThrough, Readable } from 'node:stream';
 import {
-    attachDownloadItem,
     requestDownloadCancellation,
-    type DownloadTask,
+    requestDownloadPause,
 } from './download-task';
+import {
+    createTask,
+    waitForCallCount,
+    waitForStatus,
+    waitForStatusCount,
+} from './download.test-helpers';
 
-function createTask(): DownloadTask {
-    return {
-        directory: '/downloads',
-        fileName: 'movie.mp4',
-        id: 42,
-        url: 'https://example.test/movie.mp4',
-    };
-}
-
-async function waitForCallCount(
-    mock: jest.Mock,
-    expectedCallCount: number
-): Promise<void> {
-    for (let attempt = 0; attempt < 20; attempt++) {
-        if (mock.mock.calls.length === expectedCallCount) {
-            return;
-        }
-        await new Promise<void>((resolve) => setImmediate(resolve));
-    }
-
-    expect(mock).toHaveBeenCalledTimes(expectedCallCount);
-}
-
-describe('download runtime cancellation', () => {
-    it('cancels the item when an earlier cancellation request reaches onStarted', () => {
-        const task = createTask();
-        const cancel = jest.fn();
-
-        requestDownloadCancellation(task);
-        attachDownloadItem(task, { cancel } as unknown as DownloadItem);
-
-        expect(task.cancelRequested).toBe(true);
-        expect(cancel).toHaveBeenCalledTimes(1);
-    });
-
-    it('cancels an already-started item immediately', () => {
-        const cancel = jest.fn();
+describe('download task interruption', () => {
+    it('aborts an active task when cancellation is requested', () => {
+        const abort = jest.fn();
         const task = {
             ...createTask(),
-            downloadItem: { cancel } as unknown as DownloadItem,
+            abortController: { abort } as unknown as AbortController,
         };
 
         requestDownloadCancellation(task);
 
         expect(task.cancelRequested).toBe(true);
-        expect(cancel).toHaveBeenCalledTimes(1);
+        expect(abort).toHaveBeenCalledTimes(1);
     });
 
-    it('continues the queue when cancellation persistence fails', async () => {
-        jest.resetModules();
-
-        class TestCancelError extends Error {}
-
-        let cancellationCallback: Promise<void> | undefined;
-        const download = jest
-            .fn()
-            .mockImplementationOnce(
-                async (
-                    _window: unknown,
-                    _url: string,
-                    options: {
-                        onCancel: (item: DownloadItem) => Promise<void>;
-                    }
-                ) => {
-                    cancellationCallback = options.onCancel({
-                        getSavePath: () => '/downloads/movie.mp4',
-                    } as unknown as DownloadItem);
-                    throw new TestCancelError();
-                }
-            )
-            .mockImplementationOnce(
-                async (
-                    _window: unknown,
-                    _url: string,
-                    options: {
-                        onCompleted: (file: {
-                            fileSize: number;
-                            filename: string;
-                            path: string;
-                        }) => Promise<void>;
-                    }
-                ) => {
-                    await options.onCompleted({
-                        fileSize: 1,
-                        filename: 'second.mp4',
-                        path: '/downloads/second.mp4',
-                    });
-                }
-            );
-
-        const where = jest
-            .fn()
-            .mockResolvedValueOnce(undefined)
-            .mockResolvedValueOnce(undefined)
-            .mockRejectedValueOnce(new Error('database is busy'))
-            .mockResolvedValue(undefined);
-        const db = {
-            update: jest.fn(() => ({
-                set: jest.fn(() => ({ where })),
-            })),
+    it('aborts an active task when pause is requested', () => {
+        const abort = jest.fn();
+        const task = {
+            ...createTask(),
+            abortController: { abort } as unknown as AbortController,
         };
 
-        jest.doMock('electron-dl', () => ({
-            CancelError: TestCancelError,
-            download,
-        }));
+        requestDownloadPause(task);
+
+        expect(task.pauseRequested).toBe(true);
+        expect(abort).toHaveBeenCalledTimes(1);
+    });
+});
+
+describe('download runtime pause and resume', () => {
+    it('persists active pause without deleting the partial file', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn();
+        const stream = new PassThrough();
+        const requestWithValidatedRedirects = jest.fn(
+            async (
+                _url: string,
+                options: { signal?: AbortSignal }
+            ) => {
+                options.signal?.addEventListener('abort', () => {
+                    stream.destroy(new Error('aborted'));
+                });
+                return {
+                    data: stream,
+                    headers: { 'content-length': '100' },
+                    status: 200,
+                };
+            }
+        );
+
         jest.doMock('../../database/connection', () => ({
             getDatabase: jest.fn().mockResolvedValue(db),
         }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
         jest.doMock('./download-file-path', () => ({
-            removePartialDownload: jest.fn(),
-            reserveAvailableDownloadFile: jest.fn(
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest
+                .fn()
+                .mockReturnValueOnce(0)
+                .mockReturnValue(25),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(
                 (directory: string, filename: string) => ({
                     filename,
+                    partialPath: `${directory}/${filename}.part`,
                     path: `${directory}/${filename}`,
                 })
             ),
@@ -127,96 +94,134 @@ describe('download runtime cancellation', () => {
         const consoleError = jest
             .spyOn(console, 'error')
             .mockImplementation(() => undefined);
+        try {
+            const runtime = await import('./download-runtime');
+            runtime.setMainWindow({
+                isDestroyed: () => false,
+                webContents: { send: jest.fn() },
+            } as never);
+
+            runtime.enqueueDownload(createTask());
+            await waitForCallCount(requestWithValidatedRedirects, 1);
+
+            await expect(runtime.pauseDownload(42)).resolves.toBe(true);
+            await waitForStatus(set, 'paused');
+
+            expect(removePartialDownloadFile).not.toHaveBeenCalled();
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 25,
+                    status: 'paused',
+                })
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('uses an HTTP Range header when a partial file already exists', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            update: jest.fn(() => ({ set })),
+        };
+        const requestWithValidatedRedirects = jest.fn(
+            async () =>
+                ({
+                    data: Readable.from([Buffer.from('rest')]),
+                    headers: { 'content-range': 'bytes 50-53/54' },
+                    status: 206,
+                }) as never
+        );
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
+        jest.doMock('node:fs/promises', () => ({
+            copyFile: jest.fn(async () => undefined),
+            link: jest.fn(async () => undefined),
+            stat: jest.fn(async () => ({ size: 54 })),
+            unlink: jest.fn(async () => undefined),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 50),
+            removePartialDownloadFile: jest.fn(),
+            reserveAvailablePartialDownloadFile: jest.fn(),
+        }));
+
         const runtime = await import('./download-runtime');
         runtime.setMainWindow({
             isDestroyed: () => false,
             webContents: { send: jest.fn() },
         } as never);
 
-        runtime.enqueueDownload(createTask());
         runtime.enqueueDownload({
             ...createTask(),
-            fileName: 'second.mp4',
-            id: 43,
+            filePath: '/downloads/movie.mp4',
         });
+        await waitForCallCount(requestWithValidatedRedirects, 1);
 
-        await waitForCallCount(download, 2);
-        await expect(cancellationCallback).resolves.toBeUndefined();
-
-        consoleError.mockRestore();
+        expect(requestWithValidatedRedirects).toHaveBeenCalledWith(
+            'https://example.test/movie.mp4',
+            expect.objectContaining({
+                headers: expect.objectContaining({ Range: 'bytes=50-' }),
+            }),
+            { allowPrivateNetworks: true }
+        );
+        await waitForStatus(set, 'completed');
     });
 
-    it('continues the queue when completion persistence fails', async () => {
+    it('deletes a queued resumed partial file when the queued task is canceled', async () => {
         jest.resetModules();
 
-        class TestCancelError extends Error {}
-
-        let completionCallback: Promise<void> | undefined;
-        const download = jest
-            .fn()
-            .mockImplementationOnce(
-                async (
-                    _window: unknown,
-                    _url: string,
-                    options: {
-                        onCompleted: (file: {
-                            fileSize: number;
-                            filename: string;
-                            path: string;
-                        }) => Promise<void>;
-                    }
-                ) => {
-                    completionCallback = options.onCompleted({
-                        fileSize: 1,
-                        filename: 'movie.mp4',
-                        path: '/downloads/movie.mp4',
-                    });
-                }
-            )
-            .mockImplementationOnce(
-                async (
-                    _window: unknown,
-                    _url: string,
-                    options: {
-                        onCompleted: (file: {
-                            fileSize: number;
-                            filename: string;
-                            path: string;
-                        }) => Promise<void>;
-                    }
-                ) => {
-                    await options.onCompleted({
-                        fileSize: 1,
-                        filename: 'second.mp4',
-                        path: '/downloads/second.mp4',
-                    });
-                }
-            );
-
-        const where = jest
-            .fn()
-            .mockResolvedValueOnce(undefined)
-            .mockResolvedValueOnce(undefined)
-            .mockRejectedValueOnce(new Error('database is busy'))
-            .mockResolvedValue(undefined);
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
         const db = {
-            update: jest.fn(() => ({
-                set: jest.fn(() => ({ where })),
-            })),
+            update: jest.fn(() => ({ set })),
         };
+        const removePartialDownloadFile = jest.fn();
+        const activeStream = new PassThrough();
+        const requestWithValidatedRedirects = jest.fn(
+            async (_url: string, options: { signal?: AbortSignal }) => {
+                options.signal?.addEventListener('abort', () => {
+                    activeStream.destroy(new Error('aborted'));
+                });
+                return {
+                    data: activeStream,
+                    headers: { 'content-length': '100' },
+                    status: 200,
+                };
+            }
+        );
 
-        jest.doMock('electron-dl', () => ({
-            CancelError: TestCancelError,
-            download,
-        }));
         jest.doMock('../../database/connection', () => ({
             getDatabase: jest.fn().mockResolvedValue(db),
         }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects,
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
+        }));
         jest.doMock('./download-file-path', () => ({
-            removePartialDownload: jest.fn(),
-            reserveAvailableDownloadFile: jest.fn(
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(
                 (directory: string, filename: string) => ({
                     filename,
+                    partialPath: `${directory}/${filename}.part`,
                     path: `${directory}/${filename}`,
                 })
             ),
@@ -233,64 +238,66 @@ describe('download runtime cancellation', () => {
             } as never);
 
             runtime.enqueueDownload(createTask());
+            await waitForCallCount(requestWithValidatedRedirects, 1);
+
             runtime.enqueueDownload({
                 ...createTask(),
-                fileName: 'second.mp4',
+                fileName: 'resume.mp4',
+                filePath: '/downloads/resume.mp4',
                 id: 43,
             });
 
-            await waitForCallCount(download, 2);
-            await expect(completionCallback).resolves.toBeUndefined();
+            await expect(runtime.cancelDownload(43)).resolves.toBe(true);
+
+            expect(removePartialDownloadFile).toHaveBeenCalledWith(
+                '/downloads/resume.mp4'
+            );
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    bytesDownloaded: 0,
+                    filePath: null,
+                    status: 'canceled',
+                    totalBytes: null,
+                })
+            );
+
+            await runtime.cancelDownload(42);
+            await waitForStatusCount(set, 'canceled', 2);
         } finally {
             consoleError.mockRestore();
         }
     });
 
-    it('continues the queue when initial database access fails', async () => {
+    it('retains the partial path when canceling a queued task whose partial cannot be deleted', async () => {
         jest.resetModules();
 
-        class TestCancelError extends Error {}
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = { update: jest.fn(() => ({ set })) };
+        const removePartialDownloadFile = jest.fn(() => {
+            throw new Error('EPERM: locked');
+        });
 
-        const download = jest.fn(
-            async (
-                _window: unknown,
-                _url: string,
-                options: {
-                    onCompleted: (file: {
-                        fileSize: number;
-                        filename: string;
-                        path: string;
-                    }) => Promise<void>;
-                }
-            ) => {
-                await options.onCompleted({
-                    fileSize: 1,
-                    filename: 'second.mp4',
-                    path: '/downloads/second.mp4',
-                });
-            }
-        );
-        const where = jest.fn().mockResolvedValue(undefined);
-        const db = {
-            update: jest.fn(() => ({
-                set: jest.fn(() => ({ where })),
-            })),
-        };
-        const getDatabase = jest
-            .fn()
-            .mockRejectedValueOnce(new Error('database unavailable'))
-            .mockResolvedValue(db);
-
-        jest.doMock('electron-dl', () => ({
-            CancelError: TestCancelError,
-            download,
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('../../util/validated-axios', () => ({
+            requestWithValidatedRedirects: jest.fn(
+                () => new Promise(() => undefined)
+            ),
+        }));
+        jest.doMock('node:fs', () => ({
+            ...jest.requireActual('node:fs'),
+            createWriteStream: jest.fn(() => new PassThrough()),
+            existsSync: jest.fn(() => false),
         }));
-        jest.doMock('../../database/connection', () => ({ getDatabase }));
         jest.doMock('./download-file-path', () => ({
-            removePartialDownload: jest.fn(),
-            reserveAvailableDownloadFile: jest.fn(
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(
                 (directory: string, filename: string) => ({
                     filename,
+                    partialPath: `${directory}/${filename}.part`,
                     path: `${directory}/${filename}`,
                 })
             ),
@@ -306,18 +313,81 @@ describe('download runtime cancellation', () => {
                 webContents: { send: jest.fn() },
             } as never);
 
+            // Occupy the active slot so the second task stays queued.
             runtime.enqueueDownload(createTask());
             runtime.enqueueDownload({
                 ...createTask(),
-                fileName: 'second.mp4',
+                fileName: 'resume.mp4',
+                filePath: '/downloads/resume.mp4',
                 id: 43,
             });
 
-            await waitForCallCount(download, 1);
-            expect(download).toHaveBeenCalledWith(
-                expect.anything(),
-                'https://example.test/movie.mp4',
-                expect.objectContaining({ filename: 'second.mp4' })
+            await expect(runtime.cancelDownload(43)).resolves.toBe(true);
+
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    filePath: '/downloads/resume.mp4',
+                    status: 'canceled',
+                })
+            );
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
+    it('retains the partial path when canceling a paused row whose partial cannot be deleted', async () => {
+        jest.resetModules();
+
+        const set = jest.fn(() => ({ where: jest.fn().mockResolvedValue(undefined) }));
+        const db = {
+            select: jest.fn(() => ({
+                from: jest.fn(() => ({
+                    where: jest.fn(() => ({
+                        limit: jest.fn().mockResolvedValue([
+                            {
+                                filePath: '/downloads/paused.mp4',
+                                status: 'paused',
+                            },
+                        ]),
+                    })),
+                })),
+            })),
+            update: jest.fn(() => ({ set })),
+        };
+        const removePartialDownloadFile = jest.fn(() => {
+            throw new Error('EPERM: locked');
+        });
+
+        jest.doMock('../../database/connection', () => ({
+            getDatabase: jest.fn().mockResolvedValue(db),
+        }));
+        jest.doMock('./download-file-path', () => ({
+            getPartialDownloadPath: (filePath: string) => `${filePath}.part`,
+            getPartialDownloadSize: jest.fn(() => 0),
+            removePartialDownloadFile,
+            reserveAvailablePartialDownloadFile: jest.fn(),
+        }));
+
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        try {
+            const runtime = await import('./download-runtime');
+            runtime.setMainWindow({
+                isDestroyed: () => false,
+                webContents: { send: jest.fn() },
+            } as never);
+
+            await expect(runtime.cancelDownload(77)).resolves.toBe(true);
+
+            expect(removePartialDownloadFile).toHaveBeenCalledWith(
+                '/downloads/paused.mp4'
+            );
+            expect(set).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    filePath: '/downloads/paused.mp4',
+                    status: 'canceled',
+                })
             );
         } finally {
             consoleError.mockRestore();
diff --git a/apps/electron-backend/src/app/events/database/download-runtime.ts b/apps/electron-backend/src/app/events/database/download-runtime.ts
index c5837524c..4e670a310 100644
--- a/apps/electron-backend/src/app/events/database/download-runtime.ts
+++ b/apps/electron-backend/src/app/events/database/download-runtime.ts
@@ -1,41 +1,56 @@
 import { eq, sql } from 'drizzle-orm';
-import type { BrowserWindow } from 'electron';
-import { CancelError, download } from 'electron-dl';
+import { existsSync } from 'node:fs';
+import { rename } from 'node:fs/promises';
 import { getDatabase } from '../../database/connection';
 import * as schema from '../../database/schema';
+import { broadcastDownloadUpdate } from './download-broadcast';
 import {
-    removePartialDownload,
-    reserveAvailableDownloadFile,
+    findAvailableFinalPath,
+    getPartialDownloadPath,
+    reserveAvailablePartialDownloadFile,
+    type ReservedPartialDownloadFile,
 } from './download-file-path';
 import {
-    attachDownloadItem,
+    completeDownloadFromPartial,
+    getCompletedPartialProgress,
+    getPausedByteCount,
+    handleDownloadFailure,
+    removePartialFile,
+} from './download-finalize';
+import {
     requestDownloadCancellation,
+    requestDownloadPause,
+    type DownloadsDatabase,
     type DownloadTask,
 } from './download-task';
+import { describeError, transferToPartialFile } from './download-transfer';
+
+export {
+    broadcastDownloadUpdate,
+    setMainWindow,
+} from './download-broadcast';
 
 const downloadQueue: DownloadTask[] = [];
 let activeDownload: DownloadTask | null = null;
-let mainWindow: BrowserWindow | null = null;
-
-export function setMainWindow(win: BrowserWindow): void {
-    mainWindow = win;
-}
-
-export function broadcastDownloadUpdate(): void {
-    if (mainWindow && !mainWindow.isDestroyed()) {
-        mainWindow.webContents.send('DOWNLOADS_UPDATE_EVENT');
-    }
-}
 
 export function enqueueDownload(task: DownloadTask): void {
+    // A duplicate id (e.g. two rapid Resume clicks racing the status
+    // refresh) must not produce two transfers for the same row.
+    if (
+        activeDownload?.id === task.id ||
+        downloadQueue.some((queued) => queued.id === task.id)
+    ) {
+        return;
+    }
+
     downloadQueue.push(task);
     broadcastDownloadUpdate();
     void processQueue();
 }
 
-export async function cancelDownload(downloadId: number): Promise<boolean> {
+export async function pauseDownload(downloadId: number): Promise<boolean> {
     if (activeDownload?.id === downloadId) {
-        requestDownloadCancellation(activeDownload);
+        requestDownloadPause(activeDownload);
         return true;
     }
 
@@ -52,8 +67,7 @@ export async function cancelDownload(downloadId: number): Promise<boolean> {
         .update(schema.downloads)
         .set({
             errorMessage: null,
-            filePath: null,
-            status: 'canceled',
+            status: 'paused',
             updatedAt: sql`CURRENT_TIMESTAMP`,
         })
         .where(eq(schema.downloads.id, downloadId));
@@ -61,6 +75,52 @@ export async function cancelDownload(downloadId: number): Promise<boolean> {
     return true;
 }
 
+export async function cancelDownload(downloadId: number): Promise<boolean> {
+    if (activeDownload?.id === downloadId) {
+        requestDownloadCancellation(activeDownload);
+        return true;
+    }
+
+    const queueIndex = downloadQueue.findIndex(
+        (task) => task.id === downloadId
+    );
+    if (queueIndex !== -1) {
+        const [queuedTask] = downloadQueue.splice(queueIndex, 1);
+        const removed = removePartialFile(queuedTask?.filePath);
+        const db = await getDatabase();
+        await persistQueuedCancellation(
+            db,
+            downloadId,
+            removed ? null : (queuedTask?.filePath ?? null)
+        );
+        broadcastDownloadUpdate();
+        return true;
+    }
+
+    const db = await getDatabase();
+    const rows = await db
+        .select({
+            filePath: schema.downloads.filePath,
+            status: schema.downloads.status,
+        })
+        .from(schema.downloads)
+        .where(eq(schema.downloads.id, downloadId))
+        .limit(1);
+    const item = rows[0];
+    if (item?.status !== 'paused') {
+        return false;
+    }
+
+    const removed = removePartialFile(item.filePath);
+    await persistQueuedCancellation(
+        db,
+        downloadId,
+        removed ? null : item.filePath
+    );
+    broadcastDownloadUpdate();
+    return true;
+}
+
 export function removeDownloadFromRuntime(downloadId: number): void {
     if (activeDownload?.id === downloadId) {
         requestDownloadCancellation(activeDownload);
@@ -90,7 +150,7 @@ async function processQueue(): Promise<void> {
     } catch (error) {
         console.error(
             `[Downloads] Unhandled error for ${task.fileName}:`,
-            error
+            describeError(error)
         );
         finishTask(task);
     }
@@ -104,39 +164,25 @@ function finishTask(task: DownloadTask): void {
     void processQueue();
 }
 
-function createCancellationHandler(
-    task: DownloadTask,
-    db: Awaited<ReturnType<typeof getDatabase>>,
-    reservation: ReturnType<typeof reserveAvailableDownloadFile>
-): (item: Parameters<typeof removePartialDownload>[0]) => Promise<void> {
-    let cancellationPromise: Promise<void> | undefined;
-
-    return (item) => {
-        cancellationPromise ??= (async () => {
-            console.log(`[Downloads] Canceled: ${reservation.filename}`);
-            removePartialFile(item);
-            try {
-                await db
-                    .update(schema.downloads)
-                    .set({
-                        errorMessage: null,
-                        filePath: null,
-                        status: 'canceled',
-                        updatedAt: sql`CURRENT_TIMESTAMP`,
-                    })
-                    .where(eq(schema.downloads.id, task.id));
-            } catch (error) {
-                console.error(
-                    '[Downloads] Failed to persist cancellation:',
-                    error
-                );
-            } finally {
-                finishTask(task);
-            }
-        })();
-
-        return cancellationPromise;
-    };
+async function persistQueuedCancellation(
+    db: DownloadsDatabase,
+    downloadId: number,
+    // Keep the path when the retained .part could not be deleted, so a later
+    // remove/clear can retry the cleanup instead of orphaning the file.
+    retainedFilePath: string | null = null
+): Promise<void> {
+    await db
+        .update(schema.downloads)
+        .set({
+            bytesDownloaded: 0,
+            errorMessage: null,
+            filePath: retainedFilePath,
+            resumeValidator: null,
+            status: 'canceled',
+            totalBytes: null,
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, downloadId));
 }
 
 async function startDownload(task: DownloadTask): Promise<void> {
@@ -145,40 +191,26 @@ async function startDownload(task: DownloadTask): Promise<void> {
         .update(schema.downloads)
         .set({
             errorMessage: null,
-            filePath: null,
             status: 'downloading',
             updatedAt: sql`CURRENT_TIMESTAMP`,
         })
         .where(eq(schema.downloads.id, task.id));
     broadcastDownloadUpdate();
 
-    if (!mainWindow || mainWindow.isDestroyed()) {
-        console.error('[Downloads] No main window available');
-        await db
-            .update(schema.downloads)
-            .set({
-                errorMessage: 'No window available for download',
-                status: 'failed',
-                updatedAt: sql`CURRENT_TIMESTAMP`,
-            })
-            .where(eq(schema.downloads.id, task.id));
-        finishTask(task);
-        return;
-    }
-
-    let lastProgressUpdate = 0;
-    const progressThrottleMs = 500;
-    let handleCancellation:
-        | ReturnType<typeof createCancellationHandler>
-        | undefined;
-
+    let reservation: ReservedPartialDownloadFile | undefined;
     try {
-        const reservation = reserveAvailableDownloadFile(
-            task.directory,
-            task.fileName
-        );
-        task.reservedPath = reservation.path;
-        handleCancellation = createCancellationHandler(task, db, reservation);
+        if (task.cancelRequested) {
+            await persistCancellation(db, task);
+            return;
+        }
+        if (task.pauseRequested) {
+            await persistPause(db, task);
+            return;
+        }
+
+        reservation = await reserveTarget(task);
+        task.fileName = reservation.filename;
+        task.filePath = reservation.path;
         await db
             .update(schema.downloads)
             .set({
@@ -189,107 +221,131 @@ async function startDownload(task: DownloadTask): Promise<void> {
             })
             .where(eq(schema.downloads.id, task.id));
 
-        const downloadOptions: Parameters<typeof download>[2] = {
-            directory: task.directory,
-            filename: reservation.filename,
-            onStarted: (item) => {
-                console.log(`[Downloads] Started: ${reservation.filename}`);
-                attachDownloadItem(task, item);
-            },
-            onProgress: async (progress) => {
-                const now = Date.now();
-                if (now - lastProgressUpdate < progressThrottleMs) {
-                    return;
-                }
-                lastProgressUpdate = now;
-                await db
-                    .update(schema.downloads)
-                    .set({
-                        bytesDownloaded: progress.transferredBytes,
-                        totalBytes: progress.totalBytes,
-                        updatedAt: sql`CURRENT_TIMESTAMP`,
-                    })
-                    .where(eq(schema.downloads.id, task.id));
-                broadcastDownloadUpdate();
-            },
-            onCompleted: async (file) => {
-                console.log(`[Downloads] Completed: ${file.filename}`);
-                try {
-                    await db
-                        .update(schema.downloads)
-                        .set({
-                            bytesDownloaded: file.fileSize,
-                            errorMessage: null,
-                            fileName: file.filename,
-                            filePath: file.path,
-                            status: 'completed',
-                            totalBytes: file.fileSize,
-                            updatedAt: sql`CURRENT_TIMESTAMP`,
-                        })
-                        .where(eq(schema.downloads.id, task.id));
-                } catch (error) {
-                    console.error(
-                        '[Downloads] Failed to persist completion:',
-                        error
-                    );
-                } finally {
-                    finishTask(task);
-                }
-            },
-            onCancel: handleCancellation,
-        };
-
-        if (task.headers) {
-            (
-                downloadOptions as typeof downloadOptions & {
-                    headers: Record<string, string>;
-                }
-            ).headers = task.headers;
+        if (task.cancelRequested) {
+            await persistCancellation(db, task);
+            return;
         }
-
-        await download(mainWindow, task.url, downloadOptions);
-    } catch (error) {
-        if (error instanceof CancelError) {
-            const reservedPath = task.reservedPath;
-            if (handleCancellation) {
-                await handleCancellation(
-                    task.downloadItem ??
-                        (reservedPath
-                            ? { getSavePath: () => reservedPath }
-                            : undefined)
-                );
-            } else {
-                finishTask(task);
-            }
+        if (task.pauseRequested) {
+            await persistPause(db, task);
             return;
         }
 
-        console.error(`[Downloads] Error downloading ${task.fileName}:`, error);
-        const reservedPath = task.reservedPath;
-        removePartialFile(
-            task.downloadItem ??
-                (reservedPath ? { getSavePath: () => reservedPath } : undefined)
-        );
-        await db
-            .update(schema.downloads)
-            .set({
-                errorMessage:
-                    error instanceof Error ? error.message : String(error),
-                filePath: null,
-                status: 'failed',
-                updatedAt: sql`CURRENT_TIMESTAMP`,
-            })
-            .where(eq(schema.downloads.id, task.id));
+        const completedPartialProgress = getCompletedPartialProgress(task);
+        if (completedPartialProgress) {
+            await completeDownloadFromPartial(
+                db,
+                task,
+                reservation,
+                completedPartialProgress
+            );
+            return;
+        }
+
+        const progress = await transferToPartialFile(db, task, reservation);
+        if (task.cancelRequested) {
+            await persistCancellation(db, task);
+            return;
+        }
+        if (task.pauseRequested) {
+            await persistPause(db, task);
+            return;
+        }
+
+        await completeDownloadFromPartial(db, task, reservation, progress);
+    } catch (error) {
+        if (task.cancelRequested) {
+            await persistCancellation(db, task);
+            return;
+        }
+        if (task.pauseRequested) {
+            await persistPause(db, task);
+            return;
+        }
+
+        await handleDownloadFailure(db, task, reservation, error);
+    } finally {
+        task.abortController = undefined;
         finishTask(task);
     }
 }
 
-function removePartialFile(
-    item: Parameters<typeof removePartialDownload>[0]
-): void {
+async function reserveTarget(
+    task: DownloadTask
+): Promise<ReservedPartialDownloadFile> {
+    if (task.filePath) {
+        if (!existsSync(task.filePath)) {
+            return {
+                filename: task.fileName,
+                partialPath: getPartialDownloadPath(task.filePath),
+                path: task.filePath,
+            };
+        }
+
+        // Something now occupies the recorded destination — possibly a file
+        // the user created while this download was paused or failed. Never
+        // inspect or delete it: move the retained .part to the next free
+        // numbered destination and finalize there instead.
+        const redirected = findAvailableFinalPath(task.filePath);
+        const currentPartial = getPartialDownloadPath(task.filePath);
+        const redirectedPartial = getPartialDownloadPath(redirected.path);
+        if (existsSync(currentPartial)) {
+            await rename(currentPartial, redirectedPartial);
+        }
+
+        return {
+            filename: redirected.filename,
+            partialPath: redirectedPartial,
+            path: redirected.path,
+        };
+    }
+
+    return reserveAvailablePartialDownloadFile(task.directory, task.fileName);
+}
+
+async function persistCancellation(
+    db: DownloadsDatabase,
+    task: DownloadTask
+): Promise<void> {
+    console.log(`[Downloads] Canceled: ${task.fileName}`);
+    const removed = removePartialFile(task.filePath);
     try {
-        removePartialDownload(item);
+        await db
+            .update(schema.downloads)
+            .set({
+                bytesDownloaded: 0,
+                errorMessage: null,
+                filePath: removed ? null : (task.filePath ?? null),
+                resumeValidator: null,
+                status: 'canceled',
+                totalBytes: null,
+                updatedAt: sql`CURRENT_TIMESTAMP`,
+            })
+            .where(eq(schema.downloads.id, task.id));
     } catch (error) {
-        console.error('[Downloads] Failed to delete partial file:', error);
+        console.error('[Downloads] Failed to persist cancellation:', error);
+    }
+}
+
+async function persistPause(
+    db: DownloadsDatabase,
+    task: DownloadTask
+): Promise<void> {
+    console.log(`[Downloads] Paused: ${task.fileName}`);
+    const bytesDownloaded = getPausedByteCount(task);
+    try {
+        await db
+            .update(schema.downloads)
+            .set({
+                bytesDownloaded,
+                errorMessage: null,
+                fileName: task.fileName,
+                filePath: task.filePath ?? null,
+                status: 'paused',
+                totalBytes: task.totalBytes ?? null,
+                updatedAt: sql`CURRENT_TIMESTAMP`,
+            })
+            .where(eq(schema.downloads.id, task.id));
+    } catch (error) {
+        console.error('[Downloads] Failed to persist pause:', error);
     }
 }
diff --git a/apps/electron-backend/src/app/events/database/download-task.ts b/apps/electron-backend/src/app/events/database/download-task.ts
index 93c0f890e..ec6bdea98 100644
--- a/apps/electron-backend/src/app/events/database/download-task.ts
+++ b/apps/electron-backend/src/app/events/database/download-task.ts
@@ -1,4 +1,15 @@
-import type { DownloadItem } from 'electron';
+import type { getDatabase } from '../../database/connection';
+
+export type DownloadsDatabase = Awaited<ReturnType<typeof getDatabase>>;
+
+export interface TransferProgress {
+    bytesDownloaded: number;
+    totalBytes: number | null;
+}
+
+export interface CompletedPartialProgress extends TransferProgress {
+    filePath: string;
+}
 
 export interface DownloadTask {
     id: number;
@@ -7,21 +18,20 @@ export interface DownloadTask {
     directory: string;
     headers?: Record<string, string>;
     cancelRequested?: boolean;
-    downloadItem?: DownloadItem;
-    reservedPath?: string;
-}
-
-export function attachDownloadItem(
-    task: DownloadTask,
-    item: DownloadItem
-): void {
-    task.downloadItem = item;
-    if (task.cancelRequested) {
-        item.cancel();
-    }
+    pauseRequested?: boolean;
+    abortController?: AbortController;
+    filePath?: string | null;
+    totalBytes?: number | null;
+    /** ETag/Last-Modified of the entity the partial belongs to (If-Range). */
+    resumeValidator?: string | null;
 }
 
 export function requestDownloadCancellation(task: DownloadTask): void {
     task.cancelRequested = true;
-    task.downloadItem?.cancel();
+    task.abortController?.abort();
+}
+
+export function requestDownloadPause(task: DownloadTask): void {
+    task.pauseRequested = true;
+    task.abortController?.abort();
 }
diff --git a/apps/electron-backend/src/app/events/database/download-transfer.ts b/apps/electron-backend/src/app/events/database/download-transfer.ts
new file mode 100644
index 000000000..cb8df4a81
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download-transfer.ts
@@ -0,0 +1,262 @@
+import { eq, sql } from 'drizzle-orm';
+import { createWriteStream } from 'node:fs';
+import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import * as schema from '../../database/schema';
+import { requestWithValidatedRedirects } from '../../util/validated-axios';
+import { broadcastDownloadUpdate } from './download-broadcast';
+import {
+    getPartialDownloadSize,
+    type ReservedPartialDownloadFile,
+} from './download-file-path';
+import type {
+    DownloadsDatabase,
+    DownloadTask,
+    TransferProgress,
+} from './download-task';
+
+/**
+ * Log transfer failures by message only: a raw AxiosError dumps its request
+ * config, and download URLs can embed portal credentials.
+ */
+export function describeError(error: unknown): string {
+    return error instanceof Error ? error.message : String(error);
+}
+
+/**
+ * The response stream ended cleanly before the advertised representation
+ * size was reached (e.g. a proxy that caps each response). The partial is
+ * valid — the caller must retain it so a retry can continue via Range.
+ */
+export class TruncatedTransferError extends Error {
+    constructor(readonly progress: TransferProgress) {
+        super('Transfer ended before the advertised size');
+    }
+}
+
+export async function transferToPartialFile(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    reservation: ReservedPartialDownloadFile
+): Promise<TransferProgress> {
+    const resumeOffset = getResumeOffset(task, reservation);
+
+    const headers = {
+        ...(task.headers ?? {}),
+    };
+    if (resumeOffset > 0) {
+        headers.Range = `bytes=${resumeOffset}-`;
+        if (task.resumeValidator) {
+            headers['If-Range'] = task.resumeValidator;
+        }
+    }
+
+    const abortController = new AbortController();
+    task.abortController = abortController;
+    if (task.cancelRequested || task.pauseRequested) {
+        abortController.abort();
+    }
+
+    console.log(`[Downloads] Started: ${reservation.filename}`);
+    const response = await requestWithValidatedRedirects<Readable>(
+        task.url,
+        {
+            headers,
+            method: 'GET',
+            responseType: 'stream',
+            signal: abortController.signal,
+            validateStatus: (status) => status >= 200 && status < 300,
+        },
+        { allowPrivateNetworks: true }
+    );
+
+    const readable = response.data;
+    let effectiveOffset = resumeOffset;
+    try {
+        effectiveOffset = validateResumeResponse(
+            reservation,
+            response.status,
+            response.headers,
+            resumeOffset
+        );
+    } catch (error) {
+        // Abandon the unconsumed response body; swallow its error events so
+        // destroying a stream nobody is piping cannot crash the process.
+        readable.on('error', () => undefined);
+        readable.destroy();
+        throw error;
+    }
+
+    const totalBytes = getTotalBytes(response.headers, effectiveOffset);
+    task.totalBytes = totalBytes;
+    if (effectiveOffset === 0) {
+        task.resumeValidator = getResponseValidator(response.headers);
+    }
+    await persistTransferStart(db, task, effectiveOffset, totalBytes);
+
+    let bytesDownloaded = effectiveOffset;
+    let lastProgressUpdate = 0;
+    const progressThrottleMs = 500;
+    const output = createWriteStream(reservation.partialPath, {
+        flags: effectiveOffset > 0 ? 'a' : 'w',
+    });
+    const abortStream = () => {
+        readable.destroy(new Error('Download aborted'));
+    };
+
+    if (abortController.signal.aborted) {
+        abortStream();
+    } else {
+        abortController.signal.addEventListener('abort', abortStream, {
+            once: true,
+        });
+    }
+    readable.on('data', (chunk: Buffer | string) => {
+        bytesDownloaded += Buffer.isBuffer(chunk)
+            ? chunk.length
+            : Buffer.byteLength(chunk);
+        const now = Date.now();
+        if (now - lastProgressUpdate < progressThrottleMs) {
+            return;
+        }
+        lastProgressUpdate = now;
+        void persistProgress(db, task, {
+            bytesDownloaded,
+            totalBytes,
+        }).catch((error) => {
+            console.error('[Downloads] Failed to persist progress:', error);
+        });
+    });
+
+    try {
+        await pipeline(readable, output);
+    } finally {
+        abortController.signal.removeEventListener('abort', abortStream);
+    }
+
+    await persistProgress(db, task, { bytesDownloaded, totalBytes });
+    if (totalBytes !== null && bytesDownloaded < totalBytes) {
+        throw new TruncatedTransferError({ bytesDownloaded, totalBytes });
+    }
+    return { bytesDownloaded, totalBytes };
+}
+
+function getResumeOffset(
+    task: DownloadTask,
+    reservation: ReservedPartialDownloadFile
+): number {
+    const resumeOffset = getPartialDownloadSize(reservation.path);
+    if (
+        task.totalBytes !== null &&
+        task.totalBytes !== undefined &&
+        resumeOffset > task.totalBytes
+    ) {
+        throw new Error('Partial download is larger than expected');
+    }
+    return resumeOffset;
+}
+
+function validateResumeResponse(
+    reservation: ReservedPartialDownloadFile,
+    status: number,
+    headers: unknown,
+    resumeOffset: number
+): number {
+    if (resumeOffset === 0) {
+        return 0;
+    }
+
+    if (status !== 206) {
+        // Either the server ignored Range or If-Range detected that the
+        // remote entity changed. The retained partial is unusable either way,
+        // so restart from byte zero instead of failing the download.
+        console.warn(
+            `[Downloads] Restarting ${reservation.filename} from the beginning (resume request answered with HTTP ${status})`
+        );
+        return 0;
+    }
+
+    const contentRange = getHeaderValue(
+        headers as Record<string, unknown>,
+        'content-range'
+    );
+    const start = contentRange?.match(/^bytes\s+(\d+)-/i)?.[1];
+    if (start === undefined || Number(start) !== resumeOffset) {
+        throw new Error('Server returned an invalid resume range');
+    }
+    return resumeOffset;
+}
+
+function getResponseValidator(headers: unknown): string | null {
+    const headerMap = headers as Record<string, unknown>;
+    const etag = getHeaderValue(headerMap, 'etag');
+    // If-Range only accepts strong validators, so skip weak W/ ETags.
+    if (etag && !etag.startsWith('W/')) {
+        return etag;
+    }
+    return getHeaderValue(headerMap, 'last-modified') ?? null;
+}
+
+async function persistTransferStart(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    bytesDownloaded: number,
+    totalBytes: number | null
+): Promise<void> {
+    await db
+        .update(schema.downloads)
+        .set({
+            bytesDownloaded,
+            resumeValidator: task.resumeValidator ?? null,
+            totalBytes,
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, task.id));
+    broadcastDownloadUpdate();
+}
+
+async function persistProgress(
+    db: DownloadsDatabase,
+    task: DownloadTask,
+    progress: TransferProgress
+): Promise<void> {
+    await db
+        .update(schema.downloads)
+        .set({
+            bytesDownloaded: progress.bytesDownloaded,
+            totalBytes: progress.totalBytes,
+            updatedAt: sql`CURRENT_TIMESTAMP`,
+        })
+        .where(eq(schema.downloads.id, task.id));
+    broadcastDownloadUpdate();
+}
+
+function getTotalBytes(headers: unknown, resumeOffset: number): number | null {
+    const headerMap = headers as Record<string, unknown>;
+    const contentRange = getHeaderValue(headerMap, 'content-range');
+    if (contentRange) {
+        const match = contentRange.match(/\/(\d+)$/);
+        if (match) {
+            return Number(match[1]);
+        }
+    }
+
+    const contentLength = getHeaderValue(headerMap, 'content-length');
+    if (!contentLength) {
+        return null;
+    }
+
+    const parsed = Number(contentLength);
+    return Number.isFinite(parsed) ? resumeOffset + parsed : null;
+}
+
+function getHeaderValue(
+    headers: Record<string, unknown>,
+    name: string
+): string | undefined {
+    const value = headers[name] ?? headers[name.toLowerCase()];
+    if (Array.isArray(value)) {
+        return value.length > 0 ? String(value[0]) : undefined;
+    }
+    return value === undefined ? undefined : String(value);
+}
diff --git a/apps/electron-backend/src/app/events/database/download.test-helpers.ts b/apps/electron-backend/src/app/events/database/download.test-helpers.ts
new file mode 100644
index 000000000..7fe5e4442
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/download.test-helpers.ts
@@ -0,0 +1,58 @@
+import type { DownloadTask } from './download-task';
+
+export function createTask(): DownloadTask {
+    return {
+        directory: '/downloads',
+        fileName: 'movie.mp4',
+        id: 42,
+        url: 'https://example.test/movie.mp4',
+    };
+}
+
+export async function waitForCallCount(
+    mock: jest.Mock,
+    expectedCallCount: number
+): Promise<void> {
+    for (let attempt = 0; attempt < 20; attempt++) {
+        if (mock.mock.calls.length === expectedCallCount) {
+            return;
+        }
+        await new Promise<void>((resolve) => setImmediate(resolve));
+    }
+
+    expect(mock).toHaveBeenCalledTimes(expectedCallCount);
+}
+
+export async function waitForStatus(
+    set: jest.Mock,
+    status: string
+): Promise<void> {
+    for (let attempt = 0; attempt < 20; attempt++) {
+        if (set.mock.calls.some(([value]) => value?.status === status)) {
+            return;
+        }
+        await new Promise<void>((resolve) => setImmediate(resolve));
+    }
+
+    expect(set).toHaveBeenCalledWith(expect.objectContaining({ status }));
+}
+
+export async function waitForStatusCount(
+    set: jest.Mock,
+    status: string,
+    expectedCount: number
+): Promise<void> {
+    for (let attempt = 0; attempt < 20; attempt++) {
+        const statusCount = set.mock.calls.filter(
+            ([value]) => value?.status === status
+        ).length;
+        if (statusCount >= expectedCount) {
+            return;
+        }
+        await new Promise<void>((resolve) => setImmediate(resolve));
+    }
+
+    expect(
+        set.mock.calls.filter(([value]) => value?.status === status)
+    ).toHaveLength(expectedCount);
+}
diff --git a/apps/electron-backend/src/app/events/database/downloads-actions.spec.ts b/apps/electron-backend/src/app/events/database/downloads-actions.spec.ts
new file mode 100644
index 000000000..51234846f
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/downloads-actions.spec.ts
@@ -0,0 +1,196 @@
+import {
+    expectManagedPathLookup,
+    getHandler,
+    MANAGED_PATH_STATE,
+    mockExistsSync,
+    mockManagedPath,
+    mockOpenPath,
+    mockPauseDownload,
+    mockResumeDownloadRequest,
+    mockShowItemInFolder,
+    setupDownloadsEventsHarness,
+} from './downloads.test-helpers';
+
+describe('downloads events: pause, resume, and reveal', () => {
+    beforeEach(async () => {
+        await setupDownloadsEventsHarness();
+    });
+
+    it('maps a successful runtime pause to a success response', async () => {
+        mockPauseDownload.mockResolvedValue(true);
+        const consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+
+        try {
+            await expect(
+                getHandler('DOWNLOADS_PAUSE')(null, 42)
+            ).resolves.toEqual({ success: true });
+        } finally {
+            consoleLog.mockRestore();
+        }
+
+        expect(mockPauseDownload).toHaveBeenCalledWith(42);
+    });
+
+    it('maps an unknown pause target to an error response', async () => {
+        mockPauseDownload.mockResolvedValue(false);
+        const consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+
+        try {
+            await expect(
+                getHandler('DOWNLOADS_PAUSE')(null, 42)
+            ).resolves.toEqual({
+                error: 'Download not found in queue',
+                success: false,
+            });
+        } finally {
+            consoleLog.mockRestore();
+        }
+    });
+
+    it('forwards resume requests with the download folder and returns the result', async () => {
+        mockResumeDownloadRequest.mockResolvedValue({
+            error: 'Can only resume paused downloads',
+            success: false,
+        });
+
+        await expect(
+            getHandler('DOWNLOADS_RESUME')(null, 42, '/downloads')
+        ).resolves.toEqual({
+            error: 'Can only resume paused downloads',
+            success: false,
+        });
+
+        expect(mockResumeDownloadRequest).toHaveBeenCalledWith(
+            42,
+            '/downloads',
+            expect.anything()
+        );
+    });
+
+    describe.each([
+        {
+            channel: 'DOWNLOADS_REVEAL_FILE',
+            filePath: '/downloads/reveal-boundary.mp4',
+            operation: 'reveal',
+        },
+        {
+            channel: 'DOWNLOADS_PLAY_FILE',
+            filePath: '/downloads/play-boundary.mp4',
+            operation: 'play',
+        },
+    ])('$operation managed-path boundary', ({ channel, filePath }) => {
+        it('rejects an unmanaged database path before accessing the filesystem', async () => {
+            const lookup = mockManagedPath(MANAGED_PATH_STATE.UNMANAGED);
+            mockExistsSync.mockReturnValue(true);
+
+            await expect(getHandler(channel)(null, filePath)).resolves.toEqual({
+                error: 'File not found',
+                success: false,
+            });
+
+            expectManagedPathLookup(lookup, filePath);
+            expect(mockExistsSync).not.toHaveBeenCalled();
+            expect(mockOpenPath).not.toHaveBeenCalled();
+            expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        });
+
+        it('rejects a managed database path that is missing from disk', async () => {
+            const lookup = mockManagedPath(MANAGED_PATH_STATE.MANAGED);
+            mockExistsSync.mockReturnValue(false);
+
+            await expect(getHandler(channel)(null, filePath)).resolves.toEqual({
+                error: 'File not found',
+                success: false,
+            });
+
+            expectManagedPathLookup(lookup, filePath);
+            expect(mockExistsSync).toHaveBeenCalledTimes(1);
+            expect(mockExistsSync).toHaveBeenCalledWith(filePath);
+            expect(mockOpenPath).not.toHaveBeenCalled();
+            expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        });
+
+        it('fails closed when the managed-path database query rejects', async () => {
+            const lookup = mockManagedPath(MANAGED_PATH_STATE.ERROR);
+            mockExistsSync.mockReturnValue(true);
+            const consoleError = jest
+                .spyOn(console, 'error')
+                .mockImplementation(() => undefined);
+
+            try {
+                await expect(
+                    getHandler(channel)(null, filePath)
+                ).resolves.toEqual({
+                    error: 'File not found',
+                    success: false,
+                });
+                expect(consoleError).toHaveBeenCalledTimes(1);
+                expect(consoleError).toHaveBeenCalledWith(
+                    'Error verifying managed download path:',
+                    expect.objectContaining({
+                        message: 'database unavailable',
+                    })
+                );
+            } finally {
+                consoleError.mockRestore();
+            }
+
+            expectManagedPathLookup(lookup, filePath);
+            expect(mockExistsSync).not.toHaveBeenCalled();
+            expect(mockOpenPath).not.toHaveBeenCalled();
+            expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        });
+    });
+
+    it('reveals a managed file that exists on disk', async () => {
+        const filePath = '/downloads/reveal-success.mp4';
+        const lookup = mockManagedPath(MANAGED_PATH_STATE.MANAGED);
+        mockExistsSync.mockReturnValue(true);
+
+        await expect(
+            getHandler('DOWNLOADS_REVEAL_FILE')(null, filePath)
+        ).resolves.toEqual({ success: true });
+
+        expectManagedPathLookup(lookup, filePath);
+        expect(mockExistsSync).toHaveBeenCalledTimes(1);
+        expect(mockExistsSync).toHaveBeenCalledWith(filePath);
+        expect(mockShowItemInFolder).toHaveBeenCalledTimes(1);
+        expect(mockShowItemInFolder).toHaveBeenCalledWith(filePath);
+        expect(mockOpenPath).not.toHaveBeenCalled();
+    });
+
+    it('waits for the native shell before reporting a managed file as played', async () => {
+        const filePath = '/downloads/play-success.mp4';
+        const lookup = mockManagedPath(MANAGED_PATH_STATE.MANAGED);
+        mockExistsSync.mockReturnValue(true);
+        let resolveOpenPath!: (value: string) => void;
+        const openPathResult = new Promise<string>((resolve) => {
+            resolveOpenPath = resolve;
+        });
+        mockOpenPath.mockReturnValue(openPathResult);
+
+        let responseSettled = false;
+        const response = getHandler('DOWNLOADS_PLAY_FILE')(null, filePath).then(
+            (result) => {
+                responseSettled = true;
+                return result;
+            }
+        );
+        await new Promise<void>((resolve) => setImmediate(resolve));
+
+        expectManagedPathLookup(lookup, filePath);
+        expect(mockExistsSync).toHaveBeenCalledTimes(1);
+        expect(mockExistsSync).toHaveBeenCalledWith(filePath);
+        expect(mockOpenPath).toHaveBeenCalledTimes(1);
+        expect(mockOpenPath).toHaveBeenCalledWith(filePath);
+        expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        expect(responseSettled).toBe(false);
+
+        resolveOpenPath('');
+        await expect(response).resolves.toEqual({ success: true });
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/downloads.events.spec.ts b/apps/electron-backend/src/app/events/database/downloads.events.spec.ts
new file mode 100644
index 000000000..a68e70fdf
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/downloads.events.spec.ts
@@ -0,0 +1,182 @@
+import {
+    createDownloadRow,
+    getHandler,
+    mockBroadcastDownloadUpdate,
+    mockDownloadRow,
+    mockRemoveDownloadFromRuntime,
+    mockRemovePartialDownloadFile,
+    mockTerminalRows,
+    setupDownloadsEventsHarness,
+} from './downloads.test-helpers';
+
+describe('downloads events: partial-file cleanup', () => {
+    beforeEach(async () => {
+        await setupDownloadsEventsHarness();
+    });
+
+    it('removes queued resumed partial files before deleting the row', async () => {
+        const { deleteWhere } = mockDownloadRow(createDownloadRow('queued'));
+
+        await expect(getHandler('DOWNLOADS_REMOVE')(null, 42)).resolves.toEqual(
+            {
+                success: true,
+            }
+        );
+
+        expect(mockRemoveDownloadFromRuntime).toHaveBeenCalledWith(42);
+        expect(mockRemovePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/resume.mp4'
+        );
+        expect(
+            mockRemovePartialDownloadFile.mock.invocationCallOrder[0]
+        ).toBeLessThan(
+            mockRemoveDownloadFromRuntime.mock.invocationCallOrder[0]
+        );
+        expect(
+            mockRemovePartialDownloadFile.mock.invocationCallOrder[0]
+        ).toBeLessThan(deleteWhere.mock.invocationCallOrder[0]);
+        expect(mockBroadcastDownloadUpdate).toHaveBeenCalledTimes(1);
+    });
+
+    it('removes completed partial files before deleting the row', async () => {
+        const { deleteWhere } = mockDownloadRow(createDownloadRow('completed'));
+
+        await expect(getHandler('DOWNLOADS_REMOVE')(null, 42)).resolves.toEqual(
+            {
+                success: true,
+            }
+        );
+
+        expect(mockRemovePartialDownloadFile).toHaveBeenCalledWith(
+            '/downloads/resume.mp4'
+        );
+        expect(
+            mockRemovePartialDownloadFile.mock.invocationCallOrder[0]
+        ).toBeLessThan(deleteWhere.mock.invocationCallOrder[0]);
+    });
+
+    it('keeps the queued runtime entry and row when partial cleanup fails', async () => {
+        const cleanupError = new Error('permission denied');
+        const { deleteWhere } = mockDownloadRow(createDownloadRow('queued'));
+        mockRemovePartialDownloadFile.mockImplementation(() => {
+            throw cleanupError;
+        });
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        const consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+
+        try {
+            // The row and its .part must survive, but the renderer gets a
+            // structured failure it can surface instead of an IPC rejection.
+            await expect(
+                getHandler('DOWNLOADS_REMOVE')(null, 42)
+            ).resolves.toEqual({
+                error: 'Could not delete the partial file',
+                success: false,
+            });
+        } finally {
+            consoleError.mockRestore();
+            consoleLog.mockRestore();
+        }
+
+        expect(deleteWhere).not.toHaveBeenCalled();
+        expect(mockRemoveDownloadFromRuntime).not.toHaveBeenCalled();
+    });
+
+    it('removes completed, failed, and canceled partial files before clearing terminal downloads', async () => {
+        const { deleteWhere } = mockTerminalRows([
+            { filePath: '/downloads/done.mp4', status: 'completed' },
+            { filePath: '/downloads/failed.mp4', status: 'failed' },
+            { filePath: '/downloads/canceled.mp4', status: 'canceled' },
+        ]);
+
+        await expect(
+            getHandler('DOWNLOADS_CLEAR_COMPLETED')(null)
+        ).resolves.toEqual({ success: true });
+
+        expect(mockRemovePartialDownloadFile).toHaveBeenCalledTimes(3);
+        expect(mockRemovePartialDownloadFile).toHaveBeenNthCalledWith(
+            1,
+            '/downloads/done.mp4'
+        );
+        expect(mockRemovePartialDownloadFile).toHaveBeenNthCalledWith(
+            2,
+            '/downloads/failed.mp4'
+        );
+        expect(mockRemovePartialDownloadFile).toHaveBeenNthCalledWith(
+            3,
+            '/downloads/canceled.mp4'
+        );
+        expect(
+            mockRemovePartialDownloadFile.mock.invocationCallOrder[0]
+        ).toBeLessThan(deleteWhere.mock.invocationCallOrder[0]);
+        expect(mockBroadcastDownloadUpdate).toHaveBeenCalledTimes(1);
+    });
+
+    it('retains only downloads whose partial cleanup fails when clearing terminal downloads', async () => {
+        const cleanupError = new Error('permission denied');
+        const { deleteWhere } = mockTerminalRows([
+            { filePath: '/downloads/done.mp4', status: 'completed' },
+            { filePath: '/downloads/failed.mp4', status: 'failed' },
+        ]);
+        mockRemovePartialDownloadFile.mockImplementation((filePath) => {
+            if (filePath !== '/downloads/failed.mp4') {
+                return;
+            }
+            throw cleanupError;
+        });
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+
+        try {
+            await expect(
+                getHandler('DOWNLOADS_CLEAR_COMPLETED')(null)
+            ).resolves.toEqual({ success: true });
+        } finally {
+            consoleError.mockRestore();
+        }
+
+        expect(deleteWhere).toHaveBeenCalledTimes(1);
+        expect(mockBroadcastDownloadUpdate).toHaveBeenCalledTimes(1);
+    });
+
+    it('removes the row once a previously locked partial becomes deletable', async () => {
+        const { deleteWhere } = mockDownloadRow(createDownloadRow('paused'));
+        mockRemovePartialDownloadFile
+            .mockImplementationOnce(() => {
+                throw new Error('EPERM: locked');
+            })
+            .mockImplementation(() => true);
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        const consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+
+        try {
+            await expect(
+                getHandler('DOWNLOADS_REMOVE')(null, 42)
+            ).resolves.toEqual({
+                error: 'Could not delete the partial file',
+                success: false,
+            });
+            expect(deleteWhere).not.toHaveBeenCalled();
+
+            // Retry after the lock is released: cleanup and delete succeed.
+            await expect(
+                getHandler('DOWNLOADS_REMOVE')(null, 42)
+            ).resolves.toEqual({ success: true });
+        } finally {
+            consoleError.mockRestore();
+            consoleLog.mockRestore();
+        }
+
+        expect(mockRemovePartialDownloadFile).toHaveBeenCalledTimes(2);
+        expect(deleteWhere).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/events/database/downloads.events.ts b/apps/electron-backend/src/app/events/database/downloads.events.ts
index 2f41b83f0..57c8e7ae0 100644
--- a/apps/electron-backend/src/app/events/database/downloads.events.ts
+++ b/apps/electron-backend/src/app/events/database/downloads.events.ts
@@ -6,7 +6,9 @@ import { join } from 'node:path';
 import { getDatabase } from '../../database/connection';
 import * as schema from '../../database/schema';
 import { DownloadDirectoryAuthorizer } from './download-directory-authorization';
+import { removePartialDownloadFile } from './download-file-path';
 import {
+    resumeDownloadRequest,
     retryDownloadRequest,
     startDownloadRequest,
     type StartDownloadRequest,
@@ -15,10 +17,19 @@ import { resetStaleDownloads } from './download-recovery';
 import {
     broadcastDownloadUpdate,
     cancelDownload,
+    pauseDownload,
     removeDownloadFromRuntime,
     setMainWindow,
 } from './download-runtime';
 
+const removablePartialStatuses = new Set([
+    'queued',
+    'paused',
+    'completed',
+    'failed',
+    'canceled',
+]);
+
 function getDownloadAuthorizationPath(): string {
     return join(
         app.getPath('userData'),
@@ -104,6 +115,34 @@ ipcMain.handle('DOWNLOADS_CANCEL', async (_event, downloadId: number) => {
     }
 });
 
+ipcMain.handle('DOWNLOADS_PAUSE', async (_event, downloadId: number) => {
+    try {
+        console.log('[Downloads] Pause download:', downloadId);
+        return (await pauseDownload(downloadId))
+            ? { success: true }
+            : { error: 'Download not found in queue', success: false };
+    } catch (error) {
+        console.error('[Downloads] Error pausing download:', error);
+        throw error;
+    }
+});
+
+ipcMain.handle(
+    'DOWNLOADS_RESUME',
+    async (_event, downloadId: number, downloadFolder: string) => {
+        try {
+            return await resumeDownloadRequest(
+                downloadId,
+                downloadFolder,
+                downloadDirectoryAuthorizer
+            );
+        } catch (error) {
+            console.error('[Downloads] Error resuming download:', error);
+            throw error;
+        }
+    }
+);
+
 ipcMain.handle(
     'DOWNLOADS_RETRY',
     async (_event, downloadId: number, downloadFolder: string) => {
@@ -123,8 +162,36 @@ ipcMain.handle(
 ipcMain.handle('DOWNLOADS_REMOVE', async (_event, downloadId: number) => {
     try {
         console.log('[Downloads] Remove download:', downloadId);
-        removeDownloadFromRuntime(downloadId);
         const db = await getDatabase();
+        const rows = await db
+            .select({
+                filePath: schema.downloads.filePath,
+                status: schema.downloads.status,
+        })
+            .from(schema.downloads)
+            .where(eq(schema.downloads.id, downloadId))
+            .limit(1);
+        const row = rows[0];
+        if (row?.filePath && removablePartialStatuses.has(row.status)) {
+            try {
+                removePartialDownloadFile(row.filePath);
+            } catch (cleanupError) {
+                // Keep the row (and its runtime entry) so the .part is never
+                // orphaned, but answer with a structured failure the UI can
+                // surface instead of an opaque IPC rejection. Retrying the
+                // remove re-attempts the deletion.
+                console.error(
+                    '[Downloads] Failed to delete partial file on remove:',
+                    row.filePath,
+                    cleanupError
+                );
+                return {
+                    error: 'Could not delete the partial file',
+                    success: false,
+                };
+            }
+        }
+        removeDownloadFromRuntime(downloadId);
         await db
             .delete(schema.downloads)
             .where(eq(schema.downloads.id, downloadId));
@@ -210,17 +277,43 @@ ipcMain.handle(
                 'failed',
                 'canceled',
             ]);
-            await db
-                .delete(schema.downloads)
-                .where(
-                    playlistId
-                        ? and(
-                              eq(schema.downloads.playlistId, playlistId),
-                              terminalStatus
-                          )
-                        : terminalStatus
-                );
-            broadcastDownloadUpdate();
+            const terminalFilter = playlistId
+                ? and(eq(schema.downloads.playlistId, playlistId), terminalStatus)
+                : terminalStatus;
+            const rows = await db
+                .select({
+                    id: schema.downloads.id,
+                    filePath: schema.downloads.filePath,
+                    status: schema.downloads.status,
+                })
+                .from(schema.downloads)
+                .where(terminalFilter);
+            const downloadIdsToDelete: number[] = [];
+            for (const row of rows) {
+                if (row.filePath && removablePartialStatuses.has(row.status)) {
+                    try {
+                        removePartialDownloadFile(row.filePath);
+                    } catch (error) {
+                        console.error(
+                            '[Downloads] Retaining download after partial cleanup failed:',
+                            error
+                        );
+                        continue;
+                    }
+                }
+                downloadIdsToDelete.push(row.id);
+            }
+            if (downloadIdsToDelete.length > 0) {
+                await db
+                    .delete(schema.downloads)
+                    .where(
+                        and(
+                            terminalFilter,
+                            inArray(schema.downloads.id, downloadIdsToDelete)
+                        )
+                    );
+                broadcastDownloadUpdate();
+            }
             return { success: true };
         } catch (error) {
             console.error('[Downloads] Error clearing completed:', error);
diff --git a/apps/electron-backend/src/app/events/database/downloads.test-helpers.ts b/apps/electron-backend/src/app/events/database/downloads.test-helpers.ts
new file mode 100644
index 000000000..21f2dd4ab
--- /dev/null
+++ b/apps/electron-backend/src/app/events/database/downloads.test-helpers.ts
@@ -0,0 +1,192 @@
+type IpcHandler = (_event: unknown, ...args: unknown[]) => Promise<unknown>;
+
+/**
+ * Shared harness for the downloads-events specs.
+ *
+ * The module registry is reset and re-mocked per test via `jest.doMock`, which
+ * is deliberately not hoisted — so the whole setup can live here and each spec
+ * just calls `setupDownloadsEventsHarness()` from its own `beforeEach`.
+ */
+
+export const mockRegisteredHandlers = new Map<string, IpcHandler>();
+export const mockGetDatabase = jest.fn();
+export const mockRemoveDownloadFromRuntime = jest.fn();
+export const mockBroadcastDownloadUpdate = jest.fn();
+export const mockRemovePartialDownloadFile = jest.fn();
+export const mockPauseDownload = jest.fn();
+export const mockResumeDownloadRequest = jest.fn();
+export const mockExistsSync = jest.fn();
+export const mockOpenPath = jest.fn();
+export const mockShowItemInFolder = jest.fn();
+export const mockEq = jest.fn();
+let downloadsFilePathColumn: unknown;
+
+export const MANAGED_PATH_STATE = {
+    ERROR: 'error',
+    MANAGED: 'managed',
+    UNMANAGED: 'unmanaged',
+} as const;
+
+export type ManagedPathState =
+    (typeof MANAGED_PATH_STATE)[keyof typeof MANAGED_PATH_STATE];
+
+export function getHandler(channel: string): IpcHandler {
+    const handler = mockRegisteredHandlers.get(channel);
+    if (!handler) {
+        throw new Error(`Expected IPC handler for ${channel}`);
+    }
+
+    return handler;
+}
+
+export function createDownloadRow(status: string) {
+    return {
+        filePath: '/downloads/resume.mp4',
+        status,
+    };
+}
+
+export async function setupDownloadsEventsHarness(): Promise<void> {
+    jest.resetModules();
+    mockRegisteredHandlers.clear();
+    mockGetDatabase.mockReset();
+    mockRemoveDownloadFromRuntime.mockReset();
+    mockBroadcastDownloadUpdate.mockReset();
+    mockRemovePartialDownloadFile.mockReset();
+    mockPauseDownload.mockReset();
+    mockResumeDownloadRequest.mockReset();
+    mockExistsSync.mockReset();
+    mockOpenPath.mockReset().mockResolvedValue('');
+    mockShowItemInFolder.mockReset();
+    mockEq.mockReset();
+
+    jest.doMock('node:fs', () => ({
+        ...jest.requireActual<typeof import('node:fs')>('node:fs'),
+        existsSync: mockExistsSync,
+    }));
+    jest.doMock('drizzle-orm', () => {
+        const actual =
+            jest.requireActual<typeof import('drizzle-orm')>('drizzle-orm');
+        mockEq.mockImplementation(actual.eq);
+        return {
+            ...actual,
+            eq: mockEq,
+        };
+    });
+    jest.doMock('electron', () => ({
+        app: {
+            getPath: jest.fn((name: string) =>
+                name === 'userData' ? '/user-data' : '/downloads'
+            ),
+        },
+        dialog: {
+            showOpenDialog: jest.fn(),
+        },
+        ipcMain: {
+            handle: jest.fn((channel: string, handler: IpcHandler) => {
+                mockRegisteredHandlers.set(channel, handler);
+            }),
+        },
+        shell: {
+            openPath: mockOpenPath,
+            showItemInFolder: mockShowItemInFolder,
+        },
+    }));
+    jest.doMock('../../database/connection', () => ({
+        getDatabase: mockGetDatabase,
+    }));
+    jest.doMock('./download-file-path', () => ({
+        removePartialDownloadFile: mockRemovePartialDownloadFile,
+    }));
+    jest.doMock('./download-runtime', () => ({
+        broadcastDownloadUpdate: mockBroadcastDownloadUpdate,
+        cancelDownload: jest.fn(),
+        pauseDownload: mockPauseDownload,
+        removeDownloadFromRuntime: mockRemoveDownloadFromRuntime,
+        setMainWindow: jest.fn(),
+    }));
+    jest.doMock('./download-requests', () => ({
+        resumeDownloadRequest: mockResumeDownloadRequest,
+        retryDownloadRequest: jest.fn(),
+        startDownloadRequest: jest.fn(),
+    }));
+    jest.doMock('./download-recovery', () => ({
+        resetStaleDownloads: jest.fn(),
+    }));
+
+    await import('./downloads.events');
+    const schema = await import('../../database/schema');
+    downloadsFilePathColumn = schema.downloads.filePath;
+}
+
+export function mockManagedPath(state: ManagedPathState) {
+    const limit = jest.fn(() => {
+        if (state === MANAGED_PATH_STATE.ERROR) {
+            return Promise.reject(new Error('database unavailable'));
+        }
+        return Promise.resolve(
+            state === MANAGED_PATH_STATE.MANAGED ? [{ id: 42 }] : []
+        );
+    });
+    const where = jest.fn((_predicate: unknown) => ({ limit }));
+    const from = jest.fn(() => ({ where }));
+    const select = jest.fn(() => ({ from }));
+    const db = { select };
+    mockGetDatabase.mockResolvedValue(db);
+    return { from, limit, select, where };
+}
+
+export function expectManagedPathLookup(
+    lookup: ReturnType<typeof mockManagedPath>,
+    filePath: string
+) {
+    expect(mockGetDatabase).toHaveBeenCalledTimes(1);
+    expect(lookup.select).toHaveBeenCalledTimes(1);
+    expect(lookup.from).toHaveBeenCalledTimes(1);
+    expect(lookup.where).toHaveBeenCalledTimes(1);
+    expect(mockEq).toHaveBeenCalledTimes(1);
+    expect(mockEq.mock.calls[0][0] === downloadsFilePathColumn).toBe(true);
+    expect(mockEq.mock.calls[0][1]).toBe(filePath);
+    expect(
+        lookup.where.mock.calls[0][0] === mockEq.mock.results[0].value
+    ).toBe(true);
+    expect(lookup.limit).toHaveBeenCalledTimes(1);
+    expect(lookup.limit).toHaveBeenCalledWith(1);
+}
+
+export function mockDownloadRow(row: { filePath: string | null; status: string }) {
+    const deleteWhere = jest.fn().mockResolvedValue(undefined);
+    const db = {
+        delete: jest.fn(() => ({ where: deleteWhere })),
+        select: jest.fn(() => ({
+            from: jest.fn(() => ({
+                where: jest.fn(() => ({
+                    limit: jest.fn().mockResolvedValue([row]),
+                })),
+            })),
+        })),
+    };
+    mockGetDatabase.mockResolvedValue(db);
+    return { db, deleteWhere };
+}
+
+export function mockTerminalRows(
+    rows: Array<{ filePath: string | null; status: string }>
+) {
+    const deleteWhere = jest.fn().mockResolvedValue(undefined);
+    const selectWhere = jest
+        .fn()
+        .mockResolvedValue(
+            rows.map((row, index) => ({ id: index + 1, ...row }))
+        );
+    const db = {
+        delete: jest.fn(() => ({ where: deleteWhere })),
+        select: jest.fn(() => ({
+            from: jest.fn(() => ({
+                where: selectWhere,
+            })),
+        })),
+    };
+    mockGetDatabase.mockResolvedValue(db);
+    return { db, deleteWhere, selectWhere };
+}
diff --git a/apps/electron-backend/src/app/events/database/favorites.events.ts b/apps/electron-backend/src/app/events/database/favorites.events.ts
index a0c77ae28..2daef247b 100644
--- a/apps/electron-backend/src/app/events/database/favorites.events.ts
+++ b/apps/electron-backend/src/app/events/database/favorites.events.ts
@@ -39,7 +39,7 @@ handleWorkerRequest('DB_GET_ALL_GLOBAL_FAVORITES', () => ({}));
 
 handleWorkerRequest(
     'DB_REORDER_GLOBAL_FAVORITES',
-    (updates: { content_id: number; position: number }[]) => ({
+    (updates: { content_id: number; playlist_id: string; position: number }[]) => ({
         updates,
     })
 );
diff --git a/apps/electron-backend/src/app/events/database/stale-download-files.ts b/apps/electron-backend/src/app/events/database/stale-download-files.ts
deleted file mode 100644
index 71d1f159e..000000000
--- a/apps/electron-backend/src/app/events/database/stale-download-files.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { removePartialDownload } from './download-file-path';
-
-interface StaleDownloadFile {
-    filePath: string | null;
-}
-
-function removePersistedPartial(filePath: string): void {
-    removePartialDownload({ getSavePath: () => filePath });
-}
-
-export function cleanupStaleDownloadFiles(
-    downloads: readonly StaleDownloadFile[],
-    removeFile: (filePath: string) => void = removePersistedPartial
-): void {
-    for (const download of downloads) {
-        if (!download.filePath) {
-            continue;
-        }
-        try {
-            removeFile(download.filePath);
-        } catch (error) {
-            console.error(
-                '[Downloads] Failed to delete stale partial file:',
-                download.filePath,
-                error
-            );
-        }
-    }
-}
diff --git a/apps/electron-backend/src/app/events/database/tmdb.events.ts b/apps/electron-backend/src/app/events/database/tmdb.events.ts
index 19b6b84da..796ab78bc 100644
--- a/apps/electron-backend/src/app/events/database/tmdb.events.ts
+++ b/apps/electron-backend/src/app/events/database/tmdb.events.ts
@@ -19,4 +19,8 @@ handleWorkerRequest('DB_SET_TMDB_METADATA', (entry: TmdbCacheEntry) => ({
     entry,
 }));
 
+handleWorkerRequest('DB_GET_TMDB_CACHE_STATS', () => ({}));
+
+handleWorkerRequest('DB_CLEAR_TMDB_METADATA', () => ({}));
+
 handleWorkerRequest('DB_MATCH_TITLES', (titles: string[]) => ({ titles }));
diff --git a/apps/electron-backend/src/app/events/database/worker-ipc-contract.spec-data.ts b/apps/electron-backend/src/app/events/database/worker-ipc-contract.spec-data.ts
index 6fb9e60f8..f03e24b3f 100644
--- a/apps/electron-backend/src/app/events/database/worker-ipc-contract.spec-data.ts
+++ b/apps/electron-backend/src/app/events/database/worker-ipc-contract.spec-data.ts
@@ -323,6 +323,16 @@ export const workerIpcContractCases: WorkerIpcContractCase[] = [
         args: [tmdbCacheEntry],
         payload: { entry: tmdbCacheEntry },
     },
+    {
+        operation: 'DB_GET_TMDB_CACHE_STATS',
+        args: [],
+        payload: {},
+    },
+    {
+        operation: 'DB_CLEAR_TMDB_METADATA',
+        args: [],
+        payload: {},
+    },
     {
         operation: 'DB_MATCH_TITLES',
         args: [['The Matrix', 'Inception']],
diff --git a/apps/electron-backend/src/app/events/embedded-mpv.events.ts b/apps/electron-backend/src/app/events/embedded-mpv.events.ts
index 307544024..38a76bf2f 100644
--- a/apps/electron-backend/src/app/events/embedded-mpv.events.ts
+++ b/apps/electron-backend/src/app/events/embedded-mpv.events.ts
@@ -2,6 +2,7 @@ import { ipcMain } from 'electron';
 import {
     EMBEDDED_MPV_CREATE_SESSION,
     EMBEDDED_MPV_DISPOSE_SESSION,
+    EMBEDDED_MPV_GET_FRAME_SOURCE,
     EMBEDDED_MPV_LOAD_PLAYBACK,
     EMBEDDED_MPV_PREPARE,
     EMBEDDED_MPV_SEEK,
@@ -142,6 +143,10 @@ handleEmbeddedMpv(EMBEDDED_MPV_DISPOSE_SESSION, (sessionId: string) =>
     getService().disposeSession(sessionId)
 );
 
+handleEmbeddedMpv(EMBEDDED_MPV_GET_FRAME_SOURCE, (sessionId: string) =>
+    getService().getFrameSource(sessionId)
+);
+
 export function shutdownEmbeddedMpv(): void {
     getService().shutdown();
 }
diff --git a/apps/electron-backend/src/app/events/epg-fetch.service.ts b/apps/electron-backend/src/app/events/epg-fetch.service.ts
new file mode 100644
index 000000000..10b79f8a7
--- /dev/null
+++ b/apps/electron-backend/src/app/events/epg-fetch.service.ts
@@ -0,0 +1,167 @@
+import { eq } from 'drizzle-orm';
+import { ElectronBridgeTrustOptions } from '@iptvnator/shared/interfaces';
+import { getDatabase } from '../database/connection';
+import * as schema from '../database/schema';
+import { epgWorkerService } from './epg-worker.service';
+
+/**
+ * EPG freshness checks and multi-URL fetch orchestration.
+ * Worker lifecycle itself lives in `epg-worker.service.ts`; this module only
+ * decides *which* URLs are worth handing to it, and in what order.
+ */
+
+const loggerLabel = '[EPG Events]';
+
+/** Age after which stored EPG data is refetched. */
+export const EPG_FRESHNESS_MAX_AGE_HOURS = 12;
+
+export interface EpgFreshnessResult {
+    staleUrls: string[];
+    freshUrls: string[];
+}
+
+export interface EpgFetchResult {
+    success: boolean;
+    message?: string;
+    skipped?: string[];
+}
+
+/**
+ * Check which EPG URLs have fresh data vs stale/missing data
+ * @param urls - EPG source URLs to check
+ * @param maxAgeHours - Maximum age in hours before data is considered stale
+ */
+export async function checkEpgFreshness(
+    urls: string[],
+    maxAgeHours: number
+): Promise<EpgFreshnessResult> {
+    const staleUrls: string[] = [];
+    const freshUrls: string[] = [];
+    const cutoffTime = new Date(
+        Date.now() - maxAgeHours * 60 * 60 * 1000
+    ).toISOString();
+
+    try {
+        const db = await getDatabase();
+
+        for (const url of urls) {
+            if (!url?.trim()) continue;
+
+            const result = await db
+                .select({ updatedAt: schema.epgChannels.updatedAt })
+                .from(schema.epgChannels)
+                .where(eq(schema.epgChannels.sourceUrl, url))
+                .limit(1);
+
+            const isFresh =
+                result.length > 0 &&
+                result[0].updatedAt &&
+                result[0].updatedAt >= cutoffTime;
+
+            if (isFresh) {
+                freshUrls.push(url);
+                epgWorkerService.markFetchedUrl(url);
+            } else {
+                staleUrls.push(url);
+            }
+        }
+    } catch (error) {
+        console.error(loggerLabel, 'Error checking EPG freshness:', error);
+        return { staleUrls: urls, freshUrls: [] };
+    }
+
+    if (freshUrls.length > 0) {
+        console.log(
+            loggerLabel,
+            `EPG fresh (skipping): ${freshUrls.length} source(s)`
+        );
+    }
+    if (staleUrls.length > 0) {
+        console.log(
+            loggerLabel,
+            `EPG stale (will fetch): ${staleUrls.length} source(s)`
+        );
+    }
+
+    return { staleUrls, freshUrls };
+}
+
+/**
+ * Handle EPG fetch from URLs
+ * Automatically skips URLs with fresh data (less than 12 hours old)
+ * Processes URLs sequentially to avoid SQLite database locking issues
+ */
+export async function handleFetchEpg(
+    urls: string[],
+    options: ElectronBridgeTrustOptions = {}
+): Promise<EpgFetchResult> {
+    const validUrls = urls.filter((url) => url?.trim());
+
+    if (validUrls.length === 0) {
+        return { success: false, message: 'No valid URLs provided' };
+    }
+
+    const { staleUrls, freshUrls } = await checkEpgFreshness(
+        validUrls,
+        EPG_FRESHNESS_MAX_AGE_HOURS
+    );
+
+    if (staleUrls.length === 0) {
+        return {
+            success: true,
+            message: 'All EPG data is fresh',
+            skipped: freshUrls,
+        };
+    }
+
+    // Exclude URLs already processed this session — otherwise the loop sends
+    // a 'queued' status, then fetchEpgFromUrl silently skips the URL and no
+    // completion update ever arrives, leaving the UI stuck at "queued".
+    const urlsToFetch = staleUrls.filter(
+        (url) => !epgWorkerService.hasFetchedUrl(url)
+    );
+
+    if (urlsToFetch.length === 0) {
+        console.log(
+            loggerLabel,
+            `All ${staleUrls.length} stale URL(s) already fetched this session; skipping`
+        );
+        return { success: true, skipped: freshUrls };
+    }
+
+    urlsToFetch.forEach((url, index) => {
+        epgWorkerService.sendProgressToRenderer(
+            url,
+            'queued',
+            undefined,
+            undefined,
+            index + 1
+        );
+    });
+
+    const errors: string[] = [];
+    for (const url of urlsToFetch) {
+        try {
+            await epgWorkerService.fetchEpgFromUrl(url, options);
+        } catch (error) {
+            console.error(
+                loggerLabel,
+                `Error fetching EPG from ${url}:`,
+                error
+            );
+            errors.push(
+                error instanceof Error ? error.message : String(error)
+            );
+        }
+    }
+
+    if (errors.length > 0) {
+        return {
+            success: errors.length < urlsToFetch.length,
+            message: errors.join('; '),
+            skipped: freshUrls,
+        };
+    }
+
+    return { success: true, skipped: freshUrls };
+}
diff --git a/apps/electron-backend/src/app/events/epg-mapping.events.spec.ts b/apps/electron-backend/src/app/events/epg-mapping.events.spec.ts
new file mode 100644
index 000000000..0af8125fe
--- /dev/null
+++ b/apps/electron-backend/src/app/events/epg-mapping.events.spec.ts
@@ -0,0 +1,174 @@
+import type EpgEventsType from './epg.events';
+
+const getDatabase = jest.fn();
+const getEpgMapping = jest.fn();
+const getEpgMappingsBatch = jest.fn();
+const setEpgMapping = jest.fn();
+const deleteEpgMapping = jest.fn();
+const searchEpgChannels = jest.fn();
+const ipcHandlers = new Map<
+    string,
+    (event: unknown, args: unknown) => Promise<unknown>
+>();
+
+jest.mock('electron', () => ({
+    app: {
+        isPackaged: false,
+        getAppPath: () => '/mock/app.asar',
+    },
+    BrowserWindow: {
+        getAllWindows: () => [],
+    },
+    ipcMain: {
+        handle: jest.fn(),
+    },
+}));
+
+jest.mock('../database/connection', () => ({
+    getDatabase: (...args: unknown[]) => getDatabase(...args),
+}));
+
+jest.mock('../database/operations/epg-mapping.operations', () => ({
+    getEpgMapping: (...args: unknown[]) => getEpgMapping(...args),
+    getEpgMappingsBatch: (...args: unknown[]) => getEpgMappingsBatch(...args),
+    setEpgMapping: (...args: unknown[]) => setEpgMapping(...args),
+    deleteEpgMapping: (...args: unknown[]) => deleteEpgMapping(...args),
+    searchEpgChannels: (...args: unknown[]) => searchEpgChannels(...args),
+}));
+
+/**
+ * The EPG mapping IPC handlers must fail soft: a mapping lookup is a side
+ * concern of an EPG request and must never take that request down. The
+ * handlers wrap the DB call in try/catch, but a bare `return promise` inside
+ * an async function is *adopted*, not awaited — so the catch block only ever
+ * saw a synchronous `getDatabase()` failure while a rejection from the query
+ * itself escaped to the IPC caller. These tests pin both failure modes.
+ */
+describe('EPG mapping IPC handlers', () => {
+    let EpgEvents: typeof EpgEventsType;
+
+    beforeEach(async () => {
+        jest.resetModules();
+        ipcHandlers.clear();
+        [
+            getDatabase,
+            getEpgMapping,
+            getEpgMappingsBatch,
+            setEpgMapping,
+            deleteEpgMapping,
+            searchEpgChannels,
+        ].forEach((mock) => mock.mockReset());
+
+        getDatabase.mockResolvedValue({});
+
+        ({ default: EpgEvents } = await import('./epg.events'));
+
+        const { ipcMain } = jest.requireMock('electron');
+        (ipcMain.handle as jest.Mock).mockReset();
+        (ipcMain.handle as jest.Mock).mockImplementation(
+            (
+                channel: string,
+                handler: (event: unknown, args: unknown) => Promise<unknown>
+            ) => {
+                ipcHandlers.set(channel, handler);
+            }
+        );
+
+        EpgEvents.bootstrapEpgEvents();
+    });
+
+    function invoke(channel: string, args: unknown): Promise<unknown> {
+        const handler = ipcHandlers.get(channel);
+        if (!handler) {
+            throw new Error(`No IPC handler registered for "${channel}"`);
+        }
+        return handler({}, args);
+    }
+
+    describe.each([
+        {
+            channel: 'EPG_MAPPING_GET',
+            args: { channelKey: 'bbc.one.uk' },
+            operation: () => getEpgMapping,
+            resolved: {
+                id: 1,
+                channelKey: 'bbc.one.uk',
+                epgChannelId: 'BBC.ONE.UK',
+                playlistId: null,
+            },
+            fallback: null,
+        },
+        {
+            channel: 'EPG_MAPPING_SET',
+            args: { channelKey: 'bbc.one.uk', epgChannelId: 'BBC.ONE.UK' },
+            operation: () => setEpgMapping,
+            resolved: { success: true },
+            fallback: { success: false },
+        },
+        {
+            channel: 'EPG_MAPPING_DELETE',
+            args: { channelKey: 'bbc.one.uk' },
+            operation: () => deleteEpgMapping,
+            resolved: { success: true },
+            fallback: { success: false },
+        },
+        {
+            channel: 'EPG_CHANNEL_SEARCH',
+            args: { searchTerm: 'bbc' },
+            operation: () => searchEpgChannels,
+            resolved: [
+                { id: 'BBC.ONE.UK', displayName: 'BBC One', iconUrl: null },
+            ],
+            fallback: [],
+        },
+        {
+            channel: 'EPG_MAPPING_GET_BATCH',
+            args: { channelKeys: ['bbc.one.uk'] },
+            operation: () => getEpgMappingsBatch,
+            resolved: new Map([['bbc.one.uk', 'BBC.ONE.UK']]),
+            fallback: {},
+        },
+    ])('$channel', ({ channel, args, operation, resolved, fallback }) => {
+        it('returns the fallback when the underlying query rejects', async () => {
+            operation().mockRejectedValue(new Error('database is locked'));
+
+            await expect(invoke(channel, args)).resolves.toEqual(fallback);
+        });
+
+        it('returns the fallback when opening the database rejects', async () => {
+            getDatabase.mockRejectedValue(new Error('no such file'));
+
+            await expect(invoke(channel, args)).resolves.toEqual(fallback);
+            expect(operation()).not.toHaveBeenCalled();
+        });
+
+        it('passes the resolved value through on success', async () => {
+            operation().mockResolvedValue(resolved);
+
+            const result = await invoke(channel, args);
+
+            expect(result).toEqual(
+                // The batch handler is the one that reshapes its result.
+                resolved instanceof Map
+                    ? Object.fromEntries(resolved)
+                    : resolved
+            );
+        });
+    });
+
+    it('short-circuits a blank search term without touching the database', async () => {
+        await expect(
+            invoke('EPG_CHANNEL_SEARCH', { searchTerm: '   ' })
+        ).resolves.toEqual([]);
+        expect(getDatabase).not.toHaveBeenCalled();
+        expect(searchEpgChannels).not.toHaveBeenCalled();
+    });
+
+    it('short-circuits an empty batch without touching the database', async () => {
+        await expect(
+            invoke('EPG_MAPPING_GET_BATCH', { channelKeys: [] })
+        ).resolves.toEqual({});
+        expect(getDatabase).not.toHaveBeenCalled();
+        expect(getEpgMappingsBatch).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/events/epg-mapping.service.ts b/apps/electron-backend/src/app/events/epg-mapping.service.ts
new file mode 100644
index 000000000..7b767ce0a
--- /dev/null
+++ b/apps/electron-backend/src/app/events/epg-mapping.service.ts
@@ -0,0 +1,130 @@
+import { getDatabase } from '../database/connection';
+import {
+    deleteEpgMapping,
+    getEpgMapping,
+    getEpgMappingsBatch,
+    searchEpgChannels,
+    setEpgMapping,
+} from '../database/operations/epg-mapping.operations';
+
+/**
+ * Manual EPG channel mapping resolution and CRUD, called at the IPC boundary
+ * before EPG queries run. Every method fails soft: a mapping lookup must never
+ * take down an EPG request, it just falls back to the unmapped channel id.
+ */
+
+export interface EpgMappingRecord {
+    id: number;
+    channelKey: string;
+    epgChannelId: string;
+    playlistId: string | null;
+}
+
+export interface EpgChannelSearchResult {
+    id: string;
+    displayName: string;
+    iconUrl: string | null;
+}
+
+/**
+ * Batch-resolve channel IDs through manual mappings.
+ * Returns a Map of original ID → mapped ID (identity when no mapping).
+ */
+export async function resolveChannelIds(
+    channelIds: string[]
+): Promise<Map<string, string>> {
+    try {
+        const db = await getDatabase();
+        const mappings = await getEpgMappingsBatch(db, channelIds);
+        return mappings;
+    } catch {
+        return new Map();
+    }
+}
+
+/**
+ * Run a batch query against mapping-resolved channel IDs and remap the results
+ * back onto the original request keys the renderer asked for.
+ */
+export async function queryByResolvedChannelIds<T>(
+    channelIds: string[],
+    query: (resolvedIds: string[]) => Promise<Record<string, T | null>>
+): Promise<Record<string, T | null>> {
+    const resolvedMap = await resolveChannelIds(channelIds);
+    const resolvedIds = channelIds.map((id) => resolvedMap.get(id) ?? id);
+    const results = await query(resolvedIds);
+
+    const remapped: Record<string, T | null> = {};
+    for (const originalId of channelIds) {
+        const resolvedId = resolvedMap.get(originalId) ?? originalId;
+        remapped[originalId] = results[resolvedId] ?? null;
+    }
+    return remapped;
+}
+
+export async function handleGetEpgMapping(
+    channelKey: string
+): Promise<EpgMappingRecord | null> {
+    try {
+        const db = await getDatabase();
+        return await getEpgMapping(db, channelKey);
+    } catch {
+        return null;
+    }
+}
+
+export async function handleGetEpgMappingsBatch(
+    channelKeys: string[]
+): Promise<Record<string, string>> {
+    if (!Array.isArray(channelKeys) || channelKeys.length === 0) {
+        return {};
+    }
+
+    try {
+        const db = await getDatabase();
+        const mappings = await getEpgMappingsBatch(db, channelKeys);
+        return Object.fromEntries(mappings);
+    } catch {
+        return {};
+    }
+}
+
+export async function handleSetEpgMapping(
+    channelKey: string,
+    epgChannelId: string,
+    playlistId?: string
+): Promise<{ success: boolean }> {
+    try {
+        const db = await getDatabase();
+        return await setEpgMapping(db, channelKey, epgChannelId, playlistId);
+    } catch {
+        return { success: false };
+    }
+}
+
+export async function handleDeleteEpgMapping(
+    channelKey: string
+): Promise<{ success: boolean }> {
+    try {
+        const db = await getDatabase();
+        return await deleteEpgMapping(db, channelKey);
+    } catch {
+        return { success: false };
+    }
+}
+
+export async function handleSearchEpgChannels(
+    searchTerm: string,
+    limit?: number
+): Promise<EpgChannelSearchResult[]> {
+    if (!searchTerm?.trim()) {
+        return [];
+    }
+
+    try {
+        const db = await getDatabase();
+        return await searchEpgChannels(db, searchTerm, limit);
+    } catch {
+        return [];
+    }
+}
diff --git a/apps/electron-backend/src/app/events/epg-query.service.spec.ts b/apps/electron-backend/src/app/events/epg-query.service.spec.ts
index 33350e748..577096476 100644
--- a/apps/electron-backend/src/app/events/epg-query.service.spec.ts
+++ b/apps/electron-backend/src/app/events/epg-query.service.spec.ts
@@ -66,16 +66,35 @@ function createLimitedSelectChain(
     limitResult: unknown,
     whereCalls: unknown[]
 ): { from: jest.Mock } {
-    const limit = jest.fn().mockResolvedValue(limitResult);
+    const chain: Record<string, jest.Mock> = {
+        limit: jest.fn().mockResolvedValue(limitResult),
+    };
+    // groupBy/orderBy are optional links in the various query shapes; each
+    // returns the chain so where().groupBy().orderBy().limit() (and any
+    // subset) resolves to the same data.
+    chain.groupBy = jest.fn(() => chain);
+    chain.orderBy = jest.fn(() => chain);
     const where = jest.fn((condition: unknown) => {
         whereCalls.push(condition);
-        return { limit };
+        return chain;
     });
     return {
         from: jest.fn(() => ({ where })),
     };
 }
 
+/** Program-query chain: from().where().groupBy().orderBy().limit(). */
+function createProgramChain(rows: unknown): { from: jest.Mock } {
+    const chain: Record<string, jest.Mock> = {
+        limit: jest.fn().mockResolvedValue(rows),
+    };
+    chain.groupBy = jest.fn(() => chain);
+    chain.orderBy = jest.fn(() => chain);
+    return {
+        from: jest.fn(() => ({ where: jest.fn(() => chain) })),
+    };
+}
+
 describe('EpgQueryService', () => {
     let service: EpgQueryService;
 
@@ -403,4 +422,103 @@ describe('EpgQueryService', () => {
             )
         ).toBe(true);
     });
+
+    it('resolves a manual mapping saved under any stream sharing the epg_channel_id via a single join', async () => {
+        const whereCalls: unknown[] = [];
+        const joinLimit = jest
+            .fn()
+            .mockResolvedValue([{ epgChannelId: 'BBC.MAPPED' }]);
+        let innerJoinCount = 0;
+        const joinChain: Record<string, jest.Mock> = {};
+        joinChain.innerJoin = jest.fn(() => {
+            innerJoinCount += 1;
+            return joinChain;
+        });
+        joinChain.where = jest.fn((condition: unknown) => {
+            whereCalls.push(condition);
+            return { orderBy: jest.fn(() => ({ limit: joinLimit })) };
+        });
+
+        // Program lookup for the resolved (mapped) channel id.
+        const programRow = {
+            id: 1,
+            channelId: 'BBC.MAPPED',
+            start: '2026-06-21T17:00:00.000Z',
+            stop: '2026-06-21T18:00:00.000Z',
+            title: 'Mapped Programme',
+            description: null,
+            category: null,
+            iconUrl: null,
+            rating: null,
+            episodeNum: null,
+            sourceUrl: null,
+        };
+
+        const select = jest
+            .fn()
+            // getMapping direct lookup — miss.
+            .mockReturnValueOnce(createLimitedSelectChain([], whereCalls))
+            // getMapping Xtream fallback — single join across content /
+            // categories / mappings, no arbitrary candidate cap.
+            .mockReturnValueOnce({ from: jest.fn(() => joinChain) })
+            // selectChannelPrograms for the mapped id.
+            .mockReturnValueOnce(createProgramChain([programRow]));
+
+        getDatabase.mockResolvedValue({ select });
+
+        const result = await service.getChannelPrograms('provider.epg.id');
+
+        expect(innerJoinCount).toBe(2);
+        expect(joinLimit).toHaveBeenCalledWith(1);
+        expect(result).toHaveLength(1);
+        expect(result[0].title).toBe('Mapped Programme');
+    });
+
+    it('collapses duplicate programme slots from multiple sources in an unscoped lookup', async () => {
+        const whereCalls: unknown[] = [];
+        const dupRow = {
+            id: 1,
+            channelId: 'bbc.one.uk',
+            start: '2026-06-21T20:00:00.000Z',
+            stop: '2026-06-21T21:00:00.000Z',
+            title: 'News',
+            description: null,
+            category: null,
+            iconUrl: null,
+            rating: null,
+            episodeNum: null,
+        };
+        const select = jest
+            .fn()
+            // getMapping direct + Xtream fallback — both miss.
+            .mockReturnValueOnce(createLimitedSelectChain([], whereCalls))
+            .mockReturnValueOnce({
+                from: jest.fn(() => ({
+                    innerJoin: jest.fn(function inner() {
+                        return this;
+                    }),
+                    where: jest.fn(() => ({
+                        orderBy: jest.fn(() => ({
+                            limit: jest.fn().mockResolvedValue([]),
+                        })),
+                    })),
+                })),
+            })
+            // selectChannelPrograms — two sources, same channel/start/title.
+            // The SQL GROUP BY would collapse these; the mock returns both to
+            // prove the JS safety-net dedup also holds.
+            .mockReturnValueOnce(
+                createProgramChain([
+                    { ...dupRow, sourceUrl: 'https://a.example/g.xml' },
+                    { ...dupRow, id: 2, sourceUrl: 'https://b.example/g.xml' },
+                ])
+            );
+
+        getDatabase.mockResolvedValue({ select });
+
+        const result = await service.getChannelPrograms('bbc.one.uk');
+
+        expect(result).toHaveLength(1);
+        expect(result[0].title).toBe('News');
+    });
 });
diff --git a/apps/electron-backend/src/app/events/epg-query.service.ts b/apps/electron-backend/src/app/events/epg-query.service.ts
index 63db5b36e..8ed16023e 100644
--- a/apps/electron-backend/src/app/events/epg-query.service.ts
+++ b/apps/electron-backend/src/app/events/epg-query.service.ts
@@ -1,5 +1,8 @@
 import { and, eq, inArray, isNull, or, sql, type SQL } from 'drizzle-orm';
-import { EpgChannelMetadata, EpgProgram } from '@iptvnator/shared/interfaces';
+import {
+    EpgChannelMetadata,
+    EpgProgram,
+} from '@iptvnator/shared/interfaces';
 import { getDatabase } from '../database/connection';
 import * as schema from '../database/schema';
 
@@ -36,13 +39,21 @@ export class EpgQueryService {
     ): Promise<EpgProgram[]> {
         try {
             const db = await getDatabase();
-            const trimmedChannelId = channelId.trim();
+            let trimmedChannelId = channelId.trim();
             const sourceUrls = this.normalizeSourceUrls(options.sourceUrls);
 
             if (!trimmedChannelId) {
                 return [];
             }
 
+            // Check for manual EPG mapping — if a user has mapped this
+            // channel key to a different EPG channel ID, use the mapped
+            // ID for all subsequent lookups.
+            const mapped = await this.getMapping(db, trimmedChannelId);
+            if (mapped) {
+                trimmedChannelId = mapped;
+            }
+
             let results = await this.selectChannelPrograms(
                 db,
                 trimmedChannelId,
@@ -57,9 +68,7 @@ export class EpgQueryService {
             }
 
             if (results.length > 0) {
-                return results
-                    .map(this.transformDbRowToEpgProgram)
-                    .filter(this.isValidEpgProgram);
+                return this.toEpgPrograms(results);
             }
 
             let channel = await this.selectChannelById(
@@ -90,9 +99,7 @@ export class EpgQueryService {
                 }
 
                 if (results.length > 0) {
-                    return results
-                        .map(this.transformDbRowToEpgProgram)
-                        .filter(this.isValidEpgProgram);
+                    return this.toEpgPrograms(results);
                 }
             }
 
@@ -142,9 +149,7 @@ export class EpgQueryService {
                     );
                 }
 
-                return results
-                    .map(this.transformDbRowToEpgProgram)
-                    .filter(this.isValidEpgProgram);
+                return this.toEpgPrograms(results);
             }
 
             return [];
@@ -541,6 +546,13 @@ export class EpgQueryService {
                     sourceUrls
                 )
             )
+            // Collapse identical slots from multiple sources in SQL so the
+            // 500-row cap counts distinct programmes, not duplicate rows.
+            .groupBy(
+                schema.epgPrograms.channelId,
+                schema.epgPrograms.start,
+                schema.epgPrograms.title
+            )
             .orderBy(schema.epgPrograms.start)
             .limit(500);
     }
@@ -564,6 +576,11 @@ export class EpgQueryService {
                     { legacyOnly: true }
                 )
             )
+            .groupBy(
+                schema.epgPrograms.channelId,
+                schema.epgPrograms.start,
+                schema.epgPrograms.title
+            )
             .orderBy(schema.epgPrograms.start)
             .limit(500);
     }
@@ -595,6 +612,9 @@ export class EpgQueryService {
                     options
                 )
             )
+            // One current row per channel so duplicate cross-source slots
+            // don't consume the per-channel cap and starve other channels.
+            .groupBy(schema.epgPrograms.channelId)
             .limit(channelIds.length);
     }
 
@@ -883,6 +903,31 @@ export class EpgQueryService {
         );
     }
 
+    /**
+     * Map program rows to EpgProgram and drop invalid ones, then collapse
+     * duplicate programme slots. The dedup index is source-aware, so an
+     * unscoped lookup (e.g. the M3U timeline, which queries without
+     * `sourceUrls`) can return the same channel/start/title from two EPG
+     * sources; keep the first so a programme is never shown twice.
+     */
+    private toEpgPrograms(rows: EpgProgramRow[]): EpgProgram[] {
+        const seen = new Set<string>();
+        const programs: EpgProgram[] = [];
+        for (const row of rows) {
+            const program = this.transformDbRowToEpgProgram(row);
+            if (!this.isValidEpgProgram(program)) {
+                continue;
+            }
+            const key = `${program.channel}|${program.start}|${program.title}`;
+            if (seen.has(key)) {
+                continue;
+            }
+            seen.add(key);
+            programs.push(program);
+        }
+        return programs;
+    }
+
     private transformDbRowToEpgProgram(row: EpgProgramRow): EpgProgram {
         return {
             start: row.start,
@@ -905,6 +950,75 @@ export class EpgQueryService {
             !Number.isNaN(new Date(program.stop).getTime())
         );
     }
+
+    private async getMapping(
+        db: EpgDatabase,
+        channelKey: string
+    ): Promise<string | null> {
+        try {
+            // Direct lookup by channel key.
+            const rows = await db
+                .select({
+                    epgChannelId: schema.epgChannelMappings.epgChannelId,
+                })
+                .from(schema.epgChannelMappings)
+                .where(
+                    eq(schema.epgChannelMappings.channelKey, channelKey)
+                )
+                .limit(1);
+            if (rows.length > 0) {
+                return rows[0].epgChannelId;
+            }
+
+            // Fallback: the key may be an Xtream provider epg_channel_id
+            // while the mapping was saved under the playlist-scoped Xtream
+            // key. Resolve the owning streams (joined through categories for
+            // the playlist ID) and look up their mapping keys in a single
+            // join, so a mapping saved under any matching stream is found —
+            // an earlier "check the first few" cap could silently miss a
+            // mapping saved under a later stream sharing this epg_channel_id.
+            //
+            // The join key is built in SQL to mirror
+            // buildXtreamEpgMappingKey(playlistId, xtreamId) →
+            // `xtream:{playlistId}:{xtreamId}`; keep the two in sync.
+            //
+            // This layer only receives the provider epg_channel_id, not the
+            // caller's playlist, so when the same id exists in several
+            // playlists it cannot scope to the caller's own mapping — the
+            // renderer resolves the playlist-scoped key directly and this is
+            // a best-effort fallback. Order deterministically so the chosen
+            // mapping is at least stable rather than storage-order dependent.
+            const mapped = await db
+                .select({
+                    epgChannelId: schema.epgChannelMappings.epgChannelId,
+                })
+                .from(schema.content)
+                .innerJoin(
+                    schema.categories,
+                    eq(schema.content.categoryId, schema.categories.id)
+                )
+                .innerJoin(
+                    schema.epgChannelMappings,
+                    eq(
+                        schema.epgChannelMappings.channelKey,
+                        sql`'xtream:' || ${schema.categories.playlistId} || ':' || ${schema.content.xtreamId}`
+                    )
+                )
+                .where(eq(schema.content.epgChannelId, channelKey))
+                .orderBy(
+                    schema.categories.playlistId,
+                    schema.content.xtreamId
+                )
+                .limit(1);
+            if (mapped.length > 0) {
+                return mapped[0].epgChannelId;
+            }
+
+            return null;
+        } catch {
+            return null;
+        }
+    }
 }
 
 export const epgQueryService = new EpgQueryService();
diff --git a/apps/electron-backend/src/app/events/epg.events.spec.ts b/apps/electron-backend/src/app/events/epg.events.spec.ts
index efbc14696..1f2977a66 100644
--- a/apps/electron-backend/src/app/events/epg.events.spec.ts
+++ b/apps/electron-backend/src/app/events/epg.events.spec.ts
@@ -371,46 +371,47 @@ describe('EpgEvents', () => {
 
     it('falls back to case-insensitive channel id lookup for EPG programs', async () => {
         const select = jest.fn();
-        const programLimitExact = jest.fn().mockResolvedValue([]);
-        const channelLimit = jest
-            .fn()
-            .mockResolvedValue([{ id: 'BBC.ONE.UK', displayName: 'BBC One' }]);
-        const programLimitResolved = jest.fn().mockResolvedValue([
-            {
-                id: 1,
-                channelId: 'BBC.ONE.UK',
-                start: '2026-04-14T10:00:00Z',
-                stop: '2026-04-14T11:00:00Z',
-                title: 'News',
-                description: null,
-                category: null,
-                iconUrl: null,
-                rating: null,
-                episodeNum: null,
-            },
-        ]);
 
+        /**
+         * Build a flexible query-chain mock that every db.select().from().<method>() call
+         * resolves to the same chain object. Each method (where, orderBy, limit) returns
+         * the chain itself, and limit() additionally resolves to the given data. This
+         * handles any query shape our service uses (with or without orderBy) without
+         * requiring exact call-count ordering — important because our mapping feature
+         * inserts extra queries that the original test didn't anticipate.
+         */
+        function queryChain<T>(data: T) {
+            const chain: Record<string, jest.Mock> = {} as Record<string, jest.Mock>;
+            chain.where = jest.fn().mockReturnValue(chain);
+            chain.innerJoin = jest.fn().mockReturnValue(chain);
+            chain.groupBy = jest.fn().mockReturnValue(chain);
+            chain.orderBy = jest.fn().mockReturnValue(chain);
+            chain.limit = jest.fn().mockResolvedValue(data);
+            return chain;
+        }
+
+        // getMapping queries (must come first — they return empty)
         const from = jest
             .fn()
-            .mockReturnValueOnce({
-                where: jest.fn().mockReturnValue({
-                    orderBy: jest.fn().mockReturnValue({
-                        limit: programLimitExact,
-                    }),
-                }),
-            })
-            .mockReturnValueOnce({
-                where: jest.fn().mockReturnValue({
-                    limit: channelLimit,
-                }),
-            })
-            .mockReturnValueOnce({
-                where: jest.fn().mockReturnValue({
-                    orderBy: jest.fn().mockReturnValue({
-                        limit: programLimitResolved,
-                    }),
-                }),
-            });
+            .mockReturnValueOnce(queryChain([]))                          // 1. getMapping: epgChannelMappings
+            .mockReturnValueOnce(queryChain([]))                          // 2. getMapping: content table
+            // Test expectations below
+            .mockReturnValueOnce(queryChain([]))                          // 3. selectChannelPrograms (bbc.one.uk → empty)
+            .mockReturnValueOnce(queryChain([{ id: 'BBC.ONE.UK', displayName: 'BBC One' }]))  // 4. selectChannelById → channel found
+            .mockReturnValueOnce(queryChain([                             // 5. selectChannelPrograms (BBC.ONE.UK → programs)
+                {
+                    id: 1,
+                    channelId: 'BBC.ONE.UK',
+                    start: '2026-04-14T10:00:00Z',
+                    stop: '2026-04-14T11:00:00Z',
+                    title: 'News',
+                    description: null,
+                    category: null,
+                    iconUrl: null,
+                    rating: null,
+                    episodeNum: null,
+                },
+            ]));
 
         select.mockImplementation(() => ({ from }));
 
@@ -470,12 +471,14 @@ describe('EpgEvents', () => {
         const select = jest.fn();
         const from = jest.fn();
         const where = jest.fn();
+        const groupBy = jest.fn();
         const orderBy = jest.fn();
         const limit = jest.fn();
 
         select.mockImplementation(() => ({ from }));
         from.mockReturnValue({ where });
-        where.mockReturnValue({ orderBy });
+        where.mockReturnValue({ groupBy });
+        groupBy.mockReturnValue({ orderBy });
         orderBy.mockReturnValue({ limit });
         limit.mockResolvedValue([
             {
diff --git a/apps/electron-backend/src/app/events/epg.events.ts b/apps/electron-backend/src/app/events/epg.events.ts
index 7a371ca72..c7085939a 100644
--- a/apps/electron-backend/src/app/events/epg.events.ts
+++ b/apps/electron-backend/src/app/events/epg.events.ts
@@ -1,22 +1,29 @@
-import { eq } from 'drizzle-orm';
 import { ipcMain } from 'electron';
 import {
     ElectronBridgeTrustOptions,
     EpgChannelMetadata,
     EpgProgram,
 } from '@iptvnator/shared/interfaces';
-import { getDatabase } from '../database/connection';
-import * as schema from '../database/schema';
 import { epgQueryService } from './epg-query.service';
 import { epgWorkerService } from './epg-worker.service';
+import { checkEpgFreshness, handleFetchEpg } from './epg-fetch.service';
+import type { EpgFetchResult, EpgFreshnessResult } from './epg-fetch.service';
+import {
+    handleDeleteEpgMapping,
+    handleGetEpgMapping,
+    handleGetEpgMappingsBatch,
+    handleSearchEpgChannels,
+    handleSetEpgMapping,
+    queryByResolvedChannelIds,
+} from './epg-mapping.service';
 
 /**
  * EPG Events Handler
  * Manages EPG IPC registration and delegates worker/query behavior.
+ * Freshness and fetch orchestration live in `epg-fetch.service.ts`; manual
+ * channel-mapping resolution and CRUD live in `epg-mapping.service.ts`.
  */
 export default class EpgEvents {
-    private static readonly loggerLabel = '[EPG Events]';
-
     /**
      * Bootstrap EPG events
      */
@@ -129,151 +136,71 @@ export default class EpgEvents {
             }
         );
 
+        // EPG channel mapping CRUD — handled entirely by epg-mapping.service.
+        ipcMain.handle(
+            'EPG_MAPPING_GET',
+            async (_event, args: { channelKey: string }) => {
+                return handleGetEpgMapping(args.channelKey);
+            }
+        );
+
+        ipcMain.handle(
+            'EPG_MAPPING_SET',
+            async (
+                _event,
+                args: {
+                    channelKey: string;
+                    epgChannelId: string;
+                    playlistId?: string;
+                }
+            ) => {
+                return handleSetEpgMapping(
+                    args.channelKey,
+                    args.epgChannelId,
+                    args.playlistId
+                );
+            }
+        );
+
+        ipcMain.handle(
+            'EPG_MAPPING_GET_BATCH',
+            async (_event, args: { channelKeys: string[] }) => {
+                return handleGetEpgMappingsBatch(args.channelKeys);
+            }
+        );
+
+        ipcMain.handle(
+            'EPG_MAPPING_DELETE',
+            async (_event, args: { channelKey: string }) => {
+                return handleDeleteEpgMapping(args.channelKey);
+            }
+        );
+
+        ipcMain.handle(
+            'EPG_CHANNEL_SEARCH',
+            async (
+                _event,
+                args: { searchTerm: string; limit?: number }
+            ) => {
+                return handleSearchEpgChannels(args.searchTerm, args.limit);
+            }
+        );
+
         return ipcMain;
     }
 
-    /**
-     * Check which EPG URLs have fresh data vs stale/missing data
-     * @param urls - EPG source URLs to check
-     * @param maxAgeHours - Maximum age in hours before data is considered stale
-     */
     private static async checkEpgFreshness(
         urls: string[],
         maxAgeHours: number
-    ): Promise<{ staleUrls: string[]; freshUrls: string[] }> {
-        const staleUrls: string[] = [];
-        const freshUrls: string[] = [];
-        const cutoffTime = new Date(
-            Date.now() - maxAgeHours * 60 * 60 * 1000
-        ).toISOString();
-
-        try {
-            const db = await getDatabase();
-
-            for (const url of urls) {
-                if (!url?.trim()) continue;
-
-                const result = await db
-                    .select({ updatedAt: schema.epgChannels.updatedAt })
-                    .from(schema.epgChannels)
-                    .where(eq(schema.epgChannels.sourceUrl, url))
-                    .limit(1);
-
-                const isFresh =
-                    result.length > 0 &&
-                    result[0].updatedAt &&
-                    result[0].updatedAt >= cutoffTime;
-
-                if (isFresh) {
-                    freshUrls.push(url);
-                    epgWorkerService.markFetchedUrl(url);
-                } else {
-                    staleUrls.push(url);
-                }
-            }
-        } catch (error) {
-            console.error(
-                this.loggerLabel,
-                'Error checking EPG freshness:',
-                error
-            );
-            return { staleUrls: urls, freshUrls: [] };
-        }
-
-        if (freshUrls.length > 0) {
-            console.log(
-                this.loggerLabel,
-                `EPG fresh (skipping): ${freshUrls.length} source(s)`
-            );
-        }
-        if (staleUrls.length > 0) {
-            console.log(
-                this.loggerLabel,
-                `EPG stale (will fetch): ${staleUrls.length} source(s)`
-            );
-        }
-
-        return { staleUrls, freshUrls };
+    ): Promise<EpgFreshnessResult> {
+        return checkEpgFreshness(urls, maxAgeHours);
     }
 
-    /**
-     * Handle EPG fetch from URLs
-     * Automatically skips URLs with fresh data (less than 12 hours old)
-     * Processes URLs sequentially to avoid SQLite database locking issues
-     */
     private static async handleFetchEpg(
         urls: string[],
         options: ElectronBridgeTrustOptions = {}
-    ): Promise<{ success: boolean; message?: string; skipped?: string[] }> {
-        const validUrls = urls.filter((url) => url?.trim());
-
-        if (validUrls.length === 0) {
-            return { success: false, message: 'No valid URLs provided' };
-        }
-
-        const { staleUrls, freshUrls } = await this.checkEpgFreshness(
-            validUrls,
-            12
-        );
-
-        if (staleUrls.length === 0) {
-            return {
-                success: true,
-                message: 'All EPG data is fresh',
-                skipped: freshUrls,
-            };
-        }
-
-        // Exclude URLs already processed this session — otherwise the loop sends
-        // a 'queued' status, then fetchEpgFromUrl silently skips the URL and no
-        // completion update ever arrives, leaving the UI stuck at "queued".
-        const urlsToFetch = staleUrls.filter(
-            (url) => !epgWorkerService.hasFetchedUrl(url)
-        );
-
-        if (urlsToFetch.length === 0) {
-            console.log(
-                this.loggerLabel,
-                `All ${staleUrls.length} stale URL(s) already fetched this session; skipping`
-            );
-            return { success: true, skipped: freshUrls };
-        }
-
-        urlsToFetch.forEach((url, index) => {
-            epgWorkerService.sendProgressToRenderer(
-                url,
-                'queued',
-                undefined,
-                undefined,
-                index + 1
-            );
-        });
-
-        const errors: string[] = [];
-        for (const url of urlsToFetch) {
-            try {
-                await this.fetchEpgFromUrl(url, options);
-            } catch (error) {
-                console.error(
-                    this.loggerLabel,
-                    `Error fetching EPG from ${url}:`,
-                    error
-                );
-                errors.push(
-                    error instanceof Error ? error.message : String(error)
-                );
-            }
-        }
-
-        if (errors.length > 0) {
-            return {
-                success: errors.length < urlsToFetch.length,
-                message: errors.join('; '),
-                skipped: freshUrls,
-            };
-        }
-
-        return { success: true, skipped: freshUrls };
+    ): Promise<EpgFetchResult> {
+        return handleFetchEpg(urls, options);
     }
 
     private static async fetchEpgFromUrl(
@@ -294,7 +221,9 @@ export default class EpgEvents {
         channelIds: string[],
         options?: { sourceUrls?: string[] }
     ): Promise<Record<string, EpgProgram | null>> {
-        return epgQueryService.getCurrentProgramsBatch(channelIds, options);
+        return queryByResolvedChannelIds(channelIds, (resolvedIds) =>
+            epgQueryService.getCurrentProgramsBatch(resolvedIds, options)
+        );
     }
 
     private static async handleGetAllChannels(): Promise<{
@@ -308,7 +237,9 @@ export default class EpgEvents {
         channelIds: string[],
         options?: { sourceUrls?: string[] }
     ): Promise<Record<string, EpgChannelMetadata | null>> {
-        return epgQueryService.getChannelMetadata(channelIds, options);
+        return queryByResolvedChannelIds(channelIds, (resolvedIds) =>
+            epgQueryService.getChannelMetadata(resolvedIds, options)
+        );
     }
 
     private static async handleGetChannelsByRange(
diff --git a/apps/electron-backend/src/app/events/playlist-auto-update.spec.ts b/apps/electron-backend/src/app/events/playlist-auto-update.spec.ts
new file mode 100644
index 000000000..d3d7c60e8
--- /dev/null
+++ b/apps/electron-backend/src/app/events/playlist-auto-update.spec.ts
@@ -0,0 +1,281 @@
+import type { Playlist } from '@iptvnator/shared/interfaces';
+import {
+    AUTO_UPDATE_CONCURRENCY,
+    autoUpdatePlaylists,
+} from './playlist-auto-update';
+
+const mockFetchPlaylistFromFile = jest.fn();
+const mockFetchPlaylistFromUrl = jest.fn();
+
+jest.mock('./playlist-source', () => ({
+    ...jest.requireActual('./playlist-source'),
+    fetchPlaylistFromFile: (...args: unknown[]) =>
+        mockFetchPlaylistFromFile(...args),
+    fetchPlaylistFromUrl: (...args: unknown[]) =>
+        mockFetchPlaylistFromUrl(...args),
+}));
+
+function createPlaylist(overrides: Partial<Playlist> = {}): Playlist {
+    return {
+        _id: 'playlist-1',
+        autoRefresh: true,
+        count: 1,
+        favorites: [],
+        filename: 'Playlist',
+        importDate: '2026-06-02T00:00:00.000Z',
+        lastUsage: '2026-06-02T00:00:00.000Z',
+        playlist: { items: [] },
+        title: 'Playlist',
+        ...overrides,
+    };
+}
+
+function createUrlPlaylist(id: string, url: string): Playlist {
+    return createPlaylist({ _id: id, title: id, url });
+}
+
+/** Lets every pending promise chain settle without advancing timers. */
+function flushMicrotasks(): Promise<void> {
+    return new Promise((resolve) => setImmediate(resolve));
+}
+
+/** A promise that never settles on its own, plus its resolver. */
+function createPendingFetch(): {
+    promise: Promise<Playlist>;
+    resolve: (playlist: Playlist) => void;
+} {
+    let resolve!: (playlist: Playlist) => void;
+    const promise = new Promise<Playlist>((resolvePromise) => {
+        resolve = resolvePromise;
+    });
+
+    return { promise, resolve };
+}
+
+describe('autoUpdatePlaylists', () => {
+    let consoleErrorSpy: jest.SpyInstance;
+    let consoleLogSpy: jest.SpyInstance;
+    let consoleWarnSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+        mockFetchPlaylistFromFile.mockReset();
+        mockFetchPlaylistFromUrl.mockReset();
+        consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+        consoleLogSpy = jest.spyOn(console, 'log').mockImplementation();
+        consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+    });
+
+    afterEach(() => {
+        consoleErrorSpy.mockRestore();
+        consoleLogSpy.mockRestore();
+        consoleWarnSpy.mockRestore();
+    });
+
+    it('refreshes the remaining playlists while an unresponsive source is still pending', async () => {
+        const unresponsive = createPendingFetch();
+        mockFetchPlaylistFromUrl.mockImplementation((url: string) =>
+            url === 'https://unresponsive.test/list.m3u'
+                ? unresponsive.promise
+                : Promise.resolve(createPlaylist({ title: 'Refreshed' }))
+        );
+
+        const updatePromise = autoUpdatePlaylists([
+            createUrlPlaylist(
+                'unresponsive',
+                'https://unresponsive.test/list.m3u'
+            ),
+            createUrlPlaylist('reachable', 'https://reachable.test/list.m3u'),
+        ]);
+
+        await flushMicrotasks();
+
+        expect(mockFetchPlaylistFromUrl).toHaveBeenCalledWith(
+            'https://reachable.test/list.m3u',
+            'reachable',
+            {}
+        );
+
+        unresponsive.resolve(createPlaylist({ title: 'Slow but refreshed' }));
+
+        const result = await updatePromise;
+        expect(result.playlists).toEqual([
+            expect.objectContaining({ _id: 'unresponsive' }),
+            expect.objectContaining({ _id: 'reachable' }),
+        ]);
+        expect(result.outcomes.map((outcome) => outcome.status)).toEqual([
+            'updated',
+            'updated',
+        ]);
+    });
+
+    it('keeps the playlists that succeeded when another source fails', async () => {
+        mockFetchPlaylistFromUrl.mockImplementation((url: string) =>
+            url === 'https://broken.test/list.m3u'
+                ? Promise.reject(new Error('timeout of 30000ms exceeded'))
+                : Promise.resolve(createPlaylist({ title: 'Refreshed' }))
+        );
+
+        const result = await autoUpdatePlaylists([
+            createUrlPlaylist('broken', 'https://broken.test/list.m3u'),
+            createUrlPlaylist('reachable', 'https://reachable.test/list.m3u'),
+        ]);
+
+        expect(result.playlists).toEqual([
+            expect.objectContaining({ _id: 'reachable' }),
+        ]);
+        // The dropped playlist must still be reported, otherwise the renderer
+        // cannot tell a partial run from a complete one.
+        expect(result.outcomes).toEqual([
+            { playlistId: 'broken', status: 'failed', title: 'broken' },
+            { playlistId: 'reachable', status: 'updated', title: 'reachable' },
+        ]);
+        expect(consoleErrorSpy).toHaveBeenCalledWith(
+            'Failed to update playlist "broken":',
+            expect.objectContaining({
+                message: 'timeout of 30000ms exceeded',
+            })
+        );
+    });
+
+    it('never runs more refreshes at once than the configured concurrency', async () => {
+        const pendingFetches = Array.from(
+            { length: AUTO_UPDATE_CONCURRENCY + 2 },
+            createPendingFetch
+        );
+        let startedFetches = 0;
+        mockFetchPlaylistFromUrl.mockImplementation(
+            () => pendingFetches[startedFetches++].promise
+        );
+
+        const updatePromise = autoUpdatePlaylists(
+            pendingFetches.map((_, index) =>
+                createUrlPlaylist(
+                    `playlist-${index}`,
+                    `https://example.test/${index}.m3u`
+                )
+            )
+        );
+
+        await flushMicrotasks();
+        expect(startedFetches).toBe(AUTO_UPDATE_CONCURRENCY);
+
+        pendingFetches[0].resolve(createPlaylist());
+        await flushMicrotasks();
+        expect(startedFetches).toBe(AUTO_UPDATE_CONCURRENCY + 1);
+
+        for (const pendingFetch of pendingFetches.slice(1)) {
+            pendingFetch.resolve(createPlaylist());
+        }
+
+        const result = await updatePromise;
+        expect(result.playlists).toHaveLength(pendingFetches.length);
+        expect(result.outcomes).toHaveLength(pendingFetches.length);
+    });
+
+    it('preserves user-owned fields and refreshes file-based playlists', async () => {
+        mockFetchPlaylistFromFile.mockResolvedValue(
+            createPlaylist({
+                _id: 'regenerated',
+                autoRefresh: false,
+                favorites: [],
+                title: 'Refreshed from file',
+                userAgent: undefined,
+            })
+        );
+
+        const result = await autoUpdatePlaylists([
+            createPlaylist({
+                _id: 'file-playlist',
+                autoRefresh: true,
+                favorites: ['fav-channel'],
+                filePath: '/playlists/local.m3u',
+                importDate: '',
+                title: 'File playlist',
+                userAgent: 'PlaylistAgent/1.0',
+            }),
+        ]);
+
+        expect(mockFetchPlaylistFromFile).toHaveBeenCalledWith(
+            '/playlists/local.m3u',
+            'File playlist'
+        );
+        expect(result.playlists).toEqual([
+            expect.objectContaining({
+                _id: 'file-playlist',
+                autoRefresh: true,
+                favorites: ['fav-channel'],
+                title: 'Refreshed from file',
+                userAgent: 'PlaylistAgent/1.0',
+            }),
+        ]);
+        expect(result.outcomes).toEqual([
+            {
+                playlistId: 'file-playlist',
+                status: 'updated',
+                title: 'File playlist',
+            },
+        ]);
+    });
+
+    it('skips playlists without a usable source and forwards trust options', async () => {
+        mockFetchPlaylistFromUrl.mockResolvedValue(createPlaylist());
+
+        const result = await autoUpdatePlaylists(
+            [
+                createPlaylist({
+                    _id: 'no-source',
+                    filePath: undefined,
+                    title: 'No source',
+                    url: undefined,
+                }),
+                createUrlPlaylist(
+                    'reachable',
+                    'https://reachable.test/list.m3u'
+                ),
+            ],
+            { trustedInsecureTlsHosts: ['self-signed.test'] }
+        );
+
+        expect(result.playlists).toHaveLength(1);
+        // A playlist with no source was never refreshable, so it is reported as
+        // skipped rather than failed.
+        expect(result.outcomes).toEqual([
+            { playlistId: 'no-source', status: 'skipped', title: 'No source' },
+            { playlistId: 'reachable', status: 'updated', title: 'reachable' },
+        ]);
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+            'Skipping playlist "No source": no URL or file path found'
+        );
+        expect(mockFetchPlaylistFromUrl).toHaveBeenCalledWith(
+            'https://reachable.test/list.m3u',
+            'reachable',
+            { trustedInsecureTlsHosts: ['self-signed.test'] }
+        );
+    });
+
+    it('redacts playlist credentials from the refresh log', async () => {
+        mockFetchPlaylistFromUrl.mockResolvedValue(createPlaylist());
+
+        await autoUpdatePlaylists([
+            createUrlPlaylist(
+                'xtream',
+                'https://portal.test/get.php?username=alice&password=hunter2'
+            ),
+        ]);
+
+        const loggedMessages = consoleLogSpy.mock.calls.map(([message]) =>
+            String(message)
+        );
+        expect(
+            loggedMessages.some((message) => message.includes('hunter2'))
+        ).toBe(false);
+        expect(
+            loggedMessages.some((message) => message.includes('alice'))
+        ).toBe(false);
+        expect(
+            loggedMessages.some((message) =>
+                message.includes('Updating playlist "xtream" from URL:')
+            )
+        ).toBe(true);
+    });
+});
diff --git a/apps/electron-backend/src/app/events/playlist-auto-update.ts b/apps/electron-backend/src/app/events/playlist-auto-update.ts
new file mode 100644
index 000000000..6e3975cff
--- /dev/null
+++ b/apps/electron-backend/src/app/events/playlist-auto-update.ts
@@ -0,0 +1,120 @@
+import type {
+    AutoUpdatePlaylistStatus,
+    AutoUpdatePlaylistsResult,
+    Playlist,
+} from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
+import {
+    fetchPlaylistFromFile,
+    fetchPlaylistFromUrl,
+    preserveAutoUpdatedPlaylistFields,
+    type PlaylistFetchOptions,
+} from './playlist-source';
+
+/**
+ * How many playlists the startup auto-update refreshes at the same time.
+ * Refreshing sequentially let a single slow or unreachable host delay every
+ * remaining playlist (issue #931), while an unbounded fan-out would download
+ * and parse arbitrarily many large M3U files in the main process at once.
+ */
+export const AUTO_UPDATE_CONCURRENCY = 3;
+
+/**
+ * Refreshes a single playlist from its original source.
+ * Returns `null` when the playlist carries neither a URL nor a file path.
+ */
+async function refreshPlaylist(
+    playlist: Playlist,
+    options: PlaylistFetchOptions
+): Promise<Playlist | null> {
+    let playlistObject: Playlist;
+
+    if (playlist.importDate && playlist.url) {
+        console.log(
+            `Updating playlist "${playlist.title}" from URL: ${redactSensitiveData(playlist.url)}`
+        );
+        playlistObject = await fetchPlaylistFromUrl(
+            playlist.url,
+            playlist.title,
+            options
+        );
+    } else if (playlist.filePath) {
+        console.log(
+            `Updating playlist "${playlist.title}" from file: ${playlist.filePath}`
+        );
+        playlistObject = await fetchPlaylistFromFile(
+            playlist.filePath,
+            playlist.title
+        );
+    } else {
+        console.warn(
+            `Skipping playlist "${playlist.title}": no URL or file path found`
+        );
+        return null;
+    }
+
+    console.log(`Successfully updated playlist "${playlist.title}"`);
+    return preserveAutoUpdatedPlaylistFields(playlistObject, playlist);
+}
+
+/**
+ * Refreshes the given playlists with bounded concurrency, isolating every
+ * failure so one broken source never withholds the playlists that did update.
+ * The returned playlists keep the order of the requested ones.
+ *
+ * Because failures are isolated, they are also reported: every requested
+ * playlist gets an outcome, so the renderer can tell the user what actually
+ * happened instead of assuming the whole run succeeded.
+ */
+export async function autoUpdatePlaylists(
+    playlists: readonly Playlist[],
+    options: PlaylistFetchOptions = {}
+): Promise<AutoUpdatePlaylistsResult> {
+    const results: (Playlist | null)[] = new Array(playlists.length).fill(null);
+    const statuses: (AutoUpdatePlaylistStatus | undefined)[] = new Array(
+        playlists.length
+    );
+    let nextIndex = 0;
+
+    const refreshNextPlaylist = async (): Promise<void> => {
+        for (
+            let index = nextIndex++;
+            index < playlists.length;
+            index = nextIndex++
+        ) {
+            const playlist = playlists[index];
+
+            try {
+                const refreshed = await refreshPlaylist(playlist, options);
+                results[index] = refreshed;
+                statuses[index] = refreshed ? 'updated' : 'skipped';
+            } catch (error) {
+                console.error(
+                    `Failed to update playlist "${playlist.title}":`,
+                    error
+                );
+                statuses[index] = 'failed';
+            }
+        }
+    };
+
+    await Promise.all(
+        Array.from(
+            { length: Math.min(AUTO_UPDATE_CONCURRENCY, playlists.length) },
+            refreshNextPlaylist
+        )
+    );
+
+    return {
+        playlists: results.filter(
+            (playlist): playlist is Playlist => playlist !== null
+        ),
+        outcomes: playlists.map((playlist, index) => ({
+            playlistId: playlist._id,
+            title: playlist.title,
+            // Every index is visited above; an unresolved slot could only mean
+            // the refresh never completed, which is a failure, not a success.
+            status: statuses[index] ?? 'failed',
+        })),
+    };
+}
diff --git a/apps/electron-backend/src/app/events/playlist-import-performance.ts b/apps/electron-backend/src/app/events/playlist-import-performance.ts
new file mode 100644
index 000000000..f5c6dc82d
--- /dev/null
+++ b/apps/electron-backend/src/app/events/playlist-import-performance.ts
@@ -0,0 +1,215 @@
+import {
+    M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL,
+    PERFORMANCE_PHASE_BOUNDARY,
+    type M3uImportPerformancePhase,
+    type PerformancePhaseEvent,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+import { randomUUID } from 'node:crypto';
+import { channel, type Channel } from 'node:diagnostics_channel';
+import { performance } from 'node:perf_hooks';
+
+export interface M3uImportPerformanceCaptureRuntime {
+    readonly createRequestId: () => string;
+    readonly readEpochMs: () => number;
+    readonly readMonotonicMs: () => number;
+}
+
+export interface M3uImportPerformanceCapture {
+    measure<TResult>(
+        phase: M3uImportPerformancePhase,
+        execute: () => TResult,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ): TResult;
+    measureAsync<TResult>(
+        phase: M3uImportPerformancePhase,
+        execute: () => Promise<TResult>,
+        metadata?: (result: TResult) => PerformancePhaseMetadata
+    ): Promise<TResult>;
+}
+
+interface CaptureOptions {
+    readonly emit?: (
+        event: PerformancePhaseEvent<M3uImportPerformancePhase>
+    ) => void;
+    readonly enabled: boolean;
+    readonly requestId?: string;
+    readonly runtime?: M3uImportPerformanceCaptureRuntime;
+}
+
+interface PhaseStart {
+    readonly monotonicMs: number;
+    readonly phase: M3uImportPerformancePhase;
+}
+
+const DEFAULT_RUNTIME: M3uImportPerformanceCaptureRuntime = {
+    createRequestId: () => randomUUID(),
+    readEpochMs: () => performance.timeOrigin + performance.now(),
+    readMonotonicMs: () => performance.now(),
+};
+
+let performanceChannel: Channel | null = null;
+let fallbackRequestSequence = 0;
+
+export function publishM3uImportPerformancePhaseEvent(
+    event: PerformancePhaseEvent<M3uImportPerformancePhase>
+): void {
+    try {
+        performanceChannel ??= channel(
+            M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL
+        );
+        performanceChannel.publish(event);
+    } catch {
+        // Development-only instrumentation must never affect playlist import.
+    }
+}
+
+export function createM3uImportPerformanceCapture(
+    options: CaptureOptions
+): M3uImportPerformanceCapture | null {
+    if (!options.enabled) {
+        return null;
+    }
+
+    const runtime = options.runtime ?? DEFAULT_RUNTIME;
+    const requestId =
+        normalizeRequestId(options.requestId) ?? createRequestId(runtime);
+    const emit = options.emit ?? publishM3uImportPerformancePhaseEvent;
+
+    const begin = (phase: M3uImportPerformancePhase): PhaseStart => {
+        const monotonicMs = safeReadMonotonicMs(runtime);
+        safeEmit(emit, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.START,
+            durationMs: null,
+            epochMs: safeReadEpochMs(runtime),
+            metadata: undefined,
+            phase,
+            requestId,
+        });
+        return { monotonicMs, phase };
+    };
+
+    const end = (
+        start: PhaseStart,
+        createMetadata?: () => PerformancePhaseMetadata
+    ): void => {
+        const endedMonotonicMs = safeReadMonotonicMs(runtime);
+        const durationMs = Math.max(0, endedMonotonicMs - start.monotonicMs);
+        const epochMs = safeReadEpochMs(runtime);
+        safeEmit(emit, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.END,
+            durationMs: Number.isFinite(durationMs) ? durationMs : 0,
+            epochMs,
+            metadata: sanitizeMetadata(safelyCreateMetadata(createMetadata)),
+            phase: start.phase,
+            requestId,
+        });
+    };
+
+    return {
+        measure: (phase, execute, metadata) => {
+            const start = begin(phase);
+            try {
+                const result = execute();
+                end(start, metadata ? () => metadata(result) : undefined);
+                return result;
+            } catch (error) {
+                end(start);
+                throw error;
+            }
+        },
+        measureAsync: async (phase, execute, metadata) => {
+            const start = begin(phase);
+            try {
+                const result = await execute();
+                end(start, metadata ? () => metadata(result) : undefined);
+                return result;
+            } catch (error) {
+                end(start);
+                throw error;
+            }
+        },
+    };
+}
+
+function createRequestId(runtime: M3uImportPerformanceCaptureRuntime): string {
+    try {
+        const requestId = normalizeRequestId(runtime.createRequestId());
+        if (requestId) {
+            return requestId;
+        }
+    } catch {
+        // Fall through to a process-local, credential-free identifier.
+    }
+    fallbackRequestSequence += 1;
+    return `m3u-import-${Date.now()}-${fallbackRequestSequence}`;
+}
+
+function normalizeRequestId(value: unknown): string | null {
+    return typeof value === 'string' && value.length > 0 ? value : null;
+}
+
+function safeReadEpochMs(runtime: M3uImportPerformanceCaptureRuntime): number {
+    try {
+        const value = runtime.readEpochMs();
+        return Number.isFinite(value) ? value : Date.now();
+    } catch {
+        return Date.now();
+    }
+}
+
+function safeReadMonotonicMs(
+    runtime: M3uImportPerformanceCaptureRuntime
+): number {
+    try {
+        const value = runtime.readMonotonicMs();
+        return Number.isFinite(value) ? value : 0;
+    } catch {
+        return 0;
+    }
+}
+
+function safelyCreateMetadata(
+    createMetadata: (() => PerformancePhaseMetadata) | undefined
+): PerformancePhaseMetadata | undefined {
+    if (!createMetadata) {
+        return undefined;
+    }
+    try {
+        return createMetadata();
+    } catch {
+        return undefined;
+    }
+}
+
+function sanitizeMetadata(
+    metadata: PerformancePhaseMetadata | undefined
+): PerformancePhaseMetadata | undefined {
+    if (!metadata) {
+        return undefined;
+    }
+
+    const sanitized: PerformancePhaseMetadata = {};
+    if (isCount(metadata.byteCount)) {
+        (sanitized as { byteCount?: number }).byteCount = metadata.byteCount;
+    }
+    if (isCount(metadata.itemCount)) {
+        (sanitized as { itemCount?: number }).itemCount = metadata.itemCount;
+    }
+    return Object.keys(sanitized).length > 0 ? sanitized : undefined;
+}
+
+function isCount(value: unknown): value is number {
+    return Number.isSafeInteger(value) && Number(value) >= 0;
+}
+
+function safeEmit(
+    emit: (event: PerformancePhaseEvent<M3uImportPerformancePhase>) => void,
+    event: PerformancePhaseEvent<M3uImportPerformancePhase>
+): void {
+    try {
+        emit(event);
+    } catch {
+        // Instrumentation delivery is deliberately fail-neutral.
+    }
+}
diff --git a/apps/electron-backend/src/app/events/playlist-source.performance.spec.ts b/apps/electron-backend/src/app/events/playlist-source.performance.spec.ts
new file mode 100644
index 000000000..b3ac6cd25
--- /dev/null
+++ b/apps/electron-backend/src/app/events/playlist-source.performance.spec.ts
@@ -0,0 +1,312 @@
+import {
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    M3U_IMPORT_PERFORMANCE_PHASE,
+    type PerformancePhaseEvent,
+} from '@iptvnator/shared/interfaces';
+
+import {
+    createM3uImportPerformanceCapture,
+    type M3uImportPerformanceCaptureRuntime,
+} from './playlist-import-performance';
+import { fetchPlaylistFromUrl } from './playlist-source';
+
+const mockCreatePlaylistObject = jest.fn();
+const mockGetFilenameFromUrl = jest.fn();
+const mockParse = jest.fn();
+const mockRequestWithValidatedRedirects = jest.fn();
+
+jest.mock('@iptvnator/shared/m3u-utils', () => ({
+    createPlaylistObject: (...args: unknown[]) =>
+        mockCreatePlaylistObject(...args),
+    getFilenameFromUrl: (...args: unknown[]) => mockGetFilenameFromUrl(...args),
+}));
+
+jest.mock('iptv-playlist-parser', () => ({
+    parse: (...args: unknown[]) => mockParse(...args),
+}));
+
+jest.mock('../util/secure-https', () => ({
+    createPlaylistAgentFactory: jest.fn(() => jest.fn()),
+}));
+
+jest.mock('../util/validated-axios', () => ({
+    requestWithValidatedRedirects: (...args: unknown[]) =>
+        mockRequestWithValidatedRedirects(...args),
+}));
+
+type ImportPhaseEvent = PerformancePhaseEvent<
+    (typeof M3U_IMPORT_PERFORMANCE_PHASE)[keyof typeof M3U_IMPORT_PERFORMANCE_PHASE]
+>;
+
+function createRuntime(): M3uImportPerformanceCaptureRuntime {
+    const epochValues = [100, 110, 120, 130, 140, 150];
+    const monotonicValues = [10, 14, 20, 23, 30, 36];
+
+    return {
+        createRequestId: jest.fn(() => 'm3u-request-1'),
+        readEpochMs: jest.fn(() => epochValues.shift() ?? 150),
+        readMonotonicMs: jest.fn(() => monotonicValues.shift() ?? 36),
+    };
+}
+
+describe('URL playlist import performance phases', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    beforeEach(() => {
+        mockCreatePlaylistObject.mockReset();
+        mockGetFilenameFromUrl.mockReset();
+        mockParse.mockReset();
+        mockRequestWithValidatedRedirects.mockReset();
+    });
+
+    it('does not allocate phase state or read clocks while capture is disabled', async () => {
+        const runtime = {
+            createRequestId: jest.fn(() => {
+                throw new Error('request id must stay untouched');
+            }),
+            readEpochMs: jest.fn(() => {
+                throw new Error('epoch clock must stay untouched');
+            }),
+            readMonotonicMs: jest.fn(() => {
+                throw new Error('monotonic clock must stay untouched');
+            }),
+        };
+        const emit = jest.fn();
+        const playlist = { playlist: { items: [] }, title: 'Synthetic' };
+
+        mockRequestWithValidatedRedirects.mockResolvedValue({
+            data: '#EXTM3U',
+        });
+        mockParse.mockReturnValue({ items: [] });
+        mockGetFilenameFromUrl.mockReturnValue('synthetic.m3u');
+        mockCreatePlaylistObject.mockReturnValue(playlist);
+
+        const capture = createM3uImportPerformanceCapture({
+            emit,
+            enabled: false,
+            runtime,
+        });
+        const result = await fetchPlaylistFromUrl(
+            'http://127.0.0.1:43210/synthetic-performance.m3u',
+            undefined,
+            { performanceCapture: capture }
+        );
+
+        expect(capture).toBeNull();
+        expect(result).toBe(playlist);
+        expect(emit).not.toHaveBeenCalled();
+        expect(runtime.createRequestId).not.toHaveBeenCalled();
+        expect(runtime.readEpochMs).not.toHaveBeenCalled();
+        expect(runtime.readMonotonicMs).not.toHaveBeenCalled();
+    });
+
+    it('emits ordered epoch-aligned pairs with durations and only byte/item metadata', async () => {
+        const events: ImportPhaseEvent[] = [];
+        const body = '#EXTM3U\n#EXTINF:-1,One\nhttps://stream.test/1';
+        const bodyBytes = Buffer.byteLength(body, 'utf8');
+        const parsed = { items: [{ name: 'One' }, { name: 'Two' }] };
+        const playlist = {
+            playlist: { items: parsed.items },
+            title: 'Synthetic',
+        };
+
+        mockRequestWithValidatedRedirects.mockResolvedValue({
+            data: body,
+            headers: {
+                'content-length': String(bodyBytes),
+            },
+        });
+        mockParse.mockReturnValue(parsed);
+        mockGetFilenameFromUrl.mockReturnValue('synthetic.m3u');
+        mockCreatePlaylistObject.mockReturnValue(playlist);
+
+        const capture = createM3uImportPerformanceCapture({
+            emit: (event) => events.push(event),
+            enabled: true,
+            requestId: 'm3u-request-1',
+            runtime: createRuntime(),
+        });
+        const byteLength = jest.spyOn(Buffer, 'byteLength');
+        const result = await fetchPlaylistFromUrl(
+            'http://127.0.0.1:43210/synthetic-performance.m3u',
+            undefined,
+            { performanceCapture: capture }
+        );
+
+        expect(result).toBe(playlist);
+        expect(byteLength).not.toHaveBeenCalled();
+        expect(
+            events.map(
+                ({
+                    boundary,
+                    durationMs,
+                    epochMs,
+                    metadata,
+                    phase,
+                    requestId,
+                }) => ({
+                    boundary,
+                    durationMs,
+                    epochMs,
+                    metadata,
+                    phase,
+                    requestId,
+                })
+            )
+        ).toEqual([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 100,
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+                requestId: 'm3u-request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 4,
+                epochMs: 110,
+                metadata: { byteCount: bodyBytes },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+                requestId: 'm3u-request-1',
+            },
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 120,
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U,
+                requestId: 'm3u-request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 3,
+                epochMs: 130,
+                metadata: { itemCount: 2 },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U,
+                requestId: 'm3u-request-1',
+            },
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 140,
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+                requestId: 'm3u-request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 6,
+                epochMs: 150,
+                metadata: { itemCount: 2 },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+                requestId: 'm3u-request-1',
+            },
+        ]);
+        const serialized = JSON.stringify(events);
+        expect(serialized).not.toContain('127.0.0.1');
+        expect(serialized).not.toContain('stream.test');
+        expect(serialized).not.toContain('Synthetic');
+        expect(serialized).not.toContain('username');
+        expect(serialized).not.toContain('password');
+        expect(serialized).not.toContain(
+            APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE
+        );
+    });
+
+    it('preserves exact results and errors when event or metadata hooks fail', async () => {
+        const resultIdentity = { result: 'same-object' };
+        const capture = createM3uImportPerformanceCapture({
+            emit: () => {
+                throw new Error('event sink failed');
+            },
+            enabled: true,
+            requestId: 'm3u-request-2',
+            runtime: createRuntime(),
+        });
+
+        expect(
+            capture?.measure(
+                M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+                () => resultIdentity,
+                () => {
+                    throw new Error('metadata failed');
+                }
+            )
+        ).toBe(resultIdentity);
+
+        const businessError = new Error('download failed');
+        const events: ImportPhaseEvent[] = [];
+        mockRequestWithValidatedRedirects.mockRejectedValue(businessError);
+        const errorCapture = createM3uImportPerformanceCapture({
+            emit: (event) => events.push(event),
+            enabled: true,
+            requestId: 'm3u-request-3',
+            runtime: createRuntime(),
+        });
+
+        await expect(
+            fetchPlaylistFromUrl(
+                'http://127.0.0.1:43210/failure.m3u',
+                undefined,
+                {
+                    performanceCapture: errorCapture,
+                }
+            )
+        ).rejects.toBe(businessError);
+        expect(
+            events.map(({ boundary, phase }) => ({ boundary, phase }))
+        ).toEqual([
+            {
+                boundary: 'start',
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+            },
+            {
+                boundary: 'end',
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+            },
+        ]);
+    });
+
+    it('samples the end boundary before creating phase metadata', () => {
+        const events: ImportPhaseEvent[] = [];
+        let epochMs = 100;
+        let monotonicMs = 10;
+        const resultIdentity = { itemCount: 2 };
+        const capture = createM3uImportPerformanceCapture({
+            emit: (event) => events.push(event),
+            enabled: true,
+            requestId: 'm3u-request-boundary',
+            runtime: {
+                createRequestId: jest.fn(() => 'unused-request-id'),
+                readEpochMs: jest.fn(() => epochMs),
+                readMonotonicMs: jest.fn(() => monotonicMs),
+            },
+        });
+
+        const result = capture?.measure(
+            M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+            () => {
+                epochMs = 110;
+                monotonicMs = 20;
+                return resultIdentity;
+            },
+            ({ itemCount }) => {
+                epochMs = 1_110;
+                monotonicMs = 1_020;
+                return { itemCount };
+            }
+        );
+
+        expect(result).toBe(resultIdentity);
+        expect(events).toHaveLength(2);
+        expect(events[1]).toMatchObject({
+            boundary: 'end',
+            durationMs: 10,
+            epochMs: 110,
+            metadata: { itemCount: 2 },
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/events/playlist-source.ts b/apps/electron-backend/src/app/events/playlist-source.ts
index a858927cd..e147ae806 100644
--- a/apps/electron-backend/src/app/events/playlist-source.ts
+++ b/apps/electron-backend/src/app/events/playlist-source.ts
@@ -13,28 +13,104 @@ import {
     isInvalidTlsCertificateError,
 } from '../util/security-errors';
 import { requestWithValidatedRedirects } from '../util/validated-axios';
+import type { M3uImportPerformanceCapture } from './playlist-import-performance';
+import { M3U_IMPORT_PERFORMANCE_PHASE } from '@iptvnator/shared/interfaces';
 
 export interface PlaylistFetchOptions {
+    performanceCapture?: M3uImportPerformanceCapture | null;
     trustedInsecureTlsHosts?: readonly string[];
 }
 
+/**
+ * Idle timeout for every playlist download hop. Without it a host that accepts
+ * the connection and then goes silent keeps the request pending forever, which
+ * stalled the unattended startup auto-update indefinitely (issue #931).
+ * Mirrored by the playlist refresh worker.
+ */
+export const PLAYLIST_FETCH_TIMEOUT_MS = 30000;
+
+function countPlaylistItems(value: unknown): number | undefined {
+    try {
+        if (typeof value !== 'object' || value === null) {
+            return undefined;
+        }
+        const items = Reflect.get(value, 'items');
+        return Array.isArray(items) ? items.length : undefined;
+    } catch {
+        return undefined;
+    }
+}
+
+function countNormalizedPlaylistItems(value: unknown): number | undefined {
+    try {
+        if (typeof value !== 'object' || value === null) {
+            return undefined;
+        }
+        return countPlaylistItems(Reflect.get(value, 'playlist'));
+    } catch {
+        return undefined;
+    }
+}
+
+function readResponseContentLength(response: unknown): number | undefined {
+    try {
+        if (typeof response !== 'object' || response === null) {
+            return undefined;
+        }
+        const headers = Reflect.get(response, 'headers');
+        if (typeof headers !== 'object' || headers === null) {
+            return undefined;
+        }
+        const directValue = Reflect.get(headers, 'content-length');
+        const getHeader = Reflect.get(headers, 'get');
+        const value =
+            directValue ??
+            (typeof getHeader === 'function'
+                ? Reflect.apply(getHeader, headers, ['content-length'])
+                : undefined);
+        const numericValue =
+            typeof value === 'number'
+                ? value
+                : typeof value === 'string' && value.trim().length > 0
+                  ? Number(value)
+                  : Number.NaN;
+        return Number.isSafeInteger(numericValue) && numericValue >= 0
+            ? numericValue
+            : undefined;
+    } catch {
+        return undefined;
+    }
+}
+
 export async function fetchPlaylistFromUrl(
     url: string,
     title?: string,
     options: PlaylistFetchOptions = {}
 ): Promise<Playlist> {
-    let result;
-    try {
-        result = await requestWithValidatedRedirects<string>(
+    const performanceCapture = options.performanceCapture;
+    const request = () =>
+        requestWithValidatedRedirects<string>(
             url,
             {
                 agentFactory: createPlaylistAgentFactory({
                     trustedInsecureTlsHosts: options.trustedInsecureTlsHosts,
                 }),
                 method: 'GET',
+                timeout: PLAYLIST_FETCH_TIMEOUT_MS,
             },
             { allowPrivateNetworks: true }
         );
+    let result;
+    try {
+        result = performanceCapture
+            ? await performanceCapture.measureAsync(
+                  M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+                  request,
+                  (response) => ({
+                      byteCount: readResponseContentLength(response),
+                  })
+              )
+            : await request();
     } catch (error) {
         if (isInvalidTlsCertificateError(error)) {
             throw createInvalidTlsCertificateError(
@@ -44,19 +120,38 @@ export async function fetchPlaylistFromUrl(
         throw error;
     }
 
-    const parsedPlaylist = parse(result.data);
-    const extractedName = url && url.length > 1 ? getFilenameFromUrl(url) : '';
-    const playlistName =
-        !extractedName || extractedName === 'Untitled playlist'
-            ? 'Imported from URL'
-            : extractedName;
+    const parsedPlaylist = performanceCapture
+        ? performanceCapture.measure(
+              M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U,
+              () => parse(result.data),
+              (parsed) => ({ itemCount: countPlaylistItems(parsed) })
+          )
+        : parse(result.data);
+    const normalize = (): Playlist => {
+        const extractedName =
+            url && url.length > 1 ? getFilenameFromUrl(url) : '';
+        const playlistName =
+            !extractedName || extractedName === 'Untitled playlist'
+                ? 'Imported from URL'
+                : extractedName;
 
-    return createPlaylistObject(
-        title ?? playlistName,
-        parsedPlaylist,
-        url,
-        'URL'
-    );
+        return createPlaylistObject(
+            title ?? playlistName,
+            parsedPlaylist,
+            url,
+            'URL'
+        );
+    };
+
+    return performanceCapture
+        ? performanceCapture.measure(
+              M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+              normalize,
+              (playlist) => ({
+                  itemCount: countNormalizedPlaylistItems(playlist),
+              })
+          )
+        : normalize();
 }
 
 export async function fetchPlaylistFromFile(
diff --git a/apps/electron-backend/src/app/events/playlist.events.spec.ts b/apps/electron-backend/src/app/events/playlist.events.spec.ts
index c0060c242..0b12a65b1 100644
--- a/apps/electron-backend/src/app/events/playlist.events.spec.ts
+++ b/apps/electron-backend/src/app/events/playlist.events.spec.ts
@@ -1,14 +1,18 @@
 import type {
+    AutoUpdatePlaylistsResult,
     Playlist,
     PlaylistRefreshEvent,
     PlaylistRefreshPayload,
 } from '@iptvnator/shared/interfaces';
 import {
     AUTO_UPDATE_PLAYLISTS,
+    M3U_IMPORT_PERFORMANCE_PHASE,
+    M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL,
     PLAYLIST_CANCEL_REFRESH,
     PLAYLIST_REFRESH,
     PLAYLIST_REFRESH_EVENT,
 } from '@iptvnator/shared/interfaces';
+import { channel } from 'node:diagnostics_channel';
 import { resolve } from 'node:path';
 
 type IpcHandler = (event: MockIpcEvent, ...args: unknown[]) => Promise<unknown>;
@@ -40,6 +44,8 @@ const mockCreatePlaylistObject = jest.fn();
 const mockGetFilenameFromUrl = jest.fn();
 const mockResolveWorkerRuntimeBootstrap = jest.fn();
 const mockWorkerInstances: MockWorker[] = [];
+const PERF_CAPTURE_ENV = 'IPTVNATOR_PERF_CAPTURE';
+const originalPerformanceCaptureValue = process.env[PERF_CAPTURE_ENV];
 
 jest.mock('electron', () => ({
     app: {
@@ -168,6 +174,11 @@ describe('playlist IPC events', () => {
     });
 
     afterEach(() => {
+        if (originalPerformanceCaptureValue === undefined) {
+            delete process.env[PERF_CAPTURE_ENV];
+        } else {
+            process.env[PERF_CAPTURE_ENV] = originalPerformanceCaptureValue;
+        }
         consoleErrorSpy.mockRestore();
         consoleLogSpy.mockRestore();
         consoleWarnSpy.mockRestore();
@@ -195,6 +206,7 @@ describe('playlist IPC events', () => {
                 httpsAgent: expect.any(Object),
                 maxRedirects: 0,
                 method: 'GET',
+                timeout: 30000,
                 url: 'https://example.test/remote.m3u',
             })
         );
@@ -208,6 +220,101 @@ describe('playlist IPC events', () => {
         expect(result).toEqual(playlist);
     });
 
+    it('publishes request-scoped URL import phases only through the opt-in internal channel', async () => {
+        process.env[PERF_CAPTURE_ENV] = '1';
+        const body = '#EXTM3U\n#EXTINF:-1,News\nhttps://stream.test/news';
+        const parsedPlaylist = { items: [{ name: 'News' }] };
+        const playlist = createPlaylist({
+            title: 'synthetic-performance.m3u',
+            url: 'http://127.0.0.1:43210/synthetic-performance.m3u',
+        });
+        const events: unknown[] = [];
+        const performanceChannel = channel(
+            M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL
+        );
+        const subscriber = (event: unknown) => events.push(event);
+
+        mockAxiosGet.mockResolvedValue({
+            data: body,
+            headers: {
+                'content-length': String(Buffer.byteLength(body, 'utf8')),
+            },
+        });
+        mockParse.mockReturnValue(parsedPlaylist);
+        mockGetFilenameFromUrl.mockReturnValue('synthetic-performance.m3u');
+        mockCreatePlaylistObject.mockReturnValue(playlist);
+        performanceChannel.subscribe(subscriber);
+
+        try {
+            await expect(
+                getHandler('fetch-playlist-by-url')(
+                    createIpcEvent(),
+                    'http://127.0.0.1:43210/synthetic-performance.m3u'
+                )
+            ).resolves.toBe(playlist);
+        } finally {
+            performanceChannel.unsubscribe(subscriber);
+        }
+
+        expect(
+            events.map((event) => {
+                const marker = event as {
+                    boundary: string;
+                    metadata?: { byteCount?: number; itemCount?: number };
+                    phase: string;
+                    requestId: string;
+                };
+                return {
+                    boundary: marker.boundary,
+                    metadata: marker.metadata,
+                    phase: marker.phase,
+                    requestIdType: typeof marker.requestId,
+                };
+            })
+        ).toEqual([
+            {
+                boundary: 'start',
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+                requestIdType: 'string',
+            },
+            {
+                boundary: 'end',
+                metadata: { byteCount: Buffer.byteLength(body, 'utf8') },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.DATA_ACQUIRE,
+                requestIdType: 'string',
+            },
+            {
+                boundary: 'start',
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U,
+                requestIdType: 'string',
+            },
+            {
+                boundary: 'end',
+                metadata: { itemCount: 1 },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.PARSE_M3U,
+                requestIdType: 'string',
+            },
+            {
+                boundary: 'start',
+                metadata: undefined,
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+                requestIdType: 'string',
+            },
+            {
+                boundary: 'end',
+                metadata: { itemCount: 1 },
+                phase: M3U_IMPORT_PERFORMANCE_PHASE.NORMALIZE,
+                requestIdType: 'string',
+            },
+        ]);
+        expect(
+            new Set(events.map((event) => (event as any).requestId)).size
+        ).toBe(1);
+        expect(JSON.stringify(events)).not.toContain('stream.test');
+    });
+
     it('returns null when the open playlist dialog is cancelled', async () => {
         mockShowOpenDialog.mockResolvedValue({
             canceled: true,
@@ -288,31 +395,32 @@ describe('playlist IPC events', () => {
         mockReadFile.mockResolvedValue('#EXTM3U file');
         mockParse.mockReturnValue(parsedPlaylist);
         mockGetFilenameFromUrl.mockReturnValue('list.m3u');
-        mockCreatePlaylistObject
-            .mockReturnValueOnce(
-                createPlaylist({
-                    _id: 'new-url-playlist',
-                    autoRefresh: false,
-                    favorites: [],
-                    title: 'Updated URL playlist',
-                    url: 'https://example.test/list.m3u',
-                })
-            )
-            .mockReturnValueOnce(
-                createPlaylist({
-                    _id: 'new-file-playlist',
-                    autoRefresh: true,
-                    filePath: '/playlists/local.m3u',
-                    title: 'Updated file playlist',
-                })
-            );
-
-        const result = await getHandler(AUTO_UPDATE_PLAYLISTS)(
-            createIpcEvent(),
-            sourcePlaylists
+        // Auto-update refreshes playlists concurrently, so the fixtures are
+        // keyed by source type instead of by call order.
+        mockCreatePlaylistObject.mockImplementation(
+            (_title, _parsed, _source, type) =>
+                type === 'URL'
+                    ? createPlaylist({
+                          _id: 'new-url-playlist',
+                          autoRefresh: false,
+                          favorites: [],
+                          title: 'Updated URL playlist',
+                          url: 'https://example.test/list.m3u',
+                      })
+                    : createPlaylist({
+                          _id: 'new-file-playlist',
+                          autoRefresh: true,
+                          filePath: '/playlists/local.m3u',
+                          title: 'Updated file playlist',
+                      })
         );
 
-        expect(result).toEqual([
+        const result = (await getHandler(AUTO_UPDATE_PLAYLISTS)(
+            createIpcEvent(),
+            sourcePlaylists
+        )) as AutoUpdatePlaylistsResult;
+
+        expect(result.playlists).toEqual([
             expect.objectContaining({
                 _id: 'url-playlist',
                 autoRefresh: true,
@@ -327,11 +435,29 @@ describe('playlist IPC events', () => {
                 title: 'Updated file playlist',
             }),
         ]);
+        expect(result.outcomes).toEqual([
+            {
+                playlistId: 'url-playlist',
+                status: 'updated',
+                title: 'URL playlist',
+            },
+            {
+                playlistId: 'file-playlist',
+                status: 'updated',
+                title: 'File playlist',
+            },
+            {
+                playlistId: 'missing-source',
+                status: 'skipped',
+                title: 'Missing source',
+            },
+        ]);
         expect(mockAxiosGet).toHaveBeenCalledWith(
             expect.objectContaining({
                 httpsAgent: expect.any(Object),
                 maxRedirects: 0,
                 method: 'GET',
+                timeout: 30000,
                 url: 'https://example.test/list.m3u',
             })
         );
@@ -344,6 +470,61 @@ describe('playlist IPC events', () => {
         );
     });
 
+    it('reports failed playlists as failed outcomes instead of dropping them silently', async () => {
+        const sourcePlaylists: Playlist[] = [
+            createPlaylist({
+                _id: 'unreachable-playlist',
+                filePath: undefined,
+                title: 'Unreachable playlist',
+                url: 'https://unreachable.test/list.m3u',
+            }),
+            createPlaylist({
+                _id: 'file-playlist',
+                filePath: '/playlists/local.m3u',
+                importDate: '',
+                title: 'File playlist',
+                url: undefined,
+            }),
+        ];
+
+        mockAxiosGet.mockRejectedValue(
+            new Error('timeout of 30000ms exceeded')
+        );
+        mockReadFile.mockResolvedValue('#EXTM3U file');
+        mockParse.mockReturnValue({ items: [{ name: 'Updated' }] });
+        mockCreatePlaylistObject.mockReturnValue(
+            createPlaylist({
+                _id: 'new-file-playlist',
+                filePath: '/playlists/local.m3u',
+                title: 'Updated file playlist',
+            })
+        );
+
+        const result = (await getHandler(AUTO_UPDATE_PLAYLISTS)(
+            createIpcEvent(),
+            sourcePlaylists
+        )) as AutoUpdatePlaylistsResult;
+
+        expect(result.playlists).toEqual([
+            expect.objectContaining({
+                _id: 'file-playlist',
+                title: 'Updated file playlist',
+            }),
+        ]);
+        expect(result.outcomes).toEqual([
+            {
+                playlistId: 'unreachable-playlist',
+                status: 'failed',
+                title: 'Unreachable playlist',
+            },
+            {
+                playlistId: 'file-playlist',
+                status: 'updated',
+                title: 'File playlist',
+            },
+        ]);
+    });
+
     it('forwards playlist refresh worker events, resolves successful responses, and cleans up the worker', async () => {
         const ipcEvent = createIpcEvent();
         const payload: PlaylistRefreshPayload = {
@@ -451,7 +632,94 @@ describe('playlist IPC events', () => {
         expect(worker.terminate).toHaveBeenCalled();
     });
 
-    it('routes refresh cancellation to the active worker and converts worker error responses to Error instances', async () => {
+    it('settles cancellation without waiting for a CPU-bound refresh worker', async () => {
+        const ipcEvent = createIpcEvent();
+        const payload: PlaylistRefreshPayload = {
+            operationId: 'refresh-busy',
+            playlistId: 'playlist-busy',
+            title: 'Busy playlist',
+            filePath: '/playlists/busy.m3u',
+        };
+        const refreshPromise = getHandler(PLAYLIST_REFRESH)(ipcEvent, payload);
+        const worker = mockWorkerInstances[0];
+        let outcome:
+            | { error: unknown; status: 'rejected' }
+            | { status: 'resolved'; value: unknown }
+            | undefined;
+        void refreshPromise.then(
+            (value) => {
+                outcome = { status: 'resolved', value };
+            },
+            (error: unknown) => {
+                outcome = { error, status: 'rejected' };
+            }
+        );
+
+        worker.emit('message', { type: 'ready' });
+        worker.emit('message', {
+            event: {
+                operationId: payload.operationId,
+                phase: 'parsing',
+                playlistId: payload.playlistId,
+                status: 'progress',
+            } satisfies PlaylistRefreshEvent,
+            type: 'event',
+        });
+
+        let finishTermination: ((exitCode: number) => void) | undefined;
+        worker.terminate.mockImplementationOnce(
+            () =>
+                new Promise<number>((resolveTermination) => {
+                    finishTermination = resolveTermination;
+                })
+        );
+        const cancelPromise = getHandler(PLAYLIST_CANCEL_REFRESH)(
+            createIpcEvent(),
+            payload.operationId
+        );
+        await Promise.resolve();
+
+        expect(worker.removeAllListeners).toHaveBeenCalledTimes(1);
+        expect(worker.terminate).toHaveBeenCalledTimes(1);
+        expect(worker.postMessage).toHaveBeenLastCalledWith({
+            operationId: payload.operationId,
+            type: 'cancel',
+        });
+        expect(outcome).toBeUndefined();
+        expect(ipcEvent.sender.send).not.toHaveBeenCalledWith(
+            PLAYLIST_REFRESH_EVENT,
+            expect.objectContaining({ status: 'cancelled' })
+        );
+
+        finishTermination?.(1);
+        await expect(cancelPromise).resolves.toEqual({ success: true });
+        await Promise.resolve();
+
+        expect(outcome).toEqual({
+            status: 'resolved',
+            value: {
+                operationId: payload.operationId,
+                type: 'playlist-refresh-cancelled',
+            },
+        });
+        expect(ipcEvent.sender.send).toHaveBeenLastCalledWith(
+            PLAYLIST_REFRESH_EVENT,
+            {
+                operationId: payload.operationId,
+                phase: 'parsing',
+                playlistId: payload.playlistId,
+                status: 'cancelled',
+            }
+        );
+        await expect(
+            getHandler(PLAYLIST_CANCEL_REFRESH)(
+                createIpcEvent(),
+                payload.operationId
+            )
+        ).resolves.toEqual({ success: false });
+    });
+
+    it('converts playlist refresh worker error responses to Error instances', async () => {
         const payload: PlaylistRefreshPayload = {
             operationId: 'refresh-error',
             playlistId: 'playlist-error',
@@ -464,17 +732,6 @@ describe('playlist IPC events', () => {
         );
         const worker = mockWorkerInstances[0];
 
-        expect(
-            await getHandler(PLAYLIST_CANCEL_REFRESH)(
-                createIpcEvent(),
-                'refresh-error'
-            )
-        ).toEqual({ success: true });
-        expect(worker.postMessage).toHaveBeenCalledWith({
-            operationId: 'refresh-error',
-            type: 'cancel',
-        });
-
         const rejectedRefresh = expect(refreshPromise).rejects.toMatchObject({
             message: 'Refresh failed',
             name: 'PlaylistRefreshFailure',
@@ -492,13 +749,6 @@ describe('playlist IPC events', () => {
         });
 
         await rejectedRefresh;
-
-        expect(
-            await getHandler(PLAYLIST_CANCEL_REFRESH)(
-                createIpcEvent(),
-                'refresh-error'
-            )
-        ).toEqual({ success: false });
     });
 
     it('returns save dialog paths and writes files through the filesystem handler', async () => {
diff --git a/apps/electron-backend/src/app/events/playlist.events.ts b/apps/electron-backend/src/app/events/playlist.events.ts
index 1fdbf34af..71ea32af1 100644
--- a/apps/electron-backend/src/app/events/playlist.events.ts
+++ b/apps/electron-backend/src/app/events/playlist.events.ts
@@ -11,24 +11,29 @@ import {
     AUTO_UPDATE_PLAYLISTS,
     PLAYLIST_CANCEL_REFRESH,
     PLAYLIST_REFRESH,
+    PLAYLIST_REFRESH_CANCELLED_RESULT_TYPE,
     PLAYLIST_REFRESH_EVENT,
     ElectronBridgeTrustOptions,
     Playlist,
+    PlaylistRefreshCancelledResult,
     PlaylistRefreshEvent,
     PlaylistRefreshPayload,
+    summarizeAutoUpdateOutcomes,
 } from '@iptvnator/shared/interfaces';
 import { resolveWorkerRuntimeBootstrap } from '../workers/worker-runtime-paths';
 import type {
     PlaylistRefreshWorkerMessage,
     PlaylistRefreshWorkerResponseMessage,
 } from '../workers/playlist-refresh.worker.types';
+import { autoUpdatePlaylists } from './playlist-auto-update';
 import {
     derivePlaylistTitleFromFilePath,
     fetchPlaylistFromFile,
     fetchPlaylistFromUrl,
-    preserveAutoUpdatedPlaylistFields,
 } from './playlist-source';
 import { PlaylistWriteAuthorizer } from './playlist-write-authorization';
+import { createM3uImportPerformanceCapture } from './playlist-import-performance';
+import { isPerformanceCaptureEnabled } from '../services/debug-trace';
 
 export default class PlaylistEvents {
     static bootstrapPlaylistEvents(): Electron.IpcMain {
@@ -39,10 +44,7 @@ export default class PlaylistEvents {
 const playlistWriteAuthorizer = new PlaylistWriteAuthorizer();
 
 type ActivePlaylistRefresh = {
-    reject: (reason?: unknown) => void;
-    resolve: (value: Playlist) => void;
-    sender: WebContents;
-    worker: Worker;
+    cancel: () => Promise<void>;
 };
 
 const activePlaylistRefreshes = new Map<string, ActivePlaylistRefresh>();
@@ -95,7 +97,11 @@ ipcMain.handle(
         options?: ElectronBridgeTrustOptions
     ) => {
         try {
+            const performanceCapture = createM3uImportPerformanceCapture({
+                enabled: isPerformanceCaptureEnabled(),
+            });
             return await fetchPlaylistFromUrl(url, title, {
+                performanceCapture,
                 trustedInsecureTlsHosts: options?.trustedInsecureTlsHosts,
             });
         } catch (error) {
@@ -152,61 +158,15 @@ ipcMain.handle(
     ) => {
         console.log(`Auto-updating ${playlists.length} playlist(s)...`);
 
-        const updatedPlaylists: Playlist[] = [];
-
-        for (const playlist of playlists) {
-            try {
-                let playlistObject;
-
-                if (playlist.importDate && playlist.url) {
-                    // Update from URL
-                    console.log(
-                        `Updating playlist "${playlist.title}" from URL: ${playlist.url}`
-                    );
-                    playlistObject = await fetchPlaylistFromUrl(
-                        playlist.url,
-                        playlist.title,
-                        {
-                            trustedInsecureTlsHosts:
-                                options?.trustedInsecureTlsHosts,
-                        }
-                    );
-                } else if (playlist.filePath) {
-                    // Update from file path
-                    console.log(
-                        `Updating playlist "${playlist.title}" from file: ${playlist.filePath}`
-                    );
-                    playlistObject = await fetchPlaylistFromFile(
-                        playlist.filePath,
-                        playlist.title
-                    );
-                } else {
-                    console.warn(
-                        `Skipping playlist "${playlist.title}": no URL or file path found`
-                    );
-                    continue;
-                }
-
-                updatedPlaylists.push(
-                    preserveAutoUpdatedPlaylistFields(playlistObject, playlist)
-                );
-
-                console.log(
-                    `Successfully updated playlist "${playlist.title}"`
-                );
-            } catch (error) {
-                console.error(
-                    `Failed to update playlist "${playlist.title}":`,
-                    error
-                );
-                // Continue with other playlists even if one fails
-            }
-        }
+        const result = await autoUpdatePlaylists(playlists, {
+            trustedInsecureTlsHosts: options?.trustedInsecureTlsHosts,
+        });
+        const summary = summarizeAutoUpdateOutcomes(result.outcomes);
 
         console.log(
-            `Auto-update completed: ${updatedPlaylists.length} updated`
+            `Auto-update completed: ${summary.updated} updated, ${summary.failed} failed, ${summary.skipped} skipped`
         );
-        return updatedPlaylists;
+        return result;
     }
 );
 
@@ -215,76 +175,126 @@ ipcMain.handle(
     async (event, payload: PlaylistRefreshPayload) => {
         const worker = resolvePlaylistRefreshWorker();
 
-        return await new Promise<Playlist>((resolve, reject) => {
-            const cleanup = async (): Promise<void> => {
-                activePlaylistRefreshes.delete(payload.operationId);
-                worker.removeAllListeners();
-                await worker.terminate().catch(() => undefined);
-            };
+        return await new Promise<Playlist | PlaylistRefreshCancelledResult>(
+            (resolve, reject) => {
+                let cleanupPromise: Promise<void> | null = null;
+                let lastPhase: PlaylistRefreshEvent['phase'] = payload.url
+                    ? 'fetching'
+                    : 'reading-file';
+                let settled = false;
 
-            activePlaylistRefreshes.set(payload.operationId, {
-                worker,
-                sender: event.sender,
-                resolve,
-                reject,
-            });
+                const cleanup = (): Promise<void> => {
+                    cleanupPromise ??= (async () => {
+                        activePlaylistRefreshes.delete(payload.operationId);
+                        worker.removeAllListeners();
+                        await worker.terminate().catch(() => undefined);
+                    })();
+                    return cleanupPromise;
+                };
 
-            worker.on(
-                'message',
-                async (message: PlaylistRefreshWorkerMessage<Playlist>) => {
-                    if (message.type === 'ready') {
-                        worker.postMessage({
-                            type: 'request',
-                            payload,
-                        });
+                const cancel = async (): Promise<void> => {
+                    if (settled) {
                         return;
                     }
+                    settled = true;
 
-                    if (message.type === 'event') {
-                        emitPlaylistRefreshEvent(event.sender, message.event);
-                        return;
+                    try {
+                        worker.postMessage({
+                            type: 'cancel',
+                            operationId: payload.operationId,
+                        });
+                    } catch {
+                        // Termination below is authoritative even if cooperative
+                        // cancellation cannot be delivered.
                     }
 
                     await cleanup();
+                    emitPlaylistRefreshEvent(event.sender, {
+                        operationId: payload.operationId,
+                        playlistId: payload.playlistId,
+                        phase: lastPhase,
+                        status: 'cancelled',
+                    });
+                    resolve({
+                        operationId: payload.operationId,
+                        type: PLAYLIST_REFRESH_CANCELLED_RESULT_TYPE,
+                    });
+                };
 
-                    const response =
-                        message as PlaylistRefreshWorkerResponseMessage<Playlist>;
-                    if (response.success && response.result) {
-                        resolve(response.result);
+                const activeRefresh: ActivePlaylistRefresh = { cancel };
+                activePlaylistRefreshes.set(payload.operationId, activeRefresh);
+
+                worker.on(
+                    'message',
+                    async (message: PlaylistRefreshWorkerMessage<Playlist>) => {
+                        if (settled) {
+                            return;
+                        }
+
+                        if (message.type === 'ready') {
+                            worker.postMessage({
+                                type: 'request',
+                                payload,
+                            });
+                            return;
+                        }
+
+                        if (message.type === 'event') {
+                            lastPhase = message.event.phase ?? lastPhase;
+                            emitPlaylistRefreshEvent(
+                                event.sender,
+                                message.event
+                            );
+                            return;
+                        }
+
+                        settled = true;
+                        await cleanup();
+
+                        const response =
+                            message as PlaylistRefreshWorkerResponseMessage<Playlist>;
+                        if (response.success && response.result) {
+                            resolve(response.result);
+                            return;
+                        }
+
+                        reject(
+                            createPlaylistRefreshError(
+                                response.error ?? {
+                                    message:
+                                        'Playlist refresh worker request failed',
+                                }
+                            )
+                        );
+                    }
+                );
+
+                worker.on('error', async (error) => {
+                    if (settled) {
+                        return;
+                    }
+                    settled = true;
+                    await cleanup();
+                    reject(error);
+                });
+
+                worker.on('exit', async (code) => {
+                    if (settled) {
                         return;
                     }
 
+                    settled = true;
+                    await cleanup();
                     reject(
-                        createPlaylistRefreshError(
-                            response.error ?? {
-                                message:
-                                    'Playlist refresh worker request failed',
-                            }
+                        new Error(
+                            code === 0
+                                ? 'Playlist refresh worker exited unexpectedly'
+                                : `Playlist refresh worker stopped with exit code ${code}`
                         )
                     );
-                }
-            );
-
-            worker.on('error', async (error) => {
-                await cleanup();
-                reject(error);
-            });
-
-            worker.on('exit', async (code) => {
-                if (!activePlaylistRefreshes.has(payload.operationId)) {
-                    return;
-                }
-
-                await cleanup();
-                reject(
-                    new Error(
-                        code === 0
-                            ? 'Playlist refresh worker exited unexpectedly'
-                            : `Playlist refresh worker stopped with exit code ${code}`
-                    )
-                );
-            });
-        });
+                });
+            }
+        );
     }
 );
 
@@ -296,10 +306,7 @@ ipcMain.handle(
             return { success: false };
         }
 
-        activeRefresh.worker.postMessage({
-            type: 'cancel',
-            operationId,
-        });
+        await activeRefresh.cancel();
 
         return { success: true };
     }
diff --git a/apps/electron-backend/src/app/events/portal-debug.events.spec.ts b/apps/electron-backend/src/app/events/portal-debug.events.spec.ts
index 9912c78f3..b64c4ead5 100644
--- a/apps/electron-backend/src/app/events/portal-debug.events.spec.ts
+++ b/apps/electron-backend/src/app/events/portal-debug.events.spec.ts
@@ -87,4 +87,37 @@ describe('sanitizePortalDebugEvent', () => {
             },
         });
     });
+
+    it('redacts credentials in request, response, errors, and URL query params', () => {
+        const secrets = {
+            username: 'main-user-secret',
+            password: 'main-password-secret',
+            token: 'main-token-secret',
+            authorization: 'main-authorization-secret',
+            mac: 'main-mac-secret',
+        };
+        const event = sanitizePortalDebugEvent({
+            requestId: 'req-redaction',
+            provider: 'stalker',
+            operation: 'get_profile',
+            transport: 'electron-main',
+            startedAt: new Date().toISOString(),
+            durationMs: 5,
+            status: 'error',
+            request: {
+                params: secrets,
+                url: `https://example.com/portal?token=${secrets.token}&action=get_profile`,
+            },
+            error: new Error(
+                `Request failed: https://example.com/portal?authorization=${secrets.authorization}&action=get_profile`
+            ),
+        });
+
+        const output = JSON.stringify(event);
+        for (const secret of Object.values(secrets)) {
+            expect(output).not.toContain(secret);
+        }
+        expect(output).toContain('get_profile');
+        expect(output).toContain('req-redaction');
+    });
 });
diff --git a/apps/electron-backend/src/app/events/portal-debug.events.ts b/apps/electron-backend/src/app/events/portal-debug.events.ts
index 153efee15..c9fb68142 100644
--- a/apps/electron-backend/src/app/events/portal-debug.events.ts
+++ b/apps/electron-backend/src/app/events/portal-debug.events.ts
@@ -1,117 +1,19 @@
 import { BrowserWindow } from 'electron';
-import { PORTAL_DEBUG_EVENT, PortalDebugEvent } from '@iptvnator/shared/interfaces';
+import {
+    PORTAL_DEBUG_EVENT,
+    PortalDebugEvent,
+} from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
 import { environment } from '../../environments/environment';
 
-const MAX_DEBUG_DEPTH = 6;
-
-function sanitizePortalDebugValue(
-    value: unknown,
-    seen = new WeakSet<object>(),
-    depth = 0
-): unknown {
-    if (
-        value == null ||
-        typeof value === 'string' ||
-        typeof value === 'number' ||
-        typeof value === 'boolean'
-    ) {
-        return value;
-    }
-
-    if (typeof value === 'bigint') {
-        return value.toString();
-    }
-
-    if (
-        typeof value === 'function' ||
-        typeof value === 'symbol'
-    ) {
-        return undefined;
-    }
-
-    if (depth >= MAX_DEBUG_DEPTH) {
-        return '[MaxDepth]';
-    }
-
-    if (value instanceof Error) {
-        const baseError = {
-            name: value.name,
-            message: value.message,
-            stack: value.stack,
-        } as Record<string, unknown>;
-
-        for (const [key, entry] of Object.entries(
-            value as unknown as Record<string, unknown>
-        )) {
-            baseError[key] = sanitizePortalDebugValue(
-                entry,
-                seen,
-                depth + 1
-            );
-        }
-
-        return baseError;
-    }
-
-    if (value instanceof Date) {
-        return value.toISOString();
-    }
-
-    if (value instanceof URL) {
-        return value.toString();
-    }
-
-    if (Array.isArray(value)) {
-        return value.map((entry) =>
-            sanitizePortalDebugValue(entry, seen, depth + 1)
-        );
-    }
-
-    if (value instanceof Map) {
-        return Object.fromEntries(
-            [...value.entries()].map(([key, entry]) => [
-                String(key),
-                sanitizePortalDebugValue(entry, seen, depth + 1),
-            ])
-        );
-    }
-
-    if (value instanceof Set) {
-        return [...value].map((entry) =>
-            sanitizePortalDebugValue(entry, seen, depth + 1)
-        );
-    }
-
-    if (typeof value === 'object') {
-        if (seen.has(value)) {
-            return '[Circular]';
-        }
-
-        seen.add(value);
-
-        const entries = Object.entries(value as Record<string, unknown>).map(
-            ([key, entry]) => [
-                key,
-                sanitizePortalDebugValue(entry, seen, depth + 1),
-            ]
-        );
-
-        seen.delete(value);
-
-        return Object.fromEntries(entries);
-    }
-
-    return String(value);
-}
-
 export function sanitizePortalDebugEvent(
     event: PortalDebugEvent
 ): PortalDebugEvent {
     return {
         ...event,
-        request: sanitizePortalDebugValue(event.request),
-        response: sanitizePortalDebugValue(event.response),
-        error: sanitizePortalDebugValue(event.error),
+        request: redactSensitiveData(event.request),
+        response: redactSensitiveData(event.response),
+        error: redactSensitiveData(event.error),
     };
 }
 
diff --git a/apps/electron-backend/src/app/events/remote-control-http.spec.ts b/apps/electron-backend/src/app/events/remote-control-http.spec.ts
new file mode 100644
index 000000000..fc8c7617b
--- /dev/null
+++ b/apps/electron-backend/src/app/events/remote-control-http.spec.ts
@@ -0,0 +1,264 @@
+import {
+    bootstrapRemoteControl as bootstrapRemoteControlWith,
+    createBodyAtByteLength,
+    getIpcListener,
+    invokeHttpHandler,
+    JSON_HEADERS,
+    METHOD_NOT_ALLOWED_RESPONSE,
+    mockFirstRendererSend,
+    mockGetAllWindows,
+    mockIpcHandle,
+    mockIpcOn,
+    mockRegisterRemoteControlHandler,
+    mockSecondRendererSend,
+    mockStartHttpServer,
+    mockStoreGet,
+    REMOTE_CONTROL_PATHS,
+    resetRemoteControlMocks,
+    SUCCESS_RESPONSE,
+    type RemoteControlSettings,
+} from './remote-control.test-helpers';
+
+jest.mock('electron', () => ({
+    BrowserWindow: {
+        getAllWindows: mockGetAllWindows,
+    },
+    ipcMain: {
+        handle: mockIpcHandle,
+        on: mockIpcOn,
+    },
+}));
+
+jest.mock('../server/http-server', () => ({
+    httpServer: {
+        registerRemoteControlHandler: mockRegisterRemoteControlHandler,
+        start: mockStartHttpServer,
+    },
+}));
+
+jest.mock('../services/store.service', () => ({
+    store: {
+        get: mockStoreGet,
+    },
+}));
+
+import { RemoteControlEvents } from './remote-control.events';
+
+const bootstrapRemoteControl = (settings?: RemoteControlSettings) =>
+    bootstrapRemoteControlWith(RemoteControlEvents, settings);
+
+describe('RemoteControlEvents HTTP endpoints', () => {
+    let consoleLog: jest.SpyInstance;
+    let consoleWarn: jest.SpyInstance;
+
+    beforeEach(() => {
+        resetRemoteControlMocks();
+        consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+        consoleWarn = jest
+            .spyOn(console, 'warn')
+            .mockImplementation(() => undefined);
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+        consoleLog.mockRestore();
+        consoleWarn.mockRestore();
+    });
+
+    it('rejects POST on the status endpoint', async () => {
+        bootstrapRemoteControl();
+
+        const result = await invokeHttpHandler(REMOTE_CONTROL_PATHS.STATUS, {
+            method: 'POST',
+        });
+
+        expect(result.response).toEqual(METHOD_NOT_ALLOWED_RESPONSE);
+        expect(mockFirstRendererSend).not.toHaveBeenCalled();
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it('floors a finite positive channel number and dispatches it', async () => {
+        bootstrapRemoteControl();
+
+        const result = await invokeHttpHandler(
+            REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+            {
+                method: 'POST',
+                body: JSON.stringify({ number: 7.9 }),
+            }
+        );
+
+        expect(result.response).toEqual(SUCCESS_RESPONSE);
+        expect(mockFirstRendererSend).toHaveBeenCalledWith(
+            'REMOTE_CONTROL_COMMAND',
+            {
+                type: 'channel-select-number',
+                number: 7,
+            }
+        );
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it.each([
+        { label: 'missing', body: '{}' },
+        { label: 'zero', body: '{"number":0}' },
+        { label: 'negative', body: '{"number":-2}' },
+        { label: 'infinite', body: '{"number":1e309}' },
+        { label: 'nonnumeric', body: '{"number":"seven"}' },
+    ])('rejects a $label channel number', async ({ body }) => {
+        bootstrapRemoteControl();
+
+        const result = await invokeHttpHandler(
+            REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+            {
+                method: 'POST',
+                body,
+            }
+        );
+
+        expect(result.response).toEqual({
+            statusCode: 400,
+            headers: JSON_HEADERS,
+            body: JSON.stringify({ error: 'Invalid channel number' }),
+        });
+        expect(mockGetAllWindows).not.toHaveBeenCalled();
+        expect(mockFirstRendererSend).not.toHaveBeenCalled();
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it('rejects malformed JSON without dispatching', async () => {
+        bootstrapRemoteControl();
+
+        const result = await invokeHttpHandler(
+            REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+            {
+                method: 'POST',
+                body: '{"number":',
+            }
+        );
+
+        expect(result.response).toEqual({
+            statusCode: 400,
+            headers: JSON_HEADERS,
+            body: JSON.stringify({ error: 'Invalid JSON payload' }),
+        });
+        expect(mockGetAllWindows).not.toHaveBeenCalled();
+        expect(mockFirstRendererSend).not.toHaveBeenCalled();
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it('accepts a valid JSON request at the 10,240-byte body limit', async () => {
+        bootstrapRemoteControl();
+        const body = createBodyAtByteLength(10 * 1024);
+
+        const result = await invokeHttpHandler(
+            REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+            {
+                method: 'POST',
+                body,
+            }
+        );
+
+        expect(Buffer.byteLength(body, 'utf8')).toBe(10_240);
+        expect(result.response).toEqual(SUCCESS_RESPONSE);
+        expect(mockFirstRendererSend).toHaveBeenCalledWith(
+            'REMOTE_CONTROL_COMMAND',
+            {
+                type: 'channel-select-number',
+                number: 7,
+            }
+        );
+    });
+
+    it('rejects and destroys a 10,241-byte request without dispatching', async () => {
+        bootstrapRemoteControl();
+        const body = Buffer.alloc(10 * 1024 + 1, 'x');
+
+        const result = await invokeHttpHandler(
+            REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+            {
+                method: 'POST',
+                body,
+            }
+        );
+        await result.requestClosed;
+
+        expect(body.byteLength).toBe(10_241);
+        expect(result.response).toEqual({
+            statusCode: 413,
+            headers: JSON_HEADERS,
+            body: JSON.stringify({ error: 'Payload too large' }),
+        });
+        expect(result.request.destroyed).toBe(true);
+        expect(result.requestErrors).toEqual([]);
+        expect(mockGetAllWindows).not.toHaveBeenCalled();
+        expect(mockFirstRendererSend).not.toHaveBeenCalled();
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it('merges partial status updates and refreshes updatedAt', async () => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date('2026-07-25T10:00:00.000Z'));
+        bootstrapRemoteControl();
+        const updateStatus = getIpcListener('REMOTE_CONTROL_STATUS_UPDATE');
+
+        jest.setSystemTime(new Date('2026-07-25T10:01:00.000Z'));
+        updateStatus(
+            {},
+            {
+                portal: 'm3u',
+                isLiveView: true,
+                channelName: 'News',
+                volume: 35,
+            }
+        );
+        jest.setSystemTime(new Date('2026-07-25T10:02:00.000Z'));
+        updateStatus({}, { channelName: 'Sports', muted: true });
+
+        const result = await invokeHttpHandler(REMOTE_CONTROL_PATHS.STATUS, {
+            method: 'GET',
+        });
+
+        expect(result.response).toEqual({
+            statusCode: 200,
+            headers: JSON_HEADERS,
+            body: JSON.stringify({
+                portal: 'm3u',
+                isLiveView: true,
+                supportsVolume: false,
+                updatedAt: '2026-07-25T10:02:00.000Z',
+                channelName: 'Sports',
+                volume: 35,
+                muted: true,
+            }),
+        });
+    });
+
+    it.each([
+        {
+            path: REMOTE_CONTROL_PATHS.CHANNEL_UP,
+            warning: 'No browser windows found to send channel change',
+        },
+        {
+            path: REMOTE_CONTROL_PATHS.VOLUME_UP,
+            warning: 'No browser windows found to send remote command',
+        },
+    ])(
+        'returns success and warns instead of throwing when $path has no renderer',
+        async ({ path, warning }) => {
+            mockGetAllWindows.mockReturnValue([]);
+            bootstrapRemoteControl();
+
+            await expect(
+                invokeHttpHandler(path, { method: 'POST' })
+            ).resolves.toMatchObject({
+                response: SUCCESS_RESPONSE,
+            });
+            expect(consoleWarn).toHaveBeenCalledWith(warning);
+            expect(mockFirstRendererSend).not.toHaveBeenCalled();
+            expect(mockSecondRendererSend).not.toHaveBeenCalled();
+        }
+    );
+});
diff --git a/apps/electron-backend/src/app/events/remote-control.events.spec.ts b/apps/electron-backend/src/app/events/remote-control.events.spec.ts
new file mode 100644
index 000000000..4c3f8efa5
--- /dev/null
+++ b/apps/electron-backend/src/app/events/remote-control.events.spec.ts
@@ -0,0 +1,188 @@
+import {
+    bootstrapRemoteControl as bootstrapRemoteControlWith,
+    getIpcHandler,
+    invokeHttpHandler,
+    METHOD_NOT_ALLOWED_RESPONSE,
+    mockFirstRendererSend,
+    mockGetAllWindows,
+    mockHttpHandlers,
+    mockIpcHandle,
+    mockIpcHandlers,
+    mockIpcOn,
+    mockRegisterRemoteControlHandler,
+    mockSecondRendererSend,
+    mockStartHttpServer,
+    mockStoreGet,
+    REMOTE_CONTROL_PATHS,
+    resetRemoteControlMocks,
+    SUCCESS_RESPONSE,
+    type RemoteControlSettings,
+} from './remote-control.test-helpers';
+
+jest.mock('electron', () => ({
+    BrowserWindow: {
+        getAllWindows: mockGetAllWindows,
+    },
+    ipcMain: {
+        handle: mockIpcHandle,
+        on: mockIpcOn,
+    },
+}));
+
+jest.mock('../server/http-server', () => ({
+    httpServer: {
+        registerRemoteControlHandler: mockRegisterRemoteControlHandler,
+        start: mockStartHttpServer,
+    },
+}));
+
+jest.mock('../services/store.service', () => ({
+    store: {
+        get: mockStoreGet,
+    },
+}));
+
+import { RemoteControlEvents } from './remote-control.events';
+
+const bootstrapRemoteControl = (settings?: RemoteControlSettings) =>
+    bootstrapRemoteControlWith(RemoteControlEvents, settings);
+
+describe('RemoteControlEvents bootstrap and dispatch', () => {
+    let consoleLog: jest.SpyInstance;
+    let consoleWarn: jest.SpyInstance;
+
+    beforeEach(() => {
+        resetRemoteControlMocks();
+        consoleLog = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+        consoleWarn = jest
+            .spyOn(console, 'warn')
+            .mockImplementation(() => undefined);
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+        consoleLog.mockRestore();
+        consoleWarn.mockRestore();
+    });
+
+    it('registers exactly the seven remote-control HTTP endpoints', () => {
+        bootstrapRemoteControl();
+
+        expect(mockRegisterRemoteControlHandler).toHaveBeenCalledTimes(7);
+        expect([...mockHttpHandlers.keys()].sort()).toEqual(
+            Object.values(REMOTE_CONTROL_PATHS).sort()
+        );
+    });
+
+    it('starts the HTTP server once with the stored port when enabled', () => {
+        bootstrapRemoteControl({ enabled: true, port: 9987 });
+
+        expect(mockStoreGet).toHaveBeenNthCalledWith(1, 'remoteControl', false);
+        expect(mockStoreGet).toHaveBeenNthCalledWith(
+            2,
+            'remoteControlPort',
+            8765
+        );
+        expect(mockStartHttpServer).toHaveBeenCalledTimes(1);
+        expect(mockStartHttpServer).toHaveBeenCalledWith(9987);
+    });
+
+    it('does not start the HTTP server when remote control is disabled', () => {
+        bootstrapRemoteControl({ enabled: false, port: 9987 });
+
+        expect(mockStartHttpServer).not.toHaveBeenCalled();
+    });
+
+    it('registers and dispatches both main-app channel IPC handlers', () => {
+        bootstrapRemoteControl();
+
+        expect(mockIpcHandle).toHaveBeenCalledTimes(2);
+        expect([...mockIpcHandlers.keys()].sort()).toEqual([
+            'REMOTE_CONTROL_CHANNEL_DOWN',
+            'REMOTE_CONTROL_CHANNEL_UP',
+        ]);
+
+        const ipcEventPlaceholder = {};
+        expect(
+            getIpcHandler('REMOTE_CONTROL_CHANNEL_UP')(ipcEventPlaceholder)
+        ).toBeUndefined();
+        expect(
+            getIpcHandler('REMOTE_CONTROL_CHANNEL_DOWN')(ipcEventPlaceholder)
+        ).toBeUndefined();
+
+        expect(mockFirstRendererSend).toHaveBeenCalledTimes(2);
+        expect(mockFirstRendererSend).toHaveBeenNthCalledWith(
+            1,
+            'CHANNEL_CHANGE',
+            { direction: 'up' }
+        );
+        expect(mockFirstRendererSend).toHaveBeenNthCalledWith(
+            2,
+            'CHANNEL_CHANGE',
+            { direction: 'down' }
+        );
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+
+    it.each([
+        {
+            path: REMOTE_CONTROL_PATHS.CHANNEL_UP,
+            channel: 'CHANNEL_CHANGE',
+            payload: { direction: 'up' },
+        },
+        {
+            path: REMOTE_CONTROL_PATHS.CHANNEL_DOWN,
+            channel: 'CHANNEL_CHANGE',
+            payload: { direction: 'down' },
+        },
+        {
+            path: REMOTE_CONTROL_PATHS.VOLUME_UP,
+            channel: 'REMOTE_CONTROL_COMMAND',
+            payload: { type: 'volume-up' },
+        },
+        {
+            path: REMOTE_CONTROL_PATHS.VOLUME_DOWN,
+            channel: 'REMOTE_CONTROL_COMMAND',
+            payload: { type: 'volume-down' },
+        },
+        {
+            path: REMOTE_CONTROL_PATHS.VOLUME_TOGGLE_MUTE,
+            channel: 'REMOTE_CONTROL_COMMAND',
+            payload: { type: 'volume-toggle-mute' },
+        },
+    ] as const)(
+        'dispatches POST $path to the first renderer',
+        async ({ path, channel, payload }) => {
+            bootstrapRemoteControl();
+
+            const result = await invokeHttpHandler(path, { method: 'POST' });
+
+            expect(result.response).toEqual(SUCCESS_RESPONSE);
+            expect(mockFirstRendererSend).toHaveBeenCalledTimes(1);
+            expect(mockFirstRendererSend).toHaveBeenCalledWith(
+                channel,
+                payload
+            );
+            expect(mockSecondRendererSend).not.toHaveBeenCalled();
+        }
+    );
+
+    it.each([
+        REMOTE_CONTROL_PATHS.SELECT_NUMBER,
+        REMOTE_CONTROL_PATHS.CHANNEL_UP,
+        REMOTE_CONTROL_PATHS.CHANNEL_DOWN,
+        REMOTE_CONTROL_PATHS.VOLUME_UP,
+        REMOTE_CONTROL_PATHS.VOLUME_DOWN,
+        REMOTE_CONTROL_PATHS.VOLUME_TOGGLE_MUTE,
+    ])('rejects GET on POST-only endpoint %s', async (path) => {
+        bootstrapRemoteControl();
+
+        const result = await invokeHttpHandler(path, { method: 'GET' });
+
+        expect(result.response).toEqual(METHOD_NOT_ALLOWED_RESPONSE);
+        expect(mockFirstRendererSend).not.toHaveBeenCalled();
+        expect(mockSecondRendererSend).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/events/remote-control.events.ts b/apps/electron-backend/src/app/events/remote-control.events.ts
index 366284ade..9f20d8bec 100644
--- a/apps/electron-backend/src/app/events/remote-control.events.ts
+++ b/apps/electron-backend/src/app/events/remote-control.events.ts
@@ -26,7 +26,7 @@ interface RemoteControlStatus {
     updatedAt?: string;
 }
 
-class RemoteControlEvents {
+export class RemoteControlEvents {
     private remoteControlStatus: RemoteControlStatus = {
         portal: 'unknown',
         isLiveView: false,
diff --git a/apps/electron-backend/src/app/events/remote-control.test-helpers.ts b/apps/electron-backend/src/app/events/remote-control.test-helpers.ts
new file mode 100644
index 000000000..e594659c6
--- /dev/null
+++ b/apps/electron-backend/src/app/events/remote-control.test-helpers.ts
@@ -0,0 +1,249 @@
+import type * as http from 'node:http';
+import { PassThrough } from 'node:stream';
+
+/**
+ * Shared harness for the remote-control specs.
+ *
+ * Every exported mock is `mock`-prefixed so the spec files can reference them
+ * from their hoisted `jest.mock()` factories.
+ */
+
+export type HttpHandler = (
+    request: http.IncomingMessage,
+    response: http.ServerResponse
+) => void;
+export type IpcCallback = (...args: unknown[]) => unknown;
+
+export interface RemoteControlSettings {
+    enabled: boolean;
+    port: number;
+}
+
+export interface ResponseSnapshot {
+    statusCode: number;
+    headers: http.OutgoingHttpHeaders;
+    body: string;
+}
+
+export interface ResponseRecorder {
+    response: http.ServerResponse;
+    completed: Promise<ResponseSnapshot>;
+}
+
+export interface RequestInvocation {
+    response: ResponseSnapshot;
+    request: PassThrough;
+    requestClosed: Promise<void>;
+    requestErrors: Error[];
+}
+
+export interface InvokeOptions {
+    method: string;
+    body?: string | Buffer;
+}
+
+export const REMOTE_CONTROL_PATHS = {
+    STATUS: '/api/remote-control/status',
+    SELECT_NUMBER: '/api/remote-control/channel/select-number',
+    CHANNEL_UP: '/api/remote-control/channel/up',
+    CHANNEL_DOWN: '/api/remote-control/channel/down',
+    VOLUME_UP: '/api/remote-control/volume/up',
+    VOLUME_DOWN: '/api/remote-control/volume/down',
+    VOLUME_TOGGLE_MUTE: '/api/remote-control/volume/toggle-mute',
+} as const;
+
+export const JSON_HEADERS = { 'Content-Type': 'application/json' } as const;
+export const SUCCESS_RESPONSE = {
+    statusCode: 200,
+    headers: JSON_HEADERS,
+    body: JSON.stringify({ success: true }),
+} as const;
+export const METHOD_NOT_ALLOWED_RESPONSE = {
+    statusCode: 405,
+    headers: JSON_HEADERS,
+    body: JSON.stringify({ error: 'Method not allowed' }),
+} as const;
+
+export const mockHttpHandlers = new Map<string, HttpHandler>();
+export const mockIpcHandlers = new Map<string, IpcCallback>();
+export const mockIpcListeners = new Map<string, IpcCallback>();
+export const mockRegisterRemoteControlHandler = jest.fn(
+    (path: string, handler: HttpHandler) => {
+        mockHttpHandlers.set(path, handler);
+    }
+);
+export const mockStartHttpServer = jest.fn();
+export const mockStoreGet = jest.fn();
+export const mockFirstRendererSend = jest.fn();
+export const mockSecondRendererSend = jest.fn();
+export const mockGetAllWindows = jest.fn();
+export const mockIpcHandle = jest.fn(
+    (channel: string, handler: IpcCallback) => {
+        mockIpcHandlers.set(channel, handler);
+    }
+);
+export const mockIpcOn = jest.fn((channel: string, listener: IpcCallback) => {
+    mockIpcListeners.set(channel, listener);
+});
+
+/** Restore every mock to the state each spec's `beforeEach` expects. */
+export function resetRemoteControlMocks(): void {
+    mockHttpHandlers.clear();
+    mockIpcHandlers.clear();
+    mockIpcListeners.clear();
+    mockRegisterRemoteControlHandler.mockClear();
+    mockStartHttpServer.mockReset();
+    mockStoreGet.mockReset();
+    mockFirstRendererSend.mockReset();
+    mockSecondRendererSend.mockReset();
+    mockGetAllWindows.mockReset();
+    mockIpcHandle.mockClear();
+    mockIpcOn.mockClear();
+    mockGetAllWindows.mockReturnValue([
+        { webContents: { send: mockFirstRendererSend } },
+        { webContents: { send: mockSecondRendererSend } },
+    ]);
+}
+
+export function createResponseRecorder(): ResponseRecorder {
+    let statusCode = 0;
+    let headers: http.OutgoingHttpHeaders = {};
+    let responseEnded = false;
+    let resolveCompleted: (snapshot: ResponseSnapshot) => void = () => {
+        throw new Error('Response completion promise is not initialized');
+    };
+    const completed = new Promise<ResponseSnapshot>((resolve) => {
+        resolveCompleted = resolve;
+    });
+
+    const response = {
+        writeHead: (
+            nextStatusCode: number,
+            nextHeaders?: http.OutgoingHttpHeaders
+        ) => {
+            statusCode = nextStatusCode;
+            headers = { ...nextHeaders };
+            return response;
+        },
+        end: (chunk?: string | Uint8Array) => {
+            if (responseEnded) {
+                throw new Error('Response ended more than once');
+            }
+            responseEnded = true;
+            const body =
+                typeof chunk === 'string'
+                    ? chunk
+                    : chunk
+                      ? Buffer.from(chunk).toString('utf8')
+                      : '';
+            resolveCompleted({ statusCode, headers, body });
+            return response;
+        },
+    } as unknown as http.ServerResponse;
+
+    return { response, completed };
+}
+
+export function getHttpHandler(path: string): HttpHandler {
+    const handler = mockHttpHandlers.get(path);
+    if (!handler) {
+        throw new Error(`Expected HTTP handler for ${path}`);
+    }
+
+    return handler;
+}
+
+export function getIpcHandler(channel: string): IpcCallback {
+    const handler = mockIpcHandlers.get(channel);
+    if (!handler) {
+        throw new Error(`Expected IPC handler for ${channel}`);
+    }
+
+    return handler;
+}
+
+export function getIpcListener(channel: string): IpcCallback {
+    const listener = mockIpcListeners.get(channel);
+    if (!listener) {
+        throw new Error(`Expected IPC listener for ${channel}`);
+    }
+
+    return listener;
+}
+
+/**
+ * Construct and bootstrap the events class under test. The constructor is
+ * injected so this module never imports the subject — the spec files own that
+ * import order relative to their `jest.mock()` calls.
+ */
+export function bootstrapRemoteControl<
+    T extends { bootstrapRemoteControlEvents(): unknown },
+>(
+    RemoteControlEvents: new () => T,
+    settings: RemoteControlSettings = { enabled: false, port: 8765 }
+): T {
+    mockStoreGet.mockImplementation(
+        (key: string, fallbackValue: unknown): unknown => {
+            if (key === 'remoteControl') {
+                return settings.enabled;
+            }
+            if (key === 'remoteControlPort') {
+                return settings.port;
+            }
+
+            return fallbackValue;
+        }
+    );
+
+    const events = new RemoteControlEvents();
+    events.bootstrapRemoteControlEvents();
+    return events;
+}
+
+export async function invokeHttpHandler(
+    path: string,
+    options: InvokeOptions
+): Promise<RequestInvocation> {
+    const request = new PassThrough();
+    const requestErrors: Error[] = [];
+    request.on('error', (error: Error) => {
+        requestErrors.push(error);
+    });
+    const requestClosed = new Promise<void>((resolve) => {
+        request.once('close', resolve);
+    });
+    const incomingMessage = Object.assign(request, {
+        method: options.method,
+        url: path,
+    }) as unknown as http.IncomingMessage;
+    const recorder = createResponseRecorder();
+
+    getHttpHandler(path)(incomingMessage, recorder.response);
+    request.end(options.body);
+
+    return {
+        response: await recorder.completed,
+        request,
+        requestClosed,
+        requestErrors,
+    };
+}
+
+export function createBodyAtByteLength(byteLength: number): string {
+    const prefix = '{"number":7,"padding":"';
+    const suffix = '"}';
+    const paddingLength =
+        byteLength -
+        Buffer.byteLength(prefix, 'utf8') -
+        Buffer.byteLength(suffix, 'utf8');
+    if (paddingLength < 0) {
+        throw new Error(`Cannot create a JSON body at ${byteLength} bytes`);
+    }
+
+    const body = `${prefix}${'x'.repeat(paddingLength)}${suffix}`;
+    if (Buffer.byteLength(body, 'utf8') !== byteLength) {
+        throw new Error(`Expected a ${byteLength}-byte JSON body`);
+    }
+
+    return body;
+}
diff --git a/apps/electron-backend/src/app/events/settings.events.spec.ts b/apps/electron-backend/src/app/events/settings.events.spec.ts
new file mode 100644
index 000000000..d115c0514
--- /dev/null
+++ b/apps/electron-backend/src/app/events/settings.events.spec.ts
@@ -0,0 +1,219 @@
+import type { Settings } from '@iptvnator/shared/interfaces';
+
+type ExternalPlayerArgumentsSetting = string | readonly unknown[];
+type SettingsUpdatePayload = Omit<
+    Partial<Settings>,
+    | 'embeddedMpvFrameCopy'
+    | 'language'
+    | 'mpvPlayerArguments'
+    | 'vlcPlayerArguments'
+> & {
+    embeddedMpvFrameCopy?: boolean | number;
+    language?: string;
+    mpvPlayerArguments?: ExternalPlayerArgumentsSetting;
+    vlcPlayerArguments?: ExternalPlayerArgumentsSetting;
+};
+type SettingsUpdateHandler = (
+    event: unknown,
+    settings: SettingsUpdatePayload
+) => unknown;
+
+const SETTINGS_UPDATE = 'SETTINGS_UPDATE';
+const STORE_KEYS = {
+    EMBEDDED_MPV_FRAME_COPY: 'EMBEDDED_MPV_FRAME_COPY',
+    MPV_PLAYER_ARGUMENTS: 'MPV_PLAYER_ARGUMENTS',
+    MPV_REUSE_INSTANCE: 'MPV_REUSE_INSTANCE',
+    VLC_PLAYER_ARGUMENTS: 'VLC_PLAYER_ARGUMENTS',
+    VLC_REUSE_INSTANCE: 'VLC_REUSE_INSTANCE',
+} as const;
+
+const handlers = new Map<string, SettingsUpdateHandler>();
+const mockStoreGet = jest.fn();
+const mockStoreSet = jest.fn();
+const mockUpdateSettings = jest.fn();
+const mockIpcHandle = jest.fn(
+    (channel: string, handler: SettingsUpdateHandler): void => {
+        handlers.set(channel, handler);
+    }
+);
+
+jest.mock('electron', () => ({
+    ipcMain: {
+        handle: mockIpcHandle,
+    },
+}));
+
+jest.mock('../services/store.service', () => ({
+    EMBEDDED_MPV_FRAME_COPY: STORE_KEYS.EMBEDDED_MPV_FRAME_COPY,
+    MPV_PLAYER_ARGUMENTS: STORE_KEYS.MPV_PLAYER_ARGUMENTS,
+    MPV_REUSE_INSTANCE: STORE_KEYS.MPV_REUSE_INSTANCE,
+    VLC_PLAYER_ARGUMENTS: STORE_KEYS.VLC_PLAYER_ARGUMENTS,
+    VLC_REUSE_INSTANCE: STORE_KEYS.VLC_REUSE_INSTANCE,
+    store: {
+        get: mockStoreGet,
+        set: mockStoreSet,
+    },
+}));
+
+jest.mock('../server/http-server', () => ({
+    httpServer: {
+        updateSettings: mockUpdateSettings,
+    },
+}));
+
+describe('SETTINGS_UPDATE', () => {
+    let consoleLogSpy: jest.SpiedFunction<typeof console.log>;
+    let settingsUpdateHandler: SettingsUpdateHandler;
+
+    beforeEach(async () => {
+        handlers.clear();
+        jest.resetModules();
+        mockIpcHandle.mockClear();
+        mockStoreGet.mockReset();
+        mockStoreSet.mockReset();
+        mockUpdateSettings.mockReset();
+        mockStoreGet.mockImplementation(
+            (_key: string, fallbackValue: unknown): unknown => fallbackValue
+        );
+        consoleLogSpy = jest
+            .spyOn(console, 'log')
+            .mockImplementation(() => undefined);
+
+        await import('./settings.events');
+
+        const registeredHandler = handlers.get(SETTINGS_UPDATE);
+        if (!registeredHandler) {
+            throw new Error(`Missing ipcMain handler for ${SETTINGS_UPDATE}`);
+        }
+        settingsUpdateHandler = registeredHandler;
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+        consoleLogSpy.mockRestore();
+    });
+
+    it('normalizes external-player arguments and preserves explicit false reuse settings', () => {
+        settingsUpdateHandler(
+            {},
+            {
+                mpvPlayerArguments: [' --screen=1 ', '', ' --hwdec=auto-safe '],
+                mpvReuseInstance: false,
+                vlcPlayerArguments:
+                    ' --network-caching=1000 \r\n\n --fullscreen ',
+                vlcReuseInstance: false,
+            }
+        );
+
+        expect(mockStoreSet.mock.calls).toEqual([
+            [STORE_KEYS.MPV_PLAYER_ARGUMENTS, '--screen=1\n--hwdec=auto-safe'],
+            [
+                STORE_KEYS.VLC_PLAYER_ARGUMENTS,
+                '--network-caching=1000\n--fullscreen',
+            ],
+            [STORE_KEYS.MPV_REUSE_INSTANCE, false],
+            [STORE_KEYS.VLC_REUSE_INSTANCE, false],
+        ]);
+        expect(mockUpdateSettings).not.toHaveBeenCalled();
+    });
+
+    it('does not persist or reconcile an empty settings update', () => {
+        settingsUpdateHandler({}, {});
+
+        expect(mockStoreGet).not.toHaveBeenCalled();
+        expect(mockStoreSet).not.toHaveBeenCalled();
+        expect(mockUpdateSettings).not.toHaveBeenCalled();
+    });
+
+    it('coerces an enabled embedded-MPV frame-copy value to boolean true', () => {
+        settingsUpdateHandler({}, { embeddedMpvFrameCopy: 1 });
+
+        expect(mockStoreSet).toHaveBeenCalledTimes(1);
+        expect(mockStoreSet).toHaveBeenCalledWith(
+            STORE_KEYS.EMBEDDED_MPV_FRAME_COPY,
+            true
+        );
+        expect(mockUpdateSettings).not.toHaveBeenCalled();
+    });
+
+    it('reconciles an enabled remote-control update with the stored port', () => {
+        mockStoreGet.mockImplementation(
+            (key: string, fallbackValue: unknown): unknown =>
+                key === 'remoteControlPort' ? 9988 : fallbackValue
+        );
+
+        settingsUpdateHandler({}, { remoteControl: true });
+
+        expect(mockStoreGet.mock.calls).toEqual([['remoteControlPort', 8765]]);
+        expect(mockStoreSet.mock.calls).toEqual([['remoteControl', true]]);
+        expect(mockUpdateSettings).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSettings).toHaveBeenCalledWith(true, 9988);
+    });
+
+    it('reconciles a remote-control port update with the stored enabled state', () => {
+        mockStoreGet.mockImplementation(
+            (key: string, fallbackValue: unknown): unknown =>
+                key === 'remoteControl' ? true : fallbackValue
+        );
+
+        settingsUpdateHandler({}, { remoteControlPort: 9123 });
+
+        expect(mockStoreGet.mock.calls).toEqual([['remoteControl', false]]);
+        expect(mockStoreSet.mock.calls).toEqual([['remoteControlPort', 9123]]);
+        expect(mockUpdateSettings).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSettings).toHaveBeenCalledWith(true, 9123);
+    });
+
+    it('preserves explicit false and zero remote-control values', () => {
+        settingsUpdateHandler(
+            {},
+            { remoteControl: false, remoteControlPort: 0 }
+        );
+
+        expect(mockStoreGet).not.toHaveBeenCalled();
+        expect(mockStoreSet.mock.calls).toEqual([
+            ['remoteControl', false],
+            ['remoteControlPort', 0],
+        ]);
+        expect(mockUpdateSettings).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSettings).toHaveBeenCalledWith(false, 0);
+    });
+
+    it('does not print a TMDB apiKey while retaining useful fields', () => {
+        const apiKey = 'tmdb-settings-api-key-secret';
+
+        settingsUpdateHandler(
+            {},
+            {
+                language: 'de',
+                tmdb: { apiKey, enabled: true },
+            }
+        );
+
+        const output = JSON.stringify(consoleLogSpy.mock.calls);
+        expect(output).not.toContain(apiKey);
+        expect(output).toContain('language');
+        expect(output).toContain('de');
+        expect(output).toContain('enabled');
+    });
+
+    it('does not print credentials embedded in external player arguments', () => {
+        const authorizationSecret = 'player-authorization-secret';
+        const cookieSecret = 'player-cookie-secret';
+
+        settingsUpdateHandler(
+            {},
+            {
+                language: 'de',
+                mpvPlayerArguments: `--http-header-fields=Authorization: Bearer ${authorizationSecret}`,
+                vlcPlayerArguments: `--http-referrer=https://example.com --http-cookie=Cookie: ${cookieSecret}`,
+            }
+        );
+
+        const output = JSON.stringify(consoleLogSpy.mock.calls);
+        expect(output).not.toContain(authorizationSecret);
+        expect(output).not.toContain(cookieSecret);
+        expect(output).toContain('language');
+        expect(output).toContain('de');
+    });
+});
diff --git a/apps/electron-backend/src/app/events/settings.events.ts b/apps/electron-backend/src/app/events/settings.events.ts
index 5d3797880..d05ccdcf0 100644
--- a/apps/electron-backend/src/app/events/settings.events.ts
+++ b/apps/electron-backend/src/app/events/settings.events.ts
@@ -1,6 +1,8 @@
 import { ipcMain } from 'electron';
 import { normalizeExternalPlayerArguments } from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
 import {
+    EMBEDDED_MPV_FRAME_COPY,
     MPV_PLAYER_ARGUMENTS,
     MPV_REUSE_INSTANCE,
     store,
@@ -16,7 +18,10 @@ export default class SettingsEvents {
 }
 
 ipcMain.handle('SETTINGS_UPDATE', (_event, arg) => {
-    console.log('Received SETTINGS_UPDATE with data:', arg);
+    console.log(
+        'Received SETTINGS_UPDATE with data:',
+        redactSensitiveData(arg)
+    );
 
     if (arg.mpvPlayerArguments !== undefined) {
         store.set(
@@ -37,6 +42,11 @@ ipcMain.handle('SETTINGS_UPDATE', (_event, arg) => {
         store.set(MPV_REUSE_INSTANCE, arg.mpvReuseInstance);
     }
 
+    // Applied on the next app start (window sandbox is fixed at creation).
+    if (arg.embeddedMpvFrameCopy !== undefined) {
+        store.set(EMBEDDED_MPV_FRAME_COPY, !!arg.embeddedMpvFrameCopy);
+    }
+
     if (arg.vlcReuseInstance !== undefined) {
         store.set(VLC_REUSE_INSTANCE, arg.vlcReuseInstance);
     }
diff --git a/apps/electron-backend/src/app/events/stalker.events.ts b/apps/electron-backend/src/app/events/stalker.events.ts
index d16fd8cba..a46a039f5 100644
--- a/apps/electron-backend/src/app/events/stalker.events.ts
+++ b/apps/electron-backend/src/app/events/stalker.events.ts
@@ -9,6 +9,7 @@ import {
     PortalDebugEvent,
     STALKER_REQUEST,
 } from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
 import { rememberStalkerPlaybackContext } from '../services/stalker-playback-context.service';
 import { emitPortalDebugEvent } from './portal-debug.events';
 import { buildStalkerIdentityRequestContext } from './stalker-identity';
@@ -186,7 +187,10 @@ ipcMain.handle(
                 emitPortalDebugEvent(debugEvent);
             }
 
-            console.error('[StalkerEvents] Request error:', error);
+            console.error(
+                '[StalkerEvents] Request error:',
+                redactSensitiveData(error)
+            );
 
             // Format error response
             if (axios.isAxiosError(error)) {
diff --git a/apps/electron-backend/src/app/events/xtream.events.ts b/apps/electron-backend/src/app/events/xtream.events.ts
index da96caa5e..0d63e0523 100644
--- a/apps/electron-backend/src/app/events/xtream.events.ts
+++ b/apps/electron-backend/src/app/events/xtream.events.ts
@@ -10,6 +10,7 @@ import {
     XTREAM_CANCEL_SESSION,
     normalizeXtreamServerUrl,
 } from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
 import { emitPortalDebugEvent } from './portal-debug.events';
 import { UnsafeUrlError } from './url-safety';
 import { requestWithValidatedRedirects } from '../util/validated-axios';
@@ -212,10 +213,12 @@ ipcMain.handle(
             if (!payload.suppressErrorLog) {
                 console.error(
                     '[XTREAM_REQUEST] Failed',
-                    formatXtreamError(
-                        error,
-                        requestUrlForLog,
-                        payload.params?.action
+                    redactSensitiveData(
+                        formatXtreamError(
+                            error,
+                            requestUrlForLog,
+                            payload.params?.action
+                        )
                     )
                 );
             }
diff --git a/apps/electron-backend/src/app/server/http-server.spec.ts b/apps/electron-backend/src/app/server/http-server.spec.ts
new file mode 100644
index 000000000..d4207d498
--- /dev/null
+++ b/apps/electron-backend/src/app/server/http-server.spec.ts
@@ -0,0 +1,377 @@
+import { once } from 'node:events';
+import {
+    mkdirSync,
+    mkdtempSync,
+    rmSync,
+    unlinkSync,
+    writeFileSync,
+} from 'node:fs';
+import * as http from 'node:http';
+import type { AddressInfo } from 'node:net';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { HttpServer } from './http-server';
+
+interface CapturedServer {
+    listening: Promise<void>;
+    listeningEvents: number;
+    server: http.Server;
+}
+
+interface TestResponse {
+    body: Buffer;
+    contentType: string | undefined;
+    statusCode: number | undefined;
+}
+
+const INDEX_BODY = Buffer.from('<main>IPTVnator remote control</main>');
+const ASSETS = {
+    '/app.js': {
+        body: Buffer.from('globalThis.remoteControlLoaded = true;'),
+        contentType: 'application/javascript',
+    },
+    '/styles.css': {
+        body: Buffer.from('main { color: rebeccapurple; }'),
+        contentType: 'text/css',
+    },
+    '/data.json': {
+        body: Buffer.from('{"ready":true}'),
+        contentType: 'application/json',
+    },
+    '/asset.unknown': {
+        body: Buffer.from([0x00, 0xff, 0x49, 0x50, 0x54, 0x56]),
+        contentType: 'application/octet-stream',
+    },
+} as const;
+
+jest.setTimeout(15_000);
+
+function request(port: number, path: string): Promise<TestResponse> {
+    return new Promise((resolve, reject) => {
+        const clientRequest = http.request(
+            {
+                host: '127.0.0.1',
+                method: 'GET',
+                path,
+                port,
+            },
+            (response) => {
+                const chunks: Buffer[] = [];
+
+                response.on('data', (chunk: Buffer) => {
+                    chunks.push(chunk);
+                });
+                response.on('end', () => {
+                    const contentType = response.headers['content-type'];
+                    resolve({
+                        body: Buffer.concat(chunks),
+                        contentType:
+                            typeof contentType === 'string'
+                                ? contentType
+                                : undefined,
+                        statusCode: response.statusCode,
+                    });
+                });
+                response.on('error', reject);
+            }
+        );
+
+        clientRequest.on('error', reject);
+        clientRequest.end();
+    });
+}
+
+function getAddress(server: http.Server): AddressInfo {
+    const address = server.address();
+    if (!address || typeof address === 'string') {
+        throw new Error('Expected the HTTP server to have an IP address');
+    }
+    return address;
+}
+
+async function closeServer(server: http.Server): Promise<void> {
+    if (!server.listening) {
+        return;
+    }
+
+    await new Promise<void>((resolve, reject) => {
+        server.close((error) => {
+            if (error) {
+                reject(error);
+            } else {
+                resolve();
+            }
+        });
+    });
+}
+
+async function getAvailablePort(): Promise<number> {
+    const probe = http.createServer();
+
+    await new Promise<void>((resolve, reject) => {
+        probe.once('error', reject);
+        probe.listen(0, '127.0.0.1', resolve);
+    });
+
+    const port = getAddress(probe).port;
+    await closeServer(probe);
+    return port;
+}
+
+describe('HttpServer', () => {
+    let capturedServers: CapturedServer[];
+    let distPath: string;
+    let server: HttpServer;
+    let tempRoot: string;
+
+    beforeEach(() => {
+        jest.spyOn(console, 'log').mockImplementation(() => undefined);
+
+        capturedServers = [];
+        tempRoot = mkdtempSync(join(tmpdir(), 'iptvnator-http-server-'));
+        distPath = join(tempRoot, 'static', 'app');
+        mkdirSync(distPath, { recursive: true });
+        writeFileSync(join(distPath, 'index.html'), INDEX_BODY);
+
+        for (const [assetPath, asset] of Object.entries(ASSETS)) {
+            writeFileSync(join(distPath, assetPath), asset.body);
+        }
+
+        writeFileSync(
+            join(tempRoot, 'outside-secret.txt'),
+            'must-not-leave-the-static-directory'
+        );
+
+        server = new HttpServer({
+            createServer: (requestListener) => {
+                const nodeServer = http.createServer(requestListener);
+                const captured: CapturedServer = {
+                    listening: once(nodeServer, 'listening').then(
+                        () => undefined
+                    ),
+                    listeningEvents: 0,
+                    server: nodeServer,
+                };
+                nodeServer.on('listening', () => {
+                    captured.listeningEvents += 1;
+                });
+                capturedServers.push(captured);
+                return nodeServer;
+            },
+            distPath,
+        });
+    });
+
+    afterEach(async () => {
+        let closeError: unknown;
+
+        try {
+            await Promise.all(
+                capturedServers.map(({ server: nodeServer }) =>
+                    closeServer(nodeServer)
+                )
+            );
+        } catch (error) {
+            closeError = error;
+        } finally {
+            rmSync(tempRoot, { force: true, recursive: true });
+            jest.restoreAllMocks();
+        }
+
+        if (closeError) {
+            throw closeError;
+        }
+    });
+
+    async function startServer(): Promise<CapturedServer> {
+        const serverIndex = capturedServers.length;
+        server.start(0);
+        const captured = capturedServers[serverIndex];
+        if (!captured) {
+            throw new Error('Expected HttpServer.start() to create a server');
+        }
+
+        await captured.listening;
+        return captured;
+    }
+
+    it('serves the exact index document at the root', async () => {
+        const captured = await startServer();
+
+        const response = await request(getAddress(captured.server).port, '/');
+
+        expect(response).toEqual({
+            body: INDEX_BODY,
+            contentType: 'text/html',
+            statusCode: 200,
+        });
+    });
+
+    it('asks the operating system for an ephemeral port when started with zero', async () => {
+        const captured = await startServer();
+
+        expect(getAddress(captured.server).port).not.toBe(8765);
+    });
+
+    it.each(Object.entries(ASSETS))(
+        'serves %s with its expected MIME type',
+        async (assetPath, asset) => {
+            const captured = await startServer();
+
+            const response = await request(
+                getAddress(captured.server).port,
+                assetPath
+            );
+
+            expect(response).toEqual({
+                body: asset.body,
+                contentType: asset.contentType,
+                statusCode: 200,
+            });
+        }
+    );
+
+    it('falls back to the exact index document for a client route', async () => {
+        const captured = await startServer();
+
+        const response = await request(
+            getAddress(captured.server).port,
+            '/channels/favorites'
+        );
+
+        expect(response).toEqual({
+            body: INDEX_BODY,
+            contentType: 'text/html',
+            statusCode: 200,
+        });
+    });
+
+    it('returns a plain-text 404 when the index document is missing', async () => {
+        unlinkSync(join(distPath, 'index.html'));
+        const captured = await startServer();
+
+        const response = await request(getAddress(captured.server).port, '/');
+
+        expect(response).toEqual({
+            body: Buffer.from('404 Not Found'),
+            contentType: 'text/plain',
+            statusCode: 404,
+        });
+    });
+
+    it('dispatches a registered API request without serving a static file', async () => {
+        let receivedRequest: http.IncomingMessage | undefined;
+        server.registerRemoteControlHandler(
+            '/api/remote-control/status',
+            (incomingRequest, response) => {
+                receivedRequest = incomingRequest;
+                response.writeHead(200, { 'Content-Type': 'application/json' });
+                response.end('{"source":"api-handler"}');
+            }
+        );
+        const captured = await startServer();
+
+        const response = await request(
+            getAddress(captured.server).port,
+            '/api/remote-control/status'
+        );
+
+        expect(receivedRequest?.url).toBe('/api/remote-control/status');
+        expect(response).toEqual({
+            body: Buffer.from('{"source":"api-handler"}'),
+            contentType: 'application/json',
+            statusCode: 200,
+        });
+        expect(response.body).not.toEqual(INDEX_BODY);
+    });
+
+    it('returns a JSON 404 for an unknown remote-control API endpoint', async () => {
+        const captured = await startServer();
+
+        const response = await request(
+            getAddress(captured.server).port,
+            '/api/remote-control/missing'
+        );
+
+        expect(response).toEqual({
+            body: Buffer.from('{"error":"Endpoint not found"}'),
+            contentType: 'application/json',
+            statusCode: 404,
+        });
+    });
+
+    it.each([
+        '/../../outside-secret.txt',
+        '//../../outside-secret.txt',
+        '/%2e%2e/%2e%2e/outside-secret.txt',
+        '/%E0%A4%A',
+    ])(
+        'rejects the invalid static request target %s without serving an outside file',
+        async (requestTarget) => {
+            const captured = await startServer();
+
+            const response = await request(
+                getAddress(captured.server).port,
+                requestTarget
+            );
+
+            expect(response).toEqual({
+                body: Buffer.from('404 Not Found'),
+                contentType: 'text/plain',
+                statusCode: 404,
+            });
+            expect(response.body.toString()).not.toContain(
+                'must-not-leave-the-static-directory'
+            );
+        }
+    );
+
+    it('creates and listens on only one server when started twice', async () => {
+        server.start(0);
+        server.start(0);
+
+        expect(capturedServers).toHaveLength(1);
+        await capturedServers[0].listening;
+        expect(capturedServers[0].listeningEvents).toBe(1);
+    });
+
+    it('stops the running server when disabled', async () => {
+        const captured = await startServer();
+        const closed = once(captured.server, 'close');
+
+        server.updateSettings(false, 0);
+        await closed;
+
+        expect(captured.server.listening).toBe(false);
+        expect(capturedServers).toHaveLength(1);
+    });
+
+    it('stops once and starts once on the new port when the port changes', async () => {
+        const first = await startServer();
+        const newPort = await getAvailablePort();
+        let closeEvents = 0;
+        first.server.on('close', () => {
+            closeEvents += 1;
+        });
+        const firstClosed = once(first.server, 'close');
+
+        server.updateSettings(true, newPort);
+        const second = capturedServers[1];
+        if (!second) {
+            throw new Error('Expected a replacement HTTP server');
+        }
+        await Promise.all([firstClosed, second.listening]);
+
+        expect(capturedServers).toHaveLength(2);
+        expect(closeEvents).toBe(1);
+        expect(first.server.listening).toBe(false);
+        expect(second.listeningEvents).toBe(1);
+        expect(getAddress(second.server).port).toBe(newPort);
+        await expect(request(newPort, '/')).resolves.toEqual({
+            body: INDEX_BODY,
+            contentType: 'text/html',
+            statusCode: 200,
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/server/http-server.ts b/apps/electron-backend/src/app/server/http-server.ts
index 23a235133..a6b24ce37 100644
--- a/apps/electron-backend/src/app/server/http-server.ts
+++ b/apps/electron-backend/src/app/server/http-server.ts
@@ -3,10 +3,61 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as path from 'path';
 
+type HttpServerFactory = (requestListener: http.RequestListener) => http.Server;
+
+interface HttpServerOptions {
+    createServer?: HttpServerFactory;
+    distPath?: string;
+}
+
+/**
+ * Resolve an HTTP request target within the configured static root.
+ * The path implementation is injectable so platform-specific semantics remain testable.
+ */
+export function resolveStaticFilePath(
+    staticRoot: string,
+    requestTarget: string,
+    pathImplementation: path.PlatformPath = path
+): string | null {
+    const separatorIndex = requestTarget.search(/[?#]/);
+    const encodedPathname =
+        separatorIndex === -1
+            ? requestTarget
+            : requestTarget.slice(0, separatorIndex);
+
+    let pathname: string;
+    try {
+        pathname = decodeURIComponent(encodedPathname);
+    } catch {
+        return null;
+    }
+
+    if (pathname.includes('\0')) {
+        return null;
+    }
+
+    const relativeCandidate = pathname.replace(/^[/\\]+/, '') || 'index.html';
+    const resolvedRoot = pathImplementation.resolve(staticRoot);
+    const candidate = pathImplementation.resolve(
+        resolvedRoot,
+        relativeCandidate
+    );
+
+    if (
+        candidate === resolvedRoot ||
+        candidate.startsWith(`${resolvedRoot}${pathImplementation.sep}`)
+    ) {
+        return candidate;
+    }
+
+    return null;
+}
+
 /**
  * HTTP server for serving the remote control web app and providing REST API endpoints
  */
 export class HttpServer {
+    private readonly createServer: HttpServerFactory;
     private server: http.Server | null = null;
     private port = 8765;
     private isEnabled = false;
@@ -16,6 +67,11 @@ export class HttpServer {
         (req: http.IncomingMessage, res: http.ServerResponse) => void
     > = new Map();
 
+    constructor(options: HttpServerOptions = {}) {
+        this.createServer = options.createServer ?? http.createServer;
+        this.distPath = options.distPath ?? null;
+    }
+
     /**
      * Get the path to the remote-control-web static files.
      * Lazily computed to avoid calling Electron APIs before app is ready.
@@ -43,11 +99,7 @@ export class HttpServer {
         } else {
             // Production mode - files are bundled with the app
             // electron-builder copies remote-control-web/**/* directly to app root
-            this.distPath = path.join(
-                appPath,
-                'remote-control-web',
-                'browser'
-            );
+            this.distPath = path.join(appPath, 'remote-control-web', 'browser');
         }
 
         console.log('[HTTP Server] Serving from:', this.distPath);
@@ -58,7 +110,7 @@ export class HttpServer {
      * Start the HTTP server
      */
     start(port?: number): void {
-        if (port) {
+        if (port !== undefined) {
             this.port = port;
         }
 
@@ -67,7 +119,7 @@ export class HttpServer {
             return;
         }
 
-        this.server = http.createServer((req, res) => {
+        this.server = this.createServer((req, res) => {
             this.handleRequest(req, res);
         });
 
@@ -153,18 +205,21 @@ export class HttpServer {
      * Serve static files
      */
     private serveStaticFile(url: string, res: http.ServerResponse): void {
-        // Default to index.html for root path
-        let filePath = url === '/' ? '/index.html' : url;
-
-        // Security: prevent directory traversal
-        filePath = path.normalize(filePath).replace(/^(\.\.[/\\])+/, '');
-
-        const fullPath = path.join(this.getDistPath(), filePath);
+        const distPath = this.getDistPath();
+        const fullPath = resolveStaticFilePath(distPath, url);
+        if (!fullPath) {
+            res.writeHead(404, { 'Content-Type': 'text/plain' });
+            res.end('404 Not Found');
+            return;
+        }
 
         fs.readFile(fullPath, (err, data) => {
             if (err) {
                 // If file not found, try serving index.html (for Angular routing)
-                if (err.code === 'ENOENT' && filePath !== '/index.html') {
+                if (
+                    err.code === 'ENOENT' &&
+                    fullPath !== path.resolve(distPath, 'index.html')
+                ) {
                     this.serveStaticFile('/', res);
                     return;
                 }
diff --git a/apps/electron-backend/src/app/server/resolve-static-file-path.spec.ts b/apps/electron-backend/src/app/server/resolve-static-file-path.spec.ts
new file mode 100644
index 000000000..3cda4154c
--- /dev/null
+++ b/apps/electron-backend/src/app/server/resolve-static-file-path.spec.ts
@@ -0,0 +1,74 @@
+import { posix, win32 } from 'node:path';
+
+import { resolveStaticFilePath } from './http-server';
+
+describe('resolveStaticFilePath', () => {
+    const POSIX_STATIC_ROOT = '/opt/iptvnator/remote-control';
+    const WINDOWS_STATIC_ROOT = 'C:\\iptvnator\\remote-control';
+
+    it('rejects a Windows double-leading-slash traversal', () => {
+        expect(
+            resolveStaticFilePath(
+                WINDOWS_STATIC_ROOT,
+                '//../../outside-secret.txt',
+                win32
+            )
+        ).toBeNull();
+    });
+
+    it('rejects encoded traversal segments after one decode', () => {
+        expect(
+            resolveStaticFilePath(
+                POSIX_STATIC_ROOT,
+                '/%2e%2e/outside-secret.txt',
+                posix
+            )
+        ).toBeNull();
+    });
+
+    it('fails closed for malformed percent encoding without throwing', () => {
+        expect(
+            resolveStaticFilePath(POSIX_STATIC_ROOT, '/%E0%A4%A', posix)
+        ).toBeNull();
+    });
+
+    it('rejects decoded NUL bytes', () => {
+        expect(
+            resolveStaticFilePath(
+                POSIX_STATIC_ROOT,
+                '/assets/%00secret.js',
+                posix
+            )
+        ).toBeNull();
+    });
+
+    it('resolves a valid Windows-style asset inside the static root', () => {
+        expect(
+            resolveStaticFilePath(
+                WINDOWS_STATIC_ROOT,
+                '/assets\\app.js?version=1',
+                win32
+            )
+        ).toBe('C:\\iptvnator\\remote-control\\assets\\app.js');
+    });
+
+    it('ignores query and fragment data for filesystem resolution', () => {
+        expect(
+            resolveStaticFilePath(
+                POSIX_STATIC_ROOT,
+                '/data.json?cache=1#ignored',
+                posix
+            )
+        ).toBe('/opt/iptvnator/remote-control/data.json');
+    });
+
+    it('decodes the URL pathname exactly once', () => {
+        expect(
+            resolveStaticFilePath(
+                POSIX_STATIC_ROOT,
+                '/%252e%252e/asset.js',
+                posix
+            )
+        ).toBe('/opt/iptvnator/remote-control/%2e%2e/asset.js');
+    });
+});
diff --git a/apps/electron-backend/src/app/services/debug-trace.spec.ts b/apps/electron-backend/src/app/services/debug-trace.spec.ts
new file mode 100644
index 000000000..91da7daed
--- /dev/null
+++ b/apps/electron-backend/src/app/services/debug-trace.spec.ts
@@ -0,0 +1,47 @@
+import { trace } from './debug-trace';
+
+describe('debug trace redaction', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('does not serialize credentials from nested payloads or URLs', () => {
+        jest.spyOn(console, 'log').mockImplementation(() => undefined);
+        const secrets = {
+            password: 'trace-password-secret',
+            token: 'trace-token-secret',
+            authorization: 'trace-authorization-secret',
+            mac: 'trace-mac-secret',
+        };
+
+        trace('portal', 'request', {
+            params: secrets,
+            url: `https://example.com/portal?token=${secrets.token}&action=get_profile`,
+            requestId: 'diagnostic-request-id',
+        });
+
+        const output = JSON.stringify((console.log as jest.Mock).mock.calls);
+        for (const secret of Object.values(secrets)) {
+            expect(output).not.toContain(secret);
+        }
+        expect(output).toContain('diagnostic-request-id');
+        expect(output).toContain('get_profile');
+    });
+
+    it('redacts serialized credentials before truncating trace strings', () => {
+        jest.spyOn(console, 'log').mockImplementation(() => undefined);
+        const secret = 'long-trace-json-password-secret';
+        const diagnostic = JSON.stringify({
+            password: secret,
+            operation: 'get_profile',
+            padding: 'x'.repeat(300),
+        });
+
+        trace('portal', 'request', { diagnostic });
+
+        const output = JSON.stringify((console.log as jest.Mock).mock.calls);
+        expect(output).not.toContain(secret);
+        expect(output).toContain('[Redacted]');
+        expect(output).toContain('get_profile');
+    });
+});
diff --git a/apps/electron-backend/src/app/services/debug-trace.ts b/apps/electron-backend/src/app/services/debug-trace.ts
index 19a727ea3..6b926a6c3 100644
--- a/apps/electron-backend/src/app/services/debug-trace.ts
+++ b/apps/electron-backend/src/app/services/debug-trace.ts
@@ -1,3 +1,5 @@
+import { redactSensitiveData } from '@iptvnator/shared/logging';
+
 const TRACE_ENV_TRUE_VALUES = new Set(['1', 'true', 'yes', 'on']);
 const TRACE_PREFIX = '[IPTVnator Trace]';
 const MAX_TRACE_ARRAY_ITEMS = 5;
@@ -50,6 +52,10 @@ export function isRendererApiTraceEnabled(): boolean {
     return isStartupTraceEnabled() || readFlag('IPTVNATOR_TRACE_IPC');
 }
 
+export function isPerformanceCaptureEnabled(): boolean {
+    return readFlag('IPTVNATOR_PERF_CAPTURE');
+}
+
 export function isDbTraceEnabled(): boolean {
     return isStartupTraceEnabled() || readFlag('IPTVNATOR_TRACE_DB');
 }
@@ -146,10 +152,10 @@ export function summarizeForTrace(value: unknown, depth = 0): unknown {
 
 export function safeStringifyForTrace(payload: unknown): string {
     try {
-        return JSON.stringify(payload);
+        return JSON.stringify(redactSensitiveData(payload));
     } catch (error) {
         return JSON.stringify({
-            fallback: summarizeForTrace(payload),
+            fallback: summarizeForTrace(redactSensitiveData(payload)),
             stringifyError:
                 error instanceof Error
                     ? truncateString(error.message)
@@ -166,7 +172,7 @@ export function trace(scope: string, message: string, payload?: unknown): void {
 
     console.log(
         `${TRACE_PREFIX}[${scope}] ${message} ${safeStringifyForTrace(
-            summarizeForTrace(payload)
+            summarizeForTrace(redactSensitiveData(payload))
         )}`
     );
 }
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.spec.ts
new file mode 100644
index 000000000..03d3ee95a
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.spec.ts
@@ -0,0 +1,133 @@
+import { EmbeddedMpvBounds } from '@iptvnator/shared/interfaces';
+import {
+    NativeViewBoundsContext,
+    toNativeViewBounds,
+} from './embedded-mpv-bounds.util';
+
+const CSS_BOUNDS: EmbeddedMpvBounds = { x: 372, y: 60, width: 578, height: 330 };
+
+function context(
+    overrides: Partial<NativeViewBoundsContext> = {}
+): NativeViewBoundsContext {
+    return {
+        platform: 'linux',
+        zoomFactor: 1,
+        displayScaleFactor: 1,
+        ...overrides,
+    };
+}
+
+describe('toNativeViewBounds', () => {
+    it('returns the input untouched at 100% zoom and 100% display scale', () => {
+        const result = toNativeViewBounds(CSS_BOUNDS, context());
+
+        expect(result).toBe(CSS_BOUNDS);
+    });
+
+    // Regression for #1145: CSS bounds were handed to XMoveResizeWindow as-is,
+    // so on a 140%-scaled Linux Mint desktop the mpv window landed at ~71% of
+    // the expected position and size, toward the window's top-left corner.
+    it('scales linux bounds by the display scale factor', () => {
+        const result = toNativeViewBounds(
+            CSS_BOUNDS,
+            context({ platform: 'linux', displayScaleFactor: 1.4 })
+        );
+
+        expect(result).toEqual({ x: 521, y: 84, width: 809, height: 462 });
+    });
+
+    it('scales win32 bounds by the display scale factor', () => {
+        const result = toNativeViewBounds(
+            { x: 100, y: 50, width: 640, height: 360 },
+            context({ platform: 'win32', displayScaleFactor: 1.25 })
+        );
+
+        expect(result).toEqual({ x: 125, y: 63, width: 800, height: 450 });
+    });
+
+    it('combines page zoom with the display scale factor', () => {
+        const result = toNativeViewBounds(
+            { x: 100, y: 50, width: 640, height: 360 },
+            context({
+                platform: 'win32',
+                zoomFactor: 1.2,
+                displayScaleFactor: 1.5,
+            })
+        );
+
+        expect(result).toEqual({ x: 180, y: 90, width: 1152, height: 648 });
+    });
+
+    it('ignores the display scale on macOS (NSView frames are in points)', () => {
+        const result = toNativeViewBounds(
+            CSS_BOUNDS,
+            context({ platform: 'darwin', displayScaleFactor: 2 })
+        );
+
+        expect(result).toBe(CSS_BOUNDS);
+    });
+
+    it('applies page zoom on macOS', () => {
+        const result = toNativeViewBounds(
+            { x: 100, y: 50, width: 640, height: 360 },
+            context({
+                platform: 'darwin',
+                zoomFactor: 1.5,
+                displayScaleFactor: 2,
+            })
+        );
+
+        expect(result).toEqual({ x: 150, y: 75, width: 960, height: 540 });
+    });
+
+    it('rounds fractional CSS edges only after scaling', () => {
+        // A 10.49px CSS edge at 200% renders at 21 physical pixels; edges
+        // rounded before scaling would send 20 and shift the video by 1px.
+        const result = toNativeViewBounds(
+            { x: 10.49, y: 0.5, width: 100.02, height: 50 },
+            context({ platform: 'win32', displayScaleFactor: 2 })
+        );
+
+        expect(result).toEqual({ x: 21, y: 1, width: 200, height: 100 });
+    });
+
+    it('keeps vertically adjacent rects seamless under fractional scales', () => {
+        // 42 × 1.25 and 153 × 1.25 both land on .5/.25 fractions: rounding
+        // x/y/width/height independently would misplace the shared edge by
+        // 1px, while edge-based rounding keeps the rects flush.
+        const scale = context({ displayScaleFactor: 1.25 });
+        const upper = toNativeViewBounds(
+            { x: 0, y: 42, width: 500, height: 111 },
+            scale
+        );
+        const lower = toNativeViewBounds(
+            { x: 0, y: 153, width: 500, height: 90 },
+            scale
+        );
+
+        expect(upper.y + upper.height).toBe(lower.y);
+    });
+
+    it('keeps hidden bounds offscreen and at least 1x1', () => {
+        const result = toNativeViewBounds(
+            { x: -100000, y: -100000, width: 1, height: 1 },
+            context({ displayScaleFactor: 1.5 })
+        );
+
+        expect(result.x).toBeLessThanOrEqual(-100000);
+        expect(result.y).toBeLessThanOrEqual(-100000);
+        expect(result.width).toBeGreaterThanOrEqual(1);
+        expect(result.height).toBeGreaterThanOrEqual(1);
+    });
+
+    it('treats non-finite or non-positive factors as 100%', () => {
+        for (const zoomFactor of [Number.NaN, 0, -1, Number.POSITIVE_INFINITY]) {
+            expect(
+                toNativeViewBounds(
+                    CSS_BOUNDS,
+                    context({ zoomFactor, displayScaleFactor: zoomFactor })
+                )
+            ).toBe(CSS_BOUNDS);
+        }
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.ts b/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.ts
new file mode 100644
index 000000000..7c7015dd1
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-bounds.util.ts
@@ -0,0 +1,60 @@
+import { EmbeddedMpvBounds } from '@iptvnator/shared/interfaces';
+
+export interface NativeViewBoundsContext {
+    platform: NodeJS.Platform;
+    /** Page zoom factor of the main window's webContents (1 = 100%). */
+    zoomFactor: number;
+    /** Scale factor of the display hosting the main window (1 = 96 dpi). */
+    displayScaleFactor: number;
+}
+
+/**
+ * Converts renderer-measured bounds (CSS pixels from
+ * getBoundingClientRect()) into the coordinate space the native-view
+ * engines position their OS windows in: physical pixels for the win32
+ * child HWND (SetWindowPos) and the linux child X11 window
+ * (XMoveResizeWindow), points — device-independent pixels — for the macOS
+ * NSView (setFrame). CSS pixels match points only at 100% page zoom and
+ * match physical pixels only at 100% page zoom AND 100% display scale, so
+ * every platform scales by the zoom factor and win32/linux additionally by
+ * the display scale factor (#1145).
+ *
+ * Bounds arrive with unrounded CSS edges and are rounded exactly once here,
+ * after scaling: edges first, then width/height derived from them. Rounding
+ * any earlier (or per-field) lets fractional CSS layouts drift by a pixel
+ * per scale factor and open 1px seams between the native video window and
+ * the surrounding DOM UI.
+ */
+export function toNativeViewBounds(
+    bounds: EmbeddedMpvBounds,
+    context: NativeViewBoundsContext
+): EmbeddedMpvBounds {
+    const scale = resolveNativeViewScale(context);
+    if (scale === 1) {
+        return bounds;
+    }
+
+    const left = Math.round(bounds.x * scale);
+    const top = Math.round(bounds.y * scale);
+    const right = Math.round((bounds.x + bounds.width) * scale);
+    const bottom = Math.round((bounds.y + bounds.height) * scale);
+
+    return {
+        x: left,
+        y: top,
+        width: Math.max(1, right - left),
+        height: Math.max(1, bottom - top),
+    };
+}
+
+function resolveNativeViewScale(context: NativeViewBoundsContext): number {
+    const zoomFactor = sanitizeFactor(context.zoomFactor);
+    if (context.platform === 'darwin') {
+        return zoomFactor;
+    }
+    return zoomFactor * sanitizeFactor(context.displayScaleFactor);
+}
+
+function sanitizeFactor(value: number): number {
+    return Number.isFinite(value) && value > 0 ? value : 1;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.spec.ts
new file mode 100644
index 000000000..9e41fc0db
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.spec.ts
@@ -0,0 +1,342 @@
+import { chmodSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
+import path from 'path';
+
+const mockElectronApp = {
+    isPackaged: false,
+    getAppPath: jest.fn(() => ''),
+};
+
+jest.mock('electron', () => ({ app: mockElectronApp }));
+
+import {
+    getEmbeddedMpvAddonCandidatePaths,
+    getFrameCopyRuntimeAvailability,
+    isFrameCopyPlatformSupported,
+    isFrameCopyRuntimeUsable,
+    resolveFrameCopyHelperPath,
+    shouldPromotePersistedFrameCopyOptIn,
+} from './embedded-mpv-frame-copy-platform.util';
+import type {
+    EmbeddedMpvFrameCopyManifestContract,
+    EmbeddedMpvFrameCopyRuntimeResult,
+} from './embedded-mpv-frame-copy-runtime';
+
+describe('embedded-mpv-frame-copy-platform.util', () => {
+    describe('isFrameCopyPlatformSupported', () => {
+        const originalPlatform = process.platform;
+        const originalArch = process.arch;
+
+        afterEach(() => {
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            });
+            Object.defineProperty(process, 'arch', { value: originalArch });
+        });
+
+        it.each<[NodeJS.Platform, string, boolean]>([
+            ['darwin', 'arm64', true],
+            ['darwin', 'x64', false],
+            ['linux', 'x64', true],
+            ['linux', 'arm64', false],
+            ['linux', 'arm', false],
+            ['win32', 'x64', true],
+            ['freebsd', 'x64', false],
+        ])('%s/%s -> %s', (platform, arch, expected) => {
+            Object.defineProperty(process, 'platform', { value: platform });
+            Object.defineProperty(process, 'arch', { value: arch });
+            expect(isFrameCopyPlatformSupported()).toBe(expected);
+        });
+    });
+
+    describe('resolveFrameCopyHelperPath', () => {
+        let tempDir: string;
+        let cwdSpy: jest.SpyInstance<string, []>;
+        let originalResourcesPath: string | undefined;
+
+        const releaseDir = () =>
+            path.join(
+                tempDir,
+                'apps',
+                'electron-backend',
+                'native',
+                'build',
+                'Release'
+            );
+        // The resolver looks for the host platform's binary name, so the
+        // fixture must follow it for the spec to stay host-agnostic.
+        const helperFileName = () =>
+            process.platform === 'win32'
+                ? 'iptvnator_mpv_helper.exe'
+                : 'iptvnator_mpv_helper';
+        const helperPath = () => path.join(releaseDir(), helperFileName());
+        const readerPath = () =>
+            path.join(releaseDir(), 'embedded_mpv_frame_reader.node');
+
+        beforeEach(() => {
+            tempDir = mkdtempSync(path.join(tmpdir(), 'impv-fc-util-'));
+            mkdirSync(releaseDir(), { recursive: true });
+            cwdSpy = jest.spyOn(process, 'cwd').mockReturnValue(tempDir);
+            mockElectronApp.isPackaged = false;
+            mockElectronApp.getAppPath.mockReturnValue('');
+            originalResourcesPath = (
+                process as NodeJS.Process & { resourcesPath?: string }
+            ).resourcesPath;
+        });
+
+        afterEach(() => {
+            cwdSpy.mockRestore();
+            Object.defineProperty(process, 'resourcesPath', {
+                configurable: true,
+                value: originalResourcesPath,
+            });
+            rmSync(tempDir, { recursive: true, force: true });
+        });
+
+        it('returns null when no helper exists', () => {
+            expect(resolveFrameCopyHelperPath()).toBeNull();
+        });
+
+        it('returns an executable helper next to the local-build addon path', () => {
+            writeFileSync(helperPath(), '#!/bin/sh\n');
+            chmodSync(helperPath(), 0o755);
+            writeFileSync(readerPath(), 'reader');
+
+            expect(resolveFrameCopyHelperPath()).toBe(helperPath());
+        });
+
+        it('ignores an executable helper without its frame reader addon', () => {
+            writeFileSync(helperPath(), '#!/bin/sh\n');
+            chmodSync(helperPath(), 0o755);
+
+            expect(resolveFrameCopyHelperPath()).toBeNull();
+        });
+
+        (process.platform === 'win32' ? it.skip : it)(
+            'ignores a helper without the execute bit',
+            () => {
+                writeFileSync(helperPath(), '#!/bin/sh\n');
+                chmodSync(helperPath(), 0o644);
+                writeFileSync(readerPath(), 'reader');
+
+                expect(resolveFrameCopyHelperPath()).toBeNull();
+            }
+        );
+
+        it('does not fall back to cwd build artifacts in a packaged app', () => {
+            writeFileSync(helperPath(), '#!/bin/sh\n');
+            chmodSync(helperPath(), 0o755);
+            writeFileSync(readerPath(), 'reader');
+            mockElectronApp.isPackaged = true;
+            const resourcesPath = path.join(tempDir, 'IPTVnator', 'Resources');
+            Object.defineProperty(process, 'resourcesPath', {
+                configurable: true,
+                value: resourcesPath,
+            });
+            mockElectronApp.getAppPath.mockReturnValue(
+                path.join(resourcesPath, 'app.asar')
+            );
+
+            expect(resolveFrameCopyHelperPath()).toBeNull();
+
+            const packagedNativeDir = path.join(
+                resourcesPath,
+                'app.asar.unpacked',
+                'electron-backend',
+                'native'
+            );
+            mkdirSync(packagedNativeDir, { recursive: true });
+            const packagedHelper = path.join(
+                packagedNativeDir,
+                helperFileName()
+            );
+            writeFileSync(packagedHelper, '#!/bin/sh\n');
+            chmodSync(packagedHelper, 0o755);
+            writeFileSync(
+                path.join(packagedNativeDir, 'embedded_mpv_frame_reader.node'),
+                'reader'
+            );
+
+            expect(resolveFrameCopyHelperPath()).toBe(packagedHelper);
+        });
+
+        it('limits packaged native-view addon discovery to package-owned paths', () => {
+            mockElectronApp.isPackaged = true;
+            const resourcesPath = path.join(tempDir, 'IPTVnator', 'Resources');
+            Object.defineProperty(process, 'resourcesPath', {
+                configurable: true,
+                value: resourcesPath,
+            });
+            mockElectronApp.getAppPath.mockReturnValue(
+                path.join(resourcesPath, 'app.asar')
+            );
+
+            expect(getEmbeddedMpvAddonCandidatePaths()).toEqual([
+                path.join(
+                    resourcesPath,
+                    'app.asar.unpacked',
+                    'electron-backend',
+                    'native',
+                    'embedded_mpv.node'
+                ),
+            ]);
+        });
+    });
+
+    describe('isFrameCopyRuntimeUsable', () => {
+        const originalPlatform = process.platform;
+        const originalArch = process.arch;
+
+        beforeEach(() => {
+            mockElectronApp.isPackaged = false;
+        });
+
+        afterEach(() => {
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            });
+            Object.defineProperty(process, 'arch', { value: originalArch });
+            mockElectronApp.isPackaged = false;
+        });
+
+        it('requires a successful Linux x64 runtime probe', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            Object.defineProperty(process, 'arch', { value: 'x64' });
+            const resolveHelper = jest.fn(() => '/native/iptvnator_mpv_helper');
+            const probeRuntime = jest.fn<
+                EmbeddedMpvFrameCopyRuntimeResult,
+                [string, EmbeddedMpvFrameCopyManifestContract]
+            >(() => ({
+                usable: true,
+                profile: 'system',
+                runtimeMode: 'system',
+                libmpv: '2.3',
+                renderApi: 'egl',
+            }));
+
+            expect(isFrameCopyRuntimeUsable(resolveHelper, probeRuntime)).toBe(
+                true
+            );
+            expect(probeRuntime).toHaveBeenCalledWith(
+                '/native/iptvnator_mpv_helper',
+                'development'
+            );
+
+            probeRuntime.mockReturnValueOnce({
+                usable: false,
+                reason: 'helper-probe-failed',
+            });
+            expect(
+                getFrameCopyRuntimeAvailability(resolveHelper, probeRuntime)
+            ).toEqual({
+                usable: false,
+                reason: 'helper-probe-failed',
+            });
+        });
+
+        it('selects the packaged manifest contract only from app.isPackaged', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            Object.defineProperty(process, 'arch', { value: 'x64' });
+            mockElectronApp.isPackaged = true;
+            const resolveHelper = jest.fn(() => '/native/iptvnator_mpv_helper');
+            const probeRuntime = jest.fn<
+                EmbeddedMpvFrameCopyRuntimeResult,
+                [string, EmbeddedMpvFrameCopyManifestContract]
+            >(() => ({
+                usable: true,
+                profile: 'system',
+                runtimeMode: 'system',
+                libmpv: '2.3',
+                renderApi: 'egl',
+            }));
+
+            expect(isFrameCopyRuntimeUsable(resolveHelper, probeRuntime)).toBe(
+                true
+            );
+            expect(probeRuntime).toHaveBeenCalledWith(
+                '/native/iptvnator_mpv_helper',
+                'packaged'
+            );
+        });
+
+        it.each<[NodeJS.Platform, string]>([
+            ['darwin', 'arm64'],
+            ['win32', 'x64'],
+        ])(
+            'keeps the existing helper-presence gate on %s',
+            (platform, arch) => {
+                Object.defineProperty(process, 'platform', {
+                    value: platform,
+                });
+                Object.defineProperty(process, 'arch', { value: arch });
+                const resolveHelper = jest.fn(
+                    () => '/native/iptvnator_mpv_helper'
+                );
+                const probeRuntime = jest.fn();
+
+                expect(
+                    isFrameCopyRuntimeUsable(resolveHelper, probeRuntime)
+                ).toBe(true);
+                expect(probeRuntime).not.toHaveBeenCalled();
+            }
+        );
+
+        it('rejects Linux ARM before helper discovery or probing', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            Object.defineProperty(process, 'arch', { value: 'arm64' });
+            const resolveHelper = jest.fn(() => '/native/iptvnator_mpv_helper');
+            const probeRuntime = jest.fn();
+
+            expect(isFrameCopyRuntimeUsable(resolveHelper, probeRuntime)).toBe(
+                false
+            );
+            expect(resolveHelper).not.toHaveBeenCalled();
+            expect(probeRuntime).not.toHaveBeenCalled();
+        });
+
+        it('reports unsupported architecture for Intel macOS', () => {
+            Object.defineProperty(process, 'platform', { value: 'darwin' });
+            Object.defineProperty(process, 'arch', { value: 'x64' });
+            const resolveHelper = jest.fn(() => '/native/iptvnator_mpv_helper');
+            const probeRuntime = jest.fn();
+
+            expect(
+                getFrameCopyRuntimeAvailability(resolveHelper, probeRuntime)
+            ).toEqual({
+                usable: false,
+                reason: 'unsupported-architecture',
+            });
+            expect(resolveHelper).not.toHaveBeenCalled();
+            expect(probeRuntime).not.toHaveBeenCalled();
+        });
+    });
+
+    it('lazily probes only a stored opt-in without an explicit env override', () => {
+        const runtimeUsable = jest.fn(() => true);
+        expect(
+            shouldPromotePersistedFrameCopyOptIn(
+                false,
+                undefined,
+                runtimeUsable
+            )
+        ).toBe(false);
+        expect(
+            shouldPromotePersistedFrameCopyOptIn(true, '0', runtimeUsable)
+        ).toBe(false);
+        expect(
+            shouldPromotePersistedFrameCopyOptIn(true, '1', runtimeUsable)
+        ).toBe(false);
+        expect(runtimeUsable).not.toHaveBeenCalled();
+
+        expect(
+            shouldPromotePersistedFrameCopyOptIn(true, undefined, runtimeUsable)
+        ).toBe(true);
+        expect(runtimeUsable).toHaveBeenCalledTimes(1);
+
+        runtimeUsable.mockReturnValue(false);
+        expect(
+            shouldPromotePersistedFrameCopyOptIn(true, undefined, runtimeUsable)
+        ).toBe(false);
+        expect(runtimeUsable).toHaveBeenCalledTimes(2);
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.ts
new file mode 100644
index 000000000..f4844d0df
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.ts
@@ -0,0 +1,208 @@
+import { app } from 'electron';
+import { accessSync, constants as fsConstants, statSync } from 'fs';
+import path from 'path';
+import { probeEmbeddedMpvFrameCopyRuntime } from './embedded-mpv-frame-copy-runtime';
+import type {
+    EmbeddedMpvFrameCopyManifestContract,
+    EmbeddedMpvFrameCopyRuntimeResult,
+} from './embedded-mpv-frame-copy-runtime';
+
+/**
+ * Platform gate + helper discovery for the embedded MPV frame-copy engine,
+ * shared by startup, the runtime service, and the frame-copy adapter so
+ * sandbox and engine decisions cannot drift. These helpers must remain
+ * callable before app.whenReady().
+ *
+ * macOS: Apple Silicon only (owner decision 2026-07-10) — Intel Macs keep
+ * the docked native engine. Linux: x64 only — official packages validate a
+ * profile manifest and run the helper's bounded EGL/libmpv capability probe;
+ * ARM packages remain honestly unavailable. Windows: any arch with a helper
+ * binary (WGL offscreen render; in practice x64, the only vendored runtime)
+ * — the helper-presence check below is the real gate.
+ */
+export function isFrameCopyPlatformSupported(): boolean {
+    return (
+        (process.platform === 'linux' && process.arch === 'x64') ||
+        process.platform === 'win32' ||
+        (process.platform === 'darwin' && process.arch === 'arm64')
+    );
+}
+
+function dedupeDefinedPaths(paths: Array<string | undefined>): string[] {
+    return [
+        ...new Set(paths.filter((value): value is string => Boolean(value))),
+    ];
+}
+
+function getLocalBuildAddonPath(): string {
+    return path.resolve(
+        process.cwd(),
+        'apps/electron-backend/native/build/Release/embedded_mpv.node'
+    );
+}
+
+function getDistAddonPaths(): string[] {
+    return [
+        path.resolve(__dirname, 'native/embedded_mpv.node'),
+        path.resolve(__dirname, '../../native/embedded_mpv.node'),
+    ];
+}
+
+function getPackagedAddonPaths(): string[] {
+    const resourcesPath = (
+        process as NodeJS.Process & { resourcesPath?: string }
+    ).resourcesPath;
+    return dedupeDefinedPaths([
+        resourcesPath
+            ? path.resolve(
+                  resourcesPath,
+                  'app.asar.unpacked',
+                  'electron-backend',
+                  'native',
+                  'embedded_mpv.node'
+              )
+            : undefined,
+        app.getAppPath()
+            ? path.join(
+                  path.dirname(app.getAppPath()),
+                  'app.asar.unpacked',
+                  'electron-backend',
+                  'native',
+                  'embedded_mpv.node'
+              )
+            : undefined,
+    ]);
+}
+
+/** Candidate locations of the embedded MPV addon, most likely first. */
+export function getEmbeddedMpvAddonCandidatePaths(): string[] {
+    const localBuildAddonPath = getLocalBuildAddonPath();
+    const distAddonPaths = getDistAddonPaths();
+    const packagedAddonPaths = getPackagedAddonPaths();
+
+    return dedupeDefinedPaths(
+        app.isPackaged
+            ? packagedAddonPaths
+            : [localBuildAddonPath, ...distAddonPaths, ...packagedAddonPaths]
+    );
+}
+
+/**
+ * Resolve the first executable frame-copy helper with a readable regular-file
+ * frame reader beside it. Both artifacts are required before the engine may
+ * relax the renderer sandbox. Windows uses the `.exe` helper name; X_OK is an
+ * existence check there, while POSIX platforms also require the execute bit.
+ */
+export function resolveFrameCopyHelperPath(): string | null {
+    // Packaged startup must never fall through to cwd/dist development
+    // artifacts: doing so would let a writable launch directory supply the
+    // executable that causes BrowserWindow sandbox relaxation.
+    const addonCandidates = app.isPackaged
+        ? getPackagedAddonPaths()
+        : [getLocalBuildAddonPath(), ...getDistAddonPaths()];
+    const helperFileName =
+        process.platform === 'win32'
+            ? 'iptvnator_mpv_helper.exe'
+            : 'iptvnator_mpv_helper';
+    return (
+        addonCandidates
+            .map((candidatePath) => path.dirname(candidatePath))
+            .map((nativeDir) => ({
+                helper: path.join(nativeDir, helperFileName),
+                reader: path.join(nativeDir, 'embedded_mpv_frame_reader.node'),
+            }))
+            .find(({ helper, reader }) => {
+                try {
+                    accessSync(helper, fsConstants.X_OK);
+                    accessSync(reader, fsConstants.R_OK);
+                    if (
+                        !statSync(helper).isFile() ||
+                        !statSync(reader).isFile()
+                    ) {
+                        return false;
+                    }
+                    return true;
+                } catch {
+                    return false;
+                }
+            })?.helper ?? null
+    );
+}
+
+type FrameCopyRuntimeProbe = (
+    helperPath: string,
+    manifestContract: EmbeddedMpvFrameCopyManifestContract
+) => EmbeddedMpvFrameCopyRuntimeResult;
+
+export type FrameCopyRuntimeAvailability =
+    | EmbeddedMpvFrameCopyRuntimeResult
+    | { usable: true };
+
+let cachedDefaultRuntimeAvailability: FrameCopyRuntimeAvailability | undefined;
+
+export function getFrameCopyRuntimeAvailability(
+    resolveHelper: () => string | null = resolveFrameCopyHelperPath,
+    probeRuntime: FrameCopyRuntimeProbe = probeEmbeddedMpvFrameCopyRuntime
+): FrameCopyRuntimeAvailability {
+    const usesProcessDecision =
+        resolveHelper === resolveFrameCopyHelperPath &&
+        probeRuntime === probeEmbeddedMpvFrameCopyRuntime;
+    if (usesProcessDecision && cachedDefaultRuntimeAvailability !== undefined) {
+        return cachedDefaultRuntimeAvailability;
+    }
+
+    let availability: FrameCopyRuntimeAvailability;
+    if (!isFrameCopyPlatformSupported()) {
+        availability = {
+            usable: false,
+            reason:
+                process.platform === 'linux' || process.platform === 'darwin'
+                    ? 'unsupported-architecture'
+                    : 'unsupported-platform',
+        };
+    } else {
+        const helperPath = resolveHelper();
+        if (!helperPath) {
+            availability = {
+                usable: false,
+                reason: 'runtime-artifact-missing',
+            };
+        } else if (process.platform !== 'linux') {
+            availability = { usable: true };
+        } else {
+            try {
+                // app.isPackaged is the trusted boundary. Environment flags
+                // can request the feature, but cannot weaken its manifest
+                // contract or make development artifacts package-trusted.
+                availability = probeRuntime(
+                    helperPath,
+                    app.isPackaged ? 'packaged' : 'development'
+                );
+            } catch {
+                availability = {
+                    usable: false,
+                    reason: 'runtime-probe-internal-error',
+                };
+            }
+        }
+    }
+    if (usesProcessDecision) {
+        cachedDefaultRuntimeAvailability = availability;
+    }
+    return availability;
+}
+
+export function isFrameCopyRuntimeUsable(
+    resolveHelper: () => string | null = resolveFrameCopyHelperPath,
+    probeRuntime: FrameCopyRuntimeProbe = probeEmbeddedMpvFrameCopyRuntime
+): boolean {
+    return getFrameCopyRuntimeAvailability(resolveHelper, probeRuntime).usable;
+}
+
+export function shouldPromotePersistedFrameCopyOptIn(
+    storedEnabled: boolean,
+    explicitEnv: string | undefined,
+    runtimeUsable: () => boolean = isFrameCopyRuntimeUsable
+): boolean {
+    return explicitEnv === undefined && storedEnabled && runtimeUsable();
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-protocol.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-protocol.ts
new file mode 100644
index 000000000..51d6146b1
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-protocol.ts
@@ -0,0 +1,138 @@
+import {
+    EmbeddedMpvFrameSource,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import type { NativeEmbeddedMpvSessionSnapshot } from './embedded-mpv-native.service';
+
+/**
+ * Wire protocol for the `iptvnator_mpv_helper` frame-copy process:
+ * tab-separated commands over stdin, JSON events over stdout.
+ *
+ * Kept separate from the adapter so the encoding rules and the event contract
+ * can be read (and tested) without the process-lifecycle machinery around them.
+ */
+
+/**
+ * Percent-escape the protocol's structural characters so a title or URL can
+ * never inject an extra field or line into a command.
+ */
+export function encodeProtocolValue(value: string): string {
+    return value
+        .replace(/%/g, '%25')
+        .replace(/\t/g, '%09')
+        .replace(/\n/g, '%0A')
+        .replace(/\r/g, '%0D');
+}
+
+export function createInitialSnapshot(): NativeEmbeddedMpvSessionSnapshot {
+    return {
+        status: 'loading',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        streamUrl: '',
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+    };
+}
+
+/** Build the `load` command line for a resolved playback target. */
+export function buildLoadPlaybackCommand(
+    playback: ResolvedPortalPlayback
+): string {
+    const fields: string[] = [`url=${encodeProtocolValue(playback.streamUrl)}`];
+    if (playback.title) {
+        fields.push(
+            `opt.force-media-title=${encodeProtocolValue(playback.title)}`
+        );
+    }
+    if (playback.userAgent) {
+        fields.push(`opt.user-agent=${encodeProtocolValue(playback.userAgent)}`);
+    }
+    if (playback.referer) {
+        fields.push(`opt.referrer=${encodeProtocolValue(playback.referer)}`);
+    }
+    if (
+        typeof playback.startTime === 'number' &&
+        Number.isFinite(playback.startTime) &&
+        playback.startTime >= 0
+    ) {
+        fields.push(`opt.start=${playback.startTime}`);
+    }
+    if (playback.headers && Object.keys(playback.headers).length > 0) {
+        const headerFields = Object.entries(playback.headers)
+            .map(([key, value]) => `${key}: ${value}`)
+            .join(',');
+        fields.push(
+            `opt.http-header-fields=${encodeProtocolValue(headerFields)}`
+        );
+    }
+    return `load\t${fields.join('\t')}`;
+}
+
+/** The mutable per-session state a helper event can act on. */
+export interface HelperEventTarget {
+    readonly id: string;
+    snapshot: NativeEmbeddedMpvSessionSnapshot;
+    frameSource: EmbeddedMpvFrameSource | null;
+}
+
+export interface HelperEventHandlers {
+    resolveReaderPath: () => string;
+    onFrameSourceChanged: (
+        sessionId: string,
+        source: EmbeddedMpvFrameSource
+    ) => void;
+}
+
+/** Apply one decoded helper stdout event to the session. */
+export function applyHelperEvent(
+    session: HelperEventTarget,
+    event: Record<string, unknown>,
+    handlers: HelperEventHandlers
+): void {
+    switch (event.event) {
+        case 'snapshot': {
+            const { event: _ignored, ...snapshot } = event;
+            session.snapshot = {
+                ...session.snapshot,
+                ...(snapshot as Partial<NativeEmbeddedMpvSessionSnapshot>),
+            } as NativeEmbeddedMpvSessionSnapshot;
+            break;
+        }
+        case 'shm': {
+            const source: EmbeddedMpvFrameSource = {
+                shmName: String(event.name ?? ''),
+                width: Number(event.width ?? 0),
+                height: Number(event.height ?? 0),
+                generation: Number(event.generation ?? 0),
+                readerPath: handlers.resolveReaderPath(),
+            };
+            session.frameSource = source;
+            handlers.onFrameSourceChanged(session.id, source);
+            break;
+        }
+        case 'fatal':
+            session.snapshot.status = 'error';
+            session.snapshot.error = String(
+                event.error ?? 'Embedded MPV helper failed.'
+            );
+            break;
+        case 'log':
+            if (event.level === 'error' || event.level === 'fatal') {
+                console.error(
+                    `[embedded-mpv-fc][${session.id}][mpv/${String(
+                        event.prefix ?? ''
+                    )}] ${String(event.text ?? '').trim()}`
+                );
+            }
+            break;
+        default:
+            break;
+    }
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts
new file mode 100644
index 000000000..349f0ef52
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts
@@ -0,0 +1,16 @@
+export { createLinuxFrameCopyHelperEnvironment } from './embedded-mpv-frame-copy-runtime/helper-environment';
+export { createLinuxFrameCopyHelperLaunch } from './embedded-mpv-frame-copy-runtime/helper-launch';
+export {
+    createEmbeddedMpvFrameCopyRuntimeProbe,
+    probeEmbeddedMpvFrameCopyRuntime,
+} from './embedded-mpv-frame-copy-runtime/probe';
+export type {
+    EmbeddedMpvFrameCopyManifestContract,
+    EmbeddedMpvFrameCopyRuntimeDependencies,
+    EmbeddedMpvFrameCopyRuntimeFailureReason,
+    EmbeddedMpvFrameCopyRuntimeFileSystem,
+    EmbeddedMpvFrameCopyRuntimeMode,
+    EmbeddedMpvFrameCopyRuntimeResult,
+    EmbeddedMpvHelperRuntimeProbeFailureReason,
+} from './embedded-mpv-frame-copy-runtime/types';
+export type { LinuxFrameCopyHelperLaunchFileSystem } from './embedded-mpv-frame-copy-runtime/helper-launch';
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/contracts.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/contracts.ts
new file mode 100644
index 000000000..4a094e217
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/contracts.ts
@@ -0,0 +1,330 @@
+import runtimeProbeContract = require('../../../../../../tools/embedded-mpv/runtime-probe-contract.cjs');
+import sourceArchiveContract = require('../../../../../../tools/embedded-mpv/linux-source-archive-contract.cjs');
+import type { EmbeddedMpvFrameCopyRuntimeMode, RuntimeProfile } from './types';
+
+interface RuntimeProfileContract {
+    origin: string;
+    runtimeMode: EmbeddedMpvFrameCopyRuntimeMode;
+    targets: ReadonlySet<string>;
+}
+
+export const RUNTIME_MANIFEST_NAME = 'embedded-mpv-runtime.json';
+export const FRAME_COPY_ADDON_NAME = 'embedded_mpv.node';
+export const FRAME_COPY_READER_NAME = 'embedded_mpv_frame_reader.node';
+export const FRAME_COPY_HELPER_NAME = 'iptvnator_mpv_helper';
+export const RUNTIME_PROBE_PROTOCOL = 1;
+export const { RUNTIME_PROBE_MAX_BUFFER_BYTES, RUNTIME_PROBE_TIMEOUT_MS } =
+    runtimeProbeContract;
+export const {
+    SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION,
+    SOURCE_ARCHIVE_NAME,
+    validateLinuxSourceArchiveBinding,
+} = sourceArchiveContract;
+export const VERSIONED_LIBMPV_PATTERN = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+export const SAFE_RUNTIME_NAME_PATTERN = /^[A-Za-z0-9_+.-]+$/;
+export const SHARED_LIBRARY_PATTERN = /\.so(?:\.\d+)*$/;
+export const PINNED_LIBPLACEBO_SOURCE_SUBMODULES = [
+    '450bd2232225d6c7728a4108055ac2e37cef6475 3rdparty/Vulkan-Headers',
+    '97b54ca9e75f5303507699d27c6b4f4efe4641a1 3rdparty/fast_float',
+    '73db193f853e2ee079bf3ca8a64aa2eaf6459043 3rdparty/glad',
+    '15206881c006c79667fe5154fe80c01c65410679 3rdparty/jinja',
+    '297fc8e356e6836a62087949245d09a28e9f1b13 3rdparty/markupsafe',
+    '242f35efa067a46c595645eeda7b1771ea1f83b1 demos/3rdparty/nuklear',
+] as const;
+export const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+export const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+export const SUBMODULE_RECORD_PATTERN =
+    /^[a-f0-9]{40,64}\s+([A-Za-z0-9_+./-]+)$/;
+export const VERSION_PATTERN = /^\d+(?:\.\d+)+$/;
+
+export const GLIBC_TOOLCHAIN_ALLOWLIST = [
+    'ld-linux-x86-64.so.2',
+    'libc.so.6',
+    'libdl.so.2',
+    'libgcc_s.so.1',
+    'libm.so.6',
+    'libpthread.so.0',
+    'librt.so.1',
+    'libstdc++.so.6',
+] as const;
+
+export const EXPECTED_EXTERNAL_SYSTEM_LIBRARIES = [
+    {
+        name: 'libEGL.so.1',
+        interface: 'EGL',
+        reason: 'System graphics-driver interface used by the frame-copy helper.',
+    },
+    {
+        name: 'libGL.so.1',
+        interface: 'OpenGL',
+        reason: 'System OpenGL compatibility interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libGLX.so.0',
+        interface: 'OpenGL',
+        reason: 'GLVND OpenGL dispatch interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libOpenGL.so.0',
+        interface: 'OpenGL',
+        reason: 'GLVND OpenGL interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libasound.so.2',
+        interface: 'ALSA',
+        reason: 'Linux system audio interface intentionally used by libmpv.',
+    },
+    {
+        name: 'libdrm.so.2',
+        interface: 'DRM',
+        reason: 'Kernel graphics interface used by system GBM and VA-API drivers.',
+    },
+    {
+        name: 'libgbm.so.1',
+        interface: 'GBM',
+        reason: 'System graphics-buffer interface used by headless EGL rendering.',
+    },
+    {
+        name: 'libpulse.so.0',
+        interface: 'PulseAudio',
+        reason: 'Linux desktop audio interface intentionally used by libmpv.',
+    },
+    {
+        name: 'libva-drm.so.2',
+        interface: 'VA-API DRM',
+        reason: 'System VA-API DRM interface used for hardware decoding.',
+    },
+    {
+        name: 'libva.so.2',
+        interface: 'VA-API',
+        reason: 'System video-acceleration interface used for hardware decoding.',
+    },
+] as const;
+
+export const ALLOWED_EXTERNAL_LIBRARY_NAMES = new Set<string>([
+    ...GLIBC_TOOLCHAIN_ALLOWLIST,
+    ...EXPECTED_EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+]);
+
+export const PORTABLE_ABI_BASELINE = {
+    distribution: 'Ubuntu 22.04',
+    glibcMaximum: '2.35',
+    glibcxxMaximum: '3.4.30',
+} as const;
+
+export const PINNED_SOURCE_PACKAGE_IDENTITIES = {
+    freetype: {
+        version: '2.13.3',
+        sourceUrl:
+            'https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz',
+        sourceSha256:
+            '0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289',
+        license: 'FreeType License (FTL)',
+    },
+    fribidi: {
+        version: '1.0.16',
+        sourceUrl:
+            'https://github.com/fribidi/fribidi/releases/download/v1.0.16/fribidi-1.0.16.tar.xz',
+        sourceSha256:
+            '1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c',
+        license: 'LGPL-2.1-or-later',
+    },
+    harfbuzz: {
+        version: '8.5.0',
+        sourceUrl:
+            'https://github.com/harfbuzz/harfbuzz/releases/download/8.5.0/harfbuzz-8.5.0.tar.xz',
+        sourceSha256:
+            '77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27',
+        license: 'MIT',
+    },
+    expat: {
+        version: '2.8.2',
+        sourceUrl:
+            'https://github.com/libexpat/libexpat/releases/download/R_2_8_2/expat-2.8.2.tar.xz',
+        sourceSha256:
+            '3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4',
+        license: 'MIT',
+    },
+    fontconfig: {
+        version: '2.16.0',
+        sourceUrl:
+            'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz',
+        sourceSha256:
+            '6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220',
+        license: 'MIT',
+    },
+    libass: {
+        version: '0.17.3',
+        sourceUrl:
+            'https://github.com/libass/libass/releases/download/0.17.3/libass-0.17.3.tar.xz',
+        sourceSha256:
+            'eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959',
+        license: 'ISC',
+    },
+    openssl: {
+        version: '3.5.7',
+        sourceUrl:
+            'https://github.com/openssl/openssl/releases/download/openssl-3.5.7/openssl-3.5.7.tar.gz',
+        sourceSha256:
+            'a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8',
+        license: 'Apache-2.0',
+    },
+    ffmpeg: {
+        version: '8.1',
+        sourceUrl: 'https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz',
+        sourceSha256:
+            'b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a',
+        license: 'LGPL-2.1-or-later',
+    },
+    libplacebo: {
+        version: '7.360.1',
+        sourceUrl: 'https://github.com/haasn/libplacebo.git',
+        sourceTag: 'v7.360.1',
+        sourceGitCommit: 'cee9b076f2c63104ccfd497fa79c39a867293ec4',
+        sourceSubmodules: PINNED_LIBPLACEBO_SOURCE_SUBMODULES,
+        license: 'LGPL-2.1-or-later',
+    },
+    hwdata: {
+        version: '0.409',
+        sourceUrl:
+            'https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.409.tar.gz',
+        sourceSha256:
+            '23006accc0f931dd5187d0307a57d0744e2b8feb85e73c37bc0f5229fb31eadd',
+        buildInput: {
+            consumer: 'libdisplay-info',
+            relativePath: 'pnp.ids',
+            purpose: 'PNP vendor lookup table compiled into libdisplay-info.',
+        },
+        license: 'GPL-2.0-or-later OR XFree86-1.0',
+    },
+    'libdisplay-info': {
+        version: '0.1.1',
+        sourceUrl:
+            'https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/libdisplay-info-0.1.1.tar.xz',
+        sourceSha256:
+            '0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60',
+        license: 'MIT',
+    },
+    mpv: {
+        version: '0.41.0',
+        sourceUrl:
+            'https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz',
+        sourceSha256:
+            'ee21092a5ee427353392360929dc64645c54479aefdb5babc5cfbb5fad626209',
+        license: 'LGPL-2.1-or-later with -Dgpl=false',
+    },
+} as const;
+
+export const EXPECTED_ARTIFACTS = {
+    addon: {
+        name: FRAME_COPY_ADDON_NAME,
+        regularFile: true,
+        readable: true,
+    },
+    frameReader: {
+        name: FRAME_COPY_READER_NAME,
+        regularFile: true,
+        readable: true,
+    },
+    helper: {
+        name: FRAME_COPY_HELPER_NAME,
+        regularFile: true,
+        readable: true,
+        executable: true,
+    },
+};
+
+export const EXPECTED_PROCESS_ISOLATION = {
+    addonLoadsLibmpv: false,
+    readerLoadsLibmpv: false,
+    electronLoadsLibmpv: false,
+    helperLinksLibmpv: true,
+    helperRunpath: ['$ORIGIN/lib'],
+};
+
+export const EXPECTED_DEVELOPMENT_ARTIFACTS = {
+    addon: FRAME_COPY_ADDON_NAME,
+    frameReader: FRAME_COPY_READER_NAME,
+    helper: FRAME_COPY_HELPER_NAME,
+};
+
+export const EXPECTED_DEVELOPMENT_PROCESS_ISOLATION = {
+    addonLoadsLibmpv: false,
+    helperLinksLibmpv: true,
+    helperRunpath: ['$ORIGIN/lib'],
+};
+
+export const DEVELOPMENT_MANIFEST_FIELDS = [
+    'allowedPackageRuntimeModes',
+    'arch',
+    'artifacts',
+    'buildInputMode',
+    'generatedAt',
+    'libmpvSoname',
+    'nativeViewFallback',
+    'origin',
+    'packageRuntimeAvailability',
+    'platform',
+    'processIsolation',
+    'runtimeFiles',
+    'runtimeTotalBytes',
+    'schemaVersion',
+    'sourceArchive',
+    'sourceRuntime',
+    'sourceRuntimeValidated',
+] as const;
+
+export const SYSTEM_PACKAGE_DEPENDENCIES = Object.freeze({
+    deb: Object.freeze(['libmpv2', 'libegl1', 'libgl1', 'libgbm1']),
+    rpm: Object.freeze([
+        'mpv-libs',
+        'libglvnd-egl',
+        'libglvnd-glx',
+        'mesa-libgbm',
+    ]),
+    pacman: Object.freeze(['mpv', 'libglvnd', 'mesa']),
+});
+
+export const PROFILE_CONTRACTS = {
+    system: {
+        origin: 'system-libmpv-frame-copy',
+        runtimeMode: 'system',
+        targets: new Set(['deb', 'rpm', 'pacman']),
+    },
+    portable: {
+        origin: 'bundled-lgpl-frame-copy',
+        runtimeMode: 'bundled',
+        targets: new Set(['appimage', 'snap']),
+    },
+    flatpak: {
+        origin: 'bundled-lgpl-frame-copy',
+        runtimeMode: 'bundled',
+        targets: new Set(['flatpak']),
+    },
+} as const satisfies Record<RuntimeProfile, RuntimeProfileContract>;
+
+export const BASE_MANIFEST_FIELDS = [
+    'arch',
+    'artifacts',
+    'generatedAt',
+    'libmpvSoname',
+    'nativeViewFallback',
+    'origin',
+    'packageDependencies',
+    'platform',
+    'processIsolation',
+    'profile',
+    'runtimeFiles',
+    'runtimeMode',
+    'runtimeTotalBytes',
+    'schemaVersion',
+    'targets',
+] as const;
+
+export const BUNDLED_MANIFEST_FIELDS = [
+    ...BASE_MANIFEST_FIELDS,
+    'externalSystemLibraries',
+    'runtimeDependencyClosure',
+    'sourceArchive',
+    'sourceRuntime',
+] as const;
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/development-manifest.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/development-manifest.spec.ts
new file mode 100644
index 000000000..57fd6bc06
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/development-manifest.spec.ts
@@ -0,0 +1,172 @@
+import { mkdirSync } from 'fs';
+import path from 'path';
+import {
+    cloneManifest,
+    createDevelopmentFixture,
+    probeDevelopmentRuntime,
+    writeManifest,
+} from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy development manifest', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it.each(['system-dev', 'system-build-inputs', 'bundled-runtime'] as const)(
+        'accepts an exact unpackaged %s build manifest and still runs the helper probe',
+        (buildInputMode) => {
+            const fixture = createDevelopmentFixture(
+                context.rootDir,
+                buildInputMode
+            );
+
+            expect(
+                probeDevelopmentRuntime(
+                    context.createProbe(),
+                    fixture.helperPath
+                )
+            ).toEqual(
+                expect.objectContaining({
+                    usable: true,
+                    runtimeMode:
+                        buildInputMode === 'bundled-runtime'
+                            ? 'bundled'
+                            : 'system',
+                })
+            );
+            expect(context.spawnRuntimeProbe).toHaveBeenCalledWith(
+                fixture.helperPath,
+                ['--runtime-probe'],
+                expect.objectContaining({
+                    env:
+                        buildInputMode === 'bundled-runtime'
+                            ? {
+                                  PATH: '/usr/bin',
+                                  LD_LIBRARY_PATH: path.join(
+                                      fixture.nativeDir,
+                                      'lib'
+                                  ),
+                              }
+                            : {
+                                  PATH: '/usr/bin',
+                              },
+                })
+            );
+        }
+    );
+
+    it('keeps the packaged manifest contract strict when a development manifest is present', () => {
+        const fixture = createDevelopmentFixture(
+            context.rootDir,
+            'bundled-runtime'
+        );
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it('accepts a local bundled runtime before a release source archive is assembled', () => {
+        const fixture = createDevelopmentFixture(
+            context.rootDir,
+            'bundled-runtime'
+        );
+        const manifest = cloneManifest(fixture.manifest);
+        manifest.sourceArchive = null;
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(
+            probeDevelopmentRuntime(context.createProbe(), fixture.helperPath)
+        ).toEqual(
+            expect.objectContaining({
+                usable: true,
+                runtimeMode: 'bundled',
+            })
+        );
+        expect(context.spawnRuntimeProbe).toHaveBeenCalled();
+    });
+
+    it.each([
+        {
+            label: 'origin',
+            mutate(manifest: Record<string, unknown>) {
+                manifest.origin = 'system-libmpv-frame-copy';
+            },
+        },
+        {
+            label: 'architecture',
+            mutate(manifest: Record<string, unknown>) {
+                manifest.arch = 'arm64';
+            },
+        },
+        {
+            label: 'artifact set',
+            mutate(manifest: Record<string, unknown>) {
+                const artifacts = manifest.artifacts as Record<string, unknown>;
+                artifacts.helper = 'other-helper';
+            },
+        },
+        {
+            label: 'package availability',
+            mutate(manifest: Record<string, unknown>) {
+                manifest.packageRuntimeAvailability = {
+                    system: true,
+                    bundled: false,
+                };
+            },
+        },
+        {
+            label: 'unexpected field',
+            mutate(manifest: Record<string, unknown>) {
+                manifest.manifestContract = 'packaged';
+            },
+        },
+    ])(
+        'rejects a development manifest with an invalid $label',
+        ({ mutate }) => {
+            const fixture = createDevelopmentFixture(
+                context.rootDir,
+                'system-dev'
+            );
+            const manifest = cloneManifest(fixture.manifest);
+            mutate(manifest);
+            writeManifest(fixture.manifestPath, manifest);
+
+            expect(
+                probeDevelopmentRuntime(
+                    context.createProbe(),
+                    fixture.helperPath
+                )
+            ).toEqual({
+                usable: false,
+                reason: 'runtime-manifest-invalid',
+            });
+            expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+        }
+    );
+
+    it('rejects a system development manifest with a private runtime directory', () => {
+        const fixture = createDevelopmentFixture(context.rootDir, 'system-dev');
+        mkdirSync(path.join(fixture.nativeDir, 'lib'));
+
+        expect(
+            probeDevelopmentRuntime(context.createProbe(), fixture.helperPath)
+        ).toEqual({
+            usable: false,
+            reason: 'runtime-library-directory-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/flatpak-runtime.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/flatpak-runtime.spec.ts
new file mode 100644
index 000000000..27b743f6e
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/flatpak-runtime.spec.ts
@@ -0,0 +1,148 @@
+import { accessSync, lstatSync, readFileSync, readdirSync } from 'fs';
+import path from 'path';
+import { createLinuxFrameCopyHelperEnvironment } from '../embedded-mpv-frame-copy-runtime';
+import { createFixture } from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+const FLATPAK_NATIVE_DIR =
+    '/app/iptvnator/resources/app.asar.unpacked/electron-backend/native';
+const FREEDESKTOP_EGL_EXTERNAL_PLATFORM_CONFIG_DIRS = [
+    '/etc/egl/egl_external_platform.d',
+    '/usr/lib/x86_64-linux-gnu/GL/egl/egl_external_platform.d',
+    '/usr/share/egl/egl_external_platform.d',
+].join(':');
+
+describe('Flatpak embedded MPV frame-copy runtime', () => {
+    it('reconstructs the immutable Freedesktop GL metadata inside the packaged app', () => {
+        expect(
+            createLinuxFrameCopyHelperEnvironment(
+                {
+                    PATH: '/app/bin:/usr/bin',
+                    FLATPAK_ID: 'com.fourgray.iptvnator',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                        '/tmp/hostile-egl-platform',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES:
+                        '/tmp/hostile-egl-platform.json',
+                    GBM_BACKENDS_PATH: '/tmp/hostile-gbm',
+                    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri',
+                    LIBVA_DRIVERS_PATH: '/tmp/hostile-va',
+                    __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor',
+                    VK_LAYER_PATH: '/tmp/hostile-vulkan',
+                },
+                FLATPAK_NATIVE_DIR,
+                'bundled'
+            )
+        ).toEqual({
+            PATH: '/app/bin:/usr/bin',
+            FLATPAK_ID: 'com.fourgray.iptvnator',
+            __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                FREEDESKTOP_EGL_EXTERNAL_PLATFORM_CONFIG_DIRS,
+            LD_LIBRARY_PATH: path.join(FLATPAK_NATIVE_DIR, 'lib'),
+        });
+    });
+
+    it.each([
+        ['wrong app id', 'com.example.other', '/app/iptvnator/native'],
+        [
+            'helper outside /app',
+            'com.fourgray.iptvnator',
+            '/opt/iptvnator/native',
+        ],
+    ])(
+        'does not reconstruct Flatpak GL metadata for %s',
+        (_label, flatpakId, nativeDir) => {
+            expect(
+                createLinuxFrameCopyHelperEnvironment(
+                    {
+                        FLATPAK_ID: flatpakId,
+                        __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                            '/tmp/hostile-egl-platform',
+                    },
+                    nativeDir,
+                    'bundled'
+                )
+            ).toEqual({
+                FLATPAK_ID: flatpakId,
+                LD_LIBRARY_PATH: path.join(nativeDir, 'lib'),
+            });
+        }
+    );
+
+    describe('packaged capability probe', () => {
+        let context: RuntimeTestContext;
+
+        beforeEach(() => {
+            context = createRuntimeTestContext();
+        });
+
+        afterEach(() => {
+            context.dispose();
+        });
+
+        it('uses reconstructed Freedesktop GL metadata through the application gate', () => {
+            const fixture = createFixture(context.rootDir, 'flatpak');
+            const virtualHelperPath = path.join(
+                FLATPAK_NATIVE_DIR,
+                'iptvnator_mpv_helper'
+            );
+            const translatePath = (candidatePath: string): string => {
+                if (
+                    candidatePath === FLATPAK_NATIVE_DIR ||
+                    candidatePath.startsWith(`${FLATPAK_NATIVE_DIR}${path.sep}`)
+                ) {
+                    return path.join(
+                        fixture.nativeDir,
+                        path.relative(FLATPAK_NATIVE_DIR, candidatePath)
+                    );
+                }
+                return candidatePath;
+            };
+            const probeRuntime = context.createProbe({
+                env: {
+                    PATH: '/app/bin:/usr/bin',
+                    FLATPAK_ID: 'com.fourgray.iptvnator',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                        '/tmp/hostile-egl-platform',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES:
+                        '/tmp/hostile-egl-platform.json',
+                    GBM_BACKENDS_PATH: '/tmp/hostile-gbm',
+                    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri',
+                },
+                fileSystem: {
+                    accessSync: (candidatePath, mode) =>
+                        accessSync(translatePath(candidatePath), mode),
+                    lstatSync: (candidatePath) =>
+                        lstatSync(translatePath(candidatePath)),
+                    readFileSync: (candidatePath) =>
+                        readFileSync(translatePath(candidatePath)),
+                    readdirSync: (candidatePath) =>
+                        readdirSync(translatePath(candidatePath)),
+                },
+            });
+
+            expect(probeRuntime(virtualHelperPath)).toEqual(
+                expect.objectContaining({
+                    usable: true,
+                    profile: 'flatpak',
+                    runtimeMode: 'bundled',
+                })
+            );
+            expect(context.spawnRuntimeProbe).toHaveBeenCalledWith(
+                virtualHelperPath,
+                ['--runtime-probe'],
+                expect.objectContaining({
+                    env: {
+                        PATH: '/app/bin:/usr/bin',
+                        FLATPAK_ID: 'com.fourgray.iptvnator',
+                        __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                            FREEDESKTOP_EGL_EXTERNAL_PLATFORM_CONFIG_DIRS,
+                        LD_LIBRARY_PATH: path.join(FLATPAK_NATIVE_DIR, 'lib'),
+                    },
+                })
+            );
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.spec.ts
new file mode 100644
index 000000000..168ccc144
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.spec.ts
@@ -0,0 +1,369 @@
+import path from 'path';
+import { createLinuxFrameCopyHelperEnvironment } from '../embedded-mpv-frame-copy-runtime';
+
+const HOSTILE_LOADER_ENVIRONMENT = {
+    BASH_ENV: '/tmp/hostile-bash-env',
+    ENV: '/tmp/hostile-shell-env',
+    BASHOPTS: 'extdebug',
+    SHELLOPTS: 'xtrace',
+    PS4: '$(/tmp/hostile-trace-hook)',
+    BASH_XTRACEFD: '9',
+    CDPATH: '/tmp/hostile-cdpath',
+    'BASH_FUNC_dirname%%': '() { printf /tmp/hostile-provider-root; exit 0; }',
+    LD_AUDIT: '/tmp/audit.so',
+    LD_LIBRARY_PATH: '/tmp/hostile-libs',
+    LD_ORIGIN_PATH: '/tmp/hostile-origin',
+    LD_PRELOAD: '/tmp/inject.so',
+    __EGL_VENDOR_LIBRARY_FILENAMES: '/tmp/hostile-egl-vendor.json',
+    __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor-dir',
+    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: '/tmp/hostile-egl-platform',
+    __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES: '/tmp/hostile-egl-platform.json',
+    GBM_BACKEND: '../../../../../tmp/hostile-gbm',
+    GBM_BACKENDS_PATH: '/tmp/hostile-gbm-path',
+    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri-path',
+    MESA_LOADER_DRIVER_OVERRIDE: '../../../../../tmp/hostile-dri',
+    LIBVA_DRIVER_NAME: '../../../../../tmp/hostile-va',
+    LIBVA_DRIVERS_PATH: '/tmp/hostile-va-path',
+    VDPAU_DRIVER_PATH: '/tmp/hostile-vdpau',
+    VK_DRIVER_FILES: '/tmp/hostile-vulkan-driver.json',
+    VK_ICD_FILENAMES: '/tmp/hostile-vulkan-icd.json',
+    VK_ADD_DRIVER_FILES: '/tmp/hostile-vulkan-add-driver.json',
+    VK_ADD_LAYER_PATH: '/tmp/hostile-vulkan-layers',
+    VK_IMPLICIT_LAYER_PATH: '/tmp/hostile-vulkan-implicit-layers',
+    VK_ADD_IMPLICIT_LAYER_PATH: '/tmp/hostile-vulkan-add-implicit-layers',
+    VK_LAYER_PATH: '/tmp/hostile-vulkan-layer-path',
+} as const;
+
+const GRAPHICS_SELECTOR_ENVIRONMENT = {
+    LIBGL_ALWAYS_SOFTWARE: '1',
+    EGL_PLATFORM: 'x11',
+    DRI_PRIME: '1',
+    GALLIUM_DRIVER: 'llvmpipe',
+    VDPAU_DRIVER: 'mesa',
+    __GLX_VENDOR_LIBRARY_NAME: 'mesa',
+    __GLX_FORCE_VENDOR_LIBRARY_0: 'mesa',
+    VK_INSTANCE_LAYERS: 'VK_LAYER_MESA_overlay',
+    VK_LOADER_DRIVERS_SELECT: '*mesa*',
+} as const;
+
+describe('createLinuxFrameCopyHelperEnvironment', () => {
+    it('removes ambient loader overrides for system packages', () => {
+        expect(
+            createLinuxFrameCopyHelperEnvironment(
+                {
+                    PATH: '/usr/bin',
+                    HOME: '/home/user',
+                    ...HOSTILE_LOADER_ENVIRONMENT,
+                },
+                '/opt/iptvnator/native',
+                'system'
+            )
+        ).toEqual({
+            PATH: '/usr/bin',
+            HOME: '/home/user',
+        });
+    });
+
+    it('preserves graphics feature and debug selectors', () => {
+        expect(
+            createLinuxFrameCopyHelperEnvironment(
+                GRAPHICS_SELECTOR_ENVIRONMENT,
+                '/opt/iptvnator/native',
+                'system'
+            )
+        ).toEqual(GRAPHICS_SELECTOR_ENVIRONMENT);
+    });
+
+    it('keeps trusted Snap GL and core22 roots ahead of older and generic libraries', () => {
+        const snapRoot = '/snap/iptvnator/42';
+        const nativeDir = path.join(
+            snapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+
+        expect(
+            createLinuxFrameCopyHelperEnvironment(
+                {
+                    PATH: '/snap/bin:/usr/bin',
+                    SNAP: snapRoot,
+                    SNAP_LIBRARY_PATH: [
+                        '/var/lib/snapd/lib/gl',
+                        '/tmp/hostile-gl',
+                        '/var/lib/snapd/lib/gl/nvidia',
+                        '/var/lib/snapd/lib/gl-evil',
+                    ].join(':'),
+                    SNAP_DESKTOP_ARCH_TRIPLET: 'hostile-linux-gnu',
+                    SNAP_DESKTOP_RUNTIME: path.join(snapRoot, 'gnome-platform'),
+                    GBM_BACKENDS_PATH: '/tmp/hostile-gbm',
+                    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri',
+                    LIBVA_DRIVERS_PATH: '/tmp/hostile-va',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                        '/tmp/hostile-egl-platform',
+                    __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor',
+                    VK_LAYER_PATH: '/tmp/hostile-vulkan',
+                    XDG_CONFIG_HOME: '/tmp/hostile-xdg-config-home',
+                    XDG_CONFIG_DIRS: '/tmp/hostile-xdg-config-dirs',
+                    XDG_DATA_HOME: '/tmp/hostile-xdg-data-home',
+                    XDG_DATA_DIRS: '/tmp/hostile-xdg-data-dirs',
+                    ...HOSTILE_LOADER_ENVIRONMENT,
+                    ...GRAPHICS_SELECTOR_ENVIRONMENT,
+                },
+                nativeDir,
+                'bundled'
+            )
+        ).toEqual({
+            PATH: '/usr/sbin:/usr/bin:/sbin:/bin',
+            SNAP: snapRoot,
+            SNAP_LIBRARY_PATH: [
+                '/var/lib/snapd/lib/gl',
+                '/var/lib/snapd/lib/gl/nvidia',
+            ].join(':'),
+            SNAP_ARCH: 'amd64',
+            SNAP_DESKTOP_ARCH_TRIPLET: 'x86_64-linux-gnu',
+            SNAP_DESKTOP_RUNTIME: path.join(snapRoot, 'gnome-platform'),
+            ...GRAPHICS_SELECTOR_ENVIRONMENT,
+            GBM_BACKENDS_PATH: [
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'gbm'
+                ),
+                '/var/lib/snapd/lib/gl/gbm',
+            ].join(':'),
+            LIBGL_DRIVERS_PATH: path.join(
+                snapRoot,
+                'graphics',
+                'usr',
+                'lib',
+                'x86_64-linux-gnu',
+                'dri'
+            ),
+            LIBVA_DRIVERS_PATH: path.join(
+                snapRoot,
+                'graphics',
+                'usr',
+                'lib',
+                'x86_64-linux-gnu',
+                'dri'
+            ),
+            __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: path.join(
+                snapRoot,
+                'graphics',
+                'usr',
+                'share',
+                'egl',
+                'egl_external_platform.d'
+            ),
+            __EGL_VENDOR_LIBRARY_DIRS: [
+                '/var/lib/snapd/lib/glvnd/egl_vendor.d',
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'share',
+                    'glvnd',
+                    'egl_vendor.d'
+                ),
+            ].join(':'),
+            VK_LAYER_PATH: [
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'share',
+                    'vulkan',
+                    'implicit_layer.d'
+                ),
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'share',
+                    'vulkan',
+                    'explicit_layer.d'
+                ),
+            ].join(':'),
+            XDG_CONFIG_HOME: path.join(snapRoot, 'etc', 'xdg'),
+            XDG_CONFIG_DIRS: [
+                path.join(snapRoot, 'etc', 'xdg'),
+                '/etc/xdg',
+            ].join(':'),
+            XDG_DATA_HOME: path.join(snapRoot, 'usr', 'share'),
+            XDG_DATA_DIRS: [
+                path.join(snapRoot, 'graphics', 'usr', 'share'),
+                path.join(snapRoot, 'gnome-platform', 'usr', 'share'),
+                path.join(snapRoot, 'usr', 'share'),
+                '/usr/share',
+            ].join(':'),
+            LD_LIBRARY_PATH: [
+                path.join(nativeDir, 'lib'),
+                '/var/lib/snapd/lib/gl',
+                '/var/lib/snapd/lib/gl/nvidia',
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu'
+                ),
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'vdpau'
+                ),
+                '/usr/lib/x86_64-linux-gnu',
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'lib',
+                    'x86_64-linux-gnu'
+                ),
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu'
+                ),
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'mesa'
+                ),
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'mesa-egl'
+                ),
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'dri'
+                ),
+                path.join(
+                    snapRoot,
+                    'gnome-platform',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'pulseaudio'
+                ),
+                path.join(snapRoot, 'lib'),
+                path.join(snapRoot, 'usr', 'lib'),
+                path.join(snapRoot, 'lib', 'x86_64-linux-gnu'),
+                path.join(snapRoot, 'usr', 'lib', 'x86_64-linux-gnu'),
+            ].join(':'),
+        });
+    });
+
+    it.each([
+        '/tmp/gnome-platform',
+        '/snap/iptvnator/42/gnome-platform-evil',
+        'gnome-platform',
+    ])(
+        'ignores an untrusted Snap desktop runtime declaration: %s',
+        (declaredDesktopRuntime) => {
+            const snapRoot = '/snap/iptvnator/42';
+            const nativeDir = path.join(
+                snapRoot,
+                'resources',
+                'app.asar.unpacked',
+                'electron-backend',
+                'native'
+            );
+
+            const helperEnvironment = createLinuxFrameCopyHelperEnvironment(
+                {
+                    SNAP: snapRoot,
+                    SNAP_DESKTOP_ARCH_TRIPLET: 'hostile-linux-gnu',
+                    SNAP_DESKTOP_RUNTIME: declaredDesktopRuntime,
+                    GBM_BACKENDS_PATH: '/tmp/hostile-gbm',
+                    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri',
+                    LIBVA_DRIVERS_PATH: '/tmp/hostile-va',
+                    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                        '/tmp/hostile-egl-platform',
+                    __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor',
+                    VK_LAYER_PATH: '/tmp/hostile-vulkan',
+                    LD_LIBRARY_PATH: '/tmp/hostile-libs',
+                },
+                nativeDir,
+                'bundled'
+            );
+
+            expect(helperEnvironment.LD_LIBRARY_PATH?.split(':')).toEqual([
+                path.join(nativeDir, 'lib'),
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu'
+                ),
+                path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'vdpau'
+                ),
+                '/usr/lib/x86_64-linux-gnu',
+                path.join(snapRoot, 'lib'),
+                path.join(snapRoot, 'usr', 'lib'),
+                path.join(snapRoot, 'lib', 'x86_64-linux-gnu'),
+                path.join(snapRoot, 'usr', 'lib', 'x86_64-linux-gnu'),
+            ]);
+            expect(helperEnvironment.LD_LIBRARY_PATH).not.toContain(
+                declaredDesktopRuntime
+            );
+            expect(helperEnvironment.LD_LIBRARY_PATH).not.toContain(
+                'hostile-linux-gnu'
+            );
+            expect(helperEnvironment.SNAP_DESKTOP_RUNTIME).toBeUndefined();
+            expect(helperEnvironment.SNAP_DESKTOP_ARCH_TRIPLET).toBe(
+                'x86_64-linux-gnu'
+            );
+            expect(helperEnvironment.SNAP_ARCH).toBe('amd64');
+        }
+    );
+
+    it('does not trust Snap loader paths when nativeDir is outside the declared mount', () => {
+        expect(
+            createLinuxFrameCopyHelperEnvironment(
+                {
+                    PATH: '/usr/bin',
+                    SNAP: '/snap/iptvnator/42',
+                    SNAP_LIBRARY_PATH: '/var/lib/snapd/lib/gl:/tmp/hostile-gl',
+                    LD_AUDIT: '/tmp/audit.so',
+                    LD_LIBRARY_PATH: '/tmp/hostile-libs',
+                    LD_PRELOAD: '/tmp/inject.so',
+                },
+                '/opt/iptvnator/native',
+                'bundled'
+            )
+        ).toEqual({
+            PATH: '/usr/bin',
+            SNAP: '/snap/iptvnator/42',
+            SNAP_LIBRARY_PATH: '/var/lib/snapd/lib/gl:/tmp/hostile-gl',
+            LD_LIBRARY_PATH: '/opt/iptvnator/native/lib',
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.ts
new file mode 100644
index 000000000..ecf7d5c08
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-environment.ts
@@ -0,0 +1,281 @@
+import path from 'path';
+import type { EmbeddedMpvFrameCopyRuntimeMode } from './types';
+import { resolveTrustedSnapRoot } from './trusted-snap-root';
+
+const TRUSTED_SNAP_GL_ROOT = '/var/lib/snapd/lib/gl';
+const TRUSTED_SNAP_EGL_VENDOR_ROOT = '/var/lib/snapd/lib/glvnd/egl_vendor.d';
+const SNAP_DESKTOP_RUNTIME_DIRECTORY = 'gnome-platform';
+const SNAP_GRAPHICS_RUNTIME_DIRECTORY = 'graphics';
+const SNAP_X64_LIBRARY_TRIPLET = 'x86_64-linux-gnu';
+const TRUSTED_SNAP_BASE_LIBRARY_ROOT = '/usr/lib/x86_64-linux-gnu';
+const TRUSTED_SNAP_HELPER_PATH = '/usr/sbin:/usr/bin:/sbin:/bin';
+const TRUSTED_FLATPAK_APP_ID = 'com.fourgray.iptvnator';
+const TRUSTED_FLATPAK_APP_ROOT = '/app';
+const TRUSTED_FLATPAK_EGL_EXTERNAL_PLATFORM_CONFIG_DIRS = [
+    '/etc/egl/egl_external_platform.d',
+    '/usr/lib/x86_64-linux-gnu/GL/egl/egl_external_platform.d',
+    '/usr/share/egl/egl_external_platform.d',
+].join(':');
+const UNSAFE_HELPER_ENVIRONMENT_VARIABLES = [
+    'BASH_ENV',
+    'ENV',
+    'BASHOPTS',
+    'SHELLOPTS',
+    'PS4',
+    'BASH_XTRACEFD',
+    'CDPATH',
+    'LD_AUDIT',
+    'LD_LIBRARY_PATH',
+    'LD_ORIGIN_PATH',
+    'LD_PRELOAD',
+    '__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS',
+    '__EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES',
+    '__EGL_VENDOR_LIBRARY_DIRS',
+    '__EGL_VENDOR_LIBRARY_FILENAMES',
+    'GBM_BACKEND',
+    'GBM_BACKENDS_PATH',
+    'LIBGL_DRIVERS_PATH',
+    'MESA_LOADER_DRIVER_OVERRIDE',
+    'LIBVA_DRIVER_NAME',
+    'LIBVA_DRIVERS_PATH',
+    'VDPAU_DRIVER_PATH',
+    'VK_DRIVER_FILES',
+    'VK_ICD_FILENAMES',
+    'VK_ADD_DRIVER_FILES',
+    'VK_ADD_LAYER_PATH',
+    'VK_IMPLICIT_LAYER_PATH',
+    'VK_ADD_IMPLICIT_LAYER_PATH',
+    'VK_LAYER_PATH',
+] as const;
+
+function isPathInside(
+    parentPath: string,
+    candidatePath: string,
+    allowEqual: boolean
+): boolean {
+    const relativePath = path.relative(parentPath, candidatePath);
+    if (relativePath === '') {
+        return allowEqual;
+    }
+    return (
+        relativePath !== '..' &&
+        !relativePath.startsWith(`..${path.sep}`) &&
+        !path.isAbsolute(relativePath)
+    );
+}
+
+function getTrustedSnapLibraryPaths(
+    environment: NodeJS.ProcessEnv,
+    snapRoot: string
+): string[] {
+    const snapLibraryPaths = getTrustedSnapHostGlLibraryPaths(environment);
+    const graphicsLibraryRoot = path.join(
+        snapRoot,
+        SNAP_GRAPHICS_RUNTIME_DIRECTORY,
+        'usr',
+        'lib',
+        SNAP_X64_LIBRARY_TRIPLET
+    );
+    const desktopLibraryPaths = getTrustedSnapDesktopLibraryPaths(
+        environment,
+        snapRoot
+    );
+
+    return [
+        ...snapLibraryPaths,
+        graphicsLibraryRoot,
+        path.join(graphicsLibraryRoot, 'vdpau'),
+        // The core22 libedit ABI must win over gnome-3-28's libtinfo5 build.
+        TRUSTED_SNAP_BASE_LIBRARY_ROOT,
+        ...desktopLibraryPaths,
+        path.join(snapRoot, 'lib'),
+        path.join(snapRoot, 'usr', 'lib'),
+        path.join(snapRoot, 'lib', SNAP_X64_LIBRARY_TRIPLET),
+        path.join(snapRoot, 'usr', 'lib', SNAP_X64_LIBRARY_TRIPLET),
+    ];
+}
+
+function getTrustedSnapHostGlLibraryPaths(
+    environment: NodeJS.ProcessEnv
+): string[] {
+    return (environment.SNAP_LIBRARY_PATH ?? '')
+        .split(':')
+        .filter(Boolean)
+        .filter((libraryPath) => path.isAbsolute(libraryPath))
+        .map((libraryPath) => path.resolve(libraryPath))
+        .filter((libraryPath) =>
+            isPathInside(TRUSTED_SNAP_GL_ROOT, libraryPath, true)
+        );
+}
+
+function getTrustedSnapDesktopLibraryPaths(
+    environment: NodeJS.ProcessEnv,
+    snapRoot: string
+): string[] {
+    const desktopRuntime = resolveTrustedSnapDesktopRuntime(
+        environment,
+        snapRoot
+    );
+    if (!desktopRuntime) {
+        return [];
+    }
+
+    const desktopLibraryRoot = path.join(
+        desktopRuntime,
+        'usr',
+        'lib',
+        SNAP_X64_LIBRARY_TRIPLET
+    );
+    return [
+        path.join(desktopRuntime, 'lib', SNAP_X64_LIBRARY_TRIPLET),
+        desktopLibraryRoot,
+        path.join(desktopLibraryRoot, 'mesa'),
+        path.join(desktopLibraryRoot, 'mesa-egl'),
+        path.join(desktopLibraryRoot, 'dri'),
+        path.join(desktopLibraryRoot, 'pulseaudio'),
+    ];
+}
+
+function resolveTrustedSnapDesktopRuntime(
+    environment: NodeJS.ProcessEnv,
+    snapRoot: string
+): string | null {
+    const expectedDesktopRuntime = path.join(
+        snapRoot,
+        SNAP_DESKTOP_RUNTIME_DIRECTORY
+    );
+    const declaredDesktopRuntime = environment.SNAP_DESKTOP_RUNTIME;
+    if (
+        !declaredDesktopRuntime ||
+        !path.isAbsolute(declaredDesktopRuntime) ||
+        path.resolve(declaredDesktopRuntime) !== expectedDesktopRuntime
+    ) {
+        return null;
+    }
+    return expectedDesktopRuntime;
+}
+
+function isTrustedFlatpakRuntime(
+    environment: NodeJS.ProcessEnv,
+    nativeDir: string
+): boolean {
+    return (
+        environment.FLATPAK_ID === TRUSTED_FLATPAK_APP_ID &&
+        path.isAbsolute(nativeDir) &&
+        isPathInside(TRUSTED_FLATPAK_APP_ROOT, path.resolve(nativeDir), false)
+    );
+}
+
+function applyTrustedSnapGraphicsEnvironment(
+    helperEnvironment: NodeJS.ProcessEnv,
+    sourceEnvironment: NodeJS.ProcessEnv,
+    snapRoot: string
+): void {
+    const graphicsRuntime = path.join(
+        snapRoot,
+        SNAP_GRAPHICS_RUNTIME_DIRECTORY,
+        'usr'
+    );
+    const graphicsLibraryRoot = path.join(
+        graphicsRuntime,
+        'lib',
+        SNAP_X64_LIBRARY_TRIPLET
+    );
+    const graphicsDriRoot = path.join(graphicsLibraryRoot, 'dri');
+
+    helperEnvironment.GBM_BACKENDS_PATH = [
+        path.join(graphicsLibraryRoot, 'gbm'),
+        path.join(TRUSTED_SNAP_GL_ROOT, 'gbm'),
+    ].join(':');
+    helperEnvironment.LIBGL_DRIVERS_PATH = graphicsDriRoot;
+    helperEnvironment.LIBVA_DRIVERS_PATH = graphicsDriRoot;
+    helperEnvironment.__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS = path.join(
+        graphicsRuntime,
+        'share',
+        'egl',
+        'egl_external_platform.d'
+    );
+    helperEnvironment.__EGL_VENDOR_LIBRARY_DIRS = [
+        TRUSTED_SNAP_EGL_VENDOR_ROOT,
+        path.join(graphicsRuntime, 'share', 'glvnd', 'egl_vendor.d'),
+    ].join(':');
+    helperEnvironment.VK_LAYER_PATH = [
+        path.join(graphicsRuntime, 'share', 'vulkan', 'implicit_layer.d'),
+        path.join(graphicsRuntime, 'share', 'vulkan', 'explicit_layer.d'),
+    ].join(':');
+
+    const snapConfigRoot = path.join(snapRoot, 'etc', 'xdg');
+    const snapDataRoot = path.join(snapRoot, 'usr', 'share');
+    const desktopRuntime = resolveTrustedSnapDesktopRuntime(
+        sourceEnvironment,
+        snapRoot
+    );
+    const snapLibraryPaths =
+        getTrustedSnapHostGlLibraryPaths(sourceEnvironment);
+    if (snapLibraryPaths.length > 0) {
+        helperEnvironment.SNAP_LIBRARY_PATH = snapLibraryPaths.join(':');
+    } else {
+        delete helperEnvironment.SNAP_LIBRARY_PATH;
+    }
+    helperEnvironment.SNAP_ARCH = 'amd64';
+    helperEnvironment.SNAP_DESKTOP_ARCH_TRIPLET = SNAP_X64_LIBRARY_TRIPLET;
+    if (desktopRuntime) {
+        helperEnvironment.SNAP_DESKTOP_RUNTIME = desktopRuntime;
+    } else {
+        delete helperEnvironment.SNAP_DESKTOP_RUNTIME;
+    }
+    helperEnvironment.XDG_CONFIG_HOME = snapConfigRoot;
+    helperEnvironment.XDG_CONFIG_DIRS = [snapConfigRoot, '/etc/xdg'].join(':');
+    helperEnvironment.XDG_DATA_HOME = snapDataRoot;
+    helperEnvironment.XDG_DATA_DIRS = [
+        path.join(graphicsRuntime, 'share'),
+        ...(desktopRuntime ? [path.join(desktopRuntime, 'usr', 'share')] : []),
+        snapDataRoot,
+        '/usr/share',
+    ].join(':');
+}
+
+/**
+ * Builds the loader environment shared by the bounded startup probe and each
+ * real Linux helper session. The validated package profile is authoritative:
+ * system packages use the system loader, while bundled packages start at
+ * native/lib and add only fixed trusted Snap or Flatpak graphics roots.
+ */
+export function createLinuxFrameCopyHelperEnvironment(
+    environment: NodeJS.ProcessEnv,
+    nativeDir: string,
+    runtimeMode: EmbeddedMpvFrameCopyRuntimeMode
+): NodeJS.ProcessEnv {
+    const helperEnvironment = { ...environment };
+    for (const variableName of UNSAFE_HELPER_ENVIRONMENT_VARIABLES) {
+        delete helperEnvironment[variableName];
+    }
+    for (const variableName of Object.keys(helperEnvironment)) {
+        if (variableName.startsWith('BASH_FUNC_')) {
+            delete helperEnvironment[variableName];
+        }
+    }
+
+    if (runtimeMode === 'system') {
+        return helperEnvironment;
+    }
+
+    const libraryPaths = [path.join(nativeDir, 'lib')];
+    const trustedSnapRoot = resolveTrustedSnapRoot(environment, nativeDir);
+    if (trustedSnapRoot) {
+        helperEnvironment.PATH = TRUSTED_SNAP_HELPER_PATH;
+        libraryPaths.push(
+            ...getTrustedSnapLibraryPaths(environment, trustedSnapRoot)
+        );
+        applyTrustedSnapGraphicsEnvironment(
+            helperEnvironment,
+            environment,
+            trustedSnapRoot
+        );
+    } else if (isTrustedFlatpakRuntime(environment, nativeDir)) {
+        helperEnvironment.__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS =
+            TRUSTED_FLATPAK_EGL_EXTERNAL_PLATFORM_CONFIG_DIRS;
+    }
+    helperEnvironment.LD_LIBRARY_PATH = [...new Set(libraryPaths)].join(':');
+    return helperEnvironment;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-failures.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-failures.spec.ts
new file mode 100644
index 000000000..25dcb8fbd
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-failures.spec.ts
@@ -0,0 +1,338 @@
+import { SUCCESS_OUTPUT } from './runtime.spec-data';
+import { createFixture } from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy helper failures', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it('converts a thrown spawn failure into a stable result', () => {
+        const fixture = createFixture(context.rootDir);
+        context.spawnRuntimeProbe.mockImplementation(() => {
+            throw new Error('spawn exploded');
+        });
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'helper-probe-spawn-error',
+        });
+    });
+
+    it.each([
+        {
+            label: 'timeout',
+            spawnResult: {
+                status: null,
+                signal: 'SIGTERM',
+                stdout: '',
+                stderr: '',
+                error: Object.assign(new Error('timed out'), {
+                    code: 'ETIMEDOUT',
+                }),
+            },
+            reason: 'helper-probe-timeout',
+        },
+        {
+            label: 'spawn error',
+            spawnResult: {
+                status: null,
+                signal: null,
+                stdout: '',
+                stderr: '',
+                error: Object.assign(new Error('spawn failed'), {
+                    code: 'EACCES',
+                }),
+            },
+            reason: 'helper-probe-spawn-error',
+        },
+        {
+            label: 'nonzero exit',
+            spawnResult: {
+                status: 1,
+                signal: null,
+                stdout: '{"protocol":1,"usable":false,"reason":"egl-unavailable"}\n',
+                stderr: '',
+            },
+            reason: 'helper-probe-failed',
+        },
+        {
+            label: 'signal',
+            spawnResult: {
+                status: null,
+                signal: 'SIGKILL',
+                stdout: '',
+                stderr: '',
+            },
+            reason: 'helper-probe-signaled',
+        },
+        {
+            label: 'invalid JSON',
+            spawnResult: {
+                status: 0,
+                signal: null,
+                stdout: 'not-json\n',
+                stderr: '',
+            },
+            reason: 'helper-probe-invalid-output',
+        },
+        {
+            label: 'multiple lines',
+            spawnResult: {
+                status: 0,
+                signal: null,
+                stdout: `${SUCCESS_OUTPUT}${SUCCESS_OUTPUT}`,
+                stderr: '',
+            },
+            reason: 'helper-probe-invalid-output',
+        },
+        {
+            label: 'wrong protocol',
+            spawnResult: {
+                status: 0,
+                signal: null,
+                stdout: '{"protocol":2,"usable":true,"libmpv":"2.3","renderApi":"egl"}\n',
+                stderr: '',
+            },
+            reason: 'helper-probe-protocol-mismatch',
+        },
+        {
+            label: 'unusable success',
+            spawnResult: {
+                status: 0,
+                signal: null,
+                stdout: '{"protocol":1,"usable":false,"reason":"egl-unavailable"}\n',
+                stderr: '',
+            },
+            reason: 'helper-probe-unusable',
+        },
+    ])('fails closed on helper $label', ({ spawnResult, reason }) => {
+        const fixture = createFixture(context.rootDir);
+        context.spawnRuntimeProbe.mockReturnValue(spawnResult);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual(
+            expect.objectContaining({ usable: false, reason })
+        );
+    });
+
+    it.each([
+        'mpv-create-failed',
+        'mpv-initialize-failed',
+        'gl-context-create-failed',
+        'gl-context-bind-failed',
+        'mpv-render-context-failed',
+        'shared-memory-create-failed',
+        'shared-memory-initialize-failed',
+    ])('preserves the allowlisted helper reason %s', (helperReason) => {
+        const fixture = createFixture(context.rootDir);
+        const helperDetail =
+            helperReason === 'mpv-create-failed'
+                ? undefined
+                : 'EGL initialization failed: display unavailable';
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout: `${JSON.stringify({
+                protocol: 1,
+                usable: false,
+                reason: helperReason,
+                ...(helperDetail ? { detail: helperDetail } : {}),
+            })}\n`,
+            stderr: '',
+        });
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'helper-probe-failed',
+            helperReason,
+            ...(helperDetail ? { helperDetail } : {}),
+        });
+    });
+
+    it.each([
+        ['one printable ASCII character', 'x'],
+        ['1024 printable ASCII characters', 'x'.repeat(1024)],
+    ])('preserves %s as helper detail', (_label, helperDetail) => {
+        const fixture = createFixture(context.rootDir);
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout: `${JSON.stringify({
+                protocol: 1,
+                usable: false,
+                reason: 'gl-context-create-failed',
+                detail: helperDetail,
+            })}\n`,
+            stderr: '',
+        });
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'helper-probe-failed',
+            helperReason: 'gl-context-create-failed',
+            helperDetail,
+        });
+    });
+
+    it.each([
+        ['malformed JSON', 'not-json\n'],
+        [
+            'multiple lines',
+            '{"protocol":1,"usable":false,"reason":"mpv-create-failed"}\nignored\n',
+        ],
+        [
+            'wrong protocol',
+            '{"protocol":2,"usable":false,"reason":"mpv-create-failed"}\n',
+        ],
+        [
+            'wrong usable value',
+            '{"protocol":1,"usable":true,"reason":"mpv-create-failed"}\n',
+        ],
+        [
+            'non-allowlisted reason',
+            '{"protocol":1,"usable":false,"reason":"loader-injected"}\n',
+        ],
+        [
+            'unexpected field',
+            '{"protocol":1,"usable":false,"reason":"mpv-create-failed","extra":true}\n',
+        ],
+        [
+            'invalid detail',
+            '{"protocol":1,"usable":false,"reason":"mpv-create-failed","detail":1}\n',
+        ],
+    ])('does not propagate a helper reason from %s', (_label, stdout) => {
+        const fixture = createFixture(context.rootDir);
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout,
+            stderr: '',
+        });
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'helper-probe-failed',
+        });
+    });
+
+    it.each([
+        ['empty', ''],
+        ['control character', 'EGL\tfailure'],
+        ['trailing line feed', 'EGL failure\n'],
+        ['DEL character', `EGL${String.fromCharCode(0x7f)}failure`],
+        ['non-ASCII character', 'EGL échoué'],
+        ['1025 characters', 'x'.repeat(1025)],
+    ])(
+        'does not propagate any helper fields from %s detail',
+        (_label, detail) => {
+            const fixture = createFixture(context.rootDir);
+            context.spawnRuntimeProbe.mockReturnValue({
+                status: 1,
+                signal: null,
+                stdout: `${JSON.stringify({
+                    protocol: 1,
+                    usable: false,
+                    reason: 'gl-context-create-failed',
+                    detail,
+                })}\n`,
+                stderr: '',
+            });
+
+            expect(context.createProbe()(fixture.helperPath)).toEqual({
+                usable: false,
+                reason: 'helper-probe-failed',
+            });
+        }
+    );
+
+    it('does not trace helper stderr without the exact player trace flag', () => {
+        const fixture = createFixture(context.rootDir);
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout: '{"protocol":1,"usable":false,"reason":"gl-context-create-failed"}\n',
+            stderr: 'libEGL debug output\n',
+        });
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'helper-probe-failed',
+            helperReason: 'gl-context-create-failed',
+        });
+        expect(context.writeRuntimeProbeStderr).not.toHaveBeenCalled();
+    });
+
+    it('traces helper stderr as one JSON-escaped line when player tracing is enabled', () => {
+        const fixture = createFixture(context.rootDir);
+        const helperStderr =
+            'libEGL warning: vendor "mesa"\nfailed path: C:\\driver';
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout: '{"protocol":1,"usable":false,"reason":"gl-context-create-failed"}\n',
+            stderr: helperStderr,
+        });
+
+        expect(
+            context.createProbe({
+                env: {
+                    PATH: '/usr/bin',
+                    IPTVNATOR_TRACE_PLAYER: '1',
+                },
+            })(fixture.helperPath)
+        ).toEqual({
+            usable: false,
+            reason: 'helper-probe-failed',
+            helperReason: 'gl-context-create-failed',
+        });
+        expect(context.writeRuntimeProbeStderr).toHaveBeenCalledWith(
+            `${JSON.stringify({
+                event: 'embedded-mpv-helper-runtime-probe-stderr',
+                stderr: helperStderr,
+                truncated: false,
+            })}\n`
+        );
+        expect(context.writeRuntimeProbeStderr).toHaveBeenCalledTimes(1);
+        expect(
+            context.writeRuntimeProbeStderr.mock.calls[0][0].split('\n')
+        ).toHaveLength(2);
+    });
+
+    it('bounds traced helper stderr to 16384 characters and reports truncation', () => {
+        const fixture = createFixture(context.rootDir);
+        const helperStderr = `${'x'.repeat(16_384)}discarded`;
+        context.spawnRuntimeProbe.mockReturnValue({
+            status: 1,
+            signal: null,
+            stdout: '{"protocol":1,"usable":false,"reason":"gl-context-create-failed"}\n',
+            stderr: helperStderr,
+        });
+
+        context.createProbe({
+            env: {
+                PATH: '/usr/bin',
+                IPTVNATOR_TRACE_PLAYER: '1',
+            },
+        })(fixture.helperPath);
+
+        const trace = JSON.parse(
+            context.writeRuntimeProbeStderr.mock.calls[0][0]
+        );
+        expect(trace).toEqual({
+            event: 'embedded-mpv-helper-runtime-probe-stderr',
+            stderr: 'x'.repeat(16_384),
+            truncated: true,
+        });
+        expect(trace.stderr).toHaveLength(16_384);
+        expect(context.writeRuntimeProbeStderr).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.spec.ts
new file mode 100644
index 000000000..ffded9066
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.spec.ts
@@ -0,0 +1,203 @@
+import type { Stats } from 'fs';
+import path from 'path';
+import { createLinuxFrameCopyHelperLaunch } from '../embedded-mpv-frame-copy-runtime';
+
+function fakeStat(
+    kind: 'directory' | 'file' | 'symlink'
+): Pick<Stats, 'isDirectory' | 'isFile' | 'isSymbolicLink'> {
+    return {
+        isDirectory: () => kind === 'directory',
+        isFile: () => kind === 'file',
+        isSymbolicLink: () => kind === 'symlink',
+    };
+}
+
+describe('createLinuxFrameCopyHelperLaunch', () => {
+    const helperArgs = ['--runtime-probe'];
+
+    it.each([
+        ['system', '/opt/iptvnator/native/iptvnator_mpv_helper'],
+        [
+            'bundled',
+            '/tmp/.mount-IPTVnator/resources/app.asar.unpacked/electron-backend/native/iptvnator_mpv_helper',
+        ],
+    ] as const)(
+        'launches a non-Snap %s helper directly',
+        (runtimeMode, helperPath) => {
+            expect(
+                createLinuxFrameCopyHelperLaunch({
+                    environment: {
+                        PATH: '/usr/bin',
+                        LD_LIBRARY_PATH: '/tmp/hostile',
+                    },
+                    helperPath,
+                    helperArgs,
+                    runtimeMode,
+                })
+            ).toEqual({
+                usable: true,
+                command: helperPath,
+                args: helperArgs,
+                env:
+                    runtimeMode === 'system'
+                        ? { PATH: '/usr/bin' }
+                        : {
+                              PATH: '/usr/bin',
+                              LD_LIBRARY_PATH: path.join(
+                                  path.dirname(helperPath),
+                                  'lib'
+                              ),
+                          },
+            });
+        }
+    );
+
+    it('launches a trusted Snap helper through the connected provider wrapper', () => {
+        const snapRoot = '/snap/iptvnator/42';
+        const nativeDir = path.join(
+            snapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        const helperPath = path.join(nativeDir, 'iptvnator_mpv_helper');
+        const graphicsRoot = path.join(snapRoot, 'graphics');
+        const wrapperPath = path.join(
+            graphicsRoot,
+            'bin',
+            'graphics-core22-provider-wrapper'
+        );
+        const lstatSync = jest.fn((candidatePath: string) => {
+            if (candidatePath === graphicsRoot) {
+                return fakeStat('directory') as Stats;
+            }
+            if (candidatePath === wrapperPath) {
+                return fakeStat('file') as Stats;
+            }
+            throw Object.assign(new Error('missing'), { code: 'ENOENT' });
+        });
+        const accessSync = jest.fn();
+
+        expect(
+            createLinuxFrameCopyHelperLaunch({
+                environment: {
+                    PATH: '/snap/bin:/usr/bin',
+                    SNAP: snapRoot,
+                },
+                helperPath,
+                helperArgs,
+                runtimeMode: 'bundled',
+                fileSystem: { lstatSync, accessSync },
+            })
+        ).toEqual({
+            usable: true,
+            command: wrapperPath,
+            args: [helperPath, ...helperArgs],
+            env: expect.objectContaining({
+                PATH: '/usr/sbin:/usr/bin:/sbin:/bin',
+                SNAP: snapRoot,
+                LD_LIBRARY_PATH: expect.stringContaining(
+                    path.join(nativeDir, 'lib')
+                ),
+            }),
+        });
+        expect(lstatSync).toHaveBeenCalledWith(graphicsRoot);
+        expect(lstatSync).toHaveBeenCalledWith(wrapperPath);
+        expect(accessSync).toHaveBeenCalledWith(
+            wrapperPath,
+            expect.any(Number)
+        );
+    });
+
+    it.each([
+        ['missing mount', 'missing', 'file'],
+        ['symlink mount', 'symlink', 'file'],
+        ['missing wrapper', 'directory', 'missing'],
+        ['symlink wrapper', 'directory', 'symlink'],
+    ] as const)(
+        'fails closed for a trusted Snap with a %s',
+        (_label, mountKind, wrapperKind) => {
+            const snapRoot = '/snap/iptvnator/42';
+            const nativeDir = path.join(
+                snapRoot,
+                'resources',
+                'app.asar.unpacked',
+                'electron-backend',
+                'native'
+            );
+            const helperPath = path.join(nativeDir, 'iptvnator_mpv_helper');
+            const graphicsRoot = path.join(snapRoot, 'graphics');
+            const wrapperPath = path.join(
+                graphicsRoot,
+                'bin',
+                'graphics-core22-provider-wrapper'
+            );
+
+            expect(
+                createLinuxFrameCopyHelperLaunch({
+                    environment: { SNAP: snapRoot },
+                    helperPath,
+                    helperArgs,
+                    runtimeMode: 'bundled',
+                    fileSystem: {
+                        lstatSync: (candidatePath) => {
+                            const kind =
+                                candidatePath === graphicsRoot
+                                    ? mountKind
+                                    : wrapperKind;
+                            if (kind === 'missing') {
+                                throw Object.assign(new Error('missing'), {
+                                    code: 'ENOENT',
+                                });
+                            }
+                            return fakeStat(kind) as Stats;
+                        },
+                        accessSync: () => undefined,
+                    },
+                })
+            ).toEqual({
+                usable: false,
+                reason: 'snap-graphics-provider-unavailable',
+            });
+
+            expect(wrapperPath).toContain('/graphics/bin/');
+        }
+    );
+
+    it('fails closed when the provider wrapper is not executable', () => {
+        const snapRoot = '/var/lib/snapd/snap/iptvnator/42';
+        const nativeDir = path.join(
+            snapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+
+        expect(
+            createLinuxFrameCopyHelperLaunch({
+                environment: { SNAP: snapRoot },
+                helperPath: path.join(nativeDir, 'iptvnator_mpv_helper'),
+                helperArgs,
+                runtimeMode: 'bundled',
+                fileSystem: {
+                    lstatSync: (candidatePath) =>
+                        fakeStat(
+                            candidatePath.endsWith('/graphics')
+                                ? 'directory'
+                                : 'file'
+                        ) as Stats,
+                    accessSync: () => {
+                        throw Object.assign(new Error('denied'), {
+                            code: 'EACCES',
+                        });
+                    },
+                },
+            })
+        ).toEqual({
+            usable: false,
+            reason: 'snap-graphics-provider-unavailable',
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.ts
new file mode 100644
index 000000000..2e8cf8c60
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/helper-launch.ts
@@ -0,0 +1,103 @@
+import {
+    accessSync as nodeAccessSync,
+    constants as fileSystemConstants,
+    lstatSync as nodeLstatSync,
+} from 'fs';
+import type * as nodeFileSystem from 'fs';
+import path from 'path';
+import { createLinuxFrameCopyHelperEnvironment } from './helper-environment';
+import { resolveTrustedSnapRoot } from './trusted-snap-root';
+import type {
+    EmbeddedMpvFrameCopyRuntimeFailureReason,
+    EmbeddedMpvFrameCopyRuntimeMode,
+} from './types';
+
+export interface LinuxFrameCopyHelperLaunchFileSystem {
+    lstatSync(filePath: string): nodeFileSystem.Stats;
+    accessSync(filePath: string, mode: number): void;
+}
+
+interface CreateLinuxFrameCopyHelperLaunchOptions {
+    environment: NodeJS.ProcessEnv;
+    helperPath: string;
+    helperArgs: string[];
+    runtimeMode: EmbeddedMpvFrameCopyRuntimeMode;
+    fileSystem?: LinuxFrameCopyHelperLaunchFileSystem;
+}
+
+export type LinuxFrameCopyHelperLaunch =
+    | {
+          usable: true;
+          command: string;
+          args: string[];
+          env: NodeJS.ProcessEnv;
+      }
+    | {
+          usable: false;
+          reason: EmbeddedMpvFrameCopyRuntimeFailureReason;
+      };
+
+export function createLinuxFrameCopyHelperLaunch(
+    options: CreateLinuxFrameCopyHelperLaunchOptions
+): LinuxFrameCopyHelperLaunch {
+    const nativeDir = path.dirname(options.helperPath);
+    const env = createLinuxFrameCopyHelperEnvironment(
+        options.environment,
+        nativeDir,
+        options.runtimeMode
+    );
+    const trustedSnapRoot =
+        options.runtimeMode === 'bundled'
+            ? resolveTrustedSnapRoot(options.environment, nativeDir)
+            : null;
+    if (!trustedSnapRoot) {
+        return {
+            usable: true,
+            command: options.helperPath,
+            args: options.helperArgs,
+            env,
+        };
+    }
+
+    const graphicsRoot = path.join(trustedSnapRoot, 'graphics');
+    const providerWrapperPath = path.join(
+        graphicsRoot,
+        'bin',
+        'graphics-core22-provider-wrapper'
+    );
+    const fileSystem = options.fileSystem ?? {
+        lstatSync: nodeLstatSync,
+        accessSync: nodeAccessSync,
+    };
+    try {
+        const graphicsRootStat = fileSystem.lstatSync(graphicsRoot);
+        const providerWrapperStat = fileSystem.lstatSync(providerWrapperPath);
+        if (
+            !graphicsRootStat.isDirectory() ||
+            graphicsRootStat.isSymbolicLink() ||
+            !providerWrapperStat.isFile() ||
+            providerWrapperStat.isSymbolicLink()
+        ) {
+            return {
+                usable: false,
+                reason: 'snap-graphics-provider-unavailable',
+            };
+        }
+        fileSystem.accessSync(
+            providerWrapperPath,
+            fileSystemConstants.R_OK | fileSystemConstants.X_OK
+        );
+    } catch {
+        return {
+            usable: false,
+            reason: 'snap-graphics-provider-unavailable',
+        };
+    }
+
+    return {
+        usable: true,
+        command: providerWrapperPath,
+        args: [options.helperPath, ...options.helperArgs],
+        env,
+    };
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-policy.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-policy.spec.ts
new file mode 100644
index 000000000..036253afb
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-policy.spec.ts
@@ -0,0 +1,149 @@
+import { unlinkSync, writeFileSync } from 'fs';
+import {
+    cloneManifest,
+    createFixture,
+    mirrorBundledManifestFields,
+    writeManifest,
+} from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy packaged manifest policy', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it('rejects a missing or malformed manifest without throwing', () => {
+        const missing = createFixture(context.rootDir);
+        unlinkSync(missing.manifestPath);
+        expect(context.createProbe()(missing.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-missing',
+        });
+
+        const malformed = createFixture(context.rootDir, 'portable');
+        writeFileSync(malformed.manifestPath, '{broken\n', { mode: 0o644 });
+        expect(context.createProbe()(malformed.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it.each([
+        ['origin', 'system-libmpv-frame-copy'],
+        ['arch', 'arm64'],
+        ['runtimeMode', 'system'],
+        ['targets', ['deb']],
+        ['sourceArchive', null],
+        ['unexpectedField', true],
+    ])('rejects a bundled profile mismatch in %s', (field, value) => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        manifest[field] = value;
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it.each([
+        ['system', ['deb', 'pacman']],
+        ['portable', ['appimage']],
+    ] as const)(
+        'rejects an allowed subset of the exact %s profile targets',
+        (profile, targets) => {
+            const fixture = createFixture(context.rootDir, profile);
+            const manifest = cloneManifest(fixture.manifest);
+            manifest.targets = targets;
+            writeManifest(fixture.manifestPath, manifest);
+
+            expect(context.createProbe()(fixture.helperPath)).toEqual({
+                usable: false,
+                reason: 'runtime-manifest-invalid',
+            });
+            expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+        }
+    );
+
+    it('rejects a bundled closure dependency outside the deterministic system allowlist', () => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        const closure = manifest.runtimeDependencyClosure as {
+            entries: Array<{ needed: string[] }>;
+            externalDependencies: string[];
+        };
+        closure.entries[0].needed = ['libambient-only.so.1'];
+        closure.externalDependencies = ['libambient-only.so.1'];
+        mirrorBundledManifestFields(manifest);
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it('requires externalDependencies to exactly equal the sorted external closure', () => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        const closure = manifest.runtimeDependencyClosure as {
+            entries: Array<{ needed: string[] }>;
+            externalDependencies: string[];
+        };
+        closure.entries[0].needed = ['libEGL.so.1', 'libc.so.6'];
+        closure.externalDependencies = [];
+        mirrorBundledManifestFields(manifest);
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it('accepts only the exact deterministic external-system library declaration', () => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        (manifest.externalSystemLibraries as unknown[]).pop();
+        mirrorBundledManifestFields(manifest);
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it('accepts bundled dependencies on declared system interfaces and the glibc toolchain', () => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        const closure = manifest.runtimeDependencyClosure as {
+            entries: Array<{ needed: string[] }>;
+            externalDependencies: string[];
+        };
+        closure.entries[0].needed = ['libEGL.so.1', 'libc.so.6'];
+        closure.externalDependencies = ['libEGL.so.1', 'libc.so.6'];
+        mirrorBundledManifestFields(manifest);
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual(
+            expect.objectContaining({ usable: true, runtimeMode: 'bundled' })
+        );
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-validator.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-validator.ts
new file mode 100644
index 000000000..23e736193
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/manifest-validator.ts
@@ -0,0 +1,267 @@
+import { isDeepStrictEqual } from 'util';
+import {
+    BASE_MANIFEST_FIELDS,
+    BUNDLED_MANIFEST_FIELDS,
+    DEVELOPMENT_MANIFEST_FIELDS,
+    EXPECTED_ARTIFACTS,
+    EXPECTED_DEVELOPMENT_ARTIFACTS,
+    EXPECTED_DEVELOPMENT_PROCESS_ISOLATION,
+    EXPECTED_PROCESS_ISOLATION,
+    PROFILE_CONTRACTS,
+    validateLinuxSourceArchiveBinding,
+    SYSTEM_PACKAGE_DEPENDENCIES,
+    VERSIONED_LIBMPV_PATTERN,
+} from './contracts';
+import { validateRuntimeClosure } from './runtime-closure-validator';
+import { validateSourceRuntimePolicy } from './source-runtime-validator';
+import type { RuntimeProfile, ValidManifest, ValidationResult } from './types';
+import {
+    hasExactFields,
+    isObject,
+    validateRuntimeFiles,
+    validateTargets,
+    validationFailure,
+} from './validation-primitives';
+
+export function validatePackagedManifest(
+    manifest: Record<string, unknown>
+): ValidationResult<ValidManifest> {
+    if (
+        manifest.schemaVersion !== 1 ||
+        manifest.platform !== 'linux' ||
+        manifest.arch !== 'x64' ||
+        typeof manifest.profile !== 'string' ||
+        !Object.prototype.hasOwnProperty.call(
+            PROFILE_CONTRACTS,
+            manifest.profile
+        )
+    ) {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    const profile = manifest.profile as RuntimeProfile;
+    const contract = PROFILE_CONTRACTS[profile];
+    if (
+        manifest.origin !== contract.origin ||
+        manifest.runtimeMode !== contract.runtimeMode ||
+        !hasExactFields(
+            manifest,
+            contract.runtimeMode === 'bundled'
+                ? BUNDLED_MANIFEST_FIELDS
+                : BASE_MANIFEST_FIELDS
+        ) ||
+        typeof manifest.generatedAt !== 'string' ||
+        manifest.generatedAt.trim() === '' ||
+        Number.isNaN(Date.parse(manifest.generatedAt)) ||
+        !validateTargets(manifest.targets, contract.targets) ||
+        !isDeepStrictEqual(manifest.artifacts, EXPECTED_ARTIFACTS) ||
+        !isDeepStrictEqual(
+            manifest.processIsolation,
+            EXPECTED_PROCESS_ISOLATION
+        ) ||
+        manifest.nativeViewFallback !== 'process-isolated mpv --wid' ||
+        typeof manifest.libmpvSoname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(manifest.libmpvSoname)
+    ) {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    if (contract.runtimeMode === 'system') {
+        if (
+            !isDeepStrictEqual(
+                manifest.packageDependencies,
+                SYSTEM_PACKAGE_DEPENDENCIES
+            ) ||
+            !isDeepStrictEqual(manifest.runtimeFiles, []) ||
+            manifest.runtimeTotalBytes !== 0
+        ) {
+            return validationFailure('runtime-manifest-invalid');
+        }
+        return {
+            value: {
+                profile,
+                runtimeMode: 'system',
+                runtimeFiles: [],
+            },
+        };
+    }
+
+    const runtimeFiles = validateRuntimeFiles(manifest.runtimeFiles);
+    if (
+        !runtimeFiles ||
+        !isDeepStrictEqual(manifest.packageDependencies, {}) ||
+        !runtimeFiles.some(({ name }) => name === 'libmpv.so') ||
+        !runtimeFiles.some(({ name }) => name === manifest.libmpvSoname) ||
+        manifest.runtimeTotalBytes !==
+            runtimeFiles.reduce(
+                (total, runtimeFile) => total + runtimeFile.size,
+                0
+            ) ||
+        !validateRuntimeClosure(
+            manifest.runtimeDependencyClosure,
+            runtimeFiles,
+            manifest.libmpvSoname,
+            manifest.externalSystemLibraries
+        ) ||
+        validateLinuxSourceArchiveBinding(manifest.sourceArchive).length !==
+            0 ||
+        !validateSourceRuntimePolicy(
+            manifest.sourceRuntime,
+            runtimeFiles,
+            manifest.runtimeDependencyClosure,
+            manifest.externalSystemLibraries
+        )
+    ) {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    return {
+        value: {
+            profile,
+            runtimeMode: 'bundled',
+            runtimeFiles,
+        },
+    };
+}
+
+function validateSystemDevelopmentSource(
+    value: unknown,
+    buildInputMode: 'system-dev' | 'system-build-inputs'
+): boolean {
+    if (buildInputMode === 'system-dev') {
+        return isDeepStrictEqual(value, {
+            linuxBackend: 'process-isolated mpv --wid',
+            warning: 'Development-only unmanaged system libmpv toolchain.',
+        });
+    }
+    if (
+        !isObject(value) ||
+        !hasExactFields(value, [
+            'buildInputs',
+            'linuxBackend',
+            'sourceDistribution',
+        ]) ||
+        value.linuxBackend !== 'process-isolated mpv --wid' ||
+        typeof value.sourceDistribution !== 'string' ||
+        value.sourceDistribution.trim() === '' ||
+        !isObject(value.buildInputs) ||
+        !hasExactFields(value.buildInputs, ['libmpvDevPackage', 'mpvPackage'])
+    ) {
+        return false;
+    }
+    return ['libmpvDevPackage', 'mpvPackage'].every((packageField) => {
+        const packageName = value.buildInputs[packageField];
+        return typeof packageName === 'string' && packageName.trim().length > 0;
+    });
+}
+
+export function validateDevelopmentManifest(
+    manifest: Record<string, unknown>
+): ValidationResult<ValidManifest> {
+    const buildInputMode = manifest.buildInputMode;
+    if (
+        !hasExactFields(manifest, DEVELOPMENT_MANIFEST_FIELDS) ||
+        manifest.schemaVersion !== 1 ||
+        manifest.origin !== 'linux-frame-copy-build' ||
+        manifest.platform !== 'linux' ||
+        manifest.arch !== 'x64' ||
+        typeof manifest.generatedAt !== 'string' ||
+        manifest.generatedAt.trim() === '' ||
+        Number.isNaN(Date.parse(manifest.generatedAt)) ||
+        !['system-dev', 'system-build-inputs', 'bundled-runtime'].includes(
+            String(buildInputMode)
+        ) ||
+        !isDeepStrictEqual(manifest.allowedPackageRuntimeModes, [
+            'system',
+            'bundled',
+        ]) ||
+        !isDeepStrictEqual(
+            manifest.artifacts,
+            EXPECTED_DEVELOPMENT_ARTIFACTS
+        ) ||
+        !isDeepStrictEqual(
+            manifest.processIsolation,
+            EXPECTED_DEVELOPMENT_PROCESS_ISOLATION
+        ) ||
+        manifest.nativeViewFallback !== 'process-isolated mpv --wid'
+    ) {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    if (
+        buildInputMode === 'system-dev' ||
+        buildInputMode === 'system-build-inputs'
+    ) {
+        if (
+            manifest.sourceRuntimeValidated !== false ||
+            !isDeepStrictEqual(manifest.packageRuntimeAvailability, {
+                system: false,
+                bundled: false,
+            }) ||
+            manifest.libmpvSoname !== null ||
+            !isDeepStrictEqual(manifest.runtimeFiles, []) ||
+            manifest.runtimeTotalBytes !== 0 ||
+            manifest.sourceArchive !== null ||
+            !validateSystemDevelopmentSource(
+                manifest.sourceRuntime,
+                buildInputMode
+            )
+        ) {
+            return validationFailure('runtime-manifest-invalid');
+        }
+        return {
+            value: {
+                profile: 'development',
+                runtimeMode: 'system',
+                runtimeFiles: [],
+            },
+        };
+    }
+
+    const sourceRuntime = manifest.sourceRuntime;
+    const runtimeFiles = validateRuntimeFiles(manifest.runtimeFiles);
+    if (
+        buildInputMode !== 'bundled-runtime' ||
+        manifest.sourceRuntimeValidated !== true ||
+        !isDeepStrictEqual(manifest.packageRuntimeAvailability, {
+            system: true,
+            bundled: true,
+        }) ||
+        typeof manifest.libmpvSoname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(manifest.libmpvSoname) ||
+        !runtimeFiles ||
+        !runtimeFiles.some(({ name }) => name === 'libmpv.so') ||
+        !runtimeFiles.some(({ name }) => name === manifest.libmpvSoname) ||
+        manifest.runtimeTotalBytes !==
+            runtimeFiles.reduce(
+                (total, runtimeFile) => total + runtimeFile.size,
+                0
+            ) ||
+        !isObject(sourceRuntime) ||
+        (manifest.sourceArchive !== null &&
+            validateLinuxSourceArchiveBinding(manifest.sourceArchive).length !==
+                0) ||
+        !validateRuntimeClosure(
+            sourceRuntime.runtimeDependencyClosure,
+            runtimeFiles,
+            manifest.libmpvSoname,
+            sourceRuntime.externalSystemLibraries
+        ) ||
+        !validateSourceRuntimePolicy(
+            sourceRuntime,
+            runtimeFiles,
+            sourceRuntime.runtimeDependencyClosure,
+            sourceRuntime.externalSystemLibraries
+        )
+    ) {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    return {
+        value: {
+            profile: 'development',
+            runtimeMode: 'bundled',
+            runtimeFiles,
+        },
+    };
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-integrity.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-integrity.spec.ts
new file mode 100644
index 000000000..4dd40ba8d
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-integrity.spec.ts
@@ -0,0 +1,246 @@
+import {
+    chmodSync,
+    constants as fsConstants,
+    mkdirSync,
+    readFileSync,
+    symlinkSync,
+    unlinkSync,
+    writeFileSync,
+} from 'fs';
+import path from 'path';
+import type { RuntimeFile, RuntimeFixture } from './runtime.spec-data';
+import {
+    cloneManifest,
+    createFixture,
+    writeManifest,
+} from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy package integrity', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it('rejects system manifests with a private library directory', () => {
+        const fixture = createFixture(context.rootDir);
+        mkdirSync(path.join(fixture.nativeDir, 'lib'));
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-library-directory-invalid',
+        });
+    });
+
+    it.each([
+        {
+            label: 'missing addon',
+            mutate(fixture: RuntimeFixture) {
+                unlinkSync(path.join(fixture.nativeDir, 'embedded_mpv.node'));
+            },
+            reason: 'runtime-artifact-missing',
+        },
+        {
+            label: 'non-executable helper',
+            mutate(fixture: RuntimeFixture) {
+                chmodSync(fixture.helperPath, 0o644);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'setuid helper',
+            mutate(fixture: RuntimeFixture) {
+                chmodSync(fixture.helperPath, 0o4755);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'setgid helper',
+            mutate(fixture: RuntimeFixture) {
+                chmodSync(fixture.helperPath, 0o2755);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'sticky helper',
+            mutate(fixture: RuntimeFixture) {
+                chmodSync(fixture.helperPath, 0o1755);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'wrong reader mode',
+            mutate(fixture: RuntimeFixture) {
+                chmodSync(
+                    path.join(
+                        fixture.nativeDir,
+                        'embedded_mpv_frame_reader.node'
+                    ),
+                    0o600
+                );
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'symlinked helper',
+            mutate(fixture: RuntimeFixture) {
+                const target = `${fixture.helperPath}.real`;
+                writeFileSync(target, '#!/bin/sh\n', { mode: 0o755 });
+                unlinkSync(fixture.helperPath);
+                symlinkSync(target, fixture.helperPath);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+        {
+            label: 'reader directory',
+            mutate(fixture: RuntimeFixture) {
+                const readerPath = path.join(
+                    fixture.nativeDir,
+                    'embedded_mpv_frame_reader.node'
+                );
+                unlinkSync(readerPath);
+                mkdirSync(readerPath);
+            },
+            reason: 'runtime-artifact-invalid',
+        },
+    ])('rejects a $label', ({ mutate, reason }) => {
+        const fixture = createFixture(context.rootDir);
+        mutate(fixture);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason,
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it.each([
+        {
+            label: 'missing declared library',
+            mutate(fixture: RuntimeFixture) {
+                unlinkSync(path.join(fixture.nativeDir, 'lib', 'libmpv.so.2'));
+            },
+            reason: 'runtime-library-missing',
+        },
+        {
+            label: 'undeclared library',
+            mutate(fixture: RuntimeFixture) {
+                writeFileSync(
+                    path.join(fixture.nativeDir, 'lib', 'libextra.so'),
+                    'extra'
+                );
+            },
+            reason: 'runtime-library-undeclared',
+        },
+        {
+            label: 'library size mismatch',
+            mutate(fixture: RuntimeFixture) {
+                writeFileSync(
+                    path.join(fixture.nativeDir, 'lib', 'libmpv.so.2'),
+                    'different-length'
+                );
+            },
+            reason: 'runtime-library-size-mismatch',
+        },
+        {
+            label: 'library hash mismatch',
+            mutate(fixture: RuntimeFixture) {
+                const runtimePath = path.join(
+                    fixture.nativeDir,
+                    'lib',
+                    'libmpv.so.2'
+                );
+                const original = readFileSync(runtimePath);
+                writeFileSync(
+                    runtimePath,
+                    Buffer.from(original.map((value) => value ^ 0xff))
+                );
+            },
+            reason: 'runtime-library-hash-mismatch',
+        },
+        {
+            label: 'symlinked library',
+            mutate(fixture: RuntimeFixture) {
+                const runtimePath = path.join(
+                    fixture.nativeDir,
+                    'lib',
+                    'libmpv.so.2'
+                );
+                const targetPath = path.join(
+                    fixture.nativeDir,
+                    'libmpv-real.so.2'
+                );
+                writeFileSync(
+                    targetPath,
+                    fixture.runtimeContents['libmpv.so.2']
+                );
+                unlinkSync(runtimePath);
+                symlinkSync(targetPath, runtimePath);
+            },
+            reason: 'runtime-library-invalid',
+        },
+        {
+            label: 'library directory',
+            mutate(fixture: RuntimeFixture) {
+                const runtimePath = path.join(
+                    fixture.nativeDir,
+                    'lib',
+                    'libmpv.so.2'
+                );
+                unlinkSync(runtimePath);
+                mkdirSync(runtimePath);
+            },
+            reason: 'runtime-library-invalid',
+        },
+    ])('rejects a $label', ({ mutate, reason }) => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        mutate(fixture);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason,
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it.each(['../libmpv.so.2', '/tmp/libmpv.so.2', 'sub/libmpv.so.2'])(
+        'rejects unsafe runtime path %s',
+        (unsafeName) => {
+            const fixture = createFixture(context.rootDir, 'portable');
+            const manifest = cloneManifest(fixture.manifest);
+            const runtimeFiles = manifest.runtimeFiles as RuntimeFile[];
+            runtimeFiles[0].name = unsafeName;
+            writeManifest(fixture.manifestPath, manifest);
+
+            expect(context.createProbe()(fixture.helperPath)).toEqual({
+                usable: false,
+                reason: 'runtime-manifest-invalid',
+            });
+            expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+        }
+    );
+
+    it('uses read and execute access checks for declared artifacts', () => {
+        const fixture = createFixture(context.rootDir);
+        const probeRuntime = context.createProbe();
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        const accessMock = context.fileSystem.accessSync as jest.Mock;
+        expect(accessMock).toHaveBeenCalledWith(
+            fixture.helperPath,
+            fsConstants.R_OK | fsConstants.X_OK
+        );
+        expect(accessMock).toHaveBeenCalledWith(
+            path.join(fixture.nativeDir, 'embedded_mpv_frame_reader.node'),
+            fsConstants.R_OK
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-validator.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-validator.ts
new file mode 100644
index 000000000..145eba544
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/package-validator.ts
@@ -0,0 +1,238 @@
+import { createHash } from 'crypto';
+import * as nodeFileSystem from 'fs';
+import path from 'path';
+import {
+    FRAME_COPY_ADDON_NAME,
+    FRAME_COPY_HELPER_NAME,
+    FRAME_COPY_READER_NAME,
+} from './contracts';
+import {
+    validateDevelopmentManifest,
+    validatePackagedManifest,
+} from './manifest-validator';
+import type {
+    EmbeddedMpvFrameCopyManifestContract,
+    EmbeddedMpvFrameCopyRuntimeFileSystem,
+    RuntimeFile,
+    ValidatedPackage,
+    ValidationResult,
+} from './types';
+import {
+    isMissingFileError,
+    isValidationFailure,
+    readManifest,
+    validationFailure,
+} from './validation-primitives';
+
+function validateRegularArtifact(
+    filePath: string,
+    accessMode: number,
+    expectedMode: number | null,
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem
+): ValidationResult<nodeFileSystem.Stats> {
+    let stat: nodeFileSystem.Stats;
+    try {
+        stat = fileSystem.lstatSync(filePath);
+    } catch (error) {
+        return validationFailure(
+            isMissingFileError(error)
+                ? 'runtime-artifact-missing'
+                : 'runtime-artifact-invalid'
+        );
+    }
+
+    if (
+        stat.isSymbolicLink() ||
+        !stat.isFile() ||
+        (expectedMode !== null && (stat.mode & 0o7777) !== expectedMode)
+    ) {
+        return validationFailure('runtime-artifact-invalid');
+    }
+    try {
+        fileSystem.accessSync(filePath, accessMode);
+    } catch {
+        return validationFailure('runtime-artifact-invalid');
+    }
+    return { value: stat };
+}
+
+function pathExistsByLstat(
+    filePath: string,
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem
+): boolean {
+    try {
+        fileSystem.lstatSync(filePath);
+        return true;
+    } catch (error) {
+        if (isMissingFileError(error)) {
+            return false;
+        }
+        throw error;
+    }
+}
+
+function validateBundledRuntimeFiles(
+    nativeDir: string,
+    runtimeFiles: RuntimeFile[],
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem
+): ValidationResult<true> {
+    const libDir = path.join(nativeDir, 'lib');
+    let libStat: nodeFileSystem.Stats;
+    try {
+        libStat = fileSystem.lstatSync(libDir);
+    } catch {
+        return validationFailure('runtime-library-directory-invalid');
+    }
+    if (libStat.isSymbolicLink() || !libStat.isDirectory()) {
+        return validationFailure('runtime-library-directory-invalid');
+    }
+
+    let packagedNames: string[];
+    try {
+        packagedNames = fileSystem.readdirSync(libDir) as string[];
+    } catch {
+        return validationFailure('runtime-library-directory-invalid');
+    }
+    const declaredNames = new Set(runtimeFiles.map(({ name }) => name));
+    if (packagedNames.some((name) => !declaredNames.has(name))) {
+        return validationFailure('runtime-library-undeclared');
+    }
+
+    for (const runtimeFile of runtimeFiles) {
+        const runtimePath = path.join(libDir, runtimeFile.name);
+        let stat: nodeFileSystem.Stats;
+        try {
+            stat = fileSystem.lstatSync(runtimePath);
+        } catch (error) {
+            return validationFailure(
+                isMissingFileError(error)
+                    ? 'runtime-library-missing'
+                    : 'runtime-library-invalid'
+            );
+        }
+        if (stat.isSymbolicLink() || !stat.isFile()) {
+            return validationFailure('runtime-library-invalid');
+        }
+        try {
+            fileSystem.accessSync(runtimePath, nodeFileSystem.constants.R_OK);
+        } catch {
+            return validationFailure('runtime-library-invalid');
+        }
+        if (stat.size !== runtimeFile.size) {
+            return validationFailure('runtime-library-size-mismatch');
+        }
+
+        let contents: Buffer;
+        try {
+            contents = fileSystem.readFileSync(runtimePath);
+        } catch {
+            return validationFailure('runtime-library-invalid');
+        }
+        if (contents.length !== runtimeFile.size) {
+            return validationFailure('runtime-library-size-mismatch');
+        }
+        const actualSha256 = createHash('sha256')
+            .update(contents)
+            .digest('hex');
+        if (actualSha256 !== runtimeFile.sha256) {
+            return validationFailure('runtime-library-hash-mismatch');
+        }
+    }
+    return { value: true };
+}
+
+export function validatePackage(
+    helperPath: string,
+    manifestPath: string,
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem,
+    manifestContract: EmbeddedMpvFrameCopyManifestContract
+): ValidationResult<ValidatedPackage> {
+    const nativeDir = path.dirname(helperPath);
+    if (
+        path.basename(helperPath) !== FRAME_COPY_HELPER_NAME ||
+        path.dirname(manifestPath) !== nativeDir
+    ) {
+        return validationFailure('runtime-artifact-invalid');
+    }
+
+    const manifestArtifact = validateRegularArtifact(
+        manifestPath,
+        nodeFileSystem.constants.R_OK,
+        0o644,
+        fileSystem
+    );
+    if (isValidationFailure(manifestArtifact)) {
+        return validationFailure(
+            manifestArtifact.reason === 'runtime-artifact-missing'
+                ? 'runtime-manifest-missing'
+                : 'runtime-manifest-invalid'
+        );
+    }
+    const manifestResult = readManifest(manifestPath, fileSystem);
+    if (isValidationFailure(manifestResult)) {
+        return manifestResult;
+    }
+    const validManifest =
+        manifestContract === 'packaged'
+            ? validatePackagedManifest(manifestResult.value)
+            : validateDevelopmentManifest(manifestResult.value);
+    if (isValidationFailure(validManifest)) {
+        return validManifest;
+    }
+
+    for (const [artifactPath, accessMode, expectedMode] of [
+        [
+            path.join(nativeDir, FRAME_COPY_ADDON_NAME),
+            nodeFileSystem.constants.R_OK,
+            null,
+        ],
+        [
+            path.join(nativeDir, FRAME_COPY_READER_NAME),
+            nodeFileSystem.constants.R_OK,
+            0o644,
+        ],
+        [
+            helperPath,
+            nodeFileSystem.constants.R_OK | nodeFileSystem.constants.X_OK,
+            0o755,
+        ],
+    ] as const) {
+        const artifact = validateRegularArtifact(
+            artifactPath,
+            accessMode,
+            expectedMode,
+            fileSystem
+        );
+        if (isValidationFailure(artifact)) {
+            return artifact;
+        }
+    }
+
+    const libDir = path.join(nativeDir, 'lib');
+    if (validManifest.value.runtimeMode === 'system') {
+        try {
+            if (pathExistsByLstat(libDir, fileSystem)) {
+                return validationFailure('runtime-library-directory-invalid');
+            }
+        } catch {
+            return validationFailure('runtime-library-directory-invalid');
+        }
+    } else {
+        const bundledRuntime = validateBundledRuntimeFiles(
+            nativeDir,
+            validManifest.value.runtimeFiles,
+            fileSystem
+        );
+        if (isValidationFailure(bundledRuntime)) {
+            return bundledRuntime;
+        }
+    }
+
+    return {
+        value: {
+            manifest: validManifest.value,
+            helperPath,
+            nativeDir,
+        },
+    };
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe-orchestration.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe-orchestration.spec.ts
new file mode 100644
index 000000000..6b6a0f610
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe-orchestration.spec.ts
@@ -0,0 +1,391 @@
+import {
+    accessSync,
+    chmodSync,
+    lstatSync,
+    mkdirSync,
+    readFileSync,
+    readdirSync,
+    writeFileSync,
+} from 'fs';
+import path from 'path';
+import {
+    cloneManifest,
+    createFixture,
+    writeManifest,
+} from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy runtime probe orchestration', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it('validates a system package, sanitizes loader overrides, and caches by helper/manifest identity', () => {
+        const fixture = createFixture(context.rootDir);
+        const probeRuntime = context.createProbe({
+            env: {
+                PATH: '/usr/bin',
+                LIBGL_ALWAYS_SOFTWARE: '1',
+                GALLIUM_DRIVER: 'llvmpipe',
+                BASH_ENV: '/tmp/hostile-bash-env',
+                ENV: '/tmp/hostile-shell-env',
+                BASHOPTS: 'extdebug',
+                SHELLOPTS: 'xtrace',
+                PS4: '$(/tmp/hostile-trace-hook)',
+                BASH_XTRACEFD: '9',
+                CDPATH: '/tmp/hostile-cdpath',
+                'BASH_FUNC_dirname%%':
+                    '() { printf /tmp/hostile-provider-root; exit 0; }',
+                LD_AUDIT: '/tmp/audit.so',
+                LD_LIBRARY_PATH: '/ambient/libs',
+                LD_ORIGIN_PATH: '/tmp/hostile-origin',
+                LD_PRELOAD: '/tmp/inject.so',
+                __EGL_VENDOR_LIBRARY_FILENAMES: '/tmp/hostile-egl-vendor.json',
+                __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor-dir',
+                __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                    '/tmp/hostile-egl-platform',
+                __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES:
+                    '/tmp/hostile-egl-platform.json',
+                GBM_BACKEND: '../../../../../tmp/hostile-gbm',
+                GBM_BACKENDS_PATH: '/tmp/hostile-gbm-path',
+                LIBGL_DRIVERS_PATH: '/tmp/hostile-dri-path',
+                MESA_LOADER_DRIVER_OVERRIDE: '../../../../../tmp/hostile-dri',
+                LIBVA_DRIVER_NAME: '../../../../../tmp/hostile-va',
+                LIBVA_DRIVERS_PATH: '/tmp/hostile-va-path',
+                VDPAU_DRIVER_PATH: '/tmp/hostile-vdpau',
+                VK_DRIVER_FILES: '/tmp/hostile-vulkan-driver.json',
+                VK_ICD_FILENAMES: '/tmp/hostile-vulkan-icd.json',
+                VK_ADD_DRIVER_FILES: '/tmp/hostile-vulkan-add-driver.json',
+                VK_ADD_LAYER_PATH: '/tmp/hostile-vulkan-layers',
+                VK_IMPLICIT_LAYER_PATH: '/tmp/hostile-vulkan-implicit-layers',
+                VK_ADD_IMPLICIT_LAYER_PATH:
+                    '/tmp/hostile-vulkan-add-implicit-layers',
+                VK_LAYER_PATH: '/tmp/hostile-vulkan-layer-path',
+            },
+        });
+
+        expect(probeRuntime(fixture.helperPath)).toEqual({
+            usable: true,
+            profile: 'system',
+            runtimeMode: 'system',
+            libmpv: '2.3',
+            renderApi: 'egl',
+        });
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledTimes(1);
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledWith(
+            fixture.helperPath,
+            ['--runtime-probe'],
+            {
+                encoding: 'utf8',
+                timeout: 3000,
+                killSignal: 'SIGKILL',
+                windowsHide: true,
+                maxBuffer: 16 * 1024 * 1024,
+                env: {
+                    PATH: '/usr/bin',
+                    LIBGL_ALWAYS_SOFTWARE: '1',
+                    GALLIUM_DRIVER: 'llvmpipe',
+                },
+            }
+        );
+        expect(context.fileSystem.readFileSync).toHaveBeenCalled();
+    });
+
+    it('invalidates a cached result when helper or manifest bytes change under identical stats', () => {
+        const fixture = createFixture(context.rootDir);
+        const fixedStats = new Map([
+            [fixture.helperPath, lstatSync(fixture.helperPath)],
+            [fixture.manifestPath, lstatSync(fixture.manifestPath)],
+        ]);
+        context.fileSystem = {
+            ...context.fileSystem,
+            lstatSync: jest.fn(
+                (filePath: string) =>
+                    fixedStats.get(filePath) ?? lstatSync(filePath)
+            ),
+        };
+        const probeRuntime = context.createProbe();
+
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        const changedHelper = readFileSync(fixture.helperPath);
+        changedHelper[0] ^= 0xff;
+        writeFileSync(fixture.helperPath, changedHelper);
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        fixture.manifest.generatedAt = '2026-07-18T00:00:00.000Z';
+        writeManifest(fixture.manifestPath, fixture.manifest);
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledTimes(3);
+    });
+
+    it.each(['portable', 'flatpak'] as const)(
+        'validates the exact %s bundled closure and uses only its private library directory',
+        (profile) => {
+            const fixture = createFixture(context.rootDir, profile);
+            const probeRuntime = context.createProbe();
+
+            expect(probeRuntime(fixture.helperPath)).toEqual(
+                expect.objectContaining({
+                    usable: true,
+                    profile,
+                    runtimeMode: 'bundled',
+                })
+            );
+            expect(context.spawnRuntimeProbe).toHaveBeenCalledWith(
+                fixture.helperPath,
+                ['--runtime-probe'],
+                expect.objectContaining({
+                    env: {
+                        PATH: '/usr/bin',
+                        LD_LIBRARY_PATH: path.join(fixture.nativeDir, 'lib'),
+                    },
+                })
+            );
+        }
+    );
+
+    it('runs a packaged Snap probe through the connected graphics provider wrapper', () => {
+        const actualSnapRoot = path.join(context.rootDir, 'snap-root');
+        const actualFixtureRoot = path.join(actualSnapRoot, 'fixture');
+        const fixture = createFixture(actualFixtureRoot, 'portable');
+        const actualGraphicsRoot = path.join(actualSnapRoot, 'graphics');
+        const actualProviderWrapper = path.join(
+            actualGraphicsRoot,
+            'bin',
+            'graphics-core22-provider-wrapper'
+        );
+        mkdirSync(path.dirname(actualProviderWrapper), { recursive: true });
+        writeFileSync(actualProviderWrapper, '#!/bin/sh\nexec "$@"\n', {
+            mode: 0o755,
+        });
+
+        const virtualSnapRoot = '/snap/iptvnator/42';
+        const linuxTriplet = 'x86_64-linux-gnu';
+        const snapLibraries = (...relativePaths: string[]): string[] =>
+            relativePaths.map((relativePath) =>
+                path.join(virtualSnapRoot, relativePath)
+            );
+        const virtualNativeDir = path.join(
+            virtualSnapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        const virtualHelperPath = path.join(
+            virtualNativeDir,
+            'iptvnator_mpv_helper'
+        );
+        const virtualGraphicsRoot = path.join(virtualSnapRoot, 'graphics');
+        const virtualProviderWrapper = path.join(
+            virtualGraphicsRoot,
+            'bin',
+            'graphics-core22-provider-wrapper'
+        );
+        const translatePath = (candidatePath: string): string => {
+            if (
+                candidatePath === virtualNativeDir ||
+                candidatePath.startsWith(`${virtualNativeDir}${path.sep}`)
+            ) {
+                return path.join(
+                    fixture.nativeDir,
+                    path.relative(virtualNativeDir, candidatePath)
+                );
+            }
+            if (
+                candidatePath === virtualGraphicsRoot ||
+                candidatePath.startsWith(`${virtualGraphicsRoot}${path.sep}`)
+            ) {
+                return path.join(
+                    actualGraphicsRoot,
+                    path.relative(virtualGraphicsRoot, candidatePath)
+                );
+            }
+            return candidatePath;
+        };
+        const virtualFileSystem = {
+            accessSync: jest.fn((candidatePath: string, mode: number) =>
+                accessSync(translatePath(candidatePath), mode)
+            ),
+            lstatSync: jest.fn((candidatePath: string) =>
+                lstatSync(translatePath(candidatePath))
+            ),
+            readFileSync: jest.fn((candidatePath: string) =>
+                readFileSync(translatePath(candidatePath))
+            ),
+            readdirSync: jest.fn((candidatePath: string) =>
+                readdirSync(translatePath(candidatePath))
+            ),
+        };
+        const probeRuntime = context.createProbe({
+            env: {
+                PATH: '/snap/bin:/usr/bin',
+                SNAP: virtualSnapRoot,
+                SNAP_DESKTOP_RUNTIME: path.join(
+                    virtualSnapRoot,
+                    'gnome-platform'
+                ),
+                SNAP_LIBRARY_PATH:
+                    '/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl/nvidia',
+            },
+            fileSystem: virtualFileSystem,
+        });
+
+        expect(probeRuntime(virtualHelperPath)).toEqual(
+            expect.objectContaining({
+                usable: true,
+                profile: 'portable',
+                runtimeMode: 'bundled',
+            })
+        );
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledWith(
+            virtualProviderWrapper,
+            [virtualHelperPath, '--runtime-probe'],
+            expect.objectContaining({
+                env: expect.objectContaining({
+                    SNAP: virtualSnapRoot,
+                    LD_LIBRARY_PATH: [
+                        path.join(virtualNativeDir, 'lib'),
+                        '/var/lib/snapd/lib/gl',
+                        '/var/lib/snapd/lib/gl/nvidia',
+                        ...snapLibraries(
+                            `graphics/usr/lib/${linuxTriplet}`,
+                            `graphics/usr/lib/${linuxTriplet}/vdpau`
+                        ),
+                        '/usr/lib/x86_64-linux-gnu',
+                        ...snapLibraries(
+                            `gnome-platform/lib/${linuxTriplet}`,
+                            `gnome-platform/usr/lib/${linuxTriplet}`,
+                            `gnome-platform/usr/lib/${linuxTriplet}/mesa`,
+                            `gnome-platform/usr/lib/${linuxTriplet}/mesa-egl`,
+                            `gnome-platform/usr/lib/${linuxTriplet}/dri`,
+                            `gnome-platform/usr/lib/${linuxTriplet}/pulseaudio`,
+                            'lib',
+                            'usr/lib',
+                            `lib/${linuxTriplet}`,
+                            `usr/lib/${linuxTriplet}`
+                        ),
+                    ].join(':'),
+                }),
+            })
+        );
+    });
+
+    it('reports a stable unavailable reason when the Snap graphics provider is disconnected', () => {
+        const actualSnapRoot = path.join(context.rootDir, 'snap-root');
+        const fixture = createFixture(
+            path.join(actualSnapRoot, 'fixture'),
+            'portable'
+        );
+        const actualGraphicsRoot = path.join(actualSnapRoot, 'graphics');
+        mkdirSync(actualGraphicsRoot, { recursive: true });
+
+        const virtualSnapRoot = '/snap/iptvnator/42';
+        const virtualNativeDir = path.join(
+            virtualSnapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        const translatePath = (candidatePath: string): string => {
+            if (
+                candidatePath === virtualNativeDir ||
+                candidatePath.startsWith(`${virtualNativeDir}${path.sep}`)
+            ) {
+                return path.join(
+                    fixture.nativeDir,
+                    path.relative(virtualNativeDir, candidatePath)
+                );
+            }
+            const virtualGraphicsRoot = path.join(virtualSnapRoot, 'graphics');
+            if (
+                candidatePath === virtualGraphicsRoot ||
+                candidatePath.startsWith(`${virtualGraphicsRoot}${path.sep}`)
+            ) {
+                return path.join(
+                    actualGraphicsRoot,
+                    path.relative(virtualGraphicsRoot, candidatePath)
+                );
+            }
+            return candidatePath;
+        };
+        const probeRuntime = context.createProbe({
+            env: { SNAP: virtualSnapRoot },
+            fileSystem: {
+                accessSync: (candidatePath, mode) =>
+                    accessSync(translatePath(candidatePath), mode),
+                lstatSync: (candidatePath) =>
+                    lstatSync(translatePath(candidatePath)),
+                readFileSync: (candidatePath) =>
+                    readFileSync(translatePath(candidatePath)),
+                readdirSync: (candidatePath) =>
+                    readdirSync(translatePath(candidatePath)),
+            },
+        });
+
+        expect(
+            probeRuntime(path.join(virtualNativeDir, 'iptvnator_mpv_helper'))
+        ).toEqual({
+            usable: false,
+            reason: 'snap-graphics-provider-unavailable',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+
+    it('reprobes when the helper identity changes', () => {
+        const fixture = createFixture(context.rootDir);
+        const probeRuntime = context.createProbe();
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        writeFileSync(fixture.helperPath, '#!/bin/sh\n# changed\n');
+        chmodSync(fixture.helperPath, 0o755);
+
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledTimes(2);
+    });
+
+    it('reprobes when the manifest identity changes', () => {
+        const fixture = createFixture(context.rootDir);
+        const probeRuntime = context.createProbe();
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+
+        const manifest = cloneManifest(fixture.manifest);
+        manifest.generatedAt = '2026-07-17T00:01:00.000Z';
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(probeRuntime(fixture.helperPath).usable).toBe(true);
+        expect(context.spawnRuntimeProbe).toHaveBeenCalledTimes(2);
+    });
+
+    it.each([
+        ['linux', 'arm64', 'unsupported-architecture'],
+        ['linux', 'arm', 'unsupported-architecture'],
+        ['darwin', 'x64', 'unsupported-platform'],
+    ] as const)(
+        'does not probe unsupported %s/%s runtimes',
+        (platform, arch, reason) => {
+            const fixture = createFixture(context.rootDir);
+
+            expect(
+                context.createProbe({ platform, arch })(fixture.helperPath)
+            ).toEqual({
+                usable: false,
+                reason,
+            });
+            expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+        }
+    );
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe.ts
new file mode 100644
index 000000000..2b9ad7e2d
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe.ts
@@ -0,0 +1,334 @@
+import { spawnSync as nodeSpawnSync } from 'child_process';
+import * as nodeFileSystem from 'fs';
+import path from 'path';
+import {
+    RUNTIME_MANIFEST_NAME,
+    RUNTIME_PROBE_MAX_BUFFER_BYTES,
+    RUNTIME_PROBE_PROTOCOL,
+    RUNTIME_PROBE_TIMEOUT_MS,
+} from './contracts';
+import { createLinuxFrameCopyHelperLaunch } from './helper-launch';
+import { validatePackage } from './package-validator';
+import { EMBEDDED_MPV_HELPER_RUNTIME_PROBE_FAILURE_REASONS } from './types';
+import type {
+    EmbeddedMpvFrameCopyManifestContract,
+    EmbeddedMpvFrameCopyRuntimeDependencies,
+    EmbeddedMpvFrameCopyRuntimeFileSystem,
+    EmbeddedMpvFrameCopyRuntimeResult,
+    EmbeddedMpvHelperRuntimeProbeFailureReason,
+    ValidManifest,
+    ValidatedPackage,
+} from './types';
+import {
+    failure,
+    fileIdentity,
+    hasExactFields,
+    isMissingFileError,
+    isObject,
+    isValidationFailure,
+} from './validation-primitives';
+
+const HELPER_RUNTIME_PROBE_FAILURE_REASON_ALLOWLIST = new Set<string>(
+    Object.values(EMBEDDED_MPV_HELPER_RUNTIME_PROBE_FAILURE_REASONS)
+);
+const HELPER_RUNTIME_PROBE_STDERR_LIMIT = 16_384;
+const HELPER_RUNTIME_PROBE_STDERR_EVENT =
+    'embedded-mpv-helper-runtime-probe-stderr';
+
+interface ParsedFailedProbe {
+    helperReason: EmbeddedMpvHelperRuntimeProbeFailureReason;
+    helperDetail?: string;
+}
+
+function isSafeHelperDetail(value: unknown): value is string {
+    return (
+        typeof value === 'string' &&
+        value.length >= 1 &&
+        value.length <= 1024 &&
+        !/[^\x20-\x7e]/.test(value)
+    );
+}
+
+function parseFailedProbe(stdout: unknown): ParsedFailedProbe | null {
+    if (typeof stdout !== 'string' || !/^[^\r\n]+\n$/.test(stdout)) {
+        return null;
+    }
+
+    let parsed: unknown;
+    try {
+        parsed = JSON.parse(stdout.slice(0, -1));
+    } catch {
+        return null;
+    }
+    if (!isObject(parsed)) {
+        return null;
+    }
+
+    const hasDetail = Object.prototype.hasOwnProperty.call(parsed, 'detail');
+    const fields = hasDetail
+        ? ['detail', 'protocol', 'reason', 'usable']
+        : ['protocol', 'reason', 'usable'];
+    if (
+        !hasExactFields(parsed, fields) ||
+        parsed.protocol !== RUNTIME_PROBE_PROTOCOL ||
+        parsed.usable !== false ||
+        typeof parsed.reason !== 'string' ||
+        !HELPER_RUNTIME_PROBE_FAILURE_REASON_ALLOWLIST.has(parsed.reason) ||
+        (hasDetail && !isSafeHelperDetail(parsed.detail))
+    ) {
+        return null;
+    }
+    return {
+        helperReason:
+            parsed.reason as EmbeddedMpvHelperRuntimeProbeFailureReason,
+        ...(hasDetail ? { helperDetail: parsed.detail as string } : {}),
+    };
+}
+
+function parseSuccessfulProbe(
+    stdout: unknown,
+    manifest: ValidManifest
+): EmbeddedMpvFrameCopyRuntimeResult {
+    if (typeof stdout !== 'string' || !/^[^\r\n]+\n$/.test(stdout)) {
+        return failure('helper-probe-invalid-output');
+    }
+
+    let parsed: unknown;
+    try {
+        parsed = JSON.parse(stdout.slice(0, -1));
+    } catch {
+        return failure('helper-probe-invalid-output');
+    }
+    if (!isObject(parsed)) {
+        return failure('helper-probe-invalid-output');
+    }
+    if (parsed.protocol !== RUNTIME_PROBE_PROTOCOL) {
+        return failure('helper-probe-protocol-mismatch');
+    }
+    if (parsed.usable !== true) {
+        return failure(
+            parsed.usable === false
+                ? 'helper-probe-unusable'
+                : 'helper-probe-invalid-output'
+        );
+    }
+    if (
+        !hasExactFields(parsed, [
+            'libmpv',
+            'protocol',
+            'renderApi',
+            'usable',
+        ]) ||
+        typeof parsed.libmpv !== 'string' ||
+        parsed.libmpv.trim() === '' ||
+        parsed.renderApi !== 'egl'
+    ) {
+        return failure('helper-probe-invalid-output');
+    }
+    return {
+        usable: true,
+        profile: manifest.profile,
+        runtimeMode: manifest.runtimeMode,
+        libmpv: parsed.libmpv,
+        renderApi: parsed.renderApi,
+    };
+}
+
+function traceHelperProbeStderr(
+    stderr: unknown,
+    dependencies: EmbeddedMpvFrameCopyRuntimeDependencies
+): void {
+    if (
+        dependencies.env.IPTVNATOR_TRACE_PLAYER !== '1' ||
+        typeof stderr !== 'string' ||
+        stderr.length === 0
+    ) {
+        return;
+    }
+
+    const boundedStderr = stderr.slice(0, HELPER_RUNTIME_PROBE_STDERR_LIMIT);
+    const output = `${JSON.stringify({
+        event: HELPER_RUNTIME_PROBE_STDERR_EVENT,
+        stderr: boundedStderr,
+        truncated: stderr.length > boundedStderr.length,
+    })}\n`;
+    try {
+        dependencies.writeStderr(output);
+    } catch {
+        // Opt-in diagnostics must never change the fail-closed probe result.
+    }
+}
+
+function runHelperProbe(
+    runtimePackage: ValidatedPackage,
+    dependencies: EmbeddedMpvFrameCopyRuntimeDependencies
+): EmbeddedMpvFrameCopyRuntimeResult {
+    const launch = createLinuxFrameCopyHelperLaunch({
+        environment: dependencies.env,
+        helperPath: runtimePackage.helperPath,
+        helperArgs: ['--runtime-probe'],
+        runtimeMode: runtimePackage.manifest.runtimeMode,
+        fileSystem: dependencies.fileSystem,
+    });
+    if (launch.usable === false) {
+        return failure(launch.reason);
+    }
+
+    let result: ReturnType<typeof nodeSpawnSync>;
+    try {
+        result = dependencies.spawnSync(launch.command, launch.args, {
+            encoding: 'utf8',
+            timeout: RUNTIME_PROBE_TIMEOUT_MS,
+            killSignal: 'SIGKILL',
+            windowsHide: true,
+            maxBuffer: RUNTIME_PROBE_MAX_BUFFER_BYTES,
+            env: launch.env,
+        });
+    } catch {
+        return failure('helper-probe-spawn-error');
+    }
+    traceHelperProbeStderr(result.stderr, dependencies);
+
+    if (
+        result.error &&
+        'code' in result.error &&
+        result.error.code === 'ETIMEDOUT'
+    ) {
+        return failure('helper-probe-timeout');
+    }
+    if (result.error) {
+        return failure('helper-probe-spawn-error');
+    }
+    if (result.signal) {
+        return failure('helper-probe-signaled');
+    }
+    if (result.status !== 0) {
+        const helperFailure = parseFailedProbe(result.stdout);
+        return helperFailure
+            ? {
+                  usable: false,
+                  reason: 'helper-probe-failed',
+                  ...helperFailure,
+              }
+            : failure('helper-probe-failed');
+    }
+    return parseSuccessfulProbe(result.stdout, runtimePackage.manifest);
+}
+
+/**
+ * Creates an isolated probe/cache. Production uses the singleton below;
+ * tests inject filesystem and spawn collaborators through this factory.
+ */
+export function createEmbeddedMpvFrameCopyRuntimeProbe(
+    overrides: Partial<EmbeddedMpvFrameCopyRuntimeDependencies> = {}
+): (
+    helperPath: string,
+    manifestContract?: EmbeddedMpvFrameCopyManifestContract
+) => EmbeddedMpvFrameCopyRuntimeResult {
+    const defaultFileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem = {
+        accessSync: (filePath, mode) =>
+            nodeFileSystem.accessSync(filePath, mode),
+        lstatSync: (filePath) => nodeFileSystem.lstatSync(filePath),
+        readFileSync: (filePath) => nodeFileSystem.readFileSync(filePath),
+        readdirSync: (filePath) => nodeFileSystem.readdirSync(filePath),
+    };
+    const dependencies: EmbeddedMpvFrameCopyRuntimeDependencies = {
+        platform: process.platform,
+        arch: process.arch,
+        env: process.env,
+        fileSystem: defaultFileSystem,
+        spawnSync: nodeSpawnSync,
+        writeStderr: (output) => {
+            nodeFileSystem.writeSync(process.stderr.fd, output);
+        },
+        ...overrides,
+    };
+    const resultCache = new Map<string, EmbeddedMpvFrameCopyRuntimeResult>();
+
+    return (
+        helperPath: string,
+        manifestContract: EmbeddedMpvFrameCopyManifestContract = 'packaged'
+    ): EmbeddedMpvFrameCopyRuntimeResult => {
+        if (dependencies.platform !== 'linux') {
+            return failure('unsupported-platform');
+        }
+        if (dependencies.arch !== 'x64') {
+            return failure('unsupported-architecture');
+        }
+
+        const manifestPath = path.join(
+            path.dirname(helperPath),
+            RUNTIME_MANIFEST_NAME
+        );
+        let helperStat: nodeFileSystem.Stats;
+        let manifestStat: nodeFileSystem.Stats;
+        try {
+            helperStat = dependencies.fileSystem.lstatSync(helperPath);
+        } catch {
+            return failure('runtime-artifact-missing');
+        }
+        try {
+            manifestStat = dependencies.fileSystem.lstatSync(manifestPath);
+        } catch (error) {
+            return failure(
+                isMissingFileError(error)
+                    ? 'runtime-manifest-missing'
+                    : 'runtime-manifest-invalid'
+            );
+        }
+
+        let helperContents: Buffer;
+        let manifestContents: Buffer;
+        try {
+            helperContents = dependencies.fileSystem.readFileSync(helperPath);
+        } catch {
+            return failure('runtime-artifact-invalid');
+        }
+        try {
+            manifestContents =
+                dependencies.fileSystem.readFileSync(manifestPath);
+        } catch {
+            return failure('runtime-manifest-invalid');
+        }
+
+        const cacheKey = `${manifestContract}\0${fileIdentity(
+            helperPath,
+            helperStat,
+            helperContents
+        )}\0${fileIdentity(manifestPath, manifestStat, manifestContents)}`;
+        const cached = resultCache.get(cacheKey);
+        if (cached) {
+            return cached;
+        }
+
+        let result: EmbeddedMpvFrameCopyRuntimeResult;
+        try {
+            const runtimePackage = validatePackage(
+                helperPath,
+                manifestPath,
+                dependencies.fileSystem,
+                manifestContract
+            );
+            result = isValidationFailure(runtimePackage)
+                ? failure(runtimePackage.reason)
+                : runHelperProbe(runtimePackage.value, dependencies);
+        } catch {
+            result = failure('runtime-probe-internal-error');
+        }
+        resultCache.set(cacheKey, result);
+        return result;
+    };
+}
+
+const processRuntimeProbe = createEmbeddedMpvFrameCopyRuntimeProbe();
+
+/**
+ * Fail-closed, process-lifetime Linux runtime decision shared by startup and
+ * the service gate. The helper and manifest identities scope cached results.
+ */
+export function probeEmbeddedMpvFrameCopyRuntime(
+    helperPath: string,
+    manifestContract: EmbeddedMpvFrameCopyManifestContract
+): EmbeddedMpvFrameCopyRuntimeResult {
+    return processRuntimeProbe(helperPath, manifestContract);
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-closure-validator.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-closure-validator.ts
new file mode 100644
index 000000000..8cf7789d6
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-closure-validator.ts
@@ -0,0 +1,95 @@
+import { isDeepStrictEqual } from 'util';
+import {
+    ALLOWED_EXTERNAL_LIBRARY_NAMES,
+    EXPECTED_EXTERNAL_SYSTEM_LIBRARIES,
+    SAFE_RUNTIME_NAME_PATTERN,
+    SHARED_LIBRARY_PATTERN,
+} from './contracts';
+import type { RuntimeFile } from './types';
+import {
+    hasExactFields,
+    isObject,
+    isSafeRuntimeName,
+} from './validation-primitives';
+
+export function validateRuntimeClosure(
+    value: unknown,
+    runtimeFiles: RuntimeFile[],
+    libmpvSoname: string,
+    externalSystemLibraries: unknown
+): boolean {
+    if (
+        !isDeepStrictEqual(
+            externalSystemLibraries,
+            EXPECTED_EXTERNAL_SYSTEM_LIBRARIES
+        ) ||
+        !isObject(value) ||
+        !hasExactFields(value, ['entries', 'externalDependencies']) ||
+        !Array.isArray(value.entries) ||
+        !Array.isArray(value.externalDependencies) ||
+        value.externalDependencies.some(
+            (dependency) =>
+                typeof dependency !== 'string' ||
+                !SAFE_RUNTIME_NAME_PATTERN.test(dependency) ||
+                !SHARED_LIBRARY_PATTERN.test(dependency)
+        )
+    ) {
+        return false;
+    }
+
+    const runtimeNames = runtimeFiles.map(({ name }) => name);
+    const runtimeNameSet = new Set(runtimeNames);
+    const closureNames: string[] = [];
+    const computedExternalDependencies = new Set<string>();
+    for (const entry of value.entries) {
+        if (
+            !isObject(entry) ||
+            !hasExactFields(entry, [
+                'name',
+                'needed',
+                'rpath',
+                'runpath',
+                'soname',
+            ]) ||
+            !isSafeRuntimeName(entry.name) ||
+            (entry.soname !== null && !isSafeRuntimeName(entry.soname)) ||
+            !Array.isArray(entry.needed) ||
+            entry.needed.some(
+                (dependency) =>
+                    typeof dependency !== 'string' ||
+                    !SAFE_RUNTIME_NAME_PATTERN.test(dependency) ||
+                    !SHARED_LIBRARY_PATTERN.test(dependency)
+            ) ||
+            !isDeepStrictEqual(entry.rpath, []) ||
+            !isDeepStrictEqual(entry.runpath, ['$ORIGIN']) ||
+            new Set(entry.needed).size !== entry.needed.length ||
+            !isDeepStrictEqual([...entry.needed].sort(), entry.needed)
+        ) {
+            return false;
+        }
+        closureNames.push(entry.name);
+        for (const dependency of entry.needed) {
+            if (runtimeNameSet.has(dependency)) {
+                continue;
+            }
+            if (!ALLOWED_EXTERNAL_LIBRARY_NAMES.has(dependency)) {
+                return false;
+            }
+            computedExternalDependencies.add(dependency);
+        }
+    }
+
+    const linkerAlias = value.entries.find(
+        (entry) => isObject(entry) && entry.name === 'libmpv.so'
+    );
+    return (
+        isDeepStrictEqual(closureNames, runtimeNames) &&
+        new Set(closureNames).size === closureNames.length &&
+        isDeepStrictEqual(
+            value.externalDependencies,
+            [...computedExternalDependencies].sort()
+        ) &&
+        isObject(linkerAlias) &&
+        linkerAlias.soname === libmpvSoname
+    );
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-fixtures.test-helpers.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-fixtures.test-helpers.ts
new file mode 100644
index 000000000..84f4c6523
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-fixtures.test-helpers.ts
@@ -0,0 +1,306 @@
+import { createHash } from 'crypto';
+import { chmodSync, mkdirSync, writeFileSync } from 'fs';
+import path from 'path';
+import type { createEmbeddedMpvFrameCopyRuntimeProbe } from '../embedded-mpv-frame-copy-runtime';
+import {
+    EXTERNAL_SYSTEM_LIBRARIES,
+    PINNED_SOURCE_PACKAGE_IDENTITIES,
+    type RuntimeFile,
+    type RuntimeFixture,
+} from './runtime.spec-data';
+
+function sha256(contents: Buffer): string {
+    return createHash('sha256').update(contents).digest('hex');
+}
+
+function createRuntimeFiles(
+    runtimeContents: Record<string, Buffer>
+): RuntimeFile[] {
+    return Object.entries(runtimeContents)
+        .map(([name, contents]) => ({
+            name,
+            size: contents.length,
+            sha256: sha256(contents),
+        }))
+        .sort((left, right) => left.name.localeCompare(right.name));
+}
+
+function createSourceRuntime(
+    runtimeFiles: RuntimeFile[],
+    runtimeDependencyClosure: Record<string, unknown>
+): Record<string, unknown> {
+    const packages = cloneManifest(PINNED_SOURCE_PACKAGE_IDENTITIES);
+    return {
+        schemaVersion: 1,
+        origin: 'vendored-lgpl-source-build',
+        platform: 'linux',
+        arch: 'x64',
+        packages,
+        ffmpeg: {
+            ...(packages.ffmpeg as Record<string, unknown>),
+            configureFlags: ['--disable-gpl', '--disable-nonfree'],
+        },
+        mpv: {
+            ...(packages.mpv as Record<string, unknown>),
+            mesonFlags: ['-Dgpl=false', '-Dlibmpv=true'],
+        },
+        sourceDistribution:
+            'Publish the exact hwdata archive and pnp.ids with the libdisplay-info source.',
+        runtimeFiles,
+        runtimeTotalBytes: runtimeFiles.reduce(
+            (total, runtimeFile) => total + runtimeFile.size,
+            0
+        ),
+        runtimeAbi: {
+            baseline: {
+                distribution: 'Ubuntu 22.04',
+                glibcMaximum: '2.35',
+                glibcxxMaximum: '3.4.30',
+            },
+            files: runtimeFiles.map(({ name }) => ({
+                name,
+                requiredGlibc: '2.34',
+                requiredGlibcxx: null,
+            })),
+        },
+        runtimeDependencyClosure,
+        externalSystemLibraries: cloneManifest(EXTERNAL_SYSTEM_LIBRARIES),
+    };
+}
+
+export function createFixture(
+    rootDir: string,
+    profile: 'system' | 'portable' | 'flatpak' = 'system'
+): RuntimeFixture {
+    const nativeDir = path.join(rootDir, profile, 'native');
+    const helperPath = path.join(nativeDir, 'iptvnator_mpv_helper');
+    const manifestPath = path.join(nativeDir, 'embedded-mpv-runtime.json');
+    mkdirSync(nativeDir, { recursive: true });
+    writeFileSync(path.join(nativeDir, 'embedded_mpv.node'), 'addon', {
+        mode: 0o644,
+    });
+    writeFileSync(
+        path.join(nativeDir, 'embedded_mpv_frame_reader.node'),
+        'reader',
+        { mode: 0o644 }
+    );
+    writeFileSync(helperPath, '#!/bin/sh\n', { mode: 0o755 });
+
+    const bundled = profile !== 'system';
+    const runtimeContents = bundled
+        ? {
+              'libmpv.so': Buffer.from('libmpv-linker-alias'),
+              'libmpv.so.2': Buffer.from('libmpv-soname'),
+          }
+        : {};
+    const runtimeFiles = createRuntimeFiles(runtimeContents);
+    const runtimeDependencyClosure = {
+        entries: runtimeFiles.map(({ name }) => ({
+            name,
+            soname: name === 'libmpv.so' ? 'libmpv.so.2' : name,
+            needed: [],
+            rpath: [],
+            runpath: ['$ORIGIN'],
+        })),
+        externalDependencies: [],
+    };
+    const externalSystemLibraries = cloneManifest(EXTERNAL_SYSTEM_LIBRARIES);
+    const sourceRuntime = createSourceRuntime(
+        runtimeFiles,
+        runtimeDependencyClosure
+    );
+    const sourceArchive = {
+        schemaVersion: 1,
+        name: 'linux-frame-copy-runtime-sources.tar.xz',
+        sha256: '7'.repeat(64),
+        repositoryRevision: '8'.repeat(40),
+    };
+    const manifest: Record<string, unknown> = {
+        schemaVersion: 1,
+        origin: bundled
+            ? 'bundled-lgpl-frame-copy'
+            : 'system-libmpv-frame-copy',
+        generatedAt: '2026-07-17T00:00:00.000Z',
+        platform: 'linux',
+        arch: 'x64',
+        profile,
+        runtimeMode: bundled ? 'bundled' : 'system',
+        targets:
+            profile === 'system'
+                ? ['deb', 'pacman', 'rpm']
+                : profile === 'portable'
+                  ? ['appimage', 'snap']
+                  : ['flatpak'],
+        artifacts: {
+            addon: {
+                name: 'embedded_mpv.node',
+                regularFile: true,
+                readable: true,
+            },
+            frameReader: {
+                name: 'embedded_mpv_frame_reader.node',
+                regularFile: true,
+                readable: true,
+            },
+            helper: {
+                name: 'iptvnator_mpv_helper',
+                regularFile: true,
+                readable: true,
+                executable: true,
+            },
+        },
+        processIsolation: {
+            addonLoadsLibmpv: false,
+            readerLoadsLibmpv: false,
+            electronLoadsLibmpv: false,
+            helperLinksLibmpv: true,
+            helperRunpath: ['$ORIGIN/lib'],
+        },
+        nativeViewFallback: 'process-isolated mpv --wid',
+        libmpvSoname: 'libmpv.so.2',
+        packageDependencies: bundled
+            ? {}
+            : {
+                  deb: ['libmpv2', 'libegl1', 'libgl1', 'libgbm1'],
+                  rpm: [
+                      'mpv-libs',
+                      'libglvnd-egl',
+                      'libglvnd-glx',
+                      'mesa-libgbm',
+                  ],
+                  pacman: ['mpv', 'libglvnd', 'mesa'],
+              },
+        runtimeFiles,
+        runtimeTotalBytes: runtimeFiles.reduce(
+            (total, runtimeFile) => total + runtimeFile.size,
+            0
+        ),
+        ...(bundled
+            ? {
+                  runtimeDependencyClosure,
+                  externalSystemLibraries,
+                  sourceArchive,
+                  sourceRuntime,
+              }
+            : {}),
+    };
+    writeManifest(manifestPath, manifest);
+    if (bundled) {
+        const libDir = path.join(nativeDir, 'lib');
+        mkdirSync(libDir);
+        for (const [name, contents] of Object.entries(runtimeContents)) {
+            writeFileSync(path.join(libDir, name), contents, {
+                mode: 0o644,
+            });
+        }
+    }
+    return {
+        nativeDir,
+        helperPath,
+        manifestPath,
+        manifest,
+        runtimeContents,
+    };
+}
+
+export function createDevelopmentFixture(
+    rootDir: string,
+    buildInputMode: 'system-dev' | 'system-build-inputs' | 'bundled-runtime'
+): RuntimeFixture {
+    const bundled = buildInputMode === 'bundled-runtime';
+    const fixture = createFixture(rootDir, bundled ? 'portable' : 'system');
+    const packagedSourceRuntime = fixture.manifest.sourceRuntime;
+    const sourceRuntime =
+        buildInputMode === 'system-dev'
+            ? {
+                  linuxBackend: 'process-isolated mpv --wid',
+                  warning:
+                      'Development-only unmanaged system libmpv toolchain.',
+              }
+            : buildInputMode === 'system-build-inputs'
+              ? {
+                    linuxBackend: 'process-isolated mpv --wid',
+                    buildInputs: {
+                        libmpvDevPackage: 'libmpv-dev',
+                        mpvPackage: 'mpv',
+                    },
+                    sourceDistribution:
+                        'Linux development inputs are supplied by the host package manager.',
+                }
+              : packagedSourceRuntime;
+    const manifest: Record<string, unknown> = {
+        schemaVersion: 1,
+        origin: 'linux-frame-copy-build',
+        generatedAt: '2026-07-17T00:00:00.000Z',
+        platform: 'linux',
+        arch: 'x64',
+        buildInputMode,
+        sourceRuntimeValidated: bundled,
+        allowedPackageRuntimeModes: ['system', 'bundled'],
+        packageRuntimeAvailability: {
+            system: bundled,
+            bundled,
+        },
+        artifacts: {
+            addon: 'embedded_mpv.node',
+            frameReader: 'embedded_mpv_frame_reader.node',
+            helper: 'iptvnator_mpv_helper',
+        },
+        processIsolation: {
+            addonLoadsLibmpv: false,
+            helperLinksLibmpv: true,
+            helperRunpath: ['$ORIGIN/lib'],
+        },
+        nativeViewFallback: 'process-isolated mpv --wid',
+        libmpvSoname: bundled ? 'libmpv.so.2' : null,
+        runtimeFiles: fixture.manifest.runtimeFiles,
+        runtimeTotalBytes: fixture.manifest.runtimeTotalBytes,
+        sourceArchive: bundled
+            ? cloneManifest(fixture.manifest.sourceArchive)
+            : null,
+        sourceRuntime,
+    };
+    fixture.manifest = manifest;
+    writeManifest(fixture.manifestPath, manifest);
+    return fixture;
+}
+
+export function probeDevelopmentRuntime(
+    probeRuntime: ReturnType<typeof createEmbeddedMpvFrameCopyRuntimeProbe>,
+    helperPath: string
+) {
+    return (
+        probeRuntime as unknown as (
+            path: string,
+            contract: 'development'
+        ) => ReturnType<typeof probeRuntime>
+    )(helperPath, 'development');
+}
+
+export function mirrorBundledManifestFields(
+    manifest: Record<string, unknown>
+): void {
+    const sourceRuntime = manifest.sourceRuntime as Record<string, unknown>;
+    sourceRuntime.runtimeFiles = cloneManifest(manifest.runtimeFiles);
+    sourceRuntime.runtimeTotalBytes = manifest.runtimeTotalBytes;
+    sourceRuntime.runtimeDependencyClosure = cloneManifest(
+        manifest.runtimeDependencyClosure
+    );
+    sourceRuntime.externalSystemLibraries = cloneManifest(
+        manifest.externalSystemLibraries
+    );
+}
+
+export function writeManifest(
+    manifestPath: string,
+    manifest: Record<string, unknown>
+): void {
+    writeFileSync(manifestPath, `${JSON.stringify(manifest)}\n`, {
+        mode: 0o644,
+    });
+    chmodSync(manifestPath, 0o644);
+}
+
+export function cloneManifest<T>(manifest: T): T {
+    return JSON.parse(JSON.stringify(manifest)) as T;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-harness.test-helpers.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-harness.test-helpers.ts
new file mode 100644
index 000000000..adbdbef73
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime-harness.test-helpers.ts
@@ -0,0 +1,74 @@
+import { spawnSync } from 'child_process';
+import {
+    accessSync,
+    lstatSync,
+    mkdtempSync,
+    readFileSync,
+    readdirSync,
+    rmSync,
+} from 'fs';
+import { tmpdir } from 'os';
+import path from 'path';
+import {
+    createEmbeddedMpvFrameCopyRuntimeProbe,
+    type EmbeddedMpvFrameCopyRuntimeDependencies,
+} from '../embedded-mpv-frame-copy-runtime';
+import { SUCCESS_OUTPUT } from './runtime.spec-data';
+
+export interface RuntimeTestContext {
+    rootDir: string;
+    spawnRuntimeProbe: jest.Mock;
+    writeRuntimeProbeStderr: jest.Mock<void, [string]>;
+    fileSystem: EmbeddedMpvFrameCopyRuntimeDependencies['fileSystem'];
+    createProbe(
+        overrides?: Partial<EmbeddedMpvFrameCopyRuntimeDependencies>
+    ): ReturnType<typeof createEmbeddedMpvFrameCopyRuntimeProbe>;
+    dispose(): void;
+}
+
+export function createRuntimeTestContext(): RuntimeTestContext {
+    const rootDir = mkdtempSync(path.join(tmpdir(), 'iptvnator-fc-runtime-'));
+    const spawnRuntimeProbe = jest.fn(() => ({
+        status: 0,
+        signal: null,
+        stdout: SUCCESS_OUTPUT,
+        stderr: '',
+    }));
+    const writeRuntimeProbeStderr = jest.fn<void, [string]>();
+    const fileSystem: EmbeddedMpvFrameCopyRuntimeDependencies['fileSystem'] = {
+        accessSync: jest.fn((filePath: string, mode: number) =>
+            accessSync(filePath, mode)
+        ),
+        lstatSync: jest.fn((filePath: string) => lstatSync(filePath)),
+        readFileSync: jest.fn((filePath: string) => readFileSync(filePath)),
+        readdirSync: jest.fn((filePath: string) => readdirSync(filePath)),
+    };
+    const context: RuntimeTestContext = {
+        rootDir,
+        spawnRuntimeProbe,
+        writeRuntimeProbeStderr,
+        fileSystem,
+        createProbe(
+            overrides: Partial<EmbeddedMpvFrameCopyRuntimeDependencies> = {}
+        ) {
+            return createEmbeddedMpvFrameCopyRuntimeProbe({
+                platform: 'linux',
+                arch: 'x64',
+                env: {
+                    PATH: '/usr/bin',
+                    LD_AUDIT: '/tmp/audit.so',
+                    LD_LIBRARY_PATH: '/ambient/libs',
+                    LD_PRELOAD: '/tmp/inject.so',
+                },
+                fileSystem: context.fileSystem,
+                spawnSync: context.spawnRuntimeProbe as typeof spawnSync,
+                writeStderr: context.writeRuntimeProbeStderr,
+                ...overrides,
+            });
+        },
+        dispose() {
+            rmSync(context.rootDir, { recursive: true, force: true });
+        },
+    };
+    return context;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime.spec-data.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime.spec-data.ts
new file mode 100644
index 000000000..81623319a
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/runtime.spec-data.ts
@@ -0,0 +1,179 @@
+export const SUCCESS_OUTPUT =
+    '{"protocol":1,"usable":true,"libmpv":"2.3","renderApi":"egl"}\n';
+
+export const EXTERNAL_SYSTEM_LIBRARIES = [
+    {
+        name: 'libEGL.so.1',
+        interface: 'EGL',
+        reason: 'System graphics-driver interface used by the frame-copy helper.',
+    },
+    {
+        name: 'libGL.so.1',
+        interface: 'OpenGL',
+        reason: 'System OpenGL compatibility interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libGLX.so.0',
+        interface: 'OpenGL',
+        reason: 'GLVND OpenGL dispatch interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libOpenGL.so.0',
+        interface: 'OpenGL',
+        reason: 'GLVND OpenGL interface supplied by the graphics stack.',
+    },
+    {
+        name: 'libasound.so.2',
+        interface: 'ALSA',
+        reason: 'Linux system audio interface intentionally used by libmpv.',
+    },
+    {
+        name: 'libdrm.so.2',
+        interface: 'DRM',
+        reason: 'Kernel graphics interface used by system GBM and VA-API drivers.',
+    },
+    {
+        name: 'libgbm.so.1',
+        interface: 'GBM',
+        reason: 'System graphics-buffer interface used by headless EGL rendering.',
+    },
+    {
+        name: 'libpulse.so.0',
+        interface: 'PulseAudio',
+        reason: 'Linux desktop audio interface intentionally used by libmpv.',
+    },
+    {
+        name: 'libva-drm.so.2',
+        interface: 'VA-API DRM',
+        reason: 'System VA-API DRM interface used for hardware decoding.',
+    },
+    {
+        name: 'libva.so.2',
+        interface: 'VA-API',
+        reason: 'System video-acceleration interface used for hardware decoding.',
+    },
+];
+
+export const PINNED_SOURCE_PACKAGE_IDENTITIES = {
+    freetype: {
+        version: '2.13.3',
+        sourceUrl:
+            'https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz',
+        sourceSha256:
+            '0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289',
+        license: 'FreeType License (FTL)',
+    },
+    fribidi: {
+        version: '1.0.16',
+        sourceUrl:
+            'https://github.com/fribidi/fribidi/releases/download/v1.0.16/fribidi-1.0.16.tar.xz',
+        sourceSha256:
+            '1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c',
+        license: 'LGPL-2.1-or-later',
+    },
+    harfbuzz: {
+        version: '8.5.0',
+        sourceUrl:
+            'https://github.com/harfbuzz/harfbuzz/releases/download/8.5.0/harfbuzz-8.5.0.tar.xz',
+        sourceSha256:
+            '77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27',
+        license: 'MIT',
+    },
+    expat: {
+        version: '2.8.2',
+        sourceUrl:
+            'https://github.com/libexpat/libexpat/releases/download/R_2_8_2/expat-2.8.2.tar.xz',
+        sourceSha256:
+            '3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4',
+        license: 'MIT',
+    },
+    fontconfig: {
+        version: '2.16.0',
+        sourceUrl:
+            'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz',
+        sourceSha256:
+            '6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220',
+        license: 'MIT',
+    },
+    libass: {
+        version: '0.17.3',
+        sourceUrl:
+            'https://github.com/libass/libass/releases/download/0.17.3/libass-0.17.3.tar.xz',
+        sourceSha256:
+            'eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959',
+        license: 'ISC',
+    },
+    openssl: {
+        version: '3.5.7',
+        sourceUrl:
+            'https://github.com/openssl/openssl/releases/download/openssl-3.5.7/openssl-3.5.7.tar.gz',
+        sourceSha256:
+            'a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8',
+        license: 'Apache-2.0',
+    },
+    ffmpeg: {
+        version: '8.1',
+        sourceUrl: 'https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz',
+        sourceSha256:
+            'b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a',
+        license: 'LGPL-2.1-or-later',
+    },
+    libplacebo: {
+        version: '7.360.1',
+        sourceUrl: 'https://github.com/haasn/libplacebo.git',
+        sourceTag: 'v7.360.1',
+        sourceGitCommit: 'cee9b076f2c63104ccfd497fa79c39a867293ec4',
+        sourceSubmodules: [
+            '450bd2232225d6c7728a4108055ac2e37cef6475 3rdparty/Vulkan-Headers',
+            '97b54ca9e75f5303507699d27c6b4f4efe4641a1 3rdparty/fast_float',
+            '73db193f853e2ee079bf3ca8a64aa2eaf6459043 3rdparty/glad',
+            '15206881c006c79667fe5154fe80c01c65410679 3rdparty/jinja',
+            '297fc8e356e6836a62087949245d09a28e9f1b13 3rdparty/markupsafe',
+            '242f35efa067a46c595645eeda7b1771ea1f83b1 demos/3rdparty/nuklear',
+        ],
+        license: 'LGPL-2.1-or-later',
+    },
+    hwdata: {
+        version: '0.409',
+        sourceUrl:
+            'https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.409.tar.gz',
+        sourceSha256:
+            '23006accc0f931dd5187d0307a57d0744e2b8feb85e73c37bc0f5229fb31eadd',
+        buildInput: {
+            consumer: 'libdisplay-info',
+            relativePath: 'pnp.ids',
+            purpose: 'PNP vendor lookup table compiled into libdisplay-info.',
+        },
+        license: 'GPL-2.0-or-later OR XFree86-1.0',
+    },
+    'libdisplay-info': {
+        version: '0.1.1',
+        sourceUrl:
+            'https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/libdisplay-info-0.1.1.tar.xz',
+        sourceSha256:
+            '0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60',
+        license: 'MIT',
+    },
+    mpv: {
+        version: '0.41.0',
+        sourceUrl:
+            'https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz',
+        sourceSha256:
+            'ee21092a5ee427353392360929dc64645c54479aefdb5babc5cfbb5fad626209',
+        license: 'LGPL-2.1-or-later with -Dgpl=false',
+    },
+};
+
+export interface RuntimeFile {
+    name: string;
+    size: number;
+    sha256: string;
+}
+
+export interface RuntimeFixture {
+    nativeDir: string;
+    helperPath: string;
+    manifestPath: string;
+    manifest: Record<string, unknown>;
+    runtimeContents: Record<string, Buffer>;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-policy.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-policy.spec.ts
new file mode 100644
index 000000000..6663bd4cd
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-policy.spec.ts
@@ -0,0 +1,150 @@
+import {
+    cloneManifest,
+    createFixture,
+    writeManifest,
+} from './runtime-fixtures.test-helpers';
+import {
+    createRuntimeTestContext,
+    type RuntimeTestContext,
+} from './runtime-harness.test-helpers';
+
+describe('embedded-mpv frame-copy source runtime policy', () => {
+    let context: RuntimeTestContext;
+
+    beforeEach(() => {
+        context = createRuntimeTestContext();
+    });
+
+    afterEach(() => {
+        context.dispose();
+    });
+
+    it.each([
+        {
+            label: 'pinned source identity',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.mpv.sourceSha256 = '0'.repeat(64);
+            },
+        },
+        {
+            label: 'pinned source URL',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.freetype.sourceUrl =
+                    'https://example.invalid/freetype.tar.xz';
+            },
+        },
+        {
+            label: 'pinned git tag',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.libplacebo.sourceTag = 'main';
+            },
+        },
+        {
+            label: 'pinned hwdata build input',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.hwdata.buildInput = {
+                    consumer: 'libdisplay-info',
+                    relativePath: '../pnp.ids',
+                    purpose:
+                        'PNP vendor lookup table compiled into libdisplay-info.',
+                };
+            },
+        },
+        {
+            label: 'git submodule record',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.libplacebo.sourceSubmodules = [
+                    `${'a'.repeat(40)} ../outside`,
+                ];
+            },
+        },
+        {
+            label: 'duplicate git submodule records',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                const record = `${'a'.repeat(40)} 3rdparty/example`;
+                packages.libplacebo.sourceSubmodules = [record, record];
+            },
+        },
+        {
+            label: 'unpinned git submodule commit',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const packages = sourceRuntime.packages as Record<
+                    string,
+                    Record<string, unknown>
+                >;
+                packages.libplacebo.sourceSubmodules = [
+                    `${'f'.repeat(40)} 3rdparty/Vulkan-Headers`,
+                    `${'e'.repeat(40)} 3rdparty/fast_float`,
+                ];
+            },
+        },
+        {
+            label: 'portable ABI baseline',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const runtimeAbi = sourceRuntime.runtimeAbi as {
+                    baseline: Record<string, unknown>;
+                };
+                runtimeAbi.baseline.glibcMaximum = '9.99';
+            },
+        },
+        {
+            label: 'source-distribution obligation',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                sourceRuntime.sourceDistribution = 'Sources available.';
+            },
+        },
+        {
+            label: 'FFmpeg LGPL flags',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const ffmpeg = sourceRuntime.ffmpeg as {
+                    configureFlags: string[];
+                };
+                ffmpeg.configureFlags = ['--disable-nonfree', '--enable-gpl'];
+            },
+        },
+        {
+            label: 'mpv LGPL flags',
+            mutate(sourceRuntime: Record<string, unknown>) {
+                const mpv = sourceRuntime.mpv as {
+                    mesonFlags: string[];
+                };
+                mpv.mesonFlags = ['-Dgpl=true', '-Dlibmpv=true'];
+            },
+        },
+    ])('rejects an invalid $label', ({ mutate }) => {
+        const fixture = createFixture(context.rootDir, 'portable');
+        const manifest = cloneManifest(fixture.manifest);
+        mutate(manifest.sourceRuntime as Record<string, unknown>);
+        writeManifest(fixture.manifestPath, manifest);
+
+        expect(context.createProbe()(fixture.helperPath)).toEqual({
+            usable: false,
+            reason: 'runtime-manifest-invalid',
+        });
+        expect(context.spawnRuntimeProbe).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-validator.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-validator.ts
new file mode 100644
index 000000000..ef5ad6c5f
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/source-runtime-validator.ts
@@ -0,0 +1,247 @@
+import path from 'path';
+import { isDeepStrictEqual } from 'util';
+import {
+    GIT_COMMIT_PATTERN,
+    PINNED_SOURCE_PACKAGE_IDENTITIES,
+    PORTABLE_ABI_BASELINE,
+    SUBMODULE_RECORD_PATTERN,
+    VERSION_PATTERN,
+} from './contracts';
+import type { RuntimeFile } from './types';
+import {
+    hasExactFields,
+    isObject,
+    isSafeRuntimeName,
+} from './validation-primitives';
+
+function compareDottedVersions(left: string, right: string): number {
+    const leftParts = left.split('.').map(Number);
+    const rightParts = right.split('.').map(Number);
+    const length = Math.max(leftParts.length, rightParts.length);
+    for (let index = 0; index < length; index += 1) {
+        const difference = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
+        if (difference !== 0) {
+            return difference;
+        }
+    }
+    return 0;
+}
+
+function validatesPinnedSourceIdentity(
+    candidate: unknown,
+    expected: (typeof PINNED_SOURCE_PACKAGE_IDENTITIES)[keyof typeof PINNED_SOURCE_PACKAGE_IDENTITIES]
+): boolean {
+    if (
+        !isObject(candidate) ||
+        candidate.version !== expected.version ||
+        candidate.sourceUrl !== expected.sourceUrl ||
+        candidate.license !== expected.license
+    ) {
+        return false;
+    }
+    if (
+        ('sourceTag' in expected
+            ? candidate.sourceTag !== expected.sourceTag
+            : candidate.sourceTag !== undefined) ||
+        ('buildInput' in expected
+            ? !isDeepStrictEqual(candidate.buildInput, expected.buildInput)
+            : candidate.buildInput !== undefined)
+    ) {
+        return false;
+    }
+    if ('sourceSha256' in expected) {
+        return (
+            candidate.sourceSha256 === expected.sourceSha256 &&
+            candidate.sourceGitCommit === undefined &&
+            candidate.sourceSubmodules === undefined
+        );
+    }
+    return (
+        'sourceSubmodules' in expected &&
+        candidate.sourceGitCommit === expected.sourceGitCommit &&
+        GIT_COMMIT_PATTERN.test(candidate.sourceGitCommit) &&
+        candidate.sourceSha256 === undefined &&
+        validatesGitSubmoduleRecords(candidate.sourceSubmodules) &&
+        isDeepStrictEqual(candidate.sourceSubmodules, expected.sourceSubmodules)
+    );
+}
+
+function validatesGitSubmoduleRecords(value: unknown): boolean {
+    if (
+        !Array.isArray(value) ||
+        value.length === 0 ||
+        new Set(value).size !== value.length
+    ) {
+        return false;
+    }
+    return value.every((record) => {
+        if (typeof record !== 'string') {
+            return false;
+        }
+        const match = record.match(SUBMODULE_RECORD_PATTERN);
+        if (!match) {
+            return false;
+        }
+        const submodulePath = match[1];
+        return (
+            !path.posix.isAbsolute(submodulePath) &&
+            !submodulePath
+                .split('/')
+                .some((segment) => segment === '.' || segment === '..')
+        );
+    });
+}
+
+function validateStringFlags(value: unknown): value is string[] {
+    return (
+        Array.isArray(value) &&
+        value.every(
+            (flag) =>
+                typeof flag === 'string' &&
+                flag.length > 0 &&
+                flag.trim() === flag
+        ) &&
+        new Set(value).size === value.length
+    );
+}
+
+function validateRuntimeAbi(
+    value: unknown,
+    runtimeFiles: RuntimeFile[]
+): boolean {
+    if (
+        !isObject(value) ||
+        !hasExactFields(value, ['baseline', 'files']) ||
+        !isDeepStrictEqual(value.baseline, PORTABLE_ABI_BASELINE) ||
+        !Array.isArray(value.files)
+    ) {
+        return false;
+    }
+
+    const abiFileNames: string[] = [];
+    for (const record of value.files) {
+        if (
+            !isObject(record) ||
+            !hasExactFields(record, [
+                'name',
+                'requiredGlibc',
+                'requiredGlibcxx',
+            ]) ||
+            !isSafeRuntimeName(record.name)
+        ) {
+            return false;
+        }
+        for (const [field, maximum] of [
+            ['requiredGlibc', PORTABLE_ABI_BASELINE.glibcMaximum],
+            ['requiredGlibcxx', PORTABLE_ABI_BASELINE.glibcxxMaximum],
+        ] as const) {
+            const version = record[field];
+            if (
+                version !== null &&
+                (typeof version !== 'string' ||
+                    !VERSION_PATTERN.test(version) ||
+                    compareDottedVersions(version, maximum) > 0)
+            ) {
+                return false;
+            }
+        }
+        abiFileNames.push(record.name);
+    }
+
+    return isDeepStrictEqual(
+        abiFileNames,
+        runtimeFiles.map(({ name }) => name)
+    );
+}
+
+/**
+ * The source builder and package verifier own exhaustive build-host, recipe,
+ * tool-version, URL and external-configuration validation. Startup repeats
+ * only the immutable policy boundary needed before sandbox relaxation:
+ * pinned source identities/licenses, LGPL flags, portable ABI, display-data
+ * distribution, and the exact runtime closure mirrored by the package.
+ */
+export function validateSourceRuntimePolicy(
+    value: unknown,
+    runtimeFiles: RuntimeFile[],
+    runtimeDependencyClosure: unknown,
+    externalSystemLibraries: unknown
+): boolean {
+    if (
+        !isObject(value) ||
+        value.schemaVersion !== 1 ||
+        value.origin !== 'vendored-lgpl-source-build' ||
+        value.platform !== 'linux' ||
+        value.arch !== 'x64' ||
+        !isObject(value.packages) ||
+        !isObject(value.ffmpeg) ||
+        !isObject(value.mpv) ||
+        !isDeepStrictEqual(
+            Object.keys(value.packages).sort(),
+            Object.keys(PINNED_SOURCE_PACKAGE_IDENTITIES).sort()
+        )
+    ) {
+        return false;
+    }
+
+    for (const [packageName, expectedIdentity] of Object.entries(
+        PINNED_SOURCE_PACKAGE_IDENTITIES
+    )) {
+        if (
+            !validatesPinnedSourceIdentity(
+                value.packages[packageName],
+                expectedIdentity
+            )
+        ) {
+            return false;
+        }
+    }
+
+    if (
+        !validatesPinnedSourceIdentity(
+            value.ffmpeg,
+            PINNED_SOURCE_PACKAGE_IDENTITIES.ffmpeg
+        ) ||
+        !validateStringFlags(value.ffmpeg.configureFlags) ||
+        !value.ffmpeg.configureFlags.includes('--disable-gpl') ||
+        !value.ffmpeg.configureFlags.includes('--disable-nonfree') ||
+        value.ffmpeg.configureFlags.includes('--enable-gpl') ||
+        value.ffmpeg.configureFlags.includes('--enable-nonfree') ||
+        !validatesPinnedSourceIdentity(
+            value.mpv,
+            PINNED_SOURCE_PACKAGE_IDENTITIES.mpv
+        ) ||
+        !validateStringFlags(value.mpv.mesonFlags) ||
+        !value.mpv.mesonFlags.includes('-Dgpl=false') ||
+        !value.mpv.mesonFlags.includes('-Dlibmpv=true') ||
+        value.mpv.mesonFlags.includes('-Dgpl=true')
+    ) {
+        return false;
+    }
+
+    if (
+        typeof value.sourceDistribution !== 'string' ||
+        !/\bhwdata\b/i.test(value.sourceDistribution) ||
+        !/\bpnp\.ids\b/i.test(value.sourceDistribution) ||
+        !/\blibdisplay-info\b/i.test(value.sourceDistribution) ||
+        value.runtimeTotalBytes !==
+            runtimeFiles.reduce(
+                (total, runtimeFile) => total + runtimeFile.size,
+                0
+            ) ||
+        !isDeepStrictEqual(value.runtimeFiles, runtimeFiles) ||
+        !isDeepStrictEqual(
+            value.runtimeDependencyClosure,
+            runtimeDependencyClosure
+        ) ||
+        !isDeepStrictEqual(
+            value.externalSystemLibraries,
+            externalSystemLibraries
+        ) ||
+        !validateRuntimeAbi(value.runtimeAbi, runtimeFiles)
+    ) {
+        return false;
+    }
+
+    return true;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/trusted-snap-root.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/trusted-snap-root.ts
new file mode 100644
index 000000000..c83432f38
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/trusted-snap-root.ts
@@ -0,0 +1,51 @@
+import path from 'path';
+
+const TRUSTED_SNAP_MOUNT_ROOTS = ['/snap', '/var/lib/snapd/snap'] as const;
+
+function isPathInside(
+    parentPath: string,
+    candidatePath: string,
+    allowEqual: boolean
+): boolean {
+    const relativePath = path.relative(parentPath, candidatePath);
+    if (relativePath === '') {
+        return allowEqual;
+    }
+    return (
+        relativePath !== '..' &&
+        !relativePath.startsWith(`..${path.sep}`) &&
+        !path.isAbsolute(relativePath)
+    );
+}
+
+export function resolveTrustedSnapRoot(
+    environment: NodeJS.ProcessEnv,
+    nativeDir: string
+): string | null {
+    const declaredSnapRoot = environment.SNAP;
+    if (
+        !declaredSnapRoot ||
+        !path.isAbsolute(declaredSnapRoot) ||
+        !path.isAbsolute(nativeDir)
+    ) {
+        return null;
+    }
+
+    const normalizedSnapRoot = path.resolve(declaredSnapRoot);
+    const resemblesReadOnlySnapMount = TRUSTED_SNAP_MOUNT_ROOTS.some(
+        (mountRoot) => {
+            const relativePath = path.relative(mountRoot, normalizedSnapRoot);
+            return (
+                isPathInside(mountRoot, normalizedSnapRoot, false) &&
+                relativePath.split(path.sep).filter(Boolean).length >= 2
+            );
+        }
+    );
+    if (
+        !resemblesReadOnlySnapMount ||
+        !isPathInside(normalizedSnapRoot, path.resolve(nativeDir), false)
+    ) {
+        return null;
+    }
+    return normalizedSnapRoot;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/types.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/types.ts
new file mode 100644
index 000000000..96240b24c
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/types.ts
@@ -0,0 +1,103 @@
+import type { spawnSync as nodeSpawnSync } from 'child_process';
+import type * as nodeFileSystem from 'fs';
+
+export const EMBEDDED_MPV_HELPER_RUNTIME_PROBE_FAILURE_REASONS = {
+    MPV_CREATE_FAILED: 'mpv-create-failed',
+    MPV_INITIALIZE_FAILED: 'mpv-initialize-failed',
+    GL_CONTEXT_CREATE_FAILED: 'gl-context-create-failed',
+    GL_CONTEXT_BIND_FAILED: 'gl-context-bind-failed',
+    MPV_RENDER_CONTEXT_FAILED: 'mpv-render-context-failed',
+    SHARED_MEMORY_CREATE_FAILED: 'shared-memory-create-failed',
+    SHARED_MEMORY_INITIALIZE_FAILED: 'shared-memory-initialize-failed',
+} as const;
+
+export type EmbeddedMpvHelperRuntimeProbeFailureReason =
+    (typeof EMBEDDED_MPV_HELPER_RUNTIME_PROBE_FAILURE_REASONS)[keyof typeof EMBEDDED_MPV_HELPER_RUNTIME_PROBE_FAILURE_REASONS];
+
+export type EmbeddedMpvFrameCopyRuntimeFailureReason =
+    | 'unsupported-platform'
+    | 'unsupported-architecture'
+    | 'runtime-manifest-missing'
+    | 'runtime-manifest-invalid'
+    | 'runtime-artifact-missing'
+    | 'runtime-artifact-invalid'
+    | 'runtime-library-directory-invalid'
+    | 'runtime-library-missing'
+    | 'runtime-library-undeclared'
+    | 'runtime-library-invalid'
+    | 'runtime-library-size-mismatch'
+    | 'runtime-library-hash-mismatch'
+    | 'snap-graphics-provider-unavailable'
+    | 'helper-probe-timeout'
+    | 'helper-probe-spawn-error'
+    | 'helper-probe-signaled'
+    | 'helper-probe-failed'
+    | 'helper-probe-invalid-output'
+    | 'helper-probe-protocol-mismatch'
+    | 'helper-probe-unusable'
+    | 'runtime-probe-internal-error';
+
+export type EmbeddedMpvFrameCopyManifestContract = 'packaged' | 'development';
+export type EmbeddedMpvFrameCopyRuntimeMode = 'system' | 'bundled';
+
+export type RuntimeProfile = 'system' | 'portable' | 'flatpak';
+export type RuntimeProbeProfile = RuntimeProfile | 'development';
+
+export type EmbeddedMpvFrameCopyRuntimeResult =
+    | {
+          usable: true;
+          profile: RuntimeProbeProfile;
+          runtimeMode: EmbeddedMpvFrameCopyRuntimeMode;
+          libmpv: string;
+          renderApi: 'egl';
+      }
+    | {
+          usable: false;
+          reason: EmbeddedMpvFrameCopyRuntimeFailureReason;
+          helperReason?: EmbeddedMpvHelperRuntimeProbeFailureReason;
+          helperDetail?: string;
+      };
+
+export interface EmbeddedMpvFrameCopyRuntimeFileSystem {
+    accessSync(filePath: string, mode: number): void;
+    lstatSync(filePath: string): nodeFileSystem.Stats;
+    readFileSync(filePath: string): Buffer;
+    readdirSync(filePath: string): string[];
+}
+
+export interface EmbeddedMpvFrameCopyRuntimeDependencies {
+    platform: NodeJS.Platform;
+    arch: string;
+    env: NodeJS.ProcessEnv;
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem;
+    spawnSync: typeof nodeSpawnSync;
+    writeStderr(output: string): void;
+}
+
+export interface RuntimeFile {
+    name: string;
+    size: number;
+    sha256: string;
+}
+
+export interface ValidManifest {
+    profile: RuntimeProbeProfile;
+    runtimeMode: EmbeddedMpvFrameCopyRuntimeMode;
+    runtimeFiles: RuntimeFile[];
+}
+
+export interface ValidatedPackage {
+    manifest: ValidManifest;
+    helperPath: string;
+    nativeDir: string;
+}
+
+export interface ValidationSuccess<T> {
+    value: T;
+}
+
+export interface ValidationFailure {
+    reason: EmbeddedMpvFrameCopyRuntimeFailureReason;
+}
+
+export type ValidationResult<T> = ValidationSuccess<T> | ValidationFailure;
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/validation-primitives.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/validation-primitives.ts
new file mode 100644
index 000000000..68c252415
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/validation-primitives.ts
@@ -0,0 +1,162 @@
+import { createHash } from 'crypto';
+import type * as nodeFileSystem from 'fs';
+import path from 'path';
+import { isDeepStrictEqual } from 'util';
+import {
+    SAFE_RUNTIME_NAME_PATTERN,
+    SHA256_PATTERN,
+    SHARED_LIBRARY_PATTERN,
+} from './contracts';
+import type {
+    EmbeddedMpvFrameCopyRuntimeFailureReason,
+    EmbeddedMpvFrameCopyRuntimeFileSystem,
+    EmbeddedMpvFrameCopyRuntimeResult,
+    RuntimeFile,
+    ValidationFailure,
+    ValidationResult,
+} from './types';
+
+export function failure(
+    reason: EmbeddedMpvFrameCopyRuntimeFailureReason
+): EmbeddedMpvFrameCopyRuntimeResult {
+    return { usable: false, reason };
+}
+
+export function validationFailure(
+    reason: EmbeddedMpvFrameCopyRuntimeFailureReason
+): ValidationFailure {
+    return { reason };
+}
+
+export function isValidationFailure<T>(
+    result: ValidationResult<T>
+): result is ValidationFailure {
+    return 'reason' in result;
+}
+
+export function isObject(value: unknown): value is Record<string, unknown> {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+export function hasExactFields(
+    value: Record<string, unknown>,
+    fields: readonly string[]
+): boolean {
+    return isDeepStrictEqual(Object.keys(value).sort(), [...fields].sort());
+}
+
+export function isSafeRuntimeName(value: unknown): value is string {
+    return (
+        typeof value === 'string' &&
+        value.length > 0 &&
+        value !== '.' &&
+        value !== '..' &&
+        path.basename(value) === value &&
+        !value.includes('/') &&
+        !value.includes('\\') &&
+        SAFE_RUNTIME_NAME_PATTERN.test(value) &&
+        SHARED_LIBRARY_PATTERN.test(value)
+    );
+}
+
+export function isMissingFileError(error: unknown): boolean {
+    return (
+        isObject(error) &&
+        typeof error.code === 'string' &&
+        (error.code === 'ENOENT' || error.code === 'ENOTDIR')
+    );
+}
+
+export function fileIdentity(
+    filePath: string,
+    stat: nodeFileSystem.Stats,
+    contents: Buffer
+): string {
+    return [
+        path.resolve(filePath),
+        stat.dev,
+        stat.ino,
+        stat.mode,
+        stat.size,
+        stat.mtimeMs,
+        stat.ctimeMs,
+        createHash('sha256').update(contents).digest('hex'),
+    ].join(':');
+}
+
+export function readManifest(
+    manifestPath: string,
+    fileSystem: EmbeddedMpvFrameCopyRuntimeFileSystem
+): ValidationResult<Record<string, unknown>> {
+    let contents: Buffer;
+    try {
+        contents = fileSystem.readFileSync(manifestPath);
+    } catch {
+        return validationFailure('runtime-manifest-invalid');
+    }
+
+    try {
+        const parsed: unknown = JSON.parse(contents.toString('utf8'));
+        return isObject(parsed)
+            ? { value: parsed }
+            : validationFailure('runtime-manifest-invalid');
+    } catch {
+        return validationFailure('runtime-manifest-invalid');
+    }
+}
+
+export function validateTargets(
+    targets: unknown,
+    allowedTargets: ReadonlySet<string>
+): boolean {
+    const expectedTargets = [...allowedTargets].sort();
+    if (
+        !Array.isArray(targets) ||
+        targets.length !== expectedTargets.length ||
+        targets.some(
+            (target) =>
+                typeof target !== 'string' ||
+                target.trim() !== target ||
+                target.toLowerCase() !== target ||
+                !allowedTargets.has(target)
+        )
+    ) {
+        return false;
+    }
+    return isDeepStrictEqual(targets, expectedTargets);
+}
+
+export function validateRuntimeFiles(value: unknown): RuntimeFile[] | null {
+    if (!Array.isArray(value) || value.length === 0) {
+        return null;
+    }
+
+    const runtimeFiles: RuntimeFile[] = [];
+    const names = new Set<string>();
+    for (const candidate of value) {
+        if (
+            !isObject(candidate) ||
+            !hasExactFields(candidate, ['name', 'sha256', 'size']) ||
+            !isSafeRuntimeName(candidate.name) ||
+            !Number.isSafeInteger(candidate.size) ||
+            (candidate.size as number) <= 0 ||
+            typeof candidate.sha256 !== 'string' ||
+            !SHA256_PATTERN.test(candidate.sha256) ||
+            names.has(candidate.name)
+        ) {
+            return null;
+        }
+        names.add(candidate.name);
+        runtimeFiles.push({
+            name: candidate.name,
+            size: candidate.size as number,
+            sha256: candidate.sha256,
+        });
+    }
+    return isDeepStrictEqual(
+        runtimeFiles.map(({ name }) => name).sort(),
+        runtimeFiles.map(({ name }) => name)
+    )
+        ? runtimeFiles
+        : null;
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-spawn.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-spawn.ts
new file mode 100644
index 000000000..d0480626f
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy-spawn.ts
@@ -0,0 +1,94 @@
+import { EmbeddedMpvBounds } from '@iptvnator/shared/interfaces';
+import { createLinuxFrameCopyHelperLaunch } from './embedded-mpv-frame-copy-runtime';
+import type {
+    EmbeddedMpvFrameCopyRuntimeMode,
+    LinuxFrameCopyHelperLaunchFileSystem,
+} from './embedded-mpv-frame-copy-runtime';
+
+/**
+ * Resolves how a frame-copy helper process is launched: the offscreen render
+ * size in device pixels, and — on Linux — the sanitized loader environment and
+ * graphics-provider wrapper the validated runtime requires.
+ */
+
+export interface FrameCopyHelperSpawnRequest {
+    bounds: EmbeddedMpvBounds;
+    environment?: NodeJS.ProcessEnv;
+    helperLaunchFileSystem?: LinuxFrameCopyHelperLaunchFileSystem;
+    helperPath: string;
+    initialVolume?: number;
+    resolveRuntimeMode: () => EmbeddedMpvFrameCopyRuntimeMode | null;
+    scale: number;
+    sessionId: string;
+}
+
+export interface FrameCopyHelperSpawnPlan {
+    args: string[];
+    command: string;
+    env?: NodeJS.ProcessEnv;
+    height: number;
+    width: number;
+}
+
+export function resolveFrameCopyHelperSpawn(
+    request: FrameCopyHelperSpawnRequest
+): FrameCopyHelperSpawnPlan {
+    const {
+        bounds,
+        environment,
+        helperLaunchFileSystem,
+        helperPath,
+        initialVolume,
+        resolveRuntimeMode,
+        scale,
+        sessionId,
+    } = request;
+
+    const width = Math.max(16, Math.round(bounds.width * scale));
+    const height = Math.max(16, Math.round(bounds.height * scale));
+    const helperArgs = [
+        '--shm-base',
+        `/${sessionId}`,
+        '--width',
+        String(width),
+        '--height',
+        String(height),
+        '--volume',
+        String(Math.min(Math.max(initialVolume ?? 1, 0), 1)),
+        // Lip-sync compensation for the video path's added latency
+        // (~10 ms measured on M1 Pro); tunable until calibration
+        // lands, see the architecture doc.
+        ...(process.env.IPTVNATOR_EMBEDDED_MPV_AUDIO_DELAY
+            ? ['--audio-delay', process.env.IPTVNATOR_EMBEDDED_MPV_AUDIO_DELAY]
+            : []),
+    ];
+
+    if (process.platform !== 'linux') {
+        return { args: helperArgs, command: helperPath, height, width };
+    }
+
+    const runtimeMode = resolveRuntimeMode();
+    if (!runtimeMode) {
+        throw new Error(
+            'A validated Linux frame-copy runtime is not available.'
+        );
+    }
+    const launch = createLinuxFrameCopyHelperLaunch({
+        environment: environment ?? process.env,
+        helperPath,
+        helperArgs,
+        runtimeMode,
+        fileSystem: helperLaunchFileSystem,
+    });
+    if (!launch.usable) {
+        throw new Error('The connected Snap graphics provider is not available.');
+    }
+
+    return {
+        args: launch.args,
+        command: launch.command,
+        env: launch.env,
+        height,
+        width,
+    };
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.linux-env.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.linux-env.spec.ts
new file mode 100644
index 000000000..b2b542a7f
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.linux-env.spec.ts
@@ -0,0 +1,295 @@
+import type { Stats } from 'fs';
+import path from 'path';
+
+const spawnMock = jest.fn();
+jest.mock('child_process', () => ({
+    spawn: (...args: unknown[]) => spawnMock(...args),
+}));
+
+import type { EmbeddedMpvFrameCopyAdapter } from './embedded-mpv-frame-copy.adapter';
+import {
+    createFrameCopyAdapter,
+    createFrameCopySession,
+    fakeStat,
+    FakeHelperProcess,
+    GRAPHICS_SELECTOR_ENVIRONMENT,
+    HOSTILE_LOADER_ENVIRONMENT,
+} from './embedded-mpv-frame-copy.adapter.test-helpers';
+
+/**
+ * The Linux side of session creation: probe/playback must share one sanitized
+ * loader environment, and a bundled Snap runtime must launch through the
+ * graphics provider wrapper with trusted GL roots ahead of generic Snap
+ * libraries. General adapter behavior lives in
+ * embedded-mpv-frame-copy.adapter.spec.ts.
+ */
+describe('EmbeddedMpvFrameCopyAdapter Linux loader environment', () => {
+    const originalPlatform = process.platform;
+    const originalArch = process.arch;
+    let child: FakeHelperProcess;
+    let adapter: EmbeddedMpvFrameCopyAdapter;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        child = new FakeHelperProcess();
+        spawnMock.mockReset();
+        spawnMock.mockReturnValue(child);
+        Object.defineProperty(process, 'platform', { value: 'linux' });
+        Object.defineProperty(process, 'arch', { value: 'x64' });
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+        Object.defineProperty(process, 'platform', { value: originalPlatform });
+        Object.defineProperty(process, 'arch', { value: originalArch });
+    });
+
+    const createSession = () => createFrameCopySession(adapter);
+
+    it('uses a sanitized system environment for the real helper session', () => {
+        ({ adapter } = createFrameCopyAdapter('/opt/iptvnator/native/helper', {
+            runtimeMode: 'system',
+            environment: {
+                PATH: '/usr/bin',
+                HOME: '/home/user',
+                ...HOSTILE_LOADER_ENVIRONMENT,
+                ...GRAPHICS_SELECTOR_ENVIRONMENT,
+            },
+        }));
+
+        createSession();
+
+        expect(spawnMock.mock.calls[0][2]).toEqual({
+            stdio: ['pipe', 'pipe', 'pipe'],
+            env: {
+                PATH: '/usr/bin',
+                HOME: '/home/user',
+                ...GRAPHICS_SELECTOR_ENVIRONMENT,
+            },
+        });
+    });
+
+    it('keeps trusted Snap GL roots ahead of generic Snap libraries for playback', () => {
+        const snapRoot = '/snap/iptvnator/42';
+        const nativeDir = path.join(
+            snapRoot,
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        ({ adapter } = createFrameCopyAdapter(path.join(nativeDir, 'helper'), {
+            runtimeMode: 'bundled',
+            helperLaunchFileSystem: {
+                lstatSync: (candidatePath) =>
+                    fakeStat(
+                        candidatePath.endsWith('/graphics')
+                            ? 'directory'
+                            : 'file'
+                    ) as Stats,
+                accessSync: () => undefined,
+            },
+            environment: {
+                PATH: '/snap/bin:/usr/bin',
+                SNAP: snapRoot,
+                SNAP_LIBRARY_PATH: '/var/lib/snapd/lib/gl:/tmp/hostile-gl',
+                SNAP_DESKTOP_ARCH_TRIPLET: 'hostile-linux-gnu',
+                SNAP_DESKTOP_RUNTIME: path.join(snapRoot, 'gnome-platform'),
+                GBM_BACKENDS_PATH: '/tmp/hostile-gbm',
+                LIBGL_DRIVERS_PATH: '/tmp/hostile-dri',
+                LIBVA_DRIVERS_PATH: '/tmp/hostile-va',
+                __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: '/tmp/hostile-egl-platform',
+                __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor',
+                VK_LAYER_PATH: '/tmp/hostile-vulkan',
+                XDG_CONFIG_HOME: '/tmp/hostile-xdg-config-home',
+                XDG_CONFIG_DIRS: '/tmp/hostile-xdg-config-dirs',
+                XDG_DATA_HOME: '/tmp/hostile-xdg-data-home',
+                XDG_DATA_DIRS: '/tmp/hostile-xdg-data-dirs',
+                ...HOSTILE_LOADER_ENVIRONMENT,
+                ...GRAPHICS_SELECTOR_ENVIRONMENT,
+            },
+        }));
+
+        createSession();
+
+        expect(spawnMock.mock.calls[0][0]).toBe(
+            path.join(
+                snapRoot,
+                'graphics',
+                'bin',
+                'graphics-core22-provider-wrapper'
+            )
+        );
+        expect(spawnMock.mock.calls[0][1][0]).toBe(
+            path.join(nativeDir, 'helper')
+        );
+        expect(spawnMock.mock.calls[0][2]).toEqual({
+            stdio: ['pipe', 'pipe', 'pipe'],
+            env: {
+                PATH: '/usr/sbin:/usr/bin:/sbin:/bin',
+                SNAP: snapRoot,
+                SNAP_LIBRARY_PATH: '/var/lib/snapd/lib/gl',
+                SNAP_ARCH: 'amd64',
+                SNAP_DESKTOP_ARCH_TRIPLET: 'x86_64-linux-gnu',
+                SNAP_DESKTOP_RUNTIME: path.join(snapRoot, 'gnome-platform'),
+                ...GRAPHICS_SELECTOR_ENVIRONMENT,
+                GBM_BACKENDS_PATH: [
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'gbm'
+                    ),
+                    '/var/lib/snapd/lib/gl/gbm',
+                ].join(':'),
+                LIBGL_DRIVERS_PATH: path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'dri'
+                ),
+                LIBVA_DRIVERS_PATH: path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'lib',
+                    'x86_64-linux-gnu',
+                    'dri'
+                ),
+                __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: path.join(
+                    snapRoot,
+                    'graphics',
+                    'usr',
+                    'share',
+                    'egl',
+                    'egl_external_platform.d'
+                ),
+                __EGL_VENDOR_LIBRARY_DIRS: [
+                    '/var/lib/snapd/lib/glvnd/egl_vendor.d',
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'share',
+                        'glvnd',
+                        'egl_vendor.d'
+                    ),
+                ].join(':'),
+                VK_LAYER_PATH: [
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'share',
+                        'vulkan',
+                        'implicit_layer.d'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'share',
+                        'vulkan',
+                        'explicit_layer.d'
+                    ),
+                ].join(':'),
+                XDG_CONFIG_HOME: path.join(snapRoot, 'etc', 'xdg'),
+                XDG_CONFIG_DIRS: [
+                    path.join(snapRoot, 'etc', 'xdg'),
+                    '/etc/xdg',
+                ].join(':'),
+                XDG_DATA_HOME: path.join(snapRoot, 'usr', 'share'),
+                XDG_DATA_DIRS: [
+                    path.join(snapRoot, 'graphics', 'usr', 'share'),
+                    path.join(snapRoot, 'gnome-platform', 'usr', 'share'),
+                    path.join(snapRoot, 'usr', 'share'),
+                    '/usr/share',
+                ].join(':'),
+                LD_LIBRARY_PATH: [
+                    path.join(nativeDir, 'lib'),
+                    '/var/lib/snapd/lib/gl',
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'graphics',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'vdpau'
+                    ),
+                    '/usr/lib/x86_64-linux-gnu',
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'lib',
+                        'x86_64-linux-gnu'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'mesa'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'mesa-egl'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'dri'
+                    ),
+                    path.join(
+                        snapRoot,
+                        'gnome-platform',
+                        'usr',
+                        'lib',
+                        'x86_64-linux-gnu',
+                        'pulseaudio'
+                    ),
+                    path.join(snapRoot, 'lib'),
+                    path.join(snapRoot, 'usr', 'lib'),
+                    path.join(snapRoot, 'lib', 'x86_64-linux-gnu'),
+                    path.join(snapRoot, 'usr', 'lib', 'x86_64-linux-gnu'),
+                ].join(':'),
+            },
+        });
+    });
+
+    it('refuses a Linux session without a validated runtime mode', () => {
+        ({ adapter } = createFrameCopyAdapter('/native/helper', {
+            runtimeMode: null,
+        }));
+
+        expect(() => createSession()).toThrow(
+            'validated Linux frame-copy runtime'
+        );
+        expect(spawnMock).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.spec.ts
new file mode 100644
index 000000000..0947fe4bb
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.spec.ts
@@ -0,0 +1,182 @@
+import path from 'path';
+
+const spawnMock = jest.fn();
+jest.mock('child_process', () => ({
+    spawn: (...args: unknown[]) => spawnMock(...args),
+}));
+
+import type { EmbeddedMpvFrameCopyAdapter } from './embedded-mpv-frame-copy.adapter';
+import {
+    createFrameCopyAdapter,
+    createFrameCopySession,
+    FakeHelperProcess,
+    type FrameSourceChange,
+} from './embedded-mpv-frame-copy.adapter.test-helpers';
+
+// The Linux loader-environment contract lives in
+// embedded-mpv-frame-copy.adapter.linux-env.spec.ts.
+describe('EmbeddedMpvFrameCopyAdapter', () => {
+    let child: FakeHelperProcess;
+    let frameSourceChanges: FrameSourceChange[];
+    let adapter: EmbeddedMpvFrameCopyAdapter;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        child = new FakeHelperProcess();
+        spawnMock.mockReset();
+        spawnMock.mockReturnValue(child);
+        ({ adapter, frameSourceChanges } = createFrameCopyAdapter());
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    const createSession = () => createFrameCopySession(adapter);
+
+    it('spawns the helper with device-pixel size and initial volume', () => {
+        const sessionId = createSession();
+        expect(sessionId).toMatch(/^impv-fc-/);
+        const [helperPath, args] = spawnMock.mock.calls[0];
+        expect(helperPath).toBe('/native/helper');
+        expect(args).toEqual([
+            '--shm-base',
+            `/${sessionId}`,
+            '--width',
+            '1280',
+            '--height',
+            '720',
+            '--volume',
+            '0.8',
+        ]);
+    });
+
+    it('caches helper snapshot events for getSessionSnapshot', () => {
+        const sessionId = createSession();
+        child.emitStdout({
+            event: 'snapshot',
+            status: 'playing',
+            positionSeconds: 12.5,
+            durationSeconds: 60,
+            volume: 0.8,
+            streamUrl: 'http://stream',
+            audioTracks: [],
+            selectedAudioTrackId: null,
+            subtitleTracks: [],
+            selectedSubtitleTrackId: null,
+            playbackSpeed: 1,
+            aspectOverride: 'no',
+            recording: { active: false },
+        });
+        const snapshot = adapter.getSessionSnapshot(sessionId);
+        expect(snapshot?.status).toBe('playing');
+        expect(snapshot?.positionSeconds).toBe(12.5);
+        expect(snapshot?.streamUrl).toBe('http://stream');
+    });
+
+    it('publishes shm generations through onFrameSourceChanged', () => {
+        const sessionId = createSession();
+        child.emitStdout({
+            event: 'shm',
+            name: `/${sessionId}-g1`,
+            width: 1280,
+            height: 720,
+            generation: 1,
+        });
+        expect(frameSourceChanges).toEqual([
+            { sessionId, shmName: `/${sessionId}-g1` },
+        ]);
+        // path.join output is host-specific; build the expectation the
+        // same way so the spec passes on Windows checkouts too.
+        expect(adapter.getFrameSource(sessionId)?.readerPath).toBe(
+            path.join('/native', 'embedded_mpv_frame_reader.node')
+        );
+    });
+
+    it('encodes loadfile options with percent-escaping', () => {
+        const sessionId = createSession();
+        adapter.loadPlayback(sessionId, {
+            streamUrl: 'http://host/live.m3u8',
+            title: 'Tab\there',
+            userAgent: 'UA 1.0',
+            startTime: 42,
+            headers: { 'X-Token': 'abc' },
+        });
+        const line = child.stdin.written.at(-1) ?? '';
+        expect(line.startsWith('load\turl=http://host/live.m3u8\t')).toBe(true);
+        expect(line).toContain('opt.force-media-title=Tab%09here');
+        expect(line).toContain('opt.user-agent=UA 1.0');
+        expect(line).toContain('opt.start=42');
+        expect(line).toContain('opt.http-header-fields=X-Token: abc');
+    });
+
+    it('scales bounds and ignores hidden/degenerate bounds', () => {
+        const sessionId = createSession();
+        adapter.setBounds(sessionId, { x: 0, y: 0, width: 800, height: 450 });
+        expect(child.stdin.written.at(-1)).toBe(
+            'size\twidth=1600\theight=900\n'
+        );
+        const writesBefore = child.stdin.written.length;
+        adapter.setBounds(sessionId, {
+            x: -10000,
+            y: -10000,
+            width: 1,
+            height: 1,
+        });
+        expect(child.stdin.written.length).toBe(writesBefore);
+    });
+
+    it('maps an unexpected helper exit to a session error', () => {
+        const sessionId = createSession();
+        child.exitCode = 1;
+        child.emit('exit', 1, null);
+        const snapshot = adapter.getSessionSnapshot(sessionId);
+        expect(snapshot?.status).toBe('error');
+        expect(snapshot?.error).toContain('exited unexpectedly');
+    });
+
+    it('disposes with quit and escalates to SIGTERM', () => {
+        const sessionId = createSession();
+        adapter.disposeSession(sessionId);
+        expect(child.stdin.written.at(-1)).toBe('quit\n');
+        expect(adapter.getSessionSnapshot(sessionId)).toBeNull();
+        child.exitCode = null; // helper ignored quit
+        jest.advanceTimersByTime(600);
+        expect(child.kill).toHaveBeenCalledWith('SIGTERM');
+    });
+
+    it('reports unsupported without a helper binary', () => {
+        const { adapter: withoutHelper } = createFrameCopyAdapter(null);
+        expect(withoutHelper.isSupported()).toBe(false);
+    });
+
+    describe('isSupported platform gate', () => {
+        const originalPlatform = process.platform;
+        const originalArch = process.arch;
+
+        afterEach(() => {
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            });
+            Object.defineProperty(process, 'arch', { value: originalArch });
+        });
+
+        it.each<[NodeJS.Platform, string, boolean]>([
+            ['darwin', 'arm64', true],
+            ['darwin', 'x64', false],
+            ['linux', 'x64', true],
+            ['linux', 'arm64', false],
+            ['win32', 'x64', true],
+            ['freebsd', 'x64', false],
+        ])(
+            'on %s/%s with a helper binary present -> %s',
+            (platform, arch, expected) => {
+                Object.defineProperty(process, 'platform', {
+                    value: platform,
+                });
+                Object.defineProperty(process, 'arch', { value: arch });
+                expect(adapter.isSupported()).toBe(expected);
+            }
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.test-helpers.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.test-helpers.ts
new file mode 100644
index 000000000..128a612d3
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.test-helpers.ts
@@ -0,0 +1,144 @@
+import { EventEmitter } from 'events';
+import type { Stats } from 'fs';
+import { EmbeddedMpvFrameCopyAdapter } from './embedded-mpv-frame-copy.adapter';
+import type { EmbeddedMpvFrameCopyRuntimeMode } from './embedded-mpv-frame-copy-runtime';
+
+/**
+ * Shared fixtures for the frame-copy adapter specs. The `child_process` spawn
+ * mock stays in each spec file (it must be registered before the adapter is
+ * imported), and is handed to `createFrameCopyAdapter` via the spec's own
+ * `beforeEach`.
+ */
+
+/**
+ * Every loader/shell override the sanitized helper environment must strip.
+ * Kept in one place so both specs assert against the same hostile input.
+ */
+export const HOSTILE_LOADER_ENVIRONMENT = {
+    BASH_ENV: '/tmp/hostile-bash-env',
+    ENV: '/tmp/hostile-shell-env',
+    BASHOPTS: 'extdebug',
+    SHELLOPTS: 'xtrace',
+    PS4: '$(/tmp/hostile-trace-hook)',
+    BASH_XTRACEFD: '9',
+    CDPATH: '/tmp/hostile-cdpath',
+    'BASH_FUNC_dirname%%': '() { printf /tmp/hostile-provider-root; exit 0; }',
+    LD_AUDIT: '/tmp/audit.so',
+    LD_LIBRARY_PATH: '/tmp/hostile-libs',
+    LD_ORIGIN_PATH: '/tmp/hostile-origin',
+    LD_PRELOAD: '/tmp/inject.so',
+    __EGL_VENDOR_LIBRARY_FILENAMES: '/tmp/hostile-egl-vendor.json',
+    __EGL_VENDOR_LIBRARY_DIRS: '/tmp/hostile-egl-vendor-dir',
+    __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: '/tmp/hostile-egl-platform',
+    __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES: '/tmp/hostile-egl-platform.json',
+    GBM_BACKEND: '../../../../../tmp/hostile-gbm',
+    GBM_BACKENDS_PATH: '/tmp/hostile-gbm-path',
+    LIBGL_DRIVERS_PATH: '/tmp/hostile-dri-path',
+    MESA_LOADER_DRIVER_OVERRIDE: '../../../../../tmp/hostile-dri',
+    LIBVA_DRIVER_NAME: '../../../../../tmp/hostile-va',
+    LIBVA_DRIVERS_PATH: '/tmp/hostile-va-path',
+    VDPAU_DRIVER_PATH: '/tmp/hostile-vdpau',
+    VK_DRIVER_FILES: '/tmp/hostile-vulkan-driver.json',
+    VK_ICD_FILENAMES: '/tmp/hostile-vulkan-icd.json',
+    VK_ADD_DRIVER_FILES: '/tmp/hostile-vulkan-add-driver.json',
+    VK_ADD_LAYER_PATH: '/tmp/hostile-vulkan-layers',
+    VK_IMPLICIT_LAYER_PATH: '/tmp/hostile-vulkan-implicit-layers',
+    VK_ADD_IMPLICIT_LAYER_PATH: '/tmp/hostile-vulkan-add-implicit-layers',
+    VK_LAYER_PATH: '/tmp/hostile-vulkan-layer-path',
+} as const;
+
+/** Selectors that must survive sanitization (CI uses them for llvmpipe). */
+export const GRAPHICS_SELECTOR_ENVIRONMENT = {
+    LIBGL_ALWAYS_SOFTWARE: '1',
+    GALLIUM_DRIVER: 'llvmpipe',
+} as const;
+
+export function fakeStat(
+    kind: 'directory' | 'file'
+): Pick<Stats, 'isDirectory' | 'isFile' | 'isSymbolicLink'> {
+    return {
+        isDirectory: () => kind === 'directory',
+        isFile: () => kind === 'file',
+        isSymbolicLink: () => false,
+    };
+}
+
+export class FakeHelperProcess extends EventEmitter {
+    exitCode: number | null = null;
+    readonly stdout = new EventEmitter();
+    readonly stderr = new EventEmitter();
+    readonly stdin = {
+        writable: true,
+        written: [] as string[],
+        write(line: string) {
+            this.written.push(line);
+            return true;
+        },
+    };
+    readonly kill = jest.fn((signal?: string) => {
+        this.exitCode = 0;
+        this.emit('exit', 0, signal ?? null);
+        return true;
+    });
+
+    emitStdout(payload: object): void {
+        this.stdout.emit('data', Buffer.from(`${JSON.stringify(payload)}\n`));
+    }
+}
+
+export interface CreateFrameCopyAdapterOptions {
+    runtimeMode?: EmbeddedMpvFrameCopyRuntimeMode | null;
+    environment?: NodeJS.ProcessEnv;
+    helperLaunchFileSystem?: {
+        lstatSync(filePath: string): Stats;
+        accessSync(filePath: string, mode: number): void;
+    };
+}
+
+export interface FrameSourceChange {
+    sessionId: string;
+    shmName: string;
+}
+
+/**
+ * Build an adapter plus the list that records its frame-source callbacks.
+ * `getScaleFactor` is fixed at 2 so specs can assert device-pixel maths.
+ */
+export function createFrameCopyAdapter(
+    helperPath: string | null = '/native/helper',
+    {
+        runtimeMode = 'system',
+        environment,
+        helperLaunchFileSystem,
+    }: CreateFrameCopyAdapterOptions = {}
+): {
+    adapter: EmbeddedMpvFrameCopyAdapter;
+    frameSourceChanges: FrameSourceChange[];
+} {
+    const frameSourceChanges: FrameSourceChange[] = [];
+    const adapter = new EmbeddedMpvFrameCopyAdapter({
+        resolveHelperPath: () => helperPath,
+        resolveRuntimeMode: () => runtimeMode,
+        environment,
+        helperLaunchFileSystem,
+        getScaleFactor: () => 2,
+        onFrameSourceChanged: (sessionId, source) =>
+            frameSourceChanges.push({
+                sessionId,
+                shmName: source.shmName,
+            }),
+    } as ConstructorParameters<typeof EmbeddedMpvFrameCopyAdapter>[0]);
+    return { adapter, frameSourceChanges };
+}
+
+/** The standard 640x360 session every spec opens. */
+export function createFrameCopySession(
+    adapter: EmbeddedMpvFrameCopyAdapter
+): string {
+    return adapter.createSession(
+        Buffer.alloc(0),
+        { x: 0, y: 0, width: 640, height: 360 },
+        'Title',
+        0.8
+    );
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts
new file mode 100644
index 000000000..b16331b8d
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts
@@ -0,0 +1,298 @@
+import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
+import { randomUUID } from 'crypto';
+import path from 'path';
+import {
+    EmbeddedMpvBounds,
+    EmbeddedMpvFrameSource,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { isFrameCopyPlatformSupported } from './embedded-mpv-frame-copy-platform.util';
+import {
+    applyHelperEvent,
+    buildLoadPlaybackCommand,
+    createInitialSnapshot,
+    encodeProtocolValue,
+} from './embedded-mpv-frame-copy-protocol';
+import { resolveFrameCopyHelperSpawn } from './embedded-mpv-frame-copy-spawn';
+import type {
+    EmbeddedMpvFrameCopyRuntimeMode,
+    LinuxFrameCopyHelperLaunchFileSystem,
+} from './embedded-mpv-frame-copy-runtime';
+import type {
+    NativeEmbeddedMpvAddon,
+    NativeEmbeddedMpvSessionSnapshot,
+} from './embedded-mpv-native.service';
+
+/**
+ * Frame-copy engine adapter: implements the same surface as the native
+ * embedded MPV addon, but backed by a per-session `iptvnator_mpv_helper`
+ * process. The helper owns libmpv (decode, offscreen render at viewport
+ * size, audio) and publishes BGRA frames into a shared-memory ring that the
+ * preload frame pump uploads to a renderer canvas.
+ *
+ * The wire protocol lives in `embedded-mpv-frame-copy-protocol.ts` and the
+ * launch/environment rules in `embedded-mpv-frame-copy-spawn.ts`, so this
+ * class is mostly a process-lifecycle wrapper plus a snapshot cache that the
+ * existing EmbeddedMpvNativeService polling consumes unchanged.
+ */
+
+export interface EmbeddedMpvFrameCopyAdapterOptions {
+    resolveHelperPath: () => string | null;
+    resolveRuntimeMode: () => EmbeddedMpvFrameCopyRuntimeMode | null;
+    environment?: NodeJS.ProcessEnv;
+    helperLaunchFileSystem?: LinuxFrameCopyHelperLaunchFileSystem;
+    getScaleFactor: () => number;
+    onFrameSourceChanged: (
+        sessionId: string,
+        source: EmbeddedMpvFrameSource
+    ) => void;
+}
+
+interface FrameCopyRuntimeSession {
+    id: string;
+    child: ChildProcessWithoutNullStreams;
+    snapshot: NativeEmbeddedMpvSessionSnapshot;
+    frameSource: EmbeddedMpvFrameSource | null;
+    stdoutBuffer: string;
+    disposed: boolean;
+    killTimers: NodeJS.Timeout[];
+}
+
+const HELPER_QUIT_GRACE_MS = 500;
+const HELPER_KILL_GRACE_MS = 2000;
+
+export class EmbeddedMpvFrameCopyAdapter implements NativeEmbeddedMpvAddon {
+    private readonly sessions = new Map<string, FrameCopyRuntimeSession>();
+
+    constructor(private readonly options: EmbeddedMpvFrameCopyAdapterOptions) {}
+
+    isSupported(): boolean {
+        if (
+            !isFrameCopyPlatformSupported() ||
+            this.options.resolveHelperPath() === null
+        ) {
+            return false;
+        }
+        return (
+            process.platform !== 'linux' ||
+            this.options.resolveRuntimeMode() !== null
+        );
+    }
+
+    createSession(
+        _windowHandle: Buffer,
+        bounds: EmbeddedMpvBounds,
+        _title?: string,
+        initialVolume?: number
+    ): string {
+        const helperPath = this.options.resolveHelperPath();
+        if (!helperPath) {
+            throw new Error(
+                'The frame-copy embedded MPV helper binary was not found.'
+            );
+        }
+
+        const sessionId = `impv-fc-${randomUUID().slice(0, 8)}`;
+        const plan = resolveFrameCopyHelperSpawn({
+            bounds,
+            environment: this.options.environment,
+            helperLaunchFileSystem: this.options.helperLaunchFileSystem,
+            helperPath,
+            initialVolume,
+            resolveRuntimeMode: this.options.resolveRuntimeMode,
+            scale: this.options.getScaleFactor(),
+            sessionId,
+        });
+
+        const child = spawn(plan.command, plan.args, {
+            stdio: ['pipe', 'pipe', 'pipe'],
+            ...(plan.env ? { env: plan.env } : {}),
+        });
+
+        console.log(
+            `[embedded-mpv-fc][${sessionId}] spawn ${plan.width}x${plan.height} (pid pending)`
+        );
+        const session: FrameCopyRuntimeSession = {
+            id: sessionId,
+            child,
+            snapshot: createInitialSnapshot(),
+            frameSource: null,
+            stdoutBuffer: '',
+            disposed: false,
+            killTimers: [],
+        };
+        this.sessions.set(sessionId, session);
+
+        child.stdout.on('data', (chunk: Buffer) =>
+            this.consumeStdout(session, chunk)
+        );
+        child.stderr.on('data', (chunk: Buffer) => {
+            console.error(
+                `[embedded-mpv-fc][${sessionId}] ${chunk.toString().trim()}`
+            );
+        });
+        child.on('error', (error) => {
+            session.snapshot.status = 'error';
+            session.snapshot.error = `Helper process failed: ${error.message}`;
+        });
+        child.on('exit', (code, signal) => {
+            console.log(
+                `[embedded-mpv-fc][${sessionId}] exit code=${code} signal=${signal} disposed=${session.disposed}`
+            );
+            session.killTimers.forEach((timer) => clearTimeout(timer));
+            session.killTimers = [];
+            if (session.disposed) {
+                session.snapshot.status = 'closed';
+                return;
+            }
+            // An unexpected helper death must surface as a session error so
+            // the renderer can fall back — never crash the main process.
+            session.snapshot.status = 'error';
+            session.snapshot.error = `The embedded MPV helper exited unexpectedly (${
+                signal ?? code ?? 'unknown'
+            }).`;
+        });
+
+        return sessionId;
+    }
+
+    loadPlayback(sessionId: string, playback: ResolvedPortalPlayback): void {
+        this.send(sessionId, buildLoadPlaybackCommand(playback));
+    }
+
+    setBounds(sessionId: string, bounds: EmbeddedMpvBounds): void {
+        const scale = this.options.getScaleFactor();
+        const width = Math.round(bounds.width * scale);
+        const height = Math.round(bounds.height * scale);
+        if (width < 16 || height < 16) {
+            // Off-screen/hidden bounds are meaningless for a DOM canvas
+            // engine; the video keeps rendering at its last real size.
+            return;
+        }
+        this.send(sessionId, `size\twidth=${width}\theight=${height}`);
+    }
+
+    setPaused(sessionId: string, paused: boolean): void {
+        this.send(sessionId, `pause\tvalue=${paused ? 1 : 0}`);
+    }
+
+    seek(sessionId: string, seconds: number): void {
+        this.send(sessionId, `seek\tseconds=${seconds}`);
+    }
+
+    setVolume(sessionId: string, volume: number): void {
+        this.send(sessionId, `volume\tvalue=${volume}`);
+    }
+
+    setAudioTrack(sessionId: string, trackId: number): void {
+        this.send(sessionId, `aid\tvalue=${trackId}`);
+    }
+
+    setSubtitleTrack(sessionId: string, trackId: number): void {
+        this.send(sessionId, `sid\tvalue=${trackId}`);
+    }
+
+    setSpeed(sessionId: string, speed: number): void {
+        this.send(sessionId, `speed\tvalue=${speed}`);
+    }
+
+    setAspect(sessionId: string, aspect: string): void {
+        this.send(sessionId, `aspect\tvalue=${encodeProtocolValue(aspect)}`);
+    }
+
+    startRecording(sessionId: string, targetPath: string): void {
+        this.send(sessionId, `record\tpath=${encodeProtocolValue(targetPath)}`);
+    }
+
+    stopRecording(sessionId: string): void {
+        this.send(sessionId, 'record\tpath=');
+    }
+
+    getSessionSnapshot(
+        sessionId: string
+    ): NativeEmbeddedMpvSessionSnapshot | null {
+        const session = this.sessions.get(sessionId);
+        return session ? { ...session.snapshot } : null;
+    }
+
+    getFrameSource(sessionId: string): EmbeddedMpvFrameSource | null {
+        return this.sessions.get(sessionId)?.frameSource ?? null;
+    }
+
+    disposeSession(sessionId: string): void {
+        const session = this.sessions.get(sessionId);
+        if (!session) {
+            return;
+        }
+        session.disposed = true;
+        console.log(`[embedded-mpv-fc][${sessionId}] dispose`);
+        this.send(sessionId, 'quit');
+        const child = session.child;
+        // Belt and braces: the helper also exits on stdin EOF, so closing
+        // the pipe covers a helper that missed the quit line.
+        try {
+            child.stdin.end();
+        } catch {
+            // stdin may already be destroyed with the process
+        }
+        session.killTimers.push(
+            setTimeout(() => {
+                if (child.exitCode === null) child.kill('SIGTERM');
+            }, HELPER_QUIT_GRACE_MS),
+            setTimeout(() => {
+                if (child.exitCode === null) child.kill('SIGKILL');
+            }, HELPER_KILL_GRACE_MS)
+        );
+        this.sessions.delete(sessionId);
+    }
+
+    private send(sessionId: string, line: string): void {
+        const session = this.sessions.get(sessionId);
+        if (!session) {
+            throw new Error(
+                `Embedded MPV frame-copy session "${sessionId}" was not found.`
+            );
+        }
+        if (session.child.exitCode !== null || !session.child.stdin.writable) {
+            return;
+        }
+        session.child.stdin.write(`${line}\n`);
+    }
+
+    private consumeStdout(
+        session: FrameCopyRuntimeSession,
+        chunk: Buffer
+    ): void {
+        session.stdoutBuffer += chunk.toString('utf8');
+        let newlineIndex = session.stdoutBuffer.indexOf('\n');
+        while (newlineIndex >= 0) {
+            const line = session.stdoutBuffer.slice(0, newlineIndex).trim();
+            session.stdoutBuffer = session.stdoutBuffer.slice(newlineIndex + 1);
+            newlineIndex = session.stdoutBuffer.indexOf('\n');
+            if (!line) continue;
+            try {
+                applyHelperEvent(session, JSON.parse(line), {
+                    resolveReaderPath: () => this.resolveReaderPath(),
+                    // Call through `this.options` so a callback that relies on
+                    // its own receiver keeps working, as it did inline.
+                    onFrameSourceChanged: (id, source) =>
+                        this.options.onFrameSourceChanged(id, source),
+                });
+            } catch {
+                console.error(
+                    `[embedded-mpv-fc][${session.id}] unparseable event: ${line}`
+                );
+            }
+        }
+    }
+
+    private resolveReaderPath(): string {
+        const helperPath = this.options.resolveHelperPath();
+        return helperPath
+            ? path.join(
+                  path.dirname(helperPath),
+                  'embedded_mpv_frame_reader.node'
+              )
+            : '';
+    }
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage-validation.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage-validation.spec.ts
new file mode 100644
index 000000000..de90ba8e8
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage-validation.spec.ts
@@ -0,0 +1,147 @@
+import { unlinkSync } from 'fs';
+import path from 'path';
+
+import {
+    cleanupTemporaryDirectories,
+    createArtifactFixture,
+    loadLinkageModule,
+    readelfDynamic,
+} from './embedded-mpv-linux-linkage.test-helpers';
+
+/**
+ * Artifact-level linkage validation: only the helper may link libmpv, and it
+ * must do so through `$ORIGIN/lib` with no RPATH. SONAME resolution and build
+ * mode inputs live in embedded-mpv-linux-linkage.spec.ts.
+ */
+describe('Linux Embedded MPV linkage validation', () => {
+    afterEach(() => {
+        cleanupTemporaryDirectories();
+    });
+
+    it('accepts only process-isolated Linux frame-copy linkage', () => {
+        const { validateLinuxFrameCopyLinkage } = loadLinkageModule();
+        const fixture = createArtifactFixture();
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: fixture.outputDir,
+                readDynamicSection: fixture.readDynamicSection,
+            })
+        ).not.toThrow();
+    });
+
+    it('rejects a helper linked to the wrong libmpv SONAME', () => {
+        const { validateLinuxFrameCopyLinkage } = loadLinkageModule();
+        const fixture = createArtifactFixture();
+
+        fixture.outputs.iptvnator_mpv_helper = readelfDynamic([
+            ['NEEDED', 'libmpv.so.3'],
+            ['RUNPATH', '$ORIGIN/lib'],
+        ]);
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: fixture.outputDir,
+                readDynamicSection: fixture.readDynamicSection,
+            })
+        ).toThrow(/helper.*DT_NEEDED must contain exactly libmpv\.so\.2/i);
+    });
+
+    it('rejects helper RPATH and any RUNPATH other than $ORIGIN/lib', () => {
+        const { validateLinuxFrameCopyLinkage } = loadLinkageModule();
+        const rpathFixture = createArtifactFixture();
+        rpathFixture.outputs.iptvnator_mpv_helper = readelfDynamic([
+            ['NEEDED', 'libmpv.so.2'],
+            ['RPATH', '/host/lib'],
+            ['RUNPATH', '$ORIGIN/lib'],
+        ]);
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: rpathFixture.outputDir,
+                readDynamicSection: rpathFixture.readDynamicSection,
+            })
+        ).toThrow(/helper must not contain RPATH/i);
+
+        const runpathFixture = createArtifactFixture();
+        runpathFixture.outputs.iptvnator_mpv_helper = readelfDynamic([
+            ['NEEDED', 'libmpv.so.2'],
+            ['RUNPATH', '$ORIGIN'],
+        ]);
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: runpathFixture.outputDir,
+                readDynamicSection: runpathFixture.readDynamicSection,
+            })
+        ).toThrow(/helper RUNPATH must be exactly \$ORIGIN\/lib/i);
+    });
+
+    it.each([
+        ['embedded_mpv.node', 'addon'],
+        ['embedded_mpv_frame_reader.node', 'frame reader'],
+    ])('rejects Electron-side libmpv linkage from %s', (fileName, label) => {
+        const { validateLinuxFrameCopyLinkage } = loadLinkageModule();
+        const fixture = createArtifactFixture();
+        fixture.outputs[fileName] = readelfDynamic([['NEEDED', 'libmpv.so.2']]);
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: fixture.outputDir,
+                readDynamicSection: fixture.readDynamicSection,
+            })
+        ).toThrow(new RegExp(`${label} must not have a direct libmpv`, 'i'));
+    });
+
+    it('rejects missing artifacts and readelf failures', () => {
+        const { validateLinuxFrameCopyLinkage } = loadLinkageModule();
+        const missingArtifactFixture = createArtifactFixture();
+        unlinkSync(
+            path.join(
+                missingArtifactFixture.outputDir,
+                'embedded_mpv_frame_reader.node'
+            )
+        );
+
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: missingArtifactFixture.outputDir,
+                readDynamicSection: missingArtifactFixture.readDynamicSection,
+            })
+        ).toThrow(/missing.*frame reader/i);
+
+        const readelfFailureFixture = createArtifactFixture();
+        expect(() =>
+            validateLinuxFrameCopyLinkage({
+                expectedLibmpvSoname: 'libmpv.so.2',
+                outputDir: readelfFailureFixture.outputDir,
+                readDynamicSection: () => {
+                    throw new Error('readelf is unavailable');
+                },
+            })
+        ).toThrow(/readelf is unavailable/);
+    });
+
+    it('runs cleanup before rethrowing the original transaction failure', () => {
+        const { runWithCleanup } = loadLinkageModule();
+        const calls: string[] = [];
+        const failure = new Error('post-link validation failed');
+
+        expect(() =>
+            runWithCleanup(
+                () => {
+                    calls.push('operation');
+                    throw failure;
+                },
+                () => calls.push('cleanup')
+            )
+        ).toThrow(failure);
+        expect(calls).toEqual(['operation', 'cleanup']);
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.spec.ts
new file mode 100644
index 000000000..12e71dc5d
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.spec.ts
@@ -0,0 +1,251 @@
+import { symlinkSync, unlinkSync, writeFileSync } from 'fs';
+import path from 'path';
+
+import {
+    cleanupTemporaryDirectories,
+    createSonameFixture,
+    loadLinkageModule,
+    readelfDynamic,
+} from './embedded-mpv-linux-linkage.test-helpers';
+
+/**
+ * SONAME resolution and build-mode linker inputs. The artifact-level linkage
+ * checks live in embedded-mpv-linux-linkage-validation.spec.ts.
+ */
+describe('Linux Embedded MPV linkage resolution', () => {
+    afterEach(() => {
+        cleanupTemporaryDirectories();
+    });
+
+    it('parses every dynamic tag without hiding duplicate SONAME entries', () => {
+        const { parseReadelfDynamic } = loadLinkageModule();
+
+        expect(
+            parseReadelfDynamic(
+                readelfDynamic([
+                    ['NEEDED', 'libmpv.so.2'],
+                    ['RPATH', '/forbidden'],
+                    ['RUNPATH', '$ORIGIN/lib'],
+                    ['SONAME', 'libmpv.so.2'],
+                    ['SONAME', 'libmpv.so.3'],
+                ])
+            )
+        ).toEqual({
+            needed: ['libmpv.so.2'],
+            rpath: ['/forbidden'],
+            runpath: ['$ORIGIN/lib'],
+            soname: ['libmpv.so.2', 'libmpv.so.3'],
+        });
+    });
+
+    it('resolves the exact libmpv SONAME from closure metadata and verified copied files', () => {
+        const { resolveVerifiedLinuxLibMpvSoname } = loadLinkageModule();
+        const fixture = createSonameFixture();
+
+        expect(
+            resolveVerifiedLinuxLibMpvSoname({
+                ...fixture,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.2']]),
+            })
+        ).toBe('libmpv.so.2');
+    });
+
+    it('rejects missing and ambiguous closure SONAME metadata', () => {
+        const { resolveVerifiedLinuxLibMpvSoname } = loadLinkageModule();
+        const missingFixture = createSonameFixture();
+        for (const entry of missingFixture.runtimeDependencyClosure.entries) {
+            entry.soname = null;
+        }
+
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...missingFixture,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.2']]),
+            })
+        ).toThrow(/exactly one versioned libmpv SONAME/i);
+
+        const ambiguousFixture = createSonameFixture();
+        ambiguousFixture.runtimeDependencyClosure.entries.push({
+            name: 'libmpv.so.3',
+            needed: [],
+            rpath: [],
+            runpath: ['$ORIGIN'],
+            soname: 'libmpv.so.3',
+        });
+
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...ambiguousFixture,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.2']]),
+            })
+        ).toThrow(/exactly one versioned libmpv SONAME/i);
+    });
+
+    it('rejects missing, ambiguous, and mismatched DT_SONAME values', () => {
+        const { resolveVerifiedLinuxLibMpvSoname } = loadLinkageModule();
+        const fixture = createSonameFixture();
+
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...fixture,
+                readDynamicSection: () => readelfDynamic([]),
+            })
+        ).toThrow(/exactly one DT_SONAME/i);
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...fixture,
+                readDynamicSection: () =>
+                    readelfDynamic([
+                        ['SONAME', 'libmpv.so.2'],
+                        ['SONAME', 'libmpv.so.3'],
+                    ]),
+            })
+        ).toThrow(/exactly one DT_SONAME/i);
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...fixture,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.3']]),
+            })
+        ).toThrow(/does not match validated closure SONAME/i);
+    });
+
+    (process.platform === 'win32' ? it.skip : it)(
+        'rejects a symlinked copied linker input',
+        () => {
+            const { resolveVerifiedLinuxLibMpvSoname } = loadLinkageModule();
+            const fixture = createSonameFixture();
+            const aliasPath = path.join(fixture.outputLibDir, 'libmpv.so');
+            unlinkSync(aliasPath);
+            symlinkSync(path.basename(fixture.exactPath), aliasPath);
+
+            expect(() =>
+                resolveVerifiedLinuxLibMpvSoname({
+                    ...fixture,
+                    readDynamicSection: () =>
+                        readelfDynamic([['SONAME', 'libmpv.so.2']]),
+                })
+            ).toThrow(/must be a regular non-symbolic-link file/i);
+        }
+    );
+
+    it('rejects a missing exact runtime record and a mismatched exact file hash', () => {
+        const { resolveVerifiedLinuxLibMpvSoname } = loadLinkageModule();
+        const missingRecordFixture = createSonameFixture();
+
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...missingRecordFixture,
+                runtimeFiles: missingRecordFixture.runtimeFiles.filter(
+                    ({ name }) => name !== 'libmpv.so.2'
+                ),
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.2']]),
+            })
+        ).toThrow(/exact runtimeFiles record/i);
+
+        const mismatchedFileFixture = createSonameFixture();
+        writeFileSync(
+            mismatchedFileFixture.exactPath,
+            Buffer.from('tampered exact SONAME file')
+        );
+
+        expect(() =>
+            resolveVerifiedLinuxLibMpvSoname({
+                ...mismatchedFileFixture,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so.2']]),
+            })
+        ).toThrow(/size|SHA-256/i);
+    });
+
+    it('uses and identifies the unmanaged system libmpv only for system development', () => {
+        const { resolveLinuxFrameCopyLinkageInputs } = loadLinkageModule();
+        const readDynamicSection = jest.fn((filePath: string) => {
+            expect(filePath).toBe('/opt/libmpv/lib/libmpv.so');
+            return readelfDynamic([['SONAME', 'libmpv.so.2']]);
+        });
+
+        expect(
+            resolveLinuxFrameCopyLinkageInputs({
+                buildInputMode: 'system-dev',
+                outputLibDir: '/native/build/Release/lib',
+                packagedLibmpvSoname: null,
+                readDynamicSection,
+                runtimeLibDir: '/opt/libmpv/lib',
+            })
+        ).toEqual({
+            expectedLibmpvSoname: 'libmpv.so.2',
+            linkerLibraryDir: '/opt/libmpv/lib',
+        });
+        expect(readDynamicSection).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps bundled and untrusted build modes on the copied runtime directory', () => {
+        const { resolveLinuxFrameCopyLinkageInputs } = loadLinkageModule();
+        const readDynamicSection = jest.fn(() => {
+            throw new Error('must not inspect the ambient system runtime');
+        });
+
+        for (const buildInputMode of [
+            'bundled-runtime',
+            'system-build-inputs',
+            'unexpected-mode',
+        ]) {
+            expect(
+                resolveLinuxFrameCopyLinkageInputs({
+                    buildInputMode,
+                    outputLibDir: '/native/build/Release/lib',
+                    packagedLibmpvSoname:
+                        buildInputMode === 'bundled-runtime'
+                            ? 'libmpv.so.2'
+                            : null,
+                    readDynamicSection,
+                    runtimeLibDir: '/usr/lib/x86_64-linux-gnu',
+                })
+            ).toEqual({
+                expectedLibmpvSoname:
+                    buildInputMode === 'bundled-runtime' ? 'libmpv.so.2' : null,
+                linkerLibraryDir: '/native/build/Release/lib',
+            });
+        }
+        expect(readDynamicSection).not.toHaveBeenCalled();
+    });
+
+    it('rejects ambiguous or unversioned system-development libmpv identities', () => {
+        const { resolveLinuxFrameCopyLinkageInputs } = loadLinkageModule();
+        const options = {
+            buildInputMode: 'system-dev',
+            outputLibDir: '/native/build/Release/lib',
+            packagedLibmpvSoname: null,
+            runtimeLibDir: '/usr/lib/x86_64-linux-gnu',
+        };
+
+        expect(() =>
+            resolveLinuxFrameCopyLinkageInputs({
+                ...options,
+                readDynamicSection: () =>
+                    readelfDynamic([['SONAME', 'libmpv.so']]),
+            })
+        ).toThrow(/system-development.*exactly one versioned libmpv SONAME/i);
+        expect(() =>
+            resolveLinuxFrameCopyLinkageInputs({
+                ...options,
+                readDynamicSection: () => readelfDynamic([]),
+            })
+        ).toThrow(/system-development.*exactly one versioned libmpv SONAME/i);
+        expect(() =>
+            resolveLinuxFrameCopyLinkageInputs({
+                ...options,
+                readDynamicSection: () =>
+                    readelfDynamic([
+                        ['SONAME', 'libmpv.so.1'],
+                        ['SONAME', 'libmpv.so.2'],
+                    ]),
+            })
+        ).toThrow(/system-development.*exactly one versioned libmpv SONAME/i);
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.test-helpers.ts b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.test-helpers.ts
new file mode 100644
index 000000000..bd7d14045
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-linux-linkage.test-helpers.ts
@@ -0,0 +1,196 @@
+import {
+    existsSync,
+    mkdtempSync,
+    mkdirSync,
+    rmSync,
+    writeFileSync,
+} from 'fs';
+import { createHash } from 'crypto';
+import { createRequire } from 'module';
+import { tmpdir } from 'os';
+import path from 'path';
+
+/**
+ * Shared fixtures for the Linux frame-copy linkage specs. The module under
+ * test is the CommonJS build helper `embedded-mpv-linux-linkage.cjs`, loaded
+ * through `createRequire` because it is packaging tooling rather than app code.
+ */
+
+const linkageModulePath = path.resolve(
+    __dirname,
+    '../../../embedded-mpv-linux-linkage.cjs'
+);
+const requireBuildHelper = createRequire(__filename);
+
+export interface RuntimeFileRecord {
+    name: string;
+    size: number;
+    sha256: string;
+}
+
+export interface SonameFixture {
+    exactPath: string;
+    outputLibDir: string;
+    runtimeDependencyClosure: {
+        entries: Array<{
+            name: string;
+            needed: string[];
+            rpath: string[];
+            runpath: string[];
+            soname: string | null;
+        }>;
+    };
+    runtimeFiles: RuntimeFileRecord[];
+}
+
+export interface ArtifactFixture {
+    outputDir: string;
+    readDynamicSection: (filePath: string) => string;
+    outputs: Record<string, string>;
+}
+
+export interface LinkageModule {
+    parseReadelfDynamic: (output: string) => {
+        needed: string[];
+        rpath: string[];
+        runpath: string[];
+        soname: string[];
+    };
+    resolveVerifiedLinuxLibMpvSoname: (options: {
+        outputLibDir: string;
+        readDynamicSection: (filePath: string) => string;
+        runtimeDependencyClosure: SonameFixture['runtimeDependencyClosure'];
+        runtimeFiles: RuntimeFileRecord[];
+    }) => string;
+    resolveLinuxFrameCopyLinkageInputs: (options: {
+        buildInputMode: string;
+        outputLibDir: string;
+        packagedLibmpvSoname: string | null;
+        readDynamicSection: (filePath: string) => string;
+        runtimeLibDir: string;
+    }) => {
+        expectedLibmpvSoname: string | null;
+        linkerLibraryDir: string;
+    };
+    runWithCleanup: <T>(operation: () => T, cleanup: () => void) => T;
+    validateLinuxFrameCopyLinkage: (options: {
+        expectedLibmpvSoname: string;
+        outputDir: string;
+        readDynamicSection: (filePath: string) => string;
+    }) => void;
+}
+
+export function loadLinkageModule(): LinkageModule {
+    expect(existsSync(linkageModulePath)).toBe(true);
+    return requireBuildHelper(linkageModulePath);
+}
+
+function sha256(contents: Buffer): string {
+    return createHash('sha256').update(contents).digest('hex');
+}
+
+export function runtimeFile(
+    name: string,
+    contents: Buffer
+): RuntimeFileRecord {
+    return {
+        name,
+        size: contents.byteLength,
+        sha256: sha256(contents),
+    };
+}
+
+/** Render a `readelf -d` style dynamic section from tag/value pairs. */
+export function readelfDynamic(
+    entries: Array<['NEEDED' | 'RPATH' | 'RUNPATH' | 'SONAME', string]>
+): string {
+    return entries
+        .map(
+            ([tag, value], index) =>
+                ` 0x${index
+                    .toString(16)
+                    .padStart(16, '0')} (${tag}) Library value: [${value}]`
+        )
+        .join('\n');
+}
+
+/**
+ * Temporary-directory registry. Specs call `createTemporaryDirectory()` while
+ * building fixtures and `cleanupTemporaryDirectories()` from their `afterEach`.
+ */
+const temporaryDirectories: string[] = [];
+
+export function createTemporaryDirectory(): string {
+    const directory = mkdtempSync(
+        path.join(tmpdir(), 'iptvnator-mpv-linkage-')
+    );
+    temporaryDirectories.push(directory);
+    return directory;
+}
+
+export function cleanupTemporaryDirectories(): void {
+    for (const directory of temporaryDirectories.splice(0)) {
+        rmSync(directory, { recursive: true, force: true });
+    }
+}
+
+/** A verified libmpv copy: matching alias + exact-SONAME regular files. */
+export function createSonameFixture(soname = 'libmpv.so.2'): SonameFixture {
+    const outputLibDir = path.join(createTemporaryDirectory(), 'lib');
+    mkdirSync(outputLibDir, { recursive: true });
+    const contents = Buffer.from('verified libmpv ELF contents');
+    const aliasPath = path.join(outputLibDir, 'libmpv.so');
+    const exactPath = path.join(outputLibDir, soname);
+    writeFileSync(aliasPath, contents);
+    writeFileSync(exactPath, contents);
+
+    return {
+        exactPath,
+        outputLibDir,
+        runtimeFiles: [
+            runtimeFile('libmpv.so', contents),
+            runtimeFile(soname, contents),
+        ],
+        runtimeDependencyClosure: {
+            entries: [
+                {
+                    name: 'libmpv.so',
+                    needed: [],
+                    rpath: [],
+                    runpath: ['$ORIGIN'],
+                    soname,
+                },
+                {
+                    name: soname,
+                    needed: [],
+                    rpath: [],
+                    runpath: ['$ORIGIN'],
+                    soname,
+                },
+            ],
+        },
+    };
+}
+
+/** A built output directory with process-isolated linkage. */
+export function createArtifactFixture(): ArtifactFixture {
+    const outputDir = createTemporaryDirectory();
+    const outputs: Record<string, string> = {
+        'embedded_mpv.node': readelfDynamic([['NEEDED', 'libX11.so.6']]),
+        'embedded_mpv_frame_reader.node': readelfDynamic([]),
+        iptvnator_mpv_helper: readelfDynamic([
+            ['NEEDED', 'libmpv.so.2'],
+            ['NEEDED', 'libEGL.so.1'],
+            ['RUNPATH', '$ORIGIN/lib'],
+        ]),
+    };
+    for (const artifact of Object.keys(outputs)) {
+        writeFileSync(path.join(outputDir, artifact), 'ELF');
+    }
+    return {
+        outputDir,
+        outputs,
+        readDynamicSection: (filePath: string) =>
+            outputs[path.basename(filePath)],
+    };
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts
index 2bddca544..cc34104c7 100644
--- a/apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts
+++ b/apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts
@@ -26,9 +26,38 @@ describe('Embedded MPV native source recording invariants', () => {
     const buildAndMakeWorkflowSource = readSource(
         '../../../../../.github/workflows/build-and-make.yaml'
     );
+    const electronBuilderConfig = JSON.parse(
+        readSource('../../../../../electron-builder.json')
+    ) as {
+        snap?: {
+            plugs?: unknown;
+        };
+    };
     const stageRuntimeSource = readSource(
         '../../../../../tools/embedded-mpv/stage-runtime.mjs'
     );
+    const frameHelperRenderSource = readFileSync(
+        path.resolve(__dirname, '../../../native/helper/frame_helper_render.h'),
+        'utf8'
+    );
+    const frameHelperSource = readFileSync(
+        path.resolve(__dirname, '../../../native/helper/mpv_frame_helper.cpp'),
+        'utf8'
+    );
+    const frameHelperGlSource = readFileSync(
+        path.resolve(__dirname, '../../../native/helper/frame_helper_gl.h'),
+        'utf8'
+    );
+    const frameShmSource = readFileSync(
+        path.resolve(__dirname, '../../../native/helper/frame_shm.h'),
+        'utf8'
+    );
+    const linuxFrameHelperGlSource = frameHelperGlSource.slice(
+        frameHelperGlSource.indexOf('inline void* eglWrapGetProcAddress')
+    );
+    const windowsFrameHelperGlSource = frameHelperGlSource.slice(
+        frameHelperGlSource.indexOf('#define FRAME_HELPER_WGL_ENTRY_POINTS')
+    );
 
     function functionBody(name: string): string {
         return sourceFunctionBody(nativeSource, `Napi::Value ${name}(`, name);
@@ -280,9 +309,7 @@ describe('Embedded MPV native source recording invariants', () => {
     });
 
     it('copies Windows runtime DLLs next to the addon for Windows loader lookup', () => {
-        expect(buildScriptSource).toContain(
-            "'libmpv-2.dll',"
-        );
+        expect(buildScriptSource).toContain("'libmpv-2.dll',");
         expect(buildScriptSource).toContain(
             'path.join(outputDir, windowsDllName)'
         );
@@ -544,11 +571,120 @@ describe('Embedded MPV native source recording invariants', () => {
         expect(buildScriptSource).toContain('cleanNativeBuildIntermediates();');
     });
 
-    it('does not stage Linux libmpv runtime libraries', () => {
-        expect(stageRuntimeSource).toContain(
-            "if (platform !== 'linux') {\n" +
-                '        copyDirectory(sourceLibDir, destinationLibDir, runtimeFileFilter);\n' +
-                '    }'
+    it('validates and copies only the staged Linux shared-library closure', () => {
+        expect(buildScriptSource).toContain(
+            "require('../../tools/embedded-mpv/linux-runtime-manifest.cjs')"
+        );
+        expect(buildScriptSource).toContain(
+            'validateLinuxRuntimeManifest(sourceRuntimeManifest)'
+        );
+        expect(buildScriptSource).toContain(
+            'validateLinuxSystemBuildInputManifest(sourceRuntimeManifest)'
+        );
+        expect(buildScriptSource).toContain(
+            'copyLinuxRuntimeClosureToNativeBuild(runtime)'
+        );
+        expect(buildScriptSource).toContain(
+            'runtime.sourceRuntimeManifest.runtimeFiles'
+        );
+        expect(buildScriptSource).toContain(
+            'SHA-256 mismatch for staged Linux runtime file'
+        );
+        expect(buildScriptSource).toContain(
+            'resolveLinuxFrameCopyLinkageInputs({'
+        );
+        expect(buildScriptSource).toContain(
+            'LINUX_VERIFIED_RUNTIME_LIBRARY_DIR:\n' +
+                '                          linuxLinkageInputs.linkerLibraryDir'
+        );
+        expect(buildScriptSource).toContain(
+            'expectedLibmpvSoname: linuxLinkageInputs.expectedLibmpvSoname'
+        );
+        expect(buildScriptSource).not.toContain(
+            'process.env.LINUX_NATIVE_LIBRARY_DIR || runtime.libDir'
+        );
+        expect(buildScriptSource).not.toContain(
+            'LINUX_NATIVE_LIBRARY_DIR: runtime.libDir'
+        );
+    });
+
+    it('writes a profile-neutral Linux frame-copy build manifest', () => {
+        expect(buildScriptSource).toContain(
+            "const LINUX_PACKAGE_RUNTIME_MODES = Object.freeze(['system', 'bundled']);"
+        );
+        expect(buildScriptSource).toContain("origin: 'linux-frame-copy-build'");
+        expect(buildScriptSource).toContain(
+            'allowedPackageRuntimeModes: [...LINUX_PACKAGE_RUNTIME_MODES]'
+        );
+        expect(buildScriptSource).toContain(
+            'buildInputMode: runtime.buildInputMode'
+        );
+        expect(buildScriptSource).toContain(
+            'sourceRuntime: runtime.sourceRuntimeManifest'
+        );
+        expect(buildScriptSource).toContain('runtimeFiles: copiedRuntimeFiles');
+        expect(buildScriptSource).not.toContain(
+            'writeLinuxProcessRuntimeManifest'
+        );
+    });
+
+    it('requires a validated bundled source runtime for required Linux builds', () => {
+        expect(buildScriptSource).toContain(
+            "sourceRuntimeValidated: buildInputMode === 'bundled-runtime'"
+        );
+        expect(buildScriptSource).toContain(
+            'assertRequiredLinuxFrameCopyRuntime(runtime);'
+        );
+        expect(buildScriptSource).toContain(
+            "runtime.buildInputMode !== 'bundled-runtime' ||"
+        );
+        expect(buildScriptSource).toContain(
+            'runtime.sourceRuntimeValidated !== true'
+        );
+        expect(buildScriptSource).toContain("runtimeFile.name === 'libmpv.so'");
+        expect(buildScriptSource).toContain(
+            'Required Linux builds must use the validated bundled source runtime containing staged libmpv.'
+        );
+    });
+
+    it('derives packaged Linux libmpv identity from validated closure SONAME metadata', () => {
+        expect(buildScriptSource).toContain('resolveVerifiedLinuxLibMpvSoname');
+        expect(buildScriptSource).toContain(
+            'runtime.sourceRuntimeManifest.runtimeDependencyClosure'
+        );
+        expect(buildScriptSource).toContain('libmpvSoname,');
+        expect(buildScriptSource).not.toContain(
+            'VERSIONED_LINUX_LIBMPV_PATTERN'
+        );
+        expect(buildScriptSource).not.toContain("libmpvSoname: 'libmpv.so.2'");
+    });
+
+    it('marks both package modes available only for a validated bundled build', () => {
+        expect(buildScriptSource).toContain(
+            'runtime.sourceRuntimeValidated === true &&\n' +
+                "        runtime.buildInputMode === 'bundled-runtime' &&\n" +
+                '        copiedRuntimeFiles.length > 0 &&\n' +
+                '        libmpvSoname !== null'
+        );
+        expect(buildScriptSource).toContain('system: packageRuntimeAvailable');
+        expect(buildScriptSource).toContain('bundled: packageRuntimeAvailable');
+    });
+
+    it('validates Linux post-link isolation before marking the build available', () => {
+        const postLinkValidation = buildScriptSource.indexOf(
+            'validateLinuxFrameCopyLinkage({'
+        );
+        const availabilityMarkerRemoval = buildScriptSource.lastIndexOf(
+            'fs.rmSync(unavailableMarkerFile'
+        );
+
+        expect(buildScriptSource).toContain(
+            "spawnSync('readelf', ['-d', filePath]"
+        );
+        expect(postLinkValidation).toBeGreaterThanOrEqual(0);
+        expect(availabilityMarkerRemoval).toBeGreaterThan(postLinkValidation);
+        expect(buildScriptSource).toContain(
+            'runWithCleanup(buildNativeArtifacts, cleanOutput)'
         );
     });
 
@@ -571,23 +707,302 @@ describe('Embedded MPV native source recording invariants', () => {
         );
     });
 
-    it('requires Linux embedded MPV build inputs and validates process isolation in CI', () => {
+    it('requires the pinned Linux source runtime artifact and validates process isolation in CI', () => {
         expect(buildAndMakeWorkflowSource).toContain(
-            'libmpv-dev mpv pkg-config'
+            'Build and stage pinned LGPL Linux runtime'
         );
         expect(buildAndMakeWorkflowSource).toContain(
+            'node tools/embedded-mpv/build-linux-runtime.mjs "${RUNTIME_PREFIX}"'
+        );
+        expect(buildAndMakeWorkflowSource).toContain(
+            'node tools/embedded-mpv/stage-runtime.mjs linux x64 "${RUNTIME_PREFIX}"'
+        );
+        expect(buildAndMakeWorkflowSource).toContain(
+            'name: linux-embedded-mpv-runtime'
+        );
+        expect(buildAndMakeWorkflowSource).toContain(
+            'path: vendor/embedded-mpv/linux-x64'
+        );
+        expect(buildAndMakeWorkflowSource).toContain(
+            'Download pinned Linux Embedded MPV runtime'
+        );
+        expect(buildAndMakeWorkflowSource).not.toContain('libopengl-dev');
+        expect(buildAndMakeWorkflowSource).not.toContain(
             'Stage Linux embedded MPV build inputs'
         );
-        expect(buildAndMakeWorkflowSource).toContain(
-            "linuxBackend: 'process-isolated mpv --wid'"
-        );
         expect(buildAndMakeWorkflowSource).toContain("matrix.os == 'linux'");
+        expect(buildAndMakeWorkflowSource).toContain(
+            "manifest.origin !== 'linux-frame-copy-build' || manifest.sourceRuntimeValidated !== true"
+        );
         expect(buildAndMakeWorkflowSource).toContain(
             'Linux embedded MPV addon must not link directly to libmpv'
         );
-        expect(buildScriptSource).toContain("origin: 'external-mpv-process'");
-        expect(buildScriptSource).toContain('writeLinuxProcessRuntimeManifest');
-        expect(buildScriptSource).toContain('runtimeFiles: []');
+        expect(buildAndMakeWorkflowSource).toContain(
+            'test -f dist/apps/electron-backend/native/iptvnator_mpv_helper'
+        );
+        expect(buildAndMakeWorkflowSource).toContain(
+            'Linux frame-copy helper must need libmpv.so.2'
+        );
+    });
+
+    it('keeps optional Linux system development separate from required staged inputs', () => {
+        expect(buildScriptSource).toContain(
+            "const systemIncludeDir =\n            process.env.LIBMPV_INCLUDE_DIR || '/usr/include';"
+        );
+        expect(buildScriptSource).toContain(
+            'process.env.LINUX_NATIVE_LIBRARY_DIR ||\n                    defaultLinuxSystemLibDir()'
+        );
+        expect(buildScriptSource).toContain("arm: 'arm-linux-gnueabihf'");
+        expect(buildScriptSource).toContain("arm64: 'aarch64-linux-gnu'");
+        expect(buildScriptSource).toContain("x64: 'x86_64-linux-gnu'");
+        expect(buildScriptSource).toContain(
+            "if (!embeddedMpvRequired && runtime.origin === 'system-dev')"
+        );
+        expect(buildScriptSource).toContain(
+            'Required Linux builds must use the validated bundled source runtime containing staged libmpv.'
+        );
+        expect(buildScriptSource).toContain(
+            'removeStaleFrameCopyArtifacts(outputDir);'
+        );
+    });
+
+    it('forces the current frame into a rebuilt shm generation after a paused resize', () => {
+        const runLoop = sourceFunctionBody(
+            frameHelperRenderSource,
+            'inline void RenderPipeline::runLoop()',
+            'RenderPipeline::runLoop'
+        );
+
+        expect(runLoop).toContain('bool targetsRebuilt = false;');
+        expect(runLoop).toContain('targetsRebuilt = true;');
+        expect(runLoop).toContain(
+            'if (targetsRebuilt || (flags & MPV_RENDER_UPDATE_FRAME))'
+        );
+    });
+
+    it('keeps Electron Builder defaults and exact Snap runtime plugs', () => {
+        expect(electronBuilderConfig.snap?.plugs).toEqual([
+            'default',
+            {
+                'graphics-core22': {
+                    interface: 'content',
+                    target: '$SNAP/graphics',
+                    'default-provider': 'mesa-core22',
+                },
+            },
+            {
+                'shared-memory': {
+                    interface: 'shared-memory',
+                    private: true,
+                },
+            },
+        ]);
+    });
+
+    it('runs the helper runtime probe through shared memory without media or command loops', () => {
+        const runtimeProbe = sourceFunctionBody(
+            frameHelperSource,
+            'int runRuntimeProbe(',
+            'runRuntimeProbe'
+        );
+        const runtimeProbeShmName = sourceFunctionBody(
+            frameHelperSource,
+            'std::string runtimeProbeShmName(',
+            'runtimeProbeShmName'
+        );
+        const main = sourceFunctionBody(frameHelperSource, 'int main(', 'main');
+        const runtimeProbeFailure = sourceFunctionBody(
+            frameHelperSource,
+            'int runtimeProbeFailure(',
+            'runtimeProbeFailure'
+        );
+
+        expect(main).toContain('if (args.runtimeProbe) {');
+        expect(main).toContain('return runRuntimeProbe();');
+        expect(runtimeProbe).toContain('mpv_create()');
+        expect(runtimeProbe).toContain('"idle", "yes"');
+        expect(runtimeProbe).toContain('"vo", "libmpv"');
+        expect(runtimeProbe).toContain('mpv_initialize(mpv)');
+        expect(runtimeProbe).toContain('GlContext gl;');
+        expect(runtimeProbe).toContain('gl.create(error)');
+        expect(runtimeProbe).toContain('gl.makeCurrent(error)');
+        expect(runtimeProbe).toContain('mpv_render_context_create(');
+        expect(runtimeProbe).toContain('mpv_render_context_free(');
+        expect(runtimeProbe).toContain('gl.destroy()');
+        expect(runtimeProbe).toContain('mpv_terminate_destroy(mpv)');
+        expect(runtimeProbe).toContain(
+            'frame_helper::ShmRing runtimeProbeRing;'
+        );
+        expect(runtimeProbe).toContain(
+            'const std::string shmName = runtimeProbeShmName();'
+        );
+        expect(runtimeProbe).toContain(
+            'runtimeProbeRing.create(shmName, 16, 16, 1)'
+        );
+        expect(runtimeProbe).toContain(
+            'runtimeProbeRing.header->magic == FRAME_SHM_MAGIC'
+        );
+        expect(runtimeProbe).toContain('runtimeProbeRing.destroy();');
+        expect(runtimeProbe).toContain('"shared-memory-create-failed"');
+        expect(runtimeProbe).toContain('"shared-memory-initialize-failed"');
+        expect(runtimeProbeShmName).toContain('"/impv-fc-runtime-probe-"');
+        expect(runtimeProbeShmName).toContain('getpid()');
+        expect(runtimeProbeShmName).toContain('GetCurrentProcessId()');
+        expect(runtimeProbeShmName).toContain('std::to_string(processId)');
+        expect(runtimeProbe).toContain('.num("protocol", 1)');
+        expect(runtimeProbe).toContain('.boolean("usable", true)');
+        expect(runtimeProbe).toContain('.str("libmpv",');
+        expect(runtimeProbe).toContain('.str("renderApi", gl.renderApiName())');
+        expect(runtimeProbe).not.toContain('pipeline');
+        expect(runtimeProbe).not.toContain('runStdinLoop');
+        expect(runtimeProbe).not.toContain('runMpvEventLoop');
+        expect(runtimeProbe).not.toContain('loadfile');
+        expect(runtimeProbe.match(/emitLine\(/g)).toHaveLength(1);
+        expect(runtimeProbeFailure).toContain('.num("protocol", 1)');
+        expect(runtimeProbeFailure).toContain('.boolean("usable", false)');
+        expect(runtimeProbeFailure).toContain('.str("reason", reason)');
+        expect(runtimeProbeFailure.match(/emitLine\(/g)).toHaveLength(1);
+        expect(runtimeProbeFailure).toContain('return 1;');
+    });
+
+    it('identifies the Linux helper runtime probe render API as EGL', () => {
+        const renderApiName = sourceFunctionBody(
+            linuxFrameHelperGlSource,
+            'const char* renderApiName() const',
+            'GlContext::renderApiName'
+        );
+
+        expect(renderApiName).toContain('return "egl";');
+    });
+
+    it('validates complete EGL candidates and keeps software rendering as the final fallback', () => {
+        const tryCandidate = sourceFunctionBody(
+            linuxFrameHelperGlSource,
+            'bool tryCandidate(',
+            'GlContext::tryCandidate'
+        );
+        const create = sourceFunctionBody(
+            linuxFrameHelperGlSource,
+            'bool create(std::string& errorOut)',
+            'GlContext::create'
+        );
+
+        for (const requiredStep of [
+            'eglInitialize(',
+            'eglBindAPI(EGL_OPENGL_API)',
+            'chooseConfig(',
+            'eglCreateContext(',
+            'eglMakeCurrent(',
+            'glGetString(GL_RENDERER)',
+        ]) {
+            expect(tryCandidate).toContain(requiredStep);
+        }
+        expect(create).toContain('softwareFallback');
+        expect(create).toContain('candidate.softwareRenderer');
+        expect(create.indexOf('DisplayTier::SurfacelessMesa')).toBeLessThan(
+            create.indexOf('DisplayTier::Default')
+        );
+        expect(create.indexOf('DisplayTier::Default')).toBeLessThan(
+            create.indexOf('DisplayTier::Gbm')
+        );
+    });
+
+    it('binds the desktop GL API on the render thread and releases it before EGL teardown', () => {
+        const makeCurrent = sourceFunctionBody(
+            linuxFrameHelperGlSource,
+            'bool makeCurrent(std::string& errorOut)',
+            'GlContext::makeCurrent'
+        );
+        const destroy = sourceFunctionBody(
+            linuxFrameHelperGlSource,
+            'void destroy()',
+            'GlContext::destroy'
+        );
+
+        expect(makeCurrent).toContain('eglBindAPI(EGL_OPENGL_API)');
+        expect(makeCurrent).toContain('eglMakeCurrent(');
+        expect(makeCurrent).toContain('return false;');
+
+        const bindIndex = destroy.indexOf('eglBindAPI(EGL_OPENGL_API)');
+        const unbindIndex = destroy.indexOf('eglMakeCurrent(');
+        const releaseIndex = destroy.indexOf('eglReleaseThread()');
+        const destroySurfaceIndex = destroy.indexOf('eglDestroySurface(');
+        expect(bindIndex).toBeGreaterThanOrEqual(0);
+        expect(unbindIndex).toBeGreaterThan(bindIndex);
+        expect(releaseIndex).toBeGreaterThan(unbindIndex);
+        expect(destroySurfaceIndex).toBeGreaterThan(releaseIndex);
+
+        const setupGl = sourceFunctionBody(
+            frameHelperRenderSource,
+            'inline bool RenderPipeline::setupGl(std::string& errorOut)',
+            'RenderPipeline::setupGl'
+        );
+        expect(setupGl).toContain(
+            'if (!gl_.makeCurrent(errorOut)) return false;'
+        );
+    });
+
+    it('checks WGL context handoff and never deletes a context after failed unbind', () => {
+        const create = sourceFunctionBody(
+            windowsFrameHelperGlSource,
+            'bool create(std::string& errorOut)',
+            'WGL GlContext::create'
+        );
+        const makeCurrent = sourceFunctionBody(
+            windowsFrameHelperGlSource,
+            'bool makeCurrent(std::string& errorOut)',
+            'WGL GlContext::makeCurrent'
+        );
+        const destroy = sourceFunctionBody(
+            windowsFrameHelperGlSource,
+            'void destroy()',
+            'WGL GlContext::destroy'
+        );
+
+        expect(create).toContain('wglMakeCurrent(dc_, core) != TRUE');
+        expect(create).toContain('wglMakeCurrent(nullptr, nullptr) != TRUE');
+        expect(create).toContain('wglLoaderGetProcAddress(opengl32_,');
+        expect(create).toContain('"wglCreateContextAttribsARB")');
+        expect(create).not.toContain(
+            'wglGetProcAddress("wglCreateContextAttribsARB")'
+        );
+        expect(makeCurrent).toContain('wglMakeCurrent(dc_, context_) != TRUE');
+        expect(makeCurrent).toContain('return false;');
+
+        const unbindIndex = destroy.indexOf(
+            'wglMakeCurrent(nullptr, nullptr) != TRUE'
+        );
+        const deleteIndex = destroy.indexOf(
+            'wglDeleteContext(context_) != TRUE'
+        );
+        expect(unbindIndex).toBeGreaterThanOrEqual(0);
+        expect(deleteIndex).toBeGreaterThan(unbindIndex);
+        expect(destroy.slice(0, deleteIndex)).toContain('return;');
+    });
+
+    it('initializes the Windows QPC frequency without a cross-thread data race', () => {
+        const nowNs = sourceFunctionBody(
+            frameShmSource,
+            'static inline uint64_t frame_shm_now_ns(void)',
+            'frame_shm_now_ns'
+        );
+
+        expect(nowNs).toContain(
+            'static const uint64_t frequency = []() -> uint64_t'
+        );
+        expect(nowNs).not.toContain('static uint64_t frequency;');
+    });
+
+    it('resolves linked core GL symbols before falling back to EGL extension lookup', () => {
+        const dlsymIndex = linuxFrameHelperGlSource.indexOf(
+            'dlsym(RTLD_DEFAULT, name)'
+        );
+        const eglIndex = linuxFrameHelperGlSource.indexOf(
+            'eglGetProcAddress(name)'
+        );
+
+        expect(dlsymIndex).toBeGreaterThanOrEqual(0);
+        expect(eglIndex).toBeGreaterThan(dlsymIndex);
     });
 });
 
@@ -602,6 +1017,10 @@ describe('Embedded MPV native build configuration', () => {
         (candidate: { target_name?: string }) =>
             candidate.target_name === 'embedded_mpv'
     );
+    const helperTarget = bindingGyp.targets.find(
+        (candidate: { target_name?: string }) =>
+            candidate.target_name === 'iptvnator_mpv_helper'
+    );
 
     it('declares platform-specific native sources for macOS, Windows, and Linux', () => {
         expect(target).toBeDefined();
@@ -609,4 +1028,43 @@ describe('Embedded MPV native build configuration', () => {
         expect(JSON.stringify(target)).toContain('src/embedded_mpv_win32.cc');
         expect(JSON.stringify(target)).toContain('src/embedded_mpv_linux.cc');
     });
+
+    it('links libmpv and headless GL only into the Linux helper process', () => {
+        const linuxAddonConfig = target.conditions.find(
+            ([condition]: [string]) => condition === 'OS=="linux"'
+        )?.[1];
+        const linuxHelperConfig = helperTarget.conditions.find(
+            ([condition]: [string]) => condition === 'OS=="linux"'
+        )?.[1];
+
+        expect(linuxAddonConfig?.libraries).not.toContain('-lmpv');
+        expect(JSON.stringify(linuxAddonConfig)).not.toContain('-lmpv');
+        expect(linuxHelperConfig?.libraries).toEqual(
+            expect.arrayContaining(['-lEGL', '-lGL', '-lgbm', '-ldl'])
+        );
+        expect(linuxHelperConfig?.libraries).not.toContain('-lOpenGL');
+        expect(linuxHelperConfig?.libraries).not.toContain('-lmpv');
+        expect(
+            linuxHelperConfig?.libraries.find((library: string) =>
+                library.includes("path.join(dir, 'libmpv.so')")
+            )
+        ).toContain('LINUX_VERIFIED_RUNTIME_LIBRARY_DIR');
+        expect(JSON.stringify(linuxHelperConfig)).not.toContain(
+            "LINUX_VERIFIED_RUNTIME_LIBRARY_DIR || '/usr/lib'"
+        );
+        expect(JSON.stringify(linuxHelperConfig)).toContain(
+            'Missing LINUX_VERIFIED_RUNTIME_LIBRARY_DIR'
+        );
+
+        const runtimeLinkerFlags = linuxHelperConfig?.ldflags.filter(
+            (flag: string) => flag.startsWith('-Wl,')
+        );
+        expect(runtimeLinkerFlags).toEqual([
+            '-Wl,--enable-new-dtags',
+            "-Wl,-rpath,'$$ORIGIN/lib'",
+        ]);
+        expect(JSON.stringify(runtimeLinkerFlags)).not.toContain(
+            'LINUX_NATIVE_LIBRARY_DIR'
+        );
+    });
 });
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-native.service.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-native.service.spec.ts
index 5b743684d..670576c77 100644
--- a/apps/electron-backend/src/app/services/embedded-mpv-native.service.spec.ts
+++ b/apps/electron-backend/src/app/services/embedded-mpv-native.service.spec.ts
@@ -9,11 +9,24 @@ import path from 'path';
 import type { EmbeddedMpvNativeService as EmbeddedMpvNativeServiceType } from './embedded-mpv-native.service';
 
 const mockSpawnSync = jest.fn();
+const mockIsFrameCopyRuntimeUsable = jest.fn<boolean, []>();
+const mockGetFrameCopyRuntimeAvailability = jest.fn();
 
 jest.mock('child_process', () => ({
     spawnSync: mockSpawnSync,
 }));
 
+jest.mock('./embedded-mpv-frame-copy-platform.util', () => {
+    const actual = jest.requireActual(
+        './embedded-mpv-frame-copy-platform.util'
+    );
+    return {
+        ...actual,
+        getFrameCopyRuntimeAvailability: mockGetFrameCopyRuntimeAvailability,
+        isFrameCopyRuntimeUsable: mockIsFrameCopyRuntimeUsable,
+    };
+});
+
 const powerSaveBlockerMock = {
     start: jest.fn<number, [string]>(),
     stop: jest.fn<void, [number]>(),
@@ -28,19 +41,29 @@ const appMock = {
     commandLine: commandLineMock,
 };
 
+const screenGetDisplayMatchingMock = jest.fn();
+
 jest.mock('electron', () => ({
     app: appMock,
     powerSaveBlocker: powerSaveBlockerMock,
+    screen: { getDisplayMatching: screenGetDisplayMatchingMock },
 }));
 
 const mainWindowSendMock = jest.fn();
+const mainWindowWebContentsOnMock = jest.fn();
+const mainWindowGetZoomFactorMock = jest.fn<number, []>();
 const mainWindowGetNativeWindowHandleMock = jest.fn<Buffer, []>(() =>
     Buffer.alloc(8)
 );
 const mainWindowMock = {
     isDestroyed: () => false,
     getNativeWindowHandle: mainWindowGetNativeWindowHandleMock,
-    webContents: { send: mainWindowSendMock },
+    getBounds: () => ({ x: 0, y: 0, width: 1280, height: 720 }),
+    webContents: {
+        send: mainWindowSendMock,
+        on: mainWindowWebContentsOnMock,
+        getZoomFactor: mainWindowGetZoomFactorMock,
+    },
 };
 
 jest.mock('../app', () => ({
@@ -112,7 +135,9 @@ describe('EmbeddedMpvNativeService power blocker', () => {
     let addon: MockAddon;
     let nextBlockerId: number;
     let originalPlatform: NodeJS.Platform;
+    let originalArch: string;
     let originalDisplay: string | undefined;
+    let originalExperiment: string | undefined;
     let originalOzonePlatformHint: string | undefined;
     let originalWaylandDisplay: string | undefined;
     let tempDirs: string[];
@@ -128,19 +153,36 @@ describe('EmbeddedMpvNativeService power blocker', () => {
         mockSpawnSync.mockReturnValue({
             status: 0,
         });
+        mockIsFrameCopyRuntimeUsable.mockReset();
+        mockIsFrameCopyRuntimeUsable.mockReturnValue(false);
+        mockGetFrameCopyRuntimeAvailability.mockReset();
+        mockGetFrameCopyRuntimeAvailability.mockReturnValue({
+            usable: false,
+            reason: 'helper-probe-failed',
+        });
         mainWindowGetNativeWindowHandleMock.mockReset();
         mainWindowGetNativeWindowHandleMock.mockReturnValue(Buffer.alloc(8));
         mainWindowSendMock.mockReset();
+        mainWindowWebContentsOnMock.mockReset();
+        mainWindowGetZoomFactorMock.mockReset();
+        mainWindowGetZoomFactorMock.mockReturnValue(1);
+        screenGetDisplayMatchingMock.mockReset();
+        screenGetDisplayMatchingMock.mockReturnValue({ scaleFactor: 1 });
+        appMock.isPackaged = true;
 
         tempDirs = [];
         nextBlockerId = 1;
         powerSaveBlockerMock.start.mockImplementation(() => nextBlockerId++);
         powerSaveBlockerMock.isStarted.mockReturnValue(true);
         originalPlatform = process.platform;
+        originalArch = process.arch;
         Object.defineProperty(process, 'platform', {
             value: 'darwin',
         });
+        Object.defineProperty(process, 'arch', { value: 'arm64' });
         originalDisplay = process.env.DISPLAY;
+        originalExperiment =
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
         originalOzonePlatformHint = process.env.ELECTRON_OZONE_PLATFORM_HINT;
         originalWaylandDisplay = process.env.WAYLAND_DISPLAY;
 
@@ -162,7 +204,12 @@ describe('EmbeddedMpvNativeService power blocker', () => {
         Object.defineProperty(process, 'platform', {
             value: originalPlatform,
         });
+        Object.defineProperty(process, 'arch', { value: originalArch });
         restoreEnv('DISPLAY', originalDisplay);
+        restoreEnv(
+            'IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT',
+            originalExperiment
+        );
         restoreEnv('ELECTRON_OZONE_PLATFORM_HINT', originalOzonePlatformHint);
         restoreEnv('WAYLAND_DISPLAY', originalWaylandDisplay);
     });
@@ -204,11 +251,335 @@ describe('EmbeddedMpvNativeService power blocker', () => {
         };
     }
 
+    it('falls back to the native engine when frame-copy is requested without a helper binary', () => {
+        // A stale opt-in (cleaned native build) must not brick embedded MPV:
+        // no helper on disk => the engine env flag is ignored, native keeps
+        // working, and support does not advertise frame-copy.
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+        try {
+            expect(service.getActiveEngine()).toBe('native');
+            expect(mockIsFrameCopyRuntimeUsable).toHaveBeenCalledWith();
+            const support = service.getSupport();
+            expect(support.engine).not.toBe('frame-copy');
+            startSession('s-fallback', snapshot('loading'));
+            expect(addon.createSession).toHaveBeenCalled();
+        } finally {
+            delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+        }
+    });
+
+    it('requires the base embedded-MPV opt-in for unpackaged runs', () => {
+        appMock.isPackaged = false;
+        delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+
+        expect(service.getSupport()).toEqual(
+            expect.objectContaining({ supported: false })
+        );
+
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT = '1';
+        expect(service.getSupport()).toEqual(
+            expect.objectContaining({ supported: true })
+        );
+    });
+
+    (process.platform === 'win32' ? it.skip : it)(
+        'falls back to the native engine when the frame-copy runtime probe fails',
+        () => {
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+
+            try {
+                expect(service.getActiveEngine()).toBe('native');
+                expect(service.isFrameCopyAvailable()).toBe(false);
+                expect(mockIsFrameCopyRuntimeUsable).toHaveBeenCalledWith();
+                expect(service.getSupport()).toEqual(
+                    expect.objectContaining({
+                        engine: 'native',
+                        frameCopyAvailable: false,
+                        frameCopyUnavailableReason: 'helper-probe-failed',
+                    })
+                );
+            } finally {
+                delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+            }
+        }
+    );
+
+    describe('frame-copy platform gate', () => {
+        const originalArch = process.arch;
+
+        function mockRuntimeUsable(): void {
+            mockIsFrameCopyRuntimeUsable.mockReturnValue(true);
+            mockGetFrameCopyRuntimeAvailability.mockReturnValue({
+                usable: true,
+            });
+        }
+
+        afterEach(() => {
+            Object.defineProperty(process, 'arch', { value: originalArch });
+            delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+        });
+
+        it('activates the frame-copy engine on Linux, even under native Wayland', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            // Native Wayland session (no X11 ozone): blocks the --wid native
+            // engine, but the frame-copy helper renders offscreen into shm
+            // and must stay available.
+            process.env.DISPLAY = ':0';
+            process.env.WAYLAND_DISPLAY = 'wayland-0';
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockRuntimeUsable();
+
+            expect(service.getActiveEngine()).toBe('frame-copy');
+            expect(service.isFrameCopyAvailable()).toBe(true);
+            expect(service.getSupport()).toEqual(
+                expect.objectContaining({
+                    supported: true,
+                    engine: 'frame-copy',
+                    frameCopyAvailable: true,
+                })
+            );
+        });
+
+        it('advertises frame-copy availability while native Wayland blocks the native engine', () => {
+            // Pre-opt-in discoverability: without frameCopyAvailable on the
+            // unsupported payload the Settings toggle never appears in
+            // exactly the states the frame-copy engine exists to fix.
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            process.env.DISPLAY = ':0';
+            process.env.WAYLAND_DISPLAY = 'wayland-0';
+            mockRuntimeUsable();
+
+            const support = service.getSupport();
+            expect(support.supported).toBe(false);
+            expect(support.reason).toContain('Native Wayland embedding');
+            expect(support.frameCopyAvailable).toBe(true);
+        });
+
+        it('advertises frame-copy availability when the system mpv executable is missing', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            process.env.DISPLAY = ':0';
+            delete process.env.WAYLAND_DISPLAY;
+            mockSpawnSync.mockReturnValue({ status: 1 });
+            mockRuntimeUsable();
+
+            const support = service.getSupport();
+            expect(support.supported).toBe(false);
+            expect(support.frameCopyAvailable).toBe(true);
+        });
+
+        it('keeps frame-copy supported on Linux without a system mpv executable', () => {
+            // The helper links libmpv itself; the mpv-on-PATH probe only
+            // binds the native --wid engine.
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            process.env.DISPLAY = ':0';
+            delete process.env.WAYLAND_DISPLAY;
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockSpawnSync.mockReturnValue({ status: 1 });
+            mockRuntimeUsable();
+
+            expect(service.getSupport()).toEqual(
+                expect.objectContaining({
+                    supported: true,
+                    engine: 'frame-copy',
+                })
+            );
+        });
+
+        it('activates the frame-copy engine on macOS arm64', () => {
+            Object.defineProperty(process, 'arch', { value: 'arm64' });
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockRuntimeUsable();
+
+            expect(service.getActiveEngine()).toBe('frame-copy');
+            expect(service.isFrameCopyAvailable()).toBe(true);
+        });
+
+        it('supplies the adapter with the runtime mode from the validated Linux capability', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            mockGetFrameCopyRuntimeAvailability.mockReturnValue({
+                usable: true,
+                profile: 'portable',
+                runtimeMode: 'bundled',
+                libmpv: '2.3',
+                renderApi: 'egl',
+            });
+
+            expect(
+                (
+                    service as unknown as {
+                        resolveFrameCopyRuntimeMode(): string | null;
+                    }
+                ).resolveFrameCopyRuntimeMode()
+            ).toBe('bundled');
+        });
+
+        it('keeps the frame-copy engine Apple-Silicon-only on macOS', () => {
+            Object.defineProperty(process, 'arch', { value: 'x64' });
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockIsFrameCopyRuntimeUsable.mockReturnValue(false);
+
+            expect(service.getActiveEngine()).toBe('native');
+            expect(service.isFrameCopyAvailable()).toBe(false);
+        });
+
+        it('skips the native window handle when creating a frame-copy session', () => {
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockRuntimeUsable();
+            const frameCopyAddon = createMockAddon();
+            frameCopyAddon.createSession.mockReturnValueOnce('s-fc');
+            frameCopyAddon.getSessionSnapshot.mockReturnValueOnce(
+                snapshot('loading')
+            );
+            (
+                service as unknown as { frameCopyAdapter: MockAddon }
+            ).frameCopyAdapter = frameCopyAddon;
+
+            service.createSession(BOUNDS, '', 1);
+
+            expect(mainWindowGetNativeWindowHandleMock).not.toHaveBeenCalled();
+            expect(frameCopyAddon.createSession).toHaveBeenCalledWith(
+                Buffer.alloc(0),
+                BOUNDS,
+                '',
+                1
+            );
+
+            // Dispose while the frame-copy env is still set so teardown
+            // dispatches to the adapter that owns the session, not the
+            // native addon the outer afterEach shutdown would pick.
+            service.disposeSession('s-fc');
+            expect(frameCopyAddon.disposeSession).toHaveBeenCalledWith('s-fc');
+        });
+    });
+
+    describe('native view bounds scaling', () => {
+        afterEach(() => {
+            delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY;
+        });
+
+        it('converts CSS bounds to physical pixels for the native engine on scaled displays', () => {
+            // Regression for #1145: the win32/linux engines position their
+            // child window in physical pixels, so renderer CSS bounds must
+            // be multiplied by the display scale before reaching the addon.
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            screenGetDisplayMatchingMock.mockReturnValue({ scaleFactor: 1.5 });
+            addon.createSession.mockReturnValueOnce('s-scaled');
+            addon.getSessionSnapshot.mockReturnValue(snapshot('loading'));
+
+            const cssBounds = { x: 100, y: 40, width: 640, height: 360 };
+            service.createSession(cssBounds, '', 1);
+            service.setBounds('s-scaled', cssBounds);
+
+            const physicalBounds = { x: 150, y: 60, width: 960, height: 540 };
+            expect(addon.createSession).toHaveBeenCalledWith(
+                expect.any(Buffer),
+                physicalBounds,
+                '',
+                1
+            );
+            expect(addon.setBounds).toHaveBeenCalledWith(
+                's-scaled',
+                physicalBounds
+            );
+        });
+
+        it('applies page zoom but not the display scale on macOS', () => {
+            // NSView frames are in points (device-independent pixels): only
+            // the webContents zoom factor separates them from CSS pixels.
+            Object.defineProperty(process, 'platform', { value: 'darwin' });
+            screenGetDisplayMatchingMock.mockReturnValue({ scaleFactor: 2 });
+            mainWindowGetZoomFactorMock.mockReturnValue(1.25);
+            addon.createSession.mockReturnValueOnce('s-zoom');
+            addon.getSessionSnapshot.mockReturnValue(snapshot('loading'));
+
+            service.createSession({ x: 0, y: 0, width: 100, height: 100 }, '', 1);
+
+            expect(addon.createSession).toHaveBeenCalledWith(
+                expect.any(Buffer),
+                { x: 0, y: 0, width: 125, height: 125 },
+                '',
+                1
+            );
+        });
+
+        it('passes frame-copy bounds through unscaled', () => {
+            // The frame-copy engine paints into a DOM canvas laid out in CSS
+            // pixels; its adapter applies the display scale to the render
+            // size itself, so a second scaling pass here would double it.
+            Object.defineProperty(process, 'platform', { value: 'linux' });
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+            mockIsFrameCopyRuntimeUsable.mockReturnValue(true);
+            mockGetFrameCopyRuntimeAvailability.mockReturnValue({
+                usable: true,
+            });
+            screenGetDisplayMatchingMock.mockReturnValue({ scaleFactor: 1.5 });
+            const frameCopyAddon = createMockAddon();
+            frameCopyAddon.createSession.mockReturnValueOnce('s-fc-bounds');
+            frameCopyAddon.getSessionSnapshot.mockReturnValue(
+                snapshot('loading')
+            );
+            (
+                service as unknown as { frameCopyAdapter: MockAddon }
+            ).frameCopyAdapter = frameCopyAddon;
+
+            service.createSession(BOUNDS, '', 1);
+            service.setBounds('s-fc-bounds', BOUNDS);
+
+            expect(frameCopyAddon.createSession).toHaveBeenCalledWith(
+                Buffer.alloc(0),
+                BOUNDS,
+                '',
+                1
+            );
+            expect(frameCopyAddon.setBounds).toHaveBeenCalledWith(
+                's-fc-bounds',
+                BOUNDS
+            );
+
+            // Dispose while the frame-copy env is still set so teardown
+            // dispatches to the adapter that owns the session.
+            service.disposeSession('s-fc-bounds');
+        });
+    });
+
     it('does not acquire a blocker for a loading session', () => {
         startSession('s1', snapshot('loading'));
         expect(powerSaveBlockerMock.start).not.toHaveBeenCalled();
     });
 
+    it('disposes sessions when the renderer reloads or crashes', () => {
+        // Angular teardown never runs on a renderer crash or hard reload, so
+        // the main process must reap sessions itself — otherwise native mpv
+        // handles / frame-copy helper processes leak until app shutdown.
+        startSession('s1', snapshot('playing'));
+        addon.getSessionSnapshot.mockReturnValue(snapshot('playing'));
+
+        const handlers = new Map<string, (...args: unknown[]) => void>(
+            mainWindowWebContentsOnMock.mock.calls.map(
+                ([event, handler]: [string, (...args: unknown[]) => void]) => [
+                    event,
+                    handler,
+                ]
+            )
+        );
+        expect([...handlers.keys()]).toEqual(
+            expect.arrayContaining(['render-process-gone', 'did-navigate'])
+        );
+
+        const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation();
+        handlers.get('did-navigate')?.();
+        expect(addon.disposeSession).toHaveBeenCalledWith('s1');
+
+        // A crash after everything is already disposed must be a no-op.
+        addon.disposeSession.mockClear();
+        handlers.get('render-process-gone')?.(undefined, {
+            reason: 'crashed',
+        });
+        expect(addon.disposeSession).not.toHaveBeenCalled();
+        consoleWarnSpy.mockRestore();
+    });
+
     it('keeps the polling timer alive when refreshing a session throws', () => {
         jest.useFakeTimers();
         const consoleErrorSpy = jest
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-native.service.ts b/apps/electron-backend/src/app/services/embedded-mpv-native.service.ts
index c01117421..19c01502a 100644
--- a/apps/electron-backend/src/app/services/embedded-mpv-native.service.ts
+++ b/apps/electron-backend/src/app/services/embedded-mpv-native.service.ts
@@ -1,4 +1,4 @@
-import { app, dialog, powerSaveBlocker } from 'electron';
+import { app, dialog, powerSaveBlocker, screen } from 'electron';
 import { spawnSync } from 'child_process';
 import {
     closeSync,
@@ -20,12 +20,28 @@ import {
     EmbeddedMpvSession,
     EmbeddedMpvSessionStatus,
     EmbeddedMpvSubtitleTrack,
+    EmbeddedMpvEngine,
+    EmbeddedMpvFrameSource,
     EmbeddedMpvSupport,
+    EMBEDDED_MPV_FRAME_SOURCE_CHANGED,
     EMBEDDED_MPV_SESSION_UPDATE,
     ResolvedPortalPlayback,
 } from '@iptvnator/shared/interfaces';
+import { toNativeViewBounds } from './embedded-mpv-bounds.util';
+import { EmbeddedMpvFrameCopyAdapter } from './embedded-mpv-frame-copy.adapter';
+import {
+    getFrameCopyRuntimeAvailability,
+    getEmbeddedMpvAddonCandidatePaths,
+    isFrameCopyRuntimeUsable,
+    resolveFrameCopyHelperPath,
+} from './embedded-mpv-frame-copy-platform.util';
+import type { EmbeddedMpvFrameCopyRuntimeMode } from './embedded-mpv-frame-copy-runtime';
+import {
+    EMBEDDED_MPV_EXPERIMENT_ENV,
+    isEmbeddedMpvFeatureEnabled,
+} from './embedded-mpv-runtime-policy.util';
 
-interface NativeEmbeddedMpvSessionSnapshot {
+export interface NativeEmbeddedMpvSessionSnapshot {
     status: EmbeddedMpvSessionStatus;
     positionSeconds: number;
     durationSeconds: number | null;
@@ -37,11 +53,13 @@ interface NativeEmbeddedMpvSessionSnapshot {
     selectedSubtitleTrackId?: number | null;
     playbackSpeed?: number;
     aspectOverride?: string;
+    videoWidth?: number;
+    videoHeight?: number;
     recording?: EmbeddedMpvRecordingState;
     error?: string;
 }
 
-interface NativeEmbeddedMpvAddon {
+export interface NativeEmbeddedMpvAddon {
     isSupported(): boolean;
     createSession(
         windowHandle: Buffer,
@@ -76,19 +94,13 @@ interface EmbeddedMpvRuntimeSession {
     lastStatus: EmbeddedMpvSessionStatus | null;
 }
 
-const EMBEDDED_MPV_EXPERIMENT_ENV = 'IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT';
+const EMBEDDED_MPV_FRAME_COPY_ENV = 'IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY';
 const SUPPORTED_EMBEDDED_MPV_PLATFORMS = new Set<NodeJS.Platform>([
     'darwin',
     'win32',
     'linux',
 ]);
 
-function dedupePaths(paths: Array<string | undefined>): string[] {
-    return [
-        ...new Set(paths.filter((value): value is string => Boolean(value))),
-    ];
-}
-
 export class EmbeddedMpvNativeService {
     private addon: NativeEmbeddedMpvAddon | null = null;
     private addonLoadError: Error | null = null;
@@ -98,8 +110,138 @@ export class EmbeddedMpvNativeService {
     private powerBlockerId: number | null = null;
     private readonly loadAddonModule = createRequire(__filename);
     private cachedLinuxMpvExecutableReason: string | null | undefined;
+    private frameCopyAdapter: EmbeddedMpvFrameCopyAdapter | null = null;
+
+    /**
+     * Frame-copy engine: helper process + shm ring + renderer canvas.
+     * Experimental, macOS Apple Silicon (owner decision 2026-07-10), Linux
+     * x64 and Windows, opted into with
+     * IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY=1 on top of the regular
+     * embedded MPV experiment flag.
+     */
+    private isFrameCopyEngineRequested(): boolean {
+        return ['1', 'true', 'yes', 'on'].includes(
+            (process.env[EMBEDDED_MPV_FRAME_COPY_ENV] ?? '')
+                .trim()
+                .toLowerCase()
+        );
+    }
+
+    private isFrameCopyEngineActive(): boolean {
+        // Requires the helper binary too: a stale opt-in (cleaned native
+        // build, bad install) must fall back to the native engine instead
+        // of leaving embedded MPV unsupported with no way to recover.
+        return this.isFrameCopyEngineRequested() && isFrameCopyRuntimeUsable();
+    }
+
+    getActiveEngine(): EmbeddedMpvEngine {
+        return this.isFrameCopyEngineActive() ? 'frame-copy' : 'native';
+    }
+
+    isFrameCopyAvailable(): boolean {
+        return isFrameCopyRuntimeUsable();
+    }
+
+    private getFrameCopySupportDetails(): Pick<
+        EmbeddedMpvSupport,
+        'frameCopyAvailable' | 'frameCopyUnavailableReason'
+    > {
+        const availability = getFrameCopyRuntimeAvailability();
+        if (!('reason' in availability)) {
+            return { frameCopyAvailable: true };
+        }
+        return {
+            frameCopyAvailable: false,
+            frameCopyUnavailableReason: availability.reason,
+        };
+    }
+
+    private resolveFrameCopyRuntimeMode(): EmbeddedMpvFrameCopyRuntimeMode | null {
+        if (process.platform !== 'linux') {
+            return null;
+        }
+        const availability = getFrameCopyRuntimeAvailability();
+        return availability.usable && 'runtimeMode' in availability
+            ? availability.runtimeMode
+            : null;
+    }
+
+    getFrameSource(sessionId: string): EmbeddedMpvFrameSource | null {
+        return this.frameCopyAdapter?.getFrameSource(sessionId) ?? null;
+    }
+
+    private getFrameCopyAdapter(): EmbeddedMpvFrameCopyAdapter {
+        if (!this.frameCopyAdapter) {
+            this.frameCopyAdapter = new EmbeddedMpvFrameCopyAdapter({
+                resolveHelperPath: resolveFrameCopyHelperPath,
+                resolveRuntimeMode: () => this.resolveFrameCopyRuntimeMode(),
+                getScaleFactor: () => this.getMainWindowScaleFactor(),
+                onFrameSourceChanged: (sessionId, source) => {
+                    if (!App.mainWindow || App.mainWindow.isDestroyed()) {
+                        return;
+                    }
+                    App.mainWindow.webContents.send(
+                        EMBEDDED_MPV_FRAME_SOURCE_CHANGED,
+                        { sessionId, source }
+                    );
+                },
+            });
+        }
+        return this.frameCopyAdapter;
+    }
+
+    private getMainWindowScaleFactor(): number {
+        try {
+            if (!App.mainWindow || App.mainWindow.isDestroyed()) {
+                return 1;
+            }
+            return screen.getDisplayMatching(App.mainWindow.getBounds())
+                .scaleFactor;
+        } catch {
+            return 1;
+        }
+    }
+
+    private getMainWindowZoomFactor(): number {
+        try {
+            if (!App.mainWindow || App.mainWindow.isDestroyed()) {
+                return 1;
+            }
+            return App.mainWindow.webContents.getZoomFactor();
+        } catch {
+            return 1;
+        }
+    }
+
+    /**
+     * Renderer bounds arrive in CSS pixels; the native-view engines position
+     * OS windows in physical pixels (win32/linux) or points (macOS), so at
+     * page zoom or display scale ≠ 100% the raw values land the video toward
+     * the window's top-left corner at a fraction of its size (#1145). The
+     * frame-copy engine must bypass this: it paints into a DOM canvas laid
+     * out in CSS pixels, and its adapter already applies the display scale
+     * to the render size itself.
+     */
+    private scaleBoundsForNativeView(
+        bounds: EmbeddedMpvBounds
+    ): EmbeddedMpvBounds {
+        return toNativeViewBounds(bounds, {
+            platform: process.platform,
+            zoomFactor: this.getMainWindowZoomFactor(),
+            displayScaleFactor: this.getMainWindowScaleFactor(),
+        });
+    }
 
     private detectCapabilities(): EmbeddedMpvCapabilities {
+        if (this.isFrameCopyEngineActive()) {
+            return {
+                subtitles: true,
+                playbackSpeed: true,
+                aspectOverride: true,
+                screenshot: false,
+                recording: true,
+            };
+        }
         const addon = this.addon;
         return {
             subtitles: typeof addon?.setSubtitleTrack === 'function',
@@ -121,15 +263,25 @@ export class EmbeddedMpvNativeService {
             };
         }
 
-        if (this.isUnsupportedLinuxDisplayServer()) {
+        // The frame-copy engine renders offscreen (headless EGL on Linux,
+        // WGL on Windows) into a renderer canvas: the Linux X11/Xwayland and
+        // system-mpv requirements below only bind the native --wid engine. Both
+        // native-engine failure returns still advertise frameCopyAvailable
+        // so the Settings toggle stays reachable — otherwise the states the
+        // frame-copy engine exists to fix would hide the way to enable it.
+        if (
+            this.isUnsupportedLinuxDisplayServer() &&
+            !this.isFrameCopyEngineActive()
+        ) {
             return {
                 supported: false,
                 platform: process.platform,
                 reason: 'Embedded MPV on Linux currently requires X11 or Xwayland. Native Wayland embedding is not supported yet.',
+                ...this.getFrameCopySupportDetails(),
             };
         }
 
-        if (!this.isEmbeddedMpvEnabled()) {
+        if (!isEmbeddedMpvFeatureEnabled()) {
             return {
                 supported: false,
                 platform: process.platform,
@@ -137,6 +289,19 @@ export class EmbeddedMpvNativeService {
             };
         }
 
+        // A requested-but-unavailable frame-copy engine (wrong platform or
+        // missing helper) intentionally falls through to the native path so
+        // embedded MPV keeps working and Settings can clear the opt-in.
+        if (this.isFrameCopyEngineActive()) {
+            return {
+                supported: true,
+                platform: process.platform,
+                engine: 'frame-copy',
+                ...this.getFrameCopySupportDetails(),
+                capabilities: this.detectCapabilities(),
+            };
+        }
+
         const missingLinuxMpvExecutableReason =
             this.getMissingLinuxMpvExecutableReason();
         if (missingLinuxMpvExecutableReason) {
@@ -144,6 +309,7 @@ export class EmbeddedMpvNativeService {
                 supported: false,
                 platform: process.platform,
                 reason: missingLinuxMpvExecutableReason,
+                ...this.getFrameCopySupportDetails(),
             };
         }
 
@@ -160,6 +326,8 @@ export class EmbeddedMpvNativeService {
                 return {
                     supported: true,
                     platform: process.platform,
+                    engine: this.getActiveEngine(),
+                    ...this.getFrameCopySupportDetails(),
                     capabilities: this.detectCapabilities(),
                 };
             } catch (error) {
@@ -224,6 +392,8 @@ export class EmbeddedMpvNativeService {
             return {
                 supported: true,
                 platform: process.platform,
+                engine: this.getActiveEngine(),
+                ...this.getFrameCopySupportDetails(),
                 capabilities: this.detectCapabilities(),
             };
         } catch (error) {
@@ -254,6 +424,8 @@ export class EmbeddedMpvNativeService {
             return {
                 supported: true,
                 platform: process.platform,
+                engine: this.getActiveEngine(),
+                ...this.getFrameCopySupportDetails(),
                 capabilities: this.detectCapabilities(),
             };
         } catch (error) {
@@ -272,11 +444,21 @@ export class EmbeddedMpvNativeService {
     ): EmbeddedMpvSession {
         this.assertEmbeddedMpvEnabled();
         const addon = this.getAddon();
-        const windowHandle = this.getMainWindowHandle();
+        // The frame-copy adapter ignores the native window handle (frames go
+        // through shm to a DOM canvas), so skip resolving it — under native
+        // Wayland the handle assertion would reject an engine that does not
+        // embed into the window at all. Derive the skip from the dispatched
+        // addon rather than re-evaluating the engine gate, so the two
+        // decisions cannot disagree.
+        const usesFrameCopyAddon =
+            this.frameCopyAdapter !== null && addon === this.frameCopyAdapter;
+        const windowHandle = usesFrameCopyAddon
+            ? Buffer.alloc(0)
+            : this.getMainWindowHandle();
         const startedAt = new Date().toISOString();
         const sessionId = addon.createSession(
             windowHandle,
-            bounds,
+            usesFrameCopyAddon ? bounds : this.scaleBoundsForNativeView(bounds),
             title,
             initialVolume
         );
@@ -292,6 +474,7 @@ export class EmbeddedMpvNativeService {
         });
 
         this.ensurePolling();
+        this.ensureRendererLifecycleWatch();
         return (
             this.refreshSession(sessionId) ?? {
                 id: sessionId,
@@ -327,7 +510,13 @@ export class EmbeddedMpvNativeService {
 
     setBounds(sessionId: string, bounds: EmbeddedMpvBounds): void {
         this.assertEmbeddedMpvEnabled();
-        this.getAddon().setBounds(sessionId, bounds);
+        const addon = this.getAddon();
+        const usesFrameCopyAddon =
+            this.frameCopyAdapter !== null && addon === this.frameCopyAdapter;
+        addon.setBounds(
+            sessionId,
+            usesFrameCopyAddon ? bounds : this.scaleBoundsForNativeView(bounds)
+        );
     }
 
     setPaused(sessionId: string, paused: boolean): EmbeddedMpvSession | null {
@@ -544,6 +733,51 @@ export class EmbeddedMpvNativeService {
         }, 500);
     }
 
+    /**
+     * Sessions are torn down by the renderer's Angular lifecycle, which
+     * never runs when the renderer crashes or hard-reloads (dev-server HMR,
+     * Cmd+R). Without this watch, native mpv handles or frame-copy helper
+     * processes leak until app shutdown.
+     */
+    private rendererWatchInstalled = false;
+
+    private ensureRendererLifecycleWatch(): void {
+        if (
+            this.rendererWatchInstalled ||
+            !App.mainWindow ||
+            App.mainWindow.isDestroyed()
+        ) {
+            return;
+        }
+        this.rendererWatchInstalled = true;
+
+        const disposeAll = (reason: string) => {
+            if (this.sessions.size === 0) {
+                return;
+            }
+            console.warn(
+                `[Embedded MPV] Disposing ${this.sessions.size} session(s): renderer ${reason}`
+            );
+            [...this.sessions.keys()].forEach((sessionId) => {
+                try {
+                    this.disposeSession(sessionId);
+                } catch {
+                    // best-effort reaping; polling cleanup handles the rest
+                }
+            });
+        };
+
+        App.mainWindow.webContents.on(
+            'render-process-gone',
+            (_event, details) => disposeAll(`process gone (${details.reason})`)
+        );
+        // Full navigations/reloads only — in-app Angular routing emits
+        // did-navigate-in-page and must not kill the active session.
+        App.mainWindow.webContents.on('did-navigate', () =>
+            disposeAll('reloaded')
+        );
+    }
+
     private stopPollingIfIdle(): void {
         if (this.sessions.size > 0 || !this.pollingTimer) {
             return;
@@ -598,6 +832,13 @@ export class EmbeddedMpvNativeService {
                 typeof snapshot.aspectOverride === 'string'
                     ? snapshot.aspectOverride
                     : 'no',
+            ...(typeof snapshot.videoWidth === 'number' &&
+            typeof snapshot.videoHeight === 'number'
+                ? {
+                      videoWidth: snapshot.videoWidth,
+                      videoHeight: snapshot.videoHeight,
+                  }
+                : {}),
             recording: snapshot.recording ?? { active: false },
             startedAt: session.startedAt,
             updatedAt: new Date().toISOString(),
@@ -763,20 +1004,8 @@ export class EmbeddedMpvNativeService {
         return `${parts[0]}${parts[1]}${parts[2]}-${parts[3]}${parts[4]}${parts[5]}`;
     }
 
-    private isExperimentEnabled(): boolean {
-        return ['1', 'true', 'yes', 'on'].includes(
-            (process.env[EMBEDDED_MPV_EXPERIMENT_ENV] ?? '')
-                .trim()
-                .toLowerCase()
-        );
-    }
-
-    private isEmbeddedMpvEnabled(): boolean {
-        return app.isPackaged || this.isExperimentEnabled();
-    }
-
     private assertEmbeddedMpvEnabled(): void {
-        if (!this.isEmbeddedMpvEnabled()) {
+        if (!isEmbeddedMpvFeatureEnabled()) {
             throw new Error(
                 `Embedded MPV is disabled. Set ${EMBEDDED_MPV_EXPERIMENT_ENV}=1 to enable the local desktop harness, or use a packaged build with the bundled runtime.`
             );
@@ -847,6 +1076,10 @@ export class EmbeddedMpvNativeService {
     }
 
     private getAddon(): NativeEmbeddedMpvAddon {
+        if (this.isFrameCopyEngineActive()) {
+            return this.getFrameCopyAdapter();
+        }
+
         if (this.addon) {
             return this.addon;
         }
@@ -899,47 +1132,7 @@ export class EmbeddedMpvNativeService {
     }
 
     private getAddonCandidatePaths(): string[] {
-        const localBuildAddonPath = path.resolve(
-            process.cwd(),
-            'apps/electron-backend/native/build/Release/embedded_mpv.node'
-        );
-        const distAddonPaths = [
-            path.resolve(__dirname, 'native/embedded_mpv.node'),
-            path.resolve(__dirname, '../../native/embedded_mpv.node'),
-        ];
-        const packagedAddonPaths = [
-            path.resolve(
-                (process as NodeJS.Process & { resourcesPath?: string })
-                    .resourcesPath ?? '',
-                'app.asar.unpacked',
-                'electron-backend',
-                'native',
-                'embedded_mpv.node'
-            ),
-            app.getAppPath()
-                ? path.join(
-                      path.dirname(app.getAppPath()),
-                      'app.asar.unpacked',
-                      'electron-backend',
-                      'native',
-                      'embedded_mpv.node'
-                  )
-                : undefined,
-        ];
-
-        return dedupePaths(
-            app.isPackaged
-                ? [
-                      ...packagedAddonPaths,
-                      ...distAddonPaths,
-                      localBuildAddonPath,
-                  ]
-                : [
-                      localBuildAddonPath,
-                      ...distAddonPaths,
-                      ...packagedAddonPaths,
-                  ]
-        );
+        return getEmbeddedMpvAddonCandidatePaths();
     }
 
     private readUnavailableReason(candidatePaths: string[]): string | null {
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.spec.ts
new file mode 100644
index 000000000..c90ca51d1
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.spec.ts
@@ -0,0 +1,112 @@
+const mockElectronApp = {
+    isPackaged: true,
+};
+
+jest.mock('electron', () => ({ app: mockElectronApp }));
+
+import {
+    EMBEDDED_MPV_RUNTIME_PROBE_SWITCH,
+    runEmbeddedMpvRuntimeDiagnosticOrContinue,
+} from './embedded-mpv-runtime-diagnostic';
+import type { FrameCopyRuntimeAvailability } from './embedded-mpv-frame-copy-platform.util';
+
+interface DiagnosticHarness {
+    continueStartup: jest.Mock<void, []>;
+    exit: jest.Mock<void, [number]>;
+    getRuntimeAvailability: jest.Mock<FrameCopyRuntimeAvailability, []>;
+    writeStdout: jest.Mock<void, [string]>;
+}
+
+function createHarness(
+    availability: FrameCopyRuntimeAvailability = {
+        usable: false,
+        reason: 'runtime-artifact-missing',
+    }
+): DiagnosticHarness {
+    return {
+        continueStartup: jest.fn(),
+        exit: jest.fn(),
+        getRuntimeAvailability: jest.fn(() => availability),
+        writeStdout: jest.fn(),
+    };
+}
+
+function runDiagnostic(
+    argv: readonly string[],
+    harness: DiagnosticHarness
+): void {
+    runEmbeddedMpvRuntimeDiagnosticOrContinue(argv, harness.continueStartup, {
+        exit: harness.exit,
+        getRuntimeAvailability: harness.getRuntimeAvailability,
+        writeStdout: harness.writeStdout,
+    });
+}
+
+describe('embedded MPV runtime diagnostic', () => {
+    it.each([
+        [['electron', 'main.js']],
+        [['electron', 'main.js', `${EMBEDDED_MPV_RUNTIME_PROBE_SWITCH}=1`]],
+        [['electron', 'main.js', 'embedded-mpv-runtime-probe']],
+    ])('continues normal startup for argv %j', (argv) => {
+        const harness = createHarness();
+
+        runDiagnostic(argv, harness);
+
+        expect(harness.continueStartup).toHaveBeenCalledTimes(1);
+        expect(harness.getRuntimeAvailability).not.toHaveBeenCalled();
+        expect(harness.writeStdout).not.toHaveBeenCalled();
+        expect(harness.exit).not.toHaveBeenCalled();
+    });
+
+    it('prints the usable availability as one JSON line, exits zero, and skips startup', () => {
+        const availability: FrameCopyRuntimeAvailability = {
+            usable: true,
+            profile: 'portable',
+            runtimeMode: 'bundled',
+            libmpv: '2.3',
+            renderApi: 'egl',
+        };
+        const harness = createHarness(availability);
+
+        runDiagnostic(
+            ['electron', 'main.js', EMBEDDED_MPV_RUNTIME_PROBE_SWITCH],
+            harness
+        );
+
+        expect(harness.getRuntimeAvailability).toHaveBeenCalledTimes(1);
+        expect(harness.writeStdout).toHaveBeenCalledWith(
+            `${JSON.stringify(availability)}\n`
+        );
+        expect(harness.writeStdout).toHaveBeenCalledTimes(1);
+        expect(harness.exit).toHaveBeenCalledWith(0);
+        expect(harness.exit).toHaveBeenCalledTimes(1);
+        expect(harness.writeStdout.mock.invocationCallOrder[0]).toBeLessThan(
+            harness.exit.mock.invocationCallOrder[0]
+        );
+        expect(harness.continueStartup).not.toHaveBeenCalled();
+    });
+
+    it('prints the unavailable helper reason as one JSON line, exits nonzero, and skips startup', () => {
+        const availability: FrameCopyRuntimeAvailability = {
+            usable: false,
+            reason: 'helper-probe-failed',
+            helperReason: 'gl-context-create-failed',
+            helperDetail: 'EGL initialization failed: display unavailable',
+        };
+        const harness = createHarness(availability);
+
+        runDiagnostic(
+            [EMBEDDED_MPV_RUNTIME_PROBE_SWITCH, 'electron', 'main.js'],
+            harness
+        );
+
+        expect(harness.getRuntimeAvailability).toHaveBeenCalledTimes(1);
+        expect(harness.writeStdout).toHaveBeenCalledWith(
+            '{"usable":false,"reason":"helper-probe-failed","helperReason":"gl-context-create-failed","helperDetail":"EGL initialization failed: display unavailable"}\n'
+        );
+        expect(harness.writeStdout).toHaveBeenCalledTimes(1);
+        expect(harness.exit).toHaveBeenCalledWith(1);
+        expect(harness.exit).toHaveBeenCalledTimes(1);
+        expect(harness.continueStartup).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.ts b/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.ts
new file mode 100644
index 000000000..4c6f23941
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-runtime-diagnostic.ts
@@ -0,0 +1,36 @@
+import { writeSync } from 'fs';
+import {
+    getFrameCopyRuntimeAvailability,
+    type FrameCopyRuntimeAvailability,
+} from './embedded-mpv-frame-copy-platform.util';
+
+export const EMBEDDED_MPV_RUNTIME_PROBE_SWITCH = '--embedded-mpv-runtime-probe';
+
+interface EmbeddedMpvRuntimeDiagnosticDependencies {
+    exit(code: number): void;
+    getRuntimeAvailability(): FrameCopyRuntimeAvailability;
+    writeStdout(output: string): void;
+}
+
+const defaultDependencies: EmbeddedMpvRuntimeDiagnosticDependencies = {
+    exit: (code) => process.exit(code),
+    getRuntimeAvailability: getFrameCopyRuntimeAvailability,
+    writeStdout: (output) => {
+        writeSync(process.stdout.fd, output);
+    },
+};
+
+export function runEmbeddedMpvRuntimeDiagnosticOrContinue(
+    argv: readonly string[],
+    continueStartup: () => void,
+    dependencies: EmbeddedMpvRuntimeDiagnosticDependencies = defaultDependencies
+): void {
+    if (!argv.includes(EMBEDDED_MPV_RUNTIME_PROBE_SWITCH)) {
+        continueStartup();
+        return;
+    }
+
+    const availability = dependencies.getRuntimeAvailability();
+    dependencies.writeStdout(`${JSON.stringify(availability)}\n`);
+    dependencies.exit(availability.usable ? 0 : 1);
+}
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.spec.ts b/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.spec.ts
new file mode 100644
index 000000000..4b672dbe3
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.spec.ts
@@ -0,0 +1,53 @@
+const mockElectronApp = {
+    isPackaged: false,
+};
+
+jest.mock('electron', () => ({ app: mockElectronApp }));
+
+import { isEmbeddedMpvFeatureEnabled } from './embedded-mpv-runtime-policy.util';
+
+describe('embedded-mpv-runtime-policy.util', () => {
+    const originalExperiment =
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+
+    afterEach(() => {
+        mockElectronApp.isPackaged = false;
+        if (originalExperiment === undefined) {
+            delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+        } else {
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT =
+                originalExperiment;
+        }
+    });
+
+    it('enables embedded MPV for packaged apps', () => {
+        mockElectronApp.isPackaged = true;
+        delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+
+        expect(isEmbeddedMpvFeatureEnabled()).toBe(true);
+    });
+
+    it.each(['1', 'true', 'yes', 'on'])(
+        'enables embedded MPV for a truthy development opt-in: %s',
+        (value) => {
+            mockElectronApp.isPackaged = false;
+            process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT = value;
+
+            expect(isEmbeddedMpvFeatureEnabled()).toBe(true);
+        }
+    );
+
+    it.each([undefined, '0', 'false', 'off'])(
+        'keeps embedded MPV disabled for an unpackaged run with opt-in %s',
+        (value) => {
+            mockElectronApp.isPackaged = false;
+            if (value === undefined) {
+                delete process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT;
+            } else {
+                process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT = value;
+            }
+
+            expect(isEmbeddedMpvFeatureEnabled()).toBe(false);
+        }
+    );
+});
diff --git a/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.ts b/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.ts
new file mode 100644
index 000000000..d7753f71d
--- /dev/null
+++ b/apps/electron-backend/src/app/services/embedded-mpv-runtime-policy.util.ts
@@ -0,0 +1,19 @@
+import { app } from 'electron';
+
+export const EMBEDDED_MPV_EXPERIMENT_ENV =
+    'IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT';
+
+function isTruthy(value: string | undefined): boolean {
+    return ['1', 'true', 'yes', 'on'].includes(
+        (value ?? '').trim().toLowerCase()
+    );
+}
+
+/**
+ * Packaged desktop builds enable embedded MPV by default. Unpackaged runs
+ * require the regular experiment opt-in before any embedded-MPV engine may
+ * start or relax BrowserWindow security settings.
+ */
+export function isEmbeddedMpvFeatureEnabled(): boolean {
+    return app.isPackaged || isTruthy(process.env[EMBEDDED_MPV_EXPERIMENT_ENV]);
+}
diff --git a/apps/electron-backend/src/app/services/store.service.ts b/apps/electron-backend/src/app/services/store.service.ts
index a472708aa..7bd61ae7c 100644
--- a/apps/electron-backend/src/app/services/store.service.ts
+++ b/apps/electron-backend/src/app/services/store.service.ts
@@ -8,6 +8,13 @@ export const VLC_PLAYER_PATH = 'VLC_PLAYER_PATH';
 export const VLC_PLAYER_ARGUMENTS = 'VLC_PLAYER_ARGUMENTS';
 export const MPV_REUSE_INSTANCE = 'MPV_REUSE_INSTANCE';
 export const VLC_REUSE_INSTANCE = 'VLC_REUSE_INSTANCE';
+/**
+ * Embedded MPV frame-copy engine opt-in (macOS arm64, Linux x64). Lives in the
+ * main process config file because it must be readable synchronously before
+ * the BrowserWindow is created — the engine relaxes the window sandbox for
+ * its preload frame pump, which cannot change after window creation.
+ */
+export const EMBEDDED_MPV_FRAME_COPY = 'EMBEDDED_MPV_FRAME_COPY';
 
 export type StoreType = {
     [WINDOW_BOUNDS]: Electron.Rectangle;
@@ -17,6 +24,7 @@ export type StoreType = {
     [VLC_PLAYER_ARGUMENTS]: string;
     [MPV_REUSE_INSTANCE]: boolean;
     [VLC_REUSE_INSTANCE]: boolean;
+    [EMBEDDED_MPV_FRAME_COPY]: boolean;
 };
 
 // Export singleton store instance
diff --git a/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.spec.ts b/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.spec.ts
new file mode 100644
index 000000000..0ce33a94e
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.spec.ts
@@ -0,0 +1,303 @@
+import { once } from 'node:events';
+import { getHeapStatistics } from 'node:v8';
+import { MessageChannel, type MessagePort } from 'node:worker_threads';
+import {
+    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON,
+    handleDatabaseWorkerPostGcHeapRequest,
+    isDatabaseWorkerPostGcHeapRequest,
+    type DatabaseWorkerPostGcHeapRequest,
+    type DatabaseWorkerPostGcHeapResult,
+} from './database-worker-post-gc-heap';
+
+jest.mock('node:v8', () => ({
+    getHeapStatistics: jest.fn(),
+}));
+
+const PROFILING_ENV = 'IPTVNATOR_PERF_WORKER_PROFILING';
+const mockedGetHeapStatistics = getHeapStatistics as jest.MockedFunction<
+    typeof getHeapStatistics
+>;
+
+type FakeResponsePort = {
+    close: jest.Mock<void, []>;
+    messages: DatabaseWorkerPostGcHeapResult[];
+    port: MessagePort;
+    postMessage: jest.Mock<void, [DatabaseWorkerPostGcHeapResult]>;
+};
+
+function createFakeResponsePort(): FakeResponsePort {
+    const messages: DatabaseWorkerPostGcHeapResult[] = [];
+    const close = jest.fn<void, []>();
+    const postMessage = jest.fn<void, [DatabaseWorkerPostGcHeapResult]>(
+        (message) => {
+            messages.push(message);
+        }
+    );
+
+    return {
+        close,
+        messages,
+        port: {
+            close,
+            postMessage,
+        } as unknown as MessagePort,
+        postMessage,
+    };
+}
+
+function handleWithFakePort(isIdle: boolean): {
+    gc: jest.Mock<void, []> | null;
+    responsePort: FakeResponsePort;
+} {
+    const responsePort = createFakeResponsePort();
+    const gcCandidate = Reflect.get(globalThis, 'gc');
+    const request: DatabaseWorkerPostGcHeapRequest = {
+        type: 'performance:collect-post-gc-heap',
+        responsePort: responsePort.port,
+    };
+
+    handleDatabaseWorkerPostGcHeapRequest(request, isIdle);
+
+    return {
+        gc:
+            typeof gcCandidate === 'function'
+                ? (gcCandidate as unknown as jest.Mock<void, []>)
+                : null,
+        responsePort,
+    };
+}
+
+describe('database worker post-GC heap capture', () => {
+    const originalProfilingValue = process.env[PROFILING_ENV];
+    const originalGc = Reflect.get(globalThis, 'gc');
+
+    beforeEach(() => {
+        process.env[PROFILING_ENV] = '1';
+        Reflect.set(globalThis, 'gc', jest.fn<void, []>());
+        mockedGetHeapStatistics.mockReset();
+        mockedGetHeapStatistics.mockReturnValue({
+            used_heap_size: 42_000,
+        } as ReturnType<typeof getHeapStatistics>);
+    });
+
+    afterAll(() => {
+        if (originalProfilingValue === undefined) {
+            delete process.env[PROFILING_ENV];
+        } else {
+            process.env[PROFILING_ENV] = originalProfilingValue;
+        }
+
+        if (originalGc === undefined) {
+            Reflect.deleteProperty(globalThis, 'gc');
+        } else {
+            Reflect.set(globalThis, 'gc', originalGc);
+        }
+    });
+
+    it('recognizes only the exact request with a real MessagePort', () => {
+        const { port1, port2 } = new MessageChannel();
+
+        try {
+            expect(
+                isDatabaseWorkerPostGcHeapRequest({
+                    type: 'performance:collect-post-gc-heap',
+                    responsePort: port2,
+                })
+            ).toBe(true);
+            expect(isDatabaseWorkerPostGcHeapRequest(null)).toBe(false);
+            expect(
+                isDatabaseWorkerPostGcHeapRequest({
+                    type: 'performance:collect-post-gc-heap',
+                })
+            ).toBe(false);
+            expect(
+                isDatabaseWorkerPostGcHeapRequest({
+                    type: 'performance:collect-post-gc-heap',
+                    responsePort: {
+                        close: jest.fn(),
+                        postMessage: jest.fn(),
+                    },
+                })
+            ).toBe(false);
+            expect(
+                isDatabaseWorkerPostGcHeapRequest({
+                    type: 'request',
+                    responsePort: port2,
+                })
+            ).toBe(false);
+        } finally {
+            port1.close();
+            port2.close();
+        }
+    });
+
+    it('forces GC before reading and returning the worker V8 heap', async () => {
+        const lifecycle: string[] = [];
+        const { port1, port2 } = new MessageChannel();
+        Reflect.set(
+            globalThis,
+            'gc',
+            jest.fn(() => lifecycle.push('gc'))
+        );
+        mockedGetHeapStatistics.mockImplementation(() => {
+            lifecycle.push('heap');
+            return {
+                used_heap_size: 73_728,
+            } as ReturnType<typeof getHeapStatistics>;
+        });
+        const responsePromise = once(port1, 'message') as Promise<
+            [DatabaseWorkerPostGcHeapResult]
+        >;
+        const peerClosedPromise = once(port1, 'close');
+
+        handleDatabaseWorkerPostGcHeapRequest(
+            {
+                type: 'performance:collect-post-gc-heap',
+                responsePort: port2,
+            },
+            true
+        );
+
+        await expect(responsePromise).resolves.toEqual([
+            {
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: 73_728,
+                unavailableReason: null,
+            },
+        ]);
+        await peerClosedPromise;
+        expect(lifecycle).toEqual(['gc', 'heap']);
+    });
+
+    it('fails closed without profiling opt-in', () => {
+        delete process.env[PROFILING_ENV];
+
+        const { gc, responsePort } = handleWithFakePort(true);
+
+        expect(gc).not.toHaveBeenCalled();
+        expect(mockedGetHeapStatistics).not.toHaveBeenCalled();
+        expect(responsePort.messages).toEqual([
+            {
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: null,
+                unavailableReason:
+                    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.PROFILING_DISABLED,
+            },
+        ]);
+        expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+        expect(responsePort.close).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not perturb an active database operation', () => {
+        const { gc, responsePort } = handleWithFakePort(false);
+
+        expect(gc).not.toHaveBeenCalled();
+        expect(mockedGetHeapStatistics).not.toHaveBeenCalled();
+        expect(responsePort.messages).toEqual([
+            {
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: null,
+                unavailableReason:
+                    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.WORKER_BUSY,
+            },
+        ]);
+        expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+        expect(responsePort.close).toHaveBeenCalledTimes(1);
+    });
+
+    it('reports an unavailable exposed-GC runtime without reading heap statistics', () => {
+        Reflect.deleteProperty(globalThis, 'gc');
+
+        const { responsePort } = handleWithFakePort(true);
+
+        expect(mockedGetHeapStatistics).not.toHaveBeenCalled();
+        expect(responsePort.messages).toEqual([
+            {
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: null,
+                unavailableReason:
+                    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.GC_UNAVAILABLE,
+            },
+        ]);
+        expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+        expect(responsePort.close).toHaveBeenCalledTimes(1);
+    });
+
+    it.each([
+        ['negative', -1],
+        ['fractional', 1.5],
+        ['NaN', Number.NaN],
+        ['infinite', Number.POSITIVE_INFINITY],
+        ['unsafe', Number.MAX_SAFE_INTEGER + 1],
+    ])('rejects a %s heap measurement', (_label, usedHeapSize) => {
+        mockedGetHeapStatistics.mockReturnValue({
+            used_heap_size: usedHeapSize,
+        } as ReturnType<typeof getHeapStatistics>);
+
+        const { gc, responsePort } = handleWithFakePort(true);
+
+        expect(gc).toHaveBeenCalledTimes(1);
+        expect(mockedGetHeapStatistics).toHaveBeenCalledTimes(1);
+        expect(responsePort.messages).toEqual([
+            {
+                type: 'performance:post-gc-heap-result',
+                postGcHeapUsedBytes: null,
+                unavailableReason:
+                    DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.CAPTURE_FAILED,
+            },
+        ]);
+        expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+        expect(responsePort.close).toHaveBeenCalledTimes(1);
+    });
+
+    it.each(['gc', 'heap'] as const)(
+        'reports capture failure when %s collection throws',
+        (failurePoint) => {
+            if (failurePoint === 'gc') {
+                Reflect.set(
+                    globalThis,
+                    'gc',
+                    jest.fn(() => {
+                        throw new Error('gc failed');
+                    })
+                );
+            } else {
+                mockedGetHeapStatistics.mockImplementation(() => {
+                    throw new Error('heap failed');
+                });
+            }
+
+            const { responsePort } = handleWithFakePort(true);
+
+            expect(responsePort.messages).toEqual([
+                {
+                    type: 'performance:post-gc-heap-result',
+                    postGcHeapUsedBytes: null,
+                    unavailableReason:
+                        DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.CAPTURE_FAILED,
+                },
+            ]);
+            expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+            expect(responsePort.close).toHaveBeenCalledTimes(1);
+        }
+    );
+
+    it('still closes the one-shot port when posting the result fails', () => {
+        const responsePort = createFakeResponsePort();
+        responsePort.postMessage.mockImplementation(() => {
+            throw new Error('port closed');
+        });
+
+        expect(() =>
+            handleDatabaseWorkerPostGcHeapRequest(
+                {
+                    type: 'performance:collect-post-gc-heap',
+                    responsePort: responsePort.port,
+                },
+                true
+            )
+        ).not.toThrow();
+        expect(responsePort.postMessage).toHaveBeenCalledTimes(1);
+        expect(responsePort.close).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.ts b/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.ts
new file mode 100644
index 000000000..fa95bc390
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/database-worker-post-gc-heap.ts
@@ -0,0 +1,124 @@
+import { getHeapStatistics } from 'node:v8';
+import { MessagePort } from 'node:worker_threads';
+import { WORKER_PROFILING_ENV } from './worker-performance-capture.runtime';
+
+export const DATABASE_WORKER_POST_GC_HEAP_REQUEST_TYPE =
+    'performance:collect-post-gc-heap' as const;
+export const DATABASE_WORKER_POST_GC_HEAP_RESULT_TYPE =
+    'performance:post-gc-heap-result' as const;
+
+export const DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON = {
+    CAPTURE_FAILED: 'capture-failed',
+    GC_UNAVAILABLE: 'gc-unavailable',
+    PROFILING_DISABLED: 'profiling-disabled',
+    WORKER_BUSY: 'worker-busy',
+} as const;
+
+export type DatabaseWorkerPostGcHeapUnavailableReason =
+    (typeof DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON)[keyof typeof DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON];
+
+export interface DatabaseWorkerPostGcHeapRequest {
+    readonly type: typeof DATABASE_WORKER_POST_GC_HEAP_REQUEST_TYPE;
+    readonly responsePort: MessagePort;
+}
+
+export type DatabaseWorkerPostGcHeapResult =
+    | {
+          readonly type: typeof DATABASE_WORKER_POST_GC_HEAP_RESULT_TYPE;
+          readonly postGcHeapUsedBytes: number;
+          readonly unavailableReason: null;
+      }
+    | {
+          readonly type: typeof DATABASE_WORKER_POST_GC_HEAP_RESULT_TYPE;
+          readonly postGcHeapUsedBytes: null;
+          readonly unavailableReason: DatabaseWorkerPostGcHeapUnavailableReason;
+      };
+
+export function isDatabaseWorkerPostGcHeapRequest(
+    message: unknown
+): message is DatabaseWorkerPostGcHeapRequest {
+    if (
+        typeof message !== 'object' ||
+        message === null ||
+        Array.isArray(message)
+    ) {
+        return false;
+    }
+
+    const candidate = message as Record<string, unknown>;
+    return (
+        candidate['type'] === DATABASE_WORKER_POST_GC_HEAP_REQUEST_TYPE &&
+        candidate['responsePort'] instanceof MessagePort
+    );
+}
+
+function unavailableResult(
+    unavailableReason: DatabaseWorkerPostGcHeapUnavailableReason
+): DatabaseWorkerPostGcHeapResult {
+    return {
+        type: DATABASE_WORKER_POST_GC_HEAP_RESULT_TYPE,
+        postGcHeapUsedBytes: null,
+        unavailableReason,
+    };
+}
+
+function postResult(
+    responsePort: MessagePort,
+    result: DatabaseWorkerPostGcHeapResult
+): void {
+    try {
+        responsePort.postMessage(result);
+    } catch {
+        // Development-only profiling transport must not affect worker behavior.
+    } finally {
+        try {
+            responsePort.close();
+        } catch {
+            // The one-shot port may already be closed by its peer.
+        }
+    }
+}
+
+export function handleDatabaseWorkerPostGcHeapRequest(
+    message: DatabaseWorkerPostGcHeapRequest,
+    isIdle: boolean
+): void {
+    let result: DatabaseWorkerPostGcHeapResult;
+
+    if (process.env[WORKER_PROFILING_ENV] !== '1') {
+        result = unavailableResult(
+            DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.PROFILING_DISABLED
+        );
+    } else if (!isIdle) {
+        result = unavailableResult(
+            DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.WORKER_BUSY
+        );
+    } else if (typeof globalThis.gc !== 'function') {
+        result = unavailableResult(
+            DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.GC_UNAVAILABLE
+        );
+    } else {
+        try {
+            globalThis.gc();
+            const postGcHeapUsedBytes = getHeapStatistics().used_heap_size;
+
+            result =
+                Number.isSafeInteger(postGcHeapUsedBytes) &&
+                postGcHeapUsedBytes >= 0
+                    ? {
+                          type: DATABASE_WORKER_POST_GC_HEAP_RESULT_TYPE,
+                          postGcHeapUsedBytes,
+                          unavailableReason: null,
+                      }
+                    : unavailableResult(
+                          DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.CAPTURE_FAILED
+                      );
+        } catch {
+            result = unavailableResult(
+                DATABASE_WORKER_POST_GC_HEAP_UNAVAILABLE_REASON.CAPTURE_FAILED
+            );
+        }
+    }
+
+    postResult(message.responsePort, result);
+}
diff --git a/apps/electron-backend/src/app/workers/database-worker.types.ts b/apps/electron-backend/src/app/workers/database-worker.types.ts
index 7b1f21df6..d312ae21a 100644
--- a/apps/electron-backend/src/app/workers/database-worker.types.ts
+++ b/apps/electron-backend/src/app/workers/database-worker.types.ts
@@ -1,3 +1,5 @@
+import type { WorkerPerformanceCaptureResult } from './worker-performance-capture';
+
 export const DB_WORKER_OPERATIONS = [
     'DB_HAS_CATEGORIES',
     'DB_GET_CATEGORIES',
@@ -51,6 +53,8 @@ export const DB_WORKER_OPERATIONS = [
     'DB_CLEAR_PLAYBACK_POSITION',
     'DB_GET_TMDB_METADATA',
     'DB_SET_TMDB_METADATA',
+    'DB_GET_TMDB_CACHE_STATS',
+    'DB_CLEAR_TMDB_METADATA',
     'DB_MATCH_TITLES',
 ] as const;
 
@@ -136,6 +140,7 @@ export interface DbWorkerResponseMessage<TResult = unknown> {
     success: boolean;
     result?: TResult;
     error?: SerializedWorkerError;
+    performance?: WorkerPerformanceCaptureResult;
 }
 
 export type DbWorkerIncomingMessage =
diff --git a/apps/electron-backend/src/app/workers/database.worker.ts b/apps/electron-backend/src/app/workers/database.worker.ts
index 868a856d5..61ca7f54d 100644
--- a/apps/electron-backend/src/app/workers/database.worker.ts
+++ b/apps/electron-backend/src/app/workers/database.worker.ts
@@ -64,6 +64,8 @@ import {
     getAppState,
     getPlaylist,
     setAppState,
+    type AppPlaylistGetPhaseCapture,
+    type AppPlaylistUpsertPhaseCapture,
     updatePlaylist,
     upsertAppPlaylist,
     upsertAppPlaylists,
@@ -79,6 +81,8 @@ import {
 } from '../database/operations/recently-viewed.operations';
 import { matchTitles } from '../database/operations/title-match.operations';
 import {
+    clearTmdbMetadata,
+    getTmdbCacheStats,
     getTmdbMetadata,
     setTmdbMetadata,
 } from '../database/operations/tmdb.operations';
@@ -86,6 +90,23 @@ import {
     deleteXtreamContent,
     restoreXtreamUserData,
 } from '../database/operations/xtream.operations';
+import {
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    registerDatabaseWorkerPerformanceCapture,
+    releaseDatabaseWorkerPerformanceCapture,
+    stampWorkerPerformanceResponsePostedEpoch,
+    startWorkerPerformanceCapture,
+    type WorkerPerformanceCapture,
+} from './worker-performance-capture';
+import {
+    captureWorkerPerformancePhase,
+    captureWorkerPerformancePhaseAsync,
+} from './worker-performance-phase';
+import {
+    handleDatabaseWorkerPostGcHeapRequest,
+    isDatabaseWorkerPostGcHeapRequest,
+} from './database-worker-post-gc-heap';
 
 const loggerLabel = '[DB Worker]';
 const batchDelayMs = Number.parseInt(
@@ -97,6 +118,11 @@ type ActiveOperationState = {
     cancelled: boolean;
 };
 
+type PreRegisteredActiveOperation = {
+    operationId: string;
+    state: ActiveOperationState;
+};
+
 type OperationController = {
     control: {
         checkpoint: () => Promise<void>;
@@ -122,6 +148,7 @@ type OperationController = {
 };
 
 const activeOperations = new Map<string, ActiveOperationState>();
+const activePerformanceCaptures = new Set<WorkerPerformanceCapture>();
 
 if (!parentPort) {
     throw new Error('Database worker must be started with a parent port');
@@ -171,17 +198,22 @@ async function pauseBetweenBatches(): Promise<void> {
     await new Promise((resolve) => setTimeout(resolve, batchDelayMs));
 }
 
-function createOperationController(config: {
-    operationId?: string;
-    operation: string;
-    playlistId?: string;
-    requestId: string;
-    cancellable?: boolean;
-}): OperationController {
+function createOperationController(
+    config: {
+        operationId?: string;
+        operation: string;
+        playlistId?: string;
+        requestId: string;
+        cancellable?: boolean;
+    },
+    preRegisteredState?: ActiveOperationState
+): OperationController {
     const { operationId, operation, playlistId, requestId } = config;
     const cancellable = config.cancellable ?? true;
     const activeState =
-        operationId && cancellable ? { cancelled: false } : null;
+        operationId && cancellable
+            ? (preRegisteredState ?? { cancelled: false })
+            : null;
 
     if (operationId && activeState) {
         activeOperations.set(operationId, activeState);
@@ -248,7 +280,10 @@ function createOperationController(config: {
             });
         },
         cleanup: () => {
-            if (operationId) {
+            if (
+                operationId &&
+                activeOperations.get(operationId) === activeState
+            ) {
                 activeOperations.delete(operationId);
             }
         },
@@ -257,9 +292,10 @@ function createOperationController(config: {
 
 async function executeTrackedOperation<TResult>(
     config: Parameters<typeof createOperationController>[0],
-    handler: (controller: OperationController) => Promise<TResult>
+    handler: (controller: OperationController) => Promise<TResult>,
+    preRegisteredState?: ActiveOperationState
 ): Promise<TResult> {
-    const controller = createOperationController(config);
+    const controller = createOperationController(config, preRegisteredState);
 
     try {
         return await handler(controller);
@@ -275,7 +311,54 @@ async function executeTrackedOperation<TResult>(
     }
 }
 
-async function executeRequest(message: DbWorkerRequestMessage) {
+function preRegisterCancellableOperation(
+    message: DbWorkerRequestMessage
+): PreRegisteredActiveOperation | null {
+    switch (message.operation) {
+        case 'DB_SAVE_CONTENT':
+        case 'DB_DELETE_PLAYLIST':
+        case 'DB_DELETE_XTREAM_CONTENT':
+        case 'DB_RESTORE_XTREAM_USER_DATA':
+            break;
+        default:
+            return null;
+    }
+
+    if (
+        typeof message.payload !== 'object' ||
+        message.payload === null ||
+        Array.isArray(message.payload)
+    ) {
+        return null;
+    }
+    const operationId = (message.payload as Record<string, unknown>)[
+        'operationId'
+    ];
+    if (typeof operationId !== 'string' || operationId.length === 0) {
+        return null;
+    }
+
+    const state: ActiveOperationState = { cancelled: false };
+    activeOperations.set(operationId, state);
+    return { operationId, state };
+}
+
+function releasePreRegisteredOperation(
+    operation: PreRegisteredActiveOperation | null
+): void {
+    if (
+        operation &&
+        activeOperations.get(operation.operationId) === operation.state
+    ) {
+        activeOperations.delete(operation.operationId);
+    }
+}
+
+async function executeRequest(
+    message: DbWorkerRequestMessage,
+    preRegisteredState?: ActiveOperationState,
+    performanceCapture: WorkerPerformanceCapture | null = null
+) {
     const db = await getWorkerDatabase();
 
     switch (message.operation) {
@@ -355,11 +438,7 @@ async function executeRequest(message: DbWorkerRequestMessage) {
                 kind?: 'all' | 'vod' | 'series';
                 limit?: number;
                 playlistType?:
-                    | 'xtream'
-                    | 'stalker'
-                    | 'm3u-file'
-                    | 'm3u-text'
-                    | 'm3u-url';
+                    'xtream' | 'stalker' | 'm3u-file' | 'm3u-text' | 'm3u-url';
             };
             return getGlobalRecentlyAdded(
                 db,
@@ -406,7 +485,8 @@ async function executeRequest(message: DbWorkerRequestMessage) {
                     });
 
                     return result;
-                }
+                },
+                preRegisteredState
             );
         }
 
@@ -499,9 +579,29 @@ async function executeRequest(message: DbWorkerRequestMessage) {
         }
 
         case 'DB_UPSERT_APP_PLAYLIST': {
+            const capturePhase: AppPlaylistUpsertPhaseCapture | undefined =
+                performanceCapture
+                    ? {
+                          captureAsync: (phase, execute, metadata) =>
+                              captureWorkerPerformancePhaseAsync(
+                                  performanceCapture,
+                                  phase,
+                                  execute,
+                                  metadata
+                              ),
+                          captureSync: (phase, execute, metadata) =>
+                              captureWorkerPerformancePhase(
+                                  performanceCapture,
+                                  phase,
+                                  execute,
+                                  metadata
+                              ),
+                      }
+                    : undefined;
             return upsertAppPlaylist(
                 db,
-                message.payload as Record<string, unknown>
+                message.payload as Record<string, unknown>,
+                capturePhase
             );
         }
 
@@ -520,7 +620,26 @@ async function executeRequest(message: DbWorkerRequestMessage) {
 
         case 'DB_GET_APP_PLAYLIST': {
             const payload = message.payload as { playlistId: string };
-            return getAppPlaylist(db, payload.playlistId);
+            const capturePhase: AppPlaylistGetPhaseCapture | undefined =
+                performanceCapture
+                    ? {
+                          captureAsync: (phase, execute, metadata) =>
+                              captureWorkerPerformancePhaseAsync(
+                                  performanceCapture,
+                                  phase,
+                                  execute,
+                                  metadata
+                              ),
+                          captureSync: (phase, execute, metadata) =>
+                              captureWorkerPerformancePhase(
+                                  performanceCapture,
+                                  phase,
+                                  execute,
+                                  metadata
+                              ),
+                      }
+                    : undefined;
+            return getAppPlaylist(db, payload.playlistId, capturePhase);
         }
 
         case 'DB_GET_APP_PLAYLIST_FAVORITE_CHANNELS': {
@@ -579,7 +698,8 @@ async function executeRequest(message: DbWorkerRequestMessage) {
                     });
 
                     return result;
-                }
+                },
+                preRegisteredState
             );
         }
 
@@ -614,6 +734,12 @@ async function executeRequest(message: DbWorkerRequestMessage) {
             return setTmdbMetadata(db, payload.entry);
         }
 
+        case 'DB_GET_TMDB_CACHE_STATS':
+            return getTmdbCacheStats(db);
+
+        case 'DB_CLEAR_TMDB_METADATA':
+            return clearTmdbMetadata(db);
+
         case 'DB_MATCH_TITLES': {
             const payload = message.payload as { titles: string[] };
             return matchTitles(db, payload.titles);
@@ -682,7 +808,8 @@ async function executeRequest(message: DbWorkerRequestMessage) {
                     });
 
                     return result;
-                }
+                },
+                preRegisteredState
             );
         }
 
@@ -726,7 +853,8 @@ async function executeRequest(message: DbWorkerRequestMessage) {
                     });
 
                     return result;
-                }
+                },
+                preRegisteredState
             );
         }
 
@@ -770,7 +898,11 @@ async function executeRequest(message: DbWorkerRequestMessage) {
 
         case 'DB_REORDER_GLOBAL_FAVORITES': {
             const payload = message.payload as {
-                updates: { content_id: number; position: number }[];
+                updates: {
+                    content_id: number;
+                    playlist_id: string;
+                    position: number;
+                }[];
             };
             return reorderGlobalFavorites(db, payload.updates);
         }
@@ -904,6 +1036,14 @@ async function executeRequest(message: DbWorkerRequestMessage) {
 }
 
 parentPort.on('message', async (message: DbWorkerIncomingMessage) => {
+    if (isDatabaseWorkerPostGcHeapRequest(message)) {
+        handleDatabaseWorkerPostGcHeapRequest(
+            message,
+            activePerformanceCaptures.size === 0
+        );
+        return;
+    }
+
     if (message.type === 'cancel') {
         const activeOperation = activeOperations.get(message.operationId);
         if (activeOperation) {
@@ -912,25 +1052,62 @@ parentPort.on('message', async (message: DbWorkerIncomingMessage) => {
         return;
     }
 
-    try {
-        const result = await executeRequest(message);
+    const preRegisteredOperation = preRegisterCancellableOperation(message);
+    let performanceCapture: WorkerPerformanceCapture | null = null;
+    const execution = await (async () => {
+        try {
+            performanceCapture = startWorkerPerformanceCapture({
+                requestId: message.requestId,
+            });
+            registerDatabaseWorkerPerformanceCapture(
+                activePerformanceCaptures,
+                performanceCapture
+            );
+            await armWorkerPerformanceCapture(performanceCapture);
+            return await executeWithWorkerPerformanceCapture(
+                performanceCapture,
+                () =>
+                    executeRequest(
+                        message,
+                        preRegisteredOperation?.state,
+                        performanceCapture
+                    )
+            );
+        } finally {
+            releaseDatabaseWorkerPerformanceCapture(
+                activePerformanceCaptures,
+                performanceCapture
+            );
+            releasePreRegisteredOperation(preRegisteredOperation);
+        }
+    })();
+
+    if (execution.success) {
         postMessage({
             type: 'response',
             requestId: message.requestId,
             success: true,
-            result,
+            result: execution.result,
+            performance: stampWorkerPerformanceResponsePostedEpoch(
+                performanceCapture,
+                execution.performance
+            ),
         });
-    } catch (error) {
+    } else {
         console.error(
             loggerLabel,
             `Error handling ${message.operation}:`,
-            error
+            execution.error
         );
         postMessage({
             type: 'response',
             requestId: message.requestId,
             success: false,
-            error: serializeError(error),
+            error: serializeError(execution.error),
+            performance: stampWorkerPerformanceResponsePostedEpoch(
+                performanceCapture,
+                execution.performance
+            ),
         });
     }
 });
diff --git a/apps/electron-backend/src/app/workers/epg-database.spec.ts b/apps/electron-backend/src/app/workers/epg-database.spec.ts
index d448e47f7..d8c5519c2 100644
--- a/apps/electron-backend/src/app/workers/epg-database.spec.ts
+++ b/apps/electron-backend/src/app/workers/epg-database.spec.ts
@@ -21,12 +21,30 @@ function normalizeSql(sql: unknown): string {
     return String(sql).replace(/\s+/g, ' ').trim();
 }
 
-function createEpgDatabaseMock() {
+function createEpgDatabaseMock(
+    options: {
+        /** Result of the sqlite_master index-existence probe. */
+        dedupIndexExists?: boolean;
+        /** Make the CREATE UNIQUE INDEX statement throw on run(). */
+        failIndexCreation?: boolean;
+    } = {}
+) {
     const statements = new Map<string, jest.Mock>();
     const prepare = jest.fn((statement: string) => {
-        const run = jest.fn();
-        statements.set(normalizeSql(statement), run);
-        return { run };
+        const normalized = normalizeSql(statement);
+        const run = jest.fn(() => {
+            if (
+                options.failIndexCreation &&
+                normalized.startsWith('CREATE UNIQUE INDEX')
+            ) {
+                throw new Error('UNIQUE constraint failed');
+            }
+        });
+        const get = jest.fn(() =>
+            options.dedupIndexExists ? { 1: 1 } : undefined
+        );
+        statements.set(normalized, run);
+        return { run, get };
     });
     const transaction = jest.fn((callback: (rows: unknown[]) => void) => {
         return (rows: unknown[]) => callback(rows);
@@ -43,7 +61,7 @@ function createEpgDatabaseMock() {
 }
 
 describe('EpgDatabase', () => {
-    it('refreshes a source without cascading shared channel programs from other sources', () => {
+    it('refreshes a source selectively, keeping the recent past-programme archive', () => {
         const sourceUrl = 'https://example.com/playlist-guide.xml';
         const { Database, database, statements } = createEpgDatabaseMock();
         const epgDb = new EpgDatabase(Database);
@@ -62,8 +80,11 @@ describe('EpgDatabase', () => {
         const preparedSql = database.prepare.mock.calls.map(([sql]) =>
             normalizeSql(sql)
         );
-        const deleteProgramsSql =
-            'DELETE FROM epg_programs WHERE source_url = ?';
+        const deleteTodayAndFutureSql = normalizeSql(`
+            DELETE FROM epg_programs
+            WHERE source_url = ?
+              AND (start >= date('now') OR start < date('now', '-7 days'))
+        `);
         const deleteOrphanChannelsSql = normalizeSql(`
             DELETE FROM epg_channels
             WHERE source_url = ?
@@ -74,12 +95,18 @@ describe('EpgDatabase', () => {
               )
         `);
 
-        expect(preparedSql).toContain(deleteProgramsSql);
+        expect(preparedSql).toContain(deleteTodayAndFutureSql);
         expect(preparedSql).toContain(deleteOrphanChannelsSql);
+        // A refresh must not wipe the whole source: the last 7 days of
+        // programmes stay behind so catch-up remains browsable (#1138),
+        // and other sources' shared channels must not cascade away.
+        expect(preparedSql).not.toContain(
+            'DELETE FROM epg_programs WHERE source_url = ?'
+        );
         expect(preparedSql).not.toContain(
             'DELETE FROM epg_channels WHERE source_url = ?'
         );
-        expect(statements.get(deleteProgramsSql)).toHaveBeenCalledWith(
+        expect(statements.get(deleteTodayAndFutureSql)).toHaveBeenCalledWith(
             sourceUrl
         );
         expect(statements.get(deleteOrphanChannelsSql)).toHaveBeenCalledWith(
@@ -101,6 +128,95 @@ describe('EpgDatabase', () => {
             'source_url = excluded.source_url'
         );
     });
+
+    it('removes pre-existing duplicate programs before creating the dedup index', () => {
+        const { Database, database, statements } = createEpgDatabaseMock();
+
+        new EpgDatabase(Database);
+
+        const preparedSql = database.prepare.mock.calls.map(([sql]) =>
+            normalizeSql(sql)
+        );
+        const dedupDeleteSql = preparedSql.find((sql) =>
+            sql.startsWith('DELETE FROM epg_programs WHERE id NOT IN')
+        );
+        const createIndexSql = preparedSql.find((sql) =>
+            sql.startsWith('CREATE UNIQUE INDEX idx_epg_programs_dedup_v2')
+        );
+        const dropOldIndexSql = preparedSql.find((sql) =>
+            sql.startsWith('DROP INDEX IF EXISTS idx_epg_programs_dedup')
+        );
+
+        expect(dedupDeleteSql).toBeDefined();
+        expect(createIndexSql).toBeDefined();
+        expect(dropOldIndexSql).toBeDefined();
+        expect(statements.get(dedupDeleteSql!)).toHaveBeenCalled();
+        expect(statements.get(createIndexSql!)).toHaveBeenCalled();
+        expect(statements.get(dropOldIndexSql!)).toHaveBeenCalled();
+
+        // The dedup key and index are source-aware so programmes imported
+        // from different EPG sources are not collapsed.
+        expect(dedupDeleteSql).toContain(
+            'GROUP BY channel_id, start, title, source_url'
+        );
+        expect(createIndexSql).toContain(
+            'epg_programs(channel_id, start, title, source_url)'
+        );
+
+        const insertProgramSql = preparedSql.find((sql) =>
+            sql.startsWith('INSERT INTO epg_programs')
+        );
+        expect(insertProgramSql).toContain(
+            'ON CONFLICT(channel_id, start, title, source_url) DO UPDATE SET'
+        );
+        expect(insertProgramSql).not.toContain(
+            'source_url = excluded.source_url'
+        );
+    });
+
+    it('skips the dedup pass when the index already exists', () => {
+        const { Database, database } = createEpgDatabaseMock({
+            dedupIndexExists: true,
+        });
+
+        new EpgDatabase(Database);
+
+        const preparedSql = database.prepare.mock.calls.map(([sql]) =>
+            normalizeSql(sql)
+        );
+        expect(
+            preparedSql.some((sql) =>
+                sql.startsWith('DELETE FROM epg_programs WHERE id NOT IN')
+            )
+        ).toBe(false);
+        expect(
+            preparedSql.some((sql) => sql.startsWith('CREATE UNIQUE INDEX'))
+        ).toBe(false);
+
+        const insertProgramSql = preparedSql.find((sql) =>
+            sql.startsWith('INSERT INTO epg_programs')
+        );
+        expect(insertProgramSql).toContain(
+            'ON CONFLICT(channel_id, start, title, source_url) DO UPDATE SET'
+        );
+    });
+
+    it('falls back to plain inserts when index creation fails', () => {
+        const { Database, database } = createEpgDatabaseMock({
+            failIndexCreation: true,
+        });
+
+        expect(() => new EpgDatabase(Database)).not.toThrow();
+
+        const preparedSql = database.prepare.mock.calls.map(([sql]) =>
+            normalizeSql(sql)
+        );
+        const insertProgramSql = preparedSql.find((sql) =>
+            sql.startsWith('INSERT INTO epg_programs')
+        );
+        expect(insertProgramSql).toBeDefined();
+        expect(insertProgramSql).not.toContain('ON CONFLICT');
+    });
 });
 
 describe('EpgDatabaseClearOperation', () => {
diff --git a/apps/electron-backend/src/app/workers/epg-database.ts b/apps/electron-backend/src/app/workers/epg-database.ts
index 6123619c0..3865b4bad 100644
--- a/apps/electron-backend/src/app/workers/epg-database.ts
+++ b/apps/electron-backend/src/app/workers/epg-database.ts
@@ -11,8 +11,8 @@ export class EpgDatabase {
     private readonly knownChannelIds = new Set<string>();
     private readonly insertChannelStmt: BetterSqlite3.Statement;
     private readonly insertProgramStmt: BetterSqlite3.Statement;
-    private readonly deleteProgramsForSourceStmt: BetterSqlite3.Statement;
     private readonly deleteOrphanChannelsForSourceStmt: BetterSqlite3.Statement;
+    private readonly deleteTodayAndFutureStmt: BetterSqlite3.Statement;
 
     constructor(Database: typeof BetterSqlite3) {
         this.db = new Database(getIptvnatorDatabasePath());
@@ -30,14 +30,33 @@ export class EpgDatabase {
                 updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
         `);
 
-        this.insertProgramStmt = this.db.prepare(`
-            INSERT INTO epg_programs (channel_id, start, stop, title, description, category, icon_url, rating, episode_num, source_url)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `);
+        // Guard against duplicate entries when the clearFirst logic misses old
+        // rows. The same channel + start + title + source is treated as the
+        // same programme — a later import with a corrected stop time simply
+        // updates the earlier row. `source_url` is part of the key so that
+        // programmes imported from different EPG sources that happen to share
+        // channel_id/start/title stay isolated: the query layer scopes by
+        // source_url, and source-scoped deletes must not clobber another
+        // source's rows.
+        // The upsert (instead of INSERT OR REPLACE) keeps the epg_programs_fts
+        // triggers consistent: REPLACE deletes rows without firing the delete
+        // trigger unless recursive_triggers is enabled, leaving ghost FTS rows.
+        const dedupIndexReady = this.ensureProgramDedupIndex();
 
-        this.deleteProgramsForSourceStmt = this.db.prepare(`
-            DELETE FROM epg_programs WHERE source_url = ?
-        `);
+        this.insertProgramStmt = this.db.prepare(
+            dedupIndexReady
+                ? `INSERT INTO epg_programs (channel_id, start, stop, title, description, category, icon_url, rating, episode_num, source_url)
+                   VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                   ON CONFLICT(channel_id, start, title, source_url) DO UPDATE SET
+                       stop = excluded.stop,
+                       description = excluded.description,
+                       category = excluded.category,
+                       icon_url = excluded.icon_url,
+                       rating = excluded.rating,
+                       episode_num = excluded.episode_num`
+                : `INSERT INTO epg_programs (channel_id, start, stop, title, description, category, icon_url, rating, episode_num, source_url)
+                   VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        );
 
         this.deleteOrphanChannelsForSourceStmt = this.db.prepare(`
             DELETE FROM epg_channels
@@ -48,21 +67,28 @@ export class EpgDatabase {
                   WHERE epg_programs.channel_id = epg_channels.id
               )
         `);
+
+        this.deleteTodayAndFutureStmt = this.db.prepare(`
+            DELETE FROM epg_programs
+            WHERE source_url = ?
+              AND (start >= date('now') OR start < date('now', '-7 days'))
+        `);
     }
 
     /**
-     * Insert a batch of channels. When `clearFirst` is true, the existing rows
-     * for `sourceUrl` are deleted inside the same transaction as the insert so
-     * old data is preserved if the fetch/parse never produces any channels.
+     * Insert a batch of channels. When `clearTodayAndFuture` is true, the
+     * selective delete (today+future and older-than-7-days) runs inside the
+     * same transaction so a parse failure after the delete atomically rolls
+     * back both — no gap left in the schedule.
      */
     insertChannels(
         channels: ParsedChannel[],
         sourceUrl: string,
-        clearFirst = false
+        clearTodayAndFuture = false
     ): void {
         const insertMany = this.db.transaction((channels: ParsedChannel[]) => {
-            if (clearFirst) {
-                this.deleteProgramsForSourceStmt.run(sourceUrl);
+            if (clearTodayAndFuture) {
+                this.deleteTodayAndFutureStmt.run(sourceUrl);
                 this.deleteOrphanChannelsForSourceStmt.run(sourceUrl);
                 this.knownChannelIds.clear();
             }
@@ -131,6 +157,57 @@ export class EpgDatabase {
     close(): void {
         this.db.close();
     }
+
+    /**
+     * Create the unique (channel_id, start, title, source_url) dedup index.
+     *
+     * Databases that predate the index may already contain duplicate rows —
+     * exactly the situation the index is meant to prevent — so those are
+     * removed first; a plain `CREATE UNIQUE INDEX` would otherwise throw in
+     * this constructor and permanently break EPG imports for upgrading users.
+     *
+     * The `_v2` name migrates users off the earlier source-blind index
+     * (`idx_epg_programs_dedup` on `channel_id, start, title`), which
+     * collapsed programmes imported from different EPG sources that shared
+     * those three columns. The old index is dropped so it can no longer
+     * enforce the source-blind uniqueness.
+     *
+     * Returns false when the index could not be created, in which case the
+     * insert statement falls back to the previous plain-INSERT behaviour.
+     */
+    private ensureProgramDedupIndex(): boolean {
+        try {
+            const exists = this.db
+                .prepare(
+                    `SELECT 1 FROM sqlite_master
+                     WHERE type = 'index' AND name = 'idx_epg_programs_dedup_v2'`
+                )
+                .get();
+            if (!exists) {
+                this.db
+                    .prepare(`DROP INDEX IF EXISTS idx_epg_programs_dedup`)
+                    .run();
+                this.db
+                    .prepare(
+                        `DELETE FROM epg_programs
+                         WHERE id NOT IN (
+                             SELECT MIN(id) FROM epg_programs
+                             GROUP BY channel_id, start, title, source_url
+                         )`
+                    )
+                    .run();
+                this.db
+                    .prepare(
+                        `CREATE UNIQUE INDEX idx_epg_programs_dedup_v2
+                         ON epg_programs(channel_id, start, title, source_url)`
+                    )
+                    .run();
+            }
+            return true;
+        } catch {
+            return false;
+        }
+    }
 }
 
 export class EpgDatabaseClearOperation {
diff --git a/apps/electron-backend/src/app/workers/epg-streaming-parser.spec.ts b/apps/electron-backend/src/app/workers/epg-streaming-parser.spec.ts
index a36a3320f..bbd929208 100644
--- a/apps/electron-backend/src/app/workers/epg-streaming-parser.spec.ts
+++ b/apps/electron-backend/src/app/workers/epg-streaming-parser.spec.ts
@@ -8,9 +8,40 @@ import {
 describe('parseXmltvDate', () => {
     it('normalizes XMLTV timestamps with timezone offsets', () => {
         expect(parseXmltvDate('20260415053700 +0000')).toBe(
-            '2026-04-15T05:37:00+00:00'
+            '2026-04-15T05:37:00.000Z'
         );
     });
+
+    it('converts positive offsets to UTC', () => {
+        expect(parseXmltvDate('20260415053700 +0200')).toBe(
+            '2026-04-15T03:37:00.000Z'
+        );
+    });
+
+    it('converts negative offsets to UTC', () => {
+        expect(parseXmltvDate('20260415053700 -0530')).toBe(
+            '2026-04-15T11:07:00.000Z'
+        );
+    });
+
+    it('keeps the minutes component of zero-hour offsets', () => {
+        expect(parseXmltvDate('20260415053700 +0030')).toBe(
+            '2026-04-15T05:07:00.000Z'
+        );
+        expect(parseXmltvDate('20260415053700 -0030')).toBe(
+            '2026-04-15T06:07:00.000Z'
+        );
+    });
+
+    it('handles half-hour and 45-minute offsets', () => {
+        expect(parseXmltvDate('20260415053700 +0545')).toBe(
+            '2026-04-14T23:52:00.000Z'
+        );
+    });
+
+    it('treats offset-less timestamps as UTC', () => {
+        expect(parseXmltvDate('20260415053700')).toBe('2026-04-15T05:37:00Z');
+    });
 });
 
 describe('StreamingEpgParser', () => {
diff --git a/apps/electron-backend/src/app/workers/epg-streaming-parser.ts b/apps/electron-backend/src/app/workers/epg-streaming-parser.ts
index 7c82e7d00..c660870a0 100644
--- a/apps/electron-backend/src/app/workers/epg-streaming-parser.ts
+++ b/apps/electron-backend/src/app/workers/epg-streaming-parser.ts
@@ -56,15 +56,31 @@ export function parseXmltvDate(dateStr: string): string {
 
     const [, year, month, day, hour, minute, second, tz] = match;
 
-    let isoString = `${year}-${month}-${day}T${hour}:${minute}:${second}`;
-
     if (tz) {
-        isoString += `${tz.slice(0, 3)}:${tz.slice(3)}`;
-    } else {
-        isoString += 'Z';
+        // Normalise to UTC so all stored timestamps have a consistent
+        // representation.  Without this, lexicographic comparisons in the
+        // SQL queries (e.g. lte(start, now)) produce incorrect results
+        // when offset-containing strings like "+01:00" are compared against
+        // the always-UTC `now` string.
+        // The sign is parsed from the string rather than derived from the
+        // hours value: Math.sign(0) would silently drop the minutes of
+        // offsets like "+0030".
+        const offsetSign = tz.startsWith('-') ? -1 : 1;
+        const offsetTotalMinutes =
+            offsetSign *
+            (Number(tz.slice(1, 3)) * 60 + Number(tz.slice(3)));
+        const utcMs = Date.UTC(
+            Number(year),
+            Number(month) - 1,
+            Number(day),
+            Number(hour),
+            Number(minute) - offsetTotalMinutes,
+            Number(second)
+        );
+        return new Date(utcMs).toISOString();
     }
 
-    return isoString;
+    return `${year}-${month}-${day}T${hour}:${minute}:${second}Z`;
 }
 
 /**
diff --git a/apps/electron-backend/src/app/workers/playlist-refresh.worker.ts b/apps/electron-backend/src/app/workers/playlist-refresh.worker.ts
index 8dd781fab..a541d8baf 100644
--- a/apps/electron-backend/src/app/workers/playlist-refresh.worker.ts
+++ b/apps/electron-backend/src/app/workers/playlist-refresh.worker.ts
@@ -21,6 +21,13 @@ import {
     isInvalidTlsCertificateError,
 } from '../util/security-errors';
 import { requestWithValidatedRedirects } from '../util/validated-axios';
+import { PLAYLIST_FETCH_TIMEOUT_MS } from '../events/playlist-source';
+import {
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    stampWorkerPerformanceResponsePostedEpoch,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
 
 type ActiveRefreshState = {
     cancelled: boolean;
@@ -80,6 +87,15 @@ function checkpoint(payload: PlaylistRefreshPayload): void {
     }
 }
 
+function releaseActiveRefresh(
+    operationId: string,
+    activeRefresh: ActiveRefreshState
+): void {
+    if (activeRefreshes.get(operationId) === activeRefresh) {
+        activeRefreshes.delete(operationId);
+    }
+}
+
 async function fetchPlaylistFromUrl(
     payload: PlaylistRefreshPayload,
     controller: AbortController
@@ -97,7 +113,7 @@ async function fetchPlaylistFromUrl(
                 }),
                 method: 'GET',
                 signal: controller.signal,
-                timeout: 30000,
+                timeout: PLAYLIST_FETCH_TIMEOUT_MS,
             },
             { allowPrivateNetworks: true }
         );
@@ -153,23 +169,32 @@ async function fetchPlaylistFromFile(
 }
 
 async function executeRefresh(
-    payload: PlaylistRefreshPayload
+    payload: PlaylistRefreshPayload,
+    activeRefresh: ActiveRefreshState
 ): Promise<Playlist> {
-    const controller = new AbortController();
-    activeRefreshes.set(payload.operationId, {
-        cancelled: false,
-        controller,
-    });
-
     try {
         const playlist = payload.url
-            ? await fetchPlaylistFromUrl(payload, controller)
+            ? await fetchPlaylistFromUrl(payload, activeRefresh.controller)
             : await fetchPlaylistFromFile(payload);
 
         checkpoint(payload);
         return playlist;
+    } catch (error) {
+        if (error instanceof Error && error.name === 'AbortError') {
+            emitEvent(payload, {
+                status: 'cancelled',
+                phase: 'parsing',
+            });
+        } else {
+            emitEvent(payload, {
+                status: 'error',
+                phase: payload.url ? 'fetching' : 'reading-file',
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
+        throw error;
     } finally {
-        activeRefreshes.delete(payload.operationId);
+        releaseActiveRefresh(payload.operationId, activeRefresh);
     }
 }
 
@@ -185,31 +210,45 @@ parentPort.on(
             return;
         }
 
+        const payload = message.payload;
+        const activeRefresh: ActiveRefreshState = {
+            cancelled: false,
+            controller: new AbortController(),
+        };
+        activeRefreshes.set(payload.operationId, activeRefresh);
+
         try {
-            const result = await executeRefresh(message.payload);
-            postMessage({
-                type: 'response',
-                success: true,
-                result,
-            });
-        } catch (error) {
-            const payload = message.payload;
-            if (error instanceof Error && error.name === 'AbortError') {
-                emitEvent(payload, { status: 'cancelled', phase: 'parsing' });
+            const performanceCapture = startWorkerPerformanceCapture();
+            await armWorkerPerformanceCapture(performanceCapture);
+            const execution = await executeWithWorkerPerformanceCapture(
+                performanceCapture,
+                () => executeRefresh(payload, activeRefresh)
+            );
+
+            if (execution.success) {
+                postMessage({
+                    type: 'response',
+                    success: true,
+                    result: execution.result,
+                    performance: stampWorkerPerformanceResponsePostedEpoch(
+                        performanceCapture,
+                        execution.performance
+                    ),
+                });
             } else {
-                emitEvent(payload, {
-                    status: 'error',
-                    phase: payload.url ? 'fetching' : 'reading-file',
-                    error:
-                        error instanceof Error ? error.message : String(error),
+                const error = execution.error;
+                postMessage({
+                    type: 'response',
+                    success: false,
+                    error: serializeError(error),
+                    performance: stampWorkerPerformanceResponsePostedEpoch(
+                        performanceCapture,
+                        execution.performance
+                    ),
                 });
             }
-
-            postMessage({
-                type: 'response',
-                success: false,
-                error: serializeError(error),
-            });
+        } finally {
+            releaseActiveRefresh(payload.operationId, activeRefresh);
         }
     }
 );
diff --git a/apps/electron-backend/src/app/workers/playlist-refresh.worker.types.ts b/apps/electron-backend/src/app/workers/playlist-refresh.worker.types.ts
index 05c7e2a80..601b9e62c 100644
--- a/apps/electron-backend/src/app/workers/playlist-refresh.worker.types.ts
+++ b/apps/electron-backend/src/app/workers/playlist-refresh.worker.types.ts
@@ -1,4 +1,8 @@
-import type { PlaylistRefreshEvent, PlaylistRefreshPayload } from '@iptvnator/shared/interfaces';
+import type {
+    PlaylistRefreshEvent,
+    PlaylistRefreshPayload,
+} from '@iptvnator/shared/interfaces';
+import type { WorkerPerformanceCaptureResult } from './worker-performance-capture';
 
 export interface PlaylistRefreshWorkerRequestMessage {
     type: 'request';
@@ -28,6 +32,7 @@ export interface PlaylistRefreshWorkerResponseMessage<TResult = unknown> {
         message: string;
         stack?: string;
     };
+    performance?: WorkerPerformanceCaptureResult;
 }
 
 export type PlaylistRefreshWorkerIncomingMessage =
diff --git a/apps/electron-backend/src/app/workers/worker-performance-cancellation.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-cancellation.spec.ts
new file mode 100644
index 000000000..eadd2617f
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-cancellation.spec.ts
@@ -0,0 +1,364 @@
+import type {
+    DbWorkerIncomingMessage,
+    DbWorkerMessage,
+} from './database-worker.types';
+import type {
+    PlaylistRefreshWorkerIncomingMessage,
+    PlaylistRefreshWorkerMessage,
+} from './playlist-refresh.worker.types';
+
+type WorkerMessageHandler<TMessage> = (
+    message: TMessage
+) => Promise<void> | void;
+
+interface ArmGate {
+    readonly promise: Promise<void>;
+    readonly release: () => void;
+}
+
+function createArmGate(): ArmGate {
+    let release = (): void => undefined;
+    const promise = new Promise<void>((resolvePromise) => {
+        release = resolvePromise;
+    });
+    return { promise, release };
+}
+
+function createParentPortHarness<TIncoming, TOutgoing>() {
+    let messageHandler: WorkerMessageHandler<TIncoming> | null = null;
+    const postMessage = jest.fn<void, [TOutgoing]>();
+    const parentPort = {
+        on: jest.fn(
+            (event: string, handler: WorkerMessageHandler<TIncoming>): void => {
+                if (event === 'message') {
+                    messageHandler = handler;
+                }
+            }
+        ),
+        postMessage,
+    };
+
+    return {
+        getMessageHandler: (): WorkerMessageHandler<TIncoming> => {
+            if (!messageHandler) {
+                throw new Error('Worker message handler was not registered');
+            }
+            return messageHandler;
+        },
+        parentPort,
+        postMessage,
+    };
+}
+
+function mockPerformanceCapture(
+    armGate: ArmGate,
+    failureGates?: {
+        readonly observed: ArmGate;
+        readonly profilingFinished: ArmGate;
+    }
+): void {
+    jest.doMock('./worker-performance-capture', () => ({
+        armWorkerPerformanceCapture: jest.fn(() => armGate.promise),
+        executeWithWorkerPerformanceCapture: jest.fn(
+            async (_capture: unknown, execute: () => Promise<unknown>) => {
+                try {
+                    return {
+                        error: null,
+                        performance: undefined,
+                        result: await execute(),
+                        success: true,
+                    };
+                } catch (error) {
+                    failureGates?.observed.release();
+                    await failureGates?.profilingFinished.promise;
+                    return {
+                        error,
+                        performance: undefined,
+                        result: undefined,
+                        success: false,
+                    };
+                }
+            }
+        ),
+        registerDatabaseWorkerPerformanceCapture: jest.fn(),
+        releaseDatabaseWorkerPerformanceCapture: jest.fn(),
+        stampWorkerPerformanceResponsePostedEpoch: jest.fn(
+            (_capture: unknown, performance: unknown) => performance
+        ),
+        startWorkerPerformanceCapture: jest.fn(() => ({})),
+    }));
+}
+
+describe('worker cancellation while performance capture arms', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+        jest.resetModules();
+    });
+
+    it('cancels playlist work before file access when cancel arrives during arming', async () => {
+        const armGate = createArmGate();
+        const profilingFinished = createArmGate();
+        const failureObserved = createArmGate();
+        const port = createParentPortHarness<
+            PlaylistRefreshWorkerIncomingMessage,
+            PlaylistRefreshWorkerMessage<unknown>
+        >();
+        const readFile = jest.fn().mockResolvedValue('#EXTM3U');
+        mockPerformanceCapture(armGate, {
+            observed: failureObserved,
+            profilingFinished,
+        });
+        jest.doMock('worker_threads', () => ({
+            parentPort: port.parentPort,
+        }));
+        jest.doMock('node:fs/promises', () => ({ readFile }));
+        jest.doMock('iptv-playlist-parser', () => ({
+            parse: jest.fn(() => ({ items: [] })),
+        }));
+        jest.doMock('@iptvnator/shared/m3u-utils', () => ({
+            createPlaylistObject: jest.fn(() => ({ id: 'playlist-1' })),
+            getFilenameFromUrl: jest.fn(() => 'playlist.m3u'),
+        }));
+
+        await import('./playlist-refresh.worker');
+        port.postMessage.mockClear();
+        const handleMessage = port.getMessageHandler();
+        const requestPromise = handleMessage({
+            type: 'request',
+            payload: {
+                filePath: '/fixtures/playlist.m3u',
+                operationId: 'refresh-1',
+                playlistId: 'playlist-1',
+                title: 'Fixture',
+            },
+        });
+
+        await handleMessage({
+            type: 'cancel',
+            operationId: 'refresh-1',
+        });
+        armGate.release();
+        await failureObserved.promise;
+
+        const cancelledBeforeProfilingFinished =
+            port.postMessage.mock.calls.some(
+                ([message]) =>
+                    message.type === 'event' &&
+                    message.event.status === 'cancelled'
+            );
+        const responseBeforeProfilingFinished =
+            port.postMessage.mock.calls.some(
+                ([message]) => message.type === 'response'
+            );
+
+        profilingFinished.release();
+        await requestPromise;
+
+        expect(readFile).not.toHaveBeenCalled();
+        expect(cancelledBeforeProfilingFinished).toBe(true);
+        expect(responseBeforeProfilingFinished).toBe(false);
+        expect(port.postMessage).toHaveBeenCalledWith(
+            expect.objectContaining({
+                event: expect.objectContaining({
+                    operationId: 'refresh-1',
+                    status: 'cancelled',
+                }),
+                type: 'event',
+            })
+        );
+        expect(port.postMessage).toHaveBeenCalledWith(
+            expect.objectContaining({
+                error: expect.objectContaining({ name: 'AbortError' }),
+                success: false,
+                type: 'response',
+            })
+        );
+    });
+
+    it('cancels cancellable database work when cancel arrives during arming', async () => {
+        const armGate = createArmGate();
+        const port = createParentPortHarness<
+            DbWorkerIncomingMessage,
+            DbWorkerMessage
+        >();
+        const saveContent = jest.fn(
+            async (
+                _db: unknown,
+                _playlistId: string,
+                _streams: unknown[],
+                _type: string,
+                control: { checkpoint: () => Promise<void> }
+            ) => {
+                await control.checkpoint();
+                return { count: 0 };
+            }
+        );
+        mockPerformanceCapture(armGate);
+        jest.doMock('worker_threads', () => ({
+            parentPort: port.parentPort,
+        }));
+        jest.doMock('./database.worker-connection', () => ({
+            closeWorkerDatabase: jest.fn(),
+            getWorkerDatabase: jest.fn().mockResolvedValue({}),
+        }));
+        jest.doMock('../database/operations/content.operations', () => ({
+            saveContent,
+        }));
+        jest.spyOn(console, 'error').mockImplementation(() => undefined);
+
+        await import('./database.worker');
+        port.postMessage.mockClear();
+        const handleMessage = port.getMessageHandler();
+        const requestPromise = handleMessage({
+            type: 'request',
+            operation: 'DB_SAVE_CONTENT',
+            payload: {
+                operationId: 'database-operation-1',
+                playlistId: 'playlist-1',
+                streams: [],
+                type: 'movie',
+            },
+            requestId: 'request-1',
+        });
+
+        await handleMessage({
+            type: 'cancel',
+            operationId: 'database-operation-1',
+        });
+        armGate.release();
+        await requestPromise;
+
+        expect(saveContent).toHaveBeenCalledTimes(1);
+        expect(port.postMessage).toHaveBeenCalledWith(
+            expect.objectContaining({
+                event: expect.objectContaining({
+                    operationId: 'database-operation-1',
+                    status: 'cancelled',
+                }),
+                requestId: 'request-1',
+                type: 'event',
+            })
+        );
+        expect(port.postMessage).toHaveBeenCalledWith(
+            expect.objectContaining({
+                error: expect.objectContaining({ name: 'AbortError' }),
+                requestId: 'request-1',
+                success: false,
+                type: 'response',
+            })
+        );
+    });
+
+    it('does not make an explicitly non-cancellable database operation cancellable during arming', async () => {
+        const armGate = createArmGate();
+        const port = createParentPortHarness<
+            DbWorkerIncomingMessage,
+            DbWorkerMessage
+        >();
+        const deleteAllPlaylists = jest.fn(
+            async (
+                _db: unknown,
+                control: { checkpoint: () => Promise<void> }
+            ) => {
+                await control.checkpoint();
+                return { success: true };
+            }
+        );
+        mockPerformanceCapture(armGate);
+        jest.doMock('worker_threads', () => ({
+            parentPort: port.parentPort,
+        }));
+        jest.doMock('./database.worker-connection', () => ({
+            closeWorkerDatabase: jest.fn(),
+            getWorkerDatabase: jest.fn().mockResolvedValue({}),
+        }));
+        jest.doMock('../database/operations/playlist.operations', () => ({
+            deleteAllPlaylists,
+        }));
+        jest.spyOn(console, 'error').mockImplementation(() => undefined);
+
+        await import('./database.worker');
+        port.postMessage.mockClear();
+        const handleMessage = port.getMessageHandler();
+        const requestPromise = handleMessage({
+            type: 'request',
+            operation: 'DB_DELETE_ALL_PLAYLISTS',
+            payload: {
+                operationId: 'database-operation-2',
+            },
+            requestId: 'request-2',
+        });
+
+        await handleMessage({
+            type: 'cancel',
+            operationId: 'database-operation-2',
+        });
+        armGate.release();
+        await requestPromise;
+
+        expect(deleteAllPlaylists).toHaveBeenCalledTimes(1);
+        expect(port.postMessage).toHaveBeenCalledWith(
+            expect.objectContaining({
+                requestId: 'request-2',
+                result: { success: true },
+                success: true,
+                type: 'response',
+            })
+        );
+        expect(port.postMessage).not.toHaveBeenCalledWith(
+            expect.objectContaining({
+                event: expect.objectContaining({ status: 'cancelled' }),
+                requestId: 'request-2',
+                type: 'event',
+            })
+        );
+    });
+});
+
+describe('database worker performance control messages', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+        jest.resetModules();
+    });
+
+    it('handles a post-GC probe without dispatching a database request', async () => {
+        const armGate = createArmGate();
+        armGate.release();
+        const port = createParentPortHarness<unknown, DbWorkerMessage>();
+        const getWorkerDatabase = jest.fn().mockResolvedValue({});
+        const handlePostGcHeapRequest = jest.fn();
+        const responsePort = { marker: 'response-port' };
+        mockPerformanceCapture(armGate);
+        jest.doMock('worker_threads', () => ({
+            parentPort: port.parentPort,
+        }));
+        jest.doMock('./database.worker-connection', () => ({
+            closeWorkerDatabase: jest.fn(),
+            getWorkerDatabase,
+        }));
+        jest.doMock('./database-worker-post-gc-heap', () => ({
+            handleDatabaseWorkerPostGcHeapRequest: handlePostGcHeapRequest,
+            isDatabaseWorkerPostGcHeapRequest: jest.fn(
+                (message: unknown) =>
+                    typeof message === 'object' &&
+                    message !== null &&
+                    (message as Record<string, unknown>)['type'] ===
+                        'performance:collect-post-gc-heap'
+            ),
+        }));
+
+        await import('./database.worker');
+        port.postMessage.mockClear();
+        const handleMessage = port.getMessageHandler();
+        const message = {
+            type: 'performance:collect-post-gc-heap',
+            responsePort,
+        };
+
+        await handleMessage(message);
+
+        expect(handlePostGcHeapRequest).toHaveBeenCalledWith(message, true);
+        expect(getWorkerDatabase).not.toHaveBeenCalled();
+        expect(port.postMessage).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.concurrency.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.concurrency.spec.ts
new file mode 100644
index 000000000..900f4ccde
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.concurrency.spec.ts
@@ -0,0 +1,95 @@
+import {
+    WORKER_PERFORMANCE_INVALID_REASON,
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    registerDatabaseWorkerPerformanceCapture,
+    releaseDatabaseWorkerPerformanceCapture,
+    startWorkerPerformanceCapture,
+    type WorkerPerformanceCapture,
+} from './worker-performance-capture';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+const PROFILING_ENV = 'IPTVNATOR_PERF_WORKER_PROFILING';
+
+describe('worker performance capture concurrency and real timers', () => {
+    const originalProfilingValue = process.env[PROFILING_ENV];
+
+    afterEach(() => {
+        if (originalProfilingValue === undefined) {
+            delete process.env[PROFILING_ENV];
+        } else {
+            process.env[PROFILING_ENV] = originalProfilingValue;
+        }
+    });
+
+    it('fails every overlapping database request capture closed without serializing execution', async () => {
+        const activeCaptures = new Set<WorkerPerformanceCapture>();
+        const firstHarness = createFakeRuntime();
+        const secondHarness = createFakeRuntime();
+        const first = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: firstHarness.runtime,
+        });
+        const second = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: secondHarness.runtime,
+        });
+        registerDatabaseWorkerPerformanceCapture(activeCaptures, first);
+        registerDatabaseWorkerPerformanceCapture(activeCaptures, second);
+        await Promise.all([
+            armWorkerPerformanceCapture(first),
+            armWorkerPerformanceCapture(second),
+        ]);
+
+        const [firstExecution, secondExecution] = await Promise.all([
+            executeWithWorkerPerformanceCapture(first, async () => 'first'),
+            executeWithWorkerPerformanceCapture(second, async () => 'second'),
+        ]);
+        releaseDatabaseWorkerPerformanceCapture(activeCaptures, first);
+        releaseDatabaseWorkerPerformanceCapture(activeCaptures, second);
+
+        for (const execution of [firstExecution, secondExecution]) {
+            expect(execution.performance).toMatchObject({
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS,
+                eventLoopUtilization: null,
+                eventLoopUtilizationUnavailableReason:
+                    WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS,
+                histogramFlushedEpochMs: null,
+                invalidReason:
+                    WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS,
+                threadCpuSystemMicros: null,
+                threadCpuUnavailableReason:
+                    WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS,
+                threadCpuUserMicros: null,
+            });
+        }
+        expect(firstExecution.result).toBe('first');
+        expect(secondExecution.result).toBe('second');
+        expect(activeCaptures.size).toBe(0);
+    });
+
+    it('reliably observes a real 20ms event-loop block after condition-based arming', async () => {
+        process.env[PROFILING_ENV] = '1';
+
+        const capture = startWorkerPerformanceCapture();
+        await armWorkerPerformanceCapture(capture);
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => {
+                const blockStartedAt = performance.now();
+                while (performance.now() - blockStartedAt < 20) {
+                    // This deliberate block is the behavior under measurement.
+                }
+            }
+        );
+
+        expect(execution.success).toBe(true);
+        expect(execution.performance?.eventLoopDelay).not.toBeNull();
+        expect(execution.performance?.eventLoopDelay?.maxMs).toBeGreaterThan(
+            10
+        );
+        expect(execution.performance?.histogramFlushedEpochMs).not.toBeNull();
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.spec.ts
new file mode 100644
index 000000000..19462fe5a
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.spec.ts
@@ -0,0 +1,39 @@
+import {
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+describe('worker performance histogram lifecycle', () => {
+    it('accepts a nonthrowing false disable result because the histogram is already disabled', async () => {
+        const harness = createFakeRuntime({
+            histogramDisableResult: false,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'business-result'
+        );
+
+        expect(execution).toMatchObject({
+            error: null,
+            result: 'business-result',
+            success: true,
+            performance: {
+                eventLoopDelay: {
+                    maxMs: 24,
+                    p95Ms: 18,
+                    p99Ms: 22,
+                },
+                eventLoopDelayUnavailableReason: null,
+                histogramFlushedEpochMs: 145,
+            },
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.ts
new file mode 100644
index 000000000..a4951d6cc
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.histogram.ts
@@ -0,0 +1,136 @@
+import {
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    type WorkerEventLoopDelayHistogram,
+    type WorkerEventLoopDelayMetrics,
+    type WorkerPerformanceCapture,
+    type WorkerPerformanceMetricUnavailableReason,
+} from './worker-performance-capture.model';
+import {
+    HISTOGRAM_POLL_INTERVAL_MS,
+    HISTOGRAM_WAIT_CAP_MS,
+} from './worker-performance-capture.runtime';
+
+export function disableWorkerPerformanceHistogram(
+    capture: WorkerPerformanceCapture
+): boolean {
+    if (!capture.eventLoopDelay || capture.histogramDisabled) {
+        return true;
+    }
+
+    try {
+        capture.eventLoopDelay.disable();
+        capture.histogramDisabled = true;
+        return true;
+    } catch {
+        // Performance instrumentation must never affect worker execution.
+        return false;
+    }
+}
+
+export function markEventLoopDelayUnavailable(
+    capture: WorkerPerformanceCapture,
+    reason: WorkerPerformanceMetricUnavailableReason
+): void {
+    capture.eventLoopDelayUnavailableReason ??= reason;
+    disableWorkerPerformanceHistogram(capture);
+}
+
+export async function waitForHistogramCondition(
+    capture: WorkerPerformanceCapture,
+    condition: (histogram: WorkerEventLoopDelayHistogram) => boolean
+): Promise<boolean> {
+    const histogram = capture.eventLoopDelay;
+    if (
+        !histogram ||
+        capture.histogramDisabled ||
+        capture.invalidReason !== null
+    ) {
+        return false;
+    }
+
+    let startedAt: number;
+    try {
+        startedAt = capture.runtime.readMonotonicMs();
+    } catch {
+        return false;
+    }
+
+    const maximumPolls = Math.ceil(
+        HISTOGRAM_WAIT_CAP_MS / HISTOGRAM_POLL_INTERVAL_MS
+    );
+    let pollCount = 0;
+
+    while (true) {
+        if (capture.invalidReason !== null || capture.histogramDisabled) {
+            return false;
+        }
+        try {
+            if (condition(histogram)) {
+                return true;
+            }
+        } catch {
+            return false;
+        }
+
+        let elapsedMs: number;
+        try {
+            elapsedMs = capture.runtime.readMonotonicMs() - startedAt;
+        } catch {
+            return false;
+        }
+        if (
+            !Number.isFinite(elapsedMs) ||
+            elapsedMs >= HISTOGRAM_WAIT_CAP_MS ||
+            pollCount >= maximumPolls
+        ) {
+            return false;
+        }
+
+        const delayMs = Math.min(
+            HISTOGRAM_POLL_INTERVAL_MS,
+            HISTOGRAM_WAIT_CAP_MS - Math.max(0, elapsedMs)
+        );
+        try {
+            pollCount += 1;
+            await new Promise<void>((resolvePromise) => {
+                capture.runtime.scheduleTimeout(resolvePromise, delayMs);
+            });
+        } catch {
+            return false;
+        }
+    }
+}
+
+export function readWorkerEventLoopDelay(
+    capture: WorkerPerformanceCapture
+): WorkerEventLoopDelayMetrics | null {
+    if (
+        capture.invalidReason !== null ||
+        capture.eventLoopDelayUnavailableReason !== null ||
+        capture.histogramFlushedEpochMs === null ||
+        !capture.eventLoopDelay
+    ) {
+        return null;
+    }
+
+    try {
+        const metrics: WorkerEventLoopDelayMetrics = {
+            maxMs: capture.eventLoopDelay.max / 1e6,
+            p95Ms: capture.eventLoopDelay.percentile(95) / 1e6,
+            p99Ms: capture.eventLoopDelay.percentile(99) / 1e6,
+        };
+        if (
+            Object.values(metrics).every(
+                (value) => Number.isFinite(value) && value >= 0
+            )
+        ) {
+            return metrics;
+        }
+    } catch {
+        // The fixed reason below is intentionally payload-free.
+    }
+
+    capture.eventLoopDelayUnavailableReason =
+        WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_INVALID;
+    return null;
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.metrics.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.metrics.ts
new file mode 100644
index 000000000..4f1e95ca4
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.metrics.ts
@@ -0,0 +1,249 @@
+import type { EventLoopUtilization } from 'node:perf_hooks';
+import {
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    type WorkerPerformanceCapture,
+    type WorkerPerformanceCaptureResult,
+} from './worker-performance-capture.model';
+import { readWorkerEventLoopDelay } from './worker-performance-capture.histogram';
+import { safeReadEpochMs } from './worker-performance-capture.runtime';
+
+function readThreadCpuBoundary(
+    capture: WorkerPerformanceCapture
+): NodeJS.CpuUsage | null {
+    if (!capture.runtime.readThreadCpuUsage) {
+        capture.threadCpuUnavailableReason ??=
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE;
+        return null;
+    }
+
+    try {
+        const usage = capture.runtime.readThreadCpuUsage();
+        if (
+            !Number.isFinite(usage.system) ||
+            !Number.isFinite(usage.user) ||
+            usage.system < 0 ||
+            usage.user < 0
+        ) {
+            capture.threadCpuUnavailableReason =
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_INVALID;
+            return null;
+        }
+        return usage;
+    } catch {
+        capture.threadCpuUnavailableReason =
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE;
+        return null;
+    }
+}
+
+function readEventLoopUtilizationBoundary(
+    capture: WorkerPerformanceCapture
+): EventLoopUtilization | null {
+    try {
+        const utilization = capture.runtime.readEventLoopUtilization();
+        if (
+            !Number.isFinite(utilization.active) ||
+            !Number.isFinite(utilization.idle)
+        ) {
+            capture.eventLoopUtilizationUnavailableReason =
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE;
+            return null;
+        }
+        return utilization;
+    } catch {
+        capture.eventLoopUtilizationUnavailableReason =
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE;
+        return null;
+    }
+}
+
+export function beginWorkerPerformanceCapture(
+    capture: WorkerPerformanceCapture | null
+): void {
+    if (!capture) {
+        return;
+    }
+
+    capture.workStartedEpochMs = safeReadEpochMs(capture.runtime);
+    capture.threadCpuStart = readThreadCpuBoundary(capture);
+    capture.eventLoopUtilizationStart =
+        readEventLoopUtilizationBoundary(capture);
+}
+
+function calculateThreadCpu(
+    capture: WorkerPerformanceCapture
+): Pick<
+    WorkerPerformanceCaptureResult,
+    'threadCpuSystemMicros' | 'threadCpuUserMicros'
+> {
+    if (
+        capture.invalidReason !== null ||
+        capture.threadCpuUnavailableReason !== null ||
+        !capture.threadCpuStart ||
+        !capture.threadCpuEnd
+    ) {
+        return {
+            threadCpuSystemMicros: null,
+            threadCpuUserMicros: null,
+        };
+    }
+
+    try {
+        const system =
+            capture.threadCpuEnd.system - capture.threadCpuStart.system;
+        const user = capture.threadCpuEnd.user - capture.threadCpuStart.user;
+        if (
+            !Number.isFinite(system) ||
+            !Number.isFinite(user) ||
+            system < 0 ||
+            user < 0
+        ) {
+            capture.threadCpuUnavailableReason =
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_INVALID;
+            return {
+                threadCpuSystemMicros: null,
+                threadCpuUserMicros: null,
+            };
+        }
+
+        return {
+            threadCpuSystemMicros: system,
+            threadCpuUserMicros: user,
+        };
+    } catch {
+        capture.threadCpuUnavailableReason =
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_INVALID;
+        return {
+            threadCpuSystemMicros: null,
+            threadCpuUserMicros: null,
+        };
+    }
+}
+
+function calculateEventLoopUtilization(
+    capture: WorkerPerformanceCapture
+): number | null {
+    if (
+        capture.invalidReason !== null ||
+        capture.eventLoopUtilizationUnavailableReason !== null ||
+        !capture.eventLoopUtilizationStart ||
+        !capture.eventLoopUtilizationEnd
+    ) {
+        return null;
+    }
+
+    try {
+        const active =
+            capture.eventLoopUtilizationEnd.active -
+            capture.eventLoopUtilizationStart.active;
+        const idle =
+            capture.eventLoopUtilizationEnd.idle -
+            capture.eventLoopUtilizationStart.idle;
+        const total = active + idle;
+        if (
+            !Number.isFinite(active) ||
+            !Number.isFinite(idle) ||
+            active < 0 ||
+            idle < 0 ||
+            total < 0
+        ) {
+            capture.eventLoopUtilizationUnavailableReason =
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE;
+            return null;
+        }
+
+        return total === 0 ? 0 : active / total;
+    } catch {
+        capture.eventLoopUtilizationUnavailableReason =
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE;
+        return null;
+    }
+}
+
+function createFallbackResult(
+    capture: WorkerPerformanceCapture
+): WorkerPerformanceCaptureResult {
+    const invalidReason = capture.invalidReason;
+    return {
+        eventLoopDelay: null,
+        eventLoopDelayUnavailableReason:
+            invalidReason ??
+            capture.eventLoopDelayUnavailableReason ??
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE,
+        eventLoopUtilization: null,
+        eventLoopUtilizationUnavailableReason:
+            invalidReason ??
+            capture.eventLoopUtilizationUnavailableReason ??
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE,
+        histogramFlushedEpochMs: null,
+        invalidReason,
+        ...copyPhaseEvents(capture),
+        requestReceivedEpochMs: capture.requestReceivedEpochMs,
+        threadCpuSystemMicros: null,
+        threadCpuUnavailableReason:
+            invalidReason ??
+            capture.threadCpuUnavailableReason ??
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE,
+        threadCpuUserMicros: null,
+        workEndedEpochMs:
+            capture.workEndedEpochMs ?? capture.requestReceivedEpochMs,
+        workStartedEpochMs:
+            capture.workStartedEpochMs ?? capture.requestReceivedEpochMs,
+    };
+}
+
+export function createWorkerPerformanceCaptureResult(
+    capture: WorkerPerformanceCapture
+): WorkerPerformanceCaptureResult {
+    try {
+        const overlapReason = capture.invalidReason;
+        if (overlapReason) {
+            capture.eventLoopDelayUnavailableReason = overlapReason;
+            capture.eventLoopUtilizationUnavailableReason = overlapReason;
+            capture.threadCpuUnavailableReason = overlapReason;
+            capture.histogramFlushedEpochMs = null;
+        }
+        const threadCpu = calculateThreadCpu(capture);
+
+        return {
+            eventLoopDelay: readWorkerEventLoopDelay(capture),
+            eventLoopDelayUnavailableReason:
+                capture.eventLoopDelayUnavailableReason,
+            eventLoopUtilization: calculateEventLoopUtilization(capture),
+            eventLoopUtilizationUnavailableReason:
+                capture.eventLoopUtilizationUnavailableReason,
+            histogramFlushedEpochMs: capture.histogramFlushedEpochMs,
+            invalidReason: capture.invalidReason,
+            ...copyPhaseEvents(capture),
+            requestReceivedEpochMs: capture.requestReceivedEpochMs,
+            ...threadCpu,
+            threadCpuUnavailableReason: capture.threadCpuUnavailableReason,
+            workEndedEpochMs:
+                capture.workEndedEpochMs ?? capture.requestReceivedEpochMs,
+            workStartedEpochMs:
+                capture.workStartedEpochMs ?? capture.requestReceivedEpochMs,
+        };
+    } catch {
+        return createFallbackResult(capture);
+    }
+}
+
+function copyPhaseEvents(
+    capture: WorkerPerformanceCapture
+): Pick<WorkerPerformanceCaptureResult, 'phaseEvents'> {
+    try {
+        return capture.phaseEvents.length > 0
+            ? { phaseEvents: Object.freeze([...capture.phaseEvents]) }
+            : {};
+    } catch {
+        return {};
+    }
+}
+
+export function finishWorkerPerformanceMetricBoundaries(
+    capture: WorkerPerformanceCapture
+): void {
+    capture.workEndedEpochMs = safeReadEpochMs(capture.runtime);
+    capture.threadCpuEnd = readThreadCpuBoundary(capture);
+    capture.eventLoopUtilizationEnd = readEventLoopUtilizationBoundary(capture);
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.model.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.model.ts
new file mode 100644
index 000000000..dff916076
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.model.ts
@@ -0,0 +1,103 @@
+import type { EventLoopUtilization } from 'node:perf_hooks';
+import type {
+    AppPlaylistPerformancePhase,
+    PerformancePhaseEvent,
+} from '@iptvnator/shared/interfaces';
+
+export const WORKER_PERFORMANCE_INVALID_REASON = {
+    OVERLAPPING_DATABASE_WORKER_REQUESTS:
+        'overlapping-database-worker-requests',
+} as const;
+
+export type WorkerPerformanceInvalidReason =
+    (typeof WORKER_PERFORMANCE_INVALID_REASON)[keyof typeof WORKER_PERFORMANCE_INVALID_REASON];
+
+export const WORKER_PERFORMANCE_UNAVAILABLE_REASON = {
+    EVENT_LOOP_DELAY_ARM_TIMEOUT: 'event-loop-delay-arm-timeout',
+    EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE:
+        'event-loop-delay-capture-unavailable',
+    EVENT_LOOP_DELAY_FLUSH_TIMEOUT: 'event-loop-delay-flush-timeout',
+    EVENT_LOOP_DELAY_INVALID: 'event-loop-delay-invalid',
+    EVENT_LOOP_UTILIZATION_UNAVAILABLE: 'event-loop-utilization-unavailable',
+    THREAD_CPU_USAGE_INVALID: 'thread-cpu-usage-invalid',
+    THREAD_CPU_USAGE_UNAVAILABLE: 'thread-cpu-usage-unavailable',
+} as const;
+
+export type WorkerPerformanceUnavailableReason =
+    (typeof WORKER_PERFORMANCE_UNAVAILABLE_REASON)[keyof typeof WORKER_PERFORMANCE_UNAVAILABLE_REASON];
+
+export type WorkerPerformanceMetricUnavailableReason =
+    WorkerPerformanceInvalidReason | WorkerPerformanceUnavailableReason;
+
+export interface WorkerEventLoopDelayMetrics {
+    maxMs: number;
+    p95Ms: number;
+    p99Ms: number;
+}
+
+export interface WorkerEventLoopDelayHistogram {
+    readonly count: number;
+    readonly max: number;
+    disable: () => boolean;
+    enable: () => boolean;
+    percentile: (percentile: number) => number;
+}
+
+export interface WorkerPerformanceCaptureResult {
+    eventLoopDelay: WorkerEventLoopDelayMetrics | null;
+    eventLoopDelayUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    eventLoopUtilization: number | null;
+    eventLoopUtilizationUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    histogramFlushedEpochMs: number | null;
+    invalidReason: WorkerPerformanceInvalidReason | null;
+    phaseEvents?: readonly PerformancePhaseEvent<AppPlaylistPerformancePhase>[];
+    requestReceivedEpochMs: number;
+    responsePostedEpochMs?: number;
+    threadCpuSystemMicros: number | null;
+    threadCpuUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    threadCpuUserMicros: number | null;
+    workEndedEpochMs: number;
+    workStartedEpochMs: number;
+}
+
+export interface WorkerPerformanceCaptureRuntime {
+    createEventLoopDelayHistogram: () => WorkerEventLoopDelayHistogram;
+    readEpochMs: () => number;
+    readEventLoopUtilization: () => EventLoopUtilization;
+    readMonotonicMs: () => number;
+    readThreadCpuUsage: (() => NodeJS.CpuUsage) | null;
+    scheduleTimeout: (callback: () => void, delayMs: number) => void;
+}
+
+export interface WorkerPerformanceCaptureOptions {
+    enabled?: boolean;
+    requestId?: string;
+    runtime?: WorkerPerformanceCaptureRuntime;
+}
+
+export interface WorkerPerformanceExecutionResult<TResult> {
+    error: unknown | null;
+    performance: WorkerPerformanceCaptureResult | undefined;
+    result: TResult | undefined;
+    success: boolean;
+}
+
+export interface WorkerPerformanceCapture {
+    eventLoopDelay: WorkerEventLoopDelayHistogram | null;
+    eventLoopDelayUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    eventLoopUtilizationEnd: EventLoopUtilization | null;
+    eventLoopUtilizationStart: EventLoopUtilization | null;
+    eventLoopUtilizationUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    histogramDisabled: boolean;
+    histogramFlushedEpochMs: number | null;
+    invalidReason: WorkerPerformanceInvalidReason | null;
+    phaseEvents: PerformancePhaseEvent<AppPlaylistPerformancePhase>[];
+    requestReceivedEpochMs: number;
+    requestId: string | null;
+    runtime: WorkerPerformanceCaptureRuntime;
+    threadCpuEnd: NodeJS.CpuUsage | null;
+    threadCpuStart: NodeJS.CpuUsage | null;
+    threadCpuUnavailableReason: WorkerPerformanceMetricUnavailableReason | null;
+    workEndedEpochMs: number | null;
+    workStartedEpochMs: number | null;
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.resilience.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.resilience.spec.ts
new file mode 100644
index 000000000..c56a2fb36
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.resilience.spec.ts
@@ -0,0 +1,285 @@
+import {
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+const PROFILING_ENV = 'IPTVNATOR_PERF_WORKER_PROFILING';
+
+/**
+ * Capture must never change the business result. These cases drive the
+ * monotonic-clock timeouts and every runtime callback that can throw, and
+ * assert the awaited value survives each one.
+ */
+describe('worker performance capture resilience', () => {
+    const originalProfilingValue = process.env[PROFILING_ENV];
+
+    afterEach(() => {
+        if (originalProfilingValue === undefined) {
+            delete process.env[PROFILING_ENV];
+        } else {
+            process.env[PROFILING_ENV] = originalProfilingValue;
+        }
+    });
+
+    it('times out arming after a monotonic 50ms without blocking work metrics', async () => {
+        const harness = createFakeRuntime({
+            armHistogram: false,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+
+        await armWorkerPerformanceCapture(capture);
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'result'
+        );
+
+        expect(
+            harness.scheduledTimeouts.reduce(
+                (total, timeout) => total + timeout,
+                0
+            )
+        ).toBe(50);
+        expect(execution.performance).toMatchObject({
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason:
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_ARM_TIMEOUT,
+            eventLoopUtilization: 0.75,
+            histogramFlushedEpochMs: null,
+            threadCpuSystemMicros: 30,
+            threadCpuUserMicros: 80,
+        });
+    });
+
+    it('cannot poll forever when the monotonic runtime clock stalls', async () => {
+        const harness = createFakeRuntime({
+            armHistogram: false,
+            stallMonotonicClock: true,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+
+        await armWorkerPerformanceCapture(capture);
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'result'
+        );
+
+        expect(harness.scheduledTimeouts).toHaveLength(50);
+        expect(execution).toMatchObject({
+            result: 'result',
+            success: true,
+            performance: {
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_ARM_TIMEOUT,
+            },
+        });
+    });
+
+    it('times out flushing after a monotonic 50ms while preserving work CPU and ELU', async () => {
+        const harness = createFakeRuntime({
+            flushHistogram: false,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'result'
+        );
+
+        expect(
+            harness.scheduledTimeouts
+                .slice(1)
+                .reduce((total, timeout) => total + timeout, 0)
+        ).toBe(50);
+        expect(execution.performance).toMatchObject({
+            eventLoopDelay: null,
+            eventLoopDelayUnavailableReason:
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_FLUSH_TIMEOUT,
+            eventLoopUtilization: 0.75,
+            histogramFlushedEpochMs: null,
+            threadCpuSystemMicros: 30,
+            threadCpuUserMicros: 80,
+        });
+    });
+
+    it('reports unavailable thread CPU without falling back to process CPU usage', async () => {
+        const harness = createFakeRuntime({
+            threadCpuAvailable: false,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'result'
+        );
+
+        expect(execution.performance).toMatchObject({
+            eventLoopUtilization: 0.75,
+            threadCpuSystemMicros: null,
+            threadCpuUnavailableReason:
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE,
+            threadCpuUserMicros: null,
+        });
+        expect(harness.lifecycle).not.toContain('cpu:1');
+        expect(harness.lifecycle).not.toContain('cpu:2');
+    });
+
+    it('preserves the business result when CPU and ELU runtime callbacks throw', async () => {
+        const harness = createFakeRuntime({
+            throwBoundaryCallbacks: true,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'business-result'
+        );
+
+        expect(execution).toMatchObject({
+            error: null,
+            result: 'business-result',
+            success: true,
+            performance: {
+                eventLoopDelay: {
+                    maxMs: 24,
+                    p95Ms: 18,
+                    p99Ms: 22,
+                },
+                eventLoopUtilization: null,
+                eventLoopUtilizationUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_UTILIZATION_UNAVAILABLE,
+                threadCpuSystemMicros: null,
+                threadCpuUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE,
+                threadCpuUserMicros: null,
+            },
+        });
+    });
+
+    it('preserves work metrics and the business result when timer scheduling throws', async () => {
+        const harness = createFakeRuntime({
+            throwScheduleTimeout: true,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'business-result'
+        );
+
+        expect(execution).toMatchObject({
+            error: null,
+            result: 'business-result',
+            success: true,
+            performance: {
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_ARM_TIMEOUT,
+                eventLoopUtilization: 0.75,
+                threadCpuSystemMicros: 30,
+                threadCpuUserMicros: 80,
+            },
+        });
+    });
+
+    it.each([
+        {
+            label: 'count getter during finish',
+            options: {
+                throwHistogramCountAtRead: 3,
+            },
+            reason: WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE,
+        },
+        {
+            label: 'metric getter after flush',
+            options: {
+                throwHistogramMetric: true,
+            },
+            reason: WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_INVALID,
+        },
+    ])(
+        'preserves the business result when the histogram $label throws',
+        async ({ options, reason }) => {
+            const harness = createFakeRuntime(options);
+            const capture = startWorkerPerformanceCapture({
+                enabled: true,
+                runtime: harness.runtime,
+            });
+            await armWorkerPerformanceCapture(capture);
+
+            const execution = await executeWithWorkerPerformanceCapture(
+                capture,
+                async () => 'business-result'
+            );
+
+            expect(execution).toMatchObject({
+                error: null,
+                result: 'business-result',
+                success: true,
+                performance: {
+                    eventLoopDelay: null,
+                    eventLoopDelayUnavailableReason: reason,
+                    eventLoopUtilization: 0.75,
+                    threadCpuSystemMicros: 30,
+                    threadCpuUserMicros: 80,
+                },
+            });
+        }
+    );
+
+    it('keeps the business result and rejects delay metrics when histogram disable throws', async () => {
+        const harness = createFakeRuntime({
+            throwHistogramDisable: true,
+        });
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'business-result'
+        );
+
+        expect(execution).toMatchObject({
+            error: null,
+            result: 'business-result',
+            success: true,
+            performance: {
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE,
+                eventLoopUtilization: 0.75,
+                histogramFlushedEpochMs: null,
+                threadCpuSystemMicros: 30,
+                threadCpuUserMicros: 80,
+            },
+        });
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.runtime.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.runtime.ts
new file mode 100644
index 000000000..15c0a4308
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.runtime.ts
@@ -0,0 +1,45 @@
+import { monitorEventLoopDelay, performance } from 'node:perf_hooks';
+import type {
+    WorkerPerformanceCaptureRuntime,
+    WorkerEventLoopDelayHistogram,
+} from './worker-performance-capture.model';
+
+export const WORKER_PROFILING_ENV = 'IPTVNATOR_PERF_WORKER_PROFILING';
+export const HISTOGRAM_POLL_INTERVAL_MS = 1;
+export const HISTOGRAM_WAIT_CAP_MS = 50;
+
+function readRuntimeThreadCpuUsage(): (() => NodeJS.CpuUsage) | null {
+    const candidate: unknown = Reflect.get(process, 'threadCpuUsage');
+    if (typeof candidate !== 'function') {
+        return null;
+    }
+
+    return () =>
+        (candidate as (this: NodeJS.Process) => NodeJS.CpuUsage).call(process);
+}
+
+export const DEFAULT_WORKER_PERFORMANCE_RUNTIME: WorkerPerformanceCaptureRuntime =
+    {
+        createEventLoopDelayHistogram: (): WorkerEventLoopDelayHistogram =>
+            monitorEventLoopDelay({
+                resolution: HISTOGRAM_POLL_INTERVAL_MS,
+            }),
+        readEpochMs: () => performance.timeOrigin + performance.now(),
+        readEventLoopUtilization: () => performance.eventLoopUtilization(),
+        readMonotonicMs: () => performance.now(),
+        readThreadCpuUsage: readRuntimeThreadCpuUsage(),
+        scheduleTimeout: (callback, delayMs) => {
+            setTimeout(callback, delayMs);
+        },
+    };
+
+export function safeReadEpochMs(
+    runtime: WorkerPerformanceCaptureRuntime
+): number {
+    try {
+        const epochMs = runtime.readEpochMs();
+        return Number.isFinite(epochMs) ? epochMs : Date.now();
+    } catch {
+        return Date.now();
+    }
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.spec.ts
new file mode 100644
index 000000000..a0e0db15c
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.spec.ts
@@ -0,0 +1,149 @@
+import {
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    stampWorkerPerformanceResponsePostedEpoch,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+const PROFILING_ENV = 'IPTVNATOR_PERF_WORKER_PROFILING';
+
+describe('worker performance capture', () => {
+    const originalProfilingValue = process.env[PROFILING_ENV];
+
+    afterEach(() => {
+        if (originalProfilingValue === undefined) {
+            delete process.env[PROFILING_ENV];
+        } else {
+            process.env[PROFILING_ENV] = originalProfilingValue;
+        }
+    });
+
+    it('is disabled unless explicitly opted in', () => {
+        delete process.env[PROFILING_ENV];
+
+        expect(startWorkerPerformanceCapture()).toBeNull();
+    });
+
+    it('captures exact work-boundary CPU, ELU, timestamps, and a flushed fresh histogram', async () => {
+        const harness = createFakeRuntime();
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => {
+                harness.lifecycle.push('execute');
+                await Promise.resolve();
+                harness.lifecycle.push('execute:settled');
+                return 'result';
+            }
+        );
+
+        expect(execution).toEqual({
+            error: null,
+            performance: {
+                eventLoopDelay: {
+                    maxMs: 24,
+                    p95Ms: 18,
+                    p99Ms: 22,
+                },
+                eventLoopDelayUnavailableReason: null,
+                eventLoopUtilization: 0.75,
+                eventLoopUtilizationUnavailableReason: null,
+                histogramFlushedEpochMs: 145,
+                invalidReason: null,
+                requestReceivedEpochMs: 100,
+                threadCpuSystemMicros: 30,
+                threadCpuUnavailableReason: null,
+                threadCpuUserMicros: 80,
+                workEndedEpochMs: 140,
+                workStartedEpochMs: 110,
+            },
+            result: 'result',
+            success: true,
+        });
+        expect(harness.lifecycle).toEqual([
+            'epoch:100',
+            'histogram:create',
+            'timeout:1',
+            'epoch:110',
+            'cpu:1',
+            'elu:1',
+            'execute',
+            'execute:settled',
+            'epoch:140',
+            'cpu:2',
+            'elu:2',
+            'timeout:1',
+            'epoch:145',
+        ]);
+        expect(harness.histogramLifecycle.enableCalls).toBe(1);
+        expect(harness.histogramLifecycle.disableCalls).toBe(1);
+        expect('reset' in harness.histogram).toBe(false);
+    });
+
+    it('stamps the worker-send boundary only after request profiling has finished', async () => {
+        const harness = createFakeRuntime();
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        await armWorkerPerformanceCapture(capture);
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => 'result'
+        );
+
+        const stamped = stampWorkerPerformanceResponsePostedEpoch(
+            capture,
+            execution.performance
+        );
+
+        expect(stamped).toMatchObject({
+            histogramFlushedEpochMs: 145,
+            responsePostedEpochMs: 149,
+            workEndedEpochMs: 140,
+        });
+        expect(harness.lifecycle.at(-1)).toBe('epoch:149');
+        expect(
+            stampWorkerPerformanceResponsePostedEpoch(null, undefined)
+        ).toBeUndefined();
+    });
+
+    it('finishes profiling before returning a rejected execution to worker side effects', async () => {
+        const harness = createFakeRuntime();
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: harness.runtime,
+        });
+        const failure = new Error('worker failed');
+        await armWorkerPerformanceCapture(capture);
+
+        const execution = await executeWithWorkerPerformanceCapture(
+            capture,
+            async () => {
+                harness.lifecycle.push('execute');
+                await Promise.resolve();
+                harness.lifecycle.push('execute:rejected');
+                throw failure;
+            }
+        );
+        harness.lifecycle.push('worker:emit-error');
+
+        expect(execution).toMatchObject({
+            error: failure,
+            success: false,
+        });
+        expect(harness.lifecycle.indexOf('epoch:140')).toBe(
+            harness.lifecycle.indexOf('execute:rejected') + 1
+        );
+        expect(harness.lifecycle.indexOf('worker:emit-error')).toBeGreaterThan(
+            harness.lifecycle.indexOf('epoch:145')
+        );
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.test-harness.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.test-harness.ts
new file mode 100644
index 000000000..54517e637
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.test-harness.ts
@@ -0,0 +1,158 @@
+import type {
+    WorkerEventLoopDelayHistogram,
+    WorkerPerformanceCaptureRuntime,
+} from './worker-performance-capture';
+
+interface FakeRuntimeOptions {
+    armHistogram?: boolean;
+    flushHistogram?: boolean;
+    histogramDisableResult?: boolean;
+    stallMonotonicClock?: boolean;
+    threadCpuAvailable?: boolean;
+    throwBoundaryCallbacks?: boolean;
+    throwHistogramDisable?: boolean;
+    throwHistogramCountAtRead?: number;
+    throwHistogramMetric?: boolean;
+    throwScheduleTimeout?: boolean;
+}
+
+export interface FakeRuntimeHarness {
+    histogram: WorkerEventLoopDelayHistogram;
+    histogramLifecycle: {
+        disableCalls: number;
+        enableCalls: number;
+    };
+    lifecycle: string[];
+    runtime: WorkerPerformanceCaptureRuntime;
+    scheduledTimeouts: number[];
+}
+
+export function createFakeRuntime(
+    options: FakeRuntimeOptions = {}
+): FakeRuntimeHarness {
+    const lifecycle: string[] = [];
+    const scheduledTimeouts: number[] = [];
+    let epochIndex = 0;
+    let monotonicMs = 0;
+    let timeoutCount = 0;
+    let cpuIndex = 0;
+    let eluIndex = 0;
+    let histogramCount = 0;
+    let histogramCountReads = 0;
+    const histogramLifecycle = {
+        disableCalls: 0,
+        enableCalls: 0,
+    };
+    const epochValues = [100, 110, 140, 145];
+    const cpuValues = [
+        { system: 50, user: 100 },
+        { system: 80, user: 180 },
+    ];
+    const eluValues = [
+        { active: 10, idle: 20, utilization: 1 / 3 },
+        { active: 40, idle: 30, utilization: 4 / 7 },
+    ];
+    const histogram = {
+        get count() {
+            histogramCountReads += 1;
+            if (histogramCountReads === options.throwHistogramCountAtRead) {
+                throw new Error('histogram count unavailable');
+            }
+            return histogramCount;
+        },
+        disable: () => {
+            histogramLifecycle.disableCalls += 1;
+            if (options.throwHistogramDisable === true) {
+                throw new Error('histogram disable unavailable');
+            }
+            return options.histogramDisableResult ?? true;
+        },
+        enable: () => {
+            histogramLifecycle.enableCalls += 1;
+            return true;
+        },
+        get max() {
+            if (options.throwHistogramMetric === true) {
+                throw new Error('histogram max unavailable');
+            }
+            return 24_000_000;
+        },
+        percentile: (percentile: number) => {
+            if (options.throwHistogramMetric === true) {
+                throw new Error('histogram percentile unavailable');
+            }
+            if (percentile === 95) {
+                return 18_000_000;
+            }
+            if (percentile === 99) {
+                return 22_000_000;
+            }
+            return 0;
+        },
+    } satisfies WorkerEventLoopDelayHistogram;
+    const runtime: WorkerPerformanceCaptureRuntime = {
+        createEventLoopDelayHistogram: () => {
+            lifecycle.push('histogram:create');
+            return histogram;
+        },
+        readEpochMs: () => {
+            const value = epochValues[epochIndex] ?? 145 + epochIndex;
+            epochIndex += 1;
+            lifecycle.push(`epoch:${value}`);
+            return value;
+        },
+        readEventLoopUtilization: () => {
+            if (options.throwBoundaryCallbacks === true) {
+                throw new Error('ELU callback unavailable');
+            }
+            const value = eluValues[eluIndex] ?? eluValues.at(-1)!;
+            eluIndex += 1;
+            lifecycle.push(`elu:${eluIndex}`);
+            return value;
+        },
+        readMonotonicMs: () => monotonicMs,
+        readThreadCpuUsage:
+            options.threadCpuAvailable === false
+                ? null
+                : () => {
+                      if (options.throwBoundaryCallbacks === true) {
+                          throw new Error('thread CPU callback unavailable');
+                      }
+                      const value = cpuValues[cpuIndex] ?? cpuValues.at(-1)!;
+                      cpuIndex += 1;
+                      lifecycle.push(`cpu:${cpuIndex}`);
+                      return value;
+                  },
+        scheduleTimeout: (callback, delayMs) => {
+            lifecycle.push(`timeout:${delayMs}`);
+            scheduledTimeouts.push(delayMs);
+            if (options.throwScheduleTimeout === true) {
+                throw new Error('timer callback unavailable');
+            }
+            if (options.stallMonotonicClock !== true) {
+                monotonicMs += delayMs;
+            } else if (timeoutCount >= 55) {
+                throw new Error('test scheduler fail-safe');
+            }
+            timeoutCount += 1;
+            if (timeoutCount === 1 && options.armHistogram !== false) {
+                histogramCount += 1;
+            } else if (
+                timeoutCount > 1 &&
+                options.armHistogram !== false &&
+                options.flushHistogram !== false
+            ) {
+                histogramCount += 1;
+            }
+            callback();
+        },
+    };
+
+    return {
+        histogram,
+        histogramLifecycle,
+        lifecycle,
+        runtime,
+        scheduledTimeouts,
+    };
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-capture.ts b/apps/electron-backend/src/app/workers/worker-performance-capture.ts
new file mode 100644
index 000000000..3fa1a8baa
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-capture.ts
@@ -0,0 +1,295 @@
+import {
+    WORKER_PERFORMANCE_INVALID_REASON,
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    type WorkerPerformanceCapture,
+    type WorkerPerformanceCaptureOptions,
+    type WorkerPerformanceCaptureResult,
+    type WorkerPerformanceExecutionResult,
+} from './worker-performance-capture.model';
+import {
+    disableWorkerPerformanceHistogram,
+    markEventLoopDelayUnavailable,
+    waitForHistogramCondition,
+} from './worker-performance-capture.histogram';
+import {
+    beginWorkerPerformanceCapture,
+    createWorkerPerformanceCaptureResult,
+    finishWorkerPerformanceMetricBoundaries,
+} from './worker-performance-capture.metrics';
+import {
+    DEFAULT_WORKER_PERFORMANCE_RUNTIME,
+    safeReadEpochMs,
+    WORKER_PROFILING_ENV,
+} from './worker-performance-capture.runtime';
+
+export {
+    WORKER_PERFORMANCE_INVALID_REASON,
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+} from './worker-performance-capture.model';
+export type {
+    WorkerEventLoopDelayHistogram,
+    WorkerEventLoopDelayMetrics,
+    WorkerPerformanceCapture,
+    WorkerPerformanceCaptureOptions,
+    WorkerPerformanceCaptureResult,
+    WorkerPerformanceCaptureRuntime,
+    WorkerPerformanceExecutionResult,
+    WorkerPerformanceInvalidReason,
+    WorkerPerformanceUnavailableReason,
+} from './worker-performance-capture.model';
+
+export function startWorkerPerformanceCapture(
+    options: WorkerPerformanceCaptureOptions = {}
+): WorkerPerformanceCapture | null {
+    const enabled =
+        options.enabled ?? process.env[WORKER_PROFILING_ENV] === '1';
+    if (!enabled) {
+        return null;
+    }
+
+    const runtime = options.runtime ?? DEFAULT_WORKER_PERFORMANCE_RUNTIME;
+    const capture: WorkerPerformanceCapture = {
+        eventLoopDelay: null,
+        eventLoopDelayUnavailableReason: null,
+        eventLoopUtilizationEnd: null,
+        eventLoopUtilizationStart: null,
+        eventLoopUtilizationUnavailableReason: null,
+        histogramDisabled: false,
+        histogramFlushedEpochMs: null,
+        invalidReason: null,
+        phaseEvents: [],
+        requestReceivedEpochMs: safeReadEpochMs(runtime),
+        requestId:
+            typeof options.requestId === 'string' &&
+            options.requestId.length > 0
+                ? options.requestId
+                : null,
+        runtime,
+        threadCpuEnd: null,
+        threadCpuStart: null,
+        threadCpuUnavailableReason:
+            runtime.readThreadCpuUsage === null
+                ? WORKER_PERFORMANCE_UNAVAILABLE_REASON.THREAD_CPU_USAGE_UNAVAILABLE
+                : null,
+        workEndedEpochMs: null,
+        workStartedEpochMs: null,
+    };
+
+    try {
+        capture.eventLoopDelay = runtime.createEventLoopDelayHistogram();
+        capture.eventLoopDelay.enable();
+    } catch {
+        capture.eventLoopDelay = null;
+        capture.eventLoopDelayUnavailableReason =
+            WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE;
+    }
+
+    return capture;
+}
+
+export async function armWorkerPerformanceCapture(
+    capture: WorkerPerformanceCapture | null
+): Promise<void> {
+    if (!capture) {
+        return;
+    }
+
+    try {
+        if (
+            capture.invalidReason !== null ||
+            capture.eventLoopDelayUnavailableReason !== null
+        ) {
+            return;
+        }
+        const armed = await waitForHistogramCondition(
+            capture,
+            (histogram) => histogram.count > 0
+        );
+        if (!armed && capture.invalidReason === null) {
+            markEventLoopDelayUnavailable(
+                capture,
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_ARM_TIMEOUT
+            );
+        }
+    } catch {
+        try {
+            markEventLoopDelayUnavailable(
+                capture,
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE
+            );
+        } catch {
+            // Instrumentation must never prevent business execution.
+        }
+    }
+}
+
+export async function finishWorkerPerformanceCapture(
+    capture: WorkerPerformanceCapture | null
+): Promise<WorkerPerformanceCaptureResult | undefined> {
+    if (!capture) {
+        return undefined;
+    }
+
+    finishWorkerPerformanceMetricBoundaries(capture);
+
+    if (
+        capture.invalidReason === null &&
+        capture.eventLoopDelayUnavailableReason === null &&
+        capture.eventLoopDelay
+    ) {
+        try {
+            const workEndedHistogramCount = capture.eventLoopDelay.count;
+            const flushed = await waitForHistogramCondition(
+                capture,
+                (histogram) => histogram.count > workEndedHistogramCount
+            );
+            if (flushed) {
+                const disabled = disableWorkerPerformanceHistogram(capture);
+                if (disabled) {
+                    capture.histogramFlushedEpochMs = safeReadEpochMs(
+                        capture.runtime
+                    );
+                } else {
+                    markEventLoopDelayUnavailable(
+                        capture,
+                        WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE
+                    );
+                }
+            } else if (
+                capture.invalidReason === null &&
+                capture.eventLoopDelayUnavailableReason === null
+            ) {
+                markEventLoopDelayUnavailable(
+                    capture,
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_FLUSH_TIMEOUT
+                );
+            }
+        } catch {
+            markEventLoopDelayUnavailable(
+                capture,
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE
+            );
+        }
+    } else {
+        disableWorkerPerformanceHistogram(capture);
+    }
+
+    return createWorkerPerformanceCaptureResult(capture);
+}
+
+export async function executeWithWorkerPerformanceCapture<TResult>(
+    capture: WorkerPerformanceCapture | null,
+    execute: () => Promise<TResult>,
+    finish: (
+        capture: WorkerPerformanceCapture | null
+    ) => Promise<
+        WorkerPerformanceCaptureResult | undefined
+    > = finishWorkerPerformanceCapture
+): Promise<WorkerPerformanceExecutionResult<TResult>> {
+    try {
+        beginWorkerPerformanceCapture(capture);
+    } catch {
+        // Instrumentation setup must never prevent business execution.
+    }
+    let result: TResult;
+    try {
+        result = await execute();
+    } catch (error) {
+        const performance = await safelyFinishWorkerPerformanceCapture(
+            capture,
+            finish
+        );
+        return {
+            error,
+            performance,
+            result: undefined,
+            success: false,
+        };
+    }
+
+    const performance = await safelyFinishWorkerPerformanceCapture(
+        capture,
+        finish
+    );
+    return {
+        error: null,
+        performance,
+        result,
+        success: true,
+    };
+}
+
+async function safelyFinishWorkerPerformanceCapture(
+    capture: WorkerPerformanceCapture | null,
+    finish: (
+        capture: WorkerPerformanceCapture | null
+    ) => Promise<WorkerPerformanceCaptureResult | undefined>
+): Promise<WorkerPerformanceCaptureResult | undefined> {
+    try {
+        return await finish(capture);
+    } catch {
+        if (!capture) {
+            return undefined;
+        }
+        try {
+            if (capture.workEndedEpochMs === null) {
+                finishWorkerPerformanceMetricBoundaries(capture);
+            }
+            markEventLoopDelayUnavailable(
+                capture,
+                WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE
+            );
+            return createWorkerPerformanceCaptureResult(capture);
+        } catch {
+            return undefined;
+        }
+    }
+}
+
+export function registerDatabaseWorkerPerformanceCapture(
+    activeCaptures: Set<WorkerPerformanceCapture>,
+    capture: WorkerPerformanceCapture | null
+): void {
+    if (!capture) {
+        return;
+    }
+
+    if (activeCaptures.size > 0) {
+        for (const activeCapture of activeCaptures) {
+            activeCapture.invalidReason =
+                WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS;
+            disableWorkerPerformanceHistogram(activeCapture);
+        }
+        capture.invalidReason =
+            WORKER_PERFORMANCE_INVALID_REASON.OVERLAPPING_DATABASE_WORKER_REQUESTS;
+        disableWorkerPerformanceHistogram(capture);
+    }
+    activeCaptures.add(capture);
+}
+
+export function releaseDatabaseWorkerPerformanceCapture(
+    activeCaptures: Set<WorkerPerformanceCapture>,
+    capture: WorkerPerformanceCapture | null
+): void {
+    if (capture) {
+        activeCaptures.delete(capture);
+    }
+}
+
+export function stampWorkerPerformanceResponsePostedEpoch(
+    capture: WorkerPerformanceCapture | null,
+    performance: WorkerPerformanceCaptureResult | undefined
+): WorkerPerformanceCaptureResult | undefined {
+    if (!capture || !performance) {
+        return performance;
+    }
+
+    try {
+        return {
+            ...performance,
+            responsePostedEpochMs: safeReadEpochMs(capture.runtime),
+        };
+    } catch {
+        return performance;
+    }
+}
diff --git a/apps/electron-backend/src/app/workers/worker-performance-integration.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-integration.spec.ts
new file mode 100644
index 000000000..f10fe3af9
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-integration.spec.ts
@@ -0,0 +1,149 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import {
+    WORKER_PERFORMANCE_UNAVAILABLE_REASON,
+    armWorkerPerformanceCapture,
+    executeWithWorkerPerformanceCapture,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+function readWorkerSource(filename: string): string {
+    return readFileSync(
+        join(process.cwd(), 'apps/electron-backend/src/app/workers', filename),
+        'utf8'
+    );
+}
+
+describe('worker performance integration order', () => {
+    it('profiles overlapping database requests without serializing their execution', () => {
+        const source = readWorkerSource('database.worker.ts');
+        const handler = source.slice(
+            source.lastIndexOf("parentPort.on('message'")
+        );
+
+        expect(handler).toContain('registerDatabaseWorkerPerformanceCapture');
+        expect(handler).toContain('executeWithWorkerPerformanceCapture');
+        expect(handler).toContain('releaseDatabaseWorkerPerformanceCapture');
+        expect(handler).toContain('finally');
+        expect(handler).not.toContain('finishWorkerPerformanceCapture');
+        expect(
+            handler.indexOf('executeWithWorkerPerformanceCapture')
+        ).toBeLessThan(handler.indexOf('console.error'));
+        expect(
+            handler.indexOf('executeWithWorkerPerformanceCapture')
+        ).toBeLessThan(handler.indexOf('postMessage'));
+        expect(
+            handler.match(/stampWorkerPerformanceResponsePostedEpoch/g)
+        ).toHaveLength(2);
+        expect(handler).toMatch(
+            /postMessage\(\{[\s\S]*?performance:\s*stampWorkerPerformanceResponsePostedEpoch\([\s\S]*?execution\.performance[\s\S]*?\),[\s\S]*?\}\)/
+        );
+        expect(handler).not.toContain('await previous');
+        expect(handler).not.toContain('requestQueue');
+    });
+
+    it('keeps playlist response serialization after profiling completion', () => {
+        const source = readWorkerSource('playlist-refresh.worker.ts');
+        const handler = source.slice(source.lastIndexOf('parentPort.on('));
+        const executionIndex = handler.indexOf(
+            'executeWithWorkerPerformanceCapture'
+        );
+
+        expect(executionIndex).toBeGreaterThanOrEqual(0);
+        expect(handler).not.toContain('finishWorkerPerformanceCapture');
+        expect(executionIndex).toBeLessThan(
+            handler.indexOf('serializeError', executionIndex)
+        );
+        expect(executionIndex).toBeLessThan(
+            handler.indexOf('postMessage', executionIndex)
+        );
+        expect(
+            handler.match(/stampWorkerPerformanceResponsePostedEpoch/g)
+        ).toHaveLength(2);
+    });
+
+    it('passes the request capture into the single-playlist upsert boundary', () => {
+        const source = readWorkerSource('database.worker.ts');
+        const upsertCase = source.slice(
+            source.indexOf("case 'DB_UPSERT_APP_PLAYLIST':"),
+            source.indexOf("case 'DB_UPSERT_APP_PLAYLISTS':")
+        );
+
+        expect(upsertCase).toContain('captureWorkerPerformancePhase');
+        expect(upsertCase).toContain('performanceCapture');
+        expect(upsertCase).toContain('upsertAppPlaylist');
+    });
+
+    it('passes async read and sync deserialize capture into the single-playlist GET boundary', () => {
+        const source = readWorkerSource('database.worker.ts');
+        const getCase = source.slice(
+            source.indexOf("case 'DB_GET_APP_PLAYLIST':"),
+            source.indexOf("case 'DB_GET_APP_PLAYLIST_FAVORITE_CHANNELS':")
+        );
+
+        expect(getCase).toContain('captureWorkerPerformancePhaseAsync');
+        expect(getCase).toContain('captureWorkerPerformancePhase');
+        expect(getCase).toContain('performanceCapture');
+        expect(getCase).toContain('getAppPlaylist');
+    });
+
+    it('preserves success and business errors when the finish seam throws once', async () => {
+        const successHarness = createFakeRuntime();
+        const successCapture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: successHarness.runtime,
+        });
+        await armWorkerPerformanceCapture(successCapture);
+        const failingSuccessFinish = jest.fn(async () => {
+            throw new Error('finish failed');
+        });
+
+        const success = await executeWithWorkerPerformanceCapture(
+            successCapture,
+            async () => 'business-result',
+            failingSuccessFinish
+        );
+
+        expect(success).toMatchObject({
+            error: null,
+            result: 'business-result',
+            success: true,
+            performance: {
+                eventLoopDelay: null,
+                eventLoopDelayUnavailableReason:
+                    WORKER_PERFORMANCE_UNAVAILABLE_REASON.EVENT_LOOP_DELAY_CAPTURE_UNAVAILABLE,
+                eventLoopUtilization: 0.75,
+                threadCpuSystemMicros: 30,
+                threadCpuUserMicros: 80,
+            },
+        });
+        expect(failingSuccessFinish).toHaveBeenCalledTimes(1);
+
+        const errorHarness = createFakeRuntime();
+        const errorCapture = startWorkerPerformanceCapture({
+            enabled: true,
+            runtime: errorHarness.runtime,
+        });
+        await armWorkerPerformanceCapture(errorCapture);
+        const businessError = new Error('business failed');
+        const failingErrorFinish = jest.fn(async () => {
+            throw new Error('finish failed');
+        });
+
+        const failure = await executeWithWorkerPerformanceCapture(
+            errorCapture,
+            async () => {
+                throw businessError;
+            },
+            failingErrorFinish
+        );
+
+        expect(failure).toMatchObject({
+            error: businessError,
+            result: undefined,
+            success: false,
+        });
+        expect(failingErrorFinish).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-phase.spec.ts b/apps/electron-backend/src/app/workers/worker-performance-phase.spec.ts
new file mode 100644
index 000000000..f8da24464
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-phase.spec.ts
@@ -0,0 +1,245 @@
+import {
+    APP_PLAYLIST_GET_PERFORMANCE_PHASE,
+    APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+
+import {
+    finishWorkerPerformanceCapture,
+    startWorkerPerformanceCapture,
+} from './worker-performance-capture';
+import {
+    captureWorkerPerformancePhase,
+    captureWorkerPerformancePhaseAsync,
+} from './worker-performance-phase';
+import { createFakeRuntime } from './worker-performance-capture.test-harness';
+
+describe('worker request performance phases', () => {
+    it('executes directly without phase allocation or metadata work when disabled', () => {
+        const resultIdentity = { success: true };
+        const execute = jest.fn(() => resultIdentity);
+        const metadata = jest.fn(() => {
+            throw new Error('metadata must remain untouched');
+        });
+
+        const result = captureWorkerPerformancePhase(
+            null,
+            APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+            execute,
+            metadata
+        );
+
+        expect(result).toBe(resultIdentity);
+        expect(execute).toHaveBeenCalledTimes(1);
+        expect(metadata).not.toHaveBeenCalled();
+    });
+
+    it('adds ordered request-scoped pairs to the existing performance envelope', async () => {
+        const harness = createFakeRuntime();
+        const monotonicValues = [10, 17, 20, 31];
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            requestId: 'db-request-1',
+            runtime: {
+                ...harness.runtime,
+                readMonotonicMs: () => monotonicValues.shift() ?? 31,
+            },
+        });
+        const rowIdentity = { payload: '{"playlist":"synthetic"}' };
+
+        expect(
+            captureWorkerPerformancePhase(
+                capture,
+                APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+                () => rowIdentity,
+                () =>
+                    ({
+                        byteCount: 24,
+                        itemCount: 100_000,
+                        secret: 'must-not-be-copied',
+                    }) as PerformancePhaseMetadata
+            )
+        ).toBe(rowIdentity);
+        captureWorkerPerformancePhase(
+            capture,
+            APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+            () => undefined,
+            () => ({ byteCount: 24, itemCount: 1 })
+        );
+
+        const result = await finishWorkerPerformanceCapture(capture);
+
+        expect(result?.phaseEvents).toEqual([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 110,
+                metadata: undefined,
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+                requestId: 'db-request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 7,
+                epochMs: 140,
+                metadata: { byteCount: 24, itemCount: 100_000 },
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SERIALIZE_PLAYLIST,
+                requestId: 'db-request-1',
+            },
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 145,
+                metadata: undefined,
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+                requestId: 'db-request-1',
+            },
+            {
+                boundary: 'end',
+                durationMs: 11,
+                epochMs: 149,
+                metadata: { byteCount: 24, itemCount: 1 },
+                phase: APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+                requestId: 'db-request-1',
+            },
+        ]);
+        expect(JSON.stringify(result?.phaseEvents)).not.toContain('secret');
+    });
+
+    it('preserves exact error identity and still closes the phase pair', async () => {
+        const harness = createFakeRuntime();
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            requestId: 'db-request-error',
+            runtime: harness.runtime,
+        });
+        const businessError = new Error('sqlite write failed');
+
+        expect(() =>
+            captureWorkerPerformancePhase(
+                capture,
+                APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE.SQLITE_WRITE,
+                () => {
+                    throw businessError;
+                },
+                () => {
+                    throw new Error('metadata failed');
+                }
+            )
+        ).toThrow(businessError);
+
+        const result = await finishWorkerPerformanceCapture(capture);
+        expect(
+            result?.phaseEvents?.map(({ boundary, metadata }) => ({
+                boundary,
+                metadata,
+            }))
+        ).toEqual([
+            { boundary: 'start', metadata: undefined },
+            { boundary: 'end', metadata: undefined },
+        ]);
+    });
+
+    it('returns the exact business promise without metadata work when async capture is disabled', async () => {
+        const resultIdentity = { rows: 1 };
+        const businessPromise = Promise.resolve(resultIdentity);
+        const execute = jest.fn(() => businessPromise);
+        const metadata = jest.fn(() => {
+            throw new Error('metadata must remain untouched');
+        });
+
+        const result = captureWorkerPerformancePhaseAsync(
+            null,
+            APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+            execute,
+            metadata
+        );
+
+        expect(result).toBe(businessPromise);
+        await expect(result).resolves.toBe(resultIdentity);
+        expect(execute).toHaveBeenCalledTimes(1);
+        expect(metadata).not.toHaveBeenCalled();
+    });
+
+    it('closes an async phase only after the awaited operation settles', async () => {
+        const harness = createFakeRuntime();
+        const monotonicValues = [10, 27];
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            requestId: 'db-get-request',
+            runtime: {
+                ...harness.runtime,
+                readMonotonicMs: () => monotonicValues.shift() ?? 27,
+            },
+        });
+        const rows = [{ id: 'synthetic-playlist' }];
+        let resolveRows!: (value: typeof rows) => void;
+        const pendingRows = new Promise<typeof rows>((resolve) => {
+            resolveRows = resolve;
+        });
+
+        const result = captureWorkerPerformancePhaseAsync(
+            capture,
+            APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+            () => pendingRows,
+            (value) => ({ itemCount: value.length })
+        );
+
+        expect(capture?.phaseEvents).toHaveLength(1);
+        resolveRows(rows);
+        await expect(result).resolves.toBe(rows);
+        expect(capture?.phaseEvents).toHaveLength(2);
+
+        const performance = await finishWorkerPerformanceCapture(capture);
+        expect(performance?.phaseEvents).toEqual([
+            {
+                boundary: 'start',
+                durationMs: null,
+                epochMs: 110,
+                metadata: undefined,
+                phase: APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+                requestId: 'db-get-request',
+            },
+            {
+                boundary: 'end',
+                durationMs: 17,
+                epochMs: 140,
+                metadata: { itemCount: 1 },
+                phase: APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+                requestId: 'db-get-request',
+            },
+        ]);
+    });
+
+    it('preserves async rejection identity and closes the phase without metadata', async () => {
+        const harness = createFakeRuntime();
+        const capture = startWorkerPerformanceCapture({
+            enabled: true,
+            requestId: 'db-get-error',
+            runtime: harness.runtime,
+        });
+        const businessError = new Error('sqlite read failed');
+
+        await expect(
+            captureWorkerPerformancePhaseAsync(
+                capture,
+                APP_PLAYLIST_GET_PERFORMANCE_PHASE.SQLITE_READ,
+                () => Promise.reject(businessError),
+                () => {
+                    throw new Error('metadata must not run for errors');
+                }
+            )
+        ).rejects.toBe(businessError);
+
+        const result = await finishWorkerPerformanceCapture(capture);
+        expect(
+            result?.phaseEvents?.map(({ boundary, metadata }) => ({
+                boundary,
+                metadata,
+            }))
+        ).toEqual([
+            { boundary: 'start', metadata: undefined },
+            { boundary: 'end', metadata: undefined },
+        ]);
+    });
+});
diff --git a/apps/electron-backend/src/app/workers/worker-performance-phase.ts b/apps/electron-backend/src/app/workers/worker-performance-phase.ts
new file mode 100644
index 000000000..85fca3209
--- /dev/null
+++ b/apps/electron-backend/src/app/workers/worker-performance-phase.ts
@@ -0,0 +1,172 @@
+import {
+    PERFORMANCE_PHASE_BOUNDARY,
+    type AppPlaylistPerformancePhase,
+    type PerformancePhaseEvent,
+    type PerformancePhaseMetadata,
+} from '@iptvnator/shared/interfaces';
+import type { WorkerPerformanceCapture } from './worker-performance-capture.model';
+import { safeReadEpochMs } from './worker-performance-capture.runtime';
+
+export function captureWorkerPerformancePhase<TResult>(
+    capture: WorkerPerformanceCapture | null,
+    phase: AppPlaylistPerformancePhase,
+    execute: () => TResult,
+    metadata?: (result: TResult) => PerformancePhaseMetadata
+): TResult {
+    if (!capture || !capture.requestId) {
+        return execute();
+    }
+
+    const startMonotonicMs = safeReadMonotonicMs(capture);
+    appendPhaseEvent(capture, {
+        boundary: PERFORMANCE_PHASE_BOUNDARY.START,
+        durationMs: null,
+        epochMs: safeReadEpochMs(capture.runtime),
+        metadata: undefined,
+        phase,
+        requestId: capture.requestId,
+    });
+
+    try {
+        const result = execute();
+        const endMonotonicMs = safeReadMonotonicMs(capture);
+        appendPhaseEvent(capture, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.END,
+            durationMs: safeDuration(endMonotonicMs - startMonotonicMs),
+            epochMs: safeReadEpochMs(capture.runtime),
+            metadata: sanitizeMetadata(safelyCreateMetadata(metadata, result)),
+            phase,
+            requestId: capture.requestId,
+        });
+        return result;
+    } catch (error) {
+        const endMonotonicMs = safeReadMonotonicMs(capture);
+        appendPhaseEvent(capture, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.END,
+            durationMs: safeDuration(endMonotonicMs - startMonotonicMs),
+            epochMs: safeReadEpochMs(capture.runtime),
+            metadata: undefined,
+            phase,
+            requestId: capture.requestId,
+        });
+        throw error;
+    }
+}
+
+export function captureWorkerPerformancePhaseAsync<TResult>(
+    capture: WorkerPerformanceCapture | null,
+    phase: AppPlaylistPerformancePhase,
+    execute: () => Promise<TResult>,
+    metadata?: (result: TResult) => PerformancePhaseMetadata
+): Promise<TResult> {
+    const requestId = capture?.requestId;
+    if (!capture || !requestId) {
+        return execute();
+    }
+
+    return captureAsync(capture, requestId, phase, execute, metadata);
+}
+
+async function captureAsync<TResult>(
+    capture: WorkerPerformanceCapture,
+    requestId: string,
+    phase: AppPlaylistPerformancePhase,
+    execute: () => Promise<TResult>,
+    metadata?: (result: TResult) => PerformancePhaseMetadata
+): Promise<TResult> {
+    const startMonotonicMs = safeReadMonotonicMs(capture);
+    appendPhaseEvent(capture, {
+        boundary: PERFORMANCE_PHASE_BOUNDARY.START,
+        durationMs: null,
+        epochMs: safeReadEpochMs(capture.runtime),
+        metadata: undefined,
+        phase,
+        requestId,
+    });
+
+    try {
+        const result = await execute();
+        const endMonotonicMs = safeReadMonotonicMs(capture);
+        appendPhaseEvent(capture, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.END,
+            durationMs: safeDuration(endMonotonicMs - startMonotonicMs),
+            epochMs: safeReadEpochMs(capture.runtime),
+            metadata: sanitizeMetadata(
+                safelyCreateMetadata(metadata, result)
+            ),
+            phase,
+            requestId,
+        });
+        return result;
+    } catch (error) {
+        const endMonotonicMs = safeReadMonotonicMs(capture);
+        appendPhaseEvent(capture, {
+            boundary: PERFORMANCE_PHASE_BOUNDARY.END,
+            durationMs: safeDuration(endMonotonicMs - startMonotonicMs),
+            epochMs: safeReadEpochMs(capture.runtime),
+            metadata: undefined,
+            phase,
+            requestId,
+        });
+        throw error;
+    }
+}
+
+function safeReadMonotonicMs(capture: WorkerPerformanceCapture): number {
+    try {
+        const value = capture.runtime.readMonotonicMs();
+        return Number.isFinite(value) ? value : 0;
+    } catch {
+        return 0;
+    }
+}
+
+function safeDuration(value: number): number {
+    return Number.isFinite(value) ? Math.max(0, value) : 0;
+}
+
+function safelyCreateMetadata<TResult>(
+    createMetadata: ((result: TResult) => PerformancePhaseMetadata) | undefined,
+    result: TResult
+): PerformancePhaseMetadata | undefined {
+    if (!createMetadata) {
+        return undefined;
+    }
+    try {
+        return createMetadata(result);
+    } catch {
+        return undefined;
+    }
+}
+
+function sanitizeMetadata(
+    metadata: PerformancePhaseMetadata | undefined
+): PerformancePhaseMetadata | undefined {
+    if (!metadata) {
+        return undefined;
+    }
+
+    const sanitized: { byteCount?: number; itemCount?: number } = {};
+    if (isCount(metadata.byteCount)) {
+        sanitized.byteCount = metadata.byteCount;
+    }
+    if (isCount(metadata.itemCount)) {
+        sanitized.itemCount = metadata.itemCount;
+    }
+    return Object.keys(sanitized).length > 0 ? sanitized : undefined;
+}
+
+function isCount(value: unknown): value is number {
+    return Number.isSafeInteger(value) && Number(value) >= 0;
+}
+
+function appendPhaseEvent(
+    capture: WorkerPerformanceCapture,
+    event: PerformancePhaseEvent<AppPlaylistPerformancePhase>
+): void {
+    try {
+        capture.phaseEvents.push(event);
+    } catch {
+        // Phase instrumentation is deliberately fail-neutral.
+    }
+}
diff --git a/apps/electron-backend/src/main.ts b/apps/electron-backend/src/main.ts
index 84f772e1c..ea9b08923 100644
--- a/apps/electron-backend/src/main.ts
+++ b/apps/electron-backend/src/main.ts
@@ -31,6 +31,13 @@ import { databaseWorkerClient } from './app/services/database-worker-client';
 import WindowEvents from './app/events/window.events';
 import XtreamEvents from './app/events/xtream.events';
 import { environment } from './environments/environment';
+import {
+    isFrameCopyRuntimeUsable,
+    shouldPromotePersistedFrameCopyOptIn,
+} from './app/services/embedded-mpv-frame-copy-platform.util';
+import { isEmbeddedMpvFeatureEnabled } from './app/services/embedded-mpv-runtime-policy.util';
+import { runEmbeddedMpvRuntimeDiagnosticOrContinue } from './app/services/embedded-mpv-runtime-diagnostic';
+import { EMBEDDED_MPV_FRAME_COPY, store } from './app/services/store.service';
 
 app.setName('iptvnator');
 
@@ -55,6 +62,22 @@ if (electronUserDataPath) {
     app.setPath('userData', electronUserDataPath);
 }
 
+// The frame-copy embedded MPV engine must be decided before the main window
+// exists: it relaxes the window sandbox for the preload frame pump, and
+// webPreferences are fixed at window creation. The Settings toggle persists
+// to the main-process config store; an explicitly set env var (including
+// '0') always wins so dev/CI behavior stays scriptable.
+if (
+    isEmbeddedMpvFeatureEnabled() &&
+    shouldPromotePersistedFrameCopyOptIn(
+        store.get(EMBEDDED_MPV_FRAME_COPY, false),
+        process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY,
+        isFrameCopyRuntimeUsable
+    )
+) {
+    process.env.IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY = '1';
+}
+
 let fixPathScheduled = false;
 
 /**
@@ -167,23 +190,25 @@ export default class Main {
     }
 }
 
-// handle setup events as quickly as possible
-Main.initialize();
+runEmbeddedMpvRuntimeDiagnosticOrContinue(process.argv, () => {
+    // handle setup events as quickly as possible
+    Main.initialize();
 
-// bootstrap app
-Main.bootstrapApp();
+    // bootstrap app
+    Main.bootstrapApp();
 
-// Bootstrap app events after Electron app is ready
-app.whenReady().then(async () => {
-    if (isStartupTraceEnabled()) {
-        trace('startup', 'app.whenReady');
-    }
-    await Main.bootstrapAppEvents();
-});
-
-app.on('before-quit', () => {
-    shutdownEmbeddedMpv();
-    shutdownMpvSession();
-    shutdownVlcSession();
-    void databaseWorkerClient.shutdown();
+    // Bootstrap app events after Electron app is ready
+    app.whenReady().then(async () => {
+        if (isStartupTraceEnabled()) {
+            trace('startup', 'app.whenReady');
+        }
+        await Main.bootstrapAppEvents();
+    });
+
+    app.on('before-quit', () => {
+        shutdownEmbeddedMpv();
+        shutdownMpvSession();
+        shutdownVlcSession();
+        void databaseWorkerClient.shutdown();
+    });
 });
diff --git a/apps/electron-backend/tsconfig.app.json b/apps/electron-backend/tsconfig.app.json
index 784ccb3b5..cdc691548 100644
--- a/apps/electron-backend/tsconfig.app.json
+++ b/apps/electron-backend/tsconfig.app.json
@@ -2,7 +2,8 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "types": ["node"]
+        "types": ["node"],
+        "importHelpers": false
     },
     "files": ["../../global.d.ts"],
     "exclude": [
diff --git a/apps/electron-backend/tsconfig.spec.json b/apps/electron-backend/tsconfig.spec.json
index 976a7011d..ae084b520 100644
--- a/apps/electron-backend/tsconfig.spec.json
+++ b/apps/electron-backend/tsconfig.spec.json
@@ -1,16 +1,17 @@
 {
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "esModuleInterop": true,
-    "module": "commonjs",
-    "moduleResolution": "node10",
-    "types": ["jest", "node"]
-  },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../dist/out-tsc",
+        "esModuleInterop": true,
+        "allowJs": true,
+        "module": "commonjs",
+        "moduleResolution": "node10",
+        "types": ["jest", "node"]
+    },
+    "include": [
+        "jest.config.ts",
+        "src/**/*.test.ts",
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
+    ]
 }
diff --git a/apps/remote-control-web/project.json b/apps/remote-control-web/project.json
index 5819a8bf5..8c65582c8 100644
--- a/apps/remote-control-web/project.json
+++ b/apps/remote-control-web/project.json
@@ -49,6 +49,11 @@
                     ],
                     "outputHashing": "all"
                 },
+                "electron-performance": {
+                    "optimization": true,
+                    "outputHashing": "all",
+                    "sourceMap": true
+                },
                 "development": {
                     "optimization": false,
                     "extractLicenses": false,
@@ -63,6 +68,12 @@
                 "command": "pnpm nx run remote-control-web:build:development"
             }
         },
+        "build-performance": {
+            "executor": "nx:run-commands",
+            "options": {
+                "command": "pnpm nx run remote-control-web:build:electron-performance"
+            }
+        },
         "serve": {
             "continuous": true,
             "executor": "@angular/build:dev-server",
diff --git a/apps/stalker-mock-server/README.md b/apps/stalker-mock-server/README.md
index 68a71617e..42abe86d2 100644
--- a/apps/stalker-mock-server/README.md
+++ b/apps/stalker-mock-server/README.md
@@ -38,6 +38,8 @@ Then in IPTVnator, add a new Stalker portal:
 | `00:1A:79:00:00:03` | **minimal** | 2 categories, 5 items — edge case testing (empty states, single items) |
 | `00:1A:79:00:00:04` | **is-series** | 60% of VOD items have `is_series=1` — tests the Ministra lazy-season flow |
 | `00:1A:79:00:00:05` | **embedded-series** | 50% of VOD items have embedded `series[]` arrays — tests the embedded series flow |
+| `00:1A:79:00:00:06` | **legacy-pagination** | No `get_all_channels` support — tests the paginated `get_ordered_list` crawl fallback for the full ITV channel list |
+| `00:1A:79:00:00:07` | **marketing-demo** | 35 original poster movies with the newest 20 first — safe for screenshots and marketing |
 | `<any other MAC>` | **auto** | MAC bytes used as seed → deterministic unique dataset |
 
 ## Configuration
@@ -65,6 +67,7 @@ All endpoints are served at `GET /portal.php?action=<action>&...` matching the r
 | `get_categories` | Category list filtered by `type` (itv/vod/series) |
 | `get_genres` | Genre list (mirrors categories) |
 | `get_ordered_list` | Paginated content list; if `movie_id` is present → returns seasons |
+| `get_all_channels` | Complete ITV channel list in one response (`type=itv` only); excludes censored (adult) genres; disabled in the `legacy-pagination` scenario |
 | `create_link` | Returns a real public HLS stream URL for playback |
 | `favorites` | Add / remove / get favorites (in-memory, resets on restart) |
 | `get_short_epg` | Current-and-upcoming EPG window for a channel (`ch_id`, `size`) |
@@ -72,7 +75,12 @@ All endpoints are served at `GET /portal.php?action=<action>&...` matching the r
 
 ## Cover Images
 
-Cover images and logos use [Picsum Photos](https://picsum.photos) (e.g. `https://picsum.photos/seed/{id}/300/200`). These are real images served from a CDN — no local setup required, but an internet connection is needed for images to display.
+Generated scenarios use [Picsum Photos](https://picsum.photos) for cover images
+and logos, so they need an internet connection to display artwork. The
+`marketing-demo` scenario instead uses the committed, screenshot-safe poster
+catalog shared with the Xtream mock. Stalker serves those PNGs itself from
+`/assets/marketing/poster/<slug>.png`, so screenshots remain deterministic and
+offline once the repository is checked out.
 
 ## Stream URLs
 
@@ -125,19 +133,20 @@ apps/stalker-mock-server/
 │       ├── scenarios.ts                   # MAC → scenario config mapping
 │       ├── data-generator.ts              # Seeded faker data generation
 │       ├── data-store.ts                  # Lazy per-MAC in-memory cache
-│       └── routes/
-│           ├── portal.route.ts            # /portal.php dispatcher
-│           └── handlers/
-│               ├── handshake.handler.ts
-│               ├── do-auth.handler.ts
-│               ├── get-categories.handler.ts
-│               ├── get-ordered-list.handler.ts
-│               ├── get-seasons.handler.ts
-│               ├── create-link.handler.ts
-│               ├── favorites.handler.ts
-│               ├── get-epg-info.handler.ts
-│               ├── get-short-epg.handler.ts
-│               └── get-genres.handler.ts
+│       ├── routes/
+│       │   ├── portal.route.ts            # /portal.php route
+│       │   └── dispatch.ts                # Shared Stalker action dispatcher
+│       └── handlers/
+│           ├── handshake.handler.ts
+│           ├── do-auth.handler.ts
+│           ├── get-categories.handler.ts
+│           ├── get-ordered-list.handler.ts
+│           ├── get-seasons.handler.ts
+│           ├── create-link.handler.ts
+│           ├── favorites.handler.ts
+│           ├── get-epg-info.handler.ts
+│           ├── get-short-epg.handler.ts
+│           └── get-genres.handler.ts
 ├── project.json
 ├── tsconfig.json
 └── README.md
diff --git a/apps/stalker-mock-server/jest.config.ts b/apps/stalker-mock-server/jest.config.ts
new file mode 100644
index 000000000..0f7df053c
--- /dev/null
+++ b/apps/stalker-mock-server/jest.config.ts
@@ -0,0 +1,13 @@
+export default {
+    displayName: 'stalker-mock-server',
+    preset: '../../jest.preset.js',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.[tj]s$': [
+            'ts-jest',
+            { tsconfig: '<rootDir>/tsconfig.spec.json' },
+        ],
+    },
+    moduleFileExtensions: ['ts', 'js', 'html'],
+    coverageDirectory: '../../coverage/apps/stalker-mock-server',
+};
diff --git a/apps/stalker-mock-server/project.json b/apps/stalker-mock-server/project.json
index d826d0656..97c88ee44 100644
--- a/apps/stalker-mock-server/project.json
+++ b/apps/stalker-mock-server/project.json
@@ -9,7 +9,7 @@
             "continuous": true,
             "executor": "nx:run-commands",
             "options": {
-                "command": "pnpm tsx apps/stalker-mock-server/src/main.ts",
+                "command": "pnpm tsx --tsconfig tsconfig.base.json apps/stalker-mock-server/src/main.ts",
                 "cwd": "{workspaceRoot}",
                 "color": true,
                 "env": {
@@ -22,7 +22,7 @@
             "continuous": true,
             "executor": "nx:run-commands",
             "options": {
-                "command": "pnpm tsx watch apps/stalker-mock-server/src/main.ts",
+                "command": "pnpm tsx watch --tsconfig tsconfig.base.json apps/stalker-mock-server/src/main.ts",
                 "cwd": "{workspaceRoot}",
                 "color": true,
                 "env": {
@@ -33,6 +33,14 @@
         },
         "lint": {
             "executor": "@nx/eslint:lint"
+        },
+        "test": {
+            "executor": "@nx/jest:jest",
+            "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+            "options": {
+                "jestConfig": "apps/stalker-mock-server/jest.config.ts",
+                "tsConfig": "apps/stalker-mock-server/tsconfig.spec.json"
+            }
         }
     }
 }
diff --git a/apps/stalker-mock-server/src/app/data-generator.ts b/apps/stalker-mock-server/src/app/data-generator.ts
index 0f0cb9c68..dbc8cbaf5 100644
--- a/apps/stalker-mock-server/src/app/data-generator.ts
+++ b/apps/stalker-mock-server/src/app/data-generator.ts
@@ -1,4 +1,8 @@
 import { faker } from '@faker-js/faker';
+import {
+    MarketingMovieCategoryKey,
+    POSTER_SHOWCASE_MOVIES,
+} from '@iptvnator/shared/marketing-fixtures';
 import { ScenarioConfig } from './scenarios.js';
 
 // ---------------------------------------------------------------------------
@@ -9,6 +13,8 @@ export interface RawCategory {
     id: string;
     title: string;
     alias: string;
+    /** Ministra adult-genre flag ('1' = censored). */
+    censored?: string;
 }
 
 export interface RawChannel {
@@ -53,7 +59,8 @@ export interface RawVodItem {
     category_id: string;
     is_series: 0 | 1 | '1';
     has_files: number;
-    series?: RawEmbeddedEpisode[];
+    /** vclub-style embedded episode numbers, e.g. ['1', '2', '3'] */
+    series?: string[];
 }
 
 export interface RawSeriesItem {
@@ -93,12 +100,6 @@ export interface RawSeason {
     series: string[];
 }
 
-export interface RawEmbeddedEpisode {
-    id: number;
-    name: string;
-    cmd: string;
-}
-
 export interface RawEpgProgram {
     id: string;
     name: string;
@@ -118,6 +119,8 @@ export interface GeneratedPortalData {
     channels: Map<string, RawChannel[]>; // categoryId -> channels
     radio: Map<string, RawRadioStation[]>; // categoryId -> radio stations
     vod: Map<string, RawVodItem[]>;       // categoryId -> items
+    /** Preserves the provider-neutral fixture order for the "*" VOD listing. */
+    vodOrder?: RawVodItem[];
     series: Map<string, RawSeriesItem[]>; // categoryId -> items
     seasons: Map<string, RawSeason[]>;    // seriesItemId -> seasons
     epg: Map<string, RawEpgProgram[]>;    // channelId -> programs
@@ -149,6 +152,58 @@ function logoUrl(seed: string): string {
     return `https://picsum.photos/seed/logo-${seed}/100/100`;
 }
 
+const STALKER_MARKETING_VOD_CATEGORIES: RawCategory[] = [
+    { id: '2901', title: 'Action & Mystery', alias: 'action_mystery' },
+    { id: '2902', title: 'Cosmic & Future Worlds', alias: 'future_worlds' },
+    { id: '2903', title: 'Family & Comedy', alias: 'family_comedy' },
+    {
+        id: '2904',
+        title: 'Documentary & Drama',
+        alias: 'documentary_drama',
+    },
+];
+
+const STALKER_MARKETING_VOD_CATEGORY_IDS: Record<
+    MarketingMovieCategoryKey,
+    string
+> = {
+    'action-mystery': '2901',
+    'future-fantasy': '2902',
+    'family-comedy': '2903',
+    'drama-documentary': '2904',
+};
+
+function generateMarketingVodItems(): RawVodItem[] {
+    const assetBaseUrl = '/assets/marketing/poster';
+
+    return POSTER_SHOWCASE_MOVIES.map((movie, index) => {
+        const id = String(29_000 + index);
+        const posterUrl = `${assetBaseUrl}/${movie.slug}.png`;
+        const rating = movie.rating.toFixed(1);
+
+        return {
+            id,
+            name: movie.name,
+            o_name: movie.name,
+            title: movie.name,
+            cmd: `ffrt4://vod/${id}/index.m3u8`,
+            screenshot_uri: posterUrl,
+            cover: posterUrl,
+            description: `${movie.tagline} ${movie.description}`,
+            actors: movie.actors,
+            director: movie.director,
+            year: String(movie.year),
+            genre: movie.genre,
+            genres_str: movie.genre,
+            rating_imdb: rating,
+            rating_kinopoisk: rating,
+            category_id: STALKER_MARKETING_VOD_CATEGORY_IDS[movie.categoryKey],
+            is_series: 0,
+            has_files: 1,
+        };
+    });
+}
+
 // ---------------------------------------------------------------------------
 // Generator
 // ---------------------------------------------------------------------------
@@ -171,6 +226,16 @@ export function generatePortalData(config: ScenarioConfig): GeneratedPortalData
 
     // ------ ITV categories + channels ------
     data.itvCategories = generateCategories('itv', config.categoryCount.itv);
+    // Real Ministra portals mark adult genres as censored and EXCLUDE their
+    // channels from get_all_channels / the "*" listing; the channels are only
+    // served by paging the specific genre. Mirror that with one extra
+    // censored category so clients can exercise the fallback path.
+    data.itvCategories.push({
+        id: '1099',
+        title: 'For adults',
+        alias: 'for_adults',
+        censored: '1',
+    });
     let channelIndex = 0;
     for (const cat of data.itvCategories) {
         const channels = generateChannels(cat.id, config.itemsPerCategory, channelIndex);
@@ -198,20 +263,39 @@ export function generatePortalData(config: ScenarioConfig): GeneratedPortalData
     }
 
     // ------ VOD categories + items ------
-    data.vodCategories = generateCategories('vod', config.categoryCount.vod);
-    let vodIndex = 0;
-    for (const cat of data.vodCategories) {
-        const items = generateVodItems(
-            cat.id,
-            config.itemsPerCategory,
-            vodIndex,
-            config.isSeriesFraction,
-            config.embeddedSeriesFraction,
-            config.seasonsPerSeries,
-            config.episodesPerSeason
+    if (config.marketingFixture) {
+        data.vodCategories = STALKER_MARKETING_VOD_CATEGORIES.map(
+            (category) => ({ ...category })
         );
-        data.vod.set(cat.id, items);
-        vodIndex += config.itemsPerCategory;
+        const marketingVodItems = generateMarketingVodItems();
+        data.vodOrder = marketingVodItems;
+        for (const category of data.vodCategories) {
+            data.vod.set(
+                category.id,
+                marketingVodItems.filter(
+                    (item) => item.category_id === category.id
+                )
+            );
+        }
+    } else {
+        data.vodCategories = generateCategories(
+            'vod',
+            config.categoryCount.vod
+        );
+        let vodIndex = 0;
+        for (const cat of data.vodCategories) {
+            const items = generateVodItems(
+                cat.id,
+                config.itemsPerCategory,
+                vodIndex,
+                config.isSeriesFraction,
+                config.embeddedSeriesFraction,
+                config.seasonsPerSeries,
+                config.episodesPerSeason
+            );
+            data.vod.set(cat.id, items);
+            vodIndex += config.itemsPerCategory;
+        }
     }
 
     // ------ Series categories + items ------
@@ -376,19 +460,19 @@ function generateVodItems(
         };
 
         if (hasEmbeddedSeries) {
-            item.series = generateEmbeddedEpisodes(id, seasonsPerSeries * episodesPerSeason);
+            // Real vclub portals expose embedded episodes as an array of
+            // episode numbers; playback appends the number to the item cmd.
+            item.series = generateEmbeddedEpisodes(
+                seasonsPerSeries * episodesPerSeason
+            );
         }
 
         return item;
     });
 }
 
-function generateEmbeddedEpisodes(parentId: string, count: number): RawEmbeddedEpisode[] {
-    return Array.from({ length: count }, (_, i) => ({
-        id: parseInt(parentId) * 100 + i,
-        name: `Episode ${i + 1}`,
-        cmd: `ffrt4://vod/${parentId}/ep${i + 1}/index.m3u8`,
-    }));
+function generateEmbeddedEpisodes(count: number): string[] {
+    return Array.from({ length: count }, (_, i) => String(i + 1));
 }
 
 // ---------------------------------------------------------------------------
diff --git a/apps/stalker-mock-server/src/app/handlers/get-all-channels.handler.ts b/apps/stalker-mock-server/src/app/handlers/get-all-channels.handler.ts
new file mode 100644
index 000000000..7d37396fb
--- /dev/null
+++ b/apps/stalker-mock-server/src/app/handlers/get-all-channels.handler.ts
@@ -0,0 +1,46 @@
+import { Request, Response } from 'express';
+import { getPortalData } from '../data-store.js';
+import { getScenario } from '../scenarios.js';
+import { extractMac } from './get-categories.handler.js';
+
+/**
+ * Stalker/Ministra get_all_channels — returns the COMPLETE ITV channel list
+ * in a single response (no pagination). This is what STB clients use to build
+ * their local channel list.
+ *
+ * Only type=itv is supported, matching the reference Ministra middleware.
+ * Scenarios with supportsGetAllChannels=false mimic legacy portals and answer
+ * with an error payload so clients fall back to paginated get_ordered_list.
+ */
+export function handleGetAllChannels(req: Request, res: Response): void {
+    const mac = extractMac(req);
+    const type = (req.query['type'] as string) ?? 'itv';
+    const scenario = getScenario(mac);
+
+    if (scenario.supportsGetAllChannels === false || type !== 'itv') {
+        res.json({ js: { error: 'Unknown action: get_all_channels' } });
+        return;
+    }
+
+    const data = getPortalData(mac);
+    // Like real Ministra portals: censored (adult) genres are excluded from
+    // the bulk channel list — clients must page those genres explicitly.
+    const censoredIds = new Set(
+        data.itvCategories
+            .filter((cat) => cat.censored === '1')
+            .map((cat) => cat.id)
+    );
+    const allChannels = [...data.channels.entries()]
+        .filter(([categoryId]) => !censoredIds.has(categoryId))
+        .flatMap(([, channels]) => channels);
+
+    res.json({
+        js: {
+            data: allChannels,
+            total_items: allChannels.length,
+            max_page_items: allChannels.length,
+            cur_page: 0,
+            selected_item: 0,
+        },
+    });
+}
diff --git a/apps/stalker-mock-server/src/app/handlers/get-genres.handler.ts b/apps/stalker-mock-server/src/app/handlers/get-genres.handler.ts
index a31002aa0..bc9e30a9a 100644
--- a/apps/stalker-mock-server/src/app/handlers/get-genres.handler.ts
+++ b/apps/stalker-mock-server/src/app/handlers/get-genres.handler.ts
@@ -26,7 +26,7 @@ export function handleGetGenres(req: Request, res: Response): void {
         id: cat.id,
         title: cat.title,
         alias: cat.alias,
-        censored: '0',
+        censored: cat.censored ?? '0',
     }));
 
     res.json({ js: genres });
diff --git a/apps/stalker-mock-server/src/app/handlers/get-ordered-list.handler.ts b/apps/stalker-mock-server/src/app/handlers/get-ordered-list.handler.ts
index 569ead57d..ea6c7bb26 100644
--- a/apps/stalker-mock-server/src/app/handlers/get-ordered-list.handler.ts
+++ b/apps/stalker-mock-server/src/app/handlers/get-ordered-list.handler.ts
@@ -34,8 +34,17 @@ export function handleGetOrderedList(req: Request, res: Response): void {
 
     if (type === 'itv') {
         if (categoryId === '*') {
-            for (const items of data.channels.values()) {
-                allItems.push(...items);
+            // The "*" listing excludes censored (adult) genres, matching
+            // real portals; their channels are only served by genre id.
+            const censoredIds = new Set(
+                data.itvCategories
+                    .filter((cat) => cat.censored === '1')
+                    .map((cat) => cat.id)
+            );
+            for (const [catId, items] of data.channels.entries()) {
+                if (!censoredIds.has(catId)) {
+                    allItems.push(...items);
+                }
             }
         } else {
             allItems = data.channels.get(categoryId) ?? [];
@@ -59,8 +68,12 @@ export function handleGetOrderedList(req: Request, res: Response): void {
     } else {
         // vod (default)
         if (categoryId === '*') {
-            for (const items of data.vod.values()) {
-                allItems.push(...items);
+            if (data.vodOrder) {
+                allItems.push(...data.vodOrder);
+            } else {
+                for (const items of data.vod.values()) {
+                    allItems.push(...items);
+                }
             }
         } else {
             allItems = data.vod.get(categoryId) ?? [];
diff --git a/apps/stalker-mock-server/src/app/marketing-poster-url.spec.ts b/apps/stalker-mock-server/src/app/marketing-poster-url.spec.ts
new file mode 100644
index 000000000..e8055efc9
--- /dev/null
+++ b/apps/stalker-mock-server/src/app/marketing-poster-url.spec.ts
@@ -0,0 +1,65 @@
+import {
+    buildRequestOrigin,
+    resolveMarketingPosterUrls,
+} from './marketing-poster-url';
+
+type RequestLike = Parameters<typeof buildRequestOrigin>[0];
+
+function request(
+    protocol: string,
+    headers: Record<string, string | undefined>
+): RequestLike {
+    return {
+        protocol,
+        get: (name: string) => headers[name.toLowerCase()],
+    };
+}
+
+describe('marketing poster URLs', () => {
+    it('uses the forwarded public origin for relative poster paths', () => {
+        const req = request('http', {
+            host: 'stalker-mock:3210',
+            'x-forwarded-host': 'demo.example:9443',
+            'x-forwarded-proto': 'https',
+        });
+        const payload = {
+            js: {
+                data: [
+                    {
+                        cover: '/assets/marketing/poster/black-harbor.png',
+                        screenshot_uri:
+                            '/assets/marketing/poster/black-harbor.png',
+                    },
+                ],
+            },
+        };
+
+        expect(
+            resolveMarketingPosterUrls(payload, buildRequestOrigin(req))
+        ).toEqual({
+            js: {
+                data: [
+                    {
+                        cover: 'https://demo.example:9443/assets/marketing/poster/black-harbor.png',
+                        screenshot_uri:
+                            'https://demo.example:9443/assets/marketing/poster/black-harbor.png',
+                    },
+                ],
+            },
+        });
+    });
+
+    it('preserves unrelated URLs and values', () => {
+        const payload = {
+            cover: 'https://picsum.photos/seed/movie/300/450',
+            count: 1,
+        };
+
+        expect(
+            resolveMarketingPosterUrls(
+                payload,
+                buildRequestOrigin(request('http', { host: 'localhost:3210' }))
+            )
+        ).toEqual(payload);
+    });
+});
diff --git a/apps/stalker-mock-server/src/app/marketing-poster-url.ts b/apps/stalker-mock-server/src/app/marketing-poster-url.ts
new file mode 100644
index 000000000..5ef73e4a9
--- /dev/null
+++ b/apps/stalker-mock-server/src/app/marketing-poster-url.ts
@@ -0,0 +1,51 @@
+type RequestOriginSource = {
+    protocol: string;
+    get(name: string): string | undefined;
+};
+
+const MARKETING_POSTER_PATH_PREFIX = '/assets/marketing/poster/';
+
+export function buildRequestOrigin(request: RequestOriginSource): string {
+    const protocol =
+        firstForwardedValue(request.get('x-forwarded-proto')) ??
+        request.protocol;
+    const host =
+        firstForwardedValue(request.get('x-forwarded-host')) ??
+        request.get('host');
+
+    return host ? `${protocol}://${host}` : '';
+}
+
+export function resolveMarketingPosterUrls(
+    payload: unknown,
+    origin: string
+): unknown {
+    if (
+        typeof payload === 'string' &&
+        payload.startsWith(MARKETING_POSTER_PATH_PREFIX)
+    ) {
+        return origin ? new URL(payload, origin).href : payload;
+    }
+
+    if (Array.isArray(payload)) {
+        return payload.map((item) => resolveMarketingPosterUrls(item, origin));
+    }
+
+    if (payload && typeof payload === 'object') {
+        return Object.fromEntries(
+            Object.entries(payload).map(([key, value]) => [
+                key,
+                resolveMarketingPosterUrls(value, origin),
+            ])
+        );
+    }
+
+    return payload;
+}
+
+function firstForwardedValue(value: string | undefined): string | undefined {
+    return value
+        ?.split(',', 1)[0]
+        ?.trim()
+        .replace(/^(?:https?):\/\//, '');
+}
diff --git a/apps/stalker-mock-server/src/app/routes/dispatch.ts b/apps/stalker-mock-server/src/app/routes/dispatch.ts
index 507ad1bf8..4d8aa2420 100644
--- a/apps/stalker-mock-server/src/app/routes/dispatch.ts
+++ b/apps/stalker-mock-server/src/app/routes/dispatch.ts
@@ -1,6 +1,7 @@
 import { Request, Response } from 'express';
 import { handleHandshake } from '../handlers/handshake.handler.js';
 import { handleDoAuth } from '../handlers/do-auth.handler.js';
+import { handleGetAllChannels } from '../handlers/get-all-channels.handler.js';
 import { handleGetCategories } from '../handlers/get-categories.handler.js';
 import { handleGetOrderedList } from '../handlers/get-ordered-list.handler.js';
 import { handleGetSeasons } from '../handlers/get-seasons.handler.js';
@@ -39,6 +40,9 @@ export default function dispatchPortalAction(req: Request, res: Response): void
                 handleGetOrderedList(req, res);
             }
             break;
+        case 'get_all_channels':
+            handleGetAllChannels(req, res);
+            break;
         case 'create_link':
             handleCreateLink(req, res);
             break;
diff --git a/apps/stalker-mock-server/src/app/scenarios.ts b/apps/stalker-mock-server/src/app/scenarios.ts
index 6657990ae..ec1c4b6b8 100644
--- a/apps/stalker-mock-server/src/app/scenarios.ts
+++ b/apps/stalker-mock-server/src/app/scenarios.ts
@@ -15,6 +15,14 @@ export interface ScenarioConfig {
     isSeriesFraction: number;
     /** Fraction of VOD items that have embedded series[] array */
     embeddedSeriesFraction: number;
+    /**
+     * Whether the portal implements the ITV `get_all_channels` action.
+     * Defaults to true; set false to force clients onto paginated
+     * `get_ordered_list` crawling (legacy portals).
+     */
+    supportsGetAllChannels?: boolean;
+    /** Replace generated VOD with the shared screenshot-safe poster catalog. */
+    marketingFixture?: true;
 }
 
 /**
@@ -88,6 +96,31 @@ export const SCENARIOS: Record<string, ScenarioConfig> = {
         isSeriesFraction: 0,
         embeddedSeriesFraction: 0.5, // 50% of VOD items have embedded series[]
     },
+    '00:1a:79:00:00:06': {
+        name: 'legacy-pagination',
+        description:
+            'Portal without get_all_channels — clients must crawl get_ordered_list pages',
+        seed: 6006,
+        categoryCount: { itv: 6, radio: 4, vod: 4, series: 4 },
+        itemsPerCategory: 40,
+        seasonsPerSeries: 2,
+        episodesPerSeason: 5,
+        isSeriesFraction: 0,
+        embeddedSeriesFraction: 0,
+        supportsGetAllChannels: false,
+    },
+    '00:1a:79:00:00:07': {
+        name: 'marketing-demo',
+        description: 'Screenshot-safe portal with 35 original poster movies',
+        seed: 7007,
+        categoryCount: { itv: 4, radio: 4, vod: 4, series: 4 },
+        itemsPerCategory: 6,
+        seasonsPerSeries: 2,
+        episodesPerSeason: 5,
+        isSeriesFraction: 0,
+        embeddedSeriesFraction: 0,
+        marketingFixture: true,
+    },
 };
 
 /**
diff --git a/apps/stalker-mock-server/src/main.ts b/apps/stalker-mock-server/src/main.ts
index 2e8eed602..940620f48 100644
--- a/apps/stalker-mock-server/src/main.ts
+++ b/apps/stalker-mock-server/src/main.ts
@@ -1,13 +1,22 @@
 import http from 'http';
+import { join } from 'node:path';
 import express, { Request, Response } from 'express';
 import cors from 'cors';
 import portalRouter from './app/routes/portal.route.js';
 import dispatchPortalAction from './app/routes/dispatch.js';
 import { resetAll } from './app/data-store.js';
 import { SCENARIOS } from './app/scenarios.js';
+import {
+    buildRequestOrigin,
+    resolveMarketingPosterUrls,
+} from './app/marketing-poster-url.js';
 
 const PORT = parseInt(process.env['PORT'] ?? '3210', 10);
 const app = express();
+const MARKETING_POSTER_DIRECTORY = join(
+    process.cwd(),
+    'apps/xtream-mock-server/public/marketing/poster'
+);
 
 // ---------------------------------------------------------------------------
 // Middleware
@@ -31,10 +40,42 @@ app.use((req, _res, next) => {
     next();
 });
 
+// Marketing fixtures store deployment-neutral asset paths. Resolve them
+// against the public origin of each request, including reverse-proxy headers.
+app.use((req, res, next) => {
+    if (
+        !['get_ordered_list', 'favorites'].includes(
+            String(req.query['action'])
+        )
+    ) {
+        next();
+        return;
+    }
+
+    const sendJson = res.json.bind(res);
+    const requestOrigin = buildRequestOrigin(req);
+
+    res.json = ((body: unknown) =>
+        sendJson(
+            resolveMarketingPosterUrls(body, requestOrigin)
+        )) as Response['json'];
+    next();
+});
+
 // ---------------------------------------------------------------------------
 // Routes
 // ---------------------------------------------------------------------------
 
+// Serve the shared screenshot-safe poster catalog directly from this process.
+app.use(
+    '/assets/marketing/poster',
+    express.static(MARKETING_POSTER_DIRECTORY, {
+        fallthrough: false,
+        immutable: true,
+        maxAge: '1y',
+    })
+);
+
 // Stalker portal.php endpoint (direct portal protocol, Electron mode)
 app.use('/portal.php', portalRouter);
 
diff --git a/apps/stalker-mock-server/tsconfig.spec.json b/apps/stalker-mock-server/tsconfig.spec.json
new file mode 100644
index 000000000..09849f85f
--- /dev/null
+++ b/apps/stalker-mock-server/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../dist/out-tsc",
+        "module": "commonjs",
+        "moduleResolution": "node10",
+        "types": ["jest", "node"]
+    },
+    "include": [
+        "jest.config.ts",
+        "src/**/*.test.ts",
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
+    ]
+}
diff --git a/apps/web-backend/project.json b/apps/web-backend/project.json
index a29059af2..075b3c30f 100644
--- a/apps/web-backend/project.json
+++ b/apps/web-backend/project.json
@@ -37,7 +37,7 @@
             }
         },
         "lint": {
-            "command": "eslint apps/web-backend/**/*.ts"
+            "command": "eslint \"apps/web-backend/**/*.ts\""
         },
         "test": {
             "executor": "@nx/jest:jest",
diff --git a/apps/web-backend/src/app/web-backend-app.spec.ts b/apps/web-backend/src/app/web-backend-app.spec.ts
index e9ab7f2a8..c44eaa147 100644
--- a/apps/web-backend/src/app/web-backend-app.spec.ts
+++ b/apps/web-backend/src/app/web-backend-app.spec.ts
@@ -196,6 +196,62 @@ https://stream.example/news.m3u8`);
         );
     });
 
+    it('extracts KODIPROP ClearKey DRM on the /parse URL-import path', async () => {
+        const httpClient = new StubHttpClient();
+        const kid = '00112233445566778899aabbccddeeff';
+        const key = 'ffeeddccbbaa99887766554433221100';
+        // First channel uses the KODIPROP-before-#EXTINF layout (supported
+        // since the 0.15.2-iptvnator.2 parser pin), the second the common
+        // between-#EXTINF-and-URL layout.
+        httpClient.queueResponse(`#EXTM3U
+#KODIPROP:inputstream.adaptive.license_type=clearkey
+#KODIPROP:inputstream.adaptive.license_key=${kid}:${key}
+#EXTINF:-1 tvg-id="ck" group-title="DASH",Encrypted DASH
+https://stream.example/enc.mpd
+#EXTINF:-1 tvg-id="ck2" group-title="DASH",Encrypted DASH 2
+#KODIPROP:inputstream.adaptive.license_type=clearkey
+#KODIPROP:inputstream.adaptive.license_key=${kid}:${key}
+https://stream.example/enc2.mpd
+#EXTINF:-1 tvg-id="plain",Plain Channel
+https://stream.example/live.m3u8`);
+
+        await withServer(
+            createWebBackendApp({
+                clientOrigins: ['http://localhost:4200'],
+                guid: () => 'fixed-id',
+                httpClient,
+                resolveHostname: resolvePublicHost,
+            }),
+            async (baseUrl) => {
+                const targetId = await registerProviderTarget(
+                    baseUrl,
+                    'https://provider.example/drm.m3u'
+                );
+                const response = await fetch(
+                    `${baseUrl}/parse?targetId=${targetId}`,
+                    { headers: { Origin: 'http://localhost:4200' } }
+                );
+                const body = (await response.json()) as {
+                    playlist: { items: Array<Record<string, unknown>> };
+                };
+
+                expect(response.status).toBe(200);
+                expect(body.playlist.items).toHaveLength(3);
+                expect(body.playlist.items[0]['drm']).toEqual({
+                    licenseType: 'clearkey',
+                    supported: true,
+                    clearKeys: { [kid]: key },
+                });
+                expect(body.playlist.items[1]['drm']).toEqual({
+                    licenseType: 'clearkey',
+                    supported: true,
+                    clearKeys: { [kid]: key },
+                });
+                expect(body.playlist.items[2]['drm']).toBeUndefined();
+            }
+        );
+    });
+
     it('allows browser preflight checks for provider target registration', async () => {
         await withServer(
             createWebBackendApp({
diff --git a/apps/web-backend/src/app/web-backend-app.ts b/apps/web-backend/src/app/web-backend-app.ts
index 32bd75abe..1ccbba9c9 100644
--- a/apps/web-backend/src/app/web-backend-app.ts
+++ b/apps/web-backend/src/app/web-backend-app.ts
@@ -8,6 +8,7 @@ import axios from 'axios';
 import epgParser from 'epg-parser';
 import parser from 'iptv-playlist-parser';
 import { normalizeXtreamServerUrl } from '@iptvnator/shared/interfaces';
+import { extractDrmFromRaw } from '@iptvnator/shared/m3u-utils';
 
 export interface WebBackendHttpGetOptions {
     readonly headers?: Record<string, string>;
@@ -514,10 +515,20 @@ function createPlaylistObject(options: {
         count: options.playlist.items.length,
         playlist: {
             ...options.playlist,
-            items: options.playlist.items.map((item) => ({
-                id: options.guid(),
-                ...item,
-            })),
+            items: options.playlist.items.map((item) => {
+                // Keep this builder aligned with the shared
+                // createPlaylistObject() in @iptvnator/shared/m3u-utils:
+                // KODIPROP ClearKey DRM must survive the /parse URL-import
+                // path too.
+                const drm = extractDrmFromRaw(
+                    typeof item['raw'] === 'string' ? item['raw'] : undefined
+                );
+                return {
+                    id: options.guid(),
+                    ...item,
+                    ...(drm ? { drm } : {}),
+                };
+            }),
         },
         importDate: timestamp,
         lastUsage: timestamp,
diff --git a/apps/web-e2e/src/dash-clearkey.e2e.ts b/apps/web-e2e/src/dash-clearkey.e2e.ts
new file mode 100644
index 000000000..280b1631a
--- /dev/null
+++ b/apps/web-e2e/src/dash-clearkey.e2e.ts
@@ -0,0 +1,153 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import type { Page } from '@playwright/test';
+import { expect, test } from './fixtures';
+
+/**
+ * DASH + ClearKey playback (offline fixture, no network).
+ *
+ * The fixture host is virtual: every request to it is fulfilled from
+ * `fixtures/dash/` via route interception, including HTTP Range requests
+ * (Shaka fetches the init segment and sidx via byte ranges).
+ */
+
+const FIXTURE_DIR = join(__dirname, 'fixtures/dash');
+const FIXTURE_HOST = 'https://dash-fixture.local';
+
+const CLEARKEY_KID = '00112233445566778899aabbccddeeff';
+const CLEARKEY_KEY = 'ffeeddccbbaa99887766554433221100';
+
+const DASH_PLAYLIST = [
+    '#EXTM3U',
+    '#EXTINF:-1 tvg-id="ck-dash" group-title="DASH",ClearKey DASH',
+    '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+    `#KODIPROP:inputstream.adaptive.license_key=${CLEARKEY_KID}:${CLEARKEY_KEY}`,
+    `${FIXTURE_HOST}/clearkey.mpd`,
+    '#EXTINF:-1 tvg-id="clear-dash" group-title="DASH",Clear DASH',
+    `${FIXTURE_HOST}/clear.mpd`,
+    '#EXTINF:-1 tvg-id="wv-dash" group-title="DASH",Widevine DASH',
+    '#KODIPROP:inputstream.adaptive.license_type=com.widevine.alpha',
+    '#KODIPROP:inputstream.adaptive.license_key=https://license.example.com/wv',
+    `${FIXTURE_HOST}/clearkey.mpd`,
+].join('\n');
+
+// The inline player starts playback programmatically; without this flag the
+// bundled Chromium blocks play() before a user gesture reaches the video.
+// The Angular service worker must be blocked: requests going through it
+// bypass Playwright route interception, so the virtual fixture host would
+// never resolve.
+test.use({
+    launchOptions: {
+        args: ['--autoplay-policy=no-user-gesture-required'],
+    },
+    serviceWorkers: 'block',
+});
+
+// ClearKey EME + VP9 support is only deterministic in Chromium among the
+// bundled Playwright browsers (WebKit lacks ClearKey); the Electron e2e suite
+// covers the real desktop runtime.
+test.skip(
+    ({ browserName }) => browserName !== 'chromium',
+    'DASH ClearKey coverage targets Chromium'
+);
+
+async function serveDashFixtures(page: Page): Promise<void> {
+    await page.route(`${FIXTURE_HOST}/**`, async (route) => {
+        const url = new URL(route.request().url());
+        let body: Buffer;
+        try {
+            body = readFileSync(join(FIXTURE_DIR, url.pathname.slice(1)));
+        } catch {
+            await route.fulfill({ status: 404, body: 'not found' });
+            return;
+        }
+
+        const contentType = url.pathname.endsWith('.mpd')
+            ? 'application/dash+xml'
+            : 'video/mp4';
+        const rangeHeader = route.request().headers()['range'];
+        const range = rangeHeader
+            ? /bytes=(\d+)-(\d+)?/.exec(rangeHeader)
+            : null;
+        if (!range) {
+            await route.fulfill({
+                status: 200,
+                headers: {
+                    'Content-Type': contentType,
+                    'Accept-Ranges': 'bytes',
+                },
+                body,
+            });
+            return;
+        }
+
+        const start = Number(range[1]);
+        const end = range[2] ? Number(range[2]) : body.length - 1;
+        await route.fulfill({
+            status: 206,
+            headers: {
+                'Content-Type': contentType,
+                'Accept-Ranges': 'bytes',
+                'Content-Range': `bytes ${start}-${end}/${body.length}`,
+            },
+            body: body.subarray(start, end + 1),
+        });
+    });
+}
+
+async function importDashPlaylist(page: Page): Promise<void> {
+    await page.goto('/');
+    await page.getByRole('button', { name: 'Add playlist' }).click();
+    const dialog = page.locator('mat-dialog-container');
+    await expect(dialog).toBeVisible();
+    await dialog.getByRole('radio', { name: /Raw m3u text/i }).click();
+    await dialog.locator('textarea').fill(DASH_PLAYLIST);
+    await Promise.all([
+        page.waitForURL(/\/workspace\/playlists\/.+\/all$/),
+        dialog.getByRole('button', { name: 'Import', exact: true }).click(),
+    ]);
+    await expect(page.getByText('3 channels')).toBeVisible();
+}
+
+async function expectVideoPlaying(page: Page): Promise<void> {
+    const video = page.locator('app-web-player-view video').first();
+    await expect(video).toBeVisible({ timeout: 15_000 });
+    await expect
+        .poll(
+            () =>
+                video.evaluate(
+                    (element: HTMLVideoElement) => element.currentTime
+                ),
+            { timeout: 20_000 }
+        )
+        .toBeGreaterThan(0.5);
+    await expect(
+        page.locator('[data-test-id="playback-diagnostic-banner"]')
+    ).toBeHidden();
+}
+
+test('@web @m3u @dash ClearKey and clear DASH channels play inline', async ({
+    page,
+}) => {
+    await serveDashFixtures(page);
+    await importDashPlaylist(page);
+
+    await page.getByText('1. ClearKey DASH').click();
+    await expectVideoPlaying(page);
+
+    await page.getByText('2. Clear DASH').click();
+    await expectVideoPlaying(page);
+});
+
+test('@web @m3u @dash unsupported DRM shows the encryption diagnostic', async ({
+    page,
+}) => {
+    await serveDashFixtures(page);
+    await importDashPlaylist(page);
+
+    await page.getByText('3. Widevine DASH').click();
+
+    const banner = page.locator('[data-test-id="playback-diagnostic-banner"]');
+    await expect(banner).toBeVisible({ timeout: 15_000 });
+    await expect(banner).toContainText(/encrypted or DRM-protected/i);
+});
diff --git a/apps/web-e2e/src/fixtures/dash/README.md b/apps/web-e2e/src/fixtures/dash/README.md
new file mode 100644
index 000000000..c7d11c27e
--- /dev/null
+++ b/apps/web-e2e/src/fixtures/dash/README.md
@@ -0,0 +1,49 @@
+# Offline DASH ClearKey fixtures
+
+Deterministic ~4 s DASH assets used by the DASH/ClearKey e2e suites
+(`apps/web-e2e/src/dash-clearkey.e2e.ts` and the Electron equivalent):
+
+| File                 | Content                                              |
+| -------------------- | ---------------------------------------------------- |
+| `clearkey-video.mp4` | VP9 video, CENC (`cenc` AES-CTR, subsample) encrypted |
+| `clearkey-audio.mp4` | Opus audio, CENC encrypted                           |
+| `clearkey.mpd`       | Static on-demand MPD for the encrypted pair          |
+| `clear-video.mp4`    | VP9 video, unencrypted (clear-DASH regression case)  |
+| `clear-audio.mp4`    | Opus audio, unencrypted                              |
+| `clear.mpd`          | Static on-demand MPD for the clear pair              |
+
+Fixed ClearKey test credentials (obviously synthetic, safe to commit):
+
+- KID: `00112233445566778899aabbccddeeff`
+- KEY: `ffeeddccbbaa99887766554433221100`
+
+They correspond to the `#KODIPROP:inputstream.adaptive.license_key=KID:KEY`
+value used by the e2e playlists.
+
+**Why VP9+Opus:** Playwright's bundled Chromium ships without proprietary
+codecs (no H.264/AAC), while royalty-free VP9/Opus decode both there and in
+Electron — one fixture serves both suites.
+
+**Why Shaka Packager for encryption:** ffmpeg's mp4 muxer only writes `senc`
+sample-encryption metadata — Chromium's demuxer requires `saiz`/`saio` and
+fails with `CHUNK_DEMUXER_ERROR_APPEND_FAILED: Sample encryption info is not
+available`. ffmpeg also cannot produce the subsample encryption that the VP9
+CENC binding mandates (a fully-encrypted VP9 track ends in
+`MEDIA_ERR_DECODE`). Shaka Packager produces spec-compliant output for both.
+
+## Regeneration
+
+```bash
+node apps/web-e2e/src/fixtures/dash/generate-fixture.mjs
+```
+
+Requires `ffmpeg` (tested with 7.x) with `libvpx-vp9` and `libopus`. Shaka
+Packager is resolved in this order: the `SHAKA_PACKAGER` env var (path to a
+`packager` binary), an installed `shaka-packager` npm package, otherwise the
+script fetches the official npm package (prebuilt per-platform binaries) once
+into a temp directory via `npm pack`.
+
+The script synthesizes the content with ffmpeg (`testsrc2` + `sine`, clear
+master), then packages both variants with Shaka Packager, which also writes
+the MPDs. Byte-exact output across tool versions is not guaranteed; the
+committed files are the source of truth.
diff --git a/apps/web-e2e/src/fixtures/dash/clear-audio.mp4 b/apps/web-e2e/src/fixtures/dash/clear-audio.mp4
new file mode 100644
index 000000000..9531d3301
Binary files /dev/null and b/apps/web-e2e/src/fixtures/dash/clear-audio.mp4 differ
diff --git a/apps/web-e2e/src/fixtures/dash/clear-video.mp4 b/apps/web-e2e/src/fixtures/dash/clear-video.mp4
new file mode 100644
index 000000000..5ace4324e
Binary files /dev/null and b/apps/web-e2e/src/fixtures/dash/clear-video.mp4 differ
diff --git a/apps/web-e2e/src/fixtures/dash/clear.mpd b/apps/web-e2e/src/fixtures/dash/clear.mpd
new file mode 100644
index 000000000..9e97a8489
--- /dev/null
+++ b/apps/web-e2e/src/fixtures/dash/clear.mpd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/shaka-project/shaka-packager version v3.9.2-9397a68-release-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT4S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="320" height="180" frameRate="12288/512" subsegmentAlignment="true" par="16:9">
+      <Representation id="0" bandwidth="146192" codecs="vp09.00.11.08.01.02.02.02.00" mimeType="video/mp4" sar="1:1">
+        <BaseURL>clear-video.mp4</BaseURL>
+        <SegmentBase indexRange="807-850" timescale="12288">
+          <Initialization range="0-806"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <Representation id="1" bandwidth="61348" codecs="opus" mimeType="audio/mp4" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="1"/>
+        <BaseURL>clear-audio.mp4</BaseURL>
+        <SegmentBase indexRange="810-853" timescale="48000">
+          <Initialization range="0-809"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/apps/web-e2e/src/fixtures/dash/clearkey-audio.mp4 b/apps/web-e2e/src/fixtures/dash/clearkey-audio.mp4
new file mode 100644
index 000000000..c3fee3c15
Binary files /dev/null and b/apps/web-e2e/src/fixtures/dash/clearkey-audio.mp4 differ
diff --git a/apps/web-e2e/src/fixtures/dash/clearkey-video.mp4 b/apps/web-e2e/src/fixtures/dash/clearkey-video.mp4
new file mode 100644
index 000000000..6acbd1b1c
Binary files /dev/null and b/apps/web-e2e/src/fixtures/dash/clearkey-video.mp4 differ
diff --git a/apps/web-e2e/src/fixtures/dash/clearkey.mpd b/apps/web-e2e/src/fixtures/dash/clearkey.mpd
new file mode 100644
index 000000000..a3a10a8e2
--- /dev/null
+++ b/apps/web-e2e/src/fixtures/dash/clearkey.mpd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/shaka-project/shaka-packager version v3.9.2-9397a68-release-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT4S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="320" height="180" frameRate="12288/512" subsegmentAlignment="true" par="16:9">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00112233-4455-6677-8899-aabbccddeeff"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAEAESIzRFVmd4iZqrvM3e7/AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="0" bandwidth="149370" codecs="vp09.00.11.08.01.02.02.02.00" mimeType="video/mp4" sar="1:1">
+        <BaseURL>clearkey-video.mp4</BaseURL>
+        <SegmentBase indexRange="939-982" timescale="12288">
+          <Initialization range="0-938"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="00112233-4455-6677-8899-aabbccddeeff"/>
+      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
+        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAEAESIzRFVmd4iZqrvM3e7/AAAAAA==</cenc:pssh>
+      </ContentProtection>
+      <Representation id="1" bandwidth="64670" codecs="opus" mimeType="audio/mp4" audioSamplingRate="48000">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="1"/>
+        <BaseURL>clearkey-audio.mp4</BaseURL>
+        <SegmentBase indexRange="942-985" timescale="48000">
+          <Initialization range="0-941"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/apps/web-e2e/src/fixtures/dash/generate-fixture.mjs b/apps/web-e2e/src/fixtures/dash/generate-fixture.mjs
new file mode 100644
index 000000000..f6522f0dd
--- /dev/null
+++ b/apps/web-e2e/src/fixtures/dash/generate-fixture.mjs
@@ -0,0 +1,139 @@
+#!/usr/bin/env node
+/**
+ * Regenerates the offline DASH ClearKey fixtures used by the DASH e2e suites.
+ *
+ * Produces, next to this script:
+ *   - clearkey-video.mp4 / clearkey-audio.mp4 / clearkey.mpd —
+ *     CENC (`cenc` AES-CTR) encrypted VP9 video + Opus audio. Encryption is
+ *     done by Shaka Packager because ffmpeg's mp4 muxer only writes `senc`
+ *     sample-encryption metadata (Chromium requires `saiz`/`saio`) and cannot
+ *     produce the subsample encryption that the VP9 CENC binding mandates.
+ *   - clear-video.mp4 / clear-audio.mp4 / clear.mpd — same content, clear.
+ *
+ * VP9+Opus is deliberate: Playwright's bundled Chromium ships no proprietary
+ * codecs (H.264/AAC), while royalty-free codecs work there and in Electron.
+ *
+ * Requirements:
+ *   - ffmpeg (tested with 7.x) built with libvpx-vp9 and libopus
+ *   - Shaka Packager: either set SHAKA_PACKAGER=/path/to/packager, install
+ *     the `shaka-packager` npm package, or let this script fetch it once via
+ *     `npm pack shaka-packager` into a temp directory (official Google
+ *     package with prebuilt per-platform binaries).
+ *
+ * Byte-exact output across tool versions is not guaranteed — the committed
+ * files are the source of truth for CI.
+ *
+ * Usage: node apps/web-e2e/src/fixtures/dash/generate-fixture.mjs
+ */
+
+import { execFileSync } from 'node:child_process';
+import { chmodSync, mkdtempSync, readdirSync, rmSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const OUT_DIR = dirname(fileURLToPath(import.meta.url));
+
+/** Fixed, obviously synthetic 128-bit ClearKey test credentials. */
+export const CLEARKEY_KID = '00112233445566778899aabbccddeeff';
+export const CLEARKEY_KEY = 'ffeeddccbbaa99887766554433221100';
+
+const DURATION_SECONDS = 4;
+const FRAME_RATE = 24;
+
+const masterPath = join(OUT_DIR, 'content-master.tmp.mp4');
+const packager = resolvePackager();
+
+try {
+    // 1. Synthesize the clear master (muxed VP9+Opus).
+    execFileSync(
+        'ffmpeg',
+        [
+            '-y',
+            '-f', 'lavfi', '-i',
+            `testsrc2=duration=${DURATION_SECONDS}:size=320x180:rate=${FRAME_RATE}`,
+            '-f', 'lavfi', '-i',
+            `sine=frequency=440:duration=${DURATION_SECONDS}`,
+            '-c:v', 'libvpx-vp9', '-b:v', '150k', '-g', String(FRAME_RATE),
+            '-c:a', 'libopus', '-b:a', '48k',
+            masterPath,
+        ],
+        { stdio: ['ignore', 'ignore', 'inherit'] }
+    );
+
+    // 2. Encrypted variant (subsample CENC for VP9, on-demand profile MPD).
+    runPackager([
+        `in=${masterPath},stream=video,output=${join(OUT_DIR, 'clearkey-video.mp4')},drm_label=CK`,
+        `in=${masterPath},stream=audio,output=${join(OUT_DIR, 'clearkey-audio.mp4')},drm_label=CK`,
+        '--enable_raw_key_encryption',
+        '--keys', `label=CK:key_id=${CLEARKEY_KID}:key=${CLEARKEY_KEY}`,
+        '--clear_lead', '0',
+        '--protection_scheme', 'cenc',
+        '--mpd_output', join(OUT_DIR, 'clearkey.mpd'),
+    ]);
+    console.log(`clearkey.mpd: CENC VP9+Opus (kid=${CLEARKEY_KID})`);
+
+    // 3. Clear variant.
+    runPackager([
+        `in=${masterPath},stream=video,output=${join(OUT_DIR, 'clear-video.mp4')}`,
+        `in=${masterPath},stream=audio,output=${join(OUT_DIR, 'clear-audio.mp4')}`,
+        '--mpd_output', join(OUT_DIR, 'clear.mpd'),
+    ]);
+    console.log('clear.mpd: clear VP9+Opus');
+} finally {
+    rmSync(masterPath, { force: true });
+}
+
+function runPackager(args) {
+    execFileSync(packager.command, [...packager.prefixArgs, ...args], {
+        stdio: ['ignore', 'ignore', 'inherit'],
+    });
+}
+
+function resolvePackager() {
+    if (process.env.SHAKA_PACKAGER) {
+        return { command: process.env.SHAKA_PACKAGER, prefixArgs: [] };
+    }
+
+    try {
+        const launcher = createRequire(import.meta.url).resolve(
+            'shaka-packager'
+        );
+        return { command: process.execPath, prefixArgs: [launcher] };
+    } catch {
+        return fetchPackagerViaNpmPack();
+    }
+}
+
+/** One-off fetch of the official npm package with prebuilt binaries. */
+function fetchPackagerViaNpmPack() {
+    const workDir = mkdtempSync(join(tmpdir(), 'shaka-packager-'));
+    console.log(`Fetching shaka-packager via npm pack into ${workDir} ...`);
+    execFileSync('npm', ['pack', 'shaka-packager', '--silent'], {
+        cwd: workDir,
+        stdio: ['ignore', 'ignore', 'inherit'],
+    });
+    const tarball = readdirSync(workDir).find((name) =>
+        name.endsWith('.tgz')
+    );
+    if (!tarball) {
+        throw new Error('npm pack did not produce a shaka-packager tarball.');
+    }
+    execFileSync('tar', ['-xzf', tarball], { cwd: workDir });
+
+    const binaryName = {
+        darwin: { arm64: 'packager-osx-arm64', x64: 'packager-osx-x64' },
+        linux: { arm64: 'packager-linux-arm64', x64: 'packager-linux-x64' },
+        win32: { x64: 'packager-win-x64.exe' },
+    }[process.platform]?.[process.arch];
+    if (!binaryName) {
+        throw new Error(
+            `No shaka-packager binary for ${process.platform}/${process.arch}; set SHAKA_PACKAGER manually.`
+        );
+    }
+
+    const binaryPath = join(workDir, 'package', 'bin', binaryName);
+    chmodSync(binaryPath, 0o755);
+    return { command: binaryPath, prefixArgs: [] };
+}
diff --git a/apps/web-e2e/src/provider-target-route.ts b/apps/web-e2e/src/provider-target-route.ts
index 50ebd11ef..ccc0cf9ab 100644
--- a/apps/web-e2e/src/provider-target-route.ts
+++ b/apps/web-e2e/src/provider-target-route.ts
@@ -5,10 +5,13 @@ interface ProviderTargetPayload {
 }
 
 const BACKEND_ORIGIN = 'http://localhost:3000';
+const APP_ORIGIN = process.env['BASE_URL']
+    ? new URL(process.env['BASE_URL']).origin
+    : 'http://localhost:4200';
 const CORS_HEADERS = {
     'access-control-allow-headers': 'content-type',
     'access-control-allow-methods': 'POST, OPTIONS',
-    'access-control-allow-origin': 'http://localhost:4200',
+    'access-control-allow-origin': APP_ORIGIN,
 } as const;
 
 export async function interceptProviderTargetRegistration(
diff --git a/apps/web-e2e/src/settings.e2e.ts b/apps/web-e2e/src/settings.e2e.ts
index 2b687b91b..113fe8278 100644
--- a/apps/web-e2e/src/settings.e2e.ts
+++ b/apps/web-e2e/src/settings.e2e.ts
@@ -48,6 +48,26 @@ test.describe('Settings', () => {
         );
     });
 
+    test('@settings @web Enable shared web player controls', async ({
+        page,
+    }) => {
+        await openSettings(page);
+
+        const setting = page.locator(
+            '[data-test-id="web-player-shared-controls-setting"]'
+        );
+        const checkbox = setting.locator('input[type="checkbox"]');
+
+        await expect(setting).toBeVisible();
+        await expect(checkbox).not.toBeChecked();
+        await checkbox.check();
+        await saveSettings(page);
+        await page.reload();
+        await openSettings(page);
+
+        await expect(checkbox).toBeChecked();
+    });
+
     test('@settings @web Change app theme', async ({ page }) => {
         await openSettings(page);
         // v0.22 compact theme picker exposes the segmented control as a
diff --git a/apps/web-e2e/src/stalker.e2e.ts b/apps/web-e2e/src/stalker.e2e.ts
index f7c7c56b3..9129bc0ca 100644
--- a/apps/web-e2e/src/stalker.e2e.ts
+++ b/apps/web-e2e/src/stalker.e2e.ts
@@ -35,6 +35,12 @@ const DEFAULT_MAC = '00:1A:79:00:00:01';
 /** Minimal scenario MAC — 2 categories, 5 items (edge case testing) */
 const MINIMAL_MAC = '00:1A:79:00:00:03';
 
+/** Embedded-series MAC — 50% of VOD items carry an embedded series[] array */
+const EMBEDDED_SERIES_MAC = '00:1A:79:00:00:05';
+
+/** Legacy pagination MAC — portal without get_all_channels support */
+const LEGACY_PAGINATION_MAC = '00:1A:79:00:00:06';
+
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -333,6 +339,177 @@ test('@stalker PWA skips bulk EPG across channel switches', async ({
     expect(shortEpgRequests).toHaveLength(0);
 });
 
+test('@stalker ITV full channel list loads via get_all_channels and search covers it', async ({
+    page,
+}) => {
+    await addStalkerPortal(page);
+
+    const allChannelsRequests: string[] = [];
+    page.on('request', (request) => {
+        if (request.url().includes('action=get_all_channels')) {
+            allChannelsRequests.push(request.url());
+        }
+    });
+    await page.getByRole('link', { name: /live|itv/i }).click();
+    await page.waitForURL(/stalker.*itv/);
+
+    const categories = page.locator('.category-item');
+    await expect(categories.nth(1)).toBeVisible({ timeout: 10_000 });
+
+    // BEFORE any category click (Xtream parity): entering the Live TV section
+    // preloads the full list, so the main area shows the paginated
+    // all-channels grid and the categories already carry count badges.
+    const allItemsGrid = page.locator('app-stalker-itv-all-items');
+    await expect(allItemsGrid.locator('mat-card').first()).toBeVisible({
+        timeout: 20_000,
+    });
+    await expect(
+        allItemsGrid.locator('.mat-mdc-paginator-range-label')
+    ).toContainText('of 320');
+    await expect(categories.nth(0).locator('.item-count')).toHaveText('320', {
+        timeout: 10_000,
+    });
+    await expect(categories.nth(1).locator('.item-count')).toHaveText('40');
+
+    await categories.nth(1).click();
+
+    const channels = page.locator('[data-test-id="channel-item"]');
+    await expect(channels.first()).toBeVisible({ timeout: 20_000 });
+
+    // Regression for "search only finds the first 14 loaded items": once the
+    // full list is cached, the whole category (40 channels) is available
+    // without scrolling through 14-item pages.
+    await expect(page.locator('.category-subtitle')).toHaveText('40 items', {
+        timeout: 20_000,
+    });
+    await expect.poll(() => allChannelsRequests.length).toBeGreaterThan(0);
+
+    // Regression: switching to another category once the full list is cached
+    // must serve that category from the cache, not get stuck on an empty
+    // skeleton. (The reset-on-category-change effect used to clobber the
+    // synchronously served list.)
+    await categories.nth(2).click();
+    await expect(page.locator('.category-subtitle')).toHaveText('40 items', {
+        timeout: 20_000,
+    });
+    await expect(channels.first()).toBeVisible({ timeout: 10_000 });
+    // No further get_all_channels request — it's served from the session cache.
+    const requestsAfterFirstCategory = allChannelsRequests.length;
+    await categories.nth(3).click();
+    await expect(channels.first()).toBeVisible({ timeout: 10_000 });
+    expect(allChannelsRequests.length).toBe(requestsAfterFirstCategory);
+
+    // Back to the first category for the search assertions below.
+    await categories.nth(1).click();
+    await expect(page.locator('.category-subtitle')).toHaveText('40 items', {
+        timeout: 20_000,
+    });
+
+    // Search a channel from deep in the list (beyond the first 14 items).
+    const deepChannelName = (
+        await channels.nth(30).locator('.channel-name').textContent()
+    )?.trim();
+    expect(deepChannelName).toBeTruthy();
+
+    const searchInput = page.locator('input[type="search"]');
+    await searchInput.fill(deepChannelName as string);
+    await searchInput.press('Enter');
+
+    await expect(
+        page
+            .locator('[data-test-id="channel-item"] .channel-name')
+            .filter({ hasText: deepChannelName as string })
+            .first()
+    ).toBeVisible({ timeout: 10_000 });
+    // The "loaded only" degraded-search hint must be gone in full-list mode.
+    await expect(page.locator('.search-chip--status')).toHaveCount(0);
+});
+
+test('@stalker ITV censored category pages from the portal and hides its badge', async ({
+    page,
+}) => {
+    await addStalkerPortal(page);
+
+    const adultListRequests: string[] = [];
+    page.on('request', (request) => {
+        const url = request.url();
+        if (
+            url.includes('action=get_ordered_list') &&
+            url.includes('type=itv') &&
+            url.includes('genre=1099')
+        ) {
+            adultListRequests.push(url);
+        }
+    });
+
+    await page.getByRole('link', { name: /live|itv/i }).click();
+    await page.waitForURL(/stalker.*itv/);
+
+    const categories = page.locator('.category-item');
+    // Wait until the full list is cached (a regular category shows its badge).
+    await expect(categories.nth(1).locator('.item-count')).toHaveText('40', {
+        timeout: 20_000,
+    });
+
+    // The censored genre is excluded from get_all_channels, so its real count
+    // is unknown — no badge instead of a misleading "0".
+    const adultCategory = page.locator('.category-item', {
+        hasText: 'For adults',
+    });
+    await expect(adultCategory).toBeVisible();
+    await expect(adultCategory.locator('.item-count')).toHaveCount(0);
+
+    // Clicking it falls back to the legacy paged flow and still shows channels.
+    await adultCategory.click();
+    const channels = page.locator('[data-test-id="channel-item"]');
+    await expect(channels.first()).toBeVisible({ timeout: 20_000 });
+    await expect.poll(() => adultListRequests.length).toBeGreaterThan(0);
+});
+
+test('@stalker ITV falls back to page crawling on portals without get_all_channels', async ({
+    page,
+}) => {
+    await addStalkerPortal(page, {
+        name: 'Legacy Stalker Portal',
+        mac: LEGACY_PAGINATION_MAC,
+    });
+
+    const allChannelsRequests: string[] = [];
+    const crawlRequests: string[] = [];
+    page.on('request', (request) => {
+        const url = request.url();
+        if (url.includes('action=get_all_channels')) {
+            allChannelsRequests.push(url);
+        }
+        // The full-list crawl pages through ALL genres (genre=*).
+        if (
+            url.includes('action=get_ordered_list') &&
+            url.includes('type=itv') &&
+            (url.includes('genre=*') || url.includes('genre=%2A'))
+        ) {
+            crawlRequests.push(url);
+        }
+    });
+
+    await page.getByRole('link', { name: /live|itv/i }).click();
+    await page.waitForURL(/stalker.*itv/);
+
+    const categories = page.locator('.category-item');
+    await expect(categories.nth(1)).toBeVisible({ timeout: 10_000 });
+    await categories.nth(1).click();
+
+    const channels = page.locator('[data-test-id="channel-item"]');
+    await expect(channels.first()).toBeVisible({ timeout: 20_000 });
+
+    // The crawl collects all 6 × 40 channels; the selected category then
+    // shows its full 40 items without manual lazy-load scrolling.
+    await expect(page.locator('.category-subtitle')).toHaveText('40 items', {
+        timeout: 30_000,
+    });
+    await expect.poll(() => allChannelsRequests.length).toBeGreaterThan(0);
+    expect(crawlRequests.length).toBeGreaterThan(1);
+});
+
 test('@stalker mock server reset clears cached state', async ({ request }) => {
     // Generate data for default MAC
     const before = await request.get(
@@ -391,6 +568,115 @@ test('@stalker mock server returns radio categories and stations', async ({
     );
 });
 
+test('@stalker favorites — embedded-series favorite refreshes newly released episodes', async ({
+    page,
+    request,
+}) => {
+    // Find an embedded-series VOD item in the mock catalog first
+    const listResponse = await request.get(
+        `${MOCK_SERVER}/stalker?action=get_ordered_list&type=vod&category=2001&p=1&macAddress=${EMBEDDED_SERIES_MAC}&JsHttpRequest=1-xml`
+    );
+    const listBody = await listResponse.json();
+    const embeddedItem = listBody.payload.js.data.find(
+        (item: { series?: unknown[] }) =>
+            Array.isArray(item.series) && item.series.length > 0
+    );
+    expect(embeddedItem).toBeDefined();
+    const episodeCount: number = embeddedItem.series.length;
+
+    await addStalkerPortal(page, {
+        name: 'Embedded Series Portal',
+        mac: EMBEDDED_SERIES_MAC,
+    });
+
+    // Open the embedded-series item from its category and favorite it —
+    // this persists a snapshot with the current episode list
+    const categories = page.locator('.category-item');
+    await expect(categories.first()).toBeVisible({ timeout: 10_000 });
+    await categories.nth(1).click();
+    const card = page.getByText(embeddedItem.name).first();
+    await expect(card).toBeVisible({ timeout: 10_000 });
+    await card.click();
+
+    await expect(
+        page.getByRole('heading', {
+            name: `${episodeCount}. Episode ${episodeCount}`,
+            exact: true,
+        })
+    ).toBeVisible({ timeout: 10_000 });
+    await page.getByRole('button', { name: 'Add to favorites' }).click();
+    // Wait for the async favorite persistence before navigating away
+    await expect(
+        page.getByRole('button', { name: 'Remove from favorites' })
+    ).toBeVisible({ timeout: 10_000 });
+
+    // From now on the portal has "released" one more episode: extend
+    // series[] in every search response (the background snapshot refresh
+    // re-fetches the item via a title search)
+    await page.route('**/localhost:3000/stalker**', async (route) => {
+        const originalUrl = new URL(route.request().url());
+        if (!originalUrl.searchParams.get('search')) {
+            await route.fallback();
+            return;
+        }
+
+        const mockUrl = new URL(BACKEND_PROXY);
+        const targetId = originalUrl.searchParams.get('targetId');
+        const providerUrl = targetId
+            ? Buffer.from(targetId, 'base64url').toString()
+            : originalUrl.searchParams.get('url');
+        if (providerUrl) {
+            mockUrl.searchParams.set('url', providerUrl);
+        }
+        originalUrl.searchParams.forEach((value, key) => {
+            if (key === 'targetId') {
+                return;
+            }
+            mockUrl.searchParams.set(key, value);
+        });
+
+        const response = await route.fetch({ url: mockUrl.toString() });
+        const body = await response.json();
+        const rows: { series?: string[] }[] =
+            body?.payload?.js?.data ?? body?.js?.data ?? [];
+        for (const row of rows) {
+            if (Array.isArray(row.series) && row.series.length > 0) {
+                row.series = [
+                    ...row.series,
+                    String(row.series.length + 1),
+                ];
+            }
+        }
+        await route.fulfill({ response, body: JSON.stringify(body) });
+    });
+
+    // Open the item from the Favorites view: the stored snapshot renders
+    // first, then the background refresh patches in the new episode
+    const favoritesUrl = new URL(page.url());
+    favoritesUrl.pathname = favoritesUrl.pathname.replace(
+        /\/vod.*$/,
+        '/favorites'
+    );
+    favoritesUrl.search = '';
+    await page.goto(favoritesUrl.toString());
+
+    const favoriteCard = page.getByText(embeddedItem.name).first();
+    await expect(favoriteCard).toBeVisible({ timeout: 10_000 });
+    await favoriteCard.click();
+
+    // Snapshot episodes are visible immediately…
+    await expect(
+        page.getByRole('heading', { name: '1. Episode 1', exact: true })
+    ).toBeVisible({ timeout: 10_000 });
+    // …and the newly released episode appears after the background refresh
+    await expect(
+        page.getByRole('heading', {
+            name: `${episodeCount + 1}. Episode ${episodeCount + 1}`,
+            exact: true,
+        })
+    ).toBeVisible({ timeout: 10_000 });
+});
+
 test('@stalker series — seasons load for a series item', async ({
     request,
 }) => {
diff --git a/apps/web/jest.config.ts b/apps/web/jest.config.ts
index 6145bb3e0..d218a0165 100644
--- a/apps/web/jest.config.ts
+++ b/apps/web/jest.config.ts
@@ -39,8 +39,9 @@ export default {
     tslib: 'tslib/tslib.es6.js',
     '^iptv-playlist-parser$':
       '<rootDir>/src/test-stubs/iptv-playlist-parser.mjs',
+    '^shaka-player$': '<rootDir>/src/test-stubs/shaka-player.js',
+    '^video.js$': '<rootDir>/src/test-stubs/video-js.js',
     '^rxjs': '<rootDir>/../../node_modules/rxjs/dist/bundles/rxjs.umd.js',
-    '^uuid$': '<rootDir>/../../node_modules/uuid/wrapper.mjs',
   },
   transform: angularEsmPreset.transform,
   transformIgnorePatterns: [],
diff --git a/apps/web/project.json b/apps/web/project.json
index f7b179709..302ea2e37 100644
--- a/apps/web/project.json
+++ b/apps/web/project.json
@@ -13,7 +13,7 @@
     "targets": {
         "build": {
             "executor": "@angular/build:application",
-            "outputs": ["{options.outputPath}"],
+            "outputs": ["{workspaceRoot}/dist/apps/web"],
             "options": {
                 "outputPath": {
                     "base": "dist/apps/web",
@@ -122,6 +122,27 @@
                     "extractLicenses": false,
                     "sourceMap": true
                 },
+                "electron-performance": {
+                    "baseHref": "./",
+                    "serviceWorker": false,
+                    "optimization": {
+                        "scripts": true,
+                        "styles": {
+                            "minify": true,
+                            "inlineCritical": false,
+                            "removeSpecialComments": true
+                        },
+                        "fonts": true
+                    },
+                    "outputHashing": "all",
+                    "sourceMap": true,
+                    "fileReplacements": [
+                        {
+                            "replace": "apps/web/src/environments/environment.ts",
+                            "with": "apps/web/src/environments/environment.prod.ts"
+                        }
+                    ]
+                },
                 "electron-e2e": {
                     "baseHref": "./",
                     "serviceWorker": false,
@@ -138,6 +159,12 @@
                 "command": "pnpm nx run web:build:electron-e2e"
             }
         },
+        "build-performance": {
+            "executor": "nx:run-commands",
+            "options": {
+                "command": "pnpm nx run web:build:electron-performance"
+            }
+        },
         "serve": {
             "continuous": true,
             "executor": "@angular/build:dev-server",
diff --git a/apps/web/src/app/app-date-locales.ts b/apps/web/src/app/app-date-locales.ts
index a9fdbb7ef..1cc48aca2 100644
--- a/apps/web/src/app/app-date-locales.ts
+++ b/apps/web/src/app/app-date-locales.ts
@@ -6,6 +6,7 @@ import localeDe from '@angular/common/locales/de';
 import localeEl from '@angular/common/locales/el';
 import localeEs from '@angular/common/locales/es';
 import localeFr from '@angular/common/locales/fr';
+import localeHu from '@angular/common/locales/hu';
 import localeIt from '@angular/common/locales/it';
 import localeJa from '@angular/common/locales/ja';
 import localeKo from '@angular/common/locales/ko';
@@ -31,6 +32,7 @@ export function registerAppDateLocales(): void {
     registerLocaleData(localeEl, 'el');
     registerLocaleData(localeEs, 'es');
     registerLocaleData(localeFr, 'fr');
+    registerLocaleData(localeHu, 'hu');
     registerLocaleData(localeIt, 'it');
     registerLocaleData(localeJa, 'ja');
     registerLocaleData(localeKo, 'ko');
diff --git a/apps/web/src/app/app.config.ts b/apps/web/src/app/app.config.ts
index 9acd7cf34..b5b45d06c 100644
--- a/apps/web/src/app/app.config.ts
+++ b/apps/web/src/app/app.config.ts
@@ -67,6 +67,7 @@ const SUPPORTED_LANGS = new Set([
     'en',
     'es',
     'fr',
+    'hu',
     'it',
     'ja',
     'ko',
diff --git a/apps/web/src/app/app.routes.spec.ts b/apps/web/src/app/app.routes.spec.ts
index a53309567..a3626638a 100644
--- a/apps/web/src/app/app.routes.spec.ts
+++ b/apps/web/src/app/app.routes.spec.ts
@@ -1,4 +1,8 @@
+import { TestBed } from '@angular/core/testing';
+import { SettingsStore } from '@iptvnator/services';
+
 describe('app routes', () => {
+    let workspaceRoute: import('@angular/router').Route | undefined;
     let workspaceChildren: Array<{
         canActivate?: unknown[];
         data?: Record<string, unknown>;
@@ -13,7 +17,6 @@ describe('app routes', () => {
     ) => unknown;
 
     beforeAll(async () => {
-        jest.resetModules();
         jest.unstable_mockModule(
             '@iptvnator/playlist/m3u/feature-player',
             () => ({
@@ -48,14 +51,64 @@ describe('app routes', () => {
 
         const appRoutes = await import('./app.routes');
         const { routes } = appRoutes;
-        const workspaceRoute = routes.find(
-            (route) => route.path === 'workspace'
-        );
+        workspaceRoute = routes.find((route) => route.path === 'workspace');
         workspaceChildren = workspaceRoute?.children ?? [];
         resolveElectronOnlyGlobalSearchRoute =
             appRoutes.resolveElectronOnlyGlobalSearchRoute;
     });
 
+    afterEach(() => {
+        TestBed.resetTestingModule();
+    });
+
+    it('waits for settings before activating workspace children', async () => {
+        let releaseSettings!: () => void;
+        const settingsPending = new Promise<void>((resolve) => {
+            releaseSettings = resolve;
+        });
+        const loadSettings = jest.fn(() => settingsPending);
+        TestBed.configureTestingModule({
+            providers: [
+                {
+                    provide: SettingsStore,
+                    useValue: { loadSettings },
+                },
+            ],
+        });
+        const settingsReadyResolver =
+            workspaceRoute?.resolve?.['settingsReady'];
+
+        expect(typeof settingsReadyResolver).toBe('function');
+        if (typeof settingsReadyResolver !== 'function') {
+            return;
+        }
+
+        const resolution = TestBed.runInInjectionContext(() =>
+            Promise.resolve(
+                (
+                    settingsReadyResolver as import('@angular/router').ResolveFn<void>
+                )(
+                    {} as import('@angular/router').ActivatedRouteSnapshot,
+                    {} as import('@angular/router').RouterStateSnapshot
+                )
+            )
+        );
+        let resolved = false;
+        void resolution.then(() => {
+            resolved = true;
+        });
+
+        await Promise.resolve();
+
+        expect(loadSettings).toHaveBeenCalledTimes(1);
+        expect(resolved).toBe(false);
+
+        releaseSettings();
+
+        await expect(resolution).resolves.toBeUndefined();
+        expect(resolved).toBe(true);
+    });
+
     it('lazy-loads M3U workspace routes through the feature boundary', async () => {
         const playlistRoute = workspaceChildren.find(
             (route) => route.path === 'playlists/:id'
diff --git a/apps/web/src/app/app.routes.ts b/apps/web/src/app/app.routes.ts
index 5993f4622..73361f1fc 100644
--- a/apps/web/src/app/app.routes.ts
+++ b/apps/web/src/app/app.routes.ts
@@ -1,8 +1,10 @@
 import { inject } from '@angular/core';
 import { Router, Routes } from '@angular/router';
-import { RuntimeCapabilitiesService } from '@iptvnator/services';
+import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
 import { WorkspaceStartupPreferencesService } from '@iptvnator/workspace/shell/util';
 
+const settingsReadyResolver = () => inject(SettingsStore).loadSettings();
+
 const workspaceEntryRedirect = async () =>
     inject(WorkspaceStartupPreferencesService).resolveInitialWorkspacePath();
 
@@ -41,6 +43,9 @@ export const routes: Routes = [
         data: {
             layout: 'workspace',
         },
+        resolve: {
+            settingsReady: settingsReadyResolver,
+        },
         loadComponent: () =>
             import('@iptvnator/workspace/shell/feature').then(
                 (c) => c.WorkspaceShellComponent
diff --git a/apps/web/src/app/embedded-mpv-player-recording-message.spec.ts b/apps/web/src/app/embedded-mpv-player-recording-message.spec.ts
index a31c13a1a..5aac52ff3 100644
--- a/apps/web/src/app/embedded-mpv-player-recording-message.spec.ts
+++ b/apps/web/src/app/embedded-mpv-player-recording-message.spec.ts
@@ -32,7 +32,10 @@ describe('EmbeddedMpvPlayerComponent recording status message', () => {
         } as unknown as typeof window.electron;
 
         await TestBed.configureTestingModule({
-            imports: [EmbeddedMpvPlayerHostComponent, TranslateModule.forRoot()],
+            imports: [
+                EmbeddedMpvPlayerHostComponent,
+                TranslateModule.forRoot(),
+            ],
             providers: [
                 {
                     provide: EmbeddedMpvOverlayVisibilityService,
@@ -69,6 +72,7 @@ describe('EmbeddedMpvPlayerComponent recording status message', () => {
         controller.support.set({
             supported: true,
             platform: 'darwin',
+            engine: 'native',
             capabilities: {
                 subtitles: true,
                 playbackSpeed: true,
diff --git a/apps/web/src/app/global-collection-route.component.spec.ts b/apps/web/src/app/global-collection-route.component.spec.ts
new file mode 100644
index 000000000..fb577cbfe
--- /dev/null
+++ b/apps/web/src/app/global-collection-route.component.spec.ts
@@ -0,0 +1,140 @@
+import { Component, input, output, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+    SeriesResumeTarget,
+    UnifiedCollectionItem,
+} from '@iptvnator/portal/shared/util';
+import { GlobalCollectionDetailHostComponent } from './global-collection-route.component';
+
+@Component({
+    selector: 'app-xtream-collection-detail',
+    template: '',
+})
+class MockXtreamCollectionDetailComponent {
+    readonly item = input<UnifiedCollectionItem | null>(null);
+    readonly seriesResume = input<SeriesResumeTarget | null>(null);
+    readonly closeRequested = output<void>();
+}
+
+jest.unstable_mockModule('@iptvnator/portal/xtream/feature', () => ({
+    XtreamCollectionDetailComponent: MockXtreamCollectionDetailComponent,
+}));
+
+@Component({
+    imports: [GlobalCollectionDetailHostComponent],
+    template: `
+        <app-global-collection-detail-host
+            [item]="item()"
+            [seriesResume]="seriesResume()"
+            (closeRequested)="closeCount = closeCount + 1"
+        />
+    `,
+})
+class WrapperComponent {
+    readonly item = signal<UnifiedCollectionItem | null>(null);
+    readonly seriesResume = signal<SeriesResumeTarget | null>(null);
+    closeCount = 0;
+}
+
+const xtreamSeriesItem: UnifiedCollectionItem = {
+    uid: 'xtream::xtream-1::series:103',
+    name: 'Resume Series',
+    contentType: 'series',
+    sourceType: 'xtream',
+    playlistId: 'xtream-1',
+    playlistName: 'Xtream One',
+    xtreamId: 103,
+    categoryId: 3,
+};
+
+describe('GlobalCollectionDetailHostComponent', () => {
+    let fixture: ComponentFixture<WrapperComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [WrapperComponent],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(WrapperComponent);
+    });
+
+    afterEach(() => {
+        fixture?.destroy();
+    });
+
+    function queryDetail() {
+        return fixture.debugElement.query(
+            By.directive(MockXtreamCollectionDetailComponent)
+        );
+    }
+
+    async function stabilize(): Promise<void> {
+        fixture.detectChanges();
+        await fixture.whenStable();
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+    }
+
+    it('mocks the xtream feature barrel', async () => {
+        const mod = await import('@iptvnator/portal/xtream/feature');
+        expect(mod.XtreamCollectionDetailComponent).toBe(
+            MockXtreamCollectionDetailComponent as never
+        );
+    });
+
+    it('renders nothing until an item arrives', async () => {
+        await stabilize();
+
+        expect(queryDetail()).toBeNull();
+    });
+
+    it('ignores sources without a collection detail component', async () => {
+        fixture.componentInstance.item.set({
+            ...xtreamSeriesItem,
+            uid: 'm3u::pl-1::vod:1',
+            sourceType: 'm3u' as UnifiedCollectionItem['sourceType'],
+            playlistId: 'pl-1',
+        });
+        await stabilize();
+
+        expect(queryDetail()).toBeNull();
+    });
+
+    it('creates the Xtream detail with the series resume target attached', async () => {
+        const seriesResume = {
+            seriesXtreamId: 103,
+            contentXtreamId: 2001,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        };
+        fixture.componentInstance.seriesResume.set(seriesResume);
+        fixture.componentInstance.item.set(xtreamSeriesItem);
+        await stabilize();
+
+        const detail = queryDetail();
+        expect(detail).not.toBeNull();
+
+        const instance =
+            detail?.componentInstance as MockXtreamCollectionDetailComponent;
+        expect(instance.item()?.xtreamId).toBe(103);
+        expect(instance.seriesResume()).toEqual(seriesResume);
+    });
+
+    it('re-emits close requests and clears the detail with the item', async () => {
+        fixture.componentInstance.item.set(xtreamSeriesItem);
+        await stabilize();
+
+        const instance = queryDetail()
+            ?.componentInstance as MockXtreamCollectionDetailComponent;
+        instance.closeRequested.emit();
+        expect(fixture.componentInstance.closeCount).toBe(1);
+
+        fixture.componentInstance.item.set(null);
+        await stabilize();
+
+        expect(queryDetail()).toBeNull();
+    });
+});
diff --git a/apps/web/src/app/global-collection-route.component.ts b/apps/web/src/app/global-collection-route.component.ts
index a560d385f..32542d89d 100644
--- a/apps/web/src/app/global-collection-route.component.ts
+++ b/apps/web/src/app/global-collection-route.component.ts
@@ -24,6 +24,7 @@ import {
 import {
     CollectionScope,
     PortalProvider,
+    SeriesResumeTarget,
     UnifiedCollectionItem,
 } from '@iptvnator/portal/shared/util';
 import { WORKSPACE_SHELL_ACTIONS } from '@iptvnator/workspace/shell/util';
@@ -68,6 +69,7 @@ function providerToPortalType(provider: PortalProvider): UnifiedPortalType {
 })
 export class GlobalCollectionDetailHostComponent implements OnDestroy {
     readonly item = input<UnifiedCollectionItem | null>(null);
+    readonly seriesResume = input<SeriesResumeTarget | null>(null);
     readonly closeRequested = output<void>();
 
     private readonly viewContainer = inject(ViewContainerRef);
@@ -78,9 +80,10 @@ export class GlobalCollectionDetailHostComponent implements OnDestroy {
     constructor() {
         effect(() => {
             const item = this.item();
+            const seriesResume = this.seriesResume();
 
             untracked(() => {
-                void this.renderDetail(item);
+                void this.renderDetail(item, seriesResume);
             });
         });
     }
@@ -91,7 +94,8 @@ export class GlobalCollectionDetailHostComponent implements OnDestroy {
     }
 
     private async renderDetail(
-        item: UnifiedCollectionItem | null
+        item: UnifiedCollectionItem | null,
+        seriesResume: SeriesResumeTarget | null
     ): Promise<void> {
         const requestId = ++this.renderRequestId;
         this.clearDetail();
@@ -109,6 +113,9 @@ export class GlobalCollectionDetailHostComponent implements OnDestroy {
             environmentInjector: this.environmentInjector,
         });
         componentRef.setInput('item', item);
+        if (item.sourceType === 'xtream') {
+            componentRef.setInput('seriesResume', seriesResume);
+        }
         this.subscribeToClose(componentRef.instance);
     }
 
@@ -175,9 +182,17 @@ export class GlobalCollectionDetailHostComponent implements OnDestroy {
                 [portalType]="activePortalType() ?? undefined"
                 [defaultScope]="effectiveDefaultScope()"
             >
-                <ng-template unifiedCollectionDetail let-item let-close="close">
+                <ng-template
+                    unifiedCollectionDetail
+                    let-item
+                    let-seriesResume="seriesResume"
+                    let-close="close"
+                >
                     @if (item.sourceType === 'xtream') {
-                        <app-global-collection-detail-host [item]="item" />
+                        <app-global-collection-detail-host
+                            [item]="item"
+                            [seriesResume]="seriesResume"
+                        />
                     } @else if (item.sourceType === 'stalker') {
                         <app-global-collection-detail-host
                             [item]="item"
diff --git a/apps/web/src/app/iptv-playlist-parser.contract.spec.ts b/apps/web/src/app/iptv-playlist-parser.contract.spec.ts
new file mode 100644
index 000000000..fbb1370af
--- /dev/null
+++ b/apps/web/src/app/iptv-playlist-parser.contract.spec.ts
@@ -0,0 +1,135 @@
+import { parse } from 'iptv-playlist-parser';
+
+/**
+ * Contract tests for the 4gray/iptv-playlist-parser fork (jest maps the
+ * module to the real parser source via test-stubs/iptv-playlist-parser.mjs).
+ * Guards the fork-specific behaviors iptvnator depends on:
+ * - no URL length/format validation (issue #1189: Pluto JWT URLs > 2084 chars)
+ * - '#' comments never become URLs and never shift the item index
+ * - the fork-only `radio` attribute survives upstream syncs
+ * - `url` is stripped at the first '|' while pipe params land in `http.*`
+ */
+describe('iptv-playlist-parser contract (4gray fork)', () => {
+    const plutoUrl = (id: string) =>
+        `https://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/v2/stitch/hls/channel/${id}/master.m3u8?jwt=${'e'.repeat(2100)}&masterJWTPassthrough=true`;
+
+    it('parses playlists whose URLs are longer than 2084 characters (#1189)', () => {
+        const playlist = [
+            '#EXTM3U',
+            '#EXTINF:-1 group-title="Anime & Geek" tvg-id="one" tvg-name="Beyblade",Beyblade',
+            plutoUrl('one'),
+            '#EXTINF:-1 group-title="TV Brasileira" tvg-id="two" tvg-name="TV Cultura",TV Cultura',
+            plutoUrl('two'),
+            '',
+        ].join('\n');
+
+        const result = parse(playlist);
+
+        expect(result.items.length).toBe(2);
+        expect(result.items[0].name).toBe('Beyblade');
+        expect(result.items[0].url).toBe(plutoUrl('one'));
+        expect(result.items[1].name).toBe('TV Cultura');
+        expect(result.items[1].url).toBe(plutoUrl('two'));
+    });
+
+    it('ignores comments and unknown directives between #EXTINF and the URL', () => {
+        const playlist = [
+            '#EXTM3U',
+            '#EXTINF:-1 tvg-id="one",Channel One',
+            '# stray comment',
+            '#EXT-X-SESSION-DATA:DATA-ID="com.example",VALUE="x"',
+            'http://example.com/one.m3u8',
+            '#EXTINF:-1 tvg-id="two",Channel Two',
+            'http://example.com/two.m3u8',
+            '',
+        ].join('\n');
+
+        const result = parse(playlist);
+
+        expect(result.items.length).toBe(2);
+        expect(result.items[0].url).toBe('http://example.com/one.m3u8');
+        expect(result.items[0].raw).toContain('# stray comment');
+        expect(result.items[1].url).toBe('http://example.com/two.m3u8');
+    });
+
+    it('parses the radio attribute used by the radio player', () => {
+        const playlist = [
+            '#EXTM3U',
+            '#EXTINF:-1 radio="true" tvg-id="r1",Radio One',
+            'http://example.com/radio1',
+            '#EXTINF:-1 tvg-id="tv1",TV One',
+            'http://example.com/tv1',
+            '',
+        ].join('\n');
+
+        const result = parse(playlist);
+
+        expect(result.items[0].radio).toBe('true');
+        expect(result.items[1].radio).toBe('');
+    });
+
+    it('strips pipe options from url while keeping them in http.*', () => {
+        const playlist = [
+            '#EXTM3U',
+            '#EXTINF:-1,Piped',
+            'http://example.com/stream.ts|User-Agent=CustomUA&Referer=http://ref.example',
+            '',
+        ].join('\n');
+
+        const result = parse(playlist);
+
+        expect(result.items[0].url).toBe('http://example.com/stream.ts');
+        expect(result.items[0].http['user-agent']).toBe('CustomUA');
+        expect(result.items[0].http.referrer).toBe('http://ref.example');
+    });
+
+    it('accepts playlists with a UTF-8 BOM before the header', () => {
+        const result = parse(
+            '#EXTM3U\n#EXTINF:-1,One\nhttp://example.com/one.m3u8\n'
+        );
+
+        expect(result.items.length).toBe(1);
+        expect(result.items[0].url).toBe('http://example.com/one.m3u8');
+    });
+
+    it('exposes EPG urls from the playlist header', () => {
+        const result = parse(
+            [
+                '#EXTM3U x-tvg-url="https://epg.example/guide.xml"',
+                '#EXTINF:-1,One',
+                'http://example.com/one.m3u8',
+                '',
+            ].join('\n')
+        );
+
+        expect(result.header.attrs['x-tvg-url']).toBe(
+            'https://epg.example/guide.xml'
+        );
+    });
+
+    it('preserves #KODIPROP lines placed before #EXTINF in item raw', () => {
+        // Kodi property lines apply to the NEXT entry; the DASH/ClearKey
+        // support extracts license config from item.raw (#1225).
+        const result = parse(
+            [
+                '#EXTM3U',
+                '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                '#KODIPROP:inputstream.adaptive.license_key=kid123:key456',
+                '#EXTINF:-1,Encrypted',
+                'http://example.com/enc.mpd',
+                '#EXTINF:-1,Plain',
+                'http://example.com/plain.m3u8',
+                '',
+            ].join('\n')
+        );
+
+        expect(result.items.length).toBe(2);
+        expect(result.items[0].raw).toContain(
+            '#KODIPROP:inputstream.adaptive.license_type=clearkey'
+        );
+        expect(result.items[0].raw).toContain(
+            '#KODIPROP:inputstream.adaptive.license_key=kid123:key456'
+        );
+        expect(result.items[1].raw).not.toContain('#KODIPROP');
+    });
+});
diff --git a/apps/web/src/app/services/auto-update-playlists-feedback.ts b/apps/web/src/app/services/auto-update-playlists-feedback.ts
new file mode 100644
index 000000000..9a89dfe5c
--- /dev/null
+++ b/apps/web/src/app/services/auto-update-playlists-feedback.ts
@@ -0,0 +1,69 @@
+import {
+    AutoUpdatePlaylistsResult,
+    AutoUpdatePlaylistsSummary,
+    summarizeAutoUpdateOutcomes,
+} from '@iptvnator/shared/interfaces';
+
+export const AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS = {
+    failed: 'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_FAILED',
+    partial: 'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL',
+    partialWithSkipped:
+        'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED',
+    skipped: 'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SKIPPED',
+    success: 'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SUCCESS',
+} as const;
+
+export interface AutoUpdatePlaylistsFeedback {
+    messageKey: string;
+    params: AutoUpdatePlaylistsSummary;
+    /** Failures deserve a dismissable, longer-lived snackbar. */
+    isError: boolean;
+}
+
+/**
+ * Turns an auto-refresh result into the snackbar message the user should see.
+ * The backend isolates per-playlist failures, so "some playlists were updated"
+ * must never be reported as "all playlists were updated".
+ */
+export function buildAutoUpdatePlaylistsFeedback(
+    result: AutoUpdatePlaylistsResult
+): AutoUpdatePlaylistsFeedback {
+    const summary = summarizeAutoUpdateOutcomes(result.outcomes);
+
+    if (summary.failed > 0) {
+        return {
+            messageKey: resolveFailureMessageKey(summary),
+            params: summary,
+            isError: true,
+        };
+    }
+
+    if (summary.skipped > 0) {
+        return {
+            messageKey: AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS.skipped,
+            params: summary,
+            isError: false,
+        };
+    }
+
+    return {
+        messageKey: AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS.success,
+        params: summary,
+        isError: false,
+    };
+}
+
+/**
+ * Every playlist the user was not told about looks like an unexplained
+ * remainder, so a batch that both failed and skipped needs a message that
+ * accounts for all three counts — `partial` alone leaves `total` unreconciled.
+ */
+function resolveFailureMessageKey(summary: AutoUpdatePlaylistsSummary): string {
+    if (summary.updated === 0) {
+        return AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS.failed;
+    }
+
+    return summary.skipped > 0
+        ? AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS.partialWithSkipped
+        : AUTO_UPDATE_PLAYLISTS_MESSAGE_KEYS.partial;
+}
diff --git a/apps/web/src/app/services/electron.service.performance.spec.ts b/apps/web/src/app/services/electron.service.performance.spec.ts
new file mode 100644
index 000000000..a7e10ffe2
--- /dev/null
+++ b/apps/web/src/app/services/electron.service.performance.spec.ts
@@ -0,0 +1,123 @@
+import { TestBed } from '@angular/core/testing';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { PlaylistActions } from '@iptvnator/m3u-state';
+import { SettingsStore } from '@iptvnator/services';
+import {
+    PLAYLIST_PARSE_BY_URL,
+    type Playlist,
+} from '@iptvnator/shared/interfaces';
+import {
+    RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+    type RendererPerformancePhaseEvent,
+} from '@iptvnator/shared/logging';
+import { DialogService } from '@iptvnator/ui/components';
+import { ElectronService } from './electron.service';
+
+describe('ElectronService performance phases', () => {
+    const hookSymbol = Symbol.for(RENDERER_PERFORMANCE_PHASE_HOOK_KEY);
+    const electronBridge = {
+        fetchPlaylistByUrl: jest.fn(),
+        onPlayerError: jest.fn(),
+    };
+    const store = { dispatch: jest.fn() };
+    let service: ElectronService;
+
+    beforeEach(() => {
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: electronBridge,
+        });
+        electronBridge.fetchPlaylistByUrl.mockReset();
+        electronBridge.onPlayerError.mockReset();
+        store.dispatch.mockReset();
+
+        TestBed.configureTestingModule({
+            providers: [
+                ElectronService,
+                {
+                    provide: DialogService,
+                    useValue: { openConfirmDialog: jest.fn() },
+                },
+                {
+                    provide: MatSnackBar,
+                    useValue: { open: jest.fn() },
+                },
+                {
+                    provide: SettingsStore,
+                    useValue: {
+                        getTrustOptions: jest.fn(() => ({
+                            trustedInsecureTlsHosts: [],
+                            trustedPrivateNetworkEpgUrls: [],
+                        })),
+                    },
+                },
+                { provide: Store, useValue: store },
+                {
+                    provide: TranslateService,
+                    useValue: { instant: jest.fn((key: string) => key) },
+                },
+            ],
+        });
+        service = TestBed.inject(ElectronService);
+    });
+
+    afterEach(() => {
+        delete (globalThis as unknown as Record<symbol, unknown>)[hookSymbol];
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: undefined,
+        });
+    });
+
+    it('marks the initial URL import store dispatch without exposing playlist data', async () => {
+        const events: RendererPerformancePhaseEvent[] = [];
+        (
+            globalThis as unknown as Record<
+                symbol,
+                (event: RendererPerformancePhaseEvent) => void
+            >
+        )[hookSymbol] = (event) => events.push(event);
+        const playlist = {
+            playlist: { items: [{ name: 'Sensitive channel' }] },
+            title: 'Sensitive title',
+            url: 'https://user:secret@example.test/list.m3u',
+        } as Playlist;
+        electronBridge.fetchPlaylistByUrl.mockResolvedValue(playlist);
+
+        await service.sendIpcEvent(PLAYLIST_PARSE_BY_URL, {
+            title: playlist.title,
+            url: playlist.url,
+        });
+        await Promise.resolve();
+        await Promise.resolve();
+
+        expect(store.dispatch).toHaveBeenCalledWith(
+            PlaylistActions.handleAddingPlaylistByUrl({
+                isTemporary: false,
+                playlist,
+            })
+        );
+        expect(
+            events.map(({ boundary, outcome, phase }) => ({
+                boundary,
+                outcome,
+                phase,
+            }))
+        ).toEqual([
+            {
+                boundary: 'start',
+                outcome: undefined,
+                phase: 'store.m3u-import-dispatch',
+            },
+            {
+                boundary: 'end',
+                outcome: 'success',
+                phase: 'store.m3u-import-dispatch',
+            },
+        ]);
+        expect(JSON.stringify(events)).not.toContain('Sensitive');
+        expect(JSON.stringify(events)).not.toContain('secret');
+    });
+});
diff --git a/apps/web/src/app/services/electron.service.spec.ts b/apps/web/src/app/services/electron.service.spec.ts
index ad0c5015b..8288a78cd 100644
--- a/apps/web/src/app/services/electron.service.spec.ts
+++ b/apps/web/src/app/services/electron.service.spec.ts
@@ -4,10 +4,16 @@ import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { DialogService } from '@iptvnator/ui/components';
+import { PlaylistActions } from '@iptvnator/m3u-state';
 import { SettingsStore } from '@iptvnator/services';
 import {
+    AUTO_UPDATE_PLAYLISTS,
+    AutoUpdatePlaylistOutcome,
+    AutoUpdatePlaylistStatus,
+    AutoUpdatePlaylistsResult,
     ELECTRON_BRIDGE_SECURITY_ERROR_CODES,
     PLAYLIST_PARSE_BY_URL,
+    Playlist,
     SECURITY_ERROR_PREFIX,
 } from '@iptvnator/shared/interfaces';
 import { ElectronService } from './electron.service';
@@ -15,18 +21,26 @@ import { ElectronService } from './electron.service';
 describe('ElectronService', () => {
     const session = { id: 'session-1' };
     let electronBridge: {
+        autoUpdatePlaylists: jest.Mock;
         fetchPlaylistByUrl: jest.Mock;
+        onPlayerError: jest.Mock;
         openInMpv: jest.Mock;
         openInVlc: jest.Mock;
     };
     let snackBar: { open: jest.Mock };
+    let store: { dispatch: jest.Mock };
+    let translateService: { instant: jest.Mock };
     let service: ElectronService;
 
     beforeEach(() => {
         jest.spyOn(console, 'log').mockImplementation(() => undefined);
+        jest.spyOn(console, 'warn').mockImplementation(() => undefined);
+        jest.spyOn(console, 'error').mockImplementation(() => undefined);
 
         electronBridge = {
+            autoUpdatePlaylists: jest.fn(),
             fetchPlaylistByUrl: jest.fn(),
+            onPlayerError: jest.fn(),
             openInMpv: jest.fn().mockResolvedValue(session),
             openInVlc: jest.fn().mockResolvedValue(session),
         };
@@ -35,6 +49,8 @@ describe('ElectronService', () => {
                 onAction: () => of(undefined),
             })),
         };
+        store = { dispatch: jest.fn() };
+        translateService = { instant: jest.fn((key: string) => key) };
 
         Object.defineProperty(window, 'electron', {
             configurable: true,
@@ -69,15 +85,11 @@ describe('ElectronService', () => {
                 },
                 {
                     provide: Store,
-                    useValue: {
-                        dispatch: jest.fn(),
-                    },
+                    useValue: store,
                 },
                 {
                     provide: TranslateService,
-                    useValue: {
-                        instant: jest.fn((key: string) => key),
-                    },
+                    useValue: translateService,
                 },
             ],
         });
@@ -99,6 +111,21 @@ describe('ElectronService', () => {
         expect(electronBridge.fetchPlaylistByUrl).not.toHaveBeenCalled();
     });
 
+    it('redacts credentials from backend player errors before logging', () => {
+        const secret = 'player-error-token-secret';
+        const listener = electronBridge.onPlayerError.mock.calls[0][0];
+
+        listener({
+            player: 'MPV',
+            error: 'Playback failed',
+            originalError: `Request failed: token=${secret}&channel=news`,
+        });
+
+        const output = JSON.stringify((console.error as jest.Mock).mock.calls);
+        expect(output).not.toContain(secret);
+        expect(output).toContain('channel=news');
+    });
+
     it('shows the trust-host action for Electron-wrapped security errors', async () => {
         const securityPayload = {
             code: ELECTRON_BRIDGE_SECURITY_ERROR_CODES.InvalidTlsCertificate,
@@ -170,4 +197,158 @@ describe('ElectronService', () => {
             }
         );
     });
+
+    describe('startup playlist auto-refresh feedback', () => {
+        function createPlaylist(id: string, title: string): Playlist {
+            return {
+                _id: id,
+                autoRefresh: true,
+                count: 1,
+                importDate: '2026-07-01T00:00:00.000Z',
+                lastUsage: '2026-07-01T00:00:00.000Z',
+                title,
+            };
+        }
+
+        function outcome(
+            playlistId: string,
+            title: string,
+            status: AutoUpdatePlaylistStatus
+        ): AutoUpdatePlaylistOutcome {
+            return { playlistId, status, title };
+        }
+
+        async function runAutoUpdate(
+            result: AutoUpdatePlaylistsResult
+        ): Promise<void> {
+            electronBridge.autoUpdatePlaylists.mockResolvedValue(result);
+
+            await service.sendIpcEvent(
+                AUTO_UPDATE_PLAYLISTS,
+                result.outcomes.map((entry) =>
+                    createPlaylist(entry.playlistId, entry.title)
+                )
+            );
+        }
+
+        it('reports success only when every requested playlist was refreshed', async () => {
+            const refreshed = [
+                createPlaylist('first', 'First'),
+                createPlaylist('second', 'Second'),
+            ];
+
+            await runAutoUpdate({
+                playlists: refreshed,
+                outcomes: [
+                    outcome('first', 'First', 'updated'),
+                    outcome('second', 'Second', 'updated'),
+                ],
+            });
+
+            expect(store.dispatch).toHaveBeenCalledWith(
+                PlaylistActions.updateManyPlaylists({ playlists: refreshed })
+            );
+            expect(translateService.instant).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SUCCESS',
+                { total: 2, updated: 2, failed: 0, skipped: 0 }
+            );
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SUCCESS',
+                undefined,
+                { duration: 2000 }
+            );
+        });
+
+        it('says the refresh was incomplete when only some playlists updated', async () => {
+            const refreshed = [createPlaylist('reachable', 'Reachable')];
+
+            await runAutoUpdate({
+                playlists: refreshed,
+                outcomes: [
+                    outcome('reachable', 'Reachable', 'updated'),
+                    outcome('unreachable', 'Unreachable', 'failed'),
+                ],
+            });
+
+            // Only the successfully refreshed playlists reach the store.
+            expect(store.dispatch).toHaveBeenCalledWith(
+                PlaylistActions.updateManyPlaylists({ playlists: refreshed })
+            );
+            expect(translateService.instant).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL',
+                { total: 2, updated: 1, failed: 1, skipped: 0 }
+            );
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL',
+                'CLOSE',
+                { duration: 6000, panelClass: ['error-snackbar'] }
+            );
+            expect(
+                JSON.stringify((console.warn as jest.Mock).mock.calls)
+            ).toContain('Unreachable (failed)');
+        });
+
+        it('accounts for skipped playlists in a batch that also failed', async () => {
+            await runAutoUpdate({
+                playlists: [createPlaylist('reachable', 'Reachable')],
+                outcomes: [
+                    outcome('reachable', 'Reachable', 'updated'),
+                    outcome('unreachable', 'Unreachable', 'failed'),
+                    outcome('sourceless', 'Sourceless', 'skipped'),
+                ],
+            });
+
+            // The plain partial message only names updated/total/failed, which
+            // would leave the skipped playlist unexplained.
+            expect(translateService.instant).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED',
+                { total: 3, updated: 1, failed: 1, skipped: 1 }
+            );
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED',
+                'CLOSE',
+                { duration: 6000, panelClass: ['error-snackbar'] }
+            );
+        });
+
+        it('reports a full failure when no playlist could be refreshed', async () => {
+            await runAutoUpdate({
+                playlists: [],
+                outcomes: [
+                    outcome('first', 'First', 'failed'),
+                    outcome('second', 'Second', 'failed'),
+                ],
+            });
+
+            expect(translateService.instant).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_FAILED',
+                { total: 2, updated: 0, failed: 2, skipped: 0 }
+            );
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_FAILED',
+                'CLOSE',
+                { duration: 6000, panelClass: ['error-snackbar'] }
+            );
+        });
+
+        it('distinguishes playlists skipped for a missing source from failures', async () => {
+            await runAutoUpdate({
+                playlists: [createPlaylist('reachable', 'Reachable')],
+                outcomes: [
+                    outcome('reachable', 'Reachable', 'updated'),
+                    outcome('sourceless', 'Sourceless', 'skipped'),
+                ],
+            });
+
+            expect(translateService.instant).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SKIPPED',
+                { total: 2, updated: 1, failed: 0, skipped: 1 }
+            );
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SKIPPED',
+                undefined,
+                { duration: 2000 }
+            );
+        });
+    });
 });
diff --git a/apps/web/src/app/services/electron.service.ts b/apps/web/src/app/services/electron.service.ts
index 00f3d96af..cef656806 100644
--- a/apps/web/src/app/services/electron.service.ts
+++ b/apps/web/src/app/services/electron.service.ts
@@ -7,7 +7,7 @@ import { DialogService } from '@iptvnator/ui/components';
 import { DataService, SettingsStore } from '@iptvnator/services';
 import {
     AUTO_UPDATE_PLAYLISTS,
-    createDevLogger,
+    AutoUpdatePlaylistsResult,
     ELECTRON_BRIDGE_SECURITY_ERROR_CODES,
     ERROR,
     normalizeHost,
@@ -20,8 +20,14 @@ import {
     XTREAM_RESPONSE,
     XtreamCodeActions,
 } from '@iptvnator/shared/interfaces';
-import { AppConfig } from '../../environments/environment';
 import {
+    measureRendererPerformancePhase,
+    RENDERER_PERFORMANCE_PHASE,
+} from '@iptvnator/shared/logging';
+import { AppConfig } from '../../environments/environment';
+import { buildAutoUpdatePlaylistsFeedback } from './auto-update-playlists-feedback';
+import {
+    createLogger,
     createPortalDebugRequestContext,
     logPortalDebugEvent,
 } from '@iptvnator/portal/shared/util';
@@ -54,7 +60,7 @@ export class ElectronService extends DataService {
     private readonly store = inject(Store);
     private readonly settingsStore = inject(SettingsStore);
     private readonly translateService = inject(TranslateService);
-    private readonly debugLog = createDevLogger('ElectronService');
+    private readonly logger = createLogger('ElectronService');
     private readonly silentXtreamActions = new Set<string>([
         XtreamCodeActions.GetAccountInfo,
         XtreamCodeActions.GetLiveCategories,
@@ -67,7 +73,6 @@ export class ElectronService extends DataService {
 
     constructor() {
         super();
-        this.debugLog('Electron service initialized...');
         this.setupPlayerErrorListener();
         this.setupPortalDebugListener();
     }
@@ -81,7 +86,10 @@ export class ElectronService extends DataService {
                     error: string;
                     originalError: string;
                 }) => {
-                    console.error(`${data.player} Error:`, data.originalError);
+                    this.logger.error(
+                        `${data.player} Error:`,
+                        data.originalError
+                    );
                     this.snackBar.open(
                         `${data.player} Error: ${data.error}`,
                         'Close',
@@ -182,7 +190,7 @@ export class ElectronService extends DataService {
                         duration: 5000,
                     }
                 );
-                console.error('MPV launch error:', error);
+                this.logger.error('MPV launch error:', error);
                 throw error;
             }
         }
@@ -211,36 +219,57 @@ export class ElectronService extends DataService {
                         duration: 5000,
                     }
                 );
-                console.error('VLC launch error:', error);
+                this.logger.error('VLC launch error:', error);
                 throw error;
             }
         }
 
         if (type === AUTO_UPDATE_PLAYLISTS) {
             const data = payload as Playlist[];
-            const playlists = await window.electron.autoUpdatePlaylists(
+            const result = await window.electron.autoUpdatePlaylists(
                 data,
                 this.settingsStore.getTrustOptions()
             );
             this.store.dispatch(
                 PlaylistActions.updateManyPlaylists({
-                    playlists,
+                    playlists: result.playlists,
                 })
             );
-            this.snackBar.open(
-                this.translateService.instant(
-                    'HOME.PLAYLISTS.AUTO_REFRESH_UPDATE_SUCCESS'
-                ),
-                undefined,
-                { duration: 2000 }
-            );
-            return playlists as T;
+            this.reportAutoUpdatePlaylistsResult(result);
+            return result as T;
         }
 
-        this.debugLog('Unknown IPC event type:', type);
+        this.logger.debug('Unknown IPC event type:', type);
         return undefined as T;
     }
 
+    private reportAutoUpdatePlaylistsResult(
+        result: AutoUpdatePlaylistsResult
+    ): void {
+        const unresolved = result.outcomes.filter(
+            (outcome) => outcome.status !== 'updated'
+        );
+        if (unresolved.length > 0) {
+            this.logger.warn(
+                'Playlist auto-refresh did not update every playlist:',
+                unresolved
+                    .map((outcome) => `${outcome.title} (${outcome.status})`)
+                    .join(', ')
+            );
+        }
+
+        const feedback = buildAutoUpdatePlaylistsFeedback(result);
+        this.snackBar.open(
+            this.translateService.instant(feedback.messageKey, feedback.params),
+            feedback.isError
+                ? this.translateService.instant('CLOSE')
+                : undefined,
+            feedback.isError
+                ? { duration: 6000, panelClass: ['error-snackbar'] }
+                : { duration: 2000 }
+        );
+    }
+
     private async fetchStalkerData(payload: {
         url: string;
         macAddress: string;
@@ -265,7 +294,7 @@ export class ElectronService extends DataService {
             return response;
         } catch (err: unknown) {
             const errorInfo = this.getErrorDetails(err);
-            console.error('Stalker request error:', err);
+            this.logger.error('Stalker request error:', err);
             this.snackBar.open(
                 `Error: ${errorInfo?.message ?? ' Not found'}, status: ${errorInfo?.status ?? 404}`,
                 'Close',
@@ -291,11 +320,15 @@ export class ElectronService extends DataService {
                 this.settingsStore.getTrustOptions()
             )
             .then((result) => {
-                this.store.dispatch(
-                    PlaylistActions.handleAddingPlaylistByUrl({
-                        isTemporary: !!payload?.isTemporary,
-                        playlist: result,
-                    })
+                measureRendererPerformancePhase(
+                    RENDERER_PERFORMANCE_PHASE.M3U_IMPORT_DISPATCH,
+                    () =>
+                        this.store.dispatch(
+                            PlaylistActions.handleAddingPlaylistByUrl({
+                                isTemporary: !!payload?.isTemporary,
+                                playlist: result,
+                            })
+                        )
                 );
             })
             .catch((error: unknown) => {
@@ -362,7 +395,7 @@ export class ElectronService extends DataService {
                         data.title
                     );
             } else {
-                console.error(
+                this.logger.error(
                     'Either url or filePath must be provided, but not both.'
                 );
                 return;
@@ -387,7 +420,7 @@ export class ElectronService extends DataService {
                 { duration: 2000 }
             );
         } catch (error: unknown) {
-            console.error('Playlist refresh error:', error);
+            this.logger.error('Playlist refresh error:', error);
             if (
                 data.url &&
                 this.handlePlaylistSecurityError(error, () => {
@@ -590,12 +623,12 @@ export class ElectronService extends DataService {
 
             // Log error to console
             if (isSilentAction) {
-                this.debugLog(
+                this.logger.debug(
                     `Background Xtream action failed (${action ?? 'unknown'}):`,
                     normalizedMessage
                 );
             } else {
-                console.error('Xtream request error:', normalizedMessage);
+                this.logger.error('Xtream request error:', normalizedMessage);
             }
 
             // Only show snackbar for user-triggered Xtream requests
diff --git a/apps/web/src/app/services/pwa.service.ts b/apps/web/src/app/services/pwa.service.ts
index e4f05f161..3204b3262 100644
--- a/apps/web/src/app/services/pwa.service.ts
+++ b/apps/web/src/app/services/pwa.service.ts
@@ -15,7 +15,6 @@ import {
 } from 'rxjs';
 import { DataService } from '@iptvnator/services';
 import {
-    createDevLogger,
     ERROR,
     Playlist,
     PLAYLIST_PARSE_BY_URL,
@@ -32,6 +31,7 @@ import {
     createPortalDebugSuccessEvent,
     logPortalDebugEvent,
     logPortalDebugRequest,
+    createLogger,
 } from '@iptvnator/portal/shared/util';
 import { getRuntimeBackendUrl } from './runtime-config';
 
@@ -71,7 +71,7 @@ export class PwaService extends DataService {
     private readonly store = inject(Store);
     private readonly swUpdate = inject(SwUpdate);
     private readonly translateService = inject(TranslateService);
-    private readonly debugLog = createDevLogger('PwaService');
+    private readonly logger = createLogger('PwaService');
     private readonly providerTargetIds = new Map<string, Promise<string>>();
     private readonly silentXtreamActions = new Set<string>([
         XtreamCodeActions.GetAccountInfo,
@@ -88,7 +88,6 @@ export class PwaService extends DataService {
 
     constructor() {
         super();
-        this.debugLog('PWA service initialized...');
     }
 
     /** Uses service worker mechanism to check for available application updates */
@@ -358,7 +357,7 @@ export class PwaService extends DataService {
                 );
 
                 if (isSilentAction) {
-                    this.debugLog(
+                    this.logger.debug(
                         `Background Xtream action failed (${action ?? 'unknown'}):`,
                         normalizedMessage
                     );
@@ -398,7 +397,7 @@ export class PwaService extends DataService {
 
             // Log error to console
             if (isSilentAction) {
-                this.debugLog(
+                this.logger.debug(
                     `Background Xtream action failed (${action ?? 'unknown'}):`,
                     normalizedMessage
                 );
@@ -409,7 +408,7 @@ export class PwaService extends DataService {
                 };
             }
 
-            console.error('Xtream request error:', normalizedMessage);
+            this.logger.error('Xtream request error:', normalizedMessage);
             this.snackBar.open(
                 `Xtream request failed: ${normalizedMessage}`,
                 'Close',
@@ -533,7 +532,7 @@ export class PwaService extends DataService {
         } catch (err: unknown) {
             const errorInfo = this.getErrorDetails(err);
             logPortalDebugEvent(createPortalDebugErrorEvent(context, err));
-            console.error('Stalker request error:', err);
+            this.logger.error('Stalker request error:', err);
 
             this.snackBar.open(
                 `Error: ${errorInfo?.message ?? ' Not found'}, status: ${errorInfo?.status ?? 404}`,
diff --git a/apps/web/src/app/settings/settings-about-section.component.html b/apps/web/src/app/settings/settings-about-section.component.html
index 184672bcc..c5ab3ddaf 100644
--- a/apps/web/src/app/settings/settings-about-section.component.html
+++ b/apps/web/src/app/settings/settings-about-section.component.html
@@ -19,7 +19,17 @@
             <p>{{ 'SETTINGS.VERSION_DESCRIPTION' | translate }}</p>
         </div>
         <div class="setting-item__control version-block">
-            <span>{{ version() }}</span>
+            <span data-test-id="app-version">
+                {{ version() }}
+                @if (buildCommitShort(); as commit) {
+                    <span
+                        class="build-commit"
+                        data-test-id="app-build-commit"
+                        [title]="buildCommit()"
+                        >({{ commit }})</span
+                    >
+                }
+            </span>
             <small>{{ updateMessage() }}</small>
         </div>
     </div>
diff --git a/apps/web/src/app/settings/settings-about-section.component.spec.ts b/apps/web/src/app/settings/settings-about-section.component.spec.ts
index 2ca97c487..ce5c87265 100644
--- a/apps/web/src/app/settings/settings-about-section.component.spec.ts
+++ b/apps/web/src/app/settings/settings-about-section.component.spec.ts
@@ -132,3 +132,60 @@ describe('SettingsAboutSectionComponent app updates', () => {
         expect(getButton(fixture, 'app-update-open-release')).toBeTruthy();
     });
 });
+
+describe('SettingsAboutSectionComponent version display', () => {
+    let fixture: ComponentFixture<SettingsAboutSectionComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [
+                SettingsAboutSectionComponent,
+                TranslateModule.forRoot(),
+            ],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(SettingsAboutSectionComponent);
+        fixture.componentRef.setInput('activeSection', 'about');
+        fixture.componentRef.setInput('version', '0.23.0');
+    });
+
+    function getVersionBlock() {
+        return fixture.nativeElement.querySelector(
+            '[data-test-id="app-version"]'
+        ) as HTMLElement;
+    }
+
+    function getCommitMarker() {
+        return fixture.nativeElement.querySelector(
+            '[data-test-id="app-build-commit"]'
+        ) as HTMLElement | null;
+    }
+
+    it('shows the shortened build commit next to the version on CI builds', () => {
+        fixture.componentRef.setInput(
+            'buildCommit',
+            '949ea520aa11bb22cc33dd44ee55ff6677889900'
+        );
+        fixture.detectChanges();
+
+        expect(getVersionBlock().textContent).toContain('0.23.0');
+        expect(getCommitMarker()?.textContent).toBe('(949ea52)');
+        expect(getCommitMarker()?.getAttribute('title')).toBe(
+            '949ea520aa11bb22cc33dd44ee55ff6677889900'
+        );
+    });
+
+    it('shows the plain version when no build commit was injected', () => {
+        fixture.detectChanges();
+
+        expect(getVersionBlock().textContent).toContain('0.23.0');
+        expect(getCommitMarker()).toBeNull();
+    });
+
+    it('treats a whitespace-only commit as absent', () => {
+        fixture.componentRef.setInput('buildCommit', '   ');
+        fixture.detectChanges();
+
+        expect(getCommitMarker()).toBeNull();
+    });
+});
diff --git a/apps/web/src/app/settings/settings-about-section.component.ts b/apps/web/src/app/settings/settings-about-section.component.ts
index ed510ab46..eb02ce4e7 100644
--- a/apps/web/src/app/settings/settings-about-section.component.ts
+++ b/apps/web/src/app/settings/settings-about-section.component.ts
@@ -18,15 +18,25 @@ import {
     imports: [MatButtonModule, MatIconModule, TranslateModule],
     templateUrl: './settings-about-section.component.html',
     encapsulation: ViewEncapsulation.None,
-    styles: [':host { display: contents; }'],
+    styles: [
+        ':host { display: contents; }',
+        '.version-block .build-commit { opacity: 0.65; font-size: 0.85em; }',
+    ],
 })
 export class SettingsAboutSectionComponent {
     readonly activeSection = input.required<string>();
     readonly isDesktop = input(false);
     readonly version = input<string | undefined>();
+    readonly buildCommit = input<string | undefined>();
     readonly updateMessage = input<string | undefined>();
     readonly appUpdateStatus = input<ElectronBridgeAppUpdateStatus | null>(null);
 
+    readonly buildCommitShort = computed(() => {
+        const commit = this.buildCommit()?.trim();
+
+        return commit ? commit.slice(0, 7) : undefined;
+    });
+
     readonly checkForAppUpdate = output<void>();
     readonly downloadAppUpdate = output<void>();
     readonly installAppUpdate = output<void>();
diff --git a/apps/web/src/app/settings/settings-app-update.facade.spec.ts b/apps/web/src/app/settings/settings-app-update.facade.spec.ts
new file mode 100644
index 000000000..79fa59389
--- /dev/null
+++ b/apps/web/src/app/settings/settings-app-update.facade.spec.ts
@@ -0,0 +1,270 @@
+import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
+import { DataService } from '@iptvnator/services';
+import {
+    ELECTRON_BRIDGE_APP_UPDATE_STATUSES,
+    ElectronBridgeAppUpdateStatus,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { MockProvider } from 'ng-mocks';
+import { of } from 'rxjs';
+import { ElectronServiceStub } from '../services/electron.service.stub';
+import { SettingsService } from '../services/settings.service';
+import { AppUpdateReleaseNotesDialogComponent } from './app-update-release-notes-dialog.component';
+import { SettingsAppUpdateFacade } from './settings-app-update.facade';
+import {
+    createElectronStub,
+    DEFAULT_APP_UPDATE_STATUS,
+    MockSettingsService,
+} from './test-stubs/settings-test-harness.stub';
+
+/** The retry loop is deliberately private; tests drive it directly. */
+interface SettingsAppUpdateFacadePrivateTestApi {
+    loadStatus(): Promise<void>;
+    waitForRetry(): Promise<void>;
+}
+
+describe('SettingsAppUpdateFacade', () => {
+    let facade: SettingsAppUpdateFacade;
+    let matDialog: MatDialog;
+    let dataService: DataService;
+    let translate: TranslateService;
+    const originalElectron = window.electron;
+
+    /** Lets the facade's async status load settle */
+    const flush = () => new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+    const privateApi = (): SettingsAppUpdateFacadePrivateTestApi =>
+        facade as unknown as SettingsAppUpdateFacadePrivateTestApi;
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+
+        TestBed.configureTestingModule({
+            providers: [
+                SettingsAppUpdateFacade,
+                { provide: DataService, useClass: ElectronServiceStub },
+                MockProvider(MatDialog, { open: jest.fn() }),
+                { provide: SettingsService, useClass: MockSettingsService },
+            ],
+            imports: [TranslateModule.forRoot()],
+        });
+
+        facade = TestBed.inject(SettingsAppUpdateFacade);
+        matDialog = TestBed.inject(MatDialog);
+        dataService = TestBed.inject(DataService);
+        translate = TestBed.inject(TranslateService);
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    it('loads the desktop app update status and subscribes to status pushes', async () => {
+        const pushedStatus: ElectronBridgeAppUpdateStatus = {
+            ...DEFAULT_APP_UPDATE_STATUS,
+            latestVersion: '0.23.0',
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available,
+        };
+
+        facade.init();
+        await flush();
+
+        const statusHandler = (
+            window.electron.onAppUpdateStatusChange as jest.Mock
+        ).mock.calls[0][0] as (status: ElectronBridgeAppUpdateStatus) => void;
+        statusHandler(pushedStatus);
+
+        expect(window.electron.getAppUpdateStatus).toHaveBeenCalledTimes(1);
+        expect(window.electron.onAppUpdateStatusChange).toHaveBeenCalledTimes(
+            1
+        );
+        expect(facade.status()).toEqual(pushedStatus);
+    });
+
+    it('stops listening for status pushes once disposed', () => {
+        const unsubscribe = jest.fn();
+        (window.electron.onAppUpdateStatusChange as jest.Mock).mockReturnValue(
+            unsubscribe
+        );
+
+        facade.init();
+        facade.dispose();
+
+        expect(unsubscribe).toHaveBeenCalledTimes(1);
+    });
+
+    it('retries the initial app update status load when IPC handlers are still starting', async () => {
+        const retriedStatus: ElectronBridgeAppUpdateStatus = {
+            ...DEFAULT_APP_UPDATE_STATUS,
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
+            supportedSelfUpdate: false,
+        };
+        (window.electron.getAppUpdateStatus as jest.Mock)
+            .mockReset()
+            .mockRejectedValueOnce(new Error('No handler registered'))
+            .mockResolvedValueOnce(retriedStatus);
+        jest.spyOn(privateApi(), 'waitForRetry').mockResolvedValue(undefined);
+
+        await privateApi().loadStatus();
+
+        expect(window.electron.getAppUpdateStatus).toHaveBeenCalledTimes(2);
+        expect(facade.status()).toEqual(retriedStatus);
+    });
+
+    it('waits for the desktop app update bridge method before loading status', async () => {
+        const retriedStatus: ElectronBridgeAppUpdateStatus = {
+            ...DEFAULT_APP_UPDATE_STATUS,
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
+            supportedSelfUpdate: false,
+        };
+        delete (window.electron as Partial<typeof window.electron>)
+            .getAppUpdateStatus;
+        let retryCount = 0;
+        const getStatus = jest.fn().mockResolvedValue(retriedStatus);
+        jest.spyOn(privateApi(), 'waitForRetry').mockImplementation(
+            async () => {
+                retryCount += 1;
+
+                if (retryCount === 1) {
+                    window.electron.getAppUpdateStatus = getStatus;
+                }
+            }
+        );
+
+        await privateApi().loadStatus();
+
+        expect(retryCount).toBe(1);
+        expect(getStatus).toHaveBeenCalledTimes(1);
+        expect(facade.status()).toEqual(retriedStatus);
+    });
+
+    it('forwards app update actions to the desktop bridge', async () => {
+        await facade.checkForAppUpdate();
+        await facade.downloadAppUpdate();
+        await facade.installAppUpdate();
+
+        expect(window.electron.checkForAppUpdate).toHaveBeenCalledTimes(1);
+        expect(window.electron.downloadAppUpdate).toHaveBeenCalledTimes(1);
+        expect(window.electron.installAppUpdate).toHaveBeenCalledTimes(1);
+    });
+
+    it('opens the manual release URL from unsupported update status', () => {
+        const openSpy = jest.spyOn(window, 'open').mockReturnValue(null);
+        facade.status.set({
+            ...DEFAULT_APP_UPDATE_STATUS,
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
+            supportedSelfUpdate: false,
+        });
+
+        facade.openManualAppUpdate();
+
+        expect(openSpy).toHaveBeenCalledWith(
+            DEFAULT_APP_UPDATE_STATUS.manualDownloadUrl,
+            '_blank',
+            'noreferrer'
+        );
+    });
+
+    it('opens release notes dialog for the latest update version', () => {
+        const openSpy = jest.spyOn(matDialog, 'open').mockReturnValue({
+            afterClosed: () => of(false),
+        } as unknown as ReturnType<MatDialog['open']>);
+        facade.status.set({
+            ...DEFAULT_APP_UPDATE_STATUS,
+            latestVersion: '0.23.0',
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available,
+        });
+
+        facade.openReleaseNotes();
+
+        expect(openSpy).toHaveBeenCalledWith(
+            AppUpdateReleaseNotesDialogComponent,
+            expect.objectContaining({
+                data: {
+                    initialVersion: '0.23.0',
+                },
+            })
+        );
+    });
+
+    it('opens release notes dialog for the current version when no update is available', () => {
+        const openSpy = jest.spyOn(matDialog, 'open').mockReturnValue({
+            afterClosed: () => of(false),
+        } as unknown as ReturnType<MatDialog['open']>);
+        facade.status.set({
+            ...DEFAULT_APP_UPDATE_STATUS,
+            latestVersion: '0.21.0',
+            release: {
+                version: '0.21.0',
+            },
+            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.NotAvailable,
+        });
+
+        facade.openReleaseNotes();
+
+        expect(openSpy).toHaveBeenCalledWith(
+            AppUpdateReleaseNotesDialogComponent,
+            expect.objectContaining({
+                data: {
+                    initialVersion: DEFAULT_APP_UPDATE_STATUS.currentVersion,
+                    fallbackToLatest: true,
+                },
+            })
+        );
+    });
+
+    describe('Version check', () => {
+        const latestVersion = '1.0.0';
+        const currentVersion = '0.1.0';
+
+        beforeEach(() => {
+            const settingsService = TestBed.inject(SettingsService);
+            (settingsService.getAppVersion as jest.Mock).mockReturnValue(
+                of(latestVersion)
+            );
+
+            jest.spyOn(translate, 'instant').mockImplementation((key) => {
+                if (key === 'SETTINGS.NEW_VERSION_AVAILABLE') {
+                    return 'New version available';
+                }
+                if (key === 'SETTINGS.LATEST_VERSION') {
+                    return 'Latest version installed';
+                }
+                return key;
+            });
+        });
+
+        it('should return true if version is outdated', () => {
+            jest.spyOn(dataService, 'getAppVersion').mockReturnValue(
+                currentVersion
+            );
+
+            expect(facade.isCurrentVersionOutdated(latestVersion)).toBe(true);
+        });
+
+        it('should update notification message if version is outdated', () => {
+            jest.spyOn(dataService, 'getAppVersion').mockReturnValue(
+                currentVersion
+            );
+
+            facade.showVersionInformation(latestVersion);
+
+            expect(translate.instant).toHaveBeenCalledWith(
+                'SETTINGS.NEW_VERSION_AVAILABLE'
+            );
+            expect(facade.updateMessage()).toBe('New version available: 1.0.0');
+        });
+
+        it('reports the installed version as current when it matches', () => {
+            jest.spyOn(dataService, 'getAppVersion').mockReturnValue(
+                latestVersion
+            );
+
+            facade.showVersionInformation(latestVersion);
+
+            expect(facade.updateMessage()).toBe('Latest version installed');
+            expect(facade.version()).toBe(latestVersion);
+        });
+    });
+});
diff --git a/apps/web/src/app/settings/settings-app-update.facade.ts b/apps/web/src/app/settings/settings-app-update.facade.ts
new file mode 100644
index 000000000..05659f6f7
--- /dev/null
+++ b/apps/web/src/app/settings/settings-app-update.facade.ts
@@ -0,0 +1,218 @@
+import { inject, Injectable, signal } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { DataService, RuntimeCapabilitiesService } from '@iptvnator/services';
+import {
+    ELECTRON_BRIDGE_APP_UPDATE_STATUSES,
+    ElectronBridgeAppUpdateStatus,
+} from '@iptvnator/shared/interfaces';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs';
+import { SettingsService } from '../services/settings.service';
+import { AppUpdateReleaseNotesDialogComponent } from './app-update-release-notes-dialog.component';
+
+const APP_UPDATE_STATUS_LOAD_ATTEMPTS = 60;
+const APP_UPDATE_STATUS_LOAD_RETRY_DELAY_MS = 250;
+
+/**
+ * Owns everything the About section needs to talk about versions: the
+ * electron-updater status stream and the "is my build outdated" message.
+ */
+@Injectable()
+export class SettingsAppUpdateFacade {
+    private readonly dataService = inject(DataService);
+    private readonly matDialog = inject(MatDialog);
+    private readonly runtime = inject(RuntimeCapabilitiesService);
+    private readonly settingsService = inject(SettingsService);
+    private readonly translate = inject(TranslateService);
+
+    /** Latest updater status, polled once and then pushed by the backend */
+    readonly status = signal<ElectronBridgeAppUpdateStatus | null>(null);
+
+    /** Current version of the app */
+    readonly version = signal('');
+
+    /** Update message to show */
+    readonly updateMessage = signal('');
+
+    private unsubscribeStatus: (() => void) | null = null;
+
+    /** Subscribes to status pushes and kicks off the initial status load */
+    init(): void {
+        this.bindStatusEvents();
+        void this.loadStatus();
+    }
+
+    dispose(): void {
+        this.unsubscribeStatus?.();
+        this.unsubscribeStatus = null;
+    }
+
+    async checkForAppUpdate(): Promise<void> {
+        if (!this.runtime.isElectron || !window.electron?.checkForAppUpdate) {
+            return;
+        }
+
+        this.status.set(await window.electron.checkForAppUpdate());
+    }
+
+    async downloadAppUpdate(): Promise<void> {
+        if (!this.runtime.isElectron || !window.electron?.downloadAppUpdate) {
+            return;
+        }
+
+        this.status.set(await window.electron.downloadAppUpdate());
+    }
+
+    async installAppUpdate(): Promise<void> {
+        if (!this.runtime.isElectron || !window.electron?.installAppUpdate) {
+            return;
+        }
+
+        this.status.set(await window.electron.installAppUpdate());
+    }
+
+    openManualAppUpdate(): void {
+        const manualDownloadUrl = this.status()?.manualDownloadUrl;
+
+        if (!manualDownloadUrl) {
+            return;
+        }
+
+        window.open(manualDownloadUrl, '_blank', 'noreferrer');
+    }
+
+    openReleaseNotes(): void {
+        const status = this.status();
+        const isUpdateRelease =
+            status?.status === ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available ||
+            status?.status ===
+                ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Downloading ||
+            status?.status === ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Downloaded;
+        const initialReleaseNotesVersion = isUpdateRelease
+            ? (status?.latestVersion ??
+              status?.release?.version ??
+              status?.currentVersion)
+            : status?.currentVersion;
+
+        this.matDialog.open(AppUpdateReleaseNotesDialogComponent, {
+            autoFocus: false,
+            data: {
+                ...(!isUpdateRelease ? { fallbackToLatest: true } : {}),
+                initialVersion: initialReleaseNotesVersion,
+            },
+            maxWidth: 'calc(100vw - 32px)',
+            restoreFocus: true,
+            width: '720px',
+        });
+    }
+
+    /**
+     * Checks whether the latest version of the application
+     * is used and updates the version message in the
+     * settings UI
+     */
+    checkAppVersion(): void {
+        this.settingsService
+            .getAppVersion()
+            .pipe(take(1))
+            .subscribe((version) => this.showVersionInformation(version));
+    }
+
+    /**
+     * Updates the message in settings UI about the used
+     * version of the app
+     * @param currentVersion current version of the application
+     */
+    showVersionInformation(currentVersion: string): void {
+        const isOutdated = this.isCurrentVersionOutdated(currentVersion);
+
+        if (isOutdated) {
+            this.updateMessage.set(
+                `${
+                    this.translate.instant(
+                        'SETTINGS.NEW_VERSION_AVAILABLE'
+                    ) as string
+                }: ${currentVersion}`
+            );
+        } else {
+            this.updateMessage.set(
+                this.translate.instant('SETTINGS.LATEST_VERSION')
+            );
+        }
+    }
+
+    /**
+     * Compares actual with latest version of the
+     * application
+     * @param latestVersion latest version
+     * @returns returns true if an update is available
+     */
+    isCurrentVersionOutdated(latestVersion: string): boolean {
+        this.version.set(this.dataService.getAppVersion());
+        return this.settingsService.isVersionOutdated(
+            this.version(),
+            latestVersion
+        );
+    }
+
+    private bindStatusEvents(): void {
+        if (
+            !this.runtime.isElectron ||
+            !window.electron?.onAppUpdateStatusChange
+        ) {
+            return;
+        }
+
+        this.unsubscribeStatus = window.electron.onAppUpdateStatusChange(
+            (status) => {
+                this.status.set(status);
+            }
+        );
+    }
+
+    /**
+     * The updater IPC handlers can still be registering while the settings
+     * page mounts, so the first load retries until the bridge answers.
+     */
+    private async loadStatus(): Promise<void> {
+        if (!this.runtime.isElectron) {
+            return;
+        }
+
+        let lastError: unknown;
+
+        for (
+            let attempt = 1;
+            attempt <= APP_UPDATE_STATUS_LOAD_ATTEMPTS;
+            attempt += 1
+        ) {
+            const electron = window.electron;
+
+            if (electron?.getAppUpdateStatus) {
+                try {
+                    this.status.set(await electron.getAppUpdateStatus());
+                    return;
+                } catch (error) {
+                    lastError = error;
+                }
+            }
+
+            if (attempt === APP_UPDATE_STATUS_LOAD_ATTEMPTS) {
+                console.warn(
+                    'Failed to load app update status:',
+                    lastError ??
+                        new Error('Desktop app update bridge is unavailable')
+                );
+                return;
+            }
+
+            await this.waitForRetry();
+        }
+    }
+
+    private async waitForRetry(): Promise<void> {
+        await new Promise<void>((resolve) => {
+            setTimeout(resolve, APP_UPDATE_STATUS_LOAD_RETRY_DELAY_MS);
+        });
+    }
+}
diff --git a/apps/web/src/app/settings/settings-backup.facade.spec.ts b/apps/web/src/app/settings/settings-backup.facade.spec.ts
new file mode 100644
index 000000000..e4e70ea9d
--- /dev/null
+++ b/apps/web/src/app/settings/settings-backup.facade.spec.ts
@@ -0,0 +1,157 @@
+import { TestBed } from '@angular/core/testing';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import {
+    selectAllPlaylistsMeta,
+    selectIsEpgAvailable,
+} from '@iptvnator/m3u-state';
+import { PlaylistBackupService } from '@iptvnator/services';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { MockProvider } from 'ng-mocks';
+import { SettingsBackupFacade } from './settings-backup.facade';
+import { SettingsSnackbarService } from './settings-snackbar.service';
+import {
+    BACKUP_EXPORT_RESULT,
+    createElectronStub,
+    MatSnackBarStub,
+} from './test-stubs/settings-test-harness.stub';
+
+describe('SettingsBackupFacade', () => {
+    let facade: SettingsBackupFacade;
+    let playlistBackupService: PlaylistBackupService;
+    const originalElectron = window.electron;
+
+    /** The component normally supplies a paint frame; tests skip the wait */
+    const noWait = () => Promise.resolve();
+
+    function configure(): void {
+        TestBed.configureTestingModule({
+            providers: [
+                SettingsBackupFacade,
+                SettingsSnackbarService,
+                { provide: MatSnackBar, useClass: MatSnackBarStub },
+                MockProvider(PlaylistBackupService, {
+                    exportBackup: jest
+                        .fn()
+                        .mockResolvedValue(BACKUP_EXPORT_RESULT),
+                    importBackup: jest.fn(),
+                }),
+                provideMockStore({
+                    selectors: [
+                        { selector: selectAllPlaylistsMeta, value: [] },
+                        { selector: selectIsEpgAvailable, value: false },
+                    ],
+                }),
+            ],
+            imports: [TranslateModule.forRoot()],
+        });
+
+        facade = TestBed.inject(SettingsBackupFacade);
+        playlistBackupService = TestBed.inject(PlaylistBackupService);
+    }
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    it('shows an export busy state until the backup file has been written', async () => {
+        configure();
+        let resolveExport: (value: typeof BACKUP_EXPORT_RESULT) => void = () =>
+            undefined;
+        (playlistBackupService.exportBackup as jest.Mock).mockReturnValueOnce(
+            new Promise((resolve) => {
+                resolveExport = resolve;
+            })
+        );
+
+        const exportPromise = facade.exportData(noWait);
+
+        expect(facade.isExportingData()).toBe(true);
+
+        resolveExport(BACKUP_EXPORT_RESULT);
+        await exportPromise;
+
+        expect(window.electron.saveFileDialog).toHaveBeenCalledWith(
+            BACKUP_EXPORT_RESULT.defaultFileName,
+            [
+                {
+                    extensions: ['json'],
+                    name: 'JSON',
+                },
+            ]
+        );
+        expect(window.electron.writeFile).toHaveBeenCalledWith(
+            '/tmp/backup.json',
+            '{}'
+        );
+        expect(facade.isExportingData()).toBe(false);
+    });
+
+    it('falls back to browser backup download when desktop file-save preload is incomplete', async () => {
+        const saveFileDialog = jest.fn().mockResolvedValue('/tmp/backup.json');
+        window.electron = {
+            platform: 'linux',
+            saveFileDialog,
+        } as unknown as typeof window.electron;
+        configure();
+
+        const createObjectURL = jest.fn().mockReturnValue('blob:backup');
+        const revokeObjectURL = jest.fn();
+        const originalCreateObjectURL = window.URL.createObjectURL;
+        const originalRevokeObjectURL = window.URL.revokeObjectURL;
+        Object.defineProperty(window.URL, 'createObjectURL', {
+            configurable: true,
+            value: createObjectURL,
+        });
+        Object.defineProperty(window.URL, 'revokeObjectURL', {
+            configurable: true,
+            value: revokeObjectURL,
+        });
+        const clickSpy = jest
+            .spyOn(HTMLAnchorElement.prototype, 'click')
+            .mockImplementation();
+
+        try {
+            await facade.exportData(noWait);
+
+            expect(saveFileDialog).not.toHaveBeenCalled();
+            expect(createObjectURL).toHaveBeenCalledWith(expect.any(Blob));
+            expect(clickSpy).toHaveBeenCalled();
+            expect(revokeObjectURL).toHaveBeenCalledWith('blob:backup');
+        } finally {
+            clickSpy.mockRestore();
+            Object.defineProperty(window.URL, 'createObjectURL', {
+                configurable: true,
+                value: originalCreateObjectURL,
+            });
+            Object.defineProperty(window.URL, 'revokeObjectURL', {
+                configurable: true,
+                value: originalRevokeObjectURL,
+            });
+        }
+    });
+
+    it('reports a failed export and clears the busy state', async () => {
+        configure();
+        (playlistBackupService.exportBackup as jest.Mock).mockRejectedValueOnce(
+            new Error('disk full')
+        );
+        jest.spyOn(console, 'error').mockImplementation();
+        const snackBar = TestBed.inject(
+            MatSnackBar
+        ) as unknown as MatSnackBarStub;
+
+        await facade.exportData(noWait);
+
+        expect(facade.isExportingData()).toBe(false);
+        expect(snackBar.open).toHaveBeenCalledWith(
+            'Playlist backup export failed.',
+            undefined,
+            expect.objectContaining({ panelClass: ['settings-snackbar'] })
+        );
+    });
+});
diff --git a/apps/web/src/app/settings/settings-embedded-mpv.facade.ts b/apps/web/src/app/settings/settings-embedded-mpv.facade.ts
new file mode 100644
index 000000000..cfe738c72
--- /dev/null
+++ b/apps/web/src/app/settings/settings-embedded-mpv.facade.ts
@@ -0,0 +1,74 @@
+import { computed, inject, Injectable, signal } from '@angular/core';
+import { RuntimeCapabilitiesService } from '@iptvnator/services';
+import { EmbeddedMpvSupport } from '@iptvnator/shared/interfaces';
+
+/**
+ * Probes the desktop backend for embedded MPV support so the playback
+ * section can hide options the current build cannot deliver.
+ */
+@Injectable()
+export class SettingsEmbeddedMpvFacade {
+    private readonly runtime = inject(RuntimeCapabilitiesService);
+
+    readonly support = signal<EmbeddedMpvSupport | null>(null);
+
+    readonly supported = computed(
+        () => this.runtime.isElectron && !!this.support()?.supported
+    );
+
+    readonly frameCopyAvailable = computed(
+        () => this.runtime.isElectron && !!this.support()?.frameCopyAvailable
+    );
+
+    readonly frameCopyActive = computed(
+        () => this.support()?.engine === 'frame-copy'
+    );
+
+    async load(): Promise<void> {
+        if (!this.runtime.isElectron) {
+            this.support.set({
+                supported: false,
+                platform: 'web',
+                reason: 'Embedded MPV requires the Electron desktop build.',
+            });
+            return;
+        }
+
+        if (!window.electron?.getEmbeddedMpvSupport) {
+            this.support.set({
+                supported: false,
+                platform: window.electron.platform,
+                reason: 'Embedded MPV support is not available in this build.',
+            });
+            return;
+        }
+
+        try {
+            this.support.set(await window.electron.getEmbeddedMpvSupport());
+        } catch (error) {
+            this.support.set({
+                supported: false,
+                platform: window.electron.platform,
+                reason: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+
+    /**
+     * Opens the native folder picker for MPV recordings.
+     * @returns the selected folder, or null when the user cancelled or the
+     * desktop bridge cannot show the dialog
+     */
+    async selectRecordingFolder(): Promise<string | null> {
+        if (
+            !this.runtime.isElectron ||
+            !window.electron?.selectEmbeddedMpvRecordingFolder
+        ) {
+            return null;
+        }
+
+        return (
+            (await window.electron.selectEmbeddedMpvRecordingFolder()) ?? null
+        );
+    }
+}
diff --git a/apps/web/src/app/settings/settings-epg.facade.spec.ts b/apps/web/src/app/settings/settings-epg.facade.spec.ts
new file mode 100644
index 000000000..dd8683299
--- /dev/null
+++ b/apps/web/src/app/settings/settings-epg.facade.spec.ts
@@ -0,0 +1,177 @@
+import { TestBed } from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import {
+    EpgRuntimeBridgeService,
+    EpgService,
+} from '@iptvnator/epg/data-access';
+import { DialogService } from '@iptvnator/ui/components';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { MockProvider } from 'ng-mocks';
+import { SettingsStore } from '../services/settings-store.service';
+import { SettingsService } from '../services/settings.service';
+import { SettingsEpgFacade } from './settings-epg.facade';
+import { SettingsFormFacade } from './settings-form.facade';
+import { SettingsSnackbarService } from './settings-snackbar.service';
+import {
+    createElectronStub,
+    createEpgBridgeStub,
+    MatSnackBarStub,
+    MockSettingsService,
+    MockSettingsStore,
+} from './test-stubs/settings-test-harness.stub';
+
+describe('SettingsEpgFacade', () => {
+    let facade: SettingsEpgFacade;
+    let formFacade: SettingsFormFacade;
+    let epgBridge: Partial<EpgRuntimeBridgeService>;
+    let epgService: EpgService;
+    let dialogService: DialogService;
+    let snackBar: MatSnackBarStub;
+    let translate: TranslateService;
+    const originalElectron = window.electron;
+
+    /** The confirm dialog is a mock, so tests trigger its callback directly */
+    const confirmImmediately = () => {
+        (dialogService.openConfirmDialog as jest.Mock).mockImplementation(
+            ({ onConfirm }: { onConfirm: () => Promise<void> }) => {
+                void onConfirm();
+            }
+        );
+    };
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+        epgBridge = createEpgBridgeStub();
+
+        TestBed.configureTestingModule({
+            providers: [
+                UntypedFormBuilder,
+                SettingsEpgFacade,
+                SettingsFormFacade,
+                SettingsSnackbarService,
+                { provide: EpgRuntimeBridgeService, useValue: epgBridge },
+                MockProvider(EpgService, { fetchEpg: jest.fn() }),
+                MockProvider(DialogService, { openConfirmDialog: jest.fn() }),
+                { provide: MatSnackBar, useClass: MatSnackBarStub },
+                { provide: SettingsService, useClass: MockSettingsService },
+                { provide: SettingsStore, useClass: MockSettingsStore },
+            ],
+            imports: [TranslateModule.forRoot()],
+        });
+
+        facade = TestBed.inject(SettingsEpgFacade);
+        formFacade = TestBed.inject(SettingsFormFacade);
+        epgService = TestBed.inject(EpgService);
+        dialogService = TestBed.inject(DialogService);
+        snackBar = TestBed.inject(MatSnackBar) as unknown as MatSnackBarStub;
+        translate = TestBed.inject(TranslateService);
+        jest.spyOn(translate, 'instant').mockImplementation((key) => key);
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    it('should force-fetch EPG for a single URL (bypassing freshness cache)', () => {
+        const url = 'http://epg-url-here/data.xml';
+
+        facade.refresh(url);
+
+        expect(epgBridge.forceFetchEpg).toHaveBeenCalledWith(url, {
+            trustedPrivateNetworkEpgUrls: [],
+            trustedInsecureTlsHosts: [],
+        });
+    });
+
+    it('skips the refresh when the URL is empty or EPG is unmanaged', () => {
+        facade.refresh('');
+        epgBridge.supportsDataManagement = false;
+        facade.refresh('http://epg-url-here/data.xml');
+
+        expect(epgBridge.forceFetchEpg).not.toHaveBeenCalled();
+    });
+
+    it('force-fetches every configured source, skipping blank entries', () => {
+        formFacade.setEpgUrls([
+            'http://first.example/guide.xml',
+            'http://second.example/guide.xml',
+        ]);
+        formFacade.addEpgSource();
+
+        facade.refreshAll();
+
+        expect(epgBridge.forceFetchEpg).toHaveBeenCalledTimes(2);
+        expect(epgBridge.forceFetchEpg).toHaveBeenCalledWith(
+            'http://first.example/guide.xml',
+            expect.anything()
+        );
+        expect(epgBridge.forceFetchEpg).toHaveBeenCalledWith(
+            'http://second.example/guide.xml',
+            expect.anything()
+        );
+    });
+
+    it('clears EPG data with a busy state and refreshes all sources on success', async () => {
+        let resolveClear: () => void = () => undefined;
+        const clearPromise = new Promise<{ success: boolean }>((resolve) => {
+            resolveClear = () => resolve({ success: true });
+        });
+        (epgBridge.clearEpgData as jest.Mock).mockReturnValue(clearPromise);
+        confirmImmediately();
+        const refreshSpy = jest.spyOn(facade, 'refreshAll');
+
+        facade.clear();
+
+        expect(facade.isClearing()).toBe(true);
+        expect(refreshSpy).not.toHaveBeenCalled();
+
+        resolveClear();
+        await clearPromise;
+        await Promise.resolve();
+
+        expect(facade.isClearing()).toBe(false);
+        expect(snackBar.open).toHaveBeenCalledWith(
+            'SETTINGS.EPG_DATA_CLEARED',
+            undefined,
+            expect.objectContaining({ panelClass: ['settings-snackbar'] })
+        );
+        expect(refreshSpy).toHaveBeenCalled();
+    });
+
+    it('shows a failure snackbar and skips refresh when clearing EPG data rejects', async () => {
+        (epgBridge.clearEpgData as jest.Mock).mockRejectedValueOnce(
+            new Error('boom')
+        );
+        confirmImmediately();
+        const refreshSpy = jest.spyOn(facade, 'refreshAll');
+        jest.spyOn(console, 'error').mockImplementation();
+
+        facade.clear();
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+        expect(facade.isClearing()).toBe(false);
+        expect(snackBar.open).toHaveBeenCalledWith(
+            'SETTINGS.EPG_DATA_CLEAR_FAILED',
+            undefined,
+            expect.objectContaining({ panelClass: ['settings-snackbar'] })
+        );
+        expect(refreshSpy).not.toHaveBeenCalled();
+    });
+
+    it('re-fetches the saved sources after the settings are stored', () => {
+        formFacade.setEpgUrls(['http://saved.example/guide.xml']);
+
+        facade.fetchConfiguredEpg();
+
+        expect(epgService.fetchEpg).toHaveBeenCalledWith([
+            'http://saved.example/guide.xml',
+        ]);
+    });
+
+    it('does not re-fetch when no EPG source is configured', () => {
+        facade.fetchConfiguredEpg();
+
+        expect(epgService.fetchEpg).not.toHaveBeenCalled();
+    });
+});
diff --git a/apps/web/src/app/settings/settings-epg.facade.ts b/apps/web/src/app/settings/settings-epg.facade.ts
new file mode 100644
index 000000000..7f8670e09
--- /dev/null
+++ b/apps/web/src/app/settings/settings-epg.facade.ts
@@ -0,0 +1,123 @@
+import { inject, Injectable, signal } from '@angular/core';
+import {
+    EpgRuntimeBridgeService,
+    EpgService,
+} from '@iptvnator/epg/data-access';
+import { DialogService } from '@iptvnator/ui/components';
+import { TranslateService } from '@ngx-translate/core';
+import { SettingsStore } from '../services/settings-store.service';
+import { SettingsFormFacade } from './settings-form.facade';
+import { SettingsSnackbarService } from './settings-snackbar.service';
+
+/**
+ * EPG maintenance actions offered by the settings page: force refreshes and
+ * the destructive "clear all EPG data" flow.
+ */
+@Injectable()
+export class SettingsEpgFacade {
+    private readonly dialogService = inject(DialogService);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    private readonly epgService = inject(EpgService);
+    private readonly formFacade = inject(SettingsFormFacade);
+    private readonly settingsSnackbar = inject(SettingsSnackbarService);
+    private readonly settingsStore = inject(SettingsStore);
+    private readonly translate = inject(TranslateService);
+
+    readonly isClearing = signal(false);
+
+    /**
+     * Force-fetch EPG for a single URL, bypassing the 12-hour freshness check.
+     * The plain fetchEpg would short-circuit on fresh data and click the
+     * refresh button would be a no-op — that's exactly not what the user
+     * intends when clicking "Refresh".
+     */
+    refresh(url: string): void {
+        if (!this.epgBridge.supportsDataManagement || !url) {
+            return;
+        }
+        void this.epgBridge.forceFetchEpg(
+            url,
+            this.settingsStore.getTrustOptions()
+        );
+    }
+
+    /**
+     * Force-fetch every configured EPG URL sequentially. Empty fields are
+     * skipped. Each URL flows through the normal progress panel so the user
+     * gets visible per-URL feedback.
+     */
+    refreshAll(): void {
+        if (!this.epgBridge.supportsDataManagement) return;
+        const options = this.settingsStore.getTrustOptions();
+        this.formFacade.epgUrls.forEach(
+            (url) => void this.epgBridge.forceFetchEpg(url, options)
+        );
+    }
+
+    /**
+     * Clears all EPG data from database and immediately re-fetches every
+     * configured URL so the user isn't left staring at an empty state.
+     * Tracks progress with `isClearing` so the UI can show a spinner
+     * and block double-clicks, and surfaces failures via a dedicated snackbar.
+     */
+    clear(): void {
+        this.dialogService.openConfirmDialog({
+            title: this.translate.instant('SETTINGS.CLEAR_EPG_DIALOG.TITLE'),
+            message: this.translate.instant(
+                'SETTINGS.CLEAR_EPG_DIALOG.MESSAGE'
+            ),
+            onConfirm: async (): Promise<void> => {
+                if (
+                    !this.epgBridge.supportsDataManagement ||
+                    this.isClearing()
+                ) {
+                    return;
+                }
+
+                this.isClearing.set(true);
+                try {
+                    const result = await this.epgBridge.clearEpgData();
+                    if (result && result.success === false) {
+                        throw new Error('Clear EPG returned success=false');
+                    }
+                    this.settingsSnackbar.open(
+                        this.translate.instant('SETTINGS.EPG_DATA_CLEARED')
+                    );
+                    this.refreshAll();
+                } catch (error) {
+                    console.error('Failed to clear EPG data:', error);
+                    this.settingsSnackbar.open(
+                        this.translate.instant('SETTINGS.EPG_DATA_CLEAR_FAILED')
+                    );
+                } finally {
+                    this.isClearing.set(false);
+                }
+            },
+        });
+    }
+
+    /**
+     * Re-fetches the EPG sources that were just saved so the guide reflects
+     * the new configuration without a restart.
+     */
+    fetchConfiguredEpg(): void {
+        if (!this.formFacade.supportsEpg) {
+            return;
+        }
+
+        const epgUrl = this.formFacade.form.value.epgUrl;
+
+        if (!epgUrl) {
+            return;
+        }
+
+        const validEpgUrls = (Array.isArray(epgUrl) ? epgUrl : [epgUrl]).filter(
+            (url): url is string => typeof url === 'string' && url !== ''
+        );
+
+        if (validEpgUrls.length > 0) {
+            // Fetch all EPG URLs at once
+            this.epgService.fetchEpg(validEpgUrls);
+        }
+    }
+}
diff --git a/apps/web/src/app/settings/settings-form.facade.ts b/apps/web/src/app/settings/settings-form.facade.ts
new file mode 100644
index 000000000..a1b4a31a1
--- /dev/null
+++ b/apps/web/src/app/settings/settings-form.facade.ts
@@ -0,0 +1,197 @@
+import { DestroyRef, inject, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { FormArray, FormBuilder } from '@angular/forms';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
+import { RuntimeCapabilitiesService } from '@iptvnator/services';
+import {
+    CoverSize,
+    EpgViewMode,
+    Language,
+    Theme,
+} from '@iptvnator/shared/interfaces';
+import { TranslateService } from '@ngx-translate/core';
+import { SettingsStore } from '../services/settings-store.service';
+import { SettingsService } from '../services/settings.service';
+import {
+    applyEpgUrlsToFormArray,
+    createEpgUrlControl,
+    createSettingsForm,
+    createSettingsFromFormValue,
+    SettingsForm,
+} from './settings-form.utils';
+
+type SettingsFormPatch = Parameters<SettingsForm['patchValue']>[0];
+
+/**
+ * Owns the settings form: creation, hydration from the store, the small
+ * mutations the section components trigger, and persisting on submit.
+ */
+@Injectable()
+export class SettingsFormFacade {
+    private readonly destroyRef = inject(DestroyRef);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    private readonly formBuilder = inject(FormBuilder);
+    private readonly runtime = inject(RuntimeCapabilitiesService);
+    private readonly settingsService = inject(SettingsService);
+    private readonly settingsStore = inject(SettingsStore);
+    private readonly translate = inject(TranslateService);
+
+    readonly supportsEpg =
+        this.epgBridge.supportsImport && this.epgBridge.supportsDataManagement;
+
+    /** Settings form object */
+    readonly form = createSettingsForm(this.formBuilder, this.supportsEpg);
+
+    /** Form array with epg sources — absent when EPG is unsupported */
+    readonly epgUrl = this.form.get('epgUrl') as FormArray;
+
+    /** Trimmed, non-empty EPG source URLs currently in the form */
+    get epgUrls(): string[] {
+        return ((this.epgUrl?.value as string[] | undefined) ?? [])
+            .map((url) => url?.trim())
+            .filter((url): url is string => Boolean(url));
+    }
+
+    /** Waits for the persisted settings to be available */
+    loadSettings(): Promise<void> {
+        return this.settingsStore.loadSettings();
+    }
+
+    /**
+     * Sets saved settings from the indexed db store
+     */
+    hydrateFromStore(): void {
+        const currentSettings = this.settingsStore.getSettings();
+        this.form.patchValue(currentSettings);
+        this.syncDashboardControlsEnabledState(
+            currentSettings.showDashboard ?? true
+        );
+
+        if (this.supportsEpg && currentSettings.epgUrl) {
+            this.epgUrl.clear();
+            this.setEpgUrls(currentSettings.epgUrl);
+        }
+    }
+
+    bindDashboardControlsEnabledState(): void {
+        this.form
+            .get('showDashboard')
+            ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((showDashboard) =>
+                this.syncDashboardControlsEnabledState(showDashboard ?? true)
+            );
+    }
+
+    selectTheme(theme: Theme): void {
+        if (this.form.value.theme === theme) {
+            return;
+        }
+
+        this.patchAndMarkDirty({ theme }, 'theme');
+        this.settingsService.changeTheme(theme);
+    }
+
+    selectCoverSize(coverSize: CoverSize): void {
+        if (this.form.value.coverSize === coverSize) {
+            return;
+        }
+
+        this.patchAndMarkDirty({ coverSize }, 'coverSize');
+        void this.settingsStore.updateSettings({ coverSize });
+    }
+
+    selectEpgViewMode(epgViewMode: EpgViewMode): void {
+        if (this.form.value.epgViewMode === epgViewMode) {
+            return;
+        }
+
+        this.patchAndMarkDirty({ epgViewMode }, 'epgViewMode');
+        void this.settingsStore.updateSettings({ epgViewMode });
+    }
+
+    setRecordingFolder(recordingFolder: string): void {
+        this.patchAndMarkDirty({ recordingFolder }, 'recordingFolder');
+    }
+
+    /**
+     * Sets the epg urls to the form array
+     * @param epgUrls urls of the EPG sources
+     */
+    setEpgUrls(epgUrls: string[] | string): void {
+        applyEpgUrlsToFormArray(this.epgUrl, epgUrls);
+    }
+
+    /**
+     * Initializes new entry in form array for EPG URL
+     */
+    addEpgSource(): void {
+        this.epgUrl.insert(this.epgUrl.length, createEpgUrlControl());
+    }
+
+    /**
+     * Removes entry from form array for EPG URL
+     * @param index index of the item to remove
+     */
+    removeEpgSource(index: number): void {
+        this.epgUrl.removeAt(index);
+        this.form.markAsDirty();
+    }
+
+    /**
+     * Persists the form to the settings store and mirrors the result to the
+     * desktop backend.
+     * @param onSaved runs after the store write, before the backend is
+     * notified, so the UI confirmation is not delayed by IPC
+     */
+    async save(onSaved: () => void): Promise<void> {
+        const settings = createSettingsFromFormValue(
+            this.form,
+            this.settingsStore.getSettings()
+        );
+
+        await this.settingsStore.updateSettings(settings);
+        onSaved();
+
+        if (!window.electron) {
+            return;
+        }
+
+        window.electron.updateSettings(settings);
+
+        if (this.runtime.supportsExternalPlayerPathSettings) {
+            window.electron.setMpvPlayerPath(settings.mpvPlayerPath);
+            window.electron.setVlcPlayerPath(settings.vlcPlayerPath);
+        }
+    }
+
+    /** Applies the saved language/theme and resets the dirty state */
+    applySavedSettings(): void {
+        this.form.markAsPristine();
+        this.translate.use(this.form.value.language ?? Language.ENGLISH);
+        this.settingsService.changeTheme(
+            this.form.value.theme ?? Theme.SystemTheme
+        );
+    }
+
+    private patchAndMarkDirty(
+        value: SettingsFormPatch,
+        controlName: string
+    ): void {
+        this.form.patchValue(value);
+        this.form.get(controlName)?.markAsDirty();
+        this.form.markAsDirty();
+    }
+
+    private syncDashboardControlsEnabledState(showDashboard: boolean): void {
+        const dashboardRails = this.form.get('dashboardRails');
+        if (!dashboardRails) {
+            return;
+        }
+
+        if (showDashboard) {
+            dashboardRails.enable({ emitEvent: false });
+        } else {
+            dashboardRails.disable({ emitEvent: false });
+        }
+    }
+}
diff --git a/apps/web/src/app/settings/settings-form.utils.spec.ts b/apps/web/src/app/settings/settings-form.utils.spec.ts
new file mode 100644
index 000000000..68b741725
--- /dev/null
+++ b/apps/web/src/app/settings/settings-form.utils.spec.ts
@@ -0,0 +1,36 @@
+import { FormBuilder } from '@angular/forms';
+import { Settings } from '@iptvnator/shared/interfaces';
+import {
+    createSettingsForm,
+    createSettingsFromFormValue,
+} from './settings-form.utils';
+
+describe('settings form utils — strip country prefix', () => {
+    const formBuilder = new FormBuilder();
+
+    it('defaults the form control to false', () => {
+        const form = createSettingsForm(formBuilder, true);
+
+        expect(form.getRawValue().stripCountryPrefix).toBe(false);
+    });
+
+    it('carries an enabled toggle into the settings object', () => {
+        const form = createSettingsForm(formBuilder, true);
+        form.patchValue({ stripCountryPrefix: true });
+
+        const settings = createSettingsFromFormValue(form, {} as Settings);
+
+        expect(settings.stripCountryPrefix).toBe(true);
+    });
+
+    it('falls back to false when the form value is missing', () => {
+        const form = createSettingsForm(formBuilder, true);
+        form.patchValue({
+            stripCountryPrefix: null as unknown as boolean,
+        });
+
+        const settings = createSettingsFromFormValue(form, {} as Settings);
+
+        expect(settings.stripCountryPrefix).toBe(false);
+    });
+});
diff --git a/apps/web/src/app/settings/settings-form.utils.ts b/apps/web/src/app/settings/settings-form.utils.ts
index 19a52df6c..7cde29550 100644
--- a/apps/web/src/app/settings/settings-form.utils.ts
+++ b/apps/web/src/app/settings/settings-form.utils.ts
@@ -31,6 +31,9 @@ export function createSettingsForm(
 ) {
     return formBuilder.group({
         player: [VideoPlayer.VideoJs],
+        webPlayerSharedControls: false,
+        playerAmbientMode: false,
+        playerUpNextRail: true,
         ...(supportsEpg
             ? { epgUrl: new FormArray<FormControl<string | null>>([]) }
             : {}),
@@ -54,6 +57,7 @@ export function createSettingsForm(
         }),
         startupBehavior: StartupBehavior.FirstView,
         showExternalPlaybackBar: true,
+        stripCountryPrefix: false,
         theme: Theme.SystemTheme,
         mpvPlayerPath: '',
         mpvPlayerArguments: '',
@@ -72,6 +76,7 @@ export function createSettingsForm(
             ],
         ],
         recordingFolder: '',
+        embeddedMpvFrameCopy: false,
         coverSize: 'medium' as CoverSize,
         ...(supportsEpg
             ? {
@@ -113,6 +118,9 @@ export function createSettingsFromFormValue(
 
     return {
         player: value.player ?? VideoPlayer.VideoJs,
+        webPlayerSharedControls: value.webPlayerSharedControls ?? false,
+        playerAmbientMode: value.playerAmbientMode ?? false,
+        playerUpNextRail: value.playerUpNextRail ?? true,
         streamFormat: value.streamFormat ?? StreamFormat.AutoStreamFormat,
         openStreamOnDoubleClick: value.openStreamOnDoubleClick ?? false,
         language: value.language ?? Language.ENGLISH,
@@ -121,6 +129,7 @@ export function createSettingsFromFormValue(
         dashboardRails: normalizeDashboardRailsSettings(value.dashboardRails),
         startupBehavior: value.startupBehavior ?? StartupBehavior.FirstView,
         showExternalPlaybackBar: value.showExternalPlaybackBar ?? true,
+        stripCountryPrefix: value.stripCountryPrefix ?? false,
         theme: value.theme ?? Theme.SystemTheme,
         mpvPlayerPath: normalizeExternalPlayerPath(value.mpvPlayerPath),
         mpvPlayerArguments: normalizeExternalPlayerArguments(
@@ -135,6 +144,7 @@ export function createSettingsFromFormValue(
         remoteControl: value.remoteControl ?? false,
         remoteControlPort: Number(value.remoteControlPort ?? 8765),
         recordingFolder: value.recordingFolder ?? '',
+        embeddedMpvFrameCopy: value.embeddedMpvFrameCopy ?? false,
         coverSize: value.coverSize ?? 'medium',
         epgUrl,
         preferUploadedEpgOverXtream:
diff --git a/apps/web/src/app/settings/settings-general-section.component.html b/apps/web/src/app/settings/settings-general-section.component.html
index a234e1b66..dda4b45b5 100644
--- a/apps/web/src/app/settings/settings-general-section.component.html
+++ b/apps/web/src/app/settings/settings-general-section.component.html
@@ -156,4 +156,16 @@
             <mat-checkbox formControlName="showCaptions"></mat-checkbox>
         </div>
     </div>
+
+    <div class="setting-item">
+        <div class="setting-item__meta">
+            <h4>{{ 'SETTINGS.STRIP_COUNTRY_PREFIX' | translate }}</h4>
+            <p>
+                {{ 'SETTINGS.STRIP_COUNTRY_PREFIX_DESCRIPTION' | translate }}
+            </p>
+        </div>
+        <div class="setting-item__control setting-item__toggle">
+            <mat-checkbox formControlName="stripCountryPrefix"></mat-checkbox>
+        </div>
+    </div>
 </section>
diff --git a/apps/web/src/app/settings/settings-options.ts b/apps/web/src/app/settings/settings-options.ts
index 5add3d301..8df774bc1 100644
--- a/apps/web/src/app/settings/settings-options.ts
+++ b/apps/web/src/app/settings/settings-options.ts
@@ -100,6 +100,33 @@ export const SETTINGS_EMBEDDED_PLAYER_OPTIONS: SettingsPlayerOption[] = [
     },
 ];
 
+export interface SettingsPlayerAvailability {
+    supportsEmbeddedMpv: boolean;
+    supportsManagedExternalPlayers: boolean;
+}
+
+/**
+ * Built-in web players are always offered; the OS-backed ones only show up
+ * when the current runtime can actually launch them.
+ */
+export function buildSettingsPlayerOptions({
+    supportsEmbeddedMpv,
+    supportsManagedExternalPlayers,
+}: SettingsPlayerAvailability): SettingsPlayerOption[] {
+    return [
+        ...SETTINGS_EMBEDDED_PLAYER_OPTIONS,
+        ...(supportsEmbeddedMpv
+            ? [
+                  {
+                      id: VideoPlayer.EmbeddedMpv,
+                      labelKey: 'SETTINGS.PLAYER_EMBEDDED_MPV',
+                  },
+              ]
+            : []),
+        ...(supportsManagedExternalPlayers ? SETTINGS_OS_PLAYER_OPTIONS : []),
+    ];
+}
+
 export interface SettingsSectionVisibility {
     supportsEpg: boolean;
     supportsRemoteControl: boolean;
diff --git a/apps/web/src/app/settings/settings-playback-section.component.html b/apps/web/src/app/settings/settings-playback-section.component.html
index 8b3e15080..72f64e43f 100644
--- a/apps/web/src/app/settings/settings-playback-section.component.html
+++ b/apps/web/src/app/settings/settings-playback-section.component.html
@@ -69,6 +69,70 @@
         </div>
     </div>
 
+    @if (isWebPlayerSelected()) {
+        <div
+            class="setting-item"
+            data-test-id="web-player-shared-controls-setting"
+        >
+            <div class="setting-item__meta">
+                <h4>
+                    {{ 'SETTINGS.WEB_PLAYER_SHARED_CONTROLS' | translate }}
+                </h4>
+                <p>
+                    {{
+                        'SETTINGS.WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION'
+                            | translate
+                    }}
+                </p>
+            </div>
+            <div class="setting-item__control setting-item__toggle">
+                <mat-checkbox
+                    [aria-label]="
+                        'SETTINGS.WEB_PLAYER_SHARED_CONTROLS' | translate
+                    "
+                    formControlName="webPlayerSharedControls"
+                    data-test-id="web-player-shared-controls-toggle"
+                ></mat-checkbox>
+            </div>
+        </div>
+
+        <div class="setting-item" data-test-id="player-ambient-mode-setting">
+            <div class="setting-item__meta">
+                <h4>
+                    {{ 'SETTINGS.PLAYER_AMBIENT_MODE' | translate }}
+                </h4>
+                <p>
+                    {{ 'SETTINGS.PLAYER_AMBIENT_MODE_DESCRIPTION' | translate }}
+                </p>
+            </div>
+            <div class="setting-item__control setting-item__toggle">
+                <mat-checkbox
+                    [aria-label]="'SETTINGS.PLAYER_AMBIENT_MODE' | translate"
+                    formControlName="playerAmbientMode"
+                    data-test-id="player-ambient-mode-toggle"
+                ></mat-checkbox>
+            </div>
+        </div>
+
+        <div class="setting-item" data-test-id="player-up-next-rail-setting">
+            <div class="setting-item__meta">
+                <h4>
+                    {{ 'SETTINGS.PLAYER_UP_NEXT_RAIL' | translate }}
+                </h4>
+                <p>
+                    {{ 'SETTINGS.PLAYER_UP_NEXT_RAIL_DESCRIPTION' | translate }}
+                </p>
+            </div>
+            <div class="setting-item__control setting-item__toggle">
+                <mat-checkbox
+                    [aria-label]="'SETTINGS.PLAYER_UP_NEXT_RAIL' | translate"
+                    formControlName="playerUpNextRail"
+                    data-test-id="player-up-next-rail-toggle"
+                ></mat-checkbox>
+            </div>
+        </div>
+    }
+
     @if (supportsManagedExternalPlayers() && isExternalPlayerSelected()) {
         <div
             class="setting-item"
@@ -114,6 +178,42 @@
             </div>
         </div>
 
+        @if (frameCopyAvailable() || form().value.embeddedMpvFrameCopy) {
+            <div
+                class="setting-item"
+                data-test-id="embedded-mpv-frame-copy-setting"
+            >
+                <div class="setting-item__meta">
+                    <h4>
+                        {{ 'SETTINGS.EMBEDDED_MPV_FRAME_COPY' | translate }}
+                    </h4>
+                    <p>
+                        {{
+                            'SETTINGS.EMBEDDED_MPV_FRAME_COPY_DESCRIPTION'
+                                | translate
+                        }}
+                        @if (
+                            form().value.embeddedMpvFrameCopy !==
+                            frameCopyActive()
+                        ) {
+                            <strong>
+                                {{
+                                    'SETTINGS.EMBEDDED_MPV_FRAME_COPY_RESTART'
+                                        | translate
+                                }}
+                            </strong>
+                        }
+                    </p>
+                </div>
+                <div class="setting-item__control setting-item__toggle">
+                    <mat-checkbox
+                        formControlName="embeddedMpvFrameCopy"
+                        data-test-id="embedded-mpv-frame-copy-toggle"
+                    ></mat-checkbox>
+                </div>
+            </div>
+        }
+
         <div class="setting-item" data-test-id="recording-folder-setting">
             <div class="setting-item__meta">
                 <h4>{{ 'SETTINGS.RECORDING_FOLDER_LABEL' | translate }}</h4>
@@ -148,7 +248,9 @@
         </div>
     }
 
-    @if (supportsExternalPlayerPathSettings() && form().value.player === 'mpv') {
+    @if (
+        supportsExternalPlayerPathSettings() && form().value.player === 'mpv'
+    ) {
         <div class="setting-item">
             <div class="setting-item__meta">
                 <h4>{{ 'SETTINGS.MPV_PLAYER_PATH_LABEL' | translate }}</h4>
@@ -220,7 +322,9 @@
         </div>
     }
 
-    @if (supportsExternalPlayerPathSettings() && form().value.player === 'vlc') {
+    @if (
+        supportsExternalPlayerPathSettings() && form().value.player === 'vlc'
+    ) {
         <div class="setting-item">
             <div class="setting-item__meta">
                 <h4>{{ 'SETTINGS.VLC_PLAYER_PATH_LABEL' | translate }}</h4>
diff --git a/apps/web/src/app/settings/settings-playback-section.component.spec.ts b/apps/web/src/app/settings/settings-playback-section.component.spec.ts
index c5401509c..909d55fb4 100644
--- a/apps/web/src/app/settings/settings-playback-section.component.spec.ts
+++ b/apps/web/src/app/settings/settings-playback-section.component.spec.ts
@@ -14,10 +14,15 @@ const VLC_PATH_DESCRIPTION =
 const MPV_ARGUMENTS_PLACEHOLDER =
     '--ontop\n--autofit=640x360\n--geometry=+80+80';
 const VLC_ARGUMENTS_PLACEHOLDER = '--video-on-top\n--width=640\n--height=360';
+const WEB_PLAYER_SHARED_CONTROLS_LABEL =
+    'Unified controls for web players (experimental)';
 
 describe('SettingsPlaybackSectionComponent', () => {
     let fixture: ComponentFixture<SettingsPlaybackSectionComponent>;
 
+    const queryByTestId = (testId: string): Element | null =>
+        fixture.nativeElement.querySelector(`[data-test-id="${testId}"]`);
+
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             imports: [
@@ -36,6 +41,8 @@ describe('SettingsPlaybackSectionComponent', () => {
                     MPV_PLAYER_PATH_DESCRIPTION: MPV_PATH_DESCRIPTION,
                     MPV_COMPATIBLE_PLAYER_TIP: MPV_COMPATIBLE_PLAYER_TIP,
                     VLC_PLAYER_PATH_DESCRIPTION: VLC_PATH_DESCRIPTION,
+                    WEB_PLAYER_SHARED_CONTROLS:
+                        WEB_PLAYER_SHARED_CONTROLS_LABEL,
                 },
             },
             true
@@ -65,9 +72,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         fixture.detectChanges();
 
         expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="external-player-double-click-setting"]'
-            )
+            queryByTestId('external-player-double-click-setting')
         ).toBeNull();
         expect(fixture.nativeElement.textContent).not.toContain(
             'SETTINGS.OPEN_STREAM_ON_DOUBLE_CLICK'
@@ -80,9 +85,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         fixture.detectChanges();
 
         expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="external-player-double-click-setting"]'
-            )
+            queryByTestId('external-player-double-click-setting')
         ).toBeNull();
     });
 
@@ -98,9 +101,7 @@ describe('SettingsPlaybackSectionComponent', () => {
             fixture.detectChanges();
 
             expect(
-                fixture.nativeElement.querySelector(
-                    '[data-test-id="external-player-double-click-setting"]'
-                )
+                queryByTestId('external-player-double-click-setting')
             ).not.toBeNull();
             expect(fixture.nativeElement.textContent).toContain(
                 'SETTINGS.OPEN_EXTERNAL_PLAYER_ON_DOUBLE_CLICK'
@@ -116,18 +117,14 @@ describe('SettingsPlaybackSectionComponent', () => {
         fixture.detectChanges();
 
         expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="external-player-double-click-setting"]'
-            )
+            queryByTestId('external-player-double-click-setting')
         ).toBeNull();
 
         form.controls['player'].setValue(VideoPlayer.MPV);
         fixture.detectChanges();
 
         expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="external-player-double-click-setting"]'
-            )
+            queryByTestId('external-player-double-click-setting')
         ).not.toBeNull();
     });
 
@@ -146,6 +143,56 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(option?.textContent).toContain('auto');
     });
 
+    it.each([
+        VideoPlayer.VideoJs,
+        VideoPlayer.Html5Player,
+        VideoPlayer.ArtPlayer,
+    ])('shows shared web controls for %s', (player) => {
+        fixture.componentRef.setInput('form', createForm(player));
+        fixture.detectChanges();
+
+        expect(
+            queryByTestId('web-player-shared-controls-setting')
+        ).not.toBeNull();
+    });
+
+    it.each([VideoPlayer.EmbeddedMpv, VideoPlayer.MPV, VideoPlayer.VLC])(
+        'hides shared web controls for %s',
+        (player) => {
+            fixture.componentRef.setInput('form', createForm(player));
+            fixture.detectChanges();
+
+            expect(
+                queryByTestId('web-player-shared-controls-setting')
+            ).toBeNull();
+        }
+    );
+
+    it('binds the shared web controls checkbox to the settings form', () => {
+        const form = createForm();
+        form.controls['webPlayerSharedControls'].setValue(true);
+        fixture.componentRef.setInput('form', form);
+        fixture.detectChanges();
+
+        const checkbox = fixture.nativeElement.querySelector<HTMLInputElement>(
+            '[data-test-id="web-player-shared-controls-toggle"] input[type="checkbox"]'
+        );
+
+        expect(checkbox?.checked).toBe(true);
+    });
+
+    it('labels the rendered native shared web controls checkbox', () => {
+        fixture.detectChanges();
+
+        const checkbox = fixture.nativeElement.querySelector<HTMLInputElement>(
+            '[data-test-id="web-player-shared-controls-toggle"] input[type="checkbox"]'
+        );
+
+        expect(checkbox?.getAttribute('aria-label')).toBe(
+            WEB_PLAYER_SHARED_CONTROLS_LABEL
+        );
+    });
+
     it('keeps the double-click option visible when path settings are unavailable', () => {
         fixture.componentRef.setInput('form', createForm(VideoPlayer.MPV));
         fixture.componentRef.setInput('isDesktop', true);
@@ -157,38 +204,46 @@ describe('SettingsPlaybackSectionComponent', () => {
         fixture.detectChanges();
 
         expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="external-player-double-click-setting"]'
-            )
+            queryByTestId('external-player-double-click-setting')
         ).not.toBeNull();
         expect(fixture.nativeElement.textContent).not.toContain(
             MPV_PATH_DESCRIPTION
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).toBeNull();
     });
 
+    it.each<[string, boolean, boolean, boolean, boolean]>([
+        ['shows the available desktop engine', true, true, false, true],
+        ['keeps a stale desktop opt-in clearable', true, false, true, true],
+        ['hides a stale opt-in in the PWA', false, false, true, false],
+    ])(
+        '%s',
+        (_description, isDesktop, frameCopyAvailable, stored, expected) => {
+            const form = createForm();
+            form.controls['embeddedMpvFrameCopy'].setValue(stored);
+            fixture.componentRef.setInput('form', form);
+            fixture.componentRef.setInput('isDesktop', isDesktop);
+            fixture.componentRef.setInput(
+                'frameCopyAvailable',
+                frameCopyAvailable
+            );
+            fixture.detectChanges();
+
+            const setting = queryByTestId('embedded-mpv-frame-copy-setting');
+            expect(Boolean(setting)).toBe(expected);
+        }
+    );
+
     it('shows the recording folder setting only in desktop builds', () => {
         fixture.componentRef.setInput('isDesktop', true);
         fixture.detectChanges();
 
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="recording-folder-setting"]'
-            )
-        ).not.toBeNull();
+        expect(queryByTestId('recording-folder-setting')).not.toBeNull();
 
         fixture.componentRef.setInput('isDesktop', false);
         fixture.detectChanges();
 
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="recording-folder-setting"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('recording-folder-setting')).toBeNull();
     });
 
     it('shows MPV bundle guidance and the IINA executable tip for desktop MPV playback', () => {
@@ -203,11 +258,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(fixture.nativeElement.textContent).toContain(
             MPV_PATH_DESCRIPTION
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).not.toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).not.toBeNull();
         expect(fixture.nativeElement.textContent).toContain(
             MPV_COMPATIBLE_PLAYER_TIP
         );
@@ -229,11 +280,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(fixture.nativeElement.textContent).not.toContain(
             MPV_COMPATIBLE_PLAYER_TIP
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).toBeNull();
     });
 
     it('shows VLC bundle guidance without the IINA tip for desktop VLC playback', () => {
@@ -248,11 +295,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(fixture.nativeElement.textContent).toContain(
             VLC_PATH_DESCRIPTION
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).toBeNull();
         expect(fixture.nativeElement.textContent).not.toContain(
             MPV_COMPATIBLE_PLAYER_TIP
         );
@@ -271,11 +314,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(fixture.nativeElement.textContent).not.toContain(
             VLC_PATH_DESCRIPTION
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).toBeNull();
     });
 
     it('does not show external-player path guidance for embedded players', () => {
@@ -292,11 +331,7 @@ describe('SettingsPlaybackSectionComponent', () => {
         expect(fixture.nativeElement.textContent).not.toContain(
             VLC_PATH_DESCRIPTION
         );
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-compatible-player-tip"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-compatible-player-tip')).toBeNull();
     });
 
     it('shows MPV command-line arguments only when MPV is selected', () => {
@@ -308,16 +343,8 @@ describe('SettingsPlaybackSectionComponent', () => {
         );
         fixture.detectChanges();
 
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-player-arguments-setting"]'
-            )
-        ).not.toBeNull();
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="vlc-player-arguments-setting"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('mpv-player-arguments-setting')).not.toBeNull();
+        expect(queryByTestId('vlc-player-arguments-setting')).toBeNull();
         expect(fixture.nativeElement.textContent).toContain(
             'SETTINGS.MPV_PLAYER_ARGUMENTS_LABEL'
         );
@@ -337,16 +364,8 @@ describe('SettingsPlaybackSectionComponent', () => {
         );
         fixture.detectChanges();
 
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="vlc-player-arguments-setting"]'
-            )
-        ).not.toBeNull();
-        expect(
-            fixture.nativeElement.querySelector(
-                '[data-test-id="mpv-player-arguments-setting"]'
-            )
-        ).toBeNull();
+        expect(queryByTestId('vlc-player-arguments-setting')).not.toBeNull();
+        expect(queryByTestId('mpv-player-arguments-setting')).toBeNull();
         expect(fixture.nativeElement.textContent).toContain(
             'SETTINGS.VLC_PLAYER_ARGUMENTS_LABEL'
         );
@@ -361,9 +380,13 @@ describe('SettingsPlaybackSectionComponent', () => {
 function createForm(player = VideoPlayer.VideoJs): FormGroup {
     return new FormGroup({
         player: new FormControl(player),
+        webPlayerSharedControls: new FormControl(false),
+        playerAmbientMode: new FormControl(false),
+        playerUpNextRail: new FormControl(true),
         streamFormat: new FormControl(StreamFormat.AutoStreamFormat),
         openStreamOnDoubleClick: new FormControl(false),
         showExternalPlaybackBar: new FormControl(true),
+        embeddedMpvFrameCopy: new FormControl(false),
         mpvPlayerPath: new FormControl(''),
         mpvPlayerArguments: new FormControl(''),
         mpvReuseInstance: new FormControl(false),
diff --git a/apps/web/src/app/settings/settings-playback-section.component.ts b/apps/web/src/app/settings/settings-playback-section.component.ts
index a0d6a6531..722faca52 100644
--- a/apps/web/src/app/settings/settings-playback-section.component.ts
+++ b/apps/web/src/app/settings/settings-playback-section.component.ts
@@ -45,10 +45,23 @@ export class SettingsPlaybackSectionComponent {
     readonly players = input.required<SettingsPlayerOption[]>();
     readonly streamFormatEnum = input.required<typeof StreamFormat>();
     readonly isDesktop = input(false);
+    /** Frame-copy embedded MPV engine is possible on this machine */
+    readonly frameCopyAvailable = input(false);
+    /** Frame-copy engine is what the current app run actually uses */
+    readonly frameCopyActive = input(false);
     readonly supportsManagedExternalPlayers = input(false);
     readonly supportsExternalPlayerPathSettings = input(false);
     readonly selectRecordingFolder = output<void>();
 
+    isWebPlayerSelected(): boolean {
+        const player = this.form().value.player;
+        return (
+            player === VideoPlayer.VideoJs ||
+            player === VideoPlayer.Html5Player ||
+            player === VideoPlayer.ArtPlayer
+        );
+    }
+
     isExternalPlayerSelected(): boolean {
         const player = this.form().value.player;
         return player === VideoPlayer.MPV || player === VideoPlayer.VLC;
diff --git a/apps/web/src/app/settings/settings-playlist-reset.facade.spec.ts b/apps/web/src/app/settings/settings-playlist-reset.facade.spec.ts
new file mode 100644
index 000000000..e9b3f8a5c
--- /dev/null
+++ b/apps/web/src/app/settings/settings-playlist-reset.facade.spec.ts
@@ -0,0 +1,244 @@
+import { TestBed } from '@angular/core/testing';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import {
+    PlaylistActions,
+    selectAllPlaylistsMeta,
+    selectIsEpgAvailable,
+} from '@iptvnator/m3u-state';
+import { DatabaseService, PlaylistsService } from '@iptvnator/services';
+import { PlaylistMeta } from '@iptvnator/shared/interfaces';
+import { Store } from '@ngrx/store';
+import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { MockProvider } from 'ng-mocks';
+import { of } from 'rxjs';
+import { SettingsPlaylistResetFacade } from './settings-playlist-reset.facade';
+import { SettingsSnackbarService } from './settings-snackbar.service';
+import {
+    createDialogRef,
+    createElectronStub,
+    createPlaylistMeta,
+    MatSnackBarStub,
+} from './test-stubs/settings-test-harness.stub';
+
+describe('SettingsPlaylistResetFacade', () => {
+    let facade: SettingsPlaylistResetFacade;
+    let matDialog: MatDialog;
+    let databaseService: DatabaseService;
+    let playlistsService: PlaylistsService;
+    let store: Store;
+    let mockStore: MockStore;
+    let snackBar: MatSnackBarStub;
+    let translate: TranslateService;
+    const originalElectron = window.electron;
+
+    /** The component normally supplies a paint frame; tests skip the wait */
+    const noWait = () => Promise.resolve();
+
+    function setPlaylists(playlists: PlaylistMeta[]): void {
+        mockStore.overrideSelector(selectAllPlaylistsMeta, playlists);
+        mockStore.refreshState();
+    }
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+
+        TestBed.configureTestingModule({
+            providers: [
+                SettingsPlaylistResetFacade,
+                SettingsSnackbarService,
+                MockProvider(MatDialog, { open: jest.fn() }),
+                { provide: MatSnackBar, useClass: MatSnackBarStub },
+                MockProvider(DatabaseService, {
+                    createOperationId: jest
+                        .fn()
+                        .mockReturnValue('delete-all-op'),
+                    deleteAllPlaylists: jest.fn().mockResolvedValue(true),
+                }),
+                MockProvider(PlaylistsService, {
+                    removeAll: jest.fn().mockReturnValue(of(undefined)),
+                }),
+                provideMockStore({
+                    selectors: [
+                        { selector: selectAllPlaylistsMeta, value: [] },
+                        { selector: selectIsEpgAvailable, value: false },
+                    ],
+                }),
+            ],
+            imports: [TranslateModule.forRoot()],
+        });
+
+        facade = TestBed.inject(SettingsPlaylistResetFacade);
+        matDialog = TestBed.inject(MatDialog);
+        databaseService = TestBed.inject(DatabaseService);
+        playlistsService = TestBed.inject(PlaylistsService);
+        store = TestBed.inject(Store);
+        mockStore = TestBed.inject(MockStore);
+        snackBar = TestBed.inject(MatSnackBar) as unknown as MatSnackBarStub;
+        translate = TestBed.inject(TranslateService);
+        jest.spyOn(translate, 'instant').mockImplementation(
+            (key: string, params?: Record<string, number>) =>
+                key === 'SETTINGS.REMOVE_ALL_PROGRESS'
+                    ? `${params?.current}/${params?.total}`
+                    : key
+        );
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    it('refuses the global wipe when there are no playlists', () => {
+        setPlaylists([]);
+
+        expect(facade.deleteSummary().total).toBe(0);
+        expect(facade.canRemoveAll()).toBe(false);
+
+        facade.confirmAndRemoveAll(noWait);
+
+        expect(matDialog.open).not.toHaveBeenCalled();
+    });
+
+    it('opens the dedicated delete-all dialog with the current playlist type summary', () => {
+        setPlaylists([
+            createPlaylistMeta({ _id: 'm3u-1' }),
+            createPlaylistMeta({
+                _id: 'xtream-1',
+                serverUrl: 'http://xtream.example',
+            }),
+            createPlaylistMeta({
+                _id: 'stalker-1',
+                macAddress: '00:11:22:33:44:55',
+            }),
+        ]);
+        const openSpy = jest
+            .spyOn(matDialog, 'open')
+            .mockReturnValue(createDialogRef(false));
+
+        facade.confirmAndRemoveAll(noWait);
+
+        expect(facade.deleteSummary()).toEqual({
+            total: 3,
+            m3u: 1,
+            xtream: 1,
+            stalker: 1,
+        });
+        expect(openSpy).toHaveBeenCalledWith(
+            expect.any(Function),
+            expect.objectContaining({
+                data: {
+                    summary: {
+                        total: 3,
+                        m3u: 1,
+                        xtream: 1,
+                        stalker: 1,
+                    },
+                },
+            })
+        );
+    });
+
+    it('tracks Electron delete-all progress and dispatches store cleanup after success', async () => {
+        setPlaylists([
+            createPlaylistMeta({ _id: 'm3u-1' }),
+            createPlaylistMeta({
+                _id: 'xtream-1',
+                serverUrl: 'http://xtream.example',
+            }),
+        ]);
+        const dispatchSpy = jest.spyOn(store, 'dispatch');
+        jest.spyOn(matDialog, 'open').mockReturnValue(createDialogRef(true));
+
+        let resolveDelete: (value: boolean) => void = () => undefined;
+        (databaseService.deleteAllPlaylists as jest.Mock).mockImplementation(
+            ({
+                onEvent,
+            }: {
+                onEvent?: (event: {
+                    operation: string;
+                    status: string;
+                    current?: number;
+                    total?: number;
+                }) => void;
+            }) => {
+                onEvent?.({
+                    operation: 'delete-all-playlists',
+                    status: 'progress',
+                    current: 3,
+                    total: 7,
+                });
+
+                return new Promise<boolean>((resolve) => {
+                    resolveDelete = resolve;
+                });
+            }
+        );
+
+        facade.confirmAndRemoveAll(noWait);
+        await Promise.resolve();
+
+        expect(facade.isRemovingAllPlaylists()).toBe(true);
+        expect(facade.removeAllProgressLabel()).toBe('3/7');
+        expect(databaseService.deleteAllPlaylists).toHaveBeenCalledWith(
+            expect.objectContaining({
+                operationId: 'delete-all-op',
+                onEvent: expect.any(Function),
+            })
+        );
+
+        resolveDelete(true);
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+        expect(facade.isRemovingAllPlaylists()).toBe(false);
+        expect(facade.removeAllProgress()).toBeNull();
+        expect(dispatchSpy).toHaveBeenCalledWith(
+            PlaylistActions.removeAllPlaylists()
+        );
+        expect(snackBar.open).toHaveBeenCalledWith(
+            'SETTINGS.PLAYLISTS_REMOVED',
+            undefined,
+            {
+                duration: 2000,
+                horizontalPosition: 'center',
+                panelClass: ['settings-snackbar'],
+                verticalPosition: 'bottom',
+            }
+        );
+    });
+
+    it('falls back to PlaylistsService.removeAll outside Electron', async () => {
+        window.electron = undefined as unknown as typeof window.electron;
+        setPlaylists([createPlaylistMeta({ _id: 'browser-m3u' })]);
+        const dispatchSpy = jest.spyOn(store, 'dispatch');
+        jest.spyOn(matDialog, 'open').mockReturnValue(createDialogRef(true));
+
+        facade.confirmAndRemoveAll(noWait);
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+        expect(playlistsService.removeAll).toHaveBeenCalled();
+        expect(databaseService.deleteAllPlaylists).not.toHaveBeenCalled();
+        expect(dispatchSpy).toHaveBeenCalledWith(
+            PlaylistActions.removeAllPlaylists()
+        );
+    });
+
+    it('surfaces a failure snackbar when the wipe reports no success', async () => {
+        setPlaylists([createPlaylistMeta({ _id: 'm3u-1' })]);
+        (databaseService.deleteAllPlaylists as jest.Mock).mockResolvedValue(
+            false
+        );
+        jest.spyOn(matDialog, 'open').mockReturnValue(createDialogRef(true));
+        jest.spyOn(console, 'error').mockImplementation();
+
+        facade.confirmAndRemoveAll(noWait);
+        await new Promise<void>((resolve) => setTimeout(resolve, 0));
+
+        expect(facade.isRemovingAllPlaylists()).toBe(false);
+        expect(snackBar.open).toHaveBeenCalledWith(
+            'SETTINGS.PLAYLISTS_REMOVE_FAILED',
+            undefined,
+            expect.objectContaining({ panelClass: ['settings-snackbar'] })
+        );
+    });
+});
diff --git a/apps/web/src/app/settings/settings-playlist-reset.facade.ts b/apps/web/src/app/settings/settings-playlist-reset.facade.ts
index 2a427760a..8ec1a1fa8 100644
--- a/apps/web/src/app/settings/settings-playlist-reset.facade.ts
+++ b/apps/web/src/app/settings/settings-playlist-reset.facade.ts
@@ -1,19 +1,30 @@
-import { inject, Injectable, signal } from '@angular/core';
+import { computed, inject, Injectable, signal } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { firstValueFrom } from 'rxjs';
-import { PlaylistActions } from '@iptvnator/m3u-state';
+import { firstValueFrom, take } from 'rxjs';
+import { PlaylistActions, selectAllPlaylistsMeta } from '@iptvnator/m3u-state';
 import {
     DatabaseService,
     DbOperationEvent,
     PlaylistsService,
     RuntimeCapabilitiesService,
 } from '@iptvnator/services';
+import {
+    SettingsDeleteAllPlaylistsDialogComponent,
+    SettingsDeleteAllPlaylistsDialogData,
+} from './settings-delete-all-playlists-dialog.component';
+import {
+    buildRemoveAllProgressLabel,
+    buildSettingsPlaylistDeleteSummary,
+} from './settings-playlist-summary.utils';
+import { SettingsPlaylistDeleteSummary } from './settings.models';
 import { SettingsSnackbarService } from './settings-snackbar.service';
 
 @Injectable()
 export class SettingsPlaylistResetFacade {
     private readonly databaseService = inject(DatabaseService);
+    private readonly matDialog = inject(MatDialog);
     private readonly playlistsService = inject(PlaylistsService);
     private readonly runtime = inject(RuntimeCapabilitiesService);
     private readonly settingsSnackbar = inject(SettingsSnackbarService);
@@ -23,7 +34,59 @@ export class SettingsPlaylistResetFacade {
     readonly isRemovingAllPlaylists = signal(false);
     readonly removeAllProgress = signal<DbOperationEvent | null>(null);
 
-    async removeAllConfirmed(
+    private readonly playlists = this.store.selectSignal(
+        selectAllPlaylistsMeta
+    );
+
+    readonly deleteSummary = computed<SettingsPlaylistDeleteSummary>(() =>
+        buildSettingsPlaylistDeleteSummary(this.playlists())
+    );
+
+    readonly canRemoveAll = computed(
+        () => !this.isRemovingAllPlaylists() && this.deleteSummary().total > 0
+    );
+
+    readonly removeAllProgressLabel = computed(() =>
+        buildRemoveAllProgressLabel({
+            isRemovingAllPlaylists: this.isRemovingAllPlaylists(),
+            progress: this.removeAllProgress(),
+            translate: (key, params) => this.translate.instant(key, params),
+        })
+    );
+
+    /**
+     * Asks for confirmation in a dedicated dialog before wiping every
+     * playlist, so the summary of what is about to be lost is visible.
+     */
+    confirmAndRemoveAll(waitForUiFeedbackFrame: () => Promise<void>): void {
+        if (!this.canRemoveAll()) {
+            return;
+        }
+
+        this.matDialog
+            .open<
+                SettingsDeleteAllPlaylistsDialogComponent,
+                SettingsDeleteAllPlaylistsDialogData,
+                boolean
+            >(SettingsDeleteAllPlaylistsDialogComponent, {
+                autoFocus: false,
+                data: {
+                    summary: this.deleteSummary(),
+                },
+                maxWidth: 'calc(100vw - 32px)',
+                restoreFocus: true,
+                width: '460px',
+            })
+            .afterClosed()
+            .pipe(take(1))
+            .subscribe((confirmed) => {
+                if (confirmed) {
+                    void this.removeAllConfirmed(waitForUiFeedbackFrame);
+                }
+            });
+    }
+
+    private async removeAllConfirmed(
         waitForUiFeedbackFrame: () => Promise<void>
     ): Promise<void> {
         if (this.isRemovingAllPlaylists()) {
diff --git a/apps/web/src/app/settings/settings-remote-control.facade.ts b/apps/web/src/app/settings/settings-remote-control.facade.ts
new file mode 100644
index 000000000..6796510cd
--- /dev/null
+++ b/apps/web/src/app/settings/settings-remote-control.facade.ts
@@ -0,0 +1,37 @@
+import { inject, Injectable, signal } from '@angular/core';
+import { RuntimeCapabilitiesService } from '@iptvnator/services';
+
+/**
+ * Backs the remote-control section: the reachable LAN addresses and which of
+ * them currently shows its pairing QR code.
+ */
+@Injectable()
+export class SettingsRemoteControlFacade {
+    private readonly runtime = inject(RuntimeCapabilitiesService);
+
+    /** Local IP addresses for remote control URL display */
+    readonly localIpAddresses = signal<string[]>([]);
+
+    /** Currently visible QR code IP (null = none visible) */
+    readonly visibleQrCodeIp = signal<string | null>(null);
+
+    /**
+     * Fetches local IP addresses for remote control URL display
+     */
+    async fetchLocalIpAddresses(): Promise<void> {
+        if (
+            this.runtime.supportsRemoteControl &&
+            window.electron?.getLocalIpAddresses
+        ) {
+            const addresses = await window.electron.getLocalIpAddresses();
+            this.localIpAddresses.set(addresses);
+        }
+    }
+
+    /**
+     * Toggle QR code visibility for a given IP address
+     */
+    toggleQrCode(ip: string): void {
+        this.visibleQrCodeIp.update((visible) => (visible === ip ? null : ip));
+    }
+}
diff --git a/apps/web/src/app/settings/settings-section-scroll.directive.spec.ts b/apps/web/src/app/settings/settings-section-scroll.directive.spec.ts
new file mode 100644
index 000000000..f2c402094
--- /dev/null
+++ b/apps/web/src/app/settings/settings-section-scroll.directive.spec.ts
@@ -0,0 +1,107 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
+import { SettingsContextService } from '@iptvnator/workspace/shell/util';
+import { SettingsComponent } from './settings.component';
+import { SettingsSectionScrollDirective } from './settings-section-scroll.directive';
+import {
+    configureSettingsComponentTestBed,
+    createElectronStub,
+    createEpgBridgeStub,
+    stubSettingsSideEffects,
+} from './test-stubs/settings-test-harness.stub';
+
+interface SettingsSectionScrollDirectiveTestApi {
+    getScrollRoot(): HTMLElement | null;
+}
+
+/**
+ * The directive only makes sense against a real settings page, so this is an
+ * integration spec: it renders the component and drives the section
+ * navigation the workspace shell would trigger.
+ */
+describe('SettingsSectionScrollDirective', () => {
+    let fixture: ComponentFixture<SettingsComponent>;
+    let epgBridge: Partial<EpgRuntimeBridgeService>;
+    const originalElectron = window.electron;
+
+    beforeEach(waitForAsync(() => {
+        epgBridge = createEpgBridgeStub();
+        configureSettingsComponentTestBed(epgBridge);
+    }));
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    it('should scroll the selected navigation target within the workspace viewport', async () => {
+        jest.useFakeTimers();
+
+        try {
+            fixture = TestBed.createComponent(SettingsComponent);
+            const component = fixture.componentInstance;
+            const settingsContext = TestBed.inject(SettingsContextService);
+            const originalGetElementById =
+                document.getElementById.bind(document);
+            const scrollTo = jest.fn();
+            const scrollRoot = {
+                scrollTop: 96,
+                clientHeight: 885,
+                scrollHeight: 2469,
+                getBoundingClientRect: () =>
+                    ({
+                        top: 56,
+                    }) as DOMRect,
+                scrollTo,
+            } as unknown as HTMLElement;
+
+            stubSettingsSideEffects(component);
+            fixture.detectChanges();
+            const scrollDirective = fixture.debugElement
+                .query(By.directive(SettingsSectionScrollDirective))
+                .injector.get(SettingsSectionScrollDirective);
+            jest.spyOn(
+                scrollDirective as unknown as SettingsSectionScrollDirectiveTestApi,
+                'getScrollRoot'
+            ).mockReturnValue(scrollRoot);
+
+            const getElementByIdSpy = jest
+                .spyOn(document, 'getElementById')
+                .mockImplementation((id: string) => {
+                    if (id === 'about') {
+                        return {
+                            getBoundingClientRect: () =>
+                                ({
+                                    top: 2050,
+                                    height: 159,
+                                }) as DOMRect,
+                        } as HTMLElement;
+                    }
+
+                    return originalGetElementById(id);
+                });
+
+            await fixture.whenStable();
+            fixture.detectChanges();
+            settingsContext.navigateToSection('about');
+            fixture.detectChanges();
+
+            expect(getElementByIdSpy).toHaveBeenCalledWith('about');
+            expect(scrollTo).toHaveBeenCalledWith({
+                behavior: 'smooth',
+                top: 1488,
+            });
+            expect(settingsContext.pendingScrollTarget()).toBe('about');
+
+            jest.advanceTimersByTime(600);
+
+            expect(settingsContext.pendingScrollTarget()).toBeNull();
+        } finally {
+            jest.useRealTimers();
+        }
+    });
+});
diff --git a/apps/web/src/app/settings/settings-tmdb-section.component.html b/apps/web/src/app/settings/settings-tmdb-section.component.html
index 09e3a73e6..99e5fa6d5 100644
--- a/apps/web/src/app/settings/settings-tmdb-section.component.html
+++ b/apps/web/src/app/settings/settings-tmdb-section.component.html
@@ -99,6 +99,47 @@
             </div>
         }
 
+        <div class="setting-item">
+            <div class="setting-item__meta">
+                <h4>{{ 'SETTINGS.TMDB_CACHE' | translate }}</h4>
+                <p>
+                    {{ 'SETTINGS.TMDB_CACHE_DESCRIPTION' | translate }}
+                </p>
+                <p class="tmdb-cache__size" data-test-id="tmdb-cache-size">
+                    @if (cacheError()) {
+                        <span class="tmdb-cache__error">
+                            {{ 'SETTINGS.TMDB_CACHE_ERROR' | translate }}
+                        </span>
+                    } @else if (cacheStats(); as stats) {
+                        {{
+                            'SETTINGS.TMDB_CACHE_SIZE'
+                                | translate
+                                    : {
+                                          entries: stats.entries,
+                                          size: formatBytes(stats.bytes),
+                                      }
+                        }}
+                    }
+                </p>
+            </div>
+            <div class="setting-item__control">
+                <button
+                    mat-stroked-button
+                    type="button"
+                    [disabled]="isClearing() || cacheStats()?.entries === 0"
+                    (click)="clearCache()"
+                    data-test-id="tmdb-clear-cache"
+                >
+                    @if (isClearing()) {
+                        <mat-spinner diameter="16" />
+                    } @else {
+                        <mat-icon>delete_sweep</mat-icon>
+                    }
+                    {{ 'SETTINGS.TMDB_CACHE_CLEAR' | translate }}
+                </button>
+            </div>
+        </div>
+
         <div class="setting-item setting-item--full-control">
             <div class="setting-item__meta">
                 <img
diff --git a/apps/web/src/app/settings/settings-tmdb-section.component.spec.ts b/apps/web/src/app/settings/settings-tmdb-section.component.spec.ts
new file mode 100644
index 000000000..9e09c60f3
--- /dev/null
+++ b/apps/web/src/app/settings/settings-tmdb-section.component.spec.ts
@@ -0,0 +1,143 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TmdbApiService, TmdbCacheService } from '@iptvnator/services';
+import { SettingsTmdbSectionComponent } from './settings-tmdb-section.component';
+
+const CACHE_SIZE_LABEL = '{{entries}} entries · {{size}}';
+const CACHE_ERROR_LABEL = 'Could not read the cache';
+
+describe('SettingsTmdbSectionComponent', () => {
+    let fixture: ComponentFixture<SettingsTmdbSectionComponent>;
+    let getStats: jest.Mock;
+    let clear: jest.Mock;
+
+    const createForm = () =>
+        new FormGroup({
+            tmdb: new FormGroup({
+                enabled: new FormControl(true),
+                apiKey: new FormControl(''),
+            }),
+        });
+
+    const queryByTestId = (testId: string): HTMLElement | null =>
+        fixture.nativeElement.querySelector(`[data-test-id="${testId}"]`);
+
+    const clearButton = () =>
+        queryByTestId('tmdb-clear-cache') as HTMLButtonElement;
+
+    /** The stats effect only fires once the TMDB section is the active one */
+    const activate = async (section = 'tmdb') => {
+        fixture.componentRef.setInput('activeSection', section);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+    };
+
+    beforeEach(async () => {
+        getStats = jest.fn().mockResolvedValue({ entries: 42, bytes: 2048 });
+        clear = jest.fn().mockResolvedValue(42);
+
+        await TestBed.configureTestingModule({
+            imports: [
+                SettingsTmdbSectionComponent,
+                NoopAnimationsModule,
+                ReactiveFormsModule,
+                TranslateModule.forRoot(),
+            ],
+            providers: [
+                {
+                    provide: TmdbCacheService,
+                    useValue: { getStats, clear },
+                },
+                {
+                    provide: TmdbApiService,
+                    useValue: { validateApiKey: jest.fn() },
+                },
+            ],
+        }).compileComponents();
+
+        const translate = TestBed.inject(TranslateService);
+        translate.setTranslation(
+            'en',
+            {
+                SETTINGS: {
+                    TMDB_CACHE_SIZE: CACHE_SIZE_LABEL,
+                    TMDB_CACHE_ERROR: CACHE_ERROR_LABEL,
+                },
+            },
+            true
+        );
+        translate.use('en');
+
+        fixture = TestBed.createComponent(SettingsTmdbSectionComponent);
+        fixture.componentRef.setInput('form', createForm());
+        fixture.componentRef.setInput('activeSection', 'general');
+        fixture.detectChanges();
+    });
+
+    it('defers the full-table scan until the section is opened', async () => {
+        expect(getStats).not.toHaveBeenCalled();
+
+        await activate();
+
+        expect(getStats).toHaveBeenCalledTimes(1);
+        expect(queryByTestId('tmdb-cache-size')?.textContent).toContain('42');
+    });
+
+    it('clears the cache and re-reads the size', async () => {
+        await activate();
+        getStats.mockResolvedValue({ entries: 0, bytes: 0 });
+
+        clearButton().click();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(clear).toHaveBeenCalledTimes(1);
+        expect(getStats).toHaveBeenCalledTimes(2);
+        // Nothing left to clear — the button stops offering it
+        expect(clearButton().disabled).toBe(true);
+    });
+
+    it('surfaces a failed clear instead of claiming an empty cache', async () => {
+        await activate();
+        clear.mockResolvedValue(null);
+
+        clearButton().click();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(queryByTestId('tmdb-cache-size')?.textContent).toContain(
+            CACHE_ERROR_LABEL
+        );
+        // Still actionable: the rows are there, the user can retry
+        expect(clearButton().disabled).toBe(false);
+    });
+
+    it('surfaces a failed size read the same way', async () => {
+        getStats.mockResolvedValue(null);
+
+        await activate();
+
+        expect(queryByTestId('tmdb-cache-size')?.textContent).toContain(
+            CACHE_ERROR_LABEL
+        );
+    });
+
+    it('retries the size read next time the section is opened', async () => {
+        getStats.mockResolvedValueOnce(null);
+        await activate();
+        expect(queryByTestId('tmdb-cache-size')?.textContent).toContain(
+            CACHE_ERROR_LABEL
+        );
+
+        await activate('general');
+        await activate();
+
+        // Otherwise a single transient failure sticks for the life of the
+        // page, and only the destructive Clear button can shift it
+        expect(getStats).toHaveBeenCalledTimes(2);
+        expect(queryByTestId('tmdb-cache-size')?.textContent).toContain('42');
+    });
+});
diff --git a/apps/web/src/app/settings/settings-tmdb-section.component.ts b/apps/web/src/app/settings/settings-tmdb-section.component.ts
index 593364775..e7a6f7e3c 100644
--- a/apps/web/src/app/settings/settings-tmdb-section.component.ts
+++ b/apps/web/src/app/settings/settings-tmdb-section.component.ts
@@ -1,4 +1,12 @@
-import { Component, inject, input, signal, ViewEncapsulation } from '@angular/core';
+import {
+    Component,
+    effect,
+    inject,
+    input,
+    signal,
+    untracked,
+    ViewEncapsulation,
+} from '@angular/core';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -7,7 +15,8 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { TranslateModule } from '@ngx-translate/core';
-import { TmdbApiService } from '@iptvnator/services';
+import { TmdbApiService, TmdbCacheService } from '@iptvnator/services';
+import type { TmdbCacheStats } from '@iptvnator/shared/interfaces';
 
 type TmdbKeyTestState = 'idle' | 'testing' | 'success' | 'error';
 
@@ -59,16 +68,46 @@ type TmdbKeyTestState = 'idle' | 'testing' | 'success' | 'error';
             .tmdb-key-test__result--error {
                 color: #f44336;
             }
+
+            .tmdb-cache__size {
+                font-variant-numeric: tabular-nums;
+            }
+
+            .tmdb-cache__error {
+                color: #f44336;
+            }
         `,
     ],
 })
 export class SettingsTmdbSectionComponent {
     private readonly tmdbApi = inject(TmdbApiService);
+    private readonly tmdbCache = inject(TmdbCacheService);
 
     readonly form = input.required<FormGroup>();
     readonly activeSection = input.required<string>();
 
     readonly keyTestState = signal<TmdbKeyTestState>('idle');
+    readonly cacheStats = signal<TmdbCacheStats | null>(null);
+    readonly cacheError = signal(false);
+    readonly isClearing = signal(false);
+
+    constructor() {
+        // Sizing the cache is a full table scan, so it waits until the
+        // user is actually looking at this section.
+        effect(() => {
+            if (this.activeSection() !== 'tmdb') {
+                return;
+            }
+            untracked(() => {
+                // A failed read leaves both signals in their "unknown"
+                // state, so reopening the section retries rather than
+                // showing the error until the page is rebuilt.
+                if (this.cacheStats() === null) {
+                    void this.refreshCacheStats();
+                }
+            });
+        });
+    }
 
     get enteredApiKey(): string {
         return (this.form().value.tmdb?.apiKey ?? '').trim();
@@ -84,4 +123,45 @@ export class SettingsTmdbSectionComponent {
         const isValid = await this.tmdbApi.validateApiKey(apiKey);
         this.keyTestState.set(isValid ? 'success' : 'error');
     }
+
+    async clearCache(): Promise<void> {
+        if (this.isClearing()) {
+            return;
+        }
+        this.isClearing.set(true);
+        try {
+            const deleted = await this.tmdbCache.clear();
+            if (deleted === null) {
+                // Do not claim an empty cache we failed to empty
+                this.cacheError.set(true);
+                this.cacheStats.set(null);
+                return;
+            }
+            await this.refreshCacheStats();
+        } finally {
+            this.isClearing.set(false);
+        }
+    }
+
+    /** "12.4 MB" — cache payloads are JSON, so decimal units read right */
+    formatBytes(bytes: number): string {
+        if (bytes < 1024) {
+            return `${bytes} B`;
+        }
+        const units = ['KB', 'MB', 'GB'];
+        let value = bytes / 1024;
+        let unit = 0;
+        while (value >= 1024 && unit < units.length - 1) {
+            value /= 1024;
+            unit++;
+        }
+        return `${value.toFixed(value < 10 ? 1 : 0)} ${units[unit]}`;
+    }
+
+    private async refreshCacheStats(): Promise<void> {
+        const stats = await this.tmdbCache.getStats();
+        this.cacheError.set(stats === null);
+        this.cacheStats.set(stats);
+    }
+
 }
diff --git a/apps/web/src/app/settings/settings.component.form.spec.ts b/apps/web/src/app/settings/settings.component.form.spec.ts
new file mode 100644
index 000000000..c11db5c82
--- /dev/null
+++ b/apps/web/src/app/settings/settings.component.form.spec.ts
@@ -0,0 +1,350 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
+import {
+    Language,
+    StartupBehavior,
+    Theme,
+    VideoPlayer,
+} from '@iptvnator/shared/interfaces';
+import { TranslateService } from '@ngx-translate/core';
+import { SettingsStore } from '../services/settings-store.service';
+import { SettingsComponent } from './settings.component';
+import {
+    configureSettingsComponentTestBed,
+    createElectronStub,
+    createEpgBridgeStub,
+    DEFAULT_DASHBOARD_RAILS,
+    DEFAULT_SETTINGS,
+    MatSnackBarStub,
+    MockSettingsStore,
+    stubSettingsSideEffects,
+} from './test-stubs/settings-test-harness.stub';
+
+/**
+ * Everything the rendered settings form does: hydration from the store, the
+ * section outputs that write straight through, and the submit path.
+ */
+describe('SettingsComponent form', () => {
+    let component: SettingsComponent;
+    let fixture: ComponentFixture<SettingsComponent>;
+    let settingsStore: MockSettingsStore;
+    let translate: TranslateService;
+    let snackBar: MatSnackBarStub;
+    let epgBridge: Partial<EpgRuntimeBridgeService>;
+    const originalElectron = window.electron;
+
+    beforeEach(waitForAsync(() => {
+        epgBridge = createEpgBridgeStub();
+        configureSettingsComponentTestBed(epgBridge);
+    }));
+
+    beforeEach(() => {
+        window.electron = createElectronStub();
+
+        fixture = TestBed.createComponent(SettingsComponent);
+        settingsStore = TestBed.inject(
+            SettingsStore
+        ) as unknown as MockSettingsStore;
+        translate = TestBed.inject(TranslateService);
+        snackBar = TestBed.inject(MatSnackBar) as unknown as MatSnackBarStub;
+
+        component = fixture.componentInstance;
+        stubSettingsSideEffects(component);
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        window.electron = originalElectron;
+    });
+
+    describe('Get and set settings on component init', () => {
+        const settings = {
+            language: Language.GERMAN,
+            player: VideoPlayer.Html5Player,
+            theme: Theme.DarkTheme,
+        };
+
+        it('should init default settings if previous config was not saved', async () => {
+            await component.ngOnInit();
+
+            expect(component.settingsForm.value).toEqual(DEFAULT_SETTINGS);
+        });
+
+        it('should get and apply custom settings', () => {
+            settingsStore._setSettings({
+                ...DEFAULT_SETTINGS,
+                ...settings,
+            });
+
+            component.form.hydrateFromStore();
+
+            expect(component.settingsForm.value).toEqual({
+                ...DEFAULT_SETTINGS,
+                ...settings,
+            });
+        });
+
+        it('hydrates the shared web controls setting from the settings store', () => {
+            settingsStore._setSettings({
+                webPlayerSharedControls: true,
+            });
+
+            component.form.hydrateFromStore();
+
+            expect(
+                component.settingsForm.get('webPlayerSharedControls')?.value
+            ).toBe(true);
+        });
+    });
+
+    describe('Section outputs', () => {
+        it('updates the selected theme through the general section and marks the form dirty', () => {
+            const darkThemeButton = (
+                fixture.nativeElement as HTMLElement
+            ).querySelector('[data-test-id="DARK_THEME"]') as HTMLButtonElement;
+
+            darkThemeButton.click();
+            fixture.detectChanges();
+
+            expect(component.settingsForm.value.theme).toBe(Theme.DarkTheme);
+            expect(component.settingsForm.dirty).toBeTruthy();
+        });
+
+        it('updates cover size through the general section output', () => {
+            const largeCoverButton = (
+                fixture.nativeElement as HTMLElement
+            ).querySelector(
+                '[data-test-id="cover-size-large"]'
+            ) as HTMLButtonElement;
+
+            largeCoverButton.click();
+            fixture.detectChanges();
+
+            expect(component.settingsForm.value.coverSize).toBe('large');
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith({
+                coverSize: 'large',
+            });
+        });
+
+        it('updates the EPG view mode through the epg section output', () => {
+            const listButton = (
+                fixture.nativeElement as HTMLElement
+            ).querySelector(
+                '[data-test-id="epg-view-mode-list"]'
+            ) as HTMLButtonElement;
+
+            listButton.click();
+            fixture.detectChanges();
+
+            expect(component.settingsForm.value.epgViewMode).toBe('list');
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith({
+                epgViewMode: 'list',
+            });
+        });
+    });
+
+    describe('Dashboard controls', () => {
+        it('renders dashboard controls with the expected defaults', () => {
+            const nativeElement = fixture.nativeElement as HTMLElement;
+
+            expect(
+                nativeElement.querySelector(
+                    '[data-test-id="toggle-show-dashboard"]'
+                )
+            ).not.toBeNull();
+            expect(
+                nativeElement.querySelector(
+                    '[data-test-id="toggle-dashboard-hero"]'
+                )
+            ).not.toBeNull();
+            expect(
+                nativeElement.querySelector(
+                    '[data-test-id="toggle-dashboard-rail-live-favorites"]'
+                )
+            ).not.toBeNull();
+            expect(
+                nativeElement.querySelector(
+                    '[data-test-id="toggle-dashboard-rail-recently-watched-live"]'
+                )
+            ).not.toBeNull();
+            expect(
+                nativeElement.querySelector(
+                    '[data-test-id="toggle-dashboard-rail-favorite-movies-and-series"]'
+                )
+            ).not.toBeNull();
+            expect(component.settingsForm.value.showDashboard).toBe(true);
+            expect(component.settingsForm.value.dashboardRails).toEqual(
+                DEFAULT_DASHBOARD_RAILS
+            );
+            expect(component.settingsForm.value.startupBehavior).toBe(
+                StartupBehavior.FirstView
+            );
+        });
+
+        it('disables dashboard surface controls when the dashboard is off', async () => {
+            const showDashboard = component.settingsForm.get('showDashboard');
+            const dashboardRails = component.settingsForm.get('dashboardRails');
+
+            showDashboard?.setValue(false);
+            await fixture.whenStable();
+
+            expect(dashboardRails?.disabled).toBe(true);
+            expect(
+                component.settingsForm.get('dashboardRails.hero')?.disabled
+            ).toBe(true);
+            expect(
+                component.settingsForm.get('dashboardRails.continueWatching')
+                    ?.disabled
+            ).toBe(true);
+
+            showDashboard?.setValue(true);
+            await fixture.whenStable();
+
+            expect(dashboardRails?.enabled).toBe(true);
+            expect(
+                component.settingsForm.get('dashboardRails.hero')?.enabled
+            ).toBe(true);
+        });
+    });
+
+    describe('Saving', () => {
+        it('shows the save confirmation snackbar at the bottom center with the settings offset class', () => {
+            jest.spyOn(translate, 'instant').mockReturnValue('Settings saved');
+
+            component.applyChangedSettings();
+
+            expect(snackBar.open).toHaveBeenCalledWith(
+                'Settings saved',
+                undefined,
+                {
+                    duration: 2000,
+                    horizontalPosition: 'center',
+                    panelClass: ['settings-snackbar'],
+                    verticalPosition: 'bottom',
+                }
+            );
+        });
+
+        it('should save settings on submit', async () => {
+            settingsStore.updateSettings.mockResolvedValue(undefined);
+            const updateSettings = jest.spyOn(
+                window.electron,
+                'updateSettings'
+            );
+
+            component.onSubmit();
+            await fixture.whenStable();
+
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith({
+                ...component.settingsForm.value,
+                trustedPrivateNetworkEpgUrls: [],
+                trustedInsecureTlsHosts: [],
+            });
+            expect(updateSettings).toHaveBeenCalledWith({
+                ...component.settingsForm.value,
+                trustedPrivateNetworkEpgUrls: [],
+                trustedInsecureTlsHosts: [],
+            });
+        });
+
+        it('saves the shared web controls setting on submit', async () => {
+            settingsStore.updateSettings.mockResolvedValue(undefined);
+            component.settingsForm
+                .get('webPlayerSharedControls')
+                ?.setValue(true);
+
+            component.onSubmit();
+            await fixture.whenStable();
+
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    webPlayerSharedControls: true,
+                })
+            );
+        });
+
+        it('clears external player paths in Electron when saved as empty', async () => {
+            settingsStore.updateSettings.mockResolvedValue(undefined);
+            const setMpvPlayerPath = jest.spyOn(
+                window.electron,
+                'setMpvPlayerPath'
+            );
+            const setVlcPlayerPath = jest.spyOn(
+                window.electron,
+                'setVlcPlayerPath'
+            );
+
+            component.settingsForm.patchValue({
+                mpvPlayerPath: '',
+                vlcPlayerPath: '',
+            });
+
+            component.onSubmit();
+            await fixture.whenStable();
+
+            expect(setMpvPlayerPath).toHaveBeenCalledWith('');
+            expect(setVlcPlayerPath).toHaveBeenCalledWith('');
+        });
+
+        it('saves external player command-line arguments with the settings payload', async () => {
+            settingsStore.updateSettings.mockResolvedValue(undefined);
+            const updateSettings = jest.spyOn(
+                window.electron,
+                'updateSettings'
+            );
+
+            component.settingsForm.patchValue({
+                mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
+                vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
+            });
+
+            component.onSubmit();
+            await fixture.whenStable();
+
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
+                    vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
+                })
+            );
+            expect(updateSettings).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
+                    vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
+                })
+            );
+        });
+
+        it('preserves saved EPG settings when saving from the web settings form', async () => {
+            fixture.destroy();
+            window.electron = undefined as unknown as typeof window.electron;
+
+            settingsStore._setSettings({
+                epgUrl: ['https://example.com/guide.xml'],
+                preferUploadedEpgOverXtream: true,
+            });
+            settingsStore.updateSettings.mockResolvedValue(undefined);
+
+            const webFixture = TestBed.createComponent(SettingsComponent);
+            const webComponent = webFixture.componentInstance;
+            stubSettingsSideEffects(webComponent);
+            webFixture.detectChanges();
+            await webFixture.whenStable();
+
+            webComponent.settingsForm.patchValue({ theme: Theme.DarkTheme });
+            webComponent.onSubmit();
+            await webFixture.whenStable();
+
+            expect(settingsStore.updateSettings).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    epgUrl: ['https://example.com/guide.xml'],
+                    preferUploadedEpgOverXtream: true,
+                    theme: Theme.DarkTheme,
+                })
+            );
+
+            webFixture.destroy();
+        });
+    });
+});
diff --git a/apps/web/src/app/settings/settings.component.html b/apps/web/src/app/settings/settings.component.html
index 68aa05b07..0bdbf2bd0 100644
--- a/apps/web/src/app/settings/settings.component.html
+++ b/apps/web/src/app/settings/settings.component.html
@@ -38,8 +38,8 @@
                 [themeOptions]="themeOptions"
                 [coverSizeOptions]="coverSizeOptions"
                 [startupBehaviorOptions]="startupBehaviorOptions"
-                (selectTheme)="selectTheme($event)"
-                (selectCoverSize)="selectCoverSize($event)"
+                (selectTheme)="form.selectTheme($event)"
+                (selectCoverSize)="form.selectCoverSize($event)"
             />
 
             <app-settings-playback-section
@@ -50,6 +50,8 @@
                 [isDesktop]="isDesktop"
                 [supportsManagedExternalPlayers]="supportsManagedExternalPlayers"
                 [supportsExternalPlayerPathSettings]="supportsExternalPlayerPathSettings"
+                [frameCopyAvailable]="embeddedMpv.frameCopyAvailable()"
+                [frameCopyActive]="embeddedMpv.frameCopyActive()"
                 (selectRecordingFolder)="selectRecordingFolder()"
             />
 
@@ -57,15 +59,15 @@
                 <app-settings-epg-section
                     [form]="settingsForm"
                     [activeSection]="activeSection()"
-                    [epgUrl]="epgUrl"
-                    [isClearingEpgData]="isClearingEpgData()"
+                    [epgUrl]="form.epgUrl"
+                    [isClearingEpgData]="epg.isClearing()"
                     [epgViewModeOptions]="epgViewModeOptions"
-                    (refreshEpg)="refreshEpg($event)"
-                    (removeEpgSource)="removeEpgSource($event)"
-                    (addEpgSource)="addEpgSource()"
-                    (refreshAllEpg)="refreshAllEpg()"
-                    (clearEpgData)="clearEpgData()"
-                    (selectEpgViewMode)="selectEpgViewMode($event)"
+                    (refreshEpg)="epg.refresh($event)"
+                    (removeEpgSource)="form.removeEpgSource($event)"
+                    (addEpgSource)="form.addEpgSource()"
+                    (refreshAllEpg)="epg.refreshAll()"
+                    (clearEpgData)="epg.clear()"
+                    (selectEpgViewMode)="form.selectEpgViewMode($event)"
                 />
             }
 
@@ -78,9 +80,9 @@
                 <app-settings-remote-control-section
                     [form]="settingsForm"
                     [activeSection]="activeSection()"
-                    [localIpAddresses]="localIpAddresses()"
-                    [visibleQrCodeIp]="visibleQrCodeIp()"
-                    (toggleQrCode)="toggleQrCode($event)"
+                    [localIpAddresses]="remoteControl.localIpAddresses()"
+                    [visibleQrCodeIp]="remoteControl.visibleQrCodeIp()"
+                    (toggleQrCode)="remoteControl.toggleQrCode($event)"
                 />
             }
 
@@ -92,32 +94,33 @@
             <app-settings-backup-section
                 [activeSection]="activeSection()"
                 [isPwa]="isPwa"
-                [isRemovingAllPlaylists]="isRemovingAllPlaylists()"
-                [isExportingData]="isExportingData()"
+                [isRemovingAllPlaylists]="playlistReset.isRemovingAllPlaylists()"
+                [isExportingData]="backup.isExportingData()"
                 (importData)="importData()"
                 (exportData)="exportData()"
             />
 
             <app-settings-reset-section
                 [activeSection]="activeSection()"
-                [isRemovingAllPlaylists]="isRemovingAllPlaylists()"
-                [canRemoveAllPlaylists]="canRemoveAllPlaylists()"
-                [playlistDeleteSummary]="playlistDeleteSummary()"
-                [removeAllProgressLabel]="removeAllProgressLabel()"
+                [isRemovingAllPlaylists]="playlistReset.isRemovingAllPlaylists()"
+                [canRemoveAllPlaylists]="playlistReset.canRemoveAll()"
+                [playlistDeleteSummary]="playlistReset.deleteSummary()"
+                [removeAllProgressLabel]="playlistReset.removeAllProgressLabel()"
                 (removeAll)="removeAll()"
             />
 
             <app-settings-about-section
                 [activeSection]="activeSection()"
                 [isDesktop]="isDesktop"
-                [version]="version"
-                [updateMessage]="updateMessage"
-                [appUpdateStatus]="appUpdateStatus()"
-                (checkForAppUpdate)="checkForAppUpdate()"
-                (downloadAppUpdate)="downloadAppUpdate()"
-                (installAppUpdate)="installAppUpdate()"
-                (openManualAppUpdate)="openManualAppUpdate()"
-                (openAppUpdateReleaseNotes)="openAppUpdateReleaseNotes()"
+                [version]="appUpdate.version()"
+                [buildCommit]="buildCommit"
+                [updateMessage]="appUpdate.updateMessage()"
+                [appUpdateStatus]="appUpdate.status()"
+                (checkForAppUpdate)="appUpdate.checkForAppUpdate()"
+                (downloadAppUpdate)="appUpdate.downloadAppUpdate()"
+                (installAppUpdate)="appUpdate.installAppUpdate()"
+                (openManualAppUpdate)="appUpdate.openManualAppUpdate()"
+                (openAppUpdateReleaseNotes)="appUpdate.openReleaseNotes()"
             />
 
             <footer class="action-bar" data-test-id="settings-action-bar">
diff --git a/apps/web/src/app/settings/settings.component.spec.ts b/apps/web/src/app/settings/settings.component.spec.ts
index 245985f79..72442aec9 100644
--- a/apps/web/src/app/settings/settings.component.spec.ts
+++ b/apps/web/src/app/settings/settings.component.spec.ts
@@ -1,365 +1,52 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import {
-    FormsModule,
-    ReactiveFormsModule,
-    UntypedFormBuilder,
-} from '@angular/forms';
-import { MatCardModule } from '@angular/material/card';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatDialog } from '@angular/material/dialog';
-import { MatDividerModule } from '@angular/material/divider';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatListModule } from '@angular/material/list';
-import { MatSelectModule } from '@angular/material/select';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import {
-    EpgRuntimeBridgeService,
-    EpgService,
-} from '@iptvnator/epg/data-access';
-import { Store } from '@ngrx/store';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { DialogService } from '@iptvnator/ui/components';
-import { MockModule, MockProvider } from 'ng-mocks';
-import {
-    DatabaseService,
-    DataService,
-    PlaylistBackupService,
-    PlaylistsService,
-} from '@iptvnator/services';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
+import { selectAllPlaylistsMeta } from '@iptvnator/m3u-state';
 import {
     EmbeddedMpvSupport,
-    ELECTRON_BRIDGE_APP_UPDATE_STATUSES,
-    ElectronBridgeAppUpdateStatus,
-    Language,
     PlaylistMeta,
-    StartupBehavior,
-    StreamFormat,
-    Theme,
     VideoPlayer,
 } from '@iptvnator/shared/interfaces';
+import { MockStore } from '@ngrx/store/testing';
 import { SettingsComponent } from './settings.component';
-import { AppUpdateReleaseNotesDialogComponent } from './app-update-release-notes-dialog.component';
-
-import { signal } from '@angular/core';
-import { SettingsContextService } from '@iptvnator/workspace/shell/util';
 import {
-    PlaylistActions,
-    selectAllPlaylistsMeta,
-    selectIsEpgAvailable,
-} from '@iptvnator/m3u-state';
-import { NgxIndexedDBService } from 'ngx-indexed-db';
-import { from, of } from 'rxjs';
-import { ElectronServiceStub } from '../services/electron.service.stub';
-import { SettingsStore } from '../services/settings-store.service';
-import { SettingsService } from '../services/settings.service';
-import { SettingsSectionScrollDirective } from './settings-section-scroll.directive';
-
-const DEFAULT_DASHBOARD_RAILS = {
-    hero: true,
-    continueWatching: true,
-    liveFavorites: true,
-    recentlyWatchedLive: true,
-    favoriteMoviesAndSeries: true,
-    recentSources: true,
-    xtreamRecentlyAdded: true,
-    tmdbTrending: true,
-};
-
-class MatSnackBarStub {
-    open = jest.fn();
-}
-
-export class MockRouter {
-    navigateByUrl(url: string): string {
-        return url;
-    }
-}
-
-const DEFAULT_SETTINGS = {
-    player: VideoPlayer.VideoJs,
-    streamFormat: StreamFormat.AutoStreamFormat,
-    openStreamOnDoubleClick: false,
-    language: Language.ENGLISH,
-    showCaptions: false,
-    showDashboard: true,
-    startupBehavior: StartupBehavior.FirstView,
-    showExternalPlaybackBar: true,
-    theme: Theme.SystemTheme,
-    mpvPlayerPath: '',
-    mpvPlayerArguments: '',
-    mpvReuseInstance: false,
-    vlcPlayerPath: '',
-    vlcPlayerArguments: '',
-    vlcReuseInstance: false,
-    remoteControl: false,
-    remoteControlPort: 8765,
-    epgUrl: [],
-    recordingFolder: '',
-    coverSize: 'medium',
-    dashboardRails: DEFAULT_DASHBOARD_RAILS,
-    preferUploadedEpgOverXtream: false,
-    epgViewMode: 'timeline',
-    tmdb: { enabled: false, apiKey: '' },
-};
-
-const DEFAULT_APP_UPDATE_STATUS: ElectronBridgeAppUpdateStatus = {
-    currentVersion: '0.22.0',
-    manualDownloadUrl: 'https://github.com/4gray/iptvnator/releases/latest',
-    status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Idle,
-    supportedSelfUpdate: true,
-};
-
-class MockSettingsStore {
-    private _settings = signal(DEFAULT_SETTINGS);
-
-    getSettings = () => this._settings();
-
-    getTrustOptions = () => ({
-        trustedPrivateNetworkEpgUrls:
-            (
-                this._settings() as typeof DEFAULT_SETTINGS & {
-                    trustedPrivateNetworkEpgUrls?: string[];
-                }
-            ).trustedPrivateNetworkEpgUrls ?? [],
-        trustedInsecureTlsHosts:
-            (
-                this._settings() as typeof DEFAULT_SETTINGS & {
-                    trustedInsecureTlsHosts?: string[];
-                }
-            ).trustedInsecureTlsHosts ?? [],
-    });
-
-    loadSettings = jest.fn().mockResolvedValue(undefined);
-
-    updateSettings = jest.fn().mockResolvedValue(undefined);
-
-    // Helper method for tests to modify settings
-    _setSettings(newSettings: Partial<typeof DEFAULT_SETTINGS>) {
-        this._settings.set({
-            ...this._settings(),
-            ...newSettings,
-        });
-    }
-}
-
-class MockSettingsService {
-    getAppVersion = jest.fn().mockReturnValue(from(Promise.resolve('1.0.0')));
-    changeTheme = jest.fn();
-    isVersionOutdated = jest.fn().mockImplementation(
-        (currentVersion: string, latestVersion: string) =>
-            currentVersion.localeCompare(latestVersion, undefined, {
-                numeric: true,
-                sensitivity: 'base',
-            }) < 0
-    );
-}
-
-interface SettingsSectionScrollDirectiveTestApi {
-    getScrollRoot(): HTMLElement | null;
-}
-
-interface SettingsComponentPrivateTestApi {
-    loadAppUpdateStatus(): Promise<void>;
-    matDialog: MatDialog;
-    waitForUiFeedbackFrame(): Promise<void>;
-    waitForAppUpdateStatusRetry(): Promise<void>;
-}
+    configureSettingsComponentTestBed,
+    createElectronStub,
+    createEpgBridgeStub,
+    createPlaylistMeta,
+    DEFAULT_SETTINGS,
+    stubSettingsSideEffects,
+} from './test-stubs/settings-test-harness.stub';
 
+/**
+ * Page-shell behaviour: chrome, the facade lifecycle and the runtime
+ * capabilities that decide which sections and players are offered. Form
+ * editing and saving live in `settings.component.form.spec.ts`, section
+ * scrolling in `settings-section-scroll.directive.spec.ts`, and the
+ * per-section behaviour in the matching `*.facade.spec.ts` files.
+ */
 describe('SettingsComponent', () => {
     let component: SettingsComponent;
     let fixture: ComponentFixture<SettingsComponent>;
-    let electronService: DataService;
     let router: Router;
-    let settingsStore: unknown;
-    let translate: TranslateService;
-    let dialogService: DialogService;
-    let playlistsService: PlaylistsService;
-    let playlistBackupService: PlaylistBackupService;
-    let store: Store;
     let mockStore: MockStore;
-    let databaseService: DatabaseService;
-    let snackBar: MatSnackBarStub;
     let epgBridge: Partial<EpgRuntimeBridgeService>;
     const originalElectron = window.electron;
-    const importDate = '2026-04-21T00:00:00.000Z';
-
-    const createPlaylistMeta = (
-        overrides: Partial<PlaylistMeta> = {}
-    ): PlaylistMeta => ({
-        _id: overrides._id ?? 'playlist-id',
-        title: overrides.title ?? 'Playlist',
-        count: overrides.count ?? 10,
-        importDate: overrides.importDate ?? importDate,
-        autoRefresh: overrides.autoRefresh ?? false,
-        ...overrides,
-    });
-
-    const createDialogRef = (result: boolean): ReturnType<MatDialog['open']> =>
-        ({
-            afterClosed: () => of(result),
-        }) as unknown as ReturnType<MatDialog['open']>;
 
     beforeEach(waitForAsync(() => {
-        epgBridge = {
-            clearEpgData: jest.fn().mockResolvedValue({ success: true }),
-            clearEpgDataForSource: jest
-                .fn()
-                .mockResolvedValue({ success: true }),
-            forceFetchEpg: jest.fn().mockResolvedValue({ success: true }),
-            supportsDataManagement: true,
-            supportsImport: true,
-        };
-
-        TestBed.configureTestingModule({
-            providers: [
-                UntypedFormBuilder,
-                { provide: SettingsStore, useClass: MockSettingsStore },
-                MockProvider(EpgService, {
-                    fetchEpg: jest.fn(),
-                }),
-                {
-                    provide: EpgRuntimeBridgeService,
-                    useValue: epgBridge,
-                },
-                MockProvider(DialogService, {
-                    openConfirmDialog: jest.fn(),
-                }),
-                MockProvider(MatDialog, {
-                    open: jest.fn(),
-                }),
-                { provide: SettingsService, useClass: MockSettingsService },
-                { provide: MatSnackBar, useClass: MatSnackBarStub },
-                { provide: DataService, useClass: ElectronServiceStub },
-                {
-                    provide: Router,
-                    useClass: MockRouter,
-                },
-                provideMockStore({
-                    selectors: [
-                        { selector: selectAllPlaylistsMeta, value: [] },
-                        { selector: selectIsEpgAvailable, value: false },
-                    ],
-                }),
-                {
-                    provide: NgxIndexedDBService,
-                    useValue: {},
-                },
-                MockProvider(PlaylistsService, {
-                    getAllData: jest.fn().mockReturnValue(of([])),
-                    removeAll: jest.fn(),
-                }),
-                MockProvider(DatabaseService, {
-                    createOperationId: jest
-                        .fn()
-                        .mockReturnValue('delete-all-op'),
-                    deleteAllPlaylists: jest.fn().mockResolvedValue(true),
-                }),
-                MockProvider(PlaylistBackupService, {
-                    exportBackup: jest.fn().mockResolvedValue({
-                        defaultFileName:
-                            'iptvnator-playlist-backup-2026-04-21.json',
-                        json: '{}',
-                        manifest: {
-                            kind: 'iptvnator-playlist-backup',
-                            version: 1,
-                            exportedAt: '2026-04-21T00:00:00.000Z',
-                            includeSecrets: true,
-                            playlists: [],
-                        },
-                    }),
-                    importBackup: jest.fn().mockResolvedValue({
-                        imported: 0,
-                        merged: 0,
-                        skipped: 0,
-                        failed: 0,
-                        errors: [],
-                    }),
-                }),
-            ],
-            imports: [
-                SettingsComponent,
-                HttpClientTestingModule,
-                FormsModule,
-                MockModule(MatSelectModule),
-                MockModule(MatIconModule),
-                MockModule(MatTooltipModule),
-                ReactiveFormsModule,
-                MockModule(RouterTestingModule),
-                MockModule(MatCardModule),
-                MockModule(MatListModule),
-                MockModule(MatFormFieldModule),
-                MockModule(MatCheckboxModule),
-                MockModule(MatDividerModule),
-                TranslateModule.forRoot(),
-            ],
-        }).compileComponents();
+        epgBridge = createEpgBridgeStub();
+        configureSettingsComponentTestBed(epgBridge);
     }));
 
     beforeEach(() => {
-        window.electron = {
-            checkEpgFreshness: jest.fn().mockResolvedValue({
-                freshUrls: [],
-                staleUrls: [],
-            }),
-            clearEpgData: jest.fn().mockResolvedValue({ success: true }),
-            clearEpgDataForSource: jest
-                .fn()
-                .mockResolvedValue({ success: true }),
-            fetchEpg: jest.fn().mockResolvedValue({ success: true }),
-            forceFetchEpg: jest.fn().mockResolvedValue({ success: true }),
-            getAppVersion: jest.fn().mockResolvedValue('1.0.0'),
-            getAppUpdateStatus: jest
-                .fn()
-                .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
-            getChannelPrograms: jest.fn().mockResolvedValue([]),
-            getEpgChannelsByRange: jest.fn().mockResolvedValue([]),
-            getLocalIpAddresses: jest.fn().mockResolvedValue([]),
-            checkForAppUpdate: jest
-                .fn()
-                .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
-            downloadAppUpdate: jest
-                .fn()
-                .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
-            installAppUpdate: jest
-                .fn()
-                .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
-            onAppUpdateStatusChange: jest.fn(() => jest.fn()),
-            openInMpv: jest.fn(),
-            openInVlc: jest.fn(),
-            platform: 'linux',
-            searchEpgPrograms: jest.fn().mockResolvedValue([]),
-            saveFileDialog: jest.fn().mockResolvedValue('/tmp/backup.json'),
-            setMpvPlayerPath: jest.fn().mockResolvedValue(undefined),
-            setVlcPlayerPath: jest.fn().mockResolvedValue(undefined),
-            updateSettings: jest.fn().mockResolvedValue(undefined),
-            writeFile: jest.fn().mockResolvedValue({ success: true }),
-        } as unknown as typeof window.electron;
+        window.electron = createElectronStub();
 
         fixture = TestBed.createComponent(SettingsComponent);
-        electronService = TestBed.inject(DataService);
-        settingsStore = TestBed.inject(SettingsStore);
         router = TestBed.inject(Router);
-        translate = TestBed.inject(TranslateService);
-        dialogService = TestBed.inject(DialogService);
-        playlistsService = TestBed.inject(PlaylistsService);
-        playlistBackupService = TestBed.inject(PlaylistBackupService);
-        store = TestBed.inject(Store);
         mockStore = TestBed.inject(MockStore);
-        databaseService = TestBed.inject(DatabaseService);
-        snackBar = TestBed.inject(MatSnackBar) as unknown as MatSnackBarStub;
 
         component = fixture.componentInstance;
-        component.checkAppVersion = jest.fn();
-        component.fetchLocalIpAddresses = jest
-            .fn()
-            .mockResolvedValue(undefined);
+        stubSettingsSideEffects(component);
         fixture.detectChanges();
     });
 
@@ -373,160 +60,46 @@ describe('SettingsComponent', () => {
         fixture.detectChanges();
     }
 
-    function privateApi(
-        settingsComponent: SettingsComponent
-    ): SettingsComponentPrivateTestApi {
-        return settingsComponent as unknown as SettingsComponentPrivateTestApi;
-    }
-
     it('should create and init component', () => {
         expect(component).toBeTruthy();
     });
 
-    it('loads the desktop app update status and subscribes to status pushes', async () => {
-        const pushedStatus: ElectronBridgeAppUpdateStatus = {
-            ...DEFAULT_APP_UPDATE_STATUS,
-            latestVersion: '0.23.0',
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available,
-        };
+    /**
+     * The facades own the behaviour, but only the component knows when to
+     * start and stop them — so the seam itself needs coverage here.
+     */
+    it('drives the facade lifecycle from the page lifecycle', async () => {
+        fixture.destroy();
 
-        await fixture.whenStable();
-        const statusHandler = (
-            window.electron.onAppUpdateStatusChange as jest.Mock
-        ).mock.calls[0][0] as (status: ElectronBridgeAppUpdateStatus) => void;
-        statusHandler(pushedStatus);
-
-        expect(window.electron.getAppUpdateStatus).toHaveBeenCalledTimes(1);
-        expect(window.electron.onAppUpdateStatusChange).toHaveBeenCalledTimes(
-            1
+        const lifecycleFixture = TestBed.createComponent(SettingsComponent);
+        const lifecycleComponent = lifecycleFixture.componentInstance;
+        stubSettingsSideEffects(lifecycleComponent);
+        const appUpdateInit = jest.spyOn(lifecycleComponent.appUpdate, 'init');
+        const appUpdateDispose = jest.spyOn(
+            lifecycleComponent.appUpdate,
+            'dispose'
         );
-        expect(component.appUpdateStatus()).toEqual(pushedStatus);
-    });
-
-    it('retries the initial app update status load when IPC handlers are still starting', async () => {
-        const retriedStatus: ElectronBridgeAppUpdateStatus = {
-            ...DEFAULT_APP_UPDATE_STATUS,
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
-            supportedSelfUpdate: false,
-        };
-        await fixture.whenStable();
-        (window.electron.getAppUpdateStatus as jest.Mock)
-            .mockReset()
-            .mockRejectedValueOnce(new Error('No handler registered'))
-            .mockResolvedValueOnce(retriedStatus);
-        jest.spyOn(
-            privateApi(component),
-            'waitForAppUpdateStatusRetry'
-        ).mockResolvedValue(undefined);
-
-        await privateApi(component).loadAppUpdateStatus();
-
-        expect(window.electron.getAppUpdateStatus).toHaveBeenCalledTimes(2);
-        expect(component.appUpdateStatus()).toEqual(retriedStatus);
-    });
-
-    it('waits for the desktop app update bridge method before loading status', async () => {
-        const retriedStatus: ElectronBridgeAppUpdateStatus = {
-            ...DEFAULT_APP_UPDATE_STATUS,
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
-            supportedSelfUpdate: false,
-        };
-        await fixture.whenStable();
-        delete (window.electron as Partial<typeof window.electron>)
-            .getAppUpdateStatus;
-        let retryCount = 0;
-        const getStatus = jest.fn().mockResolvedValue(retriedStatus);
-        jest.spyOn(
-            privateApi(component),
-            'waitForAppUpdateStatusRetry'
-        ).mockImplementation(async () => {
-            retryCount += 1;
-
-            if (retryCount === 1) {
-                window.electron.getAppUpdateStatus = getStatus;
-            }
-        });
-
-        await privateApi(component).loadAppUpdateStatus();
-
-        expect(retryCount).toBe(1);
-        expect(getStatus).toHaveBeenCalledTimes(1);
-        expect(component.appUpdateStatus()).toEqual(retriedStatus);
-    });
-
-    it('forwards app update actions to the desktop bridge', async () => {
-        await component.checkForAppUpdate();
-        await component.downloadAppUpdate();
-        await component.installAppUpdate();
-
-        expect(window.electron.checkForAppUpdate).toHaveBeenCalledTimes(1);
-        expect(window.electron.downloadAppUpdate).toHaveBeenCalledTimes(1);
-        expect(window.electron.installAppUpdate).toHaveBeenCalledTimes(1);
-    });
-
-    it('opens the manual release URL from unsupported update status', () => {
-        const openSpy = jest.spyOn(window, 'open').mockReturnValue(null);
-        component.appUpdateStatus.set({
-            ...DEFAULT_APP_UPDATE_STATUS,
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Unsupported,
-            supportedSelfUpdate: false,
-        });
-
-        component.openManualAppUpdate();
-
-        expect(openSpy).toHaveBeenCalledWith(
-            DEFAULT_APP_UPDATE_STATUS.manualDownloadUrl,
-            '_blank',
-            'noreferrer'
+        const embeddedMpvLoad = jest.spyOn(
+            lifecycleComponent.embeddedMpv,
+            'load'
         );
-    });
 
-    it('opens release notes dialog for the latest update version', () => {
-        const openSpy = jest
-            .spyOn(privateApi(component).matDialog, 'open')
-            .mockReturnValue(createDialogRef(false));
-        component.appUpdateStatus.set({
-            ...DEFAULT_APP_UPDATE_STATUS,
-            latestVersion: '0.23.0',
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available,
-        });
+        lifecycleFixture.detectChanges();
+        await lifecycleFixture.whenStable();
 
-        component.openAppUpdateReleaseNotes();
+        expect(appUpdateInit).toHaveBeenCalledTimes(1);
+        expect(lifecycleComponent.appUpdate.checkAppVersion).toHaveBeenCalled();
+        expect(embeddedMpvLoad).toHaveBeenCalled();
+        expect(
+            lifecycleComponent.remoteControl.fetchLocalIpAddresses
+        ).toHaveBeenCalled();
+        // The lifecycle really reaches the desktop bridge, not just the facade
+        expect(window.electron.getAppUpdateStatus).toHaveBeenCalled();
+        expect(window.electron.onAppUpdateStatusChange).toHaveBeenCalled();
 
-        expect(openSpy).toHaveBeenCalledWith(
-            AppUpdateReleaseNotesDialogComponent,
-            expect.objectContaining({
-                data: {
-                    initialVersion: '0.23.0',
-                },
-            })
-        );
-    });
+        lifecycleFixture.destroy();
 
-    it('opens release notes dialog for the current version when no update is available', () => {
-        const openSpy = jest
-            .spyOn(privateApi(component).matDialog, 'open')
-            .mockReturnValue(createDialogRef(false));
-        component.appUpdateStatus.set({
-            ...DEFAULT_APP_UPDATE_STATUS,
-            latestVersion: '0.21.0',
-            release: {
-                version: '0.21.0',
-            },
-            status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.NotAvailable,
-        });
-
-        component.openAppUpdateReleaseNotes();
-
-        expect(openSpy).toHaveBeenCalledWith(
-            AppUpdateReleaseNotesDialogComponent,
-            expect.objectContaining({
-                data: {
-                    initialVersion: DEFAULT_APP_UPDATE_STATUS.currentVersion,
-                    fallbackToLatest: true,
-                },
-            })
-        );
+        expect(appUpdateDispose).toHaveBeenCalledTimes(1);
     });
 
     it('should render a compact page header outside dialog mode', () => {
@@ -544,10 +117,7 @@ describe('SettingsComponent', () => {
         const dialogFixture = TestBed.createComponent(SettingsComponent);
         const dialogComponent = dialogFixture.componentInstance;
 
-        dialogComponent.checkAppVersion = jest.fn();
-        dialogComponent.fetchLocalIpAddresses = jest
-            .fn()
-            .mockResolvedValue(undefined);
+        stubSettingsSideEffects(dialogComponent);
         dialogComponent.isDialog = true;
         dialogFixture.detectChanges();
 
@@ -560,106 +130,30 @@ describe('SettingsComponent', () => {
         ).not.toBeNull();
     });
 
-    it('should scroll the selected navigation target within the workspace viewport', async () => {
-        fixture.destroy();
-        jest.useFakeTimers();
-
-        try {
-            const scrollFixture = TestBed.createComponent(SettingsComponent);
-            const scrollComponent = scrollFixture.componentInstance;
-            const settingsContext = TestBed.inject(SettingsContextService);
-            const originalGetElementById =
-                document.getElementById.bind(document);
-            const scrollTo = jest.fn();
-            const scrollRoot = {
-                scrollTop: 96,
-                clientHeight: 885,
-                scrollHeight: 2469,
-                getBoundingClientRect: () =>
-                    ({
-                        top: 56,
-                    }) as DOMRect,
-                scrollTo,
-            } as unknown as HTMLElement;
-
-            scrollComponent.checkAppVersion = jest.fn();
-            scrollComponent.fetchLocalIpAddresses = jest
-                .fn()
-                .mockResolvedValue(undefined);
-            scrollFixture.detectChanges();
-            const scrollDirective = scrollFixture.debugElement
-                .query(By.directive(SettingsSectionScrollDirective))
-                .injector.get(SettingsSectionScrollDirective);
-            jest.spyOn(
-                scrollDirective as unknown as SettingsSectionScrollDirectiveTestApi,
-                'getScrollRoot'
-            ).mockReturnValue(scrollRoot);
-
-            const getElementByIdSpy = jest
-                .spyOn(document, 'getElementById')
-                .mockImplementation((id: string) => {
-                    if (id === 'about') {
-                        return {
-                            getBoundingClientRect: () =>
-                                ({
-                                    top: 2050,
-                                    height: 159,
-                                }) as DOMRect,
-                        } as HTMLElement;
-                    }
-
-                    return originalGetElementById(id);
-                });
-
-            await scrollFixture.whenStable();
-            scrollFixture.detectChanges();
-            settingsContext.navigateToSection('about');
-            scrollFixture.detectChanges();
-
-            expect(getElementByIdSpy).toHaveBeenCalledWith('about');
-            expect(scrollTo).toHaveBeenCalledWith({
-                behavior: 'smooth',
-                top: 1488,
-            });
-            expect(settingsContext.pendingScrollTarget()).toBe('about');
-
-            jest.advanceTimersByTime(600);
-
-            expect(settingsContext.pendingScrollTarget()).toBeNull();
-        } finally {
-            jest.useRealTimers();
-        }
+    it('should navigate back to home page', () => {
+        jest.spyOn(router, 'navigateByUrl');
+        component.backToHome();
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/');
     });
 
-    describe('Get and set settings on component init', () => {
-        const settings = {
-            language: Language.GERMAN,
-            player: VideoPlayer.Html5Player,
-            theme: Theme.DarkTheme,
-        };
+    it('enables the global wipe action only once a playlist exists', () => {
+        const deleteButton = () =>
+            (fixture.nativeElement as HTMLElement).querySelector(
+                '.danger-zone__button'
+            ) as HTMLButtonElement | null;
 
-        it('should init default settings if previous config was not saved', async () => {
-            await component.ngOnInit();
-            //expect(settingsStore.loadSettings).toHaveBeenCalled();
-            expect(component.settingsForm.value).toEqual(DEFAULT_SETTINGS);
-        });
+        setPlaylists([]);
 
-        it('should get and apply custom settings', async () => {
-            const mockStore = settingsStore as unknown as MockSettingsStore;
-            mockStore._setSettings({
-                ...DEFAULT_SETTINGS,
-                ...settings,
-            });
+        expect(component.playlistReset.canRemoveAll()).toBe(false);
+        expect(deleteButton()?.disabled).toBe(true);
 
-            component.setSettings();
+        setPlaylists([createPlaylistMeta({ _id: 'm3u-1' })]);
 
-            //expect(settingsStore.loadSettings).toHaveBeenCalled();
-            expect(component.settingsForm.value).toEqual({
-                ...DEFAULT_SETTINGS,
-                ...settings,
-            });
-        });
+        expect(component.playlistReset.canRemoveAll()).toBe(true);
+        expect(deleteButton()?.disabled).toBe(false);
+    });
 
+    describe('Runtime capabilities', () => {
         it('hides the embedded mpv option when the desktop support probe reports unsupported', async () => {
             window.electron = {
                 ...window.electron,
@@ -702,7 +196,47 @@ describe('SettingsComponent', () => {
             }
         );
 
-        it('hides external player path settings when the Electron bridge is incomplete', async () => {
+        it('does not block settings initialization while embedded mpv support is pending', async () => {
+            let resolveSupport:
+                ((value: EmbeddedMpvSupport) => void) | undefined;
+            window.electron = {
+                ...window.electron,
+                getEmbeddedMpvSupport: jest.fn(
+                    () =>
+                        new Promise((resolve) => {
+                            resolveSupport = resolve;
+                        })
+                ),
+            } as unknown as typeof window.electron;
+
+            await expect(component.ngOnInit()).resolves.toBeUndefined();
+
+            expect(component.settingsForm.value).toEqual(DEFAULT_SETTINGS);
+            expect(window.electron.getEmbeddedMpvSupport).toHaveBeenCalled();
+            expect(
+                component
+                    .players()
+                    .some((player) => player.id === VideoPlayer.EmbeddedMpv)
+            ).toBe(false);
+
+            if (!resolveSupport) {
+                throw new Error('Expected embedded MPV support probe to start');
+            }
+
+            resolveSupport({
+                supported: true,
+                platform: 'darwin',
+            });
+            await fixture.whenStable();
+
+            expect(
+                component
+                    .players()
+                    .some((player) => player.id === VideoPlayer.EmbeddedMpv)
+            ).toBe(true);
+        });
+
+        it('hides external player path settings when the Electron bridge is incomplete', () => {
             fixture.destroy();
             epgBridge.supportsImport = false;
             window.electron = {
@@ -715,10 +249,7 @@ describe('SettingsComponent', () => {
                 TestBed.createComponent(SettingsComponent);
             const partialBridgeComponent =
                 partialBridgeFixture.componentInstance;
-            partialBridgeComponent.checkAppVersion = jest.fn();
-            partialBridgeComponent.fetchLocalIpAddresses = jest
-                .fn()
-                .mockResolvedValue(undefined);
+            stubSettingsSideEffects(partialBridgeComponent);
             partialBridgeFixture.detectChanges();
 
             expect(partialBridgeComponent.isDesktop).toBe(true);
@@ -769,10 +300,7 @@ describe('SettingsComponent', () => {
                 TestBed.createComponent(SettingsComponent);
             const launchOnlyBridgeComponent =
                 launchOnlyBridgeFixture.componentInstance;
-            launchOnlyBridgeComponent.checkAppVersion = jest.fn();
-            launchOnlyBridgeComponent.fetchLocalIpAddresses = jest
-                .fn()
-                .mockResolvedValue(undefined);
+            stubSettingsSideEffects(launchOnlyBridgeComponent);
             launchOnlyBridgeFixture.detectChanges();
 
             expect(
@@ -793,693 +321,20 @@ describe('SettingsComponent', () => {
             ).toBe(true);
         });
 
-        it('does not block settings initialization while embedded mpv support is pending', async () => {
-            let resolveSupport:
-                | ((value: EmbeddedMpvSupport) => void)
-                | undefined;
+        it('opens the playlist folder picker only when the desktop bridge offers one', async () => {
+            const selectFolder = jest.fn().mockResolvedValue('/tmp/recordings');
             window.electron = {
                 ...window.electron,
-                getEmbeddedMpvSupport: jest.fn(
-                    () =>
-                        new Promise((resolve) => {
-                            resolveSupport = resolve;
-                        })
-                ),
+                selectEmbeddedMpvRecordingFolder: selectFolder,
             } as unknown as typeof window.electron;
 
-            await expect(component.ngOnInit()).resolves.toBeUndefined();
+            await component.selectRecordingFolder();
 
-            expect(component.settingsForm.value).toEqual(DEFAULT_SETTINGS);
-            expect(window.electron.getEmbeddedMpvSupport).toHaveBeenCalled();
-            expect(
-                component
-                    .players()
-                    .some((player) => player.id === VideoPlayer.EmbeddedMpv)
-            ).toBe(false);
-
-            if (!resolveSupport) {
-                throw new Error('Expected embedded MPV support probe to start');
-            }
-
-            resolveSupport({
-                supported: true,
-                platform: 'darwin',
-            });
-            await fixture.whenStable();
-
-            expect(
-                component
-                    .players()
-                    .some((player) => player.id === VideoPlayer.EmbeddedMpv)
-            ).toBe(true);
-        });
-    });
-
-    describe('Version check', () => {
-        const latestVersion = '1.0.0';
-        const currentVersion = '0.1.0';
-
-        beforeEach(() => {
-            const settingsService = TestBed.inject(SettingsService);
-            (settingsService.getAppVersion as jest.Mock).mockReturnValue(
-                of(latestVersion)
+            expect(selectFolder).toHaveBeenCalled();
+            expect(component.settingsForm.value.recordingFolder).toBe(
+                '/tmp/recordings'
             );
-
-            // Add translation mock
-            jest.spyOn(translate, 'instant').mockImplementation((key) => {
-                if (key === 'SETTINGS.NEW_VERSION_AVAILABLE') {
-                    return 'New version available';
-                }
-                if (key === 'SETTINGS.LATEST_VERSION') {
-                    return 'Latest version installed';
-                }
-                return key;
-            });
+            expect(component.settingsForm.dirty).toBe(true);
         });
-
-        it('should return true if version is outdated', () => {
-            jest.spyOn(electronService, 'getAppVersion').mockReturnValue(
-                currentVersion
-            );
-            const isOutdated =
-                component.isCurrentVersionOutdated(latestVersion);
-            expect(isOutdated).toBeTruthy();
-        });
-
-        it('should update notification message if version is outdated', () => {
-            jest.spyOn(translate, 'instant');
-            jest.spyOn(electronService, 'getAppVersion').mockReturnValue(
-                currentVersion
-            );
-            component.showVersionInformation(latestVersion);
-            expect(translate.instant).toHaveBeenCalledWith(
-                'SETTINGS.NEW_VERSION_AVAILABLE'
-            );
-            expect(component.updateMessage).toBe(
-                'New version available: 1.0.0'
-            );
-        });
-    });
-
-    it('disables the global wipe action when there are no playlists', () => {
-        setPlaylists([]);
-
-        const deleteButton = (
-            fixture.nativeElement as HTMLElement
-        ).querySelector('.danger-zone__button') as HTMLButtonElement | null;
-
-        expect(component.canRemoveAllPlaylists()).toBe(false);
-        expect(deleteButton?.disabled).toBe(true);
-    });
-
-    it('opens the dedicated delete-all dialog with the current playlist type summary', () => {
-        setPlaylists([
-            createPlaylistMeta({ _id: 'm3u-1' }),
-            createPlaylistMeta({
-                _id: 'xtream-1',
-                serverUrl: 'http://xtream.example',
-            }),
-            createPlaylistMeta({
-                _id: 'stalker-1',
-                macAddress: '00:11:22:33:44:55',
-            }),
-        ]);
-
-        const openSpy = jest
-            .spyOn(privateApi(component).matDialog, 'open')
-            .mockReturnValue(createDialogRef(false));
-
-        component.removeAll();
-
-        expect(component.playlistDeleteSummary()).toEqual({
-            total: 3,
-            m3u: 1,
-            xtream: 1,
-            stalker: 1,
-        });
-        expect(openSpy).toHaveBeenCalledWith(
-            expect.any(Function),
-            expect.objectContaining({
-                data: {
-                    summary: {
-                        total: 3,
-                        m3u: 1,
-                        xtream: 1,
-                        stalker: 1,
-                    },
-                },
-            })
-        );
-    });
-
-    it('tracks Electron delete-all progress and dispatches store cleanup after success', async () => {
-        setPlaylists([
-            createPlaylistMeta({ _id: 'm3u-1' }),
-            createPlaylistMeta({
-                _id: 'xtream-1',
-                serverUrl: 'http://xtream.example',
-            }),
-        ]);
-
-        const dispatchSpy = jest.spyOn(store, 'dispatch');
-        (databaseService.deleteAllPlaylists as jest.Mock).mockClear();
-        jest.spyOn(privateApi(component).matDialog, 'open').mockReturnValue(
-            createDialogRef(true)
-        );
-        jest.spyOn(translate, 'instant').mockImplementation(
-            (key: string, params?: Record<string, number>) => {
-                if (key === 'SETTINGS.REMOVE_ALL_PROGRESS') {
-                    return `${params?.current}/${params?.total}`;
-                }
-                return key;
-            }
-        );
-        jest.spyOn(
-            privateApi(component),
-            'waitForUiFeedbackFrame'
-        ).mockResolvedValue(undefined);
-
-        let resolveDelete: (value: boolean) => void = () => undefined;
-        (databaseService.deleteAllPlaylists as jest.Mock).mockImplementation(
-            ({
-                onEvent,
-            }: {
-                onEvent?: (event: {
-                    operation: string;
-                    status: string;
-                    current?: number;
-                    total?: number;
-                }) => void;
-            }) => {
-                onEvent?.({
-                    operation: 'delete-all-playlists',
-                    status: 'progress',
-                    current: 3,
-                    total: 7,
-                });
-
-                return new Promise<boolean>((resolve) => {
-                    resolveDelete = resolve;
-                });
-            }
-        );
-
-        component.removeAll();
-        await Promise.resolve();
-        fixture.detectChanges();
-
-        expect(component.isRemovingAllPlaylists()).toBe(true);
-        expect(component.removeAllProgressLabel()).toBe('3/7');
-        expect(databaseService.deleteAllPlaylists).toHaveBeenCalledWith(
-            expect.objectContaining({
-                operationId: 'delete-all-op',
-                onEvent: expect.any(Function),
-            })
-        );
-
-        resolveDelete(true);
-        await fixture.whenStable();
-
-        expect(component.isRemovingAllPlaylists()).toBe(false);
-        expect(component.removeAllProgress()).toBeNull();
-        expect(dispatchSpy).toHaveBeenCalledWith(
-            PlaylistActions.removeAllPlaylists()
-        );
-        expect(snackBar.open).toHaveBeenCalledWith(
-            'SETTINGS.PLAYLISTS_REMOVED',
-            undefined,
-            {
-                duration: 2000,
-                horizontalPosition: 'center',
-                panelClass: ['settings-snackbar'],
-                verticalPosition: 'bottom',
-            }
-        );
-    });
-
-    it('falls back to PlaylistsService.removeAll outside Electron', async () => {
-        fixture.destroy();
-        window.electron = undefined as unknown as typeof window.electron;
-        epgBridge.supportsImport = false;
-
-        const browserFixture = TestBed.createComponent(SettingsComponent);
-        const browserComponent = browserFixture.componentInstance;
-        browserComponent.checkAppVersion = jest.fn();
-        browserComponent.fetchLocalIpAddresses = jest
-            .fn()
-            .mockResolvedValue(undefined);
-        browserFixture.detectChanges();
-
-        expect(browserComponent.isDesktop).toBe(false);
-        expect(browserComponent.isPwa).toBe(true);
-        expect(browserComponent.supportsEpg).toBe(false);
-        expect(browserComponent.supportsRemoteControl).toBe(false);
-        expect(browserComponent.settingsForm.get('epgUrl')).toBeNull();
-
-        mockStore.overrideSelector(selectAllPlaylistsMeta, [
-            createPlaylistMeta({ _id: 'browser-m3u' }),
-        ]);
-        mockStore.refreshState();
-        browserFixture.detectChanges();
-
-        jest.spyOn(
-            privateApi(browserComponent).matDialog,
-            'open'
-        ).mockReturnValue(createDialogRef(true));
-        jest.spyOn(
-            privateApi(browserComponent),
-            'waitForUiFeedbackFrame'
-        ).mockResolvedValue(undefined);
-        (databaseService.deleteAllPlaylists as jest.Mock).mockClear();
-        (playlistsService.removeAll as jest.Mock).mockClear();
-        (playlistsService.removeAll as jest.Mock).mockReturnValue(
-            of(undefined)
-        );
-        const dispatchSpy = jest.spyOn(store, 'dispatch');
-
-        browserComponent.removeAll();
-        await browserFixture.whenStable();
-
-        expect(playlistsService.removeAll).toHaveBeenCalled();
-        expect(databaseService.deleteAllPlaylists).not.toHaveBeenCalled();
-        expect(dispatchSpy).toHaveBeenCalledWith(
-            PlaylistActions.removeAllPlaylists()
-        );
-    });
-
-    it('shows the save confirmation snackbar at the bottom center with the settings offset class', () => {
-        jest.spyOn(translate, 'instant').mockReturnValue('Settings saved');
-
-        component.applyChangedSettings();
-
-        expect(snackBar.open).toHaveBeenCalledWith(
-            'Settings saved',
-            undefined,
-            {
-                duration: 2000,
-                horizontalPosition: 'center',
-                panelClass: ['settings-snackbar'],
-                verticalPosition: 'bottom',
-            }
-        );
-    });
-
-    it('should force-fetch EPG for a single URL (bypassing freshness cache)', () => {
-        const url = 'http://epg-url-here/data.xml';
-        component.refreshEpg(url);
-        expect(epgBridge.forceFetchEpg).toHaveBeenCalledWith(url, {
-            trustedPrivateNetworkEpgUrls: [],
-            trustedInsecureTlsHosts: [],
-        });
-    });
-
-    it('clears EPG data with a busy state and refreshes all sources on success', async () => {
-        let resolveClear: () => void = () => undefined;
-        const clearPromise = new Promise<{ success: boolean }>((resolve) => {
-            resolveClear = () => resolve({ success: true });
-        });
-        (epgBridge.clearEpgData as jest.Mock).mockReturnValue(clearPromise);
-        (dialogService.openConfirmDialog as jest.Mock).mockImplementation(
-            ({ onConfirm }: { onConfirm: () => Promise<void> }) => {
-                void onConfirm();
-            }
-        );
-        const refreshSpy = jest.spyOn(component, 'refreshAllEpg');
-        jest.spyOn(translate, 'instant').mockImplementation((key) => key);
-
-        component.clearEpgData();
-
-        expect(component.isClearingEpgData()).toBe(true);
-        expect(refreshSpy).not.toHaveBeenCalled();
-
-        resolveClear();
-        await fixture.whenStable();
-
-        expect(component.isClearingEpgData()).toBe(false);
-        expect(snackBar.open).toHaveBeenCalledWith(
-            'SETTINGS.EPG_DATA_CLEARED',
-            undefined,
-            expect.objectContaining({ panelClass: ['settings-snackbar'] })
-        );
-        expect(refreshSpy).toHaveBeenCalled();
-    });
-
-    it('shows an export busy state until the backup file has been written', async () => {
-        let resolveExport: (value: {
-            defaultFileName: string;
-            json: string;
-            manifest: {
-                kind: string;
-                version: number;
-                exportedAt: string;
-                includeSecrets: boolean;
-                playlists: never[];
-            };
-        }) => void = () => undefined;
-
-        (playlistBackupService.exportBackup as jest.Mock).mockReturnValueOnce(
-            new Promise((resolve) => {
-                resolveExport = resolve;
-            })
-        );
-
-        const exportPromise = component.exportData();
-
-        expect(component.isExportingData()).toBe(true);
-
-        resolveExport({
-            defaultFileName: 'iptvnator-playlist-backup-2026-04-21.json',
-            json: '{}',
-            manifest: {
-                kind: 'iptvnator-playlist-backup',
-                version: 1,
-                exportedAt: '2026-04-21T00:00:00.000Z',
-                includeSecrets: true,
-                playlists: [],
-            },
-        });
-
-        await exportPromise;
-
-        expect(window.electron.saveFileDialog).toHaveBeenCalledWith(
-            'iptvnator-playlist-backup-2026-04-21.json',
-            [
-                {
-                    extensions: ['json'],
-                    name: 'JSON',
-                },
-            ]
-        );
-        expect(window.electron.writeFile).toHaveBeenCalledWith(
-            '/tmp/backup.json',
-            '{}'
-        );
-        expect(component.isExportingData()).toBe(false);
-    });
-
-    it('falls back to browser backup download when desktop file-save preload is incomplete', async () => {
-        fixture.destroy();
-        const saveFileDialog = jest.fn().mockResolvedValue('/tmp/backup.json');
-        window.electron = {
-            platform: 'linux',
-            saveFileDialog,
-        } as unknown as typeof window.electron;
-
-        const createObjectURL = jest.fn().mockReturnValue('blob:backup');
-        const revokeObjectURL = jest.fn();
-        const originalCreateObjectURL = window.URL.createObjectURL;
-        const originalRevokeObjectURL = window.URL.revokeObjectURL;
-        Object.defineProperty(window.URL, 'createObjectURL', {
-            configurable: true,
-            value: createObjectURL,
-        });
-        Object.defineProperty(window.URL, 'revokeObjectURL', {
-            configurable: true,
-            value: revokeObjectURL,
-        });
-        const clickSpy = jest
-            .spyOn(HTMLAnchorElement.prototype, 'click')
-            .mockImplementation();
-        let partialFileSaveFixture: ComponentFixture<SettingsComponent> | null =
-            null;
-
-        try {
-            partialFileSaveFixture = TestBed.createComponent(SettingsComponent);
-            const partialFileSaveComponent =
-                partialFileSaveFixture.componentInstance;
-            partialFileSaveComponent.checkAppVersion = jest.fn();
-            partialFileSaveComponent.fetchLocalIpAddresses = jest
-                .fn()
-                .mockResolvedValue(undefined);
-            partialFileSaveFixture.detectChanges();
-
-            expect(partialFileSaveComponent.isDesktop).toBe(true);
-            expect(partialFileSaveComponent.supportsDesktopFileSave).toBe(
-                false
-            );
-
-            await partialFileSaveComponent.exportData();
-
-            expect(saveFileDialog).not.toHaveBeenCalled();
-            expect(createObjectURL).toHaveBeenCalledWith(expect.any(Blob));
-            expect(clickSpy).toHaveBeenCalled();
-            expect(revokeObjectURL).toHaveBeenCalledWith('blob:backup');
-        } finally {
-            partialFileSaveFixture?.destroy();
-            clickSpy.mockRestore();
-            Object.defineProperty(window.URL, 'createObjectURL', {
-                configurable: true,
-                value: originalCreateObjectURL,
-            });
-            Object.defineProperty(window.URL, 'revokeObjectURL', {
-                configurable: true,
-                value: originalRevokeObjectURL,
-            });
-        }
-    });
-
-    it('shows a failure snackbar and skips refresh when clearing EPG data rejects', async () => {
-        (epgBridge.clearEpgData as jest.Mock).mockRejectedValueOnce(
-            new Error('boom')
-        );
-        (dialogService.openConfirmDialog as jest.Mock).mockImplementation(
-            ({ onConfirm }: { onConfirm: () => Promise<void> }) => {
-                void onConfirm();
-            }
-        );
-        const refreshSpy = jest.spyOn(component, 'refreshAllEpg');
-        jest.spyOn(translate, 'instant').mockImplementation((key) => key);
-        jest.spyOn(console, 'error').mockImplementation();
-
-        component.clearEpgData();
-        await fixture.whenStable();
-
-        expect(component.isClearingEpgData()).toBe(false);
-        expect(snackBar.open).toHaveBeenCalledWith(
-            'SETTINGS.EPG_DATA_CLEAR_FAILED',
-            undefined,
-            expect.objectContaining({ panelClass: ['settings-snackbar'] })
-        );
-        expect(refreshSpy).not.toHaveBeenCalled();
-    });
-
-    it('should navigate back to home page', () => {
-        jest.spyOn(router, 'navigateByUrl');
-        component.backToHome();
-        expect(router.navigateByUrl).toHaveBeenCalledWith('/');
-    });
-
-    it('updates the selected theme through the general section and marks the form dirty', () => {
-        const darkThemeButton = (
-            fixture.nativeElement as HTMLElement
-        ).querySelector('[data-test-id="DARK_THEME"]') as HTMLButtonElement;
-
-        darkThemeButton.click();
-        fixture.detectChanges();
-
-        expect(component.settingsForm.value.theme).toBe(Theme.DarkTheme);
-        expect(component.settingsForm.dirty).toBeTruthy();
-    });
-
-    it('updates cover size through the general section output', () => {
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        const largeCoverButton = (
-            fixture.nativeElement as HTMLElement
-        ).querySelector(
-            '[data-test-id="cover-size-large"]'
-        ) as HTMLButtonElement;
-
-        largeCoverButton.click();
-        fixture.detectChanges();
-
-        expect(component.settingsForm.value.coverSize).toBe('large');
-        expect(mockStore.updateSettings).toHaveBeenCalledWith({
-            coverSize: 'large',
-        });
-    });
-
-    it('updates the EPG view mode through the epg section output', () => {
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        const listButton = (
-            fixture.nativeElement as HTMLElement
-        ).querySelector(
-            '[data-test-id="epg-view-mode-list"]'
-        ) as HTMLButtonElement;
-
-        listButton.click();
-        fixture.detectChanges();
-
-        expect(component.settingsForm.value.epgViewMode).toBe('list');
-        expect(mockStore.updateSettings).toHaveBeenCalledWith({
-            epgViewMode: 'list',
-        });
-    });
-
-    it('renders dashboard controls with the expected defaults', () => {
-        const nativeElement = fixture.nativeElement as HTMLElement;
-
-        expect(
-            nativeElement.querySelector(
-                '[data-test-id="toggle-show-dashboard"]'
-            )
-        ).not.toBeNull();
-        expect(
-            nativeElement.querySelector(
-                '[data-test-id="toggle-dashboard-hero"]'
-            )
-        ).not.toBeNull();
-        expect(
-            nativeElement.querySelector(
-                '[data-test-id="toggle-dashboard-rail-live-favorites"]'
-            )
-        ).not.toBeNull();
-        expect(
-            nativeElement.querySelector(
-                '[data-test-id="toggle-dashboard-rail-recently-watched-live"]'
-            )
-        ).not.toBeNull();
-        expect(
-            nativeElement.querySelector(
-                '[data-test-id="toggle-dashboard-rail-favorite-movies-and-series"]'
-            )
-        ).not.toBeNull();
-        expect(component.settingsForm.value.showDashboard).toBe(true);
-        expect(component.settingsForm.value.dashboardRails).toEqual(
-            DEFAULT_DASHBOARD_RAILS
-        );
-        expect(component.settingsForm.value.startupBehavior).toBe(
-            StartupBehavior.FirstView
-        );
-    });
-
-    it('disables dashboard surface controls when the dashboard is off', async () => {
-        const showDashboard = component.settingsForm.get('showDashboard');
-        const dashboardRails = component.settingsForm.get('dashboardRails');
-
-        showDashboard?.setValue(false);
-        await fixture.whenStable();
-
-        expect(dashboardRails?.disabled).toBe(true);
-        expect(
-            component.settingsForm.get('dashboardRails.hero')?.disabled
-        ).toBe(true);
-        expect(
-            component.settingsForm.get('dashboardRails.continueWatching')
-                ?.disabled
-        ).toBe(true);
-
-        showDashboard?.setValue(true);
-        await fixture.whenStable();
-
-        expect(dashboardRails?.enabled).toBe(true);
-        expect(component.settingsForm.get('dashboardRails.hero')?.enabled).toBe(
-            true
-        );
-    });
-
-    it('should save settings on submit', async () => {
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        mockStore.updateSettings.mockResolvedValue(undefined);
-        const updateSettings = jest.spyOn(window.electron, 'updateSettings');
-
-        component.onSubmit();
-        await fixture.whenStable();
-
-        expect(mockStore.updateSettings).toHaveBeenCalledWith({
-            ...component.settingsForm.value,
-            trustedPrivateNetworkEpgUrls: [],
-            trustedInsecureTlsHosts: [],
-        });
-        expect(updateSettings).toHaveBeenCalledWith({
-            ...component.settingsForm.value,
-            trustedPrivateNetworkEpgUrls: [],
-            trustedInsecureTlsHosts: [],
-        });
-    });
-
-    it('clears external player paths in Electron when saved as empty', async () => {
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        mockStore.updateSettings.mockResolvedValue(undefined);
-        const setMpvPlayerPath = jest.spyOn(
-            window.electron,
-            'setMpvPlayerPath'
-        );
-        const setVlcPlayerPath = jest.spyOn(
-            window.electron,
-            'setVlcPlayerPath'
-        );
-
-        component.settingsForm.patchValue({
-            mpvPlayerPath: '',
-            vlcPlayerPath: '',
-        });
-
-        component.onSubmit();
-        await fixture.whenStable();
-
-        expect(setMpvPlayerPath).toHaveBeenCalledWith('');
-        expect(setVlcPlayerPath).toHaveBeenCalledWith('');
-    });
-
-    it('saves external player command-line arguments with the settings payload', async () => {
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        mockStore.updateSettings.mockResolvedValue(undefined);
-        const updateSettings = jest.spyOn(window.electron, 'updateSettings');
-
-        component.settingsForm.patchValue({
-            mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
-            vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
-        });
-
-        component.onSubmit();
-        await fixture.whenStable();
-
-        expect(mockStore.updateSettings).toHaveBeenCalledWith(
-            expect.objectContaining({
-                mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
-                vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
-            })
-        );
-        expect(updateSettings).toHaveBeenCalledWith(
-            expect.objectContaining({
-                mpvPlayerArguments: '--screen=1\n--geometry=1280x720',
-                vlcPlayerArguments: '--qt-fullscreen-screennumber=1',
-            })
-        );
-    });
-
-    it('preserves saved EPG settings when saving from the web settings form', async () => {
-        fixture.destroy();
-        window.electron = undefined as unknown as typeof window.electron;
-
-        const mockStore = settingsStore as unknown as MockSettingsStore;
-        mockStore._setSettings({
-            epgUrl: ['https://example.com/guide.xml'],
-            preferUploadedEpgOverXtream: true,
-        });
-        mockStore.updateSettings.mockResolvedValue(undefined);
-
-        const webFixture = TestBed.createComponent(SettingsComponent);
-        const webComponent = webFixture.componentInstance;
-        webComponent.checkAppVersion = jest.fn();
-        webComponent.fetchLocalIpAddresses = jest
-            .fn()
-            .mockResolvedValue(undefined);
-        webFixture.detectChanges();
-        await webFixture.whenStable();
-
-        webComponent.settingsForm.patchValue({ theme: Theme.DarkTheme });
-        webComponent.onSubmit();
-        await webFixture.whenStable();
-
-        expect(mockStore.updateSettings).toHaveBeenCalledWith(
-            expect.objectContaining({
-                epgUrl: ['https://example.com/guide.xml'],
-                preferUploadedEpgOverXtream: true,
-                theme: Theme.DarkTheme,
-            })
-        );
-
-        webFixture.destroy();
     });
 });
diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts
index 66736cdfc..5535b9c76 100644
--- a/apps/web/src/app/settings/settings.component.ts
+++ b/apps/web/src/app/settings/settings.component.ts
@@ -4,14 +4,11 @@ import {
     computed,
     inject,
     Input,
-    DestroyRef,
     OnDestroy,
     OnInit,
-    signal,
     ViewEncapsulation,
 } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormArray, FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import {
     MAT_DIALOG_DATA,
@@ -20,78 +17,45 @@ import {
 } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { Router } from '@angular/router';
-import {
-    EpgRuntimeBridgeService,
-    EpgService,
-} from '@iptvnator/epg/data-access';
 import { SettingsContextService } from '@iptvnator/workspace/shell/util';
-import { Store } from '@ngrx/store';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { DialogService } from '@iptvnator/ui/components';
-import {
-    selectAllPlaylistsMeta,
-    selectIsEpgAvailable,
-} from '@iptvnator/m3u-state';
-import { take } from 'rxjs';
-import { DataService, RuntimeCapabilitiesService } from '@iptvnator/services';
-import {
-    EmbeddedMpvSupport,
-    CoverSize,
-    ELECTRON_BRIDGE_APP_UPDATE_STATUSES,
-    ElectronBridgeAppUpdateStatus,
-    EpgViewMode,
-    Language,
-    StreamFormat,
-    Theme,
-    VideoPlayer,
-} from '@iptvnator/shared/interfaces';
-import { SettingsStore } from '../services/settings-store.service';
-import { SettingsService } from './../services/settings.service';
+import { RuntimeCapabilitiesService } from '@iptvnator/services';
+import { Language, StreamFormat } from '@iptvnator/shared/interfaces';
+import { BUILD_COMMIT } from '../../environments/build-commit';
 import { SettingsAboutSectionComponent } from './settings-about-section.component';
+import { SettingsAppUpdateFacade } from './settings-app-update.facade';
 import { SettingsBackupSectionComponent } from './settings-backup-section.component';
 import { SettingsDashboardSectionComponent } from './settings-dashboard-section.component';
-import {
-    SettingsDeleteAllPlaylistsDialogComponent,
-    SettingsDeleteAllPlaylistsDialogData,
-} from './settings-delete-all-playlists-dialog.component';
+import { SettingsEmbeddedMpvFacade } from './settings-embedded-mpv.facade';
+import { SettingsEpgFacade } from './settings-epg.facade';
 import { SettingsEpgSectionComponent } from './settings-epg-section.component';
-import {
-    applyEpgUrlsToFormArray,
-    createEpgUrlControl,
-    createSettingsForm,
-    createSettingsFromFormValue,
-} from './settings-form.utils';
+import { SettingsFormFacade } from './settings-form.facade';
 import { SettingsGeneralSectionComponent } from './settings-general-section.component';
+import { SettingsSection } from './settings.models';
 import {
-    SettingsPlaylistDeleteSummary,
-    SettingsSection,
-} from './settings.models';
-import {
+    buildSettingsPlayerOptions,
     buildSettingsSectionNavItems,
     SETTINGS_COVER_SIZE_OPTIONS,
-    SETTINGS_EMBEDDED_PLAYER_OPTIONS,
     SETTINGS_EPG_VIEW_MODE_OPTIONS,
-    SETTINGS_OS_PLAYER_OPTIONS,
     SETTINGS_STARTUP_BEHAVIOR_OPTIONS,
     SETTINGS_THEME_OPTIONS,
 } from './settings-options';
 import { SettingsPlaybackSectionComponent } from './settings-playback-section.component';
+import { SettingsRemoteControlFacade } from './settings-remote-control.facade';
 import { SettingsRemoteControlSectionComponent } from './settings-remote-control-section.component';
 import { SettingsResetSectionComponent } from './settings-reset-section.component';
 import { SettingsSectionScrollDirective } from './settings-section-scroll.directive';
 import { SettingsTmdbSectionComponent } from './settings-tmdb-section.component';
 import { SettingsBackupFacade } from './settings-backup.facade';
 import { SettingsPlaylistResetFacade } from './settings-playlist-reset.facade';
-import {
-    buildRemoveAllProgressLabel,
-    buildSettingsPlaylistDeleteSummary,
-} from './settings-playlist-summary.utils';
 import { SettingsSnackbarService } from './settings-snackbar.service';
-import { AppUpdateReleaseNotesDialogComponent } from './app-update-release-notes-dialog.component';
-
-const APP_UPDATE_STATUS_LOAD_ATTEMPTS = 60;
-const APP_UPDATE_STATUS_LOAD_RETRY_DELAY_MS = 250;
 
+/**
+ * Thin coordinator for the settings page. The behaviour of each section lives
+ * in a dedicated facade the template binds to directly; what stays here is the
+ * page-level wiring: environment capabilities, section navigation, and the
+ * save/close flow that spans several facades.
+ */
 @Component({
     templateUrl: './settings.component.html',
     styleUrls: ['./settings.component.scss'],
@@ -118,33 +82,38 @@ const APP_UPDATE_STATUS_LOAD_RETRY_DELAY_MS = 250;
         SettingsTmdbSectionComponent,
     ],
     providers: [
+        SettingsAppUpdateFacade,
         SettingsBackupFacade,
+        SettingsEmbeddedMpvFacade,
+        SettingsEpgFacade,
+        SettingsFormFacade,
         SettingsPlaylistResetFacade,
+        SettingsRemoteControlFacade,
         SettingsSnackbarService,
     ],
 })
 export class SettingsComponent implements OnInit, OnDestroy {
-    private dialogService = inject(DialogService);
-    public dataService = inject(DataService);
-    private epgService = inject(EpgService);
-    private formBuilder = inject(FormBuilder);
-    private destroyRef = inject(DestroyRef);
-    private router = inject(Router);
-    private settingsService = inject(SettingsService);
-    private settingsSnackbar = inject(SettingsSnackbarService);
-    private store = inject(Store);
-    private translate = inject(TranslateService);
-    private matDialog = inject(MatDialog);
-    private readonly backupFacade = inject(SettingsBackupFacade);
-    private readonly playlistResetFacade = inject(SettingsPlaylistResetFacade);
+    readonly appUpdate = inject(SettingsAppUpdateFacade);
+    readonly backup = inject(SettingsBackupFacade);
+    readonly embeddedMpv = inject(SettingsEmbeddedMpvFacade);
+    readonly epg = inject(SettingsEpgFacade);
+    readonly form = inject(SettingsFormFacade);
+    readonly playlistReset = inject(SettingsPlaylistResetFacade);
+    readonly remoteControl = inject(SettingsRemoteControlFacade);
+
+    private readonly settingsCtx = inject(SettingsContextService);
+    private readonly settingsSnackbar = inject(SettingsSnackbarService);
     private readonly runtime = inject(RuntimeCapabilitiesService);
-    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    private readonly matDialog = inject(MatDialog);
+    private readonly router = inject(Router);
+    private readonly translate = inject(TranslateService);
     private readonly dialogData = inject<{ isDialog: boolean } | null>(
         MAT_DIALOG_DATA,
         { optional: true }
     );
 
     @Input() isDialog = this.dialogData?.isDialog ?? false;
+
     /** List with available languages as enum */
     readonly languageEnum = Language;
 
@@ -153,105 +122,41 @@ export class SettingsComponent implements OnInit, OnDestroy {
 
     /** Flag that indicates whether the app runs in electron environment */
     readonly isDesktop = this.runtime.isElectron;
+    readonly isPwa = this.runtime.isPwa;
     readonly supportsDesktopFileSave = this.runtime.supportsDesktopFileSave;
-    readonly supportsEpg =
-        this.epgBridge.supportsImport && this.epgBridge.supportsDataManagement;
+    readonly supportsEpg = this.form.supportsEpg;
     readonly supportsManagedExternalPlayers =
         this.runtime.supportsManagedExternalPlayers;
     readonly supportsExternalPlayerPathSettings =
         this.runtime.supportsExternalPlayerPathSettings;
     readonly supportsRemoteControl = this.runtime.supportsRemoteControl;
-    readonly embeddedMpvSupport = signal<EmbeddedMpvSupport | null>(null);
-    readonly supportsEmbeddedMpv = computed(
-        () => this.isDesktop && !!this.embeddedMpvSupport()?.supported
-    );
 
-    readonly isPwa = this.runtime.isPwa;
-
-    private readonly settingsCtx = inject(SettingsContextService);
     readonly activeSection = this.settingsCtx.activeSection;
 
-    readonly osPlayers = computed(() => [
-        ...(this.supportsEmbeddedMpv()
-            ? [
-                  {
-                      id: VideoPlayer.EmbeddedMpv,
-                      labelKey: 'SETTINGS.PLAYER_EMBEDDED_MPV',
-                  },
-              ]
-            : []),
-        ...(this.supportsManagedExternalPlayers
-            ? SETTINGS_OS_PLAYER_OPTIONS
-            : []),
-    ]);
+    /** Settings form object */
+    readonly settingsForm = this.form.form;
 
     /** Player options */
-    readonly players = computed(() => [
-        ...SETTINGS_EMBEDDED_PLAYER_OPTIONS,
-        ...this.osPlayers(),
-    ]);
-
-    /** Current version of the app */
-    version = '';
-
-    /** Update message to show */
-    updateMessage = '';
-    readonly appUpdateStatus = signal<ElectronBridgeAppUpdateStatus | null>(
-        null
+    readonly players = computed(() =>
+        buildSettingsPlayerOptions({
+            supportsEmbeddedMpv: this.embeddedMpv.supported(),
+            supportsManagedExternalPlayers: this.supportsManagedExternalPlayers,
+        })
     );
 
-    /** EPG availability flag */
-    epgAvailable$ = this.store.select(selectIsEpgAvailable);
-    readonly playlists = this.store.selectSignal(selectAllPlaylistsMeta);
+    /** Git commit the app was built from (CI builds only) */
+    readonly buildCommit = BUILD_COMMIT;
 
     readonly themeOptions = SETTINGS_THEME_OPTIONS;
     readonly coverSizeOptions = SETTINGS_COVER_SIZE_OPTIONS;
     readonly startupBehaviorOptions = SETTINGS_STARTUP_BEHAVIOR_OPTIONS;
     readonly epgViewModeOptions = SETTINGS_EPG_VIEW_MODE_OPTIONS;
 
-    /** Settings form object */
-    settingsForm = createSettingsForm(this.formBuilder, this.supportsEpg);
-
-    /** Form array with epg sources */
-    epgUrl = this.settingsForm.get('epgUrl') as FormArray;
-
-    /** Local IP addresses for remote control URL display */
-    localIpAddresses = signal<string[]>([]);
-
-    /** Currently visible QR code IP (null = none visible) */
-    visibleQrCodeIp = signal<string | null>(null);
-    readonly isRemovingAllPlaylists =
-        this.playlistResetFacade.isRemovingAllPlaylists;
-    readonly isClearingEpgData = signal(false);
-    readonly isExportingData = this.backupFacade.isExportingData;
-    readonly removeAllProgress = this.playlistResetFacade.removeAllProgress;
-
-    private settingsStore = inject(SettingsStore);
     readonly sectionNavItems: SettingsSection[] = buildSettingsSectionNavItems({
         supportsEpg: this.supportsEpg,
         supportsRemoteControl: this.supportsRemoteControl,
     });
 
-    readonly playlistDeleteSummary = computed<SettingsPlaylistDeleteSummary>(
-        () => buildSettingsPlaylistDeleteSummary(this.playlists())
-    );
-
-    readonly canRemoveAllPlaylists = computed(
-        () =>
-            !this.isRemovingAllPlaylists() &&
-            this.playlistDeleteSummary().total > 0
-    );
-
-    private unsubscribeAppUpdateStatus: (() => void) | null = null;
-
-    readonly removeAllProgressLabel = computed(() => {
-        return buildRemoveAllProgressLabel({
-            isRemovingAllPlaylists: this.isRemovingAllPlaylists(),
-            progress: this.removeAllProgress(),
-            translate: (key, params) => this.translate.instant(key, params),
-        });
-    });
-
     get sectionNav(): SettingsSection[] {
         return this.sectionNavItems.filter((section) => section.visible);
     }
@@ -262,338 +167,31 @@ export class SettingsComponent implements OnInit, OnDestroy {
      */
     async ngOnInit(): Promise<void> {
         // Wait for settings to load before setting the form
-        await this.settingsStore.loadSettings();
-        this.setSettings();
-        this.bindDashboardControlsEnabledState();
-        void this.loadEmbeddedMpvSupport();
-        this.checkAppVersion();
-        this.bindAppUpdateStatusEvents();
-        void this.loadAppUpdateStatus();
-        void this.fetchLocalIpAddresses();
+        await this.form.loadSettings();
+        this.form.hydrateFromStore();
+        this.form.bindDashboardControlsEnabledState();
+        void this.embeddedMpv.load();
+        this.appUpdate.checkAppVersion();
+        this.appUpdate.init();
+        void this.remoteControl.fetchLocalIpAddresses();
 
         if (!this.isDialog) {
             this.settingsCtx.setSections(this.sectionNav);
         }
     }
 
-    private async loadEmbeddedMpvSupport(): Promise<void> {
-        if (!this.isDesktop) {
-            this.embeddedMpvSupport.set({
-                supported: false,
-                platform: 'web',
-                reason: 'Embedded MPV requires the Electron desktop build.',
-            });
-            return;
-        }
-
-        if (!window.electron?.getEmbeddedMpvSupport) {
-            this.embeddedMpvSupport.set({
-                supported: false,
-                platform: window.electron.platform,
-                reason: 'Embedded MPV support is not available in this build.',
-            });
-            return;
-        }
-
-        try {
-            this.embeddedMpvSupport.set(
-                await window.electron.getEmbeddedMpvSupport()
-            );
-        } catch (error) {
-            this.embeddedMpvSupport.set({
-                supported: false,
-                platform: window.electron.platform,
-                reason: error instanceof Error ? error.message : String(error),
-            });
-        }
-    }
-
     ngOnDestroy(): void {
-        this.unsubscribeAppUpdateStatus?.();
-        this.unsubscribeAppUpdateStatus = null;
+        this.appUpdate.dispose();
         this.settingsCtx.reset();
     }
 
-    private bindAppUpdateStatusEvents(): void {
-        if (!this.isDesktop || !window.electron?.onAppUpdateStatusChange) {
-            return;
-        }
-
-        this.unsubscribeAppUpdateStatus =
-            window.electron.onAppUpdateStatusChange((status) => {
-                this.appUpdateStatus.set(status);
-            });
-    }
-
-    private async loadAppUpdateStatus(): Promise<void> {
-        if (!this.isDesktop) {
-            return;
-        }
-
-        let lastError: unknown;
-
-        for (
-            let attempt = 1;
-            attempt <= APP_UPDATE_STATUS_LOAD_ATTEMPTS;
-            attempt += 1
-        ) {
-            const electron = window.electron;
-
-            if (electron?.getAppUpdateStatus) {
-                try {
-                    this.appUpdateStatus.set(
-                        await electron.getAppUpdateStatus()
-                    );
-                    return;
-                } catch (error) {
-                    lastError = error;
-                }
-            }
-
-            if (attempt === APP_UPDATE_STATUS_LOAD_ATTEMPTS) {
-                console.warn(
-                    'Failed to load app update status:',
-                    lastError ??
-                        new Error('Desktop app update bridge is unavailable')
-                );
-                return;
-            }
-
-            await this.waitForAppUpdateStatusRetry();
-        }
-    }
-
-    private async waitForAppUpdateStatusRetry(): Promise<void> {
-        await new Promise<void>((resolve) => {
-            setTimeout(resolve, APP_UPDATE_STATUS_LOAD_RETRY_DELAY_MS);
-        });
-    }
-
-    async checkForAppUpdate(): Promise<void> {
-        if (!this.isDesktop || !window.electron?.checkForAppUpdate) {
-            return;
-        }
-
-        this.appUpdateStatus.set(await window.electron.checkForAppUpdate());
-    }
-
-    async downloadAppUpdate(): Promise<void> {
-        if (!this.isDesktop || !window.electron?.downloadAppUpdate) {
-            return;
-        }
-
-        this.appUpdateStatus.set(await window.electron.downloadAppUpdate());
-    }
-
-    async installAppUpdate(): Promise<void> {
-        if (!this.isDesktop || !window.electron?.installAppUpdate) {
-            return;
-        }
-
-        this.appUpdateStatus.set(await window.electron.installAppUpdate());
-    }
-
-    openManualAppUpdate(): void {
-        const manualDownloadUrl = this.appUpdateStatus()?.manualDownloadUrl;
-
-        if (!manualDownloadUrl) {
-            return;
-        }
-
-        window.open(manualDownloadUrl, '_blank', 'noreferrer');
-    }
-
-    openAppUpdateReleaseNotes(): void {
-        const status = this.appUpdateStatus();
-        const isUpdateRelease =
-            status?.status === ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Available ||
-            status?.status ===
-                ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Downloading ||
-            status?.status === ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Downloaded;
-        const initialReleaseNotesVersion = isUpdateRelease
-            ? (status?.latestVersion ??
-              status?.release?.version ??
-              status?.currentVersion)
-            : status?.currentVersion;
-
-        this.matDialog.open(AppUpdateReleaseNotesDialogComponent, {
-            autoFocus: false,
-            data: {
-                ...(!isUpdateRelease ? { fallbackToLatest: true } : {}),
-                initialVersion: initialReleaseNotesVersion,
-            },
-            maxWidth: 'calc(100vw - 32px)',
-            restoreFocus: true,
-            width: '720px',
-        });
-    }
-
-    /**
-     * Fetches local IP addresses for remote control URL display
-     */
-    async fetchLocalIpAddresses(): Promise<void> {
-        if (
-            this.supportsRemoteControl &&
-            window.electron?.getLocalIpAddresses
-        ) {
-            const addresses = await window.electron.getLocalIpAddresses();
-            this.localIpAddresses.set(addresses);
-        }
-    }
-
-    /**
-     * Toggle QR code visibility for a given IP address
-     */
-    toggleQrCode(ip: string): void {
-        if (this.visibleQrCodeIp() === ip) {
-            this.visibleQrCodeIp.set(null);
-        } else {
-            this.visibleQrCodeIp.set(ip);
-        }
-    }
-
-    /**
-     * Sets saved settings from the indexed db store
-     */
-    setSettings() {
-        const currentSettings = this.settingsStore.getSettings();
-        this.settingsForm.patchValue(currentSettings);
-        this.syncDashboardControlsEnabledState(
-            currentSettings.showDashboard ?? true
-        );
-
-        if (this.supportsEpg && currentSettings.epgUrl) {
-            this.epgUrl.clear();
-            this.setEpgUrls(currentSettings.epgUrl);
-        }
-    }
-
-    private bindDashboardControlsEnabledState(): void {
-        this.settingsForm
-            .get('showDashboard')
-            ?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((showDashboard) =>
-                this.syncDashboardControlsEnabledState(showDashboard ?? true)
-            );
-    }
-
-    private syncDashboardControlsEnabledState(showDashboard: boolean): void {
-        const dashboardRails = this.settingsForm.get('dashboardRails');
-        if (!dashboardRails) {
-            return;
-        }
-
-        if (showDashboard) {
-            dashboardRails.enable({ emitEvent: false });
-        } else {
-            dashboardRails.disable({ emitEvent: false });
-        }
-    }
-
-    selectTheme(theme: Theme): void {
-        if (this.settingsForm.value.theme === theme) {
-            return;
-        }
-
-        this.settingsForm.patchValue({ theme });
-        this.settingsForm.get('theme')?.markAsDirty();
-        this.settingsForm.markAsDirty();
-        this.settingsService.changeTheme(theme);
-    }
-
-    selectCoverSize(size: CoverSize): void {
-        if (this.settingsForm.value.coverSize === size) {
-            return;
-        }
-
-        this.settingsForm.patchValue({ coverSize: size });
-        this.settingsForm.get('coverSize')?.markAsDirty();
-        this.settingsForm.markAsDirty();
-        this.settingsStore.updateSettings({ coverSize: size });
-    }
-
-    selectEpgViewMode(mode: EpgViewMode): void {
-        if (this.settingsForm.value.epgViewMode === mode) {
-            return;
-        }
-
-        this.settingsForm.patchValue({ epgViewMode: mode });
-        this.settingsForm.get('epgViewMode')?.markAsDirty();
-        this.settingsForm.markAsDirty();
-        this.settingsStore.updateSettings({ epgViewMode: mode });
-    }
-
+    /** Picks a recording folder in the desktop shell and stages it in the form */
     async selectRecordingFolder(): Promise<void> {
-        if (
-            !this.isDesktop ||
-            !window.electron?.selectEmbeddedMpvRecordingFolder
-        ) {
-            return;
+        const folder = await this.embeddedMpv.selectRecordingFolder();
+
+        if (folder) {
+            this.form.setRecordingFolder(folder);
         }
-
-        const folder = await window.electron.selectEmbeddedMpvRecordingFolder();
-        if (!folder) {
-            return;
-        }
-
-        this.settingsForm.patchValue({ recordingFolder: folder });
-        this.settingsForm.get('recordingFolder')?.markAsDirty();
-        this.settingsForm.markAsDirty();
-    }
-
-    /**
-     * Sets the epg urls to the form array
-     * @param epgUrls urls of the EPG sources
-     */
-    setEpgUrls(epgUrls: string[] | string): void {
-        applyEpgUrlsToFormArray(this.epgUrl, epgUrls);
-    }
-
-    /**
-     * Checks whether the latest version of the application
-     * is used and updates the version message in the
-     * settings UI
-     */
-    checkAppVersion(): void {
-        this.settingsService
-            .getAppVersion()
-            .pipe(take(1))
-            .subscribe((version) => this.showVersionInformation(version));
-    }
-
-    /**
-     * Updates the message in settings UI about the used
-     * version of the app
-     * @param currentVersion current version of the application
-     */
-    showVersionInformation(currentVersion: string): void {
-        const isOutdated = this.isCurrentVersionOutdated(currentVersion);
-
-        if (isOutdated) {
-            this.updateMessage = `${
-                this.translate.instant(
-                    'SETTINGS.NEW_VERSION_AVAILABLE'
-                ) as string
-            }: ${currentVersion}`;
-        } else {
-            this.updateMessage = this.translate.instant(
-                'SETTINGS.LATEST_VERSION'
-            );
-        }
-    }
-
-    /**
-     * Compares actual with latest version of the
-     * application
-     * @param latestVersion latest version
-     * @returns returns true if an update is available
-     */
-    isCurrentVersionOutdated(latestVersion: string): boolean {
-        this.version = this.dataService.getAppVersion();
-        return this.settingsService.isVersionOutdated(
-            this.version,
-            latestVersion
-        );
     }
 
     /**
@@ -601,59 +199,19 @@ export class SettingsComponent implements OnInit, OnDestroy {
      * the indexed db store
      */
     onSubmit(): void {
-        const settings = this.createSettingsFromFormValue();
+        void this.form.save(() => this.applyChangedSettings());
 
-        this.settingsStore.updateSettings(settings).then(() => {
-            this.applyChangedSettings();
-
-            if (window.electron) {
-                window.electron.updateSettings(settings);
-            }
-
-            if (this.supportsExternalPlayerPathSettings && window.electron) {
-                window.electron.setMpvPlayerPath(settings.mpvPlayerPath);
-                window.electron.setVlcPlayerPath(settings.vlcPlayerPath);
-            }
-        });
         if (this.isDialog) {
             this.matDialog.closeAll();
         }
     }
 
-    private createSettingsFromFormValue() {
-        return createSettingsFromFormValue(
-            this.settingsForm,
-            this.settingsStore.getSettings()
-        );
-    }
-
     /**
      * Applies the changed settings to the app
      */
     applyChangedSettings(): void {
-        this.settingsForm.markAsPristine();
-        if (this.supportsEpg) {
-            let epgUrls = this.settingsForm.value.epgUrl;
-            if (epgUrls) {
-                if (!Array.isArray(epgUrls)) {
-                    epgUrls = [epgUrls];
-                }
-                const validEpgUrls = epgUrls.filter(
-                    (url): url is string =>
-                        typeof url === 'string' && url !== ''
-                );
-                if (validEpgUrls.length > 0) {
-                    // Fetch all EPG URLs at once
-                    this.epgService.fetchEpg(validEpgUrls);
-                }
-            }
-        }
-        this.translate.use(
-            this.settingsForm.value.language ?? Language.ENGLISH
-        );
-        this.settingsService.changeTheme(
-            this.settingsForm.value.theme ?? Theme.SystemTheme
-        );
+        this.form.applySavedSettings();
+        this.epg.fetchConfiguredEpg();
         this.settingsSnackbar.open(
             this.translate.instant('SETTINGS.SETTINGS_SAVED')
         );
@@ -670,102 +228,24 @@ export class SettingsComponent implements OnInit, OnDestroy {
         }
     }
 
-    /**
-     * Force-fetch EPG for a single URL, bypassing the 12-hour freshness check.
-     * The plain fetchEpg would short-circuit on fresh data and click the
-     * refresh button would be a no-op — that's exactly not what the user
-     * intends when clicking "Refresh".
-     */
-    refreshEpg(url: string): void {
-        if (!this.epgBridge.supportsDataManagement || !url) {
-            return;
-        }
-        void this.epgBridge.forceFetchEpg(
-            url,
-            this.settingsStore.getTrustOptions()
+    async exportData(): Promise<void> {
+        await this.backup.exportData(() => this.waitForUiFeedbackFrame());
+    }
+
+    importData(): void {
+        this.backup.importData(() => this.form.hydrateFromStore());
+    }
+
+    removeAll(): void {
+        this.playlistReset.confirmAndRemoveAll(() =>
+            this.waitForUiFeedbackFrame()
         );
     }
 
     /**
-     * Force-fetch every configured EPG URL sequentially. Empty fields are
-     * skipped. Each URL flows through the normal progress panel so the user
-     * gets visible per-URL feedback.
+     * Lets the browser paint the pending busy state before a long running
+     * task blocks the main thread.
      */
-    refreshAllEpg(): void {
-        if (!this.epgBridge.supportsDataManagement) return;
-        const urls = (this.epgUrl.value as string[])
-            .map((url) => url?.trim())
-            .filter((url): url is string => Boolean(url));
-        const options = this.settingsStore.getTrustOptions();
-        urls.forEach((url) => void this.epgBridge.forceFetchEpg(url, options));
-    }
-
-    /**
-     * Initializes new entry in form array for EPG URL
-     */
-    addEpgSource(): void {
-        this.epgUrl.insert(this.epgUrl.length, createEpgUrlControl());
-    }
-
-    /**
-     * Removes entry from form array for EPG URL
-     * @param index index of the item to remove
-     */
-    removeEpgSource(index: number): void {
-        this.epgUrl.removeAt(index);
-        this.settingsForm.markAsDirty();
-    }
-
-    /**
-     * Clears all EPG data from database and immediately re-fetches every
-     * configured URL so the user isn't left staring at an empty state.
-     * Tracks progress with `isClearingEpgData` so the UI can show a spinner
-     * and block double-clicks, and surfaces failures via a dedicated snackbar.
-     */
-    clearEpgData(): void {
-        this.dialogService.openConfirmDialog({
-            title: this.translate.instant('SETTINGS.CLEAR_EPG_DIALOG.TITLE'),
-            message: this.translate.instant(
-                'SETTINGS.CLEAR_EPG_DIALOG.MESSAGE'
-            ),
-            onConfirm: async (): Promise<void> => {
-                if (
-                    !this.epgBridge.supportsDataManagement ||
-                    this.isClearingEpgData()
-                ) {
-                    return;
-                }
-
-                this.isClearingEpgData.set(true);
-                try {
-                    const result = await this.epgBridge.clearEpgData();
-                    if (result && result.success === false) {
-                        throw new Error('Clear EPG returned success=false');
-                    }
-                    this.settingsSnackbar.open(
-                        this.translate.instant('SETTINGS.EPG_DATA_CLEARED')
-                    );
-                    this.refreshAllEpg();
-                } catch (error) {
-                    console.error('Failed to clear EPG data:', error);
-                    this.settingsSnackbar.open(
-                        this.translate.instant('SETTINGS.EPG_DATA_CLEAR_FAILED')
-                    );
-                } finally {
-                    this.isClearingEpgData.set(false);
-                }
-            },
-        });
-    }
-
-    async exportData() {
-        await this.backupFacade.exportData(() => this.waitForUiFeedbackFrame());
-    }
-
-    importData() {
-        this.backupFacade.importData(() => this.setSettings());
-    }
-
     private async waitForUiFeedbackFrame(): Promise<void> {
         if (typeof window.requestAnimationFrame !== 'function') {
             await Promise.resolve();
@@ -776,34 +256,4 @@ export class SettingsComponent implements OnInit, OnDestroy {
             window.requestAnimationFrame(() => resolve());
         });
     }
-
-    removeAll(): void {
-        if (!this.canRemoveAllPlaylists()) {
-            return;
-        }
-
-        this.matDialog
-            .open<
-                SettingsDeleteAllPlaylistsDialogComponent,
-                SettingsDeleteAllPlaylistsDialogData,
-                boolean
-            >(SettingsDeleteAllPlaylistsDialogComponent, {
-                autoFocus: false,
-                data: {
-                    summary: this.playlistDeleteSummary(),
-                },
-                maxWidth: 'calc(100vw - 32px)',
-                restoreFocus: true,
-                width: '460px',
-            })
-            .afterClosed()
-            .pipe(take(1))
-            .subscribe((confirmed) => {
-                if (confirmed) {
-                    void this.playlistResetFacade.removeAllConfirmed(() =>
-                        this.waitForUiFeedbackFrame()
-                    );
-                }
-            });
-    }
 }
diff --git a/apps/web/src/app/settings/test-stubs/settings-test-harness.stub.ts b/apps/web/src/app/settings/test-stubs/settings-test-harness.stub.ts
new file mode 100644
index 000000000..2a4013874
--- /dev/null
+++ b/apps/web/src/app/settings/test-stubs/settings-test-harness.stub.ts
@@ -0,0 +1,340 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    FormsModule,
+    ReactiveFormsModule,
+    UntypedFormBuilder,
+} from '@angular/forms';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialog } from '@angular/material/dialog';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+    EpgRuntimeBridgeService,
+    EpgService,
+} from '@iptvnator/epg/data-access';
+import {
+    selectAllPlaylistsMeta,
+    selectIsEpgAvailable,
+} from '@iptvnator/m3u-state';
+import {
+    DatabaseService,
+    DataService,
+    PlaylistBackupService,
+    PlaylistsService,
+} from '@iptvnator/services';
+import {
+    ELECTRON_BRIDGE_APP_UPDATE_STATUSES,
+    ElectronBridgeAppUpdateStatus,
+    Language,
+    PlaylistMeta,
+    StartupBehavior,
+    StreamFormat,
+    Theme,
+    VideoPlayer,
+} from '@iptvnator/shared/interfaces';
+import { DialogService } from '@iptvnator/ui/components';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { MockModule, MockProvider } from 'ng-mocks';
+import { NgxIndexedDBService } from 'ngx-indexed-db';
+import { from, of } from 'rxjs';
+import { ElectronServiceStub } from '../../services/electron.service.stub';
+import { SettingsStore } from '../../services/settings-store.service';
+import { SettingsService } from '../../services/settings.service';
+import { SettingsComponent } from '../settings.component';
+
+/**
+ * Shared fixtures for the settings specs.
+ *
+ * Both halves of the name matter: the `.stub.ts` suffix keeps the file out of
+ * the Angular app build (`tsconfig.app.json` excludes it), and the
+ * `test-stubs/` directory keeps it out of coverage — `collectCoverageFrom`,
+ * `tools/coverage/run-tier-a-coverage.mjs` and the integrity checker all
+ * exclude that path, so this harness never lands in the coverage ratchet as
+ * production source.
+ */
+
+export const DEFAULT_DASHBOARD_RAILS = {
+    hero: true,
+    continueWatching: true,
+    liveFavorites: true,
+    recentlyWatchedLive: true,
+    favoriteMoviesAndSeries: true,
+    recentSources: true,
+    xtreamRecentlyAdded: true,
+    tmdbTrending: true,
+};
+
+export const DEFAULT_SETTINGS = {
+    player: VideoPlayer.VideoJs,
+    webPlayerSharedControls: false,
+    playerAmbientMode: false,
+    playerUpNextRail: true,
+    streamFormat: StreamFormat.AutoStreamFormat,
+    openStreamOnDoubleClick: false,
+    language: Language.ENGLISH,
+    showCaptions: false,
+    showDashboard: true,
+    startupBehavior: StartupBehavior.FirstView,
+    showExternalPlaybackBar: true,
+    stripCountryPrefix: false,
+    theme: Theme.SystemTheme,
+    mpvPlayerPath: '',
+    mpvPlayerArguments: '',
+    mpvReuseInstance: false,
+    vlcPlayerPath: '',
+    vlcPlayerArguments: '',
+    vlcReuseInstance: false,
+    remoteControl: false,
+    remoteControlPort: 8765,
+    epgUrl: [],
+    recordingFolder: '',
+    embeddedMpvFrameCopy: false,
+    coverSize: 'medium',
+    dashboardRails: DEFAULT_DASHBOARD_RAILS,
+    preferUploadedEpgOverXtream: false,
+    epgViewMode: 'timeline',
+    tmdb: { enabled: false, apiKey: '' },
+};
+
+export const DEFAULT_APP_UPDATE_STATUS: ElectronBridgeAppUpdateStatus = {
+    currentVersion: '0.22.0',
+    manualDownloadUrl: 'https://github.com/4gray/iptvnator/releases/latest',
+    status: ELECTRON_BRIDGE_APP_UPDATE_STATUSES.Idle,
+    supportedSelfUpdate: true,
+};
+
+export class MatSnackBarStub {
+    open = jest.fn();
+}
+
+export class MockRouter {
+    navigateByUrl(url: string): string {
+        return url;
+    }
+}
+
+export class MockSettingsStore {
+    private _settings = signal(DEFAULT_SETTINGS);
+
+    getSettings = () => this._settings();
+
+    getTrustOptions = () => ({
+        trustedPrivateNetworkEpgUrls:
+            (
+                this._settings() as typeof DEFAULT_SETTINGS & {
+                    trustedPrivateNetworkEpgUrls?: string[];
+                }
+            ).trustedPrivateNetworkEpgUrls ?? [],
+        trustedInsecureTlsHosts:
+            (
+                this._settings() as typeof DEFAULT_SETTINGS & {
+                    trustedInsecureTlsHosts?: string[];
+                }
+            ).trustedInsecureTlsHosts ?? [],
+    });
+
+    loadSettings = jest.fn().mockResolvedValue(undefined);
+
+    updateSettings = jest.fn().mockResolvedValue(undefined);
+
+    // Helper method for tests to modify settings
+    _setSettings(newSettings: Partial<typeof DEFAULT_SETTINGS>) {
+        this._settings.set({
+            ...this._settings(),
+            ...newSettings,
+        });
+    }
+}
+
+export class MockSettingsService {
+    getAppVersion = jest.fn().mockReturnValue(from(Promise.resolve('1.0.0')));
+    changeTheme = jest.fn();
+    isVersionOutdated = jest.fn().mockImplementation(
+        (currentVersion: string, latestVersion: string) =>
+            currentVersion.localeCompare(latestVersion, undefined, {
+                numeric: true,
+                sensitivity: 'base',
+            }) < 0
+    );
+}
+
+export function createEpgBridgeStub(): Partial<EpgRuntimeBridgeService> {
+    return {
+        clearEpgData: jest.fn().mockResolvedValue({ success: true }),
+        clearEpgDataForSource: jest.fn().mockResolvedValue({ success: true }),
+        forceFetchEpg: jest.fn().mockResolvedValue({ success: true }),
+        supportsDataManagement: true,
+        supportsImport: true,
+    };
+}
+
+/** The full desktop bridge the settings page expects to be present */
+export function createElectronStub(): typeof window.electron {
+    return {
+        checkEpgFreshness: jest.fn().mockResolvedValue({
+            freshUrls: [],
+            staleUrls: [],
+        }),
+        clearEpgData: jest.fn().mockResolvedValue({ success: true }),
+        clearEpgDataForSource: jest.fn().mockResolvedValue({ success: true }),
+        fetchEpg: jest.fn().mockResolvedValue({ success: true }),
+        forceFetchEpg: jest.fn().mockResolvedValue({ success: true }),
+        getAppVersion: jest.fn().mockResolvedValue('1.0.0'),
+        getAppUpdateStatus: jest
+            .fn()
+            .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
+        getChannelPrograms: jest.fn().mockResolvedValue([]),
+        getEpgChannelsByRange: jest.fn().mockResolvedValue([]),
+        getLocalIpAddresses: jest.fn().mockResolvedValue([]),
+        checkForAppUpdate: jest
+            .fn()
+            .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
+        downloadAppUpdate: jest
+            .fn()
+            .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
+        installAppUpdate: jest
+            .fn()
+            .mockResolvedValue(DEFAULT_APP_UPDATE_STATUS),
+        onAppUpdateStatusChange: jest.fn(() => jest.fn()),
+        openInMpv: jest.fn(),
+        openInVlc: jest.fn(),
+        platform: 'linux',
+        searchEpgPrograms: jest.fn().mockResolvedValue([]),
+        saveFileDialog: jest.fn().mockResolvedValue('/tmp/backup.json'),
+        setMpvPlayerPath: jest.fn().mockResolvedValue(undefined),
+        setVlcPlayerPath: jest.fn().mockResolvedValue(undefined),
+        updateSettings: jest.fn().mockResolvedValue(undefined),
+        writeFile: jest.fn().mockResolvedValue({ success: true }),
+    } as unknown as typeof window.electron;
+}
+
+export const PLAYLIST_IMPORT_DATE = '2026-04-21T00:00:00.000Z';
+
+export function createPlaylistMeta(
+    overrides: Partial<PlaylistMeta> = {}
+): PlaylistMeta {
+    return {
+        _id: overrides._id ?? 'playlist-id',
+        title: overrides.title ?? 'Playlist',
+        count: overrides.count ?? 10,
+        importDate: overrides.importDate ?? PLAYLIST_IMPORT_DATE,
+        autoRefresh: overrides.autoRefresh ?? false,
+        ...overrides,
+    };
+}
+
+export function createDialogRef(
+    result: boolean
+): ReturnType<MatDialog['open']> {
+    return {
+        afterClosed: () => of(result),
+    } as unknown as ReturnType<MatDialog['open']>;
+}
+
+export const BACKUP_EXPORT_RESULT = {
+    defaultFileName: 'iptvnator-playlist-backup-2026-04-21.json',
+    json: '{}',
+    manifest: {
+        kind: 'iptvnator-playlist-backup',
+        version: 1,
+        exportedAt: PLAYLIST_IMPORT_DATE,
+        includeSecrets: true,
+        playlists: [],
+    },
+};
+
+/** Providers every settings spec needs, whether or not it renders the page */
+export function settingsTestProviders(
+    epgBridge: Partial<EpgRuntimeBridgeService>
+) {
+    return [
+        UntypedFormBuilder,
+        { provide: SettingsStore, useClass: MockSettingsStore },
+        MockProvider(EpgService, { fetchEpg: jest.fn() }),
+        { provide: EpgRuntimeBridgeService, useValue: epgBridge },
+        MockProvider(DialogService, { openConfirmDialog: jest.fn() }),
+        MockProvider(MatDialog, { open: jest.fn() }),
+        { provide: SettingsService, useClass: MockSettingsService },
+        { provide: MatSnackBar, useClass: MatSnackBarStub },
+        { provide: DataService, useClass: ElectronServiceStub },
+        { provide: Router, useClass: MockRouter },
+        provideMockStore({
+            selectors: [
+                { selector: selectAllPlaylistsMeta, value: [] },
+                { selector: selectIsEpgAvailable, value: false },
+            ],
+        }),
+        { provide: NgxIndexedDBService, useValue: {} },
+        MockProvider(PlaylistsService, {
+            getAllData: jest.fn().mockReturnValue(of([])),
+            removeAll: jest.fn(),
+        }),
+        MockProvider(DatabaseService, {
+            createOperationId: jest.fn().mockReturnValue('delete-all-op'),
+            deleteAllPlaylists: jest.fn().mockResolvedValue(true),
+        }),
+        MockProvider(PlaylistBackupService, {
+            exportBackup: jest.fn().mockResolvedValue(BACKUP_EXPORT_RESULT),
+            importBackup: jest.fn().mockResolvedValue({
+                imported: 0,
+                merged: 0,
+                skipped: 0,
+                failed: 0,
+                errors: [],
+            }),
+        }),
+    ];
+}
+
+/** TestBed setup for specs that render the whole settings page */
+export function configureSettingsComponentTestBed(
+    epgBridge: Partial<EpgRuntimeBridgeService>
+): void {
+    TestBed.configureTestingModule({
+        providers: settingsTestProviders(epgBridge),
+        imports: [
+            SettingsComponent,
+            HttpClientTestingModule,
+            FormsModule,
+            MockModule(MatSelectModule),
+            MockModule(MatIconModule),
+            MockModule(MatTooltipModule),
+            ReactiveFormsModule,
+            MockModule(RouterTestingModule),
+            MockModule(MatCardModule),
+            MockModule(MatListModule),
+            MockModule(MatFormFieldModule),
+            MockModule(MatCheckboxModule),
+            MockModule(MatDividerModule),
+            TranslateModule.forRoot(),
+        ],
+    }).compileComponents();
+}
+
+/**
+ * `ngOnInit` kicks off a version check and a LAN address lookup; both are
+ * stubbed on the owning facades so tests stay deterministic.
+ */
+export function stubSettingsSideEffects(
+    settingsComponent: SettingsComponent
+): void {
+    jest.spyOn(
+        settingsComponent.appUpdate,
+        'checkAppVersion'
+    ).mockImplementation();
+    jest.spyOn(
+        settingsComponent.remoteControl,
+        'fetchLocalIpAddresses'
+    ).mockResolvedValue(undefined);
+}
diff --git a/apps/web/src/assets/i18n/ar.json b/apps/web/src/assets/i18n/ar.json
index 4293e33aa..9c2ef982f 100644
--- a/apps/web/src/assets/i18n/ar.json
+++ b/apps/web/src/assets/i18n/ar.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "فشل تحديث قائمة التشغيل. الملف المحلي لم يعد متاحًا. تحقق من مسار الملف أو أعد استيراد قائمة التشغيل.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "فشل تحديث قائمة التشغيل. لم يعد بإمكان التطبيق الوصول إلى الملف المحلي.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "نجاح! تم تحديث قوائم التشغيل بنجاح",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "التحديث التلقائي غير مكتمل: تم تحديث {{updated}} من {{total}} من قوائم التشغيل، وفشل {{failed}}.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "التحديث التلقائي غير مكتمل: تم تحديث {{updated}} من {{total}} من قوائم التشغيل، وفشل {{failed}}، وتم تخطي {{skipped}} (بدون رابط أو مسار ملف).",
+            "AUTO_REFRESH_UPDATE_FAILED": "فشل التحديث التلقائي لقوائم التشغيل. لم يتم تحديث أي من قوائم التشغيل الـ {{total}}.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "التحديث التلقائي لقوائم التشغيل: تم تحديث {{updated}} من {{total}}، وتم تخطي {{skipped}} (بدون رابط أو مسار ملف).",
             "AUTO_REFRESH_ENABLED": "تم تفعيل التحديث التلقائي"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "التحقق من المفتاح",
         "TMDB_TEST_SUCCESS": "المفتاح يعمل — استجاب TMDB بنجاح",
         "TMDB_TEST_FAILED": "فشل التحقق — رفض TMDB المفتاح أو تعذر الوصول إليه",
+        "TMDB_CACHE": "ذاكرة التخزين المؤقت للبيانات الوصفية",
+        "TMDB_CACHE_DESCRIPTION": "تُحفظ البيانات الوصفية المنزّلة محلياً لتفتح صفحات التفاصيل فوراً. مسحها يجعل التطبيق يجلب بيانات جديدة عند الزيارة التالية.",
+        "TMDB_CACHE_SIZE": "{{entries}} عنصر · {{size}}",
+        "TMDB_CACHE_CLEAR": "مسح الذاكرة المؤقتة",
+        "TMDB_CACHE_ERROR": "تعذّر قراءة الذاكرة المؤقتة — حاول مجدداً",
         "TMDB_CREDITS": "البيانات الوصفية",
         "TMDB_ATTRIBUTION": "يستخدم هذا المنتج TMDB API ولكنه غير معتمد أو مصدّق من قِبل TMDB.",
         "APP_PREFERENCES": "تفضيلات التطبيق",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "جارٍ المسح…",
         "EPG_URL_ERROR": "القيمة ليست رابطًا صالحًا",
         "VIDEO_PLAYER_DESCRIPTION": "اختر مشغل الفيديو الافتراضي",
+        "WEB_PLAYER_SHARED_CONTROLS": "عناصر تحكم موحّدة لمشغلات الويب (تجريبي)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "استخدم عناصر التحكم المشتركة في IPTVnator مع HTML5 وVideo.js وArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "ملء الخلفية المحيطة",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "تعبئة المساحة حول المشغل بنسخة مشوشة ومعتمة من الملصق بدلاً من الخطوط السوداء.",
+        "PLAYER_UP_NEXT_RAIL": "شريط الحلقات التالية",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "في النوافذ العريضة، تثبيت مشغل المسلسل على اليسار وعرض الحلقات القادمة بجانبه.",
         "STREAM_FORMAT_DESCRIPTION": "اختر تنسيق البث الافتراضي (xtream)",
         "LANGUAGE_DESCRIPTION": "اختر لغة التطبيق",
         "THEME_DESCRIPTION": "اختر السمة البصرية للتطبيق",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "عرض أو إخفاء الترجمات افتراضيًا",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "عرض شريط التشغيل الحالي",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "إبقاء شريط حالة المشغل الخارجي مرئيًا في أسفل مساحة العمل على سطح المكتب.",
+        "STRIP_COUNTRY_PREFIX": "إزالة بادئات البلد من أسماء القنوات",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "يزيل بادئات البلد/المجموعة مثل \"US | \" أو \"UK - \" من أسماء قنوات البث المباشر في جميع أنحاء التطبيق.",
         "VERSION_DESCRIPTION": "الإصدار الحالي للتطبيق",
         "ABOUT_SUBTITLE": "الإصدار وروابط المشروع وطرق دعم IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "بيئة تشغيل MPV المضمّنة",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "MPV المدمج: محرك نسخ الإطارات (تجريبي)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "يُرسم الفيديو على لوحة التطبيق بحيث تظهر القوائم ومربعات الحوار فوقه.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "يسري المفعول بعد إعادة تشغيل التطبيق."
     },
     "THEMES": {
         "DARK_THEME": "داكن",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "رجوع",
             "RETRY": "إعادة المحاولة",
             "STALLED": "يستغرق بدء هذا البث وقتًا أطول من المتوقع.",
             "PLAYBACK_FAILED": "فشل التشغيل عبر MPV المضمّن.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "رجوع 10 ثوانٍ",
             "FORWARD_10_SECONDS": "تقديم 10 ثوانٍ",
             "LIVE_STREAM": "بث مباشر",
+            "PLAYBACK_POSITION": "موضع التشغيل",
             "MUTE": "كتم الصوت",
             "UNMUTE": "إلغاء كتم الصوت",
             "MUTED": "الصوت مكتوم",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "فشل بدء التسجيل.",
             "RECORDING_FAILED_TO_STOP": "فشل إيقاف التسجيل.",
             "SAVED_TO": "تم الحفظ في {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "تشغيل صورة داخل صورة",
+            "EXIT_PICTURE_IN_PICTURE": "إنهاء صورة داخل صورة",
             "ENTER_FULLSCREEN": "ملء الشاشة",
             "EXIT_FULLSCREEN": "الخروج من ملء الشاشة"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "إزالة من المفضلة",
         "ADD_FAVORITE": "إضافة إلى المفضلة",
         "SHOW_DETAILS": "عرض تفاصيل القناة",
+        "MAP_EPG": "ربط قناة دليل البرامج",
         "FAVORITES_UPDATED": "تم تحديث المفضلة!",
         "SELECT_CHANNEL_PLAYBACK": "يرجى اختيار قناة لبدء التشغيل",
         "SORT_BY": "ترتيب حسب",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "عرض ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "ربط قناة دليل البرامج (EPG)",
+        "SUBTITLE": "اختر يدويًا قناة دليل البرامج لـ \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "البحث في قنوات دليل البرامج...",
+        "CURRENT_MAPPING": "الربط الحالي",
+        "NO_MAPPING": "لم يتم تعيين ربط لدليل البرامج",
+        "SAVE": "حفظ الربط",
+        "REMOVE": "إزالة الربط",
+        "CLOSE": "إغلاق",
+        "NO_RESULTS": "لم يتم العثور على قنوات دليل البرامج",
+        "SEARCH_HINT": "اكتب {{min}} أحرف على الأقل للبحث",
+        "SAVED": "تم حفظ ربط دليل البرامج",
+        "REMOVED": "تمت إزالة ربط دليل البرامج",
+        "SAVE_FAILED": "تعذر تحديث ربط دليل البرامج"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "نعم",
     "NO": "لا",
@@ -756,6 +797,8 @@
         "ACTORS": "الممثلون",
         "DIRECTOR": "المخرج",
         "SIMILAR": "مشابه",
+        "CREW_JOB_DIRECTOR": "المخرج",
+        "CREW_JOB_CREATOR": "المبتكر",
         "ACTOR_FILMOGRAPHY": "الأعمال الفنية",
         "ACTOR_FILTER_ALL": "الكل",
         "ACTOR_SCOPE_THIS_PORTAL": "هذه البوابة",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "متوفر في مكتبتك",
         "ACTOR_SEARCH_IN_PORTAL": "البحث في البوابة",
         "ACTOR_BORN": "تاريخ الميلاد:",
+        "ACTOR_DIED": "توفي",
+        "SERIES_STATUS_RETURNING": "مستمر",
+        "SERIES_STATUS_PLANNED": "مخطط",
+        "SERIES_STATUS_IN_PRODUCTION": "قيد الإنتاج",
+        "SERIES_STATUS_ENDED": "منتهي",
+        "SERIES_STATUS_CANCELED": "ملغى",
+        "SERIES_STATUS_PILOT": "حلقة تجريبية",
         "DURATION": "المدة",
         "CAST": "طاقم العمل",
         "EPISODE_RUN_TIME": "مدة الحلقة",
@@ -779,6 +829,7 @@
         "RESTART": "البدء من جديد",
         "CONTINUE_WATCHING": "متابعة المشاهدة",
         "PLAY_FIRST_EPISODE": "تشغيل الحلقة الأولى",
+        "PLAY_EPISODE": "تشغيل الحلقة {{episode}}",
         "RESUME_EPISODE": "استئناف الحلقة",
         "PLAY_NEXT_EPISODE": "تشغيل الحلقة التالية",
         "SERIES_WATCHED": "تمت مشاهدة المسلسل",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "تم نسخ رابط البث إلى الحافظة",
         "COPY_STREAM_URL": "نسخ رابط البث",
         "NOW_PLAYING": "قيد التشغيل",
+        "UP_NEXT": "التالي",
         "CLOSE_PLAYER": "إغلاق المشغل",
         "ABOUT": "نبذة",
         "SEASONS_AND_EPISODES": "المواسم والحلقات",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "هذا المحتوى غير متاح على هذا الخادم",
         "PLAYBACK_ERROR": "فشل الحصول على رابط التشغيل",
         "LOADING_SEASONS": "جارٍ تحميل المواسم...",
+        "LOADING_ALL_CHANNELS": "جارٍ تحميل قائمة القنوات الكاملة…",
+        "REFRESH_CHANNEL_LIST": "تحديث قائمة القنوات",
+        "NO_CHANNELS_IN_CATEGORY": "لا توجد قنوات في هذه الفئة",
+        "ITEM": "عنصر",
+        "ITEMS": "عناصر",
         "NO_EPISODES": "لا توجد حلقات متاحة",
         "ALL_RADIO": "كل الراديو"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "لم يعد بالإمكان فتح هذا التنزيل في المكتبة لأنه تمت إزالة قائمة التشغيل المصدر.",
         "FILE_NOT_FOUND": "هذا الملف الذي تم تنزيله لم يعد متاحًا على القرص.",
         "FILE_ACTION_ERROR": "تعذر إكمال الإجراء على الملف.",
+        "ACTION_FAILED": "فشل الإجراء",
+        "PAUSE": "إيقاف مؤقت",
+        "RESUME": "استئناف",
         "CANCEL": "إلغاء",
         "RETRY": "إعادة المحاولة",
         "REMOVE": "إزالة",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "جارٍ التنزيل",
             "COMPLETED": "مكتمل",
             "FAILED": "فشل",
-            "CANCELED": "ملغى"
+            "CANCELED": "ملغى",
+            "PAUSED": "متوقف مؤقتًا"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/ary.json b/apps/web/src/assets/i18n/ary.json
index 4aad181c8..6f8a3ca06 100644
--- a/apps/web/src/assets/i18n/ary.json
+++ b/apps/web/src/assets/i18n/ary.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "فشل تحديث قائمة التشغيل. الملف المحلي ما بقاش متوفر. تحقق من مسار الملف ولا استورد قائمة التشغيل من جديد.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "فشل تحديث قائمة التشغيل. التطبيق ما قدرش يوصل للملف المحلي.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "نجاح! قوائم التشغيل تحدثات بنجاح",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "التحديث التلقائي ما كملش: تحدّاو {{updated}} من {{total}} ديال قوائم التشغيل، و{{failed}} فشلو.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "التحديث التلقائي ما كملش: تحدّاو {{updated}} من {{total}} ديال قوائم التشغيل، {{failed}} فشلو، و{{skipped}} تخطاو (بلا رابط ولا مسار ملف).",
+            "AUTO_REFRESH_UPDATE_FAILED": "فشل التحديث التلقائي ديال قوائم التشغيل. حتى وحدة من {{total}} ما تحدّاتش.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "التحديث التلقائي ديال قوائم التشغيل: تحدّاو {{updated}} من {{total}}، و{{skipped}} تخطاو (بلا رابط ولا مسار ملف).",
             "AUTO_REFRESH_ENABLED": "التحديث التلقائي مفعل"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "تأكد من المفتاح",
         "TMDB_TEST_SUCCESS": "المفتاح خدام — TMDB جاوب مزيان",
         "TMDB_TEST_FAILED": "التحقق ما نجحش — TMDB رفض المفتاح ولا ما يمكنش الوصول ليه",
+        "TMDB_CACHE": "كاش ديال البيانات الوصفية",
+        "TMDB_CACHE_DESCRIPTION": "البيانات الوصفية اللي تحملات كتبقى محفوظة محلياً باش صفحات التفاصيل تتفتح دغيا. إلا مسحتيها، التطبيق غايجيب بيانات جديدة فالمرة الجاية.",
+        "TMDB_CACHE_SIZE": "{{entries}} عنصر · {{size}}",
+        "TMDB_CACHE_CLEAR": "مسح الكاش",
+        "TMDB_CACHE_ERROR": "ماقدرناش نقراو الكاش — عاود جرب",
         "TMDB_CREDITS": "الميتاداتا",
         "TMDB_ATTRIBUTION": "هاد المنتج كيستعمل TMDB API ولكن ماشي معتمد ولا مصادق عليه من طرف TMDB.",
         "APP_PREFERENCES": "تفضيلات التطبيق",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "جاري المسح…",
         "EPG_URL_ERROR": "القيمة ماشي رابط صحيح",
         "VIDEO_PLAYER_DESCRIPTION": "اختار مشغل الفيديو الافتراضي",
+        "WEB_PLAYER_SHARED_CONTROLS": "عناصر تحكم موحدة لمشغلات الويب (تجريبية)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "استعمل عناصر التحكم المشتركة ديال IPTVnator مع HTML5 وVideo.js وArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "خلفية محيطة",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "ملي المساحة حول المشغل بغلاف معتم وطابت بلاصة الشرائط السوداء.",
+        "PLAYER_UP_NEXT_RAIL": "شريط الحلقات الجاية",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "فالنوافذ العريضة، حط مشغل السلسلة على اليسار وبيّن الحلقات الجاية بحداه.",
         "STREAM_FORMAT_DESCRIPTION": "اختار صيغة البث الافتراضية (xtream)",
         "LANGUAGE_DESCRIPTION": "اختار لغة التطبيق",
         "THEME_DESCRIPTION": "اختار المظهر المرئي للتطبيق",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "وري ولا خفي الترجمة افتراضياً",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "وري شريط التشغيل الحالي",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "خلي شريط حالة المشغل الخارجي ظاهر في الأسفل ديال مساحة العمل على سطح المكتب.",
+        "STRIP_COUNTRY_PREFIX": "حيد بادئات البلد من أسماء القنوات",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "كيحيد بادئات البلد/المجموعة بحال \"US | \" ولا \"UK - \" من أسماء قنوات البث المباشر فكامل التطبيق.",
         "VERSION_DESCRIPTION": "الإصدار الحالي ديال التطبيق",
         "ABOUT_SUBTITLE": "الإصدار، روابط المشروع، وطرق دعم IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "وقت تشغيل MPV المدمج",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "MPV المدمج: محرك نسخ الإطارات (تجريبي)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "الفيديو كيترسم على لوحة التطبيق باش القوائم والحوارات يبانو فوقو.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "غادي يخدم من بعد ما تعاود تشغل التطبيق."
     },
     "THEMES": {
         "DARK_THEME": "داكن",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "رجوع",
             "RETRY": "حاول مرة أخرى",
             "STALLED": "هاد البث كياخد وقت كثر من المتوقع باش يبدا.",
             "PLAYBACK_FAILED": "فشل التشغيل بـ MPV المدمج.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "رجع 10 ثواني",
             "FORWARD_10_SECONDS": "قدّم 10 ثواني",
             "LIVE_STREAM": "بث مباشر",
+            "PLAYBACK_POSITION": "موضع التشغيل",
             "MUTE": "كتم الصوت",
             "UNMUTE": "رجّع الصوت",
             "MUTED": "الصوت مكتوم",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "التسجيل ما قدرش يبدا.",
             "RECORDING_FAILED_TO_STOP": "التسجيل ما قدرش يتوقف.",
             "SAVED_TO": "تحفظ في {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "شغّل صورة داخل صورة",
+            "EXIT_PICTURE_IN_PICTURE": "خرج من صورة داخل صورة",
             "ENTER_FULLSCREEN": "دخل لملء الشاشة",
             "EXIT_FULLSCREEN": "خرج من ملء الشاشة"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "حيد من المفضلة",
         "ADD_FAVORITE": "زيد للمفضلة",
         "SHOW_DETAILS": "وري تفاصيل القناة",
+        "MAP_EPG": "ربط قناة ديال EPG",
         "FAVORITES_UPDATED": "المفضلة تحدثات!",
         "SELECT_CHANNEL_PLAYBACK": "عفاك اختار قناة باش يبدا التشغيل",
         "SORT_BY": "رتب بـ",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "وري ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "ربط قناة ديال EPG",
+        "SUBTITLE": "اختار يدويا قناة EPG لـ \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "قلب على قنوات EPG...",
+        "CURRENT_MAPPING": "الربط الحالي",
+        "NO_MAPPING": "ما كاين حتى ربط ديال EPG",
+        "SAVE": "سجل الربط",
+        "REMOVE": "حيد الربط",
+        "CLOSE": "سد",
+        "NO_RESULTS": "ما لقينا حتى قناة EPG",
+        "SEARCH_HINT": "كتب على الأقل {{min}} حروف باش تقلب",
+        "SAVED": "تسجل الربط ديال EPG",
+        "REMOVED": "تحيد الربط ديال EPG",
+        "SAVE_FAILED": "ما قدرناش نبدلو الربط ديال EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "آه",
     "NO": "لا",
@@ -756,6 +797,8 @@
         "ACTORS": "الممثلون",
         "DIRECTOR": "المخرج",
         "SIMILAR": "بحال هادو",
+        "CREW_JOB_DIRECTOR": "المخرج",
+        "CREW_JOB_CREATOR": "المبتكر",
         "ACTOR_FILMOGRAPHY": "الأفلام ديالو",
         "ACTOR_FILTER_ALL": "كلشي",
         "ACTOR_SCOPE_THIS_PORTAL": "هاد البوابة",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "كاين فالمكتبة ديالك",
         "ACTOR_SEARCH_IN_PORTAL": "قلب فالبوابة",
         "ACTOR_BORN": "مزداد:",
+        "ACTOR_DIED": "توفا",
+        "SERIES_STATUS_RETURNING": "مستمر",
+        "SERIES_STATUS_PLANNED": "مخطط",
+        "SERIES_STATUS_IN_PRODUCTION": "كيتصور",
+        "SERIES_STATUS_ENDED": "سالا",
+        "SERIES_STATUS_CANCELED": "تلغا",
+        "SERIES_STATUS_PILOT": "حلقة تجريبية",
         "DURATION": "المدة",
         "CAST": "طاقم التمثيل",
         "EPISODE_RUN_TIME": "مدة تشغيل الحلقة",
@@ -779,6 +829,7 @@
         "RESTART": "بدا من الأول",
         "CONTINUE_WATCHING": "كمل المشاهدة",
         "PLAY_FIRST_EPISODE": "شغل الحلقة الأولى",
+        "PLAY_EPISODE": "شغل الحلقة {{episode}}",
         "RESUME_EPISODE": "كمل الحلقة",
         "PLAY_NEXT_EPISODE": "شغل الحلقة الجاية",
         "SERIES_WATCHED": "السلسلة متشافة",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "رابط البث تنقل للحافظة",
         "COPY_STREAM_URL": "نسخ رابط البث",
         "NOW_PLAYING": "كيتشغل دابا",
+        "UP_NEXT": "اللي جاي",
         "CLOSE_PLAYER": "سد المشغل",
         "ABOUT": "حول",
         "SEASONS_AND_EPISODES": "المواسم والحلقات",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "هاد المحتوى ما متوفرش على هاد السيرفر",
         "PLAYBACK_ERROR": "فشل جلب رابط التشغيل",
         "LOADING_SEASONS": "جاري تشريج المواسم...",
+        "LOADING_ALL_CHANNELS": "كيتم تحميل لائحة القنوات كاملة…",
+        "REFRESH_CHANNEL_LIST": "تحديث لائحة القنوات",
+        "NO_CHANNELS_IN_CATEGORY": "ماكاينش قنوات فهاد الصنف",
+        "ITEM": "عنصر",
+        "ITEMS": "عناصر",
         "NO_EPISODES": "ما كاينش حلقات متوفرة",
         "ALL_RADIO": "All radio"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "هاد التحميل ما يقدرش يتحل في المكتبة حيت قائمة التشغيل المصدر تحيدات.",
         "FILE_NOT_FOUND": "هاد الملف المحمل ما بقاش متوفر على القرص.",
         "FILE_ACTION_ERROR": "العملية على الملف ما تكملاتش.",
+        "ACTION_FAILED": "العملية ما نجحاتش",
+        "PAUSE": "وقّف مؤقتاً",
+        "RESUME": "كمّل",
         "CANCEL": "إلغاء",
         "RETRY": "حاول مرة أخرى",
         "REMOVE": "حيد",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "جاري التحميل",
             "COMPLETED": "كمل",
             "FAILED": "فشل",
-            "CANCELED": "تلغى"
+            "CANCELED": "تلغى",
+            "PAUSED": "موقوف مؤقتاً"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/by.json b/apps/web/src/assets/i18n/by.json
index 1e92b244f..12ef0bfb5 100644
--- a/apps/web/src/assets/i18n/by.json
+++ b/apps/web/src/assets/i18n/by.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Не ўдалося абнавіць плэйліст. Лакальны файл больш недаступны. Праверце шлях да файла або паўторна імпартуйце плэйліст.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Не ўдалося абнавіць плэйліст. Праграма больш не мае доступу да лакальнага файла.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Гатова! Плэйлісты былі паспяхова абноўлены",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Аўтаабнаўленне не завершана: абноўлена {{updated}} з {{total}} плэйлістоў, не ўдалося — {{failed}}.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Аўтаабнаўленне не завершана: абноўлена {{updated}} з {{total}} плэйлістоў, не ўдалося — {{failed}}, прапушчана {{skipped}} (няма URL або шляху да файла).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Аўтаабнаўленне плэйлістоў не ўдалося. Ніводзін з {{total}} плэйлістоў не быў абноўлены.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Аўтаабнаўленне плэйлістоў: абноўлена {{updated}} з {{total}}, прапушчана {{skipped}} (няма URL або шляху да файла).",
             "AUTO_REFRESH_ENABLED": "Аўтаабнаўленне ўключана"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Праверыць ключ",
         "TMDB_TEST_SUCCESS": "Ключ працуе — TMDB паспяхова адказаў",
         "TMDB_TEST_FAILED": "Праверка не ўдалася — TMDB адхіліў ключ або недаступны",
+        "TMDB_CACHE": "Кэш метаданых",
+        "TMDB_CACHE_DESCRIPTION": "Спампаваныя метаданыя захоўваюцца лакальна, каб старонкі дэталяў адкрываліся імгненна. Пасля ачысткі праграма загрузіць свежыя даныя пры наступным адкрыцці.",
+        "TMDB_CACHE_SIZE": "{{entries}} запісаў · {{size}}",
+        "TMDB_CACHE_CLEAR": "Ачысціць кэш",
+        "TMDB_CACHE_ERROR": "Не ўдалося прачытаць кэш — паспрабуйце зноў",
         "TMDB_CREDITS": "Метаданыя",
         "TMDB_ATTRIBUTION": "Гэты прадукт выкарыстоўвае TMDB API, але не ўхвалены і не сертыфікаваны TMDB.",
         "APP_PREFERENCES": "Параметры праграмы",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Ачышчаецца...",
         "EPG_URL_ERROR": "Уведзенае значэнне не з'яўляецца URL-адрасам.",
         "VIDEO_PLAYER_DESCRIPTION": "Выбраць стандартны відэапрайгравальнік",
+        "WEB_PLAYER_SHARED_CONTROLS": "Адзіныя элементы кіравання для вэб-прайгравальнікаў (эксперыментальна)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Выкарыстоўваць агульныя элементы кіравання IPTVnator у HTML5, Video.js і ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Атмасфернае запаўненне",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Запаўніць прастор вакол плэйра размытай, затемнёнай вокладкай замяст чорных палос.",
+        "PLAYER_UP_NEXT_RAIL": "Панэль наступных эпізодаў",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "На шырокіх вокнах замацоўваць прайгравальнік серыяла злева і паказваць наступныя эпізоды побач з ім.",
         "STREAM_FORMAT_DESCRIPTION": "Выберыце фармат патоку па змаўчанні (xtream)",
         "LANGUAGE_DESCRIPTION": "Выбраць мову праграмы",
         "THEME_DESCRIPTION": "Выбраць візуальную тэму афармлення",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Паказаць або схаваць субтытры па змаўчанні.",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Паказаць ніжнюю панэль прайгравання",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Пакідаць панэль стану знешняга прайгравальніка бачнай унізе працоўнай прасторы на дэсктопе.",
+        "STRIP_COUNTRY_PREFIX": "Выдаляць прэфіксы краін з назваў каналаў",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Выдаляе прэфіксы краін/груп, такія як \"US | \" або \"UK - \", з назваў каналаў прамых трансляцый ва ўсёй праграме.",
         "VERSION_DESCRIPTION": "Бягучая версія праграмы",
         "ABOUT_SUBTITLE": "Версія, спасылкі праекта і спосабы падтрымаць IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Асяроддзе ўбудаванага MPV",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: рухавік frame-copy (эксперыментальна)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Відэа малюецца на канвасе праграмы, таму меню і дыялогі паказваюцца па-над ім.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Пачне дзейнічаць пасля перазапуску праграмы."
     },
     "THEMES": {
         "DARK_THEME": "Цёмная",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Назад",
             "RETRY": "Паўтарыць",
             "STALLED": "Гэты паток запускаецца даўжэй, чым чакалася.",
             "PLAYBACK_FAILED": "Не ўдалося прайграць праз убудаваны MPV.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Назад на 10 секунд",
             "FORWARD_10_SECONDS": "Наперад на 10 секунд",
             "LIVE_STREAM": "Прамая трансляцыя",
+            "PLAYBACK_POSITION": "Пазіцыя прайгравання",
             "MUTE": "Адключыць гук",
             "UNMUTE": "Уключыць гук",
             "MUTED": "Гук адключаны",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Не ўдалося пачаць запіс.",
             "RECORDING_FAILED_TO_STOP": "Не ўдалося спыніць запіс.",
             "SAVED_TO": "Захавана ў {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Уключыць рэжым «выява ў выяве»",
+            "EXIT_PICTURE_IN_PICTURE": "Выйсці з рэжыму «выява ў выяве»",
             "ENTER_FULLSCREEN": "Увайсці ў поўнаэкранны рэжым",
             "EXIT_FULLSCREEN": "Выйсці з поўнаэкраннага рэжыму"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Выдаліць са спісу фаварытаў",
         "ADD_FAVORITE": "Дадаць у выбранае",
         "SHOW_DETAILS": "Паказаць інфармацыю аб канале",
+        "MAP_EPG": "Прывязаць канал EPG",
         "FAVORITES_UPDATED": "Спіс фаварытаў быў абноўлены!",
         "SELECT_CHANNEL_PLAYBACK": "Калі ласка, выберыце канал, каб пачаць прайграванне",
         "SORT_BY": "Сартаваць па",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "паказаць ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Прывязка канала EPG",
+        "SUBTITLE": "Выберыце канал EPG для \"{{channelName}}\" уручную",
+        "SEARCH_PLACEHOLDER": "Пошук каналаў EPG...",
+        "CURRENT_MAPPING": "Бягучая прывязка",
+        "NO_MAPPING": "Прывязка EPG не зададзена",
+        "SAVE": "Захаваць прывязку",
+        "REMOVE": "Выдаліць прывязку",
+        "CLOSE": "Закрыць",
+        "NO_RESULTS": "Каналы EPG не знойдзены",
+        "SEARCH_HINT": "Увядзіце не менш за {{min}} сімвалы для пошуку",
+        "SAVED": "Прывязка EPG захавана",
+        "REMOVED": "Прывязка EPG выдалена",
+        "SAVE_FAILED": "Не ўдалося абнавіць прывязку EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Так",
     "NO": "Не",
@@ -756,6 +797,8 @@
         "ACTORS": "Акцёры",
         "DIRECTOR": "Рэжысёр",
         "SIMILAR": "Падобнае",
+        "CREW_JOB_DIRECTOR": "Рэжысёр",
+        "CREW_JOB_CREATOR": "Стваральнік",
         "ACTOR_FILMOGRAPHY": "Фільмаграфія",
         "ACTOR_FILTER_ALL": "Усе",
         "ACTOR_SCOPE_THIS_PORTAL": "Гэты партал",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Ёсць у вашай бібліятэцы",
         "ACTOR_SEARCH_IN_PORTAL": "Пошук на партале",
         "ACTOR_BORN": "Нарадзіўся:",
+        "ACTOR_DIED": "Памёр",
+        "SERIES_STATUS_RETURNING": "Працягваецца",
+        "SERIES_STATUS_PLANNED": "Запланаваны",
+        "SERIES_STATUS_IN_PRODUCTION": "У вытворчасці",
+        "SERIES_STATUS_ENDED": "Завершаны",
+        "SERIES_STATUS_CANCELED": "Скасаваны",
+        "SERIES_STATUS_PILOT": "Пілот",
         "DURATION": "Працягласць",
         "CAST": "Акцёрскі склад",
         "EPISODE_RUN_TIME": "Працягласць эпізоду",
@@ -779,6 +829,7 @@
         "RESTART": "Спачатку",
         "CONTINUE_WATCHING": "Працягнуць прагляд",
         "PLAY_FIRST_EPISODE": "Прайграць першы эпізод",
+        "PLAY_EPISODE": "Прайграць эпізод {{episode}}",
         "RESUME_EPISODE": "Працягнуць эпізод",
         "PLAY_NEXT_EPISODE": "Прайграць наступны эпізод",
         "SERIES_WATCHED": "Серыял прагледжаны",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL-адрас патоку быў скапіяваны ў буфер абмену.",
         "COPY_STREAM_URL": "Капіраваць URL-адрас патоку",
         "NOW_PLAYING": "Зараз прайграецца",
+        "UP_NEXT": "Далей",
         "CLOSE_PLAYER": "Закрыць прайгравальнік",
         "ABOUT": "Пра фільм",
         "SEASONS_AND_EPISODES": "Сезоны і эпізоды",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Гэты кантэнт недаступны на дадзеным серверы",
         "PLAYBACK_ERROR": "Не ўдалося атрымаць URL для прайгравання",
         "LOADING_SEASONS": "Загрузка сезонаў...",
+        "LOADING_ALL_CHANNELS": "Загрузка поўнага спісу каналаў…",
+        "REFRESH_CHANNEL_LIST": "Абнавіць спіс каналаў",
+        "NO_CHANNELS_IN_CATEGORY": "У гэтай катэгорыі няма каналаў",
+        "ITEM": "элемент",
+        "ITEMS": "элементаў",
         "NO_EPISODES": "Няма даступных эпізодаў",
         "ALL_RADIO": "Усе радыё"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Гэта спампаванне больш нельга адкрыць у бібліятэцы, бо яго зыходны плэйліст быў выдалены.",
         "FILE_NOT_FOUND": "Гэты спампаваны файл больш недаступны на дыску.",
         "FILE_ACTION_ERROR": "Не ўдалося выканаць дзеянне з файлам.",
+        "ACTION_FAILED": "Дзеянне не выканана",
+        "PAUSE": "Паўза",
+        "RESUME": "Узнавіць",
         "CANCEL": "Скасаваць",
         "RETRY": "Паўтарыць",
         "REMOVE": "Выдаліць",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Спампоўваецца",
             "COMPLETED": "Завершана",
             "FAILED": "Няўдала",
-            "CANCELED": "Скасавана"
+            "CANCELED": "Скасавана",
+            "PAUSED": "На паўзе"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/de.json b/apps/web/src/assets/i18n/de.json
index 4bb53182e..8786a0736 100644
--- a/apps/web/src/assets/i18n/de.json
+++ b/apps/web/src/assets/i18n/de.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Aktualisierung der Playlist fehlgeschlagen. Die lokale Datei ist nicht mehr verfügbar. Überprüfen Sie den Dateipfad oder importieren Sie die Playlist erneut.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Aktualisierung der Playlist fehlgeschlagen. Die App kann nicht mehr auf die lokale Datei zugreifen.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Erfolg! Die Playlists wurden erfolgreich aktualisiert",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Auto-Refresh unvollständig: {{updated}} von {{total}} Playlists aktualisiert, {{failed}} fehlgeschlagen.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Auto-Refresh unvollständig: {{updated}} von {{total}} Playlists aktualisiert, {{failed}} fehlgeschlagen, {{skipped}} übersprungen (keine URL und kein Dateipfad).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Auto-Refresh der Playlists fehlgeschlagen. Keine der {{total}} Playlists konnte aktualisiert werden.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Auto-Refresh der Playlists: {{updated}} von {{total}} aktualisiert, {{skipped}} übersprungen (keine URL und kein Dateipfad).",
             "AUTO_REFRESH_ENABLED": "Auto-Refresh aktiviert"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Schlüssel prüfen",
         "TMDB_TEST_SUCCESS": "Der Schlüssel funktioniert — TMDB hat erfolgreich geantwortet",
         "TMDB_TEST_FAILED": "Prüfung fehlgeschlagen — TMDB hat den Schlüssel abgelehnt oder ist nicht erreichbar",
+        "TMDB_CACHE": "Metadaten-Cache",
+        "TMDB_CACHE_DESCRIPTION": "Heruntergeladene Metadaten werden lokal gespeichert, damit Detailseiten sofort öffnen. Nach dem Leeren lädt die App beim nächsten Besuch frische Daten.",
+        "TMDB_CACHE_SIZE": "{{entries}} Einträge · {{size}}",
+        "TMDB_CACHE_CLEAR": "Cache leeren",
+        "TMDB_CACHE_ERROR": "Cache konnte nicht gelesen werden — erneut versuchen",
         "TMDB_CREDITS": "Metadaten",
         "TMDB_ATTRIBUTION": "Dieses Produkt verwendet die TMDB API, wird jedoch nicht von TMDB unterstützt oder zertifiziert.",
         "APP_PREFERENCES": "App-Einstellungen",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Wird gelöscht…",
         "EPG_URL_ERROR": "Der Wert ist keine gültige URL",
         "VIDEO_PLAYER_DESCRIPTION": "Wählen Sie den Standard-Videoplayer aus",
+        "WEB_PLAYER_SHARED_CONTROLS": "Einheitliche Steuerung für Web-Player (experimentell)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Verwendet die gemeinsamen IPTVnator-Steuerelemente in HTML5, Video.js und ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Umgebungs-Hintergrund",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Füllt den Bereich um den Player mit einem unscharfen, gedimmten Poster auf, anstelle von einfachen schwarzen Balken.",
+        "PLAYER_UP_NEXT_RAIL": "Folgenleiste „Als Nächstes“",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Dockt den Serienplayer in breiten Fenstern links an und zeigt daneben die kommenden Folgen an.",
         "STREAM_FORMAT_DESCRIPTION": "Standard-Streamformat auswählen (Xtream)",
         "LANGUAGE_DESCRIPTION": "Wählen Sie die Sprache der Anwendung aus",
         "THEME_DESCRIPTION": "Wählen Sie das visuelle Thema der Anwendung aus",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Untertitel standardmäßig ein- oder ausblenden",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Now-Playing-Fußleiste anzeigen",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Zeigt die Statusleiste für externe Player unten im Arbeitsbereich auf dem Desktop an.",
+        "STRIP_COUNTRY_PREFIX": "Länderpräfixe aus Sendernamen entfernen",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Entfernt Länder-/Gruppenpräfixe wie \"US | \" oder \"UK - \" aus den Namen von Live-Sendern in der gesamten App.",
         "VERSION_DESCRIPTION": "Aktuelle Version der Anwendung",
         "ABOUT_SUBTITLE": "Version, Projekt-Links und Möglichkeiten, IPTVnator zu unterstützen.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Eingebettete MPV-Laufzeit",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: Frame-Copy-Engine (experimentell)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Das Video wird auf die App-Leinwand gerendert, sodass Menüs und Dialoge darüber liegen.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Wird nach einem Neustart der App wirksam."
     },
     "THEMES": {
         "DARK_THEME": "Dunkel",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Zurück",
             "RETRY": "Erneut versuchen",
             "STALLED": "Der Start dieses Streams dauert länger als erwartet.",
             "PLAYBACK_FAILED": "Die Wiedergabe mit eingebettetem MPV ist fehlgeschlagen.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "10 Sekunden zurück",
             "FORWARD_10_SECONDS": "10 Sekunden vor",
             "LIVE_STREAM": "Live-Stream",
+            "PLAYBACK_POSITION": "Wiedergabeposition",
             "MUTE": "Stummschalten",
             "UNMUTE": "Stummschaltung aufheben",
             "MUTED": "Stummgeschaltet",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Aufnahme konnte nicht gestartet werden.",
             "RECORDING_FAILED_TO_STOP": "Aufnahme konnte nicht gestoppt werden.",
             "SAVED_TO": "Gespeichert unter {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Bild-in-Bild starten",
+            "EXIT_PICTURE_IN_PICTURE": "Bild-in-Bild beenden",
             "ENTER_FULLSCREEN": "Vollbild aktivieren",
             "EXIT_FULLSCREEN": "Vollbild beenden"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Aus Favoritenliste entfernen",
         "ADD_FAVORITE": "Zu Favoriten hinzufügen",
         "SHOW_DETAILS": "Senderdetails anzeigen",
+        "MAP_EPG": "EPG-Kanal zuordnen",
         "FAVORITES_UPDATED": "Favoriten wurden aktualisiert!",
         "SELECT_CHANNEL_PLAYBACK": "Bitte wählen Sie einen Sender aus, um die Wiedergabe zu starten",
         "SORT_BY": "Sortieren nach",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "anzeigen ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "EPG-Kanal zuordnen",
+        "SUBTITLE": "EPG-Kanal für \"{{channelName}}\" manuell auswählen",
+        "SEARCH_PLACEHOLDER": "EPG-Kanäle durchsuchen...",
+        "CURRENT_MAPPING": "Aktuelle Zuordnung",
+        "NO_MAPPING": "Keine EPG-Zuordnung festgelegt",
+        "SAVE": "Zuordnung speichern",
+        "REMOVE": "Zuordnung entfernen",
+        "CLOSE": "Schließen",
+        "NO_RESULTS": "Keine EPG-Kanäle gefunden",
+        "SEARCH_HINT": "Mindestens {{min}} Zeichen zum Suchen eingeben",
+        "SAVED": "EPG-Zuordnung gespeichert",
+        "REMOVED": "EPG-Zuordnung entfernt",
+        "SAVE_FAILED": "EPG-Zuordnung konnte nicht aktualisiert werden"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Ja",
     "NO": "Nein",
@@ -756,6 +797,8 @@
         "ACTORS": "Schauspieler",
         "DIRECTOR": "Regisseur",
         "SIMILAR": "Ähnliche Titel",
+        "CREW_JOB_DIRECTOR": "Regisseur",
+        "CREW_JOB_CREATOR": "Schöpfer",
         "ACTOR_FILMOGRAPHY": "Filmografie",
         "ACTOR_FILTER_ALL": "Alle",
         "ACTOR_SCOPE_THIS_PORTAL": "Dieses Portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "In Ihrer Bibliothek",
         "ACTOR_SEARCH_IN_PORTAL": "Im Portal suchen",
         "ACTOR_BORN": "Geboren:",
+        "ACTOR_DIED": "Gestorben",
+        "SERIES_STATUS_RETURNING": "Laufend",
+        "SERIES_STATUS_PLANNED": "Geplant",
+        "SERIES_STATUS_IN_PRODUCTION": "In Produktion",
+        "SERIES_STATUS_ENDED": "Abgeschlossen",
+        "SERIES_STATUS_CANCELED": "Abgesetzt",
+        "SERIES_STATUS_PILOT": "Pilot",
         "DURATION": "Dauer",
         "CAST": "Gießen",
         "EPISODE_RUN_TIME": "Laufzeit der Episode",
@@ -779,6 +829,7 @@
         "RESTART": "Neu starten",
         "CONTINUE_WATCHING": "Weiter schauen",
         "PLAY_FIRST_EPISODE": "Erste Folge abspielen",
+        "PLAY_EPISODE": "Folge {{episode}} abspielen",
         "RESUME_EPISODE": "Folge fortsetzen",
         "PLAY_NEXT_EPISODE": "Nächste Folge abspielen",
         "SERIES_WATCHED": "Serie angesehen",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "Stream-URL in die Zwischenablage kopiert",
         "COPY_STREAM_URL": "Stream-URL kopieren",
         "NOW_PLAYING": "Wird wiedergegeben",
+        "UP_NEXT": "Als Nächstes",
         "CLOSE_PLAYER": "Player schließen",
         "ABOUT": "Info",
         "SEASONS_AND_EPISODES": "Staffeln und Folgen",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Dieser Inhalt ist auf diesem Server nicht verfügbar",
         "PLAYBACK_ERROR": "Wiedergabe-URL konnte nicht abgerufen werden",
         "LOADING_SEASONS": "Staffeln werden geladen …",
+        "LOADING_ALL_CHANNELS": "Vollständige Senderliste wird geladen…",
+        "REFRESH_CHANNEL_LIST": "Senderliste aktualisieren",
+        "NO_CHANNELS_IN_CATEGORY": "Keine Sender in dieser Kategorie",
+        "ITEM": "Element",
+        "ITEMS": "Elemente",
         "NO_EPISODES": "Keine Episoden verfügbar",
         "ALL_RADIO": "Alle Radiosender"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Dieser Download kann nicht mehr in der Bibliothek geöffnet werden, weil die zugehörige Playlist entfernt wurde.",
         "FILE_NOT_FOUND": "Diese heruntergeladene Datei ist auf der Festplatte nicht mehr verfügbar.",
         "FILE_ACTION_ERROR": "Die Dateiaktion konnte nicht ausgeführt werden.",
+        "ACTION_FAILED": "Aktion fehlgeschlagen",
+        "PAUSE": "Pausieren",
+        "RESUME": "Fortsetzen",
         "CANCEL": "Abbrechen",
         "RETRY": "Wiederholen",
         "REMOVE": "Entfernen",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Wird heruntergeladen",
             "COMPLETED": "Abgeschlossen",
             "FAILED": "Fehlgeschlagen",
-            "CANCELED": "Abgebrochen"
+            "CANCELED": "Abgebrochen",
+            "PAUSED": "Pausiert"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/el.json b/apps/web/src/assets/i18n/el.json
index 70b2795e3..8ca4913ce 100644
--- a/apps/web/src/assets/i18n/el.json
+++ b/apps/web/src/assets/i18n/el.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Η ανανέωση της λίστας αναπαραγωγής απέτυχε. Το τοπικό αρχείο δεν είναι πλέον διαθέσιμο. Ελέγξτε τη διαδρομή του αρχείου ή εισαγάγετε ξανά τη λίστα αναπαραγωγής.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Η ανανέωση της λίστας αναπαραγωγής απέτυχε. Η εφαρμογή δεν έχει πλέον πρόσβαση στο τοπικό αρχείο.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Επιτυχία! Οι λίστες αναπαραγωγής ενημερώθηκαν με επιτυχία",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Η αυτόματη ανανέωση δεν ολοκληρώθηκε: ενημερώθηκαν {{updated}} από {{total}} λίστες αναπαραγωγής, {{failed}} απέτυχαν.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Η αυτόματη ανανέωση δεν ολοκληρώθηκε: ενημερώθηκαν {{updated}} από {{total}} λίστες αναπαραγωγής, {{failed}} απέτυχαν, {{skipped}} παραλείφθηκαν (χωρίς URL ή διαδρομή αρχείου).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Η αυτόματη ανανέωση των λιστών αναπαραγωγής απέτυχε. Καμία από τις {{total}} λίστες δεν ενημερώθηκε.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Αυτόματη ανανέωση λιστών αναπαραγωγής: ενημερώθηκαν {{updated}} από {{total}}, παραλείφθηκαν {{skipped}} (χωρίς URL ή διαδρομή αρχείου).",
             "AUTO_REFRESH_ENABLED": "Η αυτόματη ανανέωση είναι ενεργοποιημένη"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Έλεγχος κλειδιού",
         "TMDB_TEST_SUCCESS": "Το κλειδί λειτουργεί — το TMDB απάντησε με επιτυχία",
         "TMDB_TEST_FAILED": "Ο έλεγχος απέτυχε — το TMDB απέρριψε το κλειδί ή δεν είναι προσβάσιμο",
+        "TMDB_CACHE": "Προσωρινή μνήμη μεταδεδομένων",
+        "TMDB_CACHE_DESCRIPTION": "Τα ληφθέντα μεταδεδομένα αποθηκεύονται τοπικά ώστε οι σελίδες λεπτομερειών να ανοίγουν αμέσως. Η εκκαθάριση αναγκάζει την εφαρμογή να κατεβάσει νέα δεδομένα.",
+        "TMDB_CACHE_SIZE": "{{entries}} εγγραφές · {{size}}",
+        "TMDB_CACHE_CLEAR": "Εκκαθάριση",
+        "TMDB_CACHE_ERROR": "Αδυναμία ανάγνωσης της μνήμης — δοκιμάστε ξανά",
         "TMDB_CREDITS": "Μεταδεδομένα",
         "TMDB_ATTRIBUTION": "Αυτό το προϊόν χρησιμοποιεί το TMDB API, αλλά δεν είναι εγκεκριμένο ούτε πιστοποιημένο από το TMDB.",
         "APP_PREFERENCES": "Προτιμήσεις εφαρμογής",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Διαγραφή…",
         "EPG_URL_ERROR": "Η τιμή δεν είναι έγκυρη διεύθυνση URL",
         "VIDEO_PLAYER_DESCRIPTION": "Επιλογή προεπιλεγμένου προγράμματος αναπαραγωγής βίντεο",
+        "WEB_PLAYER_SHARED_CONTROLS": "Ενοποιημένα στοιχεία ελέγχου για web players (πειραματικό)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Χρησιμοποιήστε τα κοινά στοιχεία ελέγχου του IPTVnator σε HTML5, Video.js και ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Περιβαλλοντικό γέμισμα",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Γεμίστε το χώρο γύρω από τον αναπαραγωγό με θολωμένη, σκοτεινή αφίσα αντί για απλές μαύρες ράβδους.",
+        "PLAYER_UP_NEXT_RAIL": "Λίστα επόμενων επεισοδίων",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Σε πλατιά παράθυρα, ο αναπαραγωγός σειρών αγκυρώνεται στα αριστερά και τα επόμενα επεισόδια εμφανίζονται δίπλα του.",
         "STREAM_FORMAT_DESCRIPTION": "Επιλογή προεπιλεγμένης μορφής ροής (xtream)",
         "LANGUAGE_DESCRIPTION": "Επιλέξτε τη γλώσσα της εφαρμογής",
         "THEME_DESCRIPTION": "Επιλέξτε οπτικό θέμα της εφαρμογής",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Εμφάνιση ή απόκρυψη υποτίτλων από προεπιλογή",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Εμφάνιση υποσέλιδου αναπαραγωγής",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Διατηρήστε ορατή τη γραμμή κατάστασης του εξωτερικού προγράμματος αναπαραγωγής στο κάτω μέρος του χώρου εργασίας στον υπολογιστή.",
+        "STRIP_COUNTRY_PREFIX": "Αφαίρεση προθεμάτων χώρας από τα ονόματα καναλιών",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Αφαιρεί προθέματα χώρας/ομάδας όπως \"US | \" ή \"UK - \" από τα ονόματα καναλιών ζωντανής ροής σε όλη την εφαρμογή.",
         "VERSION_DESCRIPTION": "Τρέχουσα έκδοση της εφαρμογής",
         "ABOUT_SUBTITLE": "Έκδοση, σύνδεσμοι έργου και τρόποι υποστήριξης του IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Ενσωματωμένος χρόνος εκτέλεσης MPV",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: μηχανή frame-copy (πειραματικό)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Το βίντεο σχεδιάζεται στον καμβά της εφαρμογής, ώστε τα μενού και τα παράθυρα διαλόγου να εμφανίζονται από πάνω του.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Ισχύει μετά την επανεκκίνηση της εφαρμογής."
     },
     "THEMES": {
         "DARK_THEME": "Σκούρο",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Πίσω",
             "RETRY": "Επανάληψη",
             "STALLED": "Η έναρξη αυτής της ροής καθυστερεί περισσότερο από το αναμενόμενο.",
             "PLAYBACK_FAILED": "Η αναπαραγωγή με το ενσωματωμένο MPV απέτυχε.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Πίσω 10 δευτερόλεπτα",
             "FORWARD_10_SECONDS": "Μπροστά 10 δευτερόλεπτα",
             "LIVE_STREAM": "Ζωντανή ροή",
+            "PLAYBACK_POSITION": "Θέση αναπαραγωγής",
             "MUTE": "Σίγαση",
             "UNMUTE": "Κατάργηση σίγασης",
             "MUTED": "Σε σίγαση",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Η έναρξη της εγγραφής απέτυχε.",
             "RECORDING_FAILED_TO_STOP": "Η διακοπή της εγγραφής απέτυχε.",
             "SAVED_TO": "Αποθηκεύτηκε στο {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Έναρξη εικόνας εντός εικόνας",
+            "EXIT_PICTURE_IN_PICTURE": "Έξοδος από εικόνα εντός εικόνας",
             "ENTER_FULLSCREEN": "Μετάβαση σε πλήρη οθόνη",
             "EXIT_FULLSCREEN": "Έξοδος από πλήρη οθόνη"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Αφαίρεση από τα αγαπημένα",
         "ADD_FAVORITE": "Προσθήκη στα αγαπημένα",
         "SHOW_DETAILS": "Εμφάνιση λεπτομερειών καναλιού",
+        "MAP_EPG": "Αντιστοίχιση καναλιού EPG",
         "FAVORITES_UPDATED": "Τα αγαπημένα ενημερώθηκαν!",
         "SELECT_CHANNEL_PLAYBACK": "Επιλέξτε ένα κανάλι για να ξεκινήσει η αναπαραγωγή",
         "SORT_BY": "Ταξινόμηση κατά",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "εμφάνιση ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Αντιστοίχιση καναλιού EPG",
+        "SUBTITLE": "Επιλέξτε χειροκίνητα κανάλι EPG για το \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Αναζήτηση καναλιών EPG...",
+        "CURRENT_MAPPING": "Τρέχουσα αντιστοίχιση",
+        "NO_MAPPING": "Δεν έχει οριστεί αντιστοίχιση EPG",
+        "SAVE": "Αποθήκευση αντιστοίχισης",
+        "REMOVE": "Κατάργηση αντιστοίχισης",
+        "CLOSE": "Κλείσιμο",
+        "NO_RESULTS": "Δεν βρέθηκαν κανάλια EPG",
+        "SEARCH_HINT": "Πληκτρολογήστε τουλάχιστον {{min}} χαρακτήρες για αναζήτηση",
+        "SAVED": "Η αντιστοίχιση EPG αποθηκεύτηκε",
+        "REMOVED": "Η αντιστοίχιση EPG καταργήθηκε",
+        "SAVE_FAILED": "Δεν ήταν δυνατή η ενημέρωση της αντιστοίχισης EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Ναι",
     "NO": "Όχι",
@@ -756,6 +797,8 @@
         "ACTORS": "Ηθοποιοί",
         "DIRECTOR": "Σκηνοθέτης",
         "SIMILAR": "Παρόμοια",
+        "CREW_JOB_DIRECTOR": "Σκηνοθέτης",
+        "CREW_JOB_CREATOR": "Δημιουργός",
         "ACTOR_FILMOGRAPHY": "Φιλμογραφία",
         "ACTOR_FILTER_ALL": "Όλα",
         "ACTOR_SCOPE_THIS_PORTAL": "Αυτή η πύλη",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Στη βιβλιοθήκη σας",
         "ACTOR_SEARCH_IN_PORTAL": "Αναζήτηση στην πύλη",
         "ACTOR_BORN": "Γεννήθηκε:",
+        "ACTOR_DIED": "Απεβίωσε",
+        "SERIES_STATUS_RETURNING": "Σε εξέλιξη",
+        "SERIES_STATUS_PLANNED": "Προγραμματισμένο",
+        "SERIES_STATUS_IN_PRODUCTION": "Σε παραγωγή",
+        "SERIES_STATUS_ENDED": "Ολοκληρώθηκε",
+        "SERIES_STATUS_CANCELED": "Ακυρώθηκε",
+        "SERIES_STATUS_PILOT": "Πιλότος",
         "DURATION": "Διάρκεια",
         "CAST": "Πρόσωπα",
         "EPISODE_RUN_TIME": "Διάρκεια επεισοδίου",
@@ -779,6 +829,7 @@
         "RESTART": "Από την αρχή",
         "CONTINUE_WATCHING": "Συνέχιση παρακολούθησης",
         "PLAY_FIRST_EPISODE": "Αναπαραγωγή πρώτου επεισοδίου",
+        "PLAY_EPISODE": "Αναπαραγωγή επεισοδίου {{episode}}",
         "RESUME_EPISODE": "Συνέχιση επεισοδίου",
         "PLAY_NEXT_EPISODE": "Αναπαραγωγή επόμενου επεισοδίου",
         "SERIES_WATCHED": "Η σειρά προβλήθηκε",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "Η διεύθυνση URL ροής αντιγράφηκε στο πρόχειρο",
         "COPY_STREAM_URL": "Αντιγραφή διεύθηνσης URL ροής",
         "NOW_PLAYING": "Τώρα παίζει",
+        "UP_NEXT": "Επόμενα",
         "CLOSE_PLAYER": "Κλείσιμο προγράμματος αναπαραγωγής",
         "ABOUT": "Σχετικά",
         "SEASONS_AND_EPISODES": "Σεζόν και επεισόδια",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Αυτό το περιεχόμενο δεν είναι διαθέσιμο σε αυτόν τον διακομιστή",
         "PLAYBACK_ERROR": "Αποτυχία λήψης διεύθυνσης URL αναπαραγωγής",
         "LOADING_SEASONS": "Φόρτωση σεζόν...",
+        "LOADING_ALL_CHANNELS": "Φόρτωση πλήρους λίστας καναλιών…",
+        "REFRESH_CHANNEL_LIST": "Ανανέωση λίστας καναλιών",
+        "NO_CHANNELS_IN_CATEGORY": "Δεν υπάρχουν κανάλια σε αυτήν την κατηγορία",
+        "ITEM": "στοιχείο",
+        "ITEMS": "στοιχεία",
         "NO_EPISODES": "Δεν υπάρχουν διαθέσιμα επεισόδια",
         "ALL_RADIO": "Όλα τα ραδιόφωνα"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Αυτή η λήψη δεν μπορεί πλέον να ανοίξει στη βιβλιοθήκη επειδή η πηγαία λίστα αναπαραγωγής αφαιρέθηκε.",
         "FILE_NOT_FOUND": "Αυτό το ληφθέν αρχείο δεν είναι πλέον διαθέσιμο στον δίσκο.",
         "FILE_ACTION_ERROR": "Δεν ήταν δυνατή η ολοκλήρωση της ενέργειας αρχείου.",
+        "ACTION_FAILED": "Η ενέργεια απέτυχε",
+        "PAUSE": "Παύση",
+        "RESUME": "Συνέχιση",
         "CANCEL": "Ακύρωση",
         "RETRY": "Επανάληψη",
         "REMOVE": "Αφαίρεση",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Λήψη",
             "COMPLETED": "Ολοκληρώθηκε",
             "FAILED": "Απέτυχε",
-            "CANCELED": "Ακυρώθηκε"
+            "CANCELED": "Ακυρώθηκε",
+            "PAUSED": "Σε παύση"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/en.json b/apps/web/src/assets/i18n/en.json
index b77a49418..130b118e9 100644
--- a/apps/web/src/assets/i18n/en.json
+++ b/apps/web/src/assets/i18n/en.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Playlist refresh failed. The local file is no longer available. Check the file path or re-import the playlist.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Playlist refresh failed. The app can no longer access the local file.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Success! The playlists were successfully updated",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Playlist auto-refresh incomplete: {{updated}} of {{total}} playlists updated, {{failed}} failed.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Playlist auto-refresh incomplete: {{updated}} of {{total}} playlists updated, {{failed}} failed, {{skipped}} skipped (no URL or file path).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Playlist auto-refresh failed. None of the {{total}} playlists could be updated.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Playlist auto-refresh: {{updated}} of {{total}} playlists updated, {{skipped}} skipped (no URL or file path).",
             "AUTO_REFRESH_ENABLED": "Auto-refresh enabled"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Check key",
         "TMDB_TEST_SUCCESS": "The key works — TMDB responded successfully",
         "TMDB_TEST_FAILED": "Check failed — TMDB rejected the key or is unreachable",
+        "TMDB_CACHE": "Metadata cache",
+        "TMDB_CACHE_DESCRIPTION": "Downloaded metadata is stored locally so detail pages open instantly. Clearing it makes the app fetch fresh data on the next visit.",
+        "TMDB_CACHE_SIZE": "{{entries}} entries · {{size}}",
+        "TMDB_CACHE_CLEAR": "Clear cache",
+        "TMDB_CACHE_ERROR": "Could not read the cache — try again",
         "TMDB_CREDITS": "Metadata",
         "TMDB_ATTRIBUTION": "This product uses the TMDB API but is not endorsed or certified by TMDB.",
         "APP_PREFERENCES": "App preferences",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Clearing…",
         "EPG_URL_ERROR": "The value is not a valid URL",
         "VIDEO_PLAYER_DESCRIPTION": "Select default video player",
+        "WEB_PLAYER_SHARED_CONTROLS": "Unified controls for web players (experimental)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Use IPTVnator's shared controls in HTML5, Video.js, and ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Ambient background fill",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Fill the space around the player with a blurred, dimmed poster instead of plain black bars.",
+        "PLAYER_UP_NEXT_RAIL": "Up Next episode rail",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "On wide windows, dock the series player to the left and show the upcoming episodes beside it.",
         "STREAM_FORMAT_DESCRIPTION": "Select default stream format (xtream)",
         "LANGUAGE_DESCRIPTION": "Select language of the application",
         "THEME_DESCRIPTION": "Select visual theme of the application",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Show or hide subtitles by default",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Show now playing footer",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Keep the external-player status bar visible at the bottom of the workspace on desktop.",
+        "STRIP_COUNTRY_PREFIX": "Strip country prefixes from channel names",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Removes country/group prefixes like \"US | \" or \"UK - \" from live channel names throughout the app.",
         "VERSION_DESCRIPTION": "Current version of the application",
         "ABOUT_SUBTITLE": "Version, project links and ways to support IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Embedded MPV runtime",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: frame-copy engine (experimental)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Render video onto the app canvas so menus and dialogs stack above it.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Takes effect after restarting the app."
     },
     "THEMES": {
         "DARK_THEME": "Dark",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Back",
             "RETRY": "Retry",
             "STALLED": "This stream is taking longer than expected to start.",
             "PLAYBACK_FAILED": "Embedded MPV playback failed.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Back 10 seconds",
             "FORWARD_10_SECONDS": "Forward 10 seconds",
             "LIVE_STREAM": "Live stream",
+            "PLAYBACK_POSITION": "Playback position",
             "MUTE": "Mute",
             "UNMUTE": "Unmute",
             "MUTED": "Muted",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Recording failed to start.",
             "RECORDING_FAILED_TO_STOP": "Recording failed to stop.",
             "SAVED_TO": "Saved to {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Enter picture-in-picture",
+            "EXIT_PICTURE_IN_PICTURE": "Exit picture-in-picture",
             "ENTER_FULLSCREEN": "Enter fullscreen",
             "EXIT_FULLSCREEN": "Exit fullscreen"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Remove from favorites",
         "ADD_FAVORITE": "Add to favorites",
         "SHOW_DETAILS": "Show channel details",
+        "MAP_EPG": "Map EPG channel",
         "FAVORITES_UPDATED": "Favorites were updated!",
         "SELECT_CHANNEL_PLAYBACK": "Please select a channel to start playback",
         "SORT_BY": "Sort by",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "show ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Map EPG Channel",
+        "SUBTITLE": "Manually select an EPG channel for \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Search EPG channels...",
+        "CURRENT_MAPPING": "Current mapping",
+        "NO_MAPPING": "No EPG mapping set",
+        "SAVE": "Save mapping",
+        "REMOVE": "Remove mapping",
+        "CLOSE": "Close",
+        "NO_RESULTS": "No EPG channels found",
+        "SEARCH_HINT": "Type at least {{min}} characters to search",
+        "SAVED": "EPG mapping saved",
+        "REMOVED": "EPG mapping removed",
+        "SAVE_FAILED": "Could not update the EPG mapping"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Yes",
     "NO": "No",
@@ -756,6 +797,8 @@
         "ACTORS": "Actors",
         "DIRECTOR": "Director",
         "SIMILAR": "Similar",
+        "CREW_JOB_DIRECTOR": "Director",
+        "CREW_JOB_CREATOR": "Creator",
         "ACTOR_FILMOGRAPHY": "Filmography",
         "ACTOR_FILTER_ALL": "All",
         "ACTOR_SCOPE_THIS_PORTAL": "This portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "In your library",
         "ACTOR_SEARCH_IN_PORTAL": "Search in portal",
         "ACTOR_BORN": "Born",
+        "ACTOR_DIED": "Died",
+        "SERIES_STATUS_RETURNING": "Returning",
+        "SERIES_STATUS_PLANNED": "Planned",
+        "SERIES_STATUS_IN_PRODUCTION": "In production",
+        "SERIES_STATUS_ENDED": "Ended",
+        "SERIES_STATUS_CANCELED": "Canceled",
+        "SERIES_STATUS_PILOT": "Pilot",
         "DURATION": "Duration",
         "CAST": "Cast",
         "EPISODE_RUN_TIME": "Episode run time",
@@ -779,6 +829,7 @@
         "RESTART": "Start Over",
         "CONTINUE_WATCHING": "Continue Watching",
         "PLAY_FIRST_EPISODE": "Play first episode",
+        "PLAY_EPISODE": "Play episode {{episode}}",
         "RESUME_EPISODE": "Resume episode",
         "PLAY_NEXT_EPISODE": "Play next episode",
         "SERIES_WATCHED": "Series watched",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "Stream URL copied to clipboard",
         "COPY_STREAM_URL": "Copy Stream URL",
         "NOW_PLAYING": "Now playing",
+        "UP_NEXT": "Up next",
         "CLOSE_PLAYER": "Close player",
         "ABOUT": "About",
         "SEASONS_AND_EPISODES": "Seasons and Episodes",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "This content is not available on this server",
         "PLAYBACK_ERROR": "Failed to get playback URL",
         "LOADING_SEASONS": "Loading seasons...",
+        "LOADING_ALL_CHANNELS": "Loading full channel list…",
+        "REFRESH_CHANNEL_LIST": "Refresh channel list",
+        "NO_CHANNELS_IN_CATEGORY": "No channels in this category",
+        "ITEM": "item",
+        "ITEMS": "items",
         "NO_EPISODES": "No episodes available",
         "ALL_RADIO": "All radio"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "This download can no longer open in the library because its source playlist was removed.",
         "FILE_NOT_FOUND": "This downloaded file is no longer available on disk.",
         "FILE_ACTION_ERROR": "The file action could not be completed.",
+        "ACTION_FAILED": "Action failed",
+        "PAUSE": "Pause",
+        "RESUME": "Resume",
         "CANCEL": "Cancel",
         "RETRY": "Retry",
         "REMOVE": "Remove",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Downloading",
             "COMPLETED": "Completed",
             "FAILED": "Failed",
-            "CANCELED": "Canceled"
+            "CANCELED": "Canceled",
+            "PAUSED": "Paused"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/es.json b/apps/web/src/assets/i18n/es.json
index 0c4087ff0..256f10042 100644
--- a/apps/web/src/assets/i18n/es.json
+++ b/apps/web/src/assets/i18n/es.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "No se pudo actualizar la lista. El archivo local ya no está disponible. Verifica la ruta del archivo o vuelve a importar la lista.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "No se pudo actualizar la lista. La aplicación ya no puede acceder al archivo local.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "¡Listo! Las listas de reproducción se actualizaron correctamente",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Auto-actualización incompleta: se actualizaron {{updated}} de {{total}} listas de reproducción, {{failed}} fallaron.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Auto-actualización incompleta: se actualizaron {{updated}} de {{total}} listas de reproducción, {{failed}} fallaron, {{skipped}} omitidas (sin URL ni ruta de archivo).",
+            "AUTO_REFRESH_UPDATE_FAILED": "La auto-actualización de listas de reproducción falló. Ninguna de las {{total}} listas se pudo actualizar.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Auto-actualización de listas de reproducción: se actualizaron {{updated}} de {{total}}, {{skipped}} omitidas (sin URL ni ruta de archivo).",
             "AUTO_REFRESH_ENABLED": "Auto-actualización activada"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Comprobar clave",
         "TMDB_TEST_SUCCESS": "La clave funciona — TMDB respondió correctamente",
         "TMDB_TEST_FAILED": "La comprobación falló — TMDB rechazó la clave o no está disponible",
+        "TMDB_CACHE": "Caché de metadatos",
+        "TMDB_CACHE_DESCRIPTION": "Los metadatos descargados se guardan localmente para que las páginas de detalles se abran al instante. Al vaciarla, la app descargará datos nuevos en la próxima visita.",
+        "TMDB_CACHE_SIZE": "{{entries}} entradas · {{size}}",
+        "TMDB_CACHE_CLEAR": "Vaciar caché",
+        "TMDB_CACHE_ERROR": "No se pudo leer la caché: inténtalo de nuevo",
         "TMDB_CREDITS": "Metadatos",
         "TMDB_ATTRIBUTION": "Este producto utiliza la API de TMDB, pero no está avalado ni certificado por TMDB.",
         "APP_PREFERENCES": "Preferencias de la app",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Borrando…",
         "EPG_URL_ERROR": "El valor no es una URL válida.",
         "VIDEO_PLAYER_DESCRIPTION": "Seleccionar reproductor de vídeo predeterminado",
+        "WEB_PLAYER_SHARED_CONTROLS": "Controles unificados para reproductores web (experimental)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Usa los controles compartidos de IPTVnator en HTML5, Video.js y ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Relleno de fondo ambiental",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Rellena el espacio alrededor del reproductor con una imagen de póster desenfocada y oscurecida en lugar de barras negras simples.",
+        "PLAYER_UP_NEXT_RAIL": "Panel de próximos episodios",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "En ventanas anchas, ancla el reproductor de series a la izquierda y muestra los próximos episodios a su lado.",
         "STREAM_FORMAT_DESCRIPTION": "Selecciona el formato de transmision predeterminado (Xtream)",
         "LANGUAGE_DESCRIPTION": "Seleccione el idioma de la aplicación",
         "THEME_DESCRIPTION": "Seleccione el tema visual de la aplicación.",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Mostrar u ocultar subtítulos por defecto",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Mostrar pie de reproducción actual",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Mantén visible la barra de estado del reproductor externo en la parte inferior del espacio de trabajo en escritorio.",
+        "STRIP_COUNTRY_PREFIX": "Quitar prefijos de país de los nombres de los canales",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Elimina los prefijos de país o grupo, como \"US | \" o \"UK - \", de los nombres de los canales en vivo en toda la app.",
         "VERSION_DESCRIPTION": "Versión actual de la aplicación.",
         "ABOUT_SUBTITLE": "Versión, enlaces del proyecto y formas de apoyar a IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Runtime de MPV integrado",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: motor frame-copy (experimental)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "El vídeo se dibuja en el lienzo de la aplicación, de modo que los menús y diálogos quedan encima.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Se aplica tras reiniciar la aplicación."
     },
     "THEMES": {
         "DARK_THEME": "Oscuro",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Atrás",
             "RETRY": "Reintentar",
             "STALLED": "Este stream está tardando más de lo esperado en iniciarse.",
             "PLAYBACK_FAILED": "Falló la reproducción de MPV integrado.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Retroceder 10 segundos",
             "FORWARD_10_SECONDS": "Avanzar 10 segundos",
             "LIVE_STREAM": "Transmisión en vivo",
+            "PLAYBACK_POSITION": "Posición de reproducción",
             "MUTE": "Silenciar",
             "UNMUTE": "Activar sonido",
             "MUTED": "Silenciado",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "No se pudo iniciar la grabación.",
             "RECORDING_FAILED_TO_STOP": "No se pudo detener la grabación.",
             "SAVED_TO": "Guardada en {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Activar imagen en imagen",
+            "EXIT_PICTURE_IN_PICTURE": "Salir de imagen en imagen",
             "ENTER_FULLSCREEN": "Entrar en pantalla completa",
             "EXIT_FULLSCREEN": "Salir de pantalla completa"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Quitar de favoritos",
         "ADD_FAVORITE": "Agregar a favoritos",
         "SHOW_DETAILS": "Mostrar detalles del canal",
+        "MAP_EPG": "Asignar canal EPG",
         "FAVORITES_UPDATED": "¡Se actualizaron los favoritos!",
         "SELECT_CHANNEL_PLAYBACK": "Selecciona un canal para iniciar la reproducción",
         "SORT_BY": "Ordenar por",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "ver ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Asignar canal EPG",
+        "SUBTITLE": "Selecciona manualmente un canal EPG para \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Buscar canales EPG...",
+        "CURRENT_MAPPING": "Asignación actual",
+        "NO_MAPPING": "No hay asignación EPG",
+        "SAVE": "Guardar asignación",
+        "REMOVE": "Eliminar asignación",
+        "CLOSE": "Cerrar",
+        "NO_RESULTS": "No se encontraron canales EPG",
+        "SEARCH_HINT": "Escribe al menos {{min}} caracteres para buscar",
+        "SAVED": "Asignación EPG guardada",
+        "REMOVED": "Asignación EPG eliminada",
+        "SAVE_FAILED": "No se pudo actualizar la asignación EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Sí",
     "NO": "No",
@@ -756,6 +797,8 @@
         "ACTORS": "Actores",
         "DIRECTOR": "Director",
         "SIMILAR": "Similares",
+        "CREW_JOB_DIRECTOR": "Director",
+        "CREW_JOB_CREATOR": "Creador",
         "ACTOR_FILMOGRAPHY": "Filmografía",
         "ACTOR_FILTER_ALL": "Todas",
         "ACTOR_SCOPE_THIS_PORTAL": "Este portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "En tu biblioteca",
         "ACTOR_SEARCH_IN_PORTAL": "Buscar en el portal",
         "ACTOR_BORN": "Nacimiento:",
+        "ACTOR_DIED": "Fallecido",
+        "SERIES_STATUS_RETURNING": "En emisión",
+        "SERIES_STATUS_PLANNED": "Planificada",
+        "SERIES_STATUS_IN_PRODUCTION": "En producción",
+        "SERIES_STATUS_ENDED": "Finalizada",
+        "SERIES_STATUS_CANCELED": "Cancelada",
+        "SERIES_STATUS_PILOT": "Piloto",
         "DURATION": "Duración",
         "CAST": "Elenco",
         "EPISODE_RUN_TIME": "Tiempo de ejecución del episodio",
@@ -779,6 +829,7 @@
         "RESTART": "Reiniciar",
         "CONTINUE_WATCHING": "Continuar viendo",
         "PLAY_FIRST_EPISODE": "Reproducir primer episodio",
+        "PLAY_EPISODE": "Reproducir episodio {{episode}}",
         "RESUME_EPISODE": "Continuar episodio",
         "PLAY_NEXT_EPISODE": "Reproducir siguiente episodio",
         "SERIES_WATCHED": "Serie vista",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL de transmisión copiada al portapapeles",
         "COPY_STREAM_URL": "Copiar URL de transmisión",
         "NOW_PLAYING": "Reproduciendo ahora",
+        "UP_NEXT": "A continuación",
         "CLOSE_PLAYER": "Cerrar reproductor",
         "ABOUT": "Acerca de",
         "SEASONS_AND_EPISODES": "Temporadas y episodios",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Este contenido no está disponible en este servidor",
         "PLAYBACK_ERROR": "No se pudo obtener la URL de reproducción",
         "LOADING_SEASONS": "Cargando temporadas…",
+        "LOADING_ALL_CHANNELS": "Cargando la lista completa de canales…",
+        "REFRESH_CHANNEL_LIST": "Actualizar lista de canales",
+        "NO_CHANNELS_IN_CATEGORY": "No hay canales en esta categoría",
+        "ITEM": "elemento",
+        "ITEMS": "elementos",
         "NO_EPISODES": "No hay episodios disponibles",
         "ALL_RADIO": "Todas las radios"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Esta descarga ya no se puede abrir en la biblioteca porque su lista de reproducción de origen fue eliminada.",
         "FILE_NOT_FOUND": "Este archivo descargado ya no está disponible en el disco.",
         "FILE_ACTION_ERROR": "No se pudo completar la acción del archivo.",
+        "ACTION_FAILED": "La acción ha fallado",
+        "PAUSE": "Pausar",
+        "RESUME": "Reanudar",
         "CANCEL": "Cancelar",
         "RETRY": "Reintentar",
         "REMOVE": "Eliminar",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Descargando",
             "COMPLETED": "Completado",
             "FAILED": "Fallido",
-            "CANCELED": "Cancelado"
+            "CANCELED": "Cancelado",
+            "PAUSED": "En pausa"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/fr.json b/apps/web/src/assets/i18n/fr.json
index 30be779d4..cb86e2daa 100644
--- a/apps/web/src/assets/i18n/fr.json
+++ b/apps/web/src/assets/i18n/fr.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Échec de l'actualisation de la liste de lecture. Le fichier local n'est plus disponible. Vérifiez le chemin du fichier ou réimportez la liste de lecture.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Échec de l'actualisation de la liste de lecture. L'application ne peut plus accéder au fichier local.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Succès ! Les listes de lecture ont été mises à jour avec succès",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Actualisation automatique incomplète : {{updated}} listes de lecture sur {{total}} mises à jour, {{failed}} en échec.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Actualisation automatique incomplète : {{updated}} listes de lecture sur {{total}} mises à jour, {{failed}} en échec, {{skipped}} ignorées (aucune URL ni chemin de fichier).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Échec de l'actualisation automatique. Aucune des {{total}} listes de lecture n'a pu être mise à jour.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Actualisation automatique des listes de lecture : {{updated}} sur {{total}} mises à jour, {{skipped}} ignorées (aucune URL ni chemin de fichier).",
             "AUTO_REFRESH_ENABLED": "Actualisation automatique activée"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Vérifier la clé",
         "TMDB_TEST_SUCCESS": "La clé fonctionne — TMDB a répondu avec succès",
         "TMDB_TEST_FAILED": "Échec de la vérification — TMDB a rejeté la clé ou est injoignable",
+        "TMDB_CACHE": "Cache des métadonnées",
+        "TMDB_CACHE_DESCRIPTION": "Les métadonnées téléchargées sont stockées localement pour que les pages de détails s'ouvrent instantanément. Après le vidage, l'application récupérera des données fraîches.",
+        "TMDB_CACHE_SIZE": "{{entries}} entrées · {{size}}",
+        "TMDB_CACHE_CLEAR": "Vider le cache",
+        "TMDB_CACHE_ERROR": "Impossible de lire le cache — réessayez",
         "TMDB_CREDITS": "Métadonnées",
         "TMDB_ATTRIBUTION": "Ce produit utilise l'API TMDB mais n'est ni approuvé ni certifié par TMDB.",
         "APP_PREFERENCES": "Préférences de l'application",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Effacement…",
         "EPG_URL_ERROR": "La valeur n'est pas une URL valide",
         "VIDEO_PLAYER_DESCRIPTION": "Sélectionnez le lecteur vidéo par défaut",
+        "WEB_PLAYER_SHARED_CONTROLS": "Commandes unifiées pour les lecteurs web (expérimental)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Utilise les commandes partagées d’IPTVnator dans HTML5, Video.js et ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Mode ambiant",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Remplit l'espace autour du lecteur avec une affiche floue et assombrie au lieu de barres noires simples.",
+        "PLAYER_UP_NEXT_RAIL": "Rail d'épisodes « À suivre »",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Sur les fenêtres larges, ancre le lecteur de séries à gauche et affiche les épisodes à venir à côté.",
         "STREAM_FORMAT_DESCRIPTION": "Sélectionnez le format de flux par défaut (xtream)",
         "LANGUAGE_DESCRIPTION": "Sélectionnez la langue de l'application",
         "THEME_DESCRIPTION": "Sélectionnez le thème visuel de l'application",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Afficher ou masquer les sous-titres par défaut",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Afficher le pied de page de lecture en cours",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Garde la barre d'état du lecteur externe visible en bas de l'espace de travail sur ordinateur.",
+        "STRIP_COUNTRY_PREFIX": "Retirer les préfixes de pays des noms de chaînes",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Supprime les préfixes de pays ou de groupe comme \"US | \" ou \"UK - \" des noms des chaînes en direct dans toute l'application.",
         "VERSION_DESCRIPTION": "Version actuelle de l'application",
         "ABOUT_SUBTITLE": "Version, liens du projet et façons de soutenir IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Runtime MPV intégré",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV : moteur frame-copy (expérimental)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "La vidéo est rendue sur le canevas de l'application, les menus et boîtes de dialogue s'affichent donc au-dessus.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Prend effet après le redémarrage de l'application."
     },
     "THEMES": {
         "DARK_THEME": "Sombre",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Retour",
             "RETRY": "Réessayer",
             "STALLED": "Ce flux met plus de temps que prévu à démarrer.",
             "PLAYBACK_FAILED": "Échec de la lecture avec MPV intégré.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Reculer de 10 secondes",
             "FORWARD_10_SECONDS": "Avancer de 10 secondes",
             "LIVE_STREAM": "Diffusion en direct",
+            "PLAYBACK_POSITION": "Position de lecture",
             "MUTE": "Muet",
             "UNMUTE": "Activer le son",
             "MUTED": "Son coupé",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "L'enregistrement n'a pas pu démarrer.",
             "RECORDING_FAILED_TO_STOP": "L'enregistrement n'a pas pu s'arrêter.",
             "SAVED_TO": "Enregistré dans {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Activer le mode image dans l’image",
+            "EXIT_PICTURE_IN_PICTURE": "Quitter le mode image dans l’image",
             "ENTER_FULLSCREEN": "Passer en plein écran",
             "EXIT_FULLSCREEN": "Quitter le plein écran"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Retirer des favoris",
         "ADD_FAVORITE": "Ajouter aux favoris",
         "SHOW_DETAILS": "Afficher les détails de la chaîne",
+        "MAP_EPG": "Associer une chaîne EPG",
         "FAVORITES_UPDATED": "Les favoris ont été mis à jour !",
         "SELECT_CHANNEL_PLAYBACK": "Veuillez sélectionner une chaîne pour démarrer la lecture",
         "SORT_BY": "Trier par",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "afficher ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Associer une chaîne EPG",
+        "SUBTITLE": "Sélectionner manuellement une chaîne EPG pour « {{channelName}} »",
+        "SEARCH_PLACEHOLDER": "Rechercher des chaînes EPG...",
+        "CURRENT_MAPPING": "Association actuelle",
+        "NO_MAPPING": "Aucune association EPG définie",
+        "SAVE": "Enregistrer l'association",
+        "REMOVE": "Supprimer l'association",
+        "CLOSE": "Fermer",
+        "NO_RESULTS": "Aucune chaîne EPG trouvée",
+        "SEARCH_HINT": "Saisissez au moins {{min}} caractères pour rechercher",
+        "SAVED": "Association EPG enregistrée",
+        "REMOVED": "Association EPG supprimée",
+        "SAVE_FAILED": "Impossible de mettre à jour l'association EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Oui",
     "NO": "Non",
@@ -756,6 +797,8 @@
         "ACTORS": "Acteurs",
         "DIRECTOR": "Réalisateur",
         "SIMILAR": "Similaires",
+        "CREW_JOB_DIRECTOR": "Réalisateur",
+        "CREW_JOB_CREATOR": "Créateur",
         "ACTOR_FILMOGRAPHY": "Filmographie",
         "ACTOR_FILTER_ALL": "Tout",
         "ACTOR_SCOPE_THIS_PORTAL": "Ce portail",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Dans votre bibliothèque",
         "ACTOR_SEARCH_IN_PORTAL": "Rechercher dans le portail",
         "ACTOR_BORN": "Naissance :",
+        "ACTOR_DIED": "Décédé",
+        "SERIES_STATUS_RETURNING": "En cours",
+        "SERIES_STATUS_PLANNED": "Planifiée",
+        "SERIES_STATUS_IN_PRODUCTION": "En production",
+        "SERIES_STATUS_ENDED": "Terminée",
+        "SERIES_STATUS_CANCELED": "Annulée",
+        "SERIES_STATUS_PILOT": "Pilote",
         "DURATION": "Durée",
         "CAST": "Distribution",
         "EPISODE_RUN_TIME": "Durée de l'épisode",
@@ -779,6 +829,7 @@
         "RESTART": "Recommencer",
         "CONTINUE_WATCHING": "Reprendre la lecture",
         "PLAY_FIRST_EPISODE": "Lire le premier épisode",
+        "PLAY_EPISODE": "Lire l'épisode {{episode}}",
         "RESUME_EPISODE": "Reprendre l'épisode",
         "PLAY_NEXT_EPISODE": "Lire l'épisode suivant",
         "SERIES_WATCHED": "Série vue",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL du flux copiée dans le presse-papiers",
         "COPY_STREAM_URL": "Copier l'URL du flux",
         "NOW_PLAYING": "En cours de lecture",
+        "UP_NEXT": "À suivre",
         "CLOSE_PLAYER": "Fermer le lecteur",
         "ABOUT": "À propos",
         "SEASONS_AND_EPISODES": "Saisons et épisodes",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Ce contenu n'est pas disponible sur ce serveur",
         "PLAYBACK_ERROR": "Échec de l'obtention de l'URL de lecture",
         "LOADING_SEASONS": "Chargement des saisons…",
+        "LOADING_ALL_CHANNELS": "Chargement de la liste complète des chaînes…",
+        "REFRESH_CHANNEL_LIST": "Actualiser la liste des chaînes",
+        "NO_CHANNELS_IN_CATEGORY": "Aucune chaîne dans cette catégorie",
+        "ITEM": "élément",
+        "ITEMS": "éléments",
         "NO_EPISODES": "Aucun épisode disponible",
         "ALL_RADIO": "Toutes les radios"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Ce téléchargement ne peut plus être ouvert dans la bibliothèque car sa liste de lecture source a été supprimée.",
         "FILE_NOT_FOUND": "Ce fichier téléchargé n'est plus disponible sur le disque.",
         "FILE_ACTION_ERROR": "L'action sur le fichier n'a pas pu être effectuée.",
+        "ACTION_FAILED": "Échec de l'action",
+        "PAUSE": "Mettre en pause",
+        "RESUME": "Reprendre",
         "CANCEL": "Annuler",
         "RETRY": "Réessayer",
         "REMOVE": "Supprimer",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "En cours",
             "COMPLETED": "Terminé",
             "FAILED": "Échec",
-            "CANCELED": "Annulé"
+            "CANCELED": "Annulé",
+            "PAUSED": "En pause"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/hu.json b/apps/web/src/assets/i18n/hu.json
new file mode 100644
index 000000000..83183c4a4
--- /dev/null
+++ b/apps/web/src/assets/i18n/hu.json
@@ -0,0 +1,1344 @@
+{
+    "CANCEL": "Mégse",
+    "CLEAR": "Törlés",
+    "CLOSE": "Bezárás",
+    "BACK": "Vissza",
+    "SHOW_MORE": "Több mutatása",
+    "SHOW_LESS": "Kevesebb mutatása",
+    "PLAYLISTS": "Lejátszási listák",
+    "HOME": {
+        "TITLE": "IPTVnator",
+        "SUBTITLE": "Válasszon egy meglévő lejátszási listát, vagy adjon hozzá újat",
+        "TABS": {
+            "RECENTLY_ADDED": "Legutóbb hozzáadott lejátszási listák",
+            "FILE_UPLOAD": "Hozzáadás fájlból",
+            "URL_UPLOAD": "Hozzáadás URL-ről",
+            "TEXT_IMPORT": "Importálás szövegből",
+            "XTREME_IMPORT": "Xtream Codes hozzáadása",
+            "STALKER_PORTAL_IMPORT": "Stalker-portál hozzáadása"
+        },
+        "PLAYLISTS": {
+            "NO_PLAYLISTS": "Még nincs hozzáadott lejátszási lista",
+            "ADD_FIRST": "Adja hozzá az első lejátszási listát",
+            "WELCOME_TITLE": "Üdvözli Önt az IPTVnator!",
+            "WELCOME_DESCRIPTION": "Első lépésként adja hozzá lejátszási listáját. Kapcsolódjon kedvenc IPTV-szolgáltatásához, és élvezze az élő tévéadásokat, filmeket és sorozatokat.",
+            "ADD_YOUR_FIRST": "Első lejátszási lista hozzáadása",
+            "FEATURE_M3U": "M3U/M3U8-fájlok",
+            "FEATURE_XTREAM": "Xtream Codes",
+            "FEATURE_STALKER": "Stalker-portál",
+            "FEATURE_M3U_LABEL": "M3U-fájl vagy URL-cím hozzáadása",
+            "FEATURE_XTREAM_LABEL": "Kapcsolódás Xtream Codes használatával",
+            "FEATURE_STALKER_LABEL": "Kapcsolódás Stalker-portálhoz",
+            "VALUE_PROPS_LABEL": "Mire használható?",
+            "VALUE_PROP_LIVE": "Élő tévéadás EPG-vel",
+            "VALUE_PROP_VOD": "Filmek és sorozatok",
+            "VALUE_PROP_MULTISOURCE": "Több forrásból összeállított médiatár",
+            "VALUE_PROP_OFFLINE": "Offline letöltések",
+            "DASHBOARD_WELCOME_TAGLINE": "IPTV-médiatára egy helyen.",
+            "DASHBOARD_WELCOME_DESCRIPTION": "Adjon hozzá M3U-fájlokat, Xtream Codes-fiókokat vagy Stalker-portálokat, majd élvezze az élő tévéadásokat, filmeket és sorozatokat bármely képernyőn.",
+            "FEATURE_LIVE_TITLE": "Élő tévéadás",
+            "FEATURE_LIVE_DESC": "Nézzen élő csatornákat teljes műsorrenddel.",
+            "FEATURE_VOD_TITLE": "Filmek és sorozatok",
+            "FEATURE_VOD_DESC": "Igény szerinti médiatár borítókkal és részletes információkkal.",
+            "FEATURE_EPG_TITLE": "EPG és műsor-visszanézés",
+            "FEATURE_EPG_DESC": "Műsorújság és időeltolásos lejátszás.",
+            "FEATURE_OFFLINE_TITLE": "Offline letöltések",
+            "FEATURE_OFFLINE_DESC": "Filmek és epizódok mentése későbbi megtekintéshez.",
+            "SOURCES_WELCOME_TITLE": "Adja hozzá első lejátszási listáját",
+            "SOURCES_WELCOME_BODY": "A kezdéshez válasszon az alábbi forrástípusok közül.",
+            "SOURCE_M3U_NEEDS": "Helyi fájl vagy M3U/M3U8-lejátszási listára mutató URL-cím.",
+            "SOURCE_M3U_ADD": "M3U hozzáadása",
+            "SOURCE_XTREAM_NEEDS": "A szolgáltatótól kapott felhasználónév, jelszó és kiszolgálócím.",
+            "SOURCE_XTREAM_ADD": "Xtream hozzáadása",
+            "SOURCE_STALKER_NEEDS": "A portál URL-címe és egy MAC-cím (Ministra-kompatibilis).",
+            "SOURCE_STALKER_ADD": "Stalker-portál hozzáadása",
+            "CONTENT_LIVE": "Élő tévéadás",
+            "CONTENT_VOD": "Filmek",
+            "CONTENT_SERIES": "Sorozatok",
+            "CONTENT_EPG": "EPG",
+            "NO_RESULTS_TITLE": "Nem található lejátszási lista",
+            "NO_RESULTS_DESCRIPTION": "Egyetlen lejátszási lista sem felel meg a keresésnek. Módosítsa a keresést, vagy törölje a szűrőt az összes lejátszási lista megjelenítéséhez.",
+            "ADDED_VIA_URL": "URL-ről hozzáadva. URL-cím:",
+            "ADDED_VIA_FILE": "Fájlfeltöltéssel hozzáadva",
+            "XTREAM_PLAYLIST": "Xtream-lejátszási lista",
+            "STALKER_PORTAL": "Stalker-portál",
+            "CHANNELS": "Csatornák",
+            "ADDED": "Hozzáadva",
+            "SHOW_DETAILS": "Lejátszási lista részleteinek megjelenítése",
+            "REMOVE": "Lejátszási lista eltávolítása",
+            "SEARCH_PLAYLISTS": "Keresés a lejátszási listák címe alapján",
+            "INFO_DIALOG": {
+                "PLAYLIST_DETAILS": "Lejátszási lista részletei",
+                "TITLE": "Cím",
+                "FROM_URL": "URL-ről hozzáadva",
+                "IMPORT_DATE": "Importálás dátuma",
+                "CHANNELS": "Csatornák száma",
+                "CLOSE": "Bezárás",
+                "SAVE": "Mentés",
+                "USER_AGENT": "User-Agent fejléc",
+                "ORIGINAL_FILENAME": "Eredeti fájlnév",
+                "FILE_PATH": "Fájl elérési útja",
+                "UPDATE_FAILED": "A lejátszási lista legutóbbi frissítése sikertelen volt",
+                "AUTO_UPDATE": "Automatikus frissítés",
+                "AUTO_UPDATE_DESCRIPTION": "Az automatikus frissítés bekapcsolásakor a lejátszási lista az alkalmazás minden indításakor automatikusan frissül.",
+                "CUSTOM_USER_AGENT": "Egyes IPTV-szolgáltatók egyedi User-Agent fejlécet igényelnek a lejátszási lista használatához.",
+                "EXPORT_PLAYLIST": "Lejátszási lista exportálása M3U-fájlként",
+                "SERVER_URL": "Kiszolgáló URL-címe",
+                "USERNAME": "Felhasználónév",
+                "PASSWORD": "Jelszó",
+                "MAC_ADDRESS": "MAC-cím",
+                "PLAYLIST_EXPORT_SUCCESS": "A lejátszási lista exportálása sikerült.",
+                "PLAYLIST_EXPORT_ERROR": "Hiba: nem sikerült exportálni a lejátszási listát.",
+                "COPY_URL": "URL-cím másolása a vágólapra",
+                "URL_COPIED": "Az URL-cím a vágólapra került"
+            },
+            "REMOVE_DIALOG": {
+                "TITLE": "Lejátszási lista eltávolítása",
+                "MESSAGE": "Biztosan véglegesen törli ezt a lejátszási listát?",
+                "SUCCESS": "A lejátszási lista eltávolítva",
+                "IN_PROGRESS": "Lejátszási lista eltávolítása…",
+                "DELETING_FAVORITES": "Kedvencek eltávolítása…",
+                "DELETING_RECENT": "Megtekintési előzmények törlése…",
+                "DELETING_PROGRESS": "Mentett lejátszási pozíciók eltávolítása…",
+                "DELETING_DOWNLOADS": "Letöltések eltávolítása…",
+                "DELETING_CONTENT": "Gyorsítótárazott tartalom eltávolítása…",
+                "DELETING_CATEGORIES": "Kategóriák eltávolítása…",
+                "DELETING_PLAYLIST": "Lejátszási lista bejegyzésének eltávolítása…"
+            },
+            "UPDATED": "Frissítve",
+            "REFRESH": "Lejátszási lista frissítése",
+            "REFRESH_XTREAM": "Xtream-lejátszási lista frissítése a távoli forrásból",
+            "REFRESH_XTREAM_DIALOG": {
+                "TITLE": "Xtream-lejátszási lista frissítése",
+                "MESSAGE": "A művelet törli a helyi Xtream-gyorsítótárat, majd újraimportálja a kategóriákat és az adatfolyamokat a távoli kiszolgálóról. Sikeres újraimportálás után visszaállnak a kedvencek, a megtekintési előzmények, a rejtett kategóriák láthatósági beállításai és a mentett lejátszási pozíciók, amennyiben a hozzájuk tartozó tartalom továbbra is elérhető. Ha a kiszolgáló nem érhető el, a visszaállítás függőben marad egy későbbi sikeres frissítésig. Folytatja?",
+                "STARTED": "A frissítés elindult. Ugrás a lejátszási listához…",
+                "ERROR": "Nem sikerült frissíteni a lejátszási listát. Próbálja újra.",
+                "IN_PROGRESS": "Lejátszási lista frissítése…",
+                "COLLECTING_DATA": "Kedvencek és megtekintési előzmények összegyűjtése…",
+                "DELETING_CONTENT": "Gyorsítótárazott tartalom eltávolítása…",
+                "DELETING_CATEGORIES": "Gyorsítótárazott kategóriák eltávolítása…"
+            },
+            "GLOBAL_FAVORITES": "Összesített kedvencek",
+            "GLOBAL_FAVORITES_DESCRIPTION": "Az összes lejátszási lista kedvenceit egyesítő, automatikusan létrehozott lejátszási lista",
+            "MY_PLAYLISTS": "Lejátszási listáim",
+            "MY_PLAYLISTS_SUBTITLE": "Az összes elérhető lejátszási lista",
+            "PLAYLIST_UPDATE_SUCCESS": "Sikeresen frissült a lejátszási lista.",
+            "PLAYLIST_UPDATE_ERROR": "Hiba történt a lejátszási lista adatainak frissítésekor.",
+            "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Nem sikerült frissíteni a lejátszási listát, mert a helyi fájl már nem érhető el. Ellenőrizze a fájl elérési útját, vagy importálja újra a listát.",
+            "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Nem sikerült frissíteni a lejátszási listát, mert az alkalmazás már nem fér hozzá a helyi fájlhoz.",
+            "AUTO_REFRESH_UPDATE_SUCCESS": "Sikeresen frissültek a lejátszási listák.",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Playlist auto-refresh incomplete: {{updated}} of {{total}} playlists updated, {{failed}} failed.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Playlist auto-refresh incomplete: {{updated}} of {{total}} playlists updated, {{failed}} failed, {{skipped}} skipped (no URL or file path).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Playlist auto-refresh failed. None of the {{total}} playlists could be updated.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Playlist auto-refresh: {{updated}} of {{total}} playlists updated, {{skipped}} skipped (no URL or file path).",
+            "AUTO_REFRESH_ENABLED": "Automatikus frissítés bekapcsolva"
+        },
+        "ADD_PLAYLIST": {
+            "PICK_METHOD": "Válassza ki, hogyan szeretne csatlakozni. A megnevezést később módosíthatja.",
+            "METHOD_URL_LABEL": "M3U URL-címe",
+            "METHOD_URL_SUB": "Illesszen be egy távoli .m3u- vagy .m3u8-fájlra mutató hivatkozást",
+            "METHOD_FILE_LABEL": "M3U-fájl",
+            "METHOD_FILE_SUB": "Töltsön fel egy lejátszási listát a számítógépéről",
+            "METHOD_XTREAM_LABEL": "Xtream hitelesítési adatok",
+            "METHOD_XTREAM_SUB": "Kapcsolódás kiszolgálócím, felhasználónév és jelszó használatával",
+            "METHOD_STALKER_LABEL": "Stalker-portál",
+            "METHOD_STALKER_SUB": "MAC-cím és a portál URL-címe",
+            "METHOD_TEXT_LABEL": "Nyers M3U-szöveg",
+            "METHOD_TEXT_SUB": "Egyszeri listákhoz, vagy ha csak szöveg áll rendelkezésére"
+        },
+        "FILE_UPLOAD": {
+            "DRAG_DROP": "Húzzon ide egy .m3u- vagy .m3u8-fájlt",
+            "OR": "vagy",
+            "CHOOSE_PLAYLIST": "kattintson a tallózáshoz",
+            "BROWSE": "Fájlok tallózása",
+            "REJECTED": "Elutasított fájl: {{filename}} – nem támogatott fájlformátum."
+        },
+        "URL_UPLOAD": {
+            "PLAYLIST_URL": "Lejátszási lista URL-címe (m3u, m3u8)",
+            "ADD_PLAYLIST": "Lejátszási lista hozzáadása",
+            "CORS_NOTE": "Megjegyzés: a CORS-problémák elkerülésére az alkalmazás jelenleg nyilvános CORS-proxyszolgáltatást használ. Ha a lejátszási lista bizalmas adatokat tartalmaz, biztonságosabb fájlból importálni.",
+            "ERROR_FETCH_FAILED": "Nem sikerült lekérni a lejátszási listát. Ellenőrizze az URL-címet, majd próbálja újra.",
+            "ERROR_403": "Hozzáférés megtagadva (403): a kiszolgáló elutasította a kérést. Elképzelhető, hogy az URL-cím hitelesítést igényel, vagy a lejátszási lista korlátozott hozzáférésű.",
+            "ERROR_404": "A lejátszási lista nem található (404): az URL-cím nem érvényes lejátszási listára mutat. Ellenőrizze a címet.",
+            "ERROR_401": "Nincs jogosultság (401): a lejátszási lista eléréséhez hitelesítés szükséges.",
+            "ERROR_INVALID_TLS": "A lejátszási lista kiszolgálójának tanúsítványa érvénytelen.",
+            "ERROR_TLS_HOST_UNKNOWN": "Nem sikerült meghatározni a lejátszási lista kiszolgálóját. Próbálja újra kézzel.",
+            "TRUST_TLS_HOST": "Kiszolgáló megbízhatónak jelölése",
+            "TRUST_TLS_HOST_TITLE": "Megbízik ebben a kiszolgálóban az érvénytelen tanúsítvány ellenére?",
+            "TRUST_TLS_HOST_WARNING": "Csak akkor folytassa, ha megbízik a lejátszási lista kiszolgálójában. Az IPTVnator ennél a kiszolgálónál engedélyezi az érvénytelen TLS-tanúsítványokat, más kiszolgálóknál azonban továbbra is érvényes tanúsítványt követel meg."
+        },
+        "TEXT_IMPORT": {
+            "LABEL": "M3U/M3U8-lejátszási lista beillesztése szövegként",
+            "BUTTON_LABEL": "Importálás"
+        },
+        "XTREAM_PLAYLIST": {
+            "TITLE": "Lejátszási lista címe",
+            "SERVER_URL": "Kiszolgáló URL-címe",
+            "USERNAME": "Felhasználónév",
+            "PASSWORD": "Jelszó",
+            "ADD": "Hozzáadás",
+            "TEST_CREDENTIALS": "Hitelesítési adatok ellenőrzése",
+            "URL_VALIDATION_ERROR": "Adjon meg protokollt is tartalmazó, érvényes URL-címet (például http://example.com vagy https://example.com:4324)"
+        },
+        "STALKER_PORTAL": {
+            "TITLE": "Cím",
+            "MAC_ADDRESS": "MAC-cím",
+            "SERIAL_NUMBER": "Sorozatszám (nem kötelező)",
+            "SERIAL_NUMBER_HINT": "Akkor használja, ha az eszköz már regisztrálva van a szolgáltatónál",
+            "DEVICE_ID_1": "1. eszközazonosító (nem kötelező)",
+            "DEVICE_ID_2": "2. eszközazonosító (nem kötelező)",
+            "DEVICE_ID_HINT": "64 hexadecimális karakter – csak akkor adja meg, ha a szolgáltató meghatározott eszközazonosítót kér",
+            "SIGNATURE_1": "1. aláírás (nem kötelező)",
+            "SIGNATURE_2": "2. aláírás (nem kötelező)",
+            "SIGNATURE_HINT": "64 hexadecimális karakter – csak akkor adja meg, ha a szolgáltató eszközellenőrzési aláírást kér",
+            "SERVER_URL": "Kiszolgáló URL-címe",
+            "URL_VALIDATION_ERROR": "Adjon meg protokollt is tartalmazó, érvényes URL-címet (például http://example.com/c vagy https://example.com/stalker_portal/c)",
+            "ADD": "Hozzáadás",
+            "VALIDATING": "Portál ellenőrzése…"
+        },
+        "FILTER_BY_NAME": "Szűrés név alapján",
+        "FILTER_AND_SORT": "Szűrés és rendezés",
+        "SORT_PLAYLISTS": "Lejátszási listák rendezése",
+        "SORT_OPTIONS": {
+            "NAME_ASC": "Név szerint (A–Z)",
+            "NAME_DESC": "Név szerint (Z–A)",
+            "NEWEST": "Hozzáadás dátuma (legújabb elöl)",
+            "OLDEST": "Hozzáadás dátuma (legrégebbi elöl)",
+            "CUSTOM_ORDER": "Egyéni sorrend (húzással)"
+        },
+        "PLAYLIST_TYPES": {
+            "M3U": "M3U (helyi fájl, URL vagy szöveg)",
+            "XTREAM": "Xtream",
+            "STALKER": "Stalker"
+        },
+        "IMPORTED_AS_TEXT": "Szövegként importálva",
+        "PARSING_ERROR": "Hiba: a feldolgozás sikertelen; ez nem érvényes lejátszási lista:"
+    },
+    "SETTINGS": {
+        "TITLE": "Beállítások",
+        "GENERAL": "Általános",
+        "GENERAL_SUBTITLE": "Az alkalmazás beállításainak módosítása",
+        "PLAYBACK": "Lejátszás",
+        "EPG_SOURCES": "EPG-források",
+        "EPG_SOURCES_DESCRIPTION": "Egy vagy több URL-cím hozzáadása EPG-forrásként",
+        "PLAYLIST_EPG_SOURCES_AUTO_SELECTED": "A lejátszási listában észlelt {{detected}} EPG-forrás közül a rendszer {{enabled}} forrást automatikusan kijelölt importálásra.",
+        "EPG_EMPTY_TITLE": "Még nincs EPG-forrás",
+        "EPG_EMPTY_HINT": "Adjon hozzá egy URL-címet a csatornák műsoradatainak lekéréséhez.",
+        "PREFER_UPLOADED_EPG_TITLE": "Saját EPG-források előnyben részesítése Xtream-lejátszási listáknál",
+        "PREFER_UPLOADED_EPG_HINT": "Alapértelmezés szerint az Xtream-lejátszási listák a szolgáltató műsorújságát használják, a feltöltött EPG pedig csak a hiányzó csatornák adatait egészíti ki. Kapcsolja be ezt a beállítást, ha elsődlegesen a feltöltött EPG-t szeretné használni.",
+        "DATA": "Adatok",
+        "BACKUP": "Biztonsági mentés",
+        "BACKUP_DESCRIPTION": "Exportálja a médiatár pillanatnyi állapotát, vagy állítson vissza egy korábbi biztonsági mentést.",
+        "RESET": "Alaphelyzetbe állítás",
+        "RESET_DESCRIPTION": "Az alkalmazásban tárolt tartalom végleges törlése.",
+        "ABOUT": "Névjegy",
+        "NAV_GENERAL": "Általános",
+        "NAV_PLAYBACK": "Lejátszás",
+        "NAV_EPG": "EPG",
+        "NAV_REMOTE": "Távvezérlés",
+        "NAV_DATA": "Adatok",
+        "NAV_BACKUP": "Biztonsági mentés",
+        "NAV_RESET": "Alaphelyzetbe állítás",
+        "NAV_ABOUT": "Névjegy",
+        "NAV_TMDB": "Metaadatok",
+        "TMDB": "Metaadatok (TMDB)",
+        "TMDB_DESCRIPTION": "Filmek és sorozatok adatainak kiegészítése a The Movie Database adataival",
+        "TMDB_ENABLE": "TMDB-metaadatok engedélyezése",
+        "TMDB_ENABLE_DESCRIPTION": "Részletesebb történetleírásokat, szereplőlistákat, értékeléseket és képeket jelenít meg az adatlapokon. Bekapcsolásakor az alkalmazás elküldi a filmek és sorozatok címét a TMDB-nek.",
+        "TMDB_API_KEY": "TMDB API-kulcs (nem kötelező)",
+        "TMDB_API_KEY_DESCRIPTION": "A beépített helyett saját TMDB API-kulcs használata",
+        "TMDB_GET_KEY_HINT": "Ingyenes API-kulcs igénylése a themoviedb.org webhelyen",
+        "TMDB_TEST_BUTTON": "Kulcs ellenőrzése",
+        "TMDB_TEST_SUCCESS": "A kulcs működik – a TMDB sikeresen válaszolt",
+        "TMDB_TEST_FAILED": "Az ellenőrzés sikertelen – a TMDB elutasította a kulcsot, vagy nem érhető el",
+        "TMDB_CACHE": "Metaadat-gyorsítótár",
+        "TMDB_CACHE_DESCRIPTION": "A letöltött metaadatok helyben tárolódnak, így a részletek azonnal megnyílnak. Ürítés után az alkalmazás friss adatokat tölt le.",
+        "TMDB_CACHE_SIZE": "{{entries}} bejegyzés · {{size}}",
+        "TMDB_CACHE_CLEAR": "Gyorsítótár ürítése",
+        "TMDB_CACHE_ERROR": "A gyorsítótár nem olvasható — próbálja újra",
+        "TMDB_CREDITS": "Metaadatok",
+        "TMDB_ATTRIBUTION": "Ez a termék a TMDB API-ját használja, de a TMDB nem hagyta jóvá és nem tanúsította.",
+        "APP_PREFERENCES": "Az alkalmazás beállításai",
+        "HERO_EYEBROW": "Munkaterület-beállítások",
+        "HERO_TITLE": "Az IPTVnator személyre szabása",
+        "HERO_DESCRIPTION": "A lejátszás, a műsorújság, a távoli hozzáférés és az adatkezelés beállítása egy helyen, a munkaterület jelenlegi megjelenésének megtartásával.",
+        "SUBTITLE": "Az alkalmazás beállításainak módosítása",
+        "DESCRIPTION": "Módosítsa az alábbi beállításokat, majd erősítse meg a változtatásokat a Változtatások mentése gombbal.",
+        "EPG_URL_LABEL": "EPG URL-címe (*.xml vagy *.xml.gz)",
+        "EPG_URL_PLACEHOLDER": "Adjon meg egy URL-címet",
+        "REFRESH_EPG": "EPG frissítése",
+        "REFRESH_ALL_EPG": "Összes frissítése",
+        "REMOVE_EPG_SOURCE": "EPG-forrás eltávolítása",
+        "EPG_STATUS_FRESH": "Naprakész",
+        "EPG_STATUS_STALE": "Frissítendő",
+        "EPG_STATUS_ERROR": "Sikertelen",
+        "VIDEO_PLAYER_LABEL": "Videólejátszó",
+        "PLAYER_HTML5": "HTML5-videólejátszó",
+        "PLAYER_VIDEOJS": "Video.js-lejátszó",
+        "PLAYER_ARTPLAYER": "ArtPlayer",
+        "PLAYER_EMBEDDED_MPV": "Beágyazott MPV (kísérleti)",
+        "PLAYER_MPV": "MPV-lejátszó",
+        "PLAYER_VLC": "VLC",
+        "VIDEO_PLAYER_PLACEHOLDER": "Válasszon egy lehetőséget",
+        "VERSION": "Verzió",
+        "SAVE_CHANGES": "Változtatások mentése",
+        "BACK_TO_HOME": "Vissza",
+        "NEW_VERSION_AVAILABLE": "Új verzió érhető el",
+        "LATEST_VERSION": "A legújabb verziót használja",
+        "STREAM_FORMAT": "Adatfolyam formátuma",
+        "OPEN_EXTERNAL_PLAYER_ON_DOUBLE_CLICK": "MPV/VLC indítása dupla kattintással",
+        "OPEN_EXTERNAL_PLAYER_ON_DOUBLE_CLICK_DESCRIPTION": "Az MPV- vagy VLC-lejátszás csak a csatornasorra történő dupla kattintással induljon el.",
+        "LANGUAGE": "Nyelv",
+        "SETTINGS_SAVED": "A beállítások mentése sikerült.",
+        "THEME": "Megjelenési téma",
+        "SHOW_CAPTIONS": "Feliratok megjelenítése",
+        "SHOW_DASHBOARD": "Vezérlőpult megjelenítése",
+        "SHOW_DASHBOARD_DESCRIPTION": "A Vezérlőpult maradjon elérhető a munkaterület oldalsávjában. Kikapcsolásakor a Források lesz a munkaterület első oldala.",
+        "ADD_EPG_SOURCE": "EPG-forrás hozzáadása",
+        "CLEAR_EPG_DATA": "EPG-adatok törlése",
+        "CLEAR_EPG_DIALOG": {
+            "TITLE": "EPG-adatok törlése",
+            "MESSAGE": "Biztosan törli az adatbázisból az elektronikus műsorújság (EPG) összes adatát? A művelet minden gyorsítótárazott műsoradatot töröl."
+        },
+        "EPG_DATA_CLEARED": "Az EPG-adatok törölve.",
+        "EPG_DATA_CLEAR_FAILED": "Nem sikerült törölni az EPG-adatokat. Próbálja újra.",
+        "CLEARING_EPG_DATA": "Törlés…",
+        "EPG_URL_ERROR": "A megadott érték nem érvényes URL-cím",
+        "VIDEO_PLAYER_DESCRIPTION": "Az alapértelmezett videólejátszó kiválasztása",
+        "WEB_PLAYER_SHARED_CONTROLS": "Egységes vezérlők a webes lejátszókhoz (kísérleti)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Az IPTVnator közös vezérlőinek használata a HTML5-, Video.js- és ArtPlayer-lejátszóban.",
+        "PLAYER_AMBIENT_MODE": "Ambient background fill",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Fill the space around the player with a blurred, dimmed poster instead of plain black bars.",
+        "PLAYER_UP_NEXT_RAIL": "„Következik” epizódsáv",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Széles ablakban a sorozatlejátszó balra kerül, mellette pedig megjelennek a következő epizódok.",
+        "STREAM_FORMAT_DESCRIPTION": "Az alapértelmezett adatfolyam-formátum kiválasztása (Xtream)",
+        "LANGUAGE_DESCRIPTION": "Az alkalmazás nyelvének kiválasztása",
+        "THEME_DESCRIPTION": "Az alkalmazás megjelenési témájának kiválasztása",
+        "COVER_SIZE": "Borító mérete",
+        "COVER_SIZE_DESCRIPTION": "Állítsa be a borítókártyák méretét a rácsokban és a vízszintes sávokban. A nagyobb kártyák televízión könnyebben láthatók, a kisebbek pedig nagy monitorokon több tartalmat jelenítenek meg soronként.",
+        "COVER_SIZE_SMALL": "Kicsi",
+        "COVER_SIZE_MEDIUM": "Közepes",
+        "COVER_SIZE_LARGE": "Nagy",
+        "EPG_VIEW_MODE": "Műsorújság nézete",
+        "EPG_VIEW_MODE_DESCRIPTION": "Válassza ki, hogyan jelenjen meg a lejátszó alatti műsorújság: vízszintes idősávként vagy függőleges, egynapos listaként.",
+        "EPG_VIEW_MODE_TIMELINE": "Idővonal",
+        "EPG_VIEW_MODE_LIST": "Lista",
+        "STARTUP_BEHAVIOR": "Indításkori nézet",
+        "STARTUP_BEHAVIOR_DESCRIPTION": "Válassza ki, hogy induláskor az első elérhető munkaterület-nézet nyíljon meg, vagy az IPTVnator állítsa vissza a legutóbb használt szakasznézetet. Az első nézet bekapcsolt Vezérlőpult esetén a Vezérlőpult, egyébként a Források.",
+        "STARTUP_BEHAVIOR_FIRST_VIEW": "Első elérhető nézet",
+        "STARTUP_BEHAVIOR_RESTORE_LAST_VIEW": "Legutóbbi nézet visszaállítása",
+        "SHOW_CAPTIONS_DESCRIPTION": "Feliratok alapértelmezett megjelenítése vagy elrejtése",
+        "SHOW_EXTERNAL_PLAYBACK_BAR": "Aktuális lejátszás sávjának megjelenítése",
+        "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Az asztali alkalmazásban maradjon látható a munkaterület alján a külső lejátszó állapotsávja.",
+        "STRIP_COUNTRY_PREFIX": "Ország- és csoportelőtagok eltávolítása a csatornanevekből",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Eltávolítja az élő csatornák nevéből az olyan ország- vagy csoportelőtagokat, mint az „US | ” vagy az „UK - ”.",
+        "VERSION_DESCRIPTION": "Az alkalmazás jelenlegi verziója",
+        "ABOUT_SUBTITLE": "Verzióadatok, a projekt hivatkozásai és az IPTVnator támogatási lehetőségei.",
+        "EMBEDDED_MPV_NOTICE_TITLE": "Beágyazott MPV-futtatókörnyezet",
+        "EMBEDDED_MPV_NOTICE_DESCRIPTION": "Az asztali kiadások tartalmazhatják a kísérleti beágyazott MPV-lejátszóhoz szükséges libmpv- és FFmpeg-könyvtárakat. A felhasználóknak nem kell külön telepíteniük az MPV alkalmazást; szükség esetén továbbra is használható külső MPV- vagy VLC-lejátszó.",
+        "COMMUNITY": "Projekt és közösség",
+        "COMMUNITY_DESCRIPTION": "Jelölje csillaggal a GitHub-adattárat, olvassa a blogot, vagy csatlakozzon a Telegram-csoporthoz frissítésekért és segítségért.",
+        "LINK_BLOG": "Blog",
+        "LINK_GITHUB_DESCRIPTION": "Jelölje csillaggal a GitHub-adattárat, nyisson hibajegyet, vagy járuljon hozzá a fejlesztéshez",
+        "LINK_BLOG_DESCRIPTION": "Kiadási hírek, tippek és projektfrissítések",
+        "LINK_TELEGRAM_DESCRIPTION": "Bejelentések, közösség és támogatás",
+        "SUPPORT_TITLE": "A projekt támogatása",
+        "SUPPORT_DESCRIPTION": "Az IPTVnator ingyenes és nyílt forráskódú alkalmazás, amelynek fejlesztése is nyilvánosan zajlik. Ha a mindennapjai részévé vált, egy kisebb hozzájárulás is segít életben tartani a projektet és alakítani a jövőjét – köszönjük.",
+        "SUPPORT_SPONSORS_HINT": "Rendszeres vagy egyszeri támogatás",
+        "SUPPORT_KOFI_HINT": "Hívjon meg egy kávéra",
+        "EPG_NOTE": "Az EPG jelenleg csak az IPTVnator Electron-alapú változatában érhető el.",
+        "EPG_NOTE_URL_TEXT": "Megnyitás",
+        "IMPORT_EXPORT_DATA": "Lejátszási listák biztonsági mentéseinek importálása és exportálása",
+        "IMPORT_EXPORT_DATA_DESCRIPTION": "Lejátszási listák biztonsági mentéseinek exportálása vagy visszaállítása, beleértve az M3U-listák mentett példányait, az Xtream- és Stalker-kapcsolatok metaadatait, a felhasználói állapotot, valamint az EPG-források URL-címeit.",
+        "IMPORT_DATA": "Importálás",
+        "EXPORT_DATA": "Exportálás",
+        "EXPORTING_DATA": "Exportálás…",
+        "REMOVE_ALL": "Az összes lejátszási lista és kapcsolódó adat törlése",
+        "REMOVE_ALL_BUTTON": "Összes törlése",
+        "REMOVE_ALL_DESCRIPTION": "Az alkalmazásban tárolt összes M3U-, Xtream- és Stalker-lejátszási lista törlése.",
+        "REMOVE_DIALOG": {
+            "TITLE": "Törli az összes lejátszási listát?",
+            "MESSAGE": "A művelet {{count}} lejátszási listát töröl az alkalmazásból, az eszközön tárolt kapcsolódó adatokkal együtt.",
+            "SUMMARY_TITLE": "Lejátszási listák forrásai",
+            "CONSEQUENCES_TITLE": "A következők is törlődnek",
+            "CONSEQUENCE_FAVORITES": "A lejátszási listákhoz mentett kedvencek",
+            "CONSEQUENCE_RECENTLY_VIEWED": "Megtekintési előzmények",
+            "CONSEQUENCE_PLAYBACK": "Mentett lejátszási pozíciók",
+            "CONSEQUENCE_DOWNLOADS": "A lejátszási listákhoz kapcsolódó letöltési előzmények bejegyzései",
+            "CONSEQUENCE_XTREAM_CACHE": "Importált Xtream-kategóriák és helyben gyorsítótárazott tartalom",
+            "BACKUP_HINT": "Törlés előtt az Exportálás lehetőséggel készíthet később visszaállítható biztonsági mentést.",
+            "CONFIRM": "Minden törlése"
+        },
+        "IMPORT_ERROR": "Importálási hiba. Próbálkozzon másik fájllal.",
+        "PLAYLISTS_REMOVED": "Az összes lejátszási lista és kapcsolódó adat törölve.",
+        "MPV_PLAYER_PATH_LABEL": "MPV elérési útvonala",
+        "MPV_PLAYER_PATH_DESCRIPTION": "Adja meg az MPV elérési útját. macOS rendszeren használható az MPV alkalmazáscsomag, például /Applications/mpv.app, vagy a futtatható fájl elérési útja.",
+        "MPV_COMPATIBLE_PLAYER_TIP": "macOS rendszeren az IINA MPV-kompatibilis lejátszóként indítható, de a futtatható fájl elérési útját adja meg, például /Applications/IINA.app/Contents/MacOS/iina-cli vagy /Applications/IINA.app/Contents/MacOS/IINA. Az IPTVnator vezérlőfunkciói, a lejátszási pozíció lekérdezése és a példány újrafelhasználása csak MPV IPC használatakor garantált.",
+        "MPV_PLAYER_PATH": "MPV-lejátszó elérési útvonala",
+        "MPV_PLAYER_ARGUMENTS_LABEL": "MPV parancssori argumentumai",
+        "MPV_PLAYER_ARGUMENTS_DESCRIPTION": "Az IPTVnator új külső lejátszófolyamat indításakor ezeket a nem kötelező argumentumokat adja át az MPV-nek.",
+        "MPV_PLAYER_ARGUMENTS": "MPV-argumentumok",
+        "MPV_REUSE_INSTANCE_LABEL": "MPV-példány újrafelhasználása",
+        "MPV_REUSE_INSTANCE_DESCRIPTION": "Bekapcsolásakor ugyanaz az MPV-ablak használható különböző adatfolyamok lejátszására. Kikapcsolásakor minden adatfolyam új MPV-ablakban nyílik meg.",
+        "RECORDING_FOLDER_LABEL": "Felvételek mappája",
+        "RECORDING_FOLDER_DESCRIPTION": "Az élő adások beágyazott MPV-vel készített felvételeinek mappája. Hagyja üresen, ha a rendszer Letöltések mappáját szeretné használni.",
+        "RECORDING_FOLDER": "Felvételek mappája",
+        "RECORDING_FOLDER_SELECT": "Felvételek mappájának kiválasztása",
+        "VLC_PLAYER_PATH_LABEL": "VLC elérési útvonala",
+        "VLC_PLAYER_PATH_DESCRIPTION": "Adja meg a VLC elérési útját. macOS rendszeren használható a VLC alkalmazáscsomag, például /Applications/VLC.app, vagy a futtatható fájl elérési útja.",
+        "VLC_PLAYER_PATH": "VLC-lejátszó elérési útvonala",
+        "VLC_PLAYER_ARGUMENTS_LABEL": "VLC parancssori argumentumai",
+        "VLC_PLAYER_ARGUMENTS_DESCRIPTION": "Az IPTVnator új külső lejátszófolyamat indításakor ezeket a nem kötelező argumentumokat adja át a VLC-nek.",
+        "VLC_PLAYER_ARGUMENTS": "VLC-argumentumok",
+        "EXTERNAL_PLAYER_ARGUMENTS_HINT": "Soronként egy argumentumot adjon meg. Az alkalmazás ezeket az adatfolyamhoz tartozó IPTVnator-beállítások előtt alkalmazza.",
+        "VLC_REUSE_INSTANCE_LABEL": "VLC-példány újrafelhasználása",
+        "VLC_REUSE_INSTANCE_DESCRIPTION": "Bekapcsolásakor ugyanaz a VLC-ablak használható különböző adatfolyamok lejátszására. Kikapcsolásakor minden adatfolyam új VLC-ablakban nyílik meg.",
+        "REMOTE_CONTROL": "Távvezérlés",
+        "REMOTE_CONTROL_DESCRIPTION": "Az alkalmazás távvezérlésének engedélyezése.",
+        "REMOTE_CONTROL_PORT": "Távvezérléshez használt port",
+        "REMOTE_CONTROL_PORT_DESCRIPTION": "Az alkalmazás távvezérléséhez használt port. Alapértelmezés szerint a 8765-ös port van beállítva.",
+        "REMOTE_CONTROL_URL": "Távvezérlés URL-címe",
+        "REMOTE_CONTROL_URL_DESCRIPTION": "A távvezérlő elérése ugyanazon a hálózaton lévő másik eszközről.",
+        "SHOW_QR_CODE": "QR-kód megjelenítése",
+        "STATUS_ENABLED": "Bekapcsolva",
+        "STATUS_DISABLED": "Kikapcsolva",
+        "SOURCE_SINGULAR": "forrás",
+        "SOURCE_PLURAL": "forrás",
+        "PORT_RANGE_LABEL": "Port (1–65535)",
+        "PORT_REQUIRED": "A port megadása kötelező",
+        "PORT_MIN": "A port értéke legalább 1 legyen",
+        "PORT_MAX": "A port értéke legfeljebb 65535 lehet",
+        "PORT_PATTERN": "Csak számjegyek adhatók meg",
+        "REMOVE_ALL_IN_PROGRESS": "Lejátszási lista adatainak törlése…",
+        "REMOVE_ALL_PROGRESS": "Lejátszási lista adatainak törlése… {{current}} / {{total}}",
+        "PLAYLISTS_REMOVE_FAILED": "Nem sikerült törölni a lejátszási listákat. Próbálja újra.",
+        "NAV_DASHBOARD": "Vezérlőpult",
+        "DASHBOARD": "Vezérlőpult",
+        "DASHBOARD_SUBTITLE": "Válassza ki, mely tartalomsávok jelenjenek meg a munkaterület vezérlőpultján.",
+        "DASHBOARD_HERO": "Kiemelt fejléc",
+        "DASHBOARD_HERO_DESCRIPTION": "A legutóbbi tartalmat bemutató nagyméretű felső fejléc megjelenítése.",
+        "DASHBOARD_RAIL_CONTINUE": "Lejátszás folytatása",
+        "DASHBOARD_RAIL_CONTINUE_DESCRIPTION": "A legutóbb megtekintett filmek és sorozatok megjelenítése borítókártyákkal.",
+        "DASHBOARD_RAIL_LIVE_FAVORITES": "Élőben a kedvenc csatornákon",
+        "DASHBOARD_RAIL_LIVE_FAVORITES_DESCRIPTION": "Kedvenc élő csatornáinak megjelenítése az aktuális műsor előrehaladását jelző sávval.",
+        "DASHBOARD_RAIL_RECENT_LIVE": "Legutóbb nézett élő csatornák",
+        "DASHBOARD_RAIL_RECENT_LIVE_DESCRIPTION": "A nemrég megnyitott élő csatornák megjelenítése az aktuális műsor előrehaladását jelző sávval.",
+        "DASHBOARD_RAIL_FAVORITE_VOD": "Kedvenc filmek és sorozatok",
+        "DASHBOARD_RAIL_FAVORITE_VOD_DESCRIPTION": "A kedvencként megjelölt filmek és sorozatok megjelenítése borítókártyákkal.",
+        "DASHBOARD_RAIL_SOURCES": "Legutóbb használt források",
+        "DASHBOARD_RAIL_SOURCES_DESCRIPTION": "Parancsikonok megjelenítése a legutóbb használt lejátszási listákhoz és portálokhoz.",
+        "DASHBOARD_RAIL_TMDB_TRENDING": "A hét felkapott tartalmai (TMDB)",
+        "DASHBOARD_RAIL_TMDB_TRENDING_DESCRIPTION": "A TMDB heti felkapott filmjeinek és sorozatainak megjelenítése, a médiatáraiban elérhető tartalmakhoz párosítva. Használatához engedélyezni kell a TMDB-metaadatokat.",
+        "DASHBOARD_RAIL_XTREAM_ADDED": "Legutóbb hozzáadott Xtream-tartalmak",
+        "DASHBOARD_RAIL_XTREAM_ADDED_DESCRIPTION": "A legújabb Xtream-filmek, -sorozatok és -csatornák megjelenítése.",
+        "APP_UPDATE_TITLE": "Alkalmazásfrissítés",
+        "APP_UPDATE_DESCRIPTION": "Frissítések keresése az asztali alkalmazáshoz a GitHub kiadásai között.",
+        "APP_UPDATE_IDLE": "Készen áll a frissítések keresésére",
+        "APP_UPDATE_CHECKING": "Frissítések keresése…",
+        "APP_UPDATE_AVAILABLE": "{{version}} verzió érhető el",
+        "APP_UPDATE_NOT_AVAILABLE": "A legújabb verziót használja",
+        "APP_UPDATE_DOWNLOADING": "{{version}} verzió letöltése…",
+        "APP_UPDATE_DOWNLOADED": "{{version}} verzió telepíthető",
+        "APP_UPDATE_MANUAL_AVAILABLE": "{{version}} verzió kézi telepítéssel érhető el",
+        "APP_UPDATE_ERROR": "Nem sikerült ellenőrizni a frissítéseket",
+        "APP_UPDATE_CHECK": "Újbóli ellenőrzés",
+        "APP_UPDATE_DOWNLOAD": "Frissítés",
+        "APP_UPDATE_INSTALL": "Alkalmazás újraindítása",
+        "APP_UPDATE_OPEN_RELEASE": "GitHub-kiadás megnyitása",
+        "APP_UPDATE_RELEASE_NOTES": "Újdonságok",
+        "EMBEDDED_MPV_FRAME_COPY": "Beágyazott MPV: képkocka-másolásos megjelenítés (kísérleti)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "A videó megjelenítése az alkalmazás rajzfelületén, hogy a menük és párbeszédpanelek fölötte jelenhessenek meg.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Az alkalmazás újraindítása után lép érvénybe."
+    },
+    "THEMES": {
+        "DARK_THEME": "Sötét",
+        "LIGHT_THEME": "Világos",
+        "SYSTEM_THEME": "Rendszer"
+    },
+    "AUDIO_PLAYER": {
+        "PLAY": "Lejátszás",
+        "PAUSE": "Szünet",
+        "PREVIOUS_STATION": "Előző állomás",
+        "NEXT_STATION": "Következő állomás",
+        "MUTE": "Némítás",
+        "UNMUTE": "Némítás feloldása",
+        "VOLUME": "Hangerő"
+    },
+    "EMBEDDED_MPV": {
+        "PLAYER": {
+            "BACK": "Back",
+            "RETRY": "Újrapróbálkozás",
+            "STALLED": "Az adatfolyam indítása a vártnál hosszabb ideig tart.",
+            "PLAYBACK_FAILED": "Nem sikerült lejátszani a tartalmat a beágyazott MPV-vel.",
+            "CHECKING_SUPPORT": "A beágyazott MPV támogatásának ellenőrzése…",
+            "NOT_AVAILABLE": "A beágyazott MPV ebben a környezetben nem érhető el.",
+            "LOADING_STREAM": "Adatfolyam betöltése…",
+            "PLAY": "Lejátszás",
+            "PAUSE": "Szünet",
+            "PREVIOUS_EPISODE": "Előző epizód",
+            "NEXT_EPISODE": "Következő epizód",
+            "BACK_10_SECONDS": "Ugrás 10 másodperccel vissza",
+            "FORWARD_10_SECONDS": "Ugrás 10 másodperccel előre",
+            "LIVE_STREAM": "Élő adás",
+            "PLAYBACK_POSITION": "Lejátszási pozíció",
+            "MUTE": "Némítás",
+            "UNMUTE": "Némítás feloldása",
+            "MUTED": "Némítva",
+            "VOLUME": "Hangerő",
+            "VOLUME_LABEL": "Hangerő: {{percent}}%",
+            "AUDIO_TRACKS": "Hangsávok",
+            "SUBTITLES": "Feliratok",
+            "SUBTITLES_OFF": "Kikapcsolva",
+            "TRACK_DEFAULT": "Alapértelmezett",
+            "AUDIO_TRACK_FALLBACK": "{{index}}. hangsáv",
+            "SUBTITLE_TRACK_FALLBACK": "{{index}}. feliratsáv",
+            "PLAYBACK_SPEED": "Lejátszási sebesség",
+            "SPEED_TOOLTIP": "Sebesség: {{speed}}",
+            "ASPECT_RATIO": "Képarány",
+            "ASPECT_TOOLTIP": "Képarány: {{aspect}}",
+            "ASPECT_DEFAULT": "Alapértelmezett",
+            "START_RECORDING": "Felvétel indítása",
+            "STOP_RECORDING": "Felvétel leállítása",
+            "RECORDING": "Felvétel készül",
+            "RECORDING_SAVED": "Felvétel mentve",
+            "RECORDING_FAILED": "A felvétel meghiúsult",
+            "RECORDING_FAILED_TO_START": "Nem sikerült elindítani a felvételt.",
+            "RECORDING_FAILED_TO_STOP": "Nem sikerült leállítani a felvételt.",
+            "SAVED_TO": "Mentve ide: {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Kép a képben mód bekapcsolása",
+            "EXIT_PICTURE_IN_PICTURE": "Kilépés a kép a képben módból",
+            "ENTER_FULLSCREEN": "Váltás teljes képernyőre",
+            "EXIT_FULLSCREEN": "Kilépés a teljes képernyős módból"
+        }
+    },
+    "PLAYBACK_DIAGNOSTICS": {
+        "UNSUPPORTED_CONTAINER": {
+            "TITLE": "A böngészőben működő lejátszó valószínűleg nem támogatja az adatfolyam konténerformátumát",
+            "DESCRIPTION": "Előfordulhat, hogy a böngészőben működő lejátszó nem tudja közvetlenül dekódolni ezt a konténerformátumot. Másolja ki az adatfolyam URL-címét, és nyissa meg szélesebb kodektámogatást nyújtó külső lejátszóban, például MPV-ben, VLC-ben vagy IINA-ban."
+        },
+        "UNSUPPORTED_CODEC": {
+            "TITLE": "A böngészőben működő lejátszó valószínűleg nem támogatja az adatfolyam kodekjét",
+            "DESCRIPTION": "Az adatfolyamban jelzett kodekeket a böngészőben működő lejátszó esetleg nem tudja dekódolni. Másolja ki az adatfolyam URL-címét, és nyissa meg külső lejátszóban, például MPV-ben, VLC-ben vagy IINA-ban."
+        },
+        "MEDIA_DECODE_ERROR": {
+            "TITLE": "A böngészőben működő lejátszó nem tudta dekódolni ezt az adatfolyamot",
+            "DESCRIPTION": "A lejátszás elindult, de a médiafeldolgozási lánc dekódolás közben hibába ütközött. Külső lejátszóval az adatfolyam esetleg megfelelően lejátszható."
+        },
+        "NETWORK_ERROR": {
+            "TITLE": "Nem sikerült betölteni az adatfolyamot",
+            "DESCRIPTION": "A lejátszó hálózati vagy szolgáltatói betöltési hibát jelzett. Ellenőrizze az adatfolyam URL-címét, a fejléceket, illetve a szolgáltató elérhetőségét."
+        },
+        "BROWSER_ACCESS_ERROR": {
+            "TITLE": "A böngészőben működő lejátszó nem tudott hozzáférni ehhez az adatfolyamhoz",
+            "DESCRIPTION": "A kérést CORS-korlátozás, vegyes tartalom, illetve a szolgáltató fejléc- vagy proxykorlátozásai akadályozhatják. Az MPV vagy a VLC gyakran képes megkerülni a böngészőben működő lejátszó hozzáférési korlátait.",
+            "PWA_DESCRIPTION": "A kérést CORS-korlátozás, vegyes tartalom, illetve a szolgáltató fejléc- vagy proxykorlátozásai akadályozhatják. A PWA nem tud közvetlenül külső lejátszót indítani; válassza az Adatfolyam URL-címének másolása műveletet, majd nyissa meg kézzel MPV-ben, VLC-ben, IINA-ban vagy más lejátszóban."
+        },
+        "DRM_OR_ENCRYPTION": {
+            "TITLE": "Az adatfolyam titkosított vagy DRM-védelemmel ellátott lehet",
+            "DESCRIPTION": "A böngészőben működő lejátszó a jelzett titkosítási vagy kulcshiba miatt nem tudja folytatni a lejátszást. Ha a szolgáltató DRM-védelmet alkalmaz, a külső lejátszás is sikertelen lehet."
+        },
+        "UNKNOWN_PLAYBACK_ERROR": {
+            "TITLE": "A böngészőben működő lejátszó lejátszási hibát jelzett",
+            "DESCRIPTION": "Az adatfolyam lejátszása a beépített lejátszóban meghiúsult, a hiba azonban nem utalt egyértelműen kodek-, konténer- vagy hálózati problémára."
+        },
+        "NATIVE_FALLBACK_TITLE": "Nyissa meg inkább külső lejátszóban",
+        "INLINE_FAILURE_TITLE": "Másolja ki az URL-címet, vagy próbálja újra",
+        "ACTION_OPEN_MPV": "Megnyitás MPV-ben",
+        "ACTION_OPEN_VLC": "Megnyitás VLC-ben",
+        "ACTION_OPEN_MPV_HINT": "beállított lejátszó",
+        "ACTION_OPEN_VLC_HINT": "beállított lejátszó",
+        "ACTION_COPY_URL": "Adatfolyam URL-címének másolása",
+        "ACTION_RETRY": "Újrapróbálkozás",
+        "DETAILS_SUMMARY": "Műszaki részletek",
+        "CODEC_HINT": "Észlelt kodekek: {{codecs}}. A Chromium/Electron-alapú, böngészőben működő lejátszók gyakran csak korlátozottan támogatják ezeket a kodekeket.",
+        "DETAIL_CODE": "Diagnosztikai kód",
+        "DETAIL_PLAYER": "Lejátszó",
+        "DETAIL_SOURCE": "Forrás",
+        "DETAIL_CONTAINER": "Konténer",
+        "DETAIL_MIME_TYPE": "MIME-típus",
+        "DETAIL_VIDEO_CODECS": "Videókodekek",
+        "DETAIL_AUDIO_CODECS": "Hangkodekek",
+        "DETAIL_NATIVE_ERROR_CODE": "Natív hibakód",
+        "DETAIL_NATIVE_ERROR_MESSAGE": "Natív hibaüzenet",
+        "DETAIL_ERROR_DETAILS": "A hiba részletei"
+    },
+    "LAYOUT": {
+        "HIDE_CHANNELS_LIST": "Csatornalista elrejtése",
+        "SHOW_CHANNELS_LIST": "Csatornalista megjelenítése",
+        "TOGGLE_SIDEBAR_TOOLTIP": "Csatornalista megjelenítése vagy elrejtése (⌘/Ctrl+B)"
+    },
+    "CHANNELS": {
+        "UPLOAD_OR_SELECT_OTHER_PLAYLIST": "Másik lejátszási lista feltöltése vagy kiválasztása",
+        "ALL_CHANNELS": "Összes csatorna",
+        "GROUPS": "Csoportok",
+        "MANAGE_GROUPS": "Csoportok kezelése",
+        "MANAGE_GROUPS_HINT": "A korábban elrejtett csoportokat a Csoportok kezelése lehetőséggel jelenítheti meg újra.",
+        "NO_VISIBLE_GROUPS": "Nincs látható csoport",
+        "SEARCH_GROUPS": "Keresés a csoportok között",
+        "UNGROUPED": "Csoport nélkül",
+        "UNNAMED_CHANNEL": "Névtelen csatorna",
+        "FAVORITES": "Kedvencek",
+        "NO_FAVORITES": "Még nincs kedvenc csatorna",
+        "USE_STAR_TO_FAVORITE": "A csatornákat a csillag ikonnal adhatja a kedvencekhez.",
+        "REMOVE_FAVORITE": "Eltávolítás a kedvencek közül",
+        "ADD_FAVORITE": "Hozzáadás a kedvencekhez",
+        "SHOW_DETAILS": "Csatorna részleteinek megjelenítése",
+        "MAP_EPG": "Map EPG channel",
+        "FAVORITES_UPDATED": "Kedvencek frissítve!",
+        "SELECT_CHANNEL_PLAYBACK": "A lejátszás indításához válasszon egy csatornát",
+        "SORT_BY": "Rendezés",
+        "SORT_BY_DATE": "Hozzáadás dátuma szerint (legújabb elöl)",
+        "SORT_BY_RATING": "Értékelés szerint",
+        "SORT_BY_NAME": "Név szerint (A–Z)",
+        "LOAD_MORE": "Továbbiak betöltése",
+        "REMAINING": "van hátra",
+        "LOADING": "Csatornák betöltése…",
+        "LOADING_MORE": "További csatornák betöltése…",
+        "NO_SEARCH_RESULTS": "Nem található csatorna",
+        "NO_CHANNELS_FOUND": "Nem található csatorna",
+        "NO_GROUPS_FOUND": "Nem található csoport",
+        "TRY_DIFFERENT_SEARCH": "Próbálkozzon másik keresési kifejezéssel",
+        "DETAILS_DIALOG": {
+            "TITLE": "Csatorna részletei",
+            "DESCRIPTION": "A lejátszási lista fájljából beolvasott, nem szerkeszthető metaadatok.",
+            "SUMMARY": "Összefoglalás",
+            "TVG": "TVG-metaadatok",
+            "CATCHUP": "Visszanézés",
+            "HTTP": "HTTP-fejlécek",
+            "NAME": "Név",
+            "CHANNEL_ID": "Csatornaazonosító",
+            "STREAM_URL": "Adatfolyam URL-címe",
+            "GROUP": "Csoport",
+            "RADIO": "Rádió",
+            "CATCHUP_AVAILABLE": "Visszanézés elérhető",
+            "WINDOW": "Visszanézhető időszak",
+            "PLAYBACK_SUPPORTED": "A lejátszás támogatott",
+            "EPG_PARAMS": "EPG-paraméterek",
+            "TIMESHIFT": "Időeltolás",
+            "TVG_ID": "TVG-azonosító",
+            "TVG_NAME": "TVG-név",
+            "TVG_URL": "TVG URL-címe",
+            "TVG_LOGO": "TVG-logó",
+            "TVG_REC": "TVG rec",
+            "CATCHUP_TYPE": "Visszanézés típusa",
+            "CATCHUP_SOURCE": "Visszanézés forrása",
+            "CATCHUP_DAYS": "Visszanézhető napok",
+            "HTTP_ORIGIN": "Origin",
+            "HTTP_REFERRER": "Referrer",
+            "HTTP_USER_AGENT": "User-Agent",
+            "EMPTY": "Nincs megadva",
+            "NOT_AVAILABLE": "Nem érhető el",
+            "DAYS_ONE": "1 nap",
+            "DAYS_OTHER": "{{count}} nap"
+        },
+        "GROUP_MANAGEMENT": {
+            "TITLE": "Csoportok kezelése",
+            "SELECTED": "Kijelölve",
+            "SELECT_ALL": "Összes kijelölése",
+            "DESELECT_ALL": "Összes kijelölésének megszüntetése",
+            "SEARCH_PLACEHOLDER": "Keresés a csoportok között…",
+            "NO_RESULTS": "Nem található a keresésnek megfelelő csoport",
+            "SAVE": "Mentés"
+        }
+    },
+    "TOP_MENU": {
+        "OPEN_MULTI_EPG": "Többcsatornás EPG-nézet megnyitása"
+    },
+    "EPG": {
+        "NEXT_DAY": "Következő nap",
+        "PREVIOUS_DAY": "Előző nap",
+        "ZOOM_IN": "Nagyítás",
+        "ZOOM_OUT": "Kicsinyítés",
+        "FILTER_CHANNELS": "Csatornák szűrése",
+        "CLOSE_FILTER": "Szűrő bezárása",
+        "SEARCH_PROGRAMS": "Műsorok keresése",
+        "CLOSE_PROGRAM_SEARCH": "Műsorkeresés bezárása",
+        "LIVE_STREAM": "Élő adás",
+        "ARCHIVE_PLAYBACK_UNAVAILABLE_TITLE": "A műsor visszanézése nem érhető el",
+        "ARCHIVE_PLAYBACK_UNAVAILABLE_DESCRIPTION": "A szolgáltató elérhetővé teszi a csatorna korábbi műsorrendjét, de lejátszható archív vagy visszanézhető műsort nem biztosít.",
+        "EPG_NOT_AVAILABLE_CHANNEL_DESCRIPTION": "Az alkalmazás beállításaiban adja hozzá vagy módosítsa az EPG-lista URL-címét.",
+        "FETCH_EPG": "EPG-adatok lekérése…",
+        "ERROR": "Hoppá, nem sikerült betölteni az EPG-t.",
+        "DOWNLOAD_SUCCESS": "Az EPG letöltése sikerült.",
+        "NO_PROGRAM_INFO": "Nincs elérhető műsorinformáció",
+        "PROGRAM_DIALOG": {
+            "PROGRAM_DETAILS": "A tévéműsor részletei",
+            "TITLE": "Cím",
+            "CATEGORY": "Kategória",
+            "PARENTAL_RATING_SYSTEM": "Korhatár-besorolás",
+            "DESCRIPTION": "Leírás",
+            "LANGUAGE": "Nyelv",
+            "SHOW_PROGRAM_DETAILS": "Műsor részleteinek megjelenítése",
+            "EPISODE": "Epizód",
+            "DURATION": "Időtartam"
+        },
+        "FETCH_SUCCESS": "Az EPG lekérése sikerült",
+        "IMPORT_PROGRESS": "EPG importálása",
+        "CHANNELS": "csatorna",
+        "PROGRAMS": "műsor",
+        "LOADING": "Betöltés",
+        "QUEUED": "Várólistán",
+        "TOTAL_CHANNELS": "Csatornák összesen",
+        "TOTAL_PROGRAMS": "Műsorok összesen",
+        "UP_TO_DATE": "Az EPG naprakész, nincs szükség szinkronizálásra",
+        "RETRY": "Újrapróbálkozás",
+        "ALLOW_PRIVATE_SOURCE": "Forrás engedélyezése",
+        "ALLOW_PRIVATE_SOURCE_TITLE": "Engedélyezi a magánhálózaton található EPG-forrást?",
+        "ALLOW_PRIVATE_SOURCE_WARNING": "Csak akkor engedélyezze, ha megbízik az EPG-forrásban. Az IPTVnator kizárólag ennél az EPG-forrásnál engedélyezi a magán- vagy helyi hálózati címekhez való kapcsolódást.",
+        "TRUST_TLS_HOST": "Kiszolgáló megbízhatónak jelölése",
+        "TRUST_TLS_HOST_TITLE": "Megbízik ebben a kiszolgálóban az érvénytelen tanúsítvány ellenére?",
+        "TRUST_TLS_HOST_WARNING": "Csak akkor folytassa, ha megbízik ebben a kiszolgálóban. Az IPTVnator ennél a kiszolgálónál engedélyezi az érvénytelen TLS-tanúsítványokat, más kiszolgálóknál azonban továbbra is érvényes tanúsítványt követel meg.",
+        "CURRENT_PROGRAM": "Aktuális műsor",
+        "ARCHIVE_PLAYBACK": "Műsor visszanézése",
+        "COLLAPSE_PANEL": "EPG-panel összecsukása",
+        "EXPAND_PANEL": "EPG-panel kibontása",
+        "TIMELINE": {
+            "TODAY": "Ma",
+            "NOW": "Most",
+            "JUMP_NOW": "Ugrás a jelenhez",
+            "RETURN_TO_LIVE": "Visszatérés az élő adáshoz",
+            "ON_NOW": "Jelenleg műsoron",
+            "MINUTES_LEFT": "perc van hátra",
+            "FROM_ARCHIVE": "Archívumból",
+            "WATCH": "Lejátszás",
+            "WATCH_LIVE": "Élő adás megtekintése",
+            "WATCH_FROM_START": "Lejátszás az elejétől",
+            "ARCHIVE_UNAVAILABLE_NOTE": "A lejátszás nem érhető el – a szolgáltató nem biztosít archívumot.",
+            "CATCHUP_FAILED": "Nem sikerült elindítani a műsor visszanézését",
+            "SCHEDULE_ONLY_NOTICE": "Csak a műsorrend érhető el. A szolgáltató megjeleníti a korábbi műsorokat, de nem biztosít visszanézést, ezért azok nem játszhatók le.",
+            "EMPTY_DAY_TITLE": "Erre a napra nincs műsoradat",
+            "EMPTY_DAY_DESCRIPTION": "A kiválasztott nap műsorrendje még nem áll rendelkezésre. Más napokhoz már vannak adatok.",
+            "JUMP_TODAY": "Ugrás mára",
+            "JUMP_NEAREST": "Ugrás a legközelebbi műsoros napra",
+            "CHANNEL_UNMAPPED_TITLE": "Ehhez a csatornához nincs műsoradat",
+            "CHANNEL_UNMAPPED_DESCRIPTION": "A csatorna nincs hozzárendelve az EPG-forráshoz, mert nem található hozzá tvg-id. A többi csatornát ez nem érinti.",
+            "PROVIDER_NO_EPG_TITLE": "A szolgáltató nem biztosít műsorújságot",
+            "PROVIDER_NO_EPG_DESCRIPTION": "Ez a forrás egyik csatornához sem tesz elérhetővé műsorújságot. Ha műsorrendre van szüksége, forduljon a szolgáltatóhoz.",
+            "M3U_SETUP_TITLE": "Műsorújság hozzáadása",
+            "M3U_SETUP_DESCRIPTION": "Az M3U-lejátszási listákhoz külső EPG-forrás (XMLTV) szükséges. Adjon hozzá egy url-tvg hivatkozást, és a műsorrend itt jelenik meg.",
+            "OPEN_EPG_SETTINGS": "EPG-beállítások megnyitása",
+            "ERROR_TITLE": "Nem sikerült betölteni a műsorújságot",
+            "ERROR_DESCRIPTION": "Az EPG-forrás nem válaszolt. Ellenőrizze a kapcsolatot, vagy frissítse a forrást.",
+            "RETRY": "Újrapróbálkozás",
+            "MINUTES_SHORT": "perc",
+            "ZOOM": "Nagyítás",
+            "ZOOM_DAY": "Napi áttekintés",
+            "ZOOM_HOURS": "Óránként",
+            "ZOOM_DETAIL": "Részletes",
+            "GROUP_SHORT": "rövid műsorok",
+            "GROUP_EXPAND": "megjelenítés ›"
+        }
+    },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Map EPG Channel",
+        "SUBTITLE": "Manually select an EPG channel for \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Search EPG channels...",
+        "CURRENT_MAPPING": "Current mapping",
+        "NO_MAPPING": "No EPG mapping set",
+        "SAVE": "Save mapping",
+        "REMOVE": "Remove mapping",
+        "CLOSE": "Close",
+        "NO_RESULTS": "No EPG channels found",
+        "SEARCH_HINT": "Type at least {{min}} characters to search",
+        "SAVED": "EPG mapping saved",
+        "REMOVED": "EPG mapping removed",
+        "SAVE_FAILED": "Could not update the EPG mapping"
+    },
+    "LANGUAGES": {
+        "ARABIC": "العربية",
+        "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
+        "ENGLISH": "English",
+        "KOREAN": "한국어",
+        "RUSSIAN": "Русский",
+        "GERMAN": "Deutsch",
+        "SPANISH": "Español",
+        "CHINESE": "简体中文",
+        "TRADITIONAL_CHINESE": "繁體中文",
+        "FRENCH": "Français",
+        "ITALIAN": "Italiano",
+        "TURKISH": "Türkçe",
+        "JAPANESE": "日本語",
+        "DUTCH": "Nederlands",
+        "BELARUSIAN": "Беларуская",
+        "POLISH": "Polski",
+        "PORTUGUESE": "Português",
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
+    },
+    "YES": "Igen",
+    "NO": "Nem",
+    "MENU": {
+        "OPEN": "Menü megnyitása",
+        "SUPPORT_ARIA": "Az IPTVnator támogatása a GitHubon",
+        "SETTINGS_ARIA": "Beállítások megnyitása",
+        "BUG_REPORT": "Hibabejelentés",
+        "WHAT_IS_NEW": "Újdonságok",
+        "ABOUT": "Névjegy",
+        "ABOUT_ARIA": "Az alkalmazás névjegye",
+        "SUPPORT_PROJECT": "A projekt támogatása"
+    },
+    "ABOUT": {
+        "TITLE": "Az IPTVnator névjegye",
+        "DESCRIPTION": "Többplatformos IPTV-lejátszó számos funkcióval, többek között M3U- és M3U8-lejátszási listák, kedvencek, műsorújság, tévéarchívum és visszanézés támogatásával.",
+        "VERSION": "Verzió",
+        "GITHUB_TOOLTIP": "Az IPTVnator GitHub-adattára",
+        "BUY_ME_A_COFFEE_TOOLTIP": "Hívjon meg egy kávéra",
+        "TWITTER_TOOLTIP": "Megosztás a Twitteren"
+    },
+    "UPDATE_AVAILABLE": "Frissítés érhető el",
+    "REFRESH": "Frissítés",
+    "XTREAM": {
+        "PLAY": "Lejátszás",
+        "OPENING_PLAYER": "Lejátszó megnyitása…",
+        "NAME": "Név",
+        "RELEASE_DATE": "Megjelenés dátuma",
+        "GENRE": "Műfaj",
+        "COUNTRY": "Ország",
+        "ACTORS": "Szereplők",
+        "DIRECTOR": "Rendező",
+        "SIMILAR": "Hasonló tartalmak",
+        "CREW_JOB_DIRECTOR": "Director",
+        "CREW_JOB_CREATOR": "Creator",
+        "ACTOR_FILMOGRAPHY": "Filmográfia",
+        "ACTOR_FILTER_ALL": "Összes",
+        "ACTOR_SCOPE_THIS_PORTAL": "Ez a portál",
+        "ACTOR_SCOPE_ALL_PORTALS": "Összes portál",
+        "ACTOR_NO_RESULTS": "Nincs találat ezzel a szűrővel",
+        "ACTOR_IN_LIBRARY": "A médiatárban",
+        "ACTOR_SEARCH_IN_PORTAL": "Keresés a portálon",
+        "ACTOR_BORN": "Születési dátum",
+        "ACTOR_DIED": "Elhunyt",
+        "SERIES_STATUS_RETURNING": "Folyamatban",
+        "SERIES_STATUS_PLANNED": "Tervezett",
+        "SERIES_STATUS_IN_PRODUCTION": "Gyártás alatt",
+        "SERIES_STATUS_ENDED": "Befejezett",
+        "SERIES_STATUS_CANCELED": "Törölt",
+        "SERIES_STATUS_PILOT": "Pilot",
+        "DURATION": "Időtartam",
+        "CAST": "Szereplők",
+        "EPISODE_RUN_TIME": "Epizód játékideje",
+        "RATING": "Értékelés",
+        "IMDB_RATING": "IMDb-értékelés",
+        "KINOPOISK_RATING": "Kinopoisk-értékelés",
+        "DESCRIPTION": "Leírás",
+        "YEAR": "Év",
+        "AGE": "Korhatár",
+        "YOUTUBE_TRAILER": "YouTube-előzetes",
+        "EPISODE": "Epizód",
+        "RESUME": "Folytatás",
+        "RESTART": "Lejátszás az elejétől",
+        "CONTINUE_WATCHING": "Lejátszás folytatása",
+        "PLAY_FIRST_EPISODE": "Első epizód lejátszása",
+        "PLAY_EPISODE": "{{episode}}. epizód lejátszása",
+        "RESUME_EPISODE": "Epizód lejátszásának folytatása",
+        "PLAY_NEXT_EPISODE": "Következő epizód lejátszása",
+        "SERIES_WATCHED": "Sorozat megtekintve",
+        "WATCHED": "Megtekintve",
+        "IN_PROGRESS": "Folyamatban",
+        "MARK_WATCHED": "Megjelölés megtekintettként",
+        "MARK_UNWATCHED": "Megjelölés nem megtekintettként",
+        "EPISODES_WATCHED": "Megtekintett epizódok: {{count}} / {{total}}",
+        "DETAIL_FALLBACK": {
+            "STATUS": "A portál metaadatai nem állnak rendelkezésre",
+            "NOTE": "A portál nem adott meg részletes metaadatokat.",
+            "STREAM_ID": "Adatfolyam-azonosító",
+            "CATEGORY": "Kategória",
+            "CONTAINER": "Formátum",
+            "SOURCE_TITLE": "Forrás címe"
+        },
+        "ACCOUNT_INFO": {
+            "TITLE": "Fiók adatai",
+            "USER_INFO": "Felhasználói adatok",
+            "STATUS": "Állapot",
+            "USERNAME": "Felhasználónév",
+            "ACTIVE_CONNECTIONS": "Aktív kapcsolatok száma",
+            "CREATED": "Létrehozás dátuma",
+            "EXPIRES": "Lejárat dátuma",
+            "TRIAL_ACCOUNT": "Próbafiók",
+            "YES": "Igen",
+            "NO": "Nem",
+            "ALLOWED_FORMATS": "Engedélyezett formátumok",
+            "SERVER_INFO": "Kiszolgáló adatai",
+            "LIVE_TV": "Élő tévéadás",
+            "MOVIES": "Filmek",
+            "TV_SERIES": "Tévésorozatok",
+            "URL": "URL-cím",
+            "PROTOCOL": "Protokoll",
+            "TIMEZONE": "Időzóna",
+            "SERVER_TIME": "Kiszolgáló ideje",
+            "PORTS": "Portok",
+            "HTTP_PORT": "HTTP",
+            "HTTPS_PORT": "HTTPS",
+            "RTMP_PORT": "RTMP"
+        },
+        "CATEGORY_MANAGEMENT": {
+            "TITLE": "Kategóriák kezelése",
+            "LOADING": "Kategóriák betöltése…",
+            "SELECTED": "Kijelölve",
+            "SELECT_ALL": "Összes kijelölése",
+            "DESELECT_ALL": "Összes kijelölésének megszüntetése",
+            "SEARCH_PLACEHOLDER": "Keresés a kategóriák között…",
+            "NO_RESULTS": "Nem található a keresésnek megfelelő kategória",
+            "NO_CATEGORIES": "Nincs elérhető kategória",
+            "SAVE": "Mentés"
+        }
+    },
+    "PORTALS": {
+        "ALL_CATEGORIES": "Összes kategória",
+        "MY_FAVORITES": "Saját kedvencek",
+        "ADD_TO_FAVORITES": "Hozzáadás a kedvencekhez",
+        "REMOVE_FROM_FAVORITES": "Eltávolítás a kedvencek közül",
+        "REMOVED_FROM_FAVORITES": "Eltávolítva a kedvencek közül",
+        "ADDED_TO_FAVORITES": "Hozzáadva a kedvencekhez",
+        "FAVORITES": "Kedvencek",
+        "RECENTLY_VIEWED": "Legutóbb megtekintett tartalmak",
+        "THIS_PLAYLIST": "Ez a lejátszási lista",
+        "ALL_PLAYLISTS": "Összes lejátszási lista",
+        "LIVE_TV": "Élő tévéadás",
+        "MOVIES": "Filmek",
+        "SERIES": "Sorozatok",
+        "SEARCH": "Keresés",
+        "NO_FAVORITES": "Még nincs kedvenc tartalom",
+        "NO_RECENT_ITEMS": "Még nincs megtekintési előzmény",
+        "REMOVE_FROM_RECENT": "Eltávolítás a megtekintési előzményekből",
+        "BROWSE_ALL_MOVIES": "Összes film böngészése",
+        "BROWSE_ALL_SERIES": "Összes sorozat böngészése",
+        "BROWSE_ALL_LIVE": "Összes élő csatorna böngészése",
+        "SIDEBAR": {
+            "MAIN": "Főmenü",
+            "MOVIES": "Filmek",
+            "LIVE_TV": "Élő tévéadás",
+            "SERIES": "Sorozatok",
+            "LIBRARY": "Médiatár",
+            "SEARCH": "Keresés",
+            "RECENT": "Legutóbbiak",
+            "RECENTLY_ADDED": "Legutóbb hozzáadott tartalmak",
+            "FAVORITES": "Kedvencek"
+        },
+        "ERROR_VIEW": {
+            "IMPORT_CANCELLED": {
+                "TITLE": "Importálás megszakítva",
+                "DESCRIPTION": "A lejátszási lista importálását megszakította. A forrás betöltésének folytatásához próbálja újra."
+            },
+            "ACCOUNT_EXPIRED": {
+                "TITLE": "A fiók lejárt",
+                "DESCRIPTION": "Ez a fiók lejárt. Ellenőrizze a hitelesítési adatokat a lejátszási lista beállításaiban, vagy távolítsa el a listát."
+            },
+            "ACCOUNT_INACTIVE": {
+                "TITLE": "A fiók inaktív",
+                "DESCRIPTION": "Ez a fiók inaktív. Ellenőrizze a hitelesítési adatokat a lejátszási lista beállításaiban, vagy távolítsa el a listát."
+            },
+            "UNAUTHORIZED": {
+                "TITLE": "Nincs jogosultság",
+                "DESCRIPTION": "Ellenőrizze a hitelesítési adatokat a lejátszási lista beállításaiban, vagy távolítsa el a listát."
+            },
+            "NOT_FOUND": {
+                "TITLE": "A portál nem található",
+                "DESCRIPTION": "Ellenőrizze a hitelesítési adatokat és a portál URL-címét a lejátszási lista beállításaiban, vagy távolítsa el a listát."
+            },
+            "PORTAL_UNAVAILABLE": {
+                "TITLE": "A portál nem érhető el",
+                "DESCRIPTION": "Nem sikerült kapcsolódni a portálhoz. Ellenőrizze a kiszolgáló URL-címét, vagy próbálja újra, amikor a forrás ismét elérhető."
+            },
+            "EMPTY_CATEGORY": {
+                "TITLE": "Ebben a kategóriában nincs tartalom",
+                "DESCRIPTION": "Válasszon másik kategóriát, vagy váltson tartalomtípust."
+            },
+            "UNKNOWN_ERROR": {
+                "TITLE": "Hiba történt",
+                "DESCRIPTION": "Ismeretlen hiba történt. Próbálja újra később."
+            },
+            "NO_CATEGORY_SELECTED": {
+                "TITLE": "Nincs kiválasztott kategória",
+                "DESCRIPTION": "A tartalom megjelenítéséhez válasszon egy kategóriát."
+            },
+            "PLAYLIST_SETTINGS": "Lejátszási lista beállításai",
+            "HOME": "Kezdőlap",
+            "DELETE": "Törlés"
+        },
+        "EMPTY_LIST_VIEW": {
+            "TITLE": "Nincs találat",
+            "NO_SEARCH_RESULTS": "Nincs találat. Módosítsa a keresést."
+        },
+        "SEARCH_VIEW": {
+            "INITIAL_TITLE": "Tartalom keresése",
+            "INITIAL_DESCRIPTION": "Adjon meg legalább 3 karaktert az élő csatornák, filmek és sorozatok közötti kereséshez.",
+            "RESULTS_FOUND": "{{count}} találat",
+            "NO_RESULTS_FOR": "Nincs találat a következőre: „{{term}}”",
+            "GROUP_BY_PLAYLIST": "Találatok lejátszási listánkénti csoportosítása",
+            "VISIBLE_CATEGORIES_ONLY": "Csak látható kategóriák",
+            "GLOBAL_SEARCH_SOURCE_NOTE": "A globális keresés az Xtream- és M3U-lejátszási listák találatait is tartalmazza.",
+            "GLOBAL_INITIAL_DESCRIPTION": "Az Xtream- és M3U-lejátszási listák közötti kereséshez adjon meg legalább 2 karaktert.",
+            "LOADING_MORE_RESULTS": "További találatok betöltése…"
+        },
+        "STREAM_URL_COPIED": "Az adatfolyam URL-címe a vágólapra került",
+        "COPY_STREAM_URL": "Adatfolyam URL-címének másolása",
+        "NOW_PLAYING": "Lejátszás alatt",
+        "UP_NEXT": "Következik",
+        "CLOSE_PLAYER": "Lejátszó bezárása",
+        "ABOUT": "Ismertető",
+        "SEASONS_AND_EPISODES": "Évadok és epizódok",
+        "SEASON_TAB": "{{number}}. évad",
+        "BACK_TO_PLAYING_EPISODE": "Vissza a lejátszás alatt álló epizódhoz",
+        "GRID_VIEW": "Rácsnézet",
+        "LIST_VIEW": "Listanézet",
+        "NO_EPISODES_AVAILABLE": "Nincs elérhető epizód",
+        "NO_EPISODES_AVAILABLE_MESSAGE": "A szolgáltató felsorolja ezt a sorozatot, de nem érhető el lejátszható évad vagy epizód.",
+        "SEASON_EMPTY": "Ez az évad üres",
+        "SEASON_EMPTY_MESSAGE": "A szolgáltató felsorolja ezt az évadot, de nem érhető el lejátszható epizód.",
+        "EPISODE_INFO": "Epizód adatai",
+        "SELECT_CATEGORY": "Kategória kiválasztása",
+        "PAGE": "Oldal",
+        "CONTENT_NOT_AVAILABLE": "Ez a tartalom nem érhető el ezen a kiszolgálón",
+        "PLAYBACK_ERROR": "Nem sikerült lekérni a lejátszáshoz szükséges URL-címet",
+        "LOADING_SEASONS": "Évadok betöltése…",
+        "LOADING_ALL_CHANNELS": "Loading full channel list…",
+        "REFRESH_CHANNEL_LIST": "Refresh channel list",
+        "NO_CHANNELS_IN_CATEGORY": "No channels in this category",
+        "ITEM": "item",
+        "ITEMS": "items",
+        "NO_EPISODES": "Nincs elérhető epizód",
+        "ALL_RADIO": "Összes rádió"
+    },
+    "INFORMATION": "Információk",
+    "DOWNLOADS": {
+        "TITLE": "Letöltések",
+        "DOWNLOAD": "Letöltés",
+        "PLAY_LOCAL": "Helyi fájl lejátszása",
+        "EMPTY": "Még nincs letöltés",
+        "EMPTY_HINT": "Töltsön le filmeket és epizódokat offline megtekintéshez.",
+        "NO_PLAYLISTS_TITLE": "A letöltéshez előbb adjon hozzá egy lejátszási listát",
+        "NO_PLAYLISTS_BODY": "Lejátszási lista hozzáadása után itt mentheti a filmeket és epizódokat offline lejátszáshoz.",
+        "NO_ITEMS_BODY": "A filmeknél és epizódoknál látható Letöltés gombbal mentheti a tartalmat offline lejátszáshoz.",
+        "NO_FILTER_MATCH": "Nincs a szűrőnek megfelelő letöltés",
+        "NO_FILTER_MATCH_HINT": "Próbálkozzon másik keresési kifejezéssel",
+        "NOT_AVAILABLE": "A letöltések nem érhetők el",
+        "DESKTOP_ONLY": "Ez a funkció csak az asztali alkalmazásban érhető el",
+        "NO_FOLDER": "Nincs kiválasztva letöltési mappa",
+        "CHANGE_FOLDER": "Mappa módosítása",
+        "CLEAR_COMPLETED": "Befejezett bejegyzések eltávolítása",
+        "CLEAR_COMPLETED_DIALOG": {
+            "TITLE": "Befejezett letöltési bejegyzések eltávolítása",
+            "MESSAGE": "A művelet eltávolítja a jelenlegi Letöltések nézetből a befejezett, sikertelen és megszakított bejegyzéseket. A lemezre már letöltött fájlokat nem törli."
+        },
+        "SOURCE_PLAYLIST_MISSING": "Ez a letöltés már nem nyitható meg a médiatárban, mert a forrásként szolgáló lejátszási listát eltávolították.",
+        "FILE_NOT_FOUND": "A letöltött fájl már nem érhető el a lemezen.",
+        "FILE_ACTION_ERROR": "Nem sikerült végrehajtani a fájlműveletet.",
+        "ACTION_FAILED": "Action failed",
+        "PAUSE": "Pause",
+        "RESUME": "Resume",
+        "CANCEL": "Mégse",
+        "RETRY": "Újrapróbálkozás",
+        "REMOVE": "Eltávolítás",
+        "PLAY": "Lejátszás",
+        "REVEAL": "Megjelenítés a mappában",
+        "COPY_URL": "Letöltési URL-cím másolása",
+        "URL_COPIED": "A letöltési URL-cím a vágólapra került",
+        "URL_COPY_FAILED": "Nem sikerült az URL-címet a vágólapra másolni",
+        "STATUS": {
+            "QUEUED": "Várakozik",
+            "DOWNLOADING": "Letöltés folyamatban",
+            "COMPLETED": "Befejeződött",
+            "FAILED": "Sikertelen",
+            "CANCELED": "Megszakítva",
+            "PAUSED": "Paused"
+        }
+    },
+    "REMOTE_CONTROL": {
+        "TITLE": "Távvezérlés",
+        "SUBTITLE": "Az IPTV-lejátszó távvezérlése",
+        "UP_CHANNEL": "Következő csatorna",
+        "DOWN_CHANNEL": "Előző csatorna",
+        "HEADER": "IPTVnator távvezérlés",
+        "FOOTER": "IPTVnator távvezérlés"
+    },
+    "WORKSPACE": {
+        "FAVORITES_ONLY": "Csak kedvencek",
+        "SORT_CUSTOM": "Egyéni sorrend",
+        "SORT_DATE_DESC": "Hozzáadás dátuma (legújabb elöl)",
+        "SORT_DATE_ASC": "Hozzáadás dátuma (legrégebbi elöl)",
+        "SORT_NAME_ASC": "Név szerint (A–Z)",
+        "SORT_NAME_DESC": "Név szerint (Z–A)",
+        "SORT_TOP_RATED": "Legjobbra értékelt elöl",
+        "SORT_LOWEST_RATED": "Legalacsonyabbra értékelt elöl",
+        "REFINE_ACTION": "Szűrés finomítása",
+        "REFINE_SORT_SECTION": "Rendezés",
+        "REFINE_RATING_SECTION": "Minimális értékelés",
+        "REFINE_CLEAR_RATING": "A {{value}},0 vagy magasabb értékelési szűrő törlése",
+        "FILTER_RATING": "Szűrés értékelés szerint",
+        "FILTER_RATING_ANY": "Bármilyen értékelés",
+        "FILTER_RATING_MIN": "{{value}},0 vagy magasabb",
+        "SORT_LABEL": "Rendezés: ",
+        "SORT_SERVER": "Kiszolgálóoldali rendezés",
+        "CATEGORY_SORT_ARIA": "Kategóriák rendezése",
+        "DASHBOARD": {
+            "CONTINUE_WATCHING": "Lejátszás folytatása",
+            "LIVE_FAVORITES": "Most a kedvenc csatornákon",
+            "LIVE_RECENT": "Élő tévénézés folytatása",
+            "REMAINING_SECONDS": "{{seconds}} másodperc van hátra",
+            "REMAINING_MINUTES": "{{minutes}} perc van hátra",
+            "REMAINING_HOURS": "{{hours}} óra van hátra",
+            "REMAINING_HOURS_MINUTES": "{{hours}} óra {{minutes}} perc van hátra",
+            "PERCENT_WATCHED": "{{value}}% megtekintve",
+            "UNTITLED_SOURCE": "Névtelen forrás",
+            "GLOBAL_FAVORITES": "Összesített kedvencek",
+            "REMOVE_FROM_HISTORY": "Eltávolítás az előzményekből",
+            "RECENT_SOURCES": "Legutóbb használt források",
+            "MANAGE_ALL": "Összes kezelése",
+            "SEE_ALL": "Összes megjelenítése",
+            "SEE_ALL_COUNT": "Az összes ({{count}}) megjelenítése",
+            "RECENTLY_WATCHED": "Legutóbb megtekintett tartalmak",
+            "XTREAM_RECENTLY_ADDED": "Legutóbb hozzáadott Xtream-tartalmak",
+            "TMDB_TRENDING": "A hét felkapott tartalmai",
+            "NO_HISTORY": "Ehhez a szűrőhöz nem található elem.",
+            "NO_HISTORY_HINT": "Megtekintési előzményei itt jelennek meg, amint lejátszik valamit valamelyik lejátszási listáról.",
+            "XTREAM": "Xtream",
+            "STALKER": "Stalker",
+            "M3U": "M3U",
+            "STALKER_PORTAL": "Stalker-portál",
+            "PROVIDER": "Szolgáltató",
+            "TYPE_LIVE": "Élő adás",
+            "TYPE_MOVIE": "Film",
+            "TYPE_SERIES": "Sorozat",
+            "SEASON_EPISODE_BADGE": "É{{season}}·E{{episode}}",
+            "NOT_YET_SYNCED": "Még nincs szinkronizálva",
+            "RECENTLY_WATCHED_LIVE_TV": "Legutóbb nézett élő csatornák",
+            "FAVORITE_MOVIES_AND_SERIES": "Kedvenc filmek és sorozatok"
+        },
+        "SHELL": {
+            "BRAND_ALT": "IPTVnator",
+            "RAIL_DASHBOARD": "Vezérlőpult",
+            "OPEN_DASHBOARD": "Vezérlőpult megnyitása",
+            "RAIL_SOURCES": "Források",
+            "OPEN_SOURCES": "Források megnyitása",
+            "RAIL_GLOBAL_FAVORITES": "Kedvencek",
+            "RAIL_GLOBAL_RECENT": "Megtekintési előzmények",
+            "RAIL_GLOBAL_SEARCH": "Globális keresés",
+            "RAIL_SETTINGS": "Beállítások",
+            "OPEN_SETTINGS": "Beállítások megnyitása",
+            "RAIL_LIBRARY": "Médiatár",
+            "RAIL_MOVIES": "Filmek",
+            "RAIL_LIVE": "Élő tévéadás",
+            "RAIL_SERIES": "Sorozatok",
+            "RAIL_RECENTLY_ADDED": "Legutóbb hozzáadott",
+            "RAIL_SEARCH": "Részletes keresés",
+            "RAIL_RECENT": "Megtekintési előzmények",
+            "RAIL_FAVORITES": "Kedvencek",
+            "RAIL_DOWNLOADS": "Letöltések",
+            "EXTERNAL_PLAYBACK_CLOSE": "Lejátszó bezárása",
+            "RAIL_ALL_CHANNELS": "Összes csatorna",
+            "RAIL_GROUPS": "Csoportok",
+            "RAIL_CONTEXT_ACTIONS": "A szakasz műveletei",
+            "SEARCH_LABEL": "Keresés",
+            "SEARCH_SOURCES_PLACEHOLDER": "Keresés a források között (összes lejátszási lista)…",
+            "SEARCH_GLOBAL_PLACEHOLDER": "Keresés az összes lejátszási listában…",
+            "SEARCH_PLAYLIST_PLACEHOLDER": "Keresés ebben a lejátszási listában…",
+            "SEARCH_SECTION_PLACEHOLDER": "Keresés ebben a szakaszban…",
+            "FILTER_SECTION_PLACEHOLDER": "Szűrés ebben a szakaszban…",
+            "SEARCH_STATUS_LOADED_ONLY": "Csak betöltött csatornák",
+            "COMMAND_PALETTE_SHORTCUT": "Parancspaletta (Ctrl/Cmd+K)",
+            "OPEN_COMMAND_PALETTE": "Parancspaletta megnyitása",
+            "ADD_PLAYLIST_ALL": "Lejátszási lista hozzáadása",
+            "ADD_PLAYLIST": "Lejátszási lista hozzáadása",
+            "OPEN_DOWNLOADS": "Letöltések megnyitása",
+            "OPEN_CONTEXT_ACTIONS": "Szakasz műveleteinek megnyitása",
+            "NO_SECTION_ACTIONS": "Ehhez a szakaszhoz nincs elérhető művelet",
+            "PLAYLIST_INFO": "Lejátszási lista adatai",
+            "ACCOUNT_INFO": "Fiókadatok",
+            "REFRESH_PLAYLIST": "Lejátszási lista frissítése",
+            "CLEAR_COMPLETED_DOWNLOADS_ALL": "Befejezett letöltési bejegyzések eltávolítása – összes lejátszási lista",
+            "CLEAR_COMPLETED_DOWNLOADS_ALL_ARIA": "Az összes lejátszási listához tartozó befejezett letöltési bejegyzések eltávolítása",
+            "CLEAR_COMPLETED_DOWNLOADS_THIS_PLAYLIST": "Befejezett letöltési bejegyzések eltávolítása – jelenlegi lejátszási lista",
+            "CLEAR_COMPLETED_DOWNLOADS_THIS_PLAYLIST_ARIA": "A jelenlegi lejátszási listához tartozó befejezett letöltési bejegyzések eltávolítása",
+            "CLEAR_RECENTLY_VIEWED_SECTION": "Megtekintési előzmények törlése",
+            "CLEAR_RECENTLY_VIEWED_SECTION_ARIA": "A szakasz megtekintési előzményeinek törlése",
+            "CLEAR_RECENTLY_VIEWED_TYPE": "Megtekintési előzmények törlése – {{type}}",
+            "CLEAR_RECENTLY_VIEWED_DIALOG_TITLE": "Törli ezeket a megtekintési előzményeket: {{type}}?",
+            "CLEAR_RECENTLY_VIEWED_DIALOG_MESSAGE_PLAYLIST": "A lejátszási lista következő tartalomtípusba tartozó összes eleme törlődik a megtekintési előzményekből: {{type}}. A művelet nem vonható vissza.",
+            "CLEAR_RECENTLY_VIEWED_DIALOG_MESSAGE_ALL": "Az összes lejátszási lista következő tartalomtípusba tartozó valamennyi eleme törlődik a megtekintési előzményekből: {{type}}. A művelet nem vonható vissza.",
+            "CLEAR_FAVORITES_TYPE": "Kedvencek törlése – {{type}}",
+            "CLEAR_FAVORITES_DIALOG_TITLE": "Eltávolítja ezeket a kedvenceket: {{type}}?",
+            "CLEAR_FAVORITES_DIALOG_MESSAGE_PLAYLIST": "A lejátszási lista következő tartalomtípusba tartozó összes kedvence törlődik: {{type}}. A művelet nem vonható vissza.",
+            "CLEAR_FAVORITES_DIALOG_MESSAGE_ALL": "Az összes lejátszási lista következő tartalomtípusba tartozó valamennyi kedvence törlődik: {{type}}. A művelet nem vonható vissza.",
+            "XTREAM_CODE": "Xtream Codes",
+            "STALKER_PORTAL": "Stalker-portál",
+            "CHANNELS_COUNT": "{{count}} csatorna",
+            "NO_SOURCES_AVAILABLE": "Nincs elérhető forrás",
+            "ONE_SOURCE_AVAILABLE": "1 forrás érhető el",
+            "SOURCES_AVAILABLE": "{{count}} forrás érhető el",
+            "GO_TO_DASHBOARD": "Vissza a vezérlőpultra",
+            "GO_TO_SOURCES": "Ugrás a Források nézetre",
+            "DROP_OVERLAY_TITLE": "Engedje el a lejátszási lista hozzáadásához",
+            "DROP_OVERLAY_BODY": "Húzzon egy .m3u- vagy .m3u8-fájlt a munkaterület bármely pontjára, majd engedje el az importáláshoz.",
+            "DROP_OVERLAY_REJECTED_BODY": ".m3u- vagy .m3u8-fájlt húzzon ide. A bezáráshoz nyomja meg az Esc billentyűt.",
+            "DROP_OVERLAY_REJECTED_UNSUPPORTED": "Nem támogatott fájltípus",
+            "DROP_OVERLAY_REJECTED_EMPTY": "A fájl üres",
+            "DROP_OVERLAY_REJECTED_READ_ERROR": "Nem sikerült beolvasni a fájlt",
+            "DROP_IMPORT_SUCCESS": "„{{title}}” importálása…",
+            "XTREAM_IMPORT_TITLE": "Lejátszási lista szinkronizálása",
+            "XTREAM_IMPORT_REMOTE_BADGE": "Távoli forrás",
+            "XTREAM_IMPORT_LOCAL_BADGE": "Helyi médiatár",
+            "XTREAM_IMPORT_DETAIL_REMOTE": "Várakozás a szolgáltató válaszára.",
+            "XTREAM_IMPORT_DETAIL_LOCAL": "A lejátszási listák gyorsabb későbbi megnyitásának előkészítése.",
+            "XTREAM_IMPORT_PREPARING": "Helyi médiatár előkészítése…",
+            "XTREAM_IMPORT_LOADING": "Lejátszási lista adatainak lekérése a forrásból…",
+            "XTREAM_IMPORT_SAVING": "Lejátszási lista adatainak helyi mentése…",
+            "XTREAM_IMPORT_RESTORING_FAVORITES": "Kedvencek visszaállítása a helyi médiatárból…",
+            "XTREAM_IMPORT_RESTORING_RECENT": "Megtekintési előzmények visszaállítása a helyi médiatárból…",
+            "XTREAM_IMPORT_PROGRESS": "{{type}} importálva: {{current}} / {{total}}",
+            "XTREAM_IMPORT_CANCEL": "Szinkronizálás leállítása",
+            "XTREAM_IMPORT_CANCELLING": "Szinkronizálás leállítása…",
+            "COMMANDS": {
+                "GLOBAL_SEARCH_LABEL": "Keresés az összes lejátszási listában",
+                "GLOBAL_SEARCH_DESCRIPTION": "Globális keresés megnyitása",
+                "PLAYLIST_SEARCH_LABEL": "Részletes keresés ebben a lejátszási listában",
+                "PLAYLIST_SEARCH_DESCRIPTION": "Részletes keresés megnyitása ebben a lejátszási listában",
+                "OPEN_GLOBAL_FAVORITES_LABEL": "Összesített kedvencek megnyitása",
+                "OPEN_GLOBAL_FAVORITES_DESCRIPTION": "Ugrás az összesített kedvencekhez",
+                "OPEN_DOWNLOADS_LABEL": "Letöltések megnyitása",
+                "OPEN_DOWNLOADS_DESCRIPTION": "Ugrás a Letöltésekhez",
+                "OPEN_GLOBAL_RECENT_LABEL": "Megtekintési előzmények megnyitása",
+                "OPEN_GLOBAL_RECENT_DESCRIPTION": "A megtekintési előzmények összesített oldalának megnyitása",
+                "OPEN_SETTINGS_LABEL": "Beállítások megnyitása",
+                "OPEN_SETTINGS_DESCRIPTION": "Ugrás az alkalmazás beállításaihoz",
+                "OPEN_SOURCES_LABEL": "Források kezelése",
+                "OPEN_SOURCES_DESCRIPTION": "Ugrás a forráskezeléshez",
+                "OPEN_DASHBOARD_LABEL": "Vezérlőpult megnyitása",
+                "OPEN_DASHBOARD_DESCRIPTION": "Ugrás a vezérlőpultra",
+                "ADD_PLAYLIST_LABEL": "Új forrás hozzáadása",
+                "ADD_PLAYLIST_DESCRIPTION": "A lejátszási lista hozzáadására szolgáló párbeszédpanel megnyitása",
+                "ADD_PLAYLIST_M3U_LABEL": "M3U-lejátszási lista hozzáadása",
+                "ADD_PLAYLIST_M3U_DESCRIPTION": "A hozzáadási párbeszédpanel megnyitása az M3U-fájl vagy URL-cím lapján",
+                "ADD_PLAYLIST_XTREAM_LABEL": "Xtream Codes-lejátszási lista hozzáadása",
+                "ADD_PLAYLIST_XTREAM_DESCRIPTION": "A hozzáadási párbeszédpanel megnyitása az Xtream Codes lapon",
+                "ADD_PLAYLIST_STALKER_LABEL": "Stalker-portál hozzáadása",
+                "ADD_PLAYLIST_STALKER_DESCRIPTION": "A hozzáadási párbeszédpanel megnyitása a Stalker-portál lapon",
+                "REFRESH_PLAYLIST_LABEL": "Lejátszási lista frissítése",
+                "REFRESH_PLAYLIST_DESCRIPTION": "A távoli forrás adatainak újbóli szinkronizálása",
+                "PLAYLIST_INFO_LABEL": "Lejátszási lista részletei",
+                "PLAYLIST_INFO_DESCRIPTION": "A jelenlegi lejátszási lista adatainak megjelenítése",
+                "ACCOUNT_INFO_LABEL": "Fiókadatok",
+                "ACCOUNT_INFO_DESCRIPTION": "Az Xtream-kiszolgálóhoz tartozó fiókadatok megjelenítése",
+                "OPEN_VIEW_DESCRIPTION": "Nézet megnyitása: {{view}}",
+                "CLEAR_CURRENT_VIEW_DESCRIPTION": "A nézetben látható elemek törlése – {{type}}",
+                "OPEN_MULTI_EPG_DESCRIPTION": "Többcsatornás EPG-nézet megnyitása",
+                "GO_TO_VOD_LABEL": "Filmek",
+                "GO_TO_VOD_DESCRIPTION": "Ugrás a filmekhez",
+                "GO_TO_LIVE_LABEL": "Élő tévéadás",
+                "GO_TO_LIVE_DESCRIPTION": "Ugrás az élő tévéadásokhoz",
+                "GO_TO_SERIES_LABEL": "Sorozatok",
+                "GO_TO_SERIES_DESCRIPTION": "Ugrás a sorozatokhoz",
+                "SWITCH_PLAYER_LABEL": "Lejátszóváltás: {{name}}",
+                "SWITCH_PLAYER_DESCRIPTION": "{{name}} beállítása aktív videólejátszóként",
+                "SWITCH_PLAYER_FEEDBACK": "Aktív lejátszó: {{name}}"
+            },
+            "XTREAM_REFRESH_TITLE": "Lejátszási lista frissítése",
+            "XTREAM_REFRESH_COLLECTING_DATA": "A médiatár adatainak megőrzése…",
+            "XTREAM_REFRESH_DELETING_CONTENT": "Gyorsítótárazott adatfolyamok eltávolítása…",
+            "XTREAM_REFRESH_DELETING_CATEGORIES": "Gyorsítótárazott kategóriák eltávolítása…",
+            "XTREAM_REFRESH_DETAIL_LOCAL": "A kedvencek, a megtekintési előzmények, a rejtett kategóriák és a lejátszási előrehaladás megőrzése, hogy a szinkronizálás után visszaállíthatók legyenek.",
+            "XTREAM_REFRESH_PROGRESS": "Feldolgozott helyi bejegyzések: {{current}} / {{total}}",
+            "RAIL_RADIO": "Rádió"
+        },
+        "SOURCES": {
+            "TITLE": "Források",
+            "SUBTITLE": "Lejátszási listák szűrése és rendezése",
+            "TYPE": "Típus",
+            "ALL": "Összes",
+            "M3U_PLAYLISTS": "M3U-lejátszási listák",
+            "XTREAM_PLAYLISTS": "Xtream-lejátszási listák",
+            "STALKER_PLAYLISTS": "Stalker-lejátszási listák",
+            "ALL_PLAYLISTS": "Összes lejátszási lista",
+            "PLAYLIST_COUNT_ONE": "1 lejátszási lista",
+            "PLAYLIST_COUNT_OTHER": "{{count}} lejátszási lista"
+        },
+        "CONTEXT": {
+            "CATEGORIES": "Kategóriák",
+            "MOVIE_CATEGORIES": "Filmkategóriák",
+            "SERIES_CATEGORIES": "Sorozatkategóriák",
+            "LIVE_CATEGORIES": "Élő adások kategóriái",
+            "XTREAM_SYNCING_MOVIES": "Filmkategóriák szinkronizálása…",
+            "XTREAM_SYNCING_SERIES": "Sorozatkategóriák szinkronizálása…",
+            "XTREAM_SYNCING_LIVE": "Élő adások kategóriáinak szinkronizálása…",
+            "XTREAM_SOURCE": "Xtream-forrás",
+            "STALKER_PORTAL": "Stalker-portál",
+            "MANAGE_CATEGORIES": "Kategóriák kezelése",
+            "LOAD_CATEGORIES_ERROR": "Nem sikerült betölteni a kategóriákat",
+            "LOAD_CATEGORIES_ERROR_HINT": "Próbálja újra, vagy ellenőrizze a portál beállításait.",
+            "FILTER_BY_TYPE": "Szűrés típus szerint",
+            "ITEM_COUNT_ONE": "1 elem",
+            "ITEM_COUNT_OTHER": "{{count}} elem",
+            "SEARCH": "Keresés",
+            "SEARCH_CATEGORIES": "Keresés a kategóriák között",
+            "RADIO_CATEGORIES": "Rádiókategóriák"
+        },
+        "COMMAND_PALETTE": {
+            "TITLE": "Parancspaletta",
+            "SUBTITLE": "Globális és környezetfüggő műveletek",
+            "SEARCH_PLACEHOLDER": "A parancsok szűréséhez kezdjen gépelni",
+            "SEARCH_LABEL": "Parancsok szűrése",
+            "EMPTY": "Nincs találat a parancsok között",
+            "GROUP_GLOBAL": "Globális műveletek",
+            "GROUP_PLAYLIST": "Ez a lejátszási lista",
+            "GROUP_VIEW": "Aktuális nézet",
+            "GROUP_SECTION": "Ez a szakasz",
+            "GROUP_RECENT": "Legutóbb használt"
+        },
+        "SHORTCUTS": {
+            "TITLE": "Billentyűparancsok",
+            "SUBTITLE": "Az IPTVnator munkaterületén, a navigáció és lejátszás során, valamint a párbeszédpanelekben használható billentyűparancsok.",
+            "OPEN_TOOLTIP": "Billentyűparancsok (?)",
+            "OPEN_ARIA": "Billentyűparancsok megnyitása",
+            "PLATFORM": {
+                "MAC": "macOS billentyűkiosztás",
+                "OTHER": "Windows/Linux billentyűkiosztás"
+            },
+            "GROUPS": {
+                "GLOBAL": "Globális",
+                "NAVIGATION": "Navigáció",
+                "PLAYBACK": "Lejátszás",
+                "DIALOGS": "Párbeszédpanelek és listák"
+            },
+            "ITEMS": {
+                "OPEN_KEYBOARD_SHORTCUTS": "A billentyűparancsok listájának megnyitása",
+                "OPEN_COMMAND_PALETTE": "Parancspaletta megnyitása",
+                "OPEN_GLOBAL_SEARCH": "Globális keresés megnyitása",
+                "OPEN_RECENTLY_VIEWED": "Megtekintési előzmények megnyitása",
+                "SUBMIT_SHELL_SEARCH": "Munkaterületi keresés indítása",
+                "TOGGLE_SIDEBAR": "Oldalsáv megjelenítése vagy elrejtése",
+                "M3U_CHANNEL_NUMBER": "M3U-csatorna kiválasztása a számának beírásával",
+                "PLAY_PAUSE": "A beágyazott MPV lejátszásának indítása vagy szüneteltetése",
+                "TOGGLE_FULLSCREEN": "A beágyazott MPV teljes képernyős módjának be- vagy kikapcsolása",
+                "SEEK": "Ugrás 5 másodperccel előre vagy vissza a beágyazott MPV-ben",
+                "ADJUST_VOLUME": "Hangerő módosítása 5%-kal",
+                "MUTE_AUDIO": "Hang némítása",
+                "CLOSE_PLAYER_POPOVERS": "A beágyazott MPV előugró ablakainak bezárása",
+                "COMMAND_PALETTE_NAVIGATION": "Kijelölés mozgatása a parancspalettán",
+                "COMMAND_PALETTE_RUN": "A parancspalettán kijelölt művelet végrehajtása",
+                "CLOSE_DIALOGS": "Párbeszédpanel bezárása vagy fedőréteg eltüntetése",
+                "DOWNLOADS_OPEN_ITEM": "A kijelölt letöltés megnyitása a médiatárban"
+            }
+        },
+        "GLOBAL_FAVORITES": {
+            "TITLE": "Összesített kedvencek",
+            "SUBTITLE": "Élő csatornák az összes lejátszási listából",
+            "SEARCH_PLACEHOLDER": "Keresés a kedvencek között…",
+            "NO_RESULTS": "Nincs találat",
+            "NO_RESULTS_HINT": "Próbálkozzon másik keresési kifejezéssel",
+            "EMPTY_TITLE": "Még nincs kedvenc élő csatorna",
+            "EMPTY_HINT": "Jelölje csillaggal az M3U-, Xtream- vagy Stalker-lejátszási listák élő csatornáit, hogy itt jelenjenek meg.",
+            "EMPTY_PLAYER": "A megtekintés megkezdéséhez válasszon egy csatornát",
+            "NO_PLAYLISTS_TITLE": "Nincs megjeleníthető kedvenc",
+            "NO_PLAYLISTS_BODY": "Adjon hozzá egy lejátszási listát, hogy kedvencként menthessen élő csatornákat, filmeket és sorozatokat.",
+            "NO_ITEMS_TITLE": "Még nincs kedvenc tartalom",
+            "NO_ITEMS_BODY": "A csillag ikon megnyomásával bármely csatornát, filmet vagy sorozatot ide menthet.",
+            "UNKNOWN_CHANNEL": "Ismeretlen"
+        },
+        "GLOBAL_RECENT": {
+            "NO_PLAYLISTS_TITLE": "Még nincs megtekintési előzmény",
+            "NO_PLAYLISTS_BODY": "Adjon hozzá egy lejátszási listát; megtekintési előzményei ezután itt jelennek meg.",
+            "NO_ITEMS_TITLE": "Még nincs megtekintési előzmény",
+            "NO_ITEMS_BODY": "Indítson el valamilyen tartalmat a médiatárból; ezután itt is megjelenik."
+        }
+    }
+}
diff --git a/apps/web/src/assets/i18n/it.json b/apps/web/src/assets/i18n/it.json
index e5f8559a4..a57ea5146 100644
--- a/apps/web/src/assets/i18n/it.json
+++ b/apps/web/src/assets/i18n/it.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Aggiornamento della playlist non riuscito. Il file locale non è più disponibile. Controlla il percorso del file o reimporta la playlist.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Aggiornamento della playlist non riuscito. L'app non può più accedere al file locale.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Le playlist sono state aggiornate correttamente",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Aggiornamento automatico incompleto: aggiornate {{updated}} playlist su {{total}}, {{failed}} non riuscite.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Aggiornamento automatico incompleto: aggiornate {{updated}} playlist su {{total}}, {{failed}} non riuscite, {{skipped}} ignorate (nessun URL o percorso file).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Aggiornamento automatico delle playlist non riuscito. Nessuna delle {{total}} playlist è stata aggiornata.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Aggiornamento automatico delle playlist: aggiornate {{updated}} su {{total}}, {{skipped}} ignorate (nessun URL o percorso file).",
             "AUTO_REFRESH_ENABLED": "Aggiornamento automatico attivo"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Verifica chiave",
         "TMDB_TEST_SUCCESS": "La chiave funziona — TMDB ha risposto correttamente",
         "TMDB_TEST_FAILED": "Verifica non riuscita — TMDB ha rifiutato la chiave o non è raggiungibile",
+        "TMDB_CACHE": "Cache dei metadati",
+        "TMDB_CACHE_DESCRIPTION": "I metadati scaricati vengono salvati localmente perché le pagine dei dettagli si aprano subito. Svuotandola, l'app scaricherà dati aggiornati alla prossima visita.",
+        "TMDB_CACHE_SIZE": "{{entries}} voci · {{size}}",
+        "TMDB_CACHE_CLEAR": "Svuota cache",
+        "TMDB_CACHE_ERROR": "Impossibile leggere la cache — riprova",
         "TMDB_CREDITS": "Metadati",
         "TMDB_ATTRIBUTION": "Questo prodotto utilizza l'API di TMDB ma non è approvato né certificato da TMDB.",
         "APP_PREFERENCES": "Preferenze app",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Cancellazione…",
         "EPG_URL_ERROR": "Il valore non è una URL valida",
         "VIDEO_PLAYER_DESCRIPTION": "Seleziona lettore video predefinito",
+        "WEB_PLAYER_SHARED_CONTROLS": "Controlli unificati per i player web (sperimentale)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Usa i controlli condivisi di IPTVnator in HTML5, Video.js e ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Riempimento ambientale dello sfondo",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Riempie lo spazio intorno al lettore con un poster sfocato e scurito invece delle semplici barre nere.",
+        "PLAYER_UP_NEXT_RAIL": "Pannello \"A seguire\" con i prossimi episodi",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Nelle finestre ampie, ancora il lettore delle serie a sinistra e mostra i prossimi episodi accanto.",
         "STREAM_FORMAT_DESCRIPTION": "Seleziona il formato di streaming predefinito (xtream)",
         "LANGUAGE_DESCRIPTION": "Seleziona la lingua dell'applicazione",
         "THEME_DESCRIPTION": "Seleziona il tema visivo dell'applicazione",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Visualizza/nascondi i sottotitoli per impostazione predefinita",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Mostra footer In riproduzione",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Mantieni visibile la barra di stato del lettore esterno in fondo all'area di lavoro su desktop.",
+        "STRIP_COUNTRY_PREFIX": "Rimuovi i prefissi del paese dai nomi dei canali",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Rimuove i prefissi di paese/gruppo come \"US | \" o \"UK - \" dai nomi dei canali live in tutta l'app.",
         "VERSION_DESCRIPTION": "Versione attuale dell'applicazione",
         "ABOUT_SUBTITLE": "Versione, link al progetto e modi per supportare IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Runtime MPV integrato",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: motore frame-copy (sperimentale)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Il video viene disegnato sul canvas dell'app, così menu e finestre di dialogo appaiono sopra di esso.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Ha effetto dopo il riavvio dell'app."
     },
     "THEMES": {
         "DARK_THEME": "Scuro",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Indietro",
             "RETRY": "Riprova",
             "STALLED": "L'avvio di questo stream sta richiedendo più tempo del previsto.",
             "PLAYBACK_FAILED": "Riproduzione con MPV integrato non riuscita.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Indietro di 10 secondi",
             "FORWARD_10_SECONDS": "Avanti di 10 secondi",
             "LIVE_STREAM": "Stream in diretta",
+            "PLAYBACK_POSITION": "Posizione di riproduzione",
             "MUTE": "Disattiva audio",
             "UNMUTE": "Attiva audio",
             "MUTED": "Audio disattivato",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Impossibile avviare la registrazione.",
             "RECORDING_FAILED_TO_STOP": "Impossibile interrompere la registrazione.",
             "SAVED_TO": "Salvato in {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Attiva Picture-in-Picture",
+            "EXIT_PICTURE_IN_PICTURE": "Esci da Picture-in-Picture",
             "ENTER_FULLSCREEN": "Attiva schermo intero",
             "EXIT_FULLSCREEN": "Esci dallo schermo intero"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Rimuovi dai preferiti",
         "ADD_FAVORITE": "Aggiungi ai preferiti",
         "SHOW_DETAILS": "Mostra dettagli canale",
+        "MAP_EPG": "Associa canale EPG",
         "FAVORITES_UPDATED": "Aggiornamento preferiti completato!",
         "SELECT_CHANNEL_PLAYBACK": "Seleziona un canale per avviare la riproduzione",
         "SORT_BY": "Ordina per",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "mostra ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Associa canale EPG",
+        "SUBTITLE": "Seleziona manualmente un canale EPG per \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Cerca canali EPG...",
+        "CURRENT_MAPPING": "Associazione attuale",
+        "NO_MAPPING": "Nessuna associazione EPG impostata",
+        "SAVE": "Salva associazione",
+        "REMOVE": "Rimuovi associazione",
+        "CLOSE": "Chiudi",
+        "NO_RESULTS": "Nessun canale EPG trovato",
+        "SEARCH_HINT": "Digita almeno {{min}} caratteri per cercare",
+        "SAVED": "Associazione EPG salvata",
+        "REMOVED": "Associazione EPG rimossa",
+        "SAVE_FAILED": "Impossibile aggiornare l'associazione EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Sì",
     "NO": "No",
@@ -756,6 +797,8 @@
         "ACTORS": "Attori",
         "DIRECTOR": "Regista",
         "SIMILAR": "Simili",
+        "CREW_JOB_DIRECTOR": "Regista",
+        "CREW_JOB_CREATOR": "Ideatore",
         "ACTOR_FILMOGRAPHY": "Filmografia",
         "ACTOR_FILTER_ALL": "Tutti",
         "ACTOR_SCOPE_THIS_PORTAL": "Questo portale",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Nella tua libreria",
         "ACTOR_SEARCH_IN_PORTAL": "Cerca nel portale",
         "ACTOR_BORN": "Nato:",
+        "ACTOR_DIED": "Deceduto",
+        "SERIES_STATUS_RETURNING": "In corso",
+        "SERIES_STATUS_PLANNED": "Pianificata",
+        "SERIES_STATUS_IN_PRODUCTION": "In produzione",
+        "SERIES_STATUS_ENDED": "Conclusa",
+        "SERIES_STATUS_CANCELED": "Cancellata",
+        "SERIES_STATUS_PILOT": "Pilota",
         "DURATION": "Durata",
         "CAST": "Cast",
         "EPISODE_RUN_TIME": "Tempo esecuzione episodio",
@@ -779,6 +829,7 @@
         "RESTART": "Ricomincia",
         "CONTINUE_WATCHING": "Continua a guardare",
         "PLAY_FIRST_EPISODE": "Riproduci primo episodio",
+        "PLAY_EPISODE": "Riproduci episodio {{episode}}",
         "RESUME_EPISODE": "Riprendi episodio",
         "PLAY_NEXT_EPISODE": "Riproduci episodio successivo",
         "SERIES_WATCHED": "Serie vista",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL streaming copiato negli appunti",
         "COPY_STREAM_URL": "Copia URL streaming",
         "NOW_PLAYING": "In riproduzione",
+        "UP_NEXT": "A seguire",
         "CLOSE_PLAYER": "Chiudi lettore",
         "ABOUT": "Info",
         "SEASONS_AND_EPISODES": "Stagioni ed episodi",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Questo contenuto non è disponibile su questo server",
         "PLAYBACK_ERROR": "Impossibile ottenere l'URL di riproduzione",
         "LOADING_SEASONS": "Caricamento stagioni...",
+        "LOADING_ALL_CHANNELS": "Caricamento dell'elenco completo dei canali…",
+        "REFRESH_CHANNEL_LIST": "Aggiorna elenco canali",
+        "NO_CHANNELS_IN_CATEGORY": "Nessun canale in questa categoria",
+        "ITEM": "elemento",
+        "ITEMS": "elementi",
         "NO_EPISODES": "Nessun episodio disponibile",
         "ALL_RADIO": "Tutte le radio"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Questo download non può più essere aperto nella libreria perché la playlist di origine è stata rimossa.",
         "FILE_NOT_FOUND": "Questo file scaricato non è più disponibile su disco.",
         "FILE_ACTION_ERROR": "Impossibile completare l'azione sul file.",
+        "ACTION_FAILED": "Azione non riuscita",
+        "PAUSE": "Pausa",
+        "RESUME": "Riprendi",
         "CANCEL": "Annulla",
         "RETRY": "Riprova",
         "REMOVE": "Rimuovi",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "In download",
             "COMPLETED": "Completato",
             "FAILED": "Non riuscito",
-            "CANCELED": "Annullato"
+            "CANCELED": "Annullato",
+            "PAUSED": "In pausa"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/ja.json b/apps/web/src/assets/i18n/ja.json
index 9be5c7845..ccbdfeddb 100644
--- a/apps/web/src/assets/i18n/ja.json
+++ b/apps/web/src/assets/i18n/ja.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "プレイリストの更新に失敗しました。ローカルファイルが利用できなくなっています。ファイルパスを確認するか、プレイリストを再インポートしてください。",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "プレイリストの更新に失敗しました。アプリがローカルファイルにアクセスできなくなりました。",
             "AUTO_REFRESH_UPDATE_SUCCESS": "成功！プレイリストが正常に更新されました",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "プレイリストの自動更新が完了しませんでした：{{total}} 件中 {{updated}} 件を更新し、{{failed}} 件が失敗しました。",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "プレイリストの自動更新が完了しませんでした：{{total}} 件中 {{updated}} 件を更新し、{{failed}} 件が失敗、{{skipped}} 件をスキップしました（URL もファイルパスもありません）。",
+            "AUTO_REFRESH_UPDATE_FAILED": "プレイリストの自動更新に失敗しました。{{total}} 件のプレイリストをいずれも更新できませんでした。",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "プレイリストの自動更新：{{total}} 件中 {{updated}} 件を更新し、{{skipped}} 件をスキップしました（URL もファイルパスもありません）。",
             "AUTO_REFRESH_ENABLED": "自動更新が有効です"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "キーを確認",
         "TMDB_TEST_SUCCESS": "キーは有効です — TMDB が正常に応答しました",
         "TMDB_TEST_FAILED": "確認に失敗しました — TMDB がキーを拒否したか、接続できません",
+        "TMDB_CACHE": "メタデータキャッシュ",
+        "TMDB_CACHE_DESCRIPTION": "ダウンロードしたメタデータをローカルに保存し、詳細ページを即座に表示します。消去すると次回アクセス時に再取得します。",
+        "TMDB_CACHE_SIZE": "{{entries}} 件 · {{size}}",
+        "TMDB_CACHE_CLEAR": "キャッシュを消去",
+        "TMDB_CACHE_ERROR": "キャッシュを読み取れません — 再試行してください",
         "TMDB_CREDITS": "メタデータ",
         "TMDB_ATTRIBUTION": "本製品は TMDB API を使用していますが、TMDB による承認または認証を受けたものではありません。",
         "APP_PREFERENCES": "アプリ設定",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "クリア中…",
         "EPG_URL_ERROR": "有効なURLではありません",
         "VIDEO_PLAYER_DESCRIPTION": "デフォルトのビデオプレーヤーを選択",
+        "WEB_PLAYER_SHARED_CONTROLS": "Webプレーヤーの統一コントロール（試験的）",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "HTML5、Video.js、ArtPlayerでIPTVnator共通のコントロールを使用します。",
+        "PLAYER_AMBIENT_MODE": "プレーヤー周囲のぼかし背景",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "プレーヤーの周囲をぼかしたポスター画像で埋め、通常の黒い枠の代わりに表示します。",
+        "PLAYER_UP_NEXT_RAIL": "「次に再生」エピソードレール",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "ウィンドウ幅が広い場合、シリーズのプレーヤーを左側に配置し、その横に次のエピソードの一覧を表示します。",
         "STREAM_FORMAT_DESCRIPTION": "デフォルトのストリーム形式を選択（Xtream）",
         "LANGUAGE_DESCRIPTION": "アプリケーションの言語を選択",
         "THEME_DESCRIPTION": "アプリケーションの視覚テーマを選択",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "デフォルトで字幕を表示/非表示",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "再生中フッターを表示",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "デスクトップでワークスペース下部に外部プレーヤーのステータスバーを表示し続けます。",
+        "STRIP_COUNTRY_PREFIX": "チャンネル名から国名プレフィックスを削除",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "アプリ全体で、ライブチャンネル名から \"US | \" や \"UK - \" のような国／グループのプレフィックスを削除します。",
         "VERSION_DESCRIPTION": "アプリケーションの現在のバージョン",
         "ABOUT_SUBTITLE": "バージョン、プロジェクトのリンク、IPTVnatorをサポートする方法。",
         "EMBEDDED_MPV_NOTICE_TITLE": "組み込みMPVランタイム",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "埋め込みMPV：フレームコピーエンジン（実験的）",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "映像をアプリのキャンバスに描画するため、メニューやダイアログをその上に表示できます。",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "アプリの再起動後に有効になります。"
     },
     "THEMES": {
         "DARK_THEME": "ダーク",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "戻る",
             "RETRY": "再試行",
             "STALLED": "このストリームの開始に予想より時間がかかっています。",
             "PLAYBACK_FAILED": "組み込みMPVでの再生に失敗しました。",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "10秒戻る",
             "FORWARD_10_SECONDS": "10秒進む",
             "LIVE_STREAM": "ライブストリーム",
+            "PLAYBACK_POSITION": "再生位置",
             "MUTE": "ミュート",
             "UNMUTE": "ミュート解除",
             "MUTED": "ミュート中",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "録画を開始できませんでした。",
             "RECORDING_FAILED_TO_STOP": "録画を停止できませんでした。",
             "SAVED_TO": "{{path}}に保存しました",
+            "ENTER_PICTURE_IN_PICTURE": "ピクチャーインピクチャーを開始",
+            "EXIT_PICTURE_IN_PICTURE": "ピクチャーインピクチャーを終了",
             "ENTER_FULLSCREEN": "全画面表示",
             "EXIT_FULLSCREEN": "全画面表示を終了"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "お気に入りから削除",
         "ADD_FAVORITE": "お気に入りに追加",
         "SHOW_DETAILS": "チャンネルの詳細を表示",
+        "MAP_EPG": "EPGチャンネルを割り当て",
         "FAVORITES_UPDATED": "お気に入りが更新されました！",
         "SELECT_CHANNEL_PLAYBACK": "再生を開始するチャンネルを選択してください",
         "SORT_BY": "並び替え",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "表示 ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "EPGチャンネルの割り当て",
+        "SUBTITLE": "「{{channelName}}」のEPGチャンネルを手動で選択します",
+        "SEARCH_PLACEHOLDER": "EPGチャンネルを検索...",
+        "CURRENT_MAPPING": "現在の割り当て",
+        "NO_MAPPING": "EPGの割り当てはありません",
+        "SAVE": "割り当てを保存",
+        "REMOVE": "割り当てを削除",
+        "CLOSE": "閉じる",
+        "NO_RESULTS": "EPGチャンネルが見つかりません",
+        "SEARCH_HINT": "検索するには{{min}}文字以上入力してください",
+        "SAVED": "EPGの割り当てを保存しました",
+        "REMOVED": "EPGの割り当てを削除しました",
+        "SAVE_FAILED": "EPGの割り当てを更新できませんでした"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "はい",
     "NO": "いいえ",
@@ -756,6 +797,8 @@
         "ACTORS": "出演者",
         "DIRECTOR": "監督",
         "SIMILAR": "類似作品",
+        "CREW_JOB_DIRECTOR": "監督",
+        "CREW_JOB_CREATOR": "クリエイター",
         "ACTOR_FILMOGRAPHY": "出演作品",
         "ACTOR_FILTER_ALL": "すべて",
         "ACTOR_SCOPE_THIS_PORTAL": "このポータル",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "ライブラリにあり",
         "ACTOR_SEARCH_IN_PORTAL": "ポータルで検索",
         "ACTOR_BORN": "生年月日:",
+        "ACTOR_DIED": "死去",
+        "SERIES_STATUS_RETURNING": "放送中",
+        "SERIES_STATUS_PLANNED": "企画中",
+        "SERIES_STATUS_IN_PRODUCTION": "製作中",
+        "SERIES_STATUS_ENDED": "完結",
+        "SERIES_STATUS_CANCELED": "打ち切り",
+        "SERIES_STATUS_PILOT": "パイロット",
         "DURATION": "時間",
         "CAST": "キャスト",
         "EPISODE_RUN_TIME": "エピソード再生時間",
@@ -779,6 +829,7 @@
         "RESTART": "最初から再生",
         "CONTINUE_WATCHING": "視聴を再開",
         "PLAY_FIRST_EPISODE": "第1話を再生",
+        "PLAY_EPISODE": "第{{episode}}話を再生",
         "RESUME_EPISODE": "エピソードを再開",
         "PLAY_NEXT_EPISODE": "次のエピソードを再生",
         "SERIES_WATCHED": "シリーズ視聴済み",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "ストリームURLがクリップボードにコピーされました",
         "COPY_STREAM_URL": "ストリームURLをコピー",
         "NOW_PLAYING": "再生中",
+        "UP_NEXT": "次に再生",
         "CLOSE_PLAYER": "プレーヤーを閉じる",
         "ABOUT": "概要",
         "SEASONS_AND_EPISODES": "シーズンとエピソード",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "このコンテンツはこのサーバーでは利用できません",
         "PLAYBACK_ERROR": "再生URLの取得に失敗しました",
         "LOADING_SEASONS": "シーズンを読み込み中...",
+        "LOADING_ALL_CHANNELS": "全チャンネルリストを読み込み中…",
+        "REFRESH_CHANNEL_LIST": "チャンネルリストを更新",
+        "NO_CHANNELS_IN_CATEGORY": "このカテゴリーにチャンネルがありません",
+        "ITEM": "件",
+        "ITEMS": "件",
         "NO_EPISODES": "利用可能なエピソードはありません",
         "ALL_RADIO": "すべてのラジオ"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "ソースのプレイリストが削除されたため、このダウンロードはライブラリで開けなくなりました。",
         "FILE_NOT_FOUND": "このダウンロードファイルはディスク上で見つかりませんでした。",
         "FILE_ACTION_ERROR": "ファイル操作を完了できませんでした。",
+        "ACTION_FAILED": "操作に失敗しました",
+        "PAUSE": "一時停止",
+        "RESUME": "再開",
         "CANCEL": "キャンセル",
         "RETRY": "再試行",
         "REMOVE": "削除",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "ダウンロード中",
             "COMPLETED": "完了",
             "FAILED": "失敗",
-            "CANCELED": "キャンセル済み"
+            "CANCELED": "キャンセル済み",
+            "PAUSED": "一時停止中"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/ko.json b/apps/web/src/assets/i18n/ko.json
index 5b35c4905..1c7351c29 100644
--- a/apps/web/src/assets/i18n/ko.json
+++ b/apps/web/src/assets/i18n/ko.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "재생목록 새로 고침에 실패했습니다. 로컬 파일을 더 이상 사용할 수 없습니다. 파일 경로를 확인하거나 재생목록을 다시 가져오세요.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "재생목록 새로 고침에 실패했습니다. 앱이 더 이상 로컬 파일에 접근할 수 없습니다.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "성공! 재생목록이 성공적으로 업데이트되었습니다",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "재생목록 자동 새로 고침이 완료되지 않았습니다. {{total}}개 중 {{updated}}개를 업데이트했고 {{failed}}개가 실패했습니다.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "재생목록 자동 새로 고침이 완료되지 않았습니다. {{total}}개 중 {{updated}}개를 업데이트했고 {{failed}}개가 실패했으며 {{skipped}}개를 건너뛰었습니다(URL 또는 파일 경로 없음).",
+            "AUTO_REFRESH_UPDATE_FAILED": "재생목록 자동 새로 고침에 실패했습니다. {{total}}개의 재생목록을 모두 업데이트하지 못했습니다.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "재생목록 자동 새로 고침: {{total}}개 중 {{updated}}개를 업데이트하고 {{skipped}}개를 건너뛰었습니다(URL 또는 파일 경로 없음).",
             "AUTO_REFRESH_ENABLED": "자동 새로 고침 활성화됨"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "키 확인",
         "TMDB_TEST_SUCCESS": "키가 작동합니다 — TMDB가 정상적으로 응답했습니다",
         "TMDB_TEST_FAILED": "확인에 실패했습니다 — TMDB가 키를 거부했거나 연결할 수 없습니다",
+        "TMDB_CACHE": "메타데이터 캐시",
+        "TMDB_CACHE_DESCRIPTION": "내려받은 메타데이터를 로컬에 저장해 상세 페이지가 즉시 열립니다. 지우면 다음 방문 시 새로 가져옵니다.",
+        "TMDB_CACHE_SIZE": "{{entries}}개 · {{size}}",
+        "TMDB_CACHE_CLEAR": "캐시 지우기",
+        "TMDB_CACHE_ERROR": "캐시를 읽지 못했습니다 — 다시 시도하세요",
         "TMDB_CREDITS": "메타데이터",
         "TMDB_ATTRIBUTION": "이 제품은 TMDB API를 사용하지만 TMDB의 보증이나 인증을 받지 않았습니다.",
         "APP_PREFERENCES": "앱 환경설정",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "지우는 중…",
         "EPG_URL_ERROR": "값이 유효한 URL이 아닙니다.",
         "VIDEO_PLAYER_DESCRIPTION": "기본 비디오 플레이어 선택",
+        "WEB_PLAYER_SHARED_CONTROLS": "웹 플레이어 통합 컨트롤(실험적)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "HTML5, Video.js 및 ArtPlayer에서 IPTVnator 공통 컨트롤을 사용합니다.",
+        "PLAYER_AMBIENT_MODE": "주변 배경 채우기",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "플레이어 주변을 검은 막대 대신 흐려지고 어두워진 포스터로 채웁니다.",
+        "PLAYER_UP_NEXT_RAIL": "다음 에피소드 레일",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "넓은 창에서 시리즈 플레이어를 왼쪽에 고정하고 그 옆에 다음 에피소드를 표시합니다.",
         "STREAM_FORMAT_DESCRIPTION": "기본 스트림 형식 선택 (xtream)",
         "LANGUAGE_DESCRIPTION": "애플리케이션 언어 선택",
         "THEME_DESCRIPTION": "애플리케이션의 시각적 테마 선택",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "기본적으로 자막 표시 또는 숨기기",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "지금 재생 중 표시줄 표시",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "데스크톱의 작업 공간 하단에 외부 플레이어 상태 표시줄을 계속 표시합니다.",
+        "STRIP_COUNTRY_PREFIX": "채널 이름에서 국가 접두사 제거",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "라이브 채널 이름에서 \"US | \" 또는 \"UK - \"와 같은 국가/그룹 접두사를 앱 전체에서 제거합니다.",
         "VERSION_DESCRIPTION": "애플리케이션의 현재 버전",
         "ABOUT_SUBTITLE": "버전, 프로젝트 링크 및 IPTVnator를 후원하는 방법.",
         "EMBEDDED_MPV_NOTICE_TITLE": "내장 MPV 런타임",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "내장 MPV: 프레임 복사 엔진(실험적)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "비디오를 앱 캔버스에 렌더링하여 메뉴와 대화 상자가 그 위에 표시됩니다.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "앱을 다시 시작한 후 적용됩니다."
     },
     "THEMES": {
         "DARK_THEME": "어둡게",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "뒤로",
             "RETRY": "다시 시도",
             "STALLED": "이 스트림의 시작이 예상보다 오래 걸리고 있습니다.",
             "PLAYBACK_FAILED": "내장 MPV 재생에 실패했습니다.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "10초 뒤로",
             "FORWARD_10_SECONDS": "10초 앞으로",
             "LIVE_STREAM": "라이브 스트림",
+            "PLAYBACK_POSITION": "재생 위치",
             "MUTE": "음소거",
             "UNMUTE": "음소거 해제",
             "MUTED": "음소거됨",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "녹화를 시작하지 못했습니다.",
             "RECORDING_FAILED_TO_STOP": "녹화를 중지하지 못했습니다.",
             "SAVED_TO": "{{path}}에 저장되었습니다",
+            "ENTER_PICTURE_IN_PICTURE": "PIP 모드 시작",
+            "EXIT_PICTURE_IN_PICTURE": "PIP 모드 종료",
             "ENTER_FULLSCREEN": "전체 화면",
             "EXIT_FULLSCREEN": "전체 화면 종료"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "즐겨찾기에서 삭제하기",
         "ADD_FAVORITE": "즐겨찾기에 추가",
         "SHOW_DETAILS": "채널 세부정보 표시",
+        "MAP_EPG": "EPG 채널 매핑",
         "FAVORITES_UPDATED": "즐겨찾기가 업데이트되었습니다!",
         "SELECT_CHANNEL_PLAYBACK": "재생을 시작할 채널을 선택하세요",
         "SORT_BY": "정렬 기준",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "보기 ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "EPG 채널 매핑",
+        "SUBTITLE": "\"{{channelName}}\"의 EPG 채널을 직접 선택하세요",
+        "SEARCH_PLACEHOLDER": "EPG 채널 검색...",
+        "CURRENT_MAPPING": "현재 매핑",
+        "NO_MAPPING": "설정된 EPG 매핑 없음",
+        "SAVE": "매핑 저장",
+        "REMOVE": "매핑 제거",
+        "CLOSE": "닫기",
+        "NO_RESULTS": "EPG 채널을 찾을 수 없음",
+        "SEARCH_HINT": "검색하려면 {{min}}자 이상 입력하세요",
+        "SAVED": "EPG 매핑이 저장되었습니다",
+        "REMOVED": "EPG 매핑이 제거되었습니다",
+        "SAVE_FAILED": "EPG 매핑을 업데이트할 수 없습니다"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Yes",
     "NO": "No",
@@ -756,6 +797,8 @@
         "ACTORS": "배우",
         "DIRECTOR": "감독",
         "SIMILAR": "비슷한 콘텐츠",
+        "CREW_JOB_DIRECTOR": "감독",
+        "CREW_JOB_CREATOR": "크리에이터",
         "ACTOR_FILMOGRAPHY": "출연 작품",
         "ACTOR_FILTER_ALL": "전체",
         "ACTOR_SCOPE_THIS_PORTAL": "현재 포털",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "내 라이브러리에 있음",
         "ACTOR_SEARCH_IN_PORTAL": "포털에서 검색",
         "ACTOR_BORN": "출생:",
+        "ACTOR_DIED": "사망",
+        "SERIES_STATUS_RETURNING": "방영 중",
+        "SERIES_STATUS_PLANNED": "기획 중",
+        "SERIES_STATUS_IN_PRODUCTION": "제작 중",
+        "SERIES_STATUS_ENDED": "완결",
+        "SERIES_STATUS_CANCELED": "취소됨",
+        "SERIES_STATUS_PILOT": "파일럿",
         "DURATION": "지속",
         "CAST": "깁스",
         "EPISODE_RUN_TIME": "에피소드 실행 시간",
@@ -779,6 +829,7 @@
         "RESTART": "처음부터 보기",
         "CONTINUE_WATCHING": "이어서 시청",
         "PLAY_FIRST_EPISODE": "첫 에피소드 재생",
+        "PLAY_EPISODE": "에피소드 {{episode}} 재생",
         "RESUME_EPISODE": "에피소드 이어 보기",
         "PLAY_NEXT_EPISODE": "다음 에피소드 재생",
         "SERIES_WATCHED": "시리즈 시청 완료",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "스트림 URL이 클립보드에 복사되었습니다.",
         "COPY_STREAM_URL": "스트림 URL 복사",
         "NOW_PLAYING": "지금 재생 중",
+        "UP_NEXT": "다음 에피소드",
         "CLOSE_PLAYER": "플레이어 닫기",
         "ABOUT": "정보",
         "SEASONS_AND_EPISODES": "시즌 및 에피소드",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "이 서버에서는 이 콘텐츠를 사용할 수 없습니다",
         "PLAYBACK_ERROR": "재생 URL을 가져오지 못했습니다",
         "LOADING_SEASONS": "시즌을 불러오는 중...",
+        "LOADING_ALL_CHANNELS": "전체 채널 목록 불러오는 중…",
+        "REFRESH_CHANNEL_LIST": "채널 목록 새로고침",
+        "NO_CHANNELS_IN_CATEGORY": "이 카테고리에 채널이 없습니다",
+        "ITEM": "개",
+        "ITEMS": "개",
         "NO_EPISODES": "사용 가능한 에피소드가 없습니다",
         "ALL_RADIO": "모든 라디오"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "원본 재생목록이 제거되어 이 다운로드 항목을 라이브러리에서 더 이상 열 수 없습니다.",
         "FILE_NOT_FOUND": "이 다운로드한 파일을 디스크에서 더 이상 사용할 수 없습니다.",
         "FILE_ACTION_ERROR": "파일 작업을 완료하지 못했습니다.",
+        "ACTION_FAILED": "작업 실패",
+        "PAUSE": "일시정지",
+        "RESUME": "재개",
         "CANCEL": "취소",
         "RETRY": "다시 시도",
         "REMOVE": "제거",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "다운로드 중",
             "COMPLETED": "완료됨",
             "FAILED": "실패",
-            "CANCELED": "취소됨"
+            "CANCELED": "취소됨",
+            "PAUSED": "일시정지됨"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/nl.json b/apps/web/src/assets/i18n/nl.json
index 70e472cce..c28d9c7e3 100644
--- a/apps/web/src/assets/i18n/nl.json
+++ b/apps/web/src/assets/i18n/nl.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Vernieuwen van afspeellijst mislukt. Het lokale bestand is niet meer beschikbaar. Controleer het bestandspad of importeer de afspeellijst opnieuw.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Vernieuwen van afspeellijst mislukt. De app heeft geen toegang meer tot het lokale bestand.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Gelukt! De afspeellijsten zijn succesvol bijgewerkt",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Automatisch vernieuwen onvolledig: {{updated}} van {{total}} afspeellijsten bijgewerkt, {{failed}} mislukt.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Automatisch vernieuwen onvolledig: {{updated}} van {{total}} afspeellijsten bijgewerkt, {{failed}} mislukt, {{skipped}} overgeslagen (geen URL of bestandspad).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Automatisch vernieuwen van afspeellijsten mislukt. Geen van de {{total}} afspeellijsten kon worden bijgewerkt.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Automatisch vernieuwen van afspeellijsten: {{updated}} van {{total}} bijgewerkt, {{skipped}} overgeslagen (geen URL of bestandspad).",
             "AUTO_REFRESH_ENABLED": "Automatisch vernieuwen ingeschakeld"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Sleutel controleren",
         "TMDB_TEST_SUCCESS": "De sleutel werkt — TMDB heeft succesvol gereageerd",
         "TMDB_TEST_FAILED": "Controle mislukt — TMDB heeft de sleutel geweigerd of is niet bereikbaar",
+        "TMDB_CACHE": "Metadata-cache",
+        "TMDB_CACHE_DESCRIPTION": "Gedownloade metadata wordt lokaal opgeslagen zodat detailpagina's direct openen. Na het wissen haalt de app bij het volgende bezoek verse gegevens op.",
+        "TMDB_CACHE_SIZE": "{{entries}} items · {{size}}",
+        "TMDB_CACHE_CLEAR": "Cache wissen",
+        "TMDB_CACHE_ERROR": "Cache kon niet worden gelezen — probeer opnieuw",
         "TMDB_CREDITS": "Metadata",
         "TMDB_ATTRIBUTION": "Dit product maakt gebruik van de TMDB API, maar wordt niet onderschreven of gecertificeerd door TMDB.",
         "APP_PREFERENCES": "App-voorkeuren",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Wissen…",
         "EPG_URL_ERROR": "De opgegeven waarde is geen geldige URL.",
         "VIDEO_PLAYER_DESCRIPTION": "Selecteer de standaard videospeler",
+        "WEB_PLAYER_SHARED_CONTROLS": "Uniforme bediening voor webspelers (experimenteel)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Gebruik de gedeelde IPTVnator-bediening in HTML5, Video.js en ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Ambient achtergrond",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Vult de ruimte rond de speler met een vervaagde, gedimde posterafbeelding in plaats van zwarte balken.",
+        "PLAYER_UP_NEXT_RAIL": "Hierna-paneel met afleveringen",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Zet de seriespeler in brede vensters links vast en toont de komende afleveringen ernaast.",
         "STREAM_FORMAT_DESCRIPTION": "Selecteer het standaard streamformaat (xtream)",
         "LANGUAGE_DESCRIPTION": "Selecteer de taal van de applicatie",
         "THEME_DESCRIPTION": "Kies het visuele thema van de applicatie",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Standaard ondertiteling weergeven of verbergen",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Voettekst 'nu spelend' tonen",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Houd de statusbalk van de externe speler zichtbaar onderaan de werkruimte op desktop.",
+        "STRIP_COUNTRY_PREFIX": "Landprefixen uit kanaalnamen verwijderen",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Verwijdert land-/groepsprefixen zoals \"US | \" of \"UK - \" uit de namen van live-kanalen, overal in de app.",
         "VERSION_DESCRIPTION": "Huidige versie van de applicatie",
         "ABOUT_SUBTITLE": "Versie, projectlinks en manieren om IPTVnator te ondersteunen.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Ingebedde MPV-runtime",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: frame-copy-engine (experimenteel)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "De video wordt op het app-canvas getekend zodat menu's en dialoogvensters erboven verschijnen.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Wordt van kracht na het herstarten van de app."
     },
     "THEMES": {
         "DARK_THEME": "Donker",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Terug",
             "RETRY": "Opnieuw proberen",
             "STALLED": "Deze stream doet er langer over dan verwacht om te starten.",
             "PLAYBACK_FAILED": "Afspelen via Embedded MPV is mislukt.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "10 seconden terug",
             "FORWARD_10_SECONDS": "10 seconden vooruit",
             "LIVE_STREAM": "Live stream",
+            "PLAYBACK_POSITION": "Afspeelpositie",
             "MUTE": "Dempen",
             "UNMUTE": "Dempen opheffen",
             "MUTED": "Gedempt",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Opname kon niet worden gestart.",
             "RECORDING_FAILED_TO_STOP": "Opname kon niet worden gestopt.",
             "SAVED_TO": "Opgeslagen in {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Beeld-in-beeld starten",
+            "EXIT_PICTURE_IN_PICTURE": "Beeld-in-beeld sluiten",
             "ENTER_FULLSCREEN": "Volledig scherm openen",
             "EXIT_FULLSCREEN": "Volledig scherm sluiten"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Verwijder uit favorieten",
         "ADD_FAVORITE": "Toevoegen aan favorieten",
         "SHOW_DETAILS": "Toon kanaaldetails",
+        "MAP_EPG": "EPG-kanaal koppelen",
         "FAVORITES_UPDATED": "Favorieten zijn bijgewerkt!",
         "SELECT_CHANNEL_PLAYBACK": "Selecteer een kanaal om af te spelen",
         "SORT_BY": "Sorteren op",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "toon ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "EPG-kanaal koppelen",
+        "SUBTITLE": "Selecteer handmatig een EPG-kanaal voor \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "EPG-kanalen zoeken...",
+        "CURRENT_MAPPING": "Huidige koppeling",
+        "NO_MAPPING": "Geen EPG-koppeling ingesteld",
+        "SAVE": "Koppeling opslaan",
+        "REMOVE": "Koppeling verwijderen",
+        "CLOSE": "Sluiten",
+        "NO_RESULTS": "Geen EPG-kanalen gevonden",
+        "SEARCH_HINT": "Typ minimaal {{min}} tekens om te zoeken",
+        "SAVED": "EPG-koppeling opgeslagen",
+        "REMOVED": "EPG-koppeling verwijderd",
+        "SAVE_FAILED": "Kan de EPG-koppeling niet bijwerken"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Ja",
     "NO": "Nee",
@@ -756,6 +797,8 @@
         "ACTORS": "Acteurs",
         "DIRECTOR": "Regisseur",
         "SIMILAR": "Vergelijkbaar",
+        "CREW_JOB_DIRECTOR": "Regisseur",
+        "CREW_JOB_CREATOR": "Bedenker",
         "ACTOR_FILMOGRAPHY": "Filmografie",
         "ACTOR_FILTER_ALL": "Alles",
         "ACTOR_SCOPE_THIS_PORTAL": "Dit portaal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "In je bibliotheek",
         "ACTOR_SEARCH_IN_PORTAL": "Zoeken in portal",
         "ACTOR_BORN": "Geboren:",
+        "ACTOR_DIED": "Overleden",
+        "SERIES_STATUS_RETURNING": "Lopend",
+        "SERIES_STATUS_PLANNED": "Gepland",
+        "SERIES_STATUS_IN_PRODUCTION": "In productie",
+        "SERIES_STATUS_ENDED": "Afgelopen",
+        "SERIES_STATUS_CANCELED": "Geannuleerd",
+        "SERIES_STATUS_PILOT": "Pilot",
         "DURATION": "Lengte",
         "CAST": "Cast",
         "EPISODE_RUN_TIME": "Aflevering lengte",
@@ -779,6 +829,7 @@
         "RESTART": "Opnieuw beginnen",
         "CONTINUE_WATCHING": "Verder kijken",
         "PLAY_FIRST_EPISODE": "Eerste aflevering afspelen",
+        "PLAY_EPISODE": "Aflevering {{episode}} afspelen",
         "RESUME_EPISODE": "Aflevering hervatten",
         "PLAY_NEXT_EPISODE": "Volgende aflevering afspelen",
         "SERIES_WATCHED": "Serie bekeken",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "Stream URL Gekopieërd",
         "COPY_STREAM_URL": "Kopieër Stream URL",
         "NOW_PLAYING": "Nu bezig",
+        "UP_NEXT": "Hierna",
         "CLOSE_PLAYER": "Speler sluiten",
         "ABOUT": "Over",
         "SEASONS_AND_EPISODES": "Seizoenen en afleveringen",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Deze inhoud is niet beschikbaar op deze server",
         "PLAYBACK_ERROR": "Ophalen van afspeel-URL mislukt",
         "LOADING_SEASONS": "Seizoenen laden...",
+        "LOADING_ALL_CHANNELS": "Volledige zenderlijst wordt geladen…",
+        "REFRESH_CHANNEL_LIST": "Zenderlijst vernieuwen",
+        "NO_CHANNELS_IN_CATEGORY": "Geen zenders in deze categorie",
+        "ITEM": "item",
+        "ITEMS": "items",
         "NO_EPISODES": "Geen afleveringen beschikbaar",
         "ALL_RADIO": "Alle radio"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Deze download kan niet meer worden geopend in de bibliotheek omdat de bronafspeellijst is verwijderd.",
         "FILE_NOT_FOUND": "Dit gedownloade bestand is niet meer beschikbaar op de schijf.",
         "FILE_ACTION_ERROR": "De bestandsactie kon niet worden voltooid.",
+        "ACTION_FAILED": "Actie mislukt",
+        "PAUSE": "Pauzeren",
+        "RESUME": "Hervatten",
         "CANCEL": "Annuleren",
         "RETRY": "Opnieuw proberen",
         "REMOVE": "Verwijderen",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Downloaden",
             "COMPLETED": "Voltooid",
             "FAILED": "Mislukt",
-            "CANCELED": "Geannuleerd"
+            "CANCELED": "Geannuleerd",
+            "PAUSED": "Gepauzeerd"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/pl.json b/apps/web/src/assets/i18n/pl.json
index 38fdaea82..46f5db3c9 100644
--- a/apps/web/src/assets/i18n/pl.json
+++ b/apps/web/src/assets/i18n/pl.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Odświeżanie listy odtwarzania nie powiodło się. Plik lokalny jest niedostępny. Sprawdź ścieżkę pliku lub zaimportuj listę ponownie.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Odświeżanie listy odtwarzania nie powiodło się. Aplikacja nie ma już dostępu do pliku lokalnego.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Sukces! Listy odtwarzania zostały pomyślnie zaktualizowane",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Automatyczne odświeżanie niekompletne: zaktualizowano {{updated}} z {{total}} list odtwarzania, {{failed}} nie powiodło się.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Automatyczne odświeżanie niekompletne: zaktualizowano {{updated}} z {{total}} list odtwarzania, {{failed}} nie powiodło się, pominięto {{skipped}} (brak adresu URL lub ścieżki pliku).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Automatyczne odświeżanie list odtwarzania nie powiodło się. Nie zaktualizowano żadnej z {{total}} list.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Automatyczne odświeżanie list odtwarzania: zaktualizowano {{updated}} z {{total}}, pominięto {{skipped}} (brak adresu URL lub ścieżki pliku).",
             "AUTO_REFRESH_ENABLED": "Automatyczne odświeżanie włączone"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Sprawdź klucz",
         "TMDB_TEST_SUCCESS": "Klucz działa — TMDB odpowiedziało poprawnie",
         "TMDB_TEST_FAILED": "Sprawdzenie nie powiodło się — TMDB odrzuciło klucz lub jest niedostępne",
+        "TMDB_CACHE": "Pamięć podręczna metadanych",
+        "TMDB_CACHE_DESCRIPTION": "Pobrane metadane są zapisywane lokalnie, dzięki czemu strony szczegółów otwierają się natychmiast. Po wyczyszczeniu aplikacja pobierze świeże dane.",
+        "TMDB_CACHE_SIZE": "{{entries}} wpisów · {{size}}",
+        "TMDB_CACHE_CLEAR": "Wyczyść pamięć",
+        "TMDB_CACHE_ERROR": "Nie udało się odczytać pamięci — spróbuj ponownie",
         "TMDB_CREDITS": "Metadane",
         "TMDB_ATTRIBUTION": "Ten produkt korzysta z API TMDB, ale nie jest wspierany ani certyfikowany przez TMDB.",
         "APP_PREFERENCES": "Preferencje aplikacji",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Czyszczenie…",
         "EPG_URL_ERROR": "Wartość nie jest prawidłowym URL",
         "VIDEO_PLAYER_DESCRIPTION": "Wybierz domyślny odtwarzacz wideo",
+        "WEB_PLAYER_SHARED_CONTROLS": "Ujednolicone sterowanie odtwarzaczami internetowymi (eksperymentalne)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Używaj wspólnych elementów sterowania IPTVnator w HTML5, Video.js i ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Rozmyte tło",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Wypełnij przestrzeń wokół odtwarzacza rozmytym, przyciemnianym plakatem zamiast zwykłych czarnych pasków.",
+        "PLAYER_UP_NEXT_RAIL": "Panel następnych odcinków",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "W szerokich oknach zadokuj odtwarzacz serialu po lewej stronie i pokaż obok kolejne odcinki.",
         "STREAM_FORMAT_DESCRIPTION": "Wybierz domyślny format strumienia (xtream)",
         "LANGUAGE_DESCRIPTION": "Wybierz język aplikacji",
         "THEME_DESCRIPTION": "Wybierz motyw wizualny aplikacji",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Domyślnie pokaż lub ukryj napisy",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Pokaż stopkę „teraz odtwarzane”",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Pozostaw pasek statusu zewnętrznego odtwarzacza widoczny u dołu obszaru roboczego na komputerze.",
+        "STRIP_COUNTRY_PREFIX": "Usuń prefiksy krajów z nazw kanałów",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Usuwa prefiksy kraju/grupy, takie jak \"US | \" lub \"UK - \", z nazw kanałów na żywo w całej aplikacji.",
         "VERSION_DESCRIPTION": "Aktualna wersja aplikacji",
         "ABOUT_SUBTITLE": "Wersja, linki do projektu i sposoby wsparcia IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Środowisko wbudowanego MPV",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: silnik frame-copy (eksperymentalny)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Wideo jest rysowane na kanwie aplikacji, dzięki czemu menu i okna dialogowe wyświetlają się nad nim.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Zacznie działać po ponownym uruchomieniu aplikacji."
     },
     "THEMES": {
         "DARK_THEME": "Ciemny",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Wstecz",
             "RETRY": "Spróbuj ponownie",
             "STALLED": "Uruchamianie tego strumienia trwa dłużej niż zwykle.",
             "PLAYBACK_FAILED": "Odtwarzanie we wbudowanym MPV nie powiodło się.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Cofnij o 10 sekund",
             "FORWARD_10_SECONDS": "Do przodu o 10 sekund",
             "LIVE_STREAM": "Transmisja na żywo",
+            "PLAYBACK_POSITION": "Pozycja odtwarzania",
             "MUTE": "Wycisz",
             "UNMUTE": "Wyłącz wyciszenie",
             "MUTED": "Wyciszono",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Nie udało się rozpocząć nagrywania.",
             "RECORDING_FAILED_TO_STOP": "Nie udało się zatrzymać nagrywania.",
             "SAVED_TO": "Zapisano w {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Włącz obraz w obrazie",
+            "EXIT_PICTURE_IN_PICTURE": "Wyłącz obraz w obrazie",
             "ENTER_FULLSCREEN": "Włącz pełny ekran",
             "EXIT_FULLSCREEN": "Wyłącz pełny ekran"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Usuń z ulubionych",
         "ADD_FAVORITE": "Dodaj do ulubionych",
         "SHOW_DETAILS": "Pokaż szczegóły kanału",
+        "MAP_EPG": "Przypisz kanał EPG",
         "FAVORITES_UPDATED": "Ulubione zostały zaktualizowane!",
         "SELECT_CHANNEL_PLAYBACK": "Wybierz kanał, aby rozpocząć odtwarzanie",
         "SORT_BY": "Sortuj według",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "pokaż ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Przypisz kanał EPG",
+        "SUBTITLE": "Ręcznie wybierz kanał EPG dla \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Szukaj kanałów EPG...",
+        "CURRENT_MAPPING": "Bieżące przypisanie",
+        "NO_MAPPING": "Brak przypisania EPG",
+        "SAVE": "Zapisz przypisanie",
+        "REMOVE": "Usuń przypisanie",
+        "CLOSE": "Zamknij",
+        "NO_RESULTS": "Nie znaleziono kanałów EPG",
+        "SEARCH_HINT": "Wpisz co najmniej {{min}} znaki, aby wyszukać",
+        "SAVED": "Przypisanie EPG zapisane",
+        "REMOVED": "Przypisanie EPG usunięte",
+        "SAVE_FAILED": "Nie udało się zaktualizować przypisania EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Tak",
     "NO": "Nie",
@@ -756,6 +797,8 @@
         "ACTORS": "Aktorzy",
         "DIRECTOR": "Reżyser",
         "SIMILAR": "Podobne",
+        "CREW_JOB_DIRECTOR": "Reżyser",
+        "CREW_JOB_CREATOR": "Twórca",
         "ACTOR_FILMOGRAPHY": "Filmografia",
         "ACTOR_FILTER_ALL": "Wszystkie",
         "ACTOR_SCOPE_THIS_PORTAL": "Ten portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "W twojej bibliotece",
         "ACTOR_SEARCH_IN_PORTAL": "Szukaj w portalu",
         "ACTOR_BORN": "Data urodzenia:",
+        "ACTOR_DIED": "Zmarł",
+        "SERIES_STATUS_RETURNING": "W trakcie",
+        "SERIES_STATUS_PLANNED": "Zaplanowany",
+        "SERIES_STATUS_IN_PRODUCTION": "W produkcji",
+        "SERIES_STATUS_ENDED": "Zakończony",
+        "SERIES_STATUS_CANCELED": "Anulowany",
+        "SERIES_STATUS_PILOT": "Pilot",
         "DURATION": "Czas trwania",
         "CAST": "Obsada",
         "EPISODE_RUN_TIME": "Czas trwania odcinka",
@@ -779,6 +829,7 @@
         "RESTART": "Zacznij od nowa",
         "CONTINUE_WATCHING": "Kontynuuj oglądanie",
         "PLAY_FIRST_EPISODE": "Odtwórz pierwszy odcinek",
+        "PLAY_EPISODE": "Odtwórz odcinek {{episode}}",
         "RESUME_EPISODE": "Wznów odcinek",
         "PLAY_NEXT_EPISODE": "Odtwórz następny odcinek",
         "SERIES_WATCHED": "Serial obejrzany",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL strumienia skopiowany do schowka",
         "COPY_STREAM_URL": "Kopiuj URL strumienia",
         "NOW_PLAYING": "Teraz odtwarzane",
+        "UP_NEXT": "Następne",
         "CLOSE_PLAYER": "Zamknij odtwarzacz",
         "ABOUT": "Informacje",
         "SEASONS_AND_EPISODES": "Sezony i odcinki",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Ta treść jest niedostępna na tym serwerze",
         "PLAYBACK_ERROR": "Nie udało się uzyskać URL odtwarzania",
         "LOADING_SEASONS": "Ładowanie sezonów...",
+        "LOADING_ALL_CHANNELS": "Ładowanie pełnej listy kanałów…",
+        "REFRESH_CHANNEL_LIST": "Odśwież listę kanałów",
+        "NO_CHANNELS_IN_CATEGORY": "Brak kanałów w tej kategorii",
+        "ITEM": "pozycja",
+        "ITEMS": "pozycji",
         "NO_EPISODES": "Brak dostępnych odcinków",
         "ALL_RADIO": "Wszystkie radia"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Tego pobrania nie można już otworzyć w bibliotece, ponieważ jego źródłowa lista odtwarzania została usunięta.",
         "FILE_NOT_FOUND": "Ten pobrany plik nie jest już dostępny na dysku.",
         "FILE_ACTION_ERROR": "Nie udało się wykonać akcji na pliku.",
+        "ACTION_FAILED": "Akcja nie powiodła się",
+        "PAUSE": "Wstrzymaj",
+        "RESUME": "Wznów",
         "CANCEL": "Anuluj",
         "RETRY": "Spróbuj ponownie",
         "REMOVE": "Usuń",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Pobieranie",
             "COMPLETED": "Ukończone",
             "FAILED": "Niepowodzenie",
-            "CANCELED": "Anulowane"
+            "CANCELED": "Anulowane",
+            "PAUSED": "Wstrzymane"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/pt.json b/apps/web/src/assets/i18n/pt.json
index a1b75be66..da02cce09 100644
--- a/apps/web/src/assets/i18n/pt.json
+++ b/apps/web/src/assets/i18n/pt.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Falha ao atualizar a playlist. O arquivo local não está mais disponível. Verifique o caminho do arquivo ou reimporte a playlist.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Falha ao atualizar a playlist. O aplicativo não consegue mais acessar o arquivo local.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Sucesso! As playlists foram atualizadas com sucesso",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Atualização automática incompleta: {{updated}} de {{total}} playlists atualizadas, {{failed}} falharam.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Atualização automática incompleta: {{updated}} de {{total}} playlists atualizadas, {{failed}} falharam, {{skipped}} ignoradas (sem URL ou caminho de arquivo).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Falha na atualização automática das playlists. Nenhuma das {{total}} playlists pôde ser atualizada.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Atualização automática de playlists: {{updated}} de {{total}} atualizadas, {{skipped}} ignoradas (sem URL ou caminho de arquivo).",
             "AUTO_REFRESH_ENABLED": "Atualização automática ativada"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Verificar chave",
         "TMDB_TEST_SUCCESS": "A chave funciona — o TMDB respondeu com sucesso",
         "TMDB_TEST_FAILED": "A verificação falhou — o TMDB rejeitou a chave ou está inacessível",
+        "TMDB_CACHE": "Cache de metadados",
+        "TMDB_CACHE_DESCRIPTION": "Os metadados transferidos são guardados localmente para que as páginas de detalhes abram de imediato. Ao limpar, a app irá obter dados novos na próxima visita.",
+        "TMDB_CACHE_SIZE": "{{entries}} entradas · {{size}}",
+        "TMDB_CACHE_CLEAR": "Limpar cache",
+        "TMDB_CACHE_ERROR": "Não foi possível ler a cache — tente novamente",
         "TMDB_CREDITS": "Metadados",
         "TMDB_ATTRIBUTION": "Este produto usa a API do TMDB, mas não é endossado nem certificado pelo TMDB.",
         "APP_PREFERENCES": "Preferências do aplicativo",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Limpando…",
         "EPG_URL_ERROR": "O valor não é uma URL válida",
         "VIDEO_PLAYER_DESCRIPTION": "Selecionar reprodutor de vídeo padrão",
+        "WEB_PLAYER_SHARED_CONTROLS": "Controlos unificados para leitores web (experimental)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Usa os controlos partilhados do IPTVnator em HTML5, Video.js e ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Preenchimento de fundo ambiente",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Preenche o espaço ao redor do reprodutor com um pôster desfocado e escurecido em vez de barras pretas simples.",
+        "PLAYER_UP_NEXT_RAIL": "Painel de próximos episódios",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Em janelas largas, ancora o reprodutor de séries à esquerda e mostra os próximos episódios ao lado.",
         "STREAM_FORMAT_DESCRIPTION": "Selecionar formato de stream padrão (xtream)",
         "LANGUAGE_DESCRIPTION": "Selecionar idioma do aplicativo",
         "THEME_DESCRIPTION": "Selecionar tema visual do aplicativo",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Mostrar ou ocultar legendas por padrão",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Mostrar rodapé de reprodução atual",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Mantém a barra de status do reprodutor externo visível na parte inferior do espaço de trabalho no desktop.",
+        "STRIP_COUNTRY_PREFIX": "Remover prefixos de país dos nomes dos canais",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Remove prefixos de país/grupo como \"US | \" ou \"UK - \" dos nomes dos canais ao vivo em todo o aplicativo.",
         "VERSION_DESCRIPTION": "Versão atual do aplicativo",
         "ABOUT_SUBTITLE": "Versão, links do projeto e formas de apoiar o IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Runtime MPV integrado",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: motor frame-copy (experimental)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "O vídeo é desenhado na tela da aplicação, para que menus e diálogos fiquem por cima.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Entra em vigor após reiniciar a aplicação."
     },
     "THEMES": {
         "DARK_THEME": "Escuro",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Voltar",
             "RETRY": "Tentar novamente",
             "STALLED": "Este stream está demorando mais do que o esperado para iniciar.",
             "PLAYBACK_FAILED": "Falha na reprodução do MPV integrado.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Voltar 10 segundos",
             "FORWARD_10_SECONDS": "Avançar 10 segundos",
             "LIVE_STREAM": "Transmissão ao vivo",
+            "PLAYBACK_POSITION": "Posição de reprodução",
             "MUTE": "Silenciar",
             "UNMUTE": "Ativar som",
             "MUTED": "Silenciado",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Falha ao iniciar a gravação.",
             "RECORDING_FAILED_TO_STOP": "Falha ao parar a gravação.",
             "SAVED_TO": "Salvo em {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Ativar imagem em imagem",
+            "EXIT_PICTURE_IN_PICTURE": "Sair de imagem em imagem",
             "ENTER_FULLSCREEN": "Entrar em tela cheia",
             "EXIT_FULLSCREEN": "Sair da tela cheia"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Remover dos favoritos",
         "ADD_FAVORITE": "Adicionar aos favoritos",
         "SHOW_DETAILS": "Mostrar detalhes do canal",
+        "MAP_EPG": "Associar canal EPG",
         "FAVORITES_UPDATED": "Favoritos foram atualizados!",
         "SELECT_CHANNEL_PLAYBACK": "Selecione um canal para iniciar a reprodução",
         "SORT_BY": "Ordenar por",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "mostrar ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Associar canal EPG",
+        "SUBTITLE": "Selecione manualmente um canal EPG para \"{{channelName}}\"",
+        "SEARCH_PLACEHOLDER": "Pesquisar canais EPG...",
+        "CURRENT_MAPPING": "Associação atual",
+        "NO_MAPPING": "Nenhuma associação EPG definida",
+        "SAVE": "Guardar associação",
+        "REMOVE": "Remover associação",
+        "CLOSE": "Fechar",
+        "NO_RESULTS": "Nenhum canal EPG encontrado",
+        "SEARCH_HINT": "Digite pelo menos {{min}} caracteres para pesquisar",
+        "SAVED": "Associação EPG guardada",
+        "REMOVED": "Associação EPG removida",
+        "SAVE_FAILED": "Não foi possível atualizar a associação EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Sim",
     "NO": "Não",
@@ -756,6 +797,8 @@
         "ACTORS": "Atores",
         "DIRECTOR": "Diretor",
         "SIMILAR": "Semelhantes",
+        "CREW_JOB_DIRECTOR": "Diretor",
+        "CREW_JOB_CREATOR": "Criador",
         "ACTOR_FILMOGRAPHY": "Filmografia",
         "ACTOR_FILTER_ALL": "Todos",
         "ACTOR_SCOPE_THIS_PORTAL": "Este portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Na sua biblioteca",
         "ACTOR_SEARCH_IN_PORTAL": "Buscar no portal",
         "ACTOR_BORN": "Nascimento:",
+        "ACTOR_DIED": "Falecido",
+        "SERIES_STATUS_RETURNING": "Em exibição",
+        "SERIES_STATUS_PLANNED": "Planeada",
+        "SERIES_STATUS_IN_PRODUCTION": "Em produção",
+        "SERIES_STATUS_ENDED": "Terminada",
+        "SERIES_STATUS_CANCELED": "Cancelada",
+        "SERIES_STATUS_PILOT": "Piloto",
         "DURATION": "Duração",
         "CAST": "Elenco",
         "EPISODE_RUN_TIME": "Tempo de execução do episódio",
@@ -779,6 +829,7 @@
         "RESTART": "Recomeçar",
         "CONTINUE_WATCHING": "Continuar assistindo",
         "PLAY_FIRST_EPISODE": "Reproduzir primeiro episódio",
+        "PLAY_EPISODE": "Reproduzir episódio {{episode}}",
         "RESUME_EPISODE": "Continuar episódio",
         "PLAY_NEXT_EPISODE": "Reproduzir próximo episódio",
         "SERIES_WATCHED": "Série assistida",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL do stream copiado para a área de transferência",
         "COPY_STREAM_URL": "Copiar URL do Stream",
         "NOW_PLAYING": "Reproduzindo agora",
+        "UP_NEXT": "A seguir",
         "CLOSE_PLAYER": "Fechar reprodutor",
         "ABOUT": "Sobre",
         "SEASONS_AND_EPISODES": "Temporadas e episódios",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Este conteúdo não está disponível neste servidor",
         "PLAYBACK_ERROR": "Falha ao obter URL de reprodução",
         "LOADING_SEASONS": "Carregando temporadas...",
+        "LOADING_ALL_CHANNELS": "A carregar a lista completa de canais…",
+        "REFRESH_CHANNEL_LIST": "Atualizar lista de canais",
+        "NO_CHANNELS_IN_CATEGORY": "Nenhum canal nesta categoria",
+        "ITEM": "item",
+        "ITEMS": "itens",
         "NO_EPISODES": "Nenhum episódio disponível",
         "ALL_RADIO": "Todas as rádios"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Este download não pode mais ser aberto na biblioteca porque sua playlist de origem foi removida.",
         "FILE_NOT_FOUND": "Este arquivo baixado não está mais disponível no disco.",
         "FILE_ACTION_ERROR": "A ação do arquivo não pôde ser concluída.",
+        "ACTION_FAILED": "Falha na ação",
+        "PAUSE": "Pausar",
+        "RESUME": "Retomar",
         "CANCEL": "Cancelar",
         "RETRY": "Tentar novamente",
         "REMOVE": "Remover",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Baixando",
             "COMPLETED": "Concluído",
             "FAILED": "Falhou",
-            "CANCELED": "Cancelado"
+            "CANCELED": "Cancelado",
+            "PAUSED": "Pausado"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/ru.json b/apps/web/src/assets/i18n/ru.json
index f043a6b13..c2eb29748 100644
--- a/apps/web/src/assets/i18n/ru.json
+++ b/apps/web/src/assets/i18n/ru.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Не удалось обновить плейлист. Локальный файл больше не доступен. Проверьте путь к файлу или импортируйте плейлист заново.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Не удалось обновить плейлист. Приложение больше не имеет доступа к локальному файлу.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Успешно! Плейлисты были успешно обновлены",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Автообновление выполнено не полностью: обновлено {{updated}} из {{total}} плейлистов, не удалось — {{failed}}.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Автообновление выполнено не полностью: обновлено {{updated}} из {{total}} плейлистов, не удалось — {{failed}}, пропущено {{skipped}} (нет URL или пути к файлу).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Не удалось выполнить автообновление плейлистов. Ни один из {{total}} плейлистов не был обновлён.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Автообновление плейлистов: обновлено {{updated}} из {{total}}, пропущено {{skipped}} (нет URL или пути к файлу).",
             "AUTO_REFRESH_ENABLED": "Автообновление включено"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Проверить ключ",
         "TMDB_TEST_SUCCESS": "Ключ работает — TMDB успешно ответил",
         "TMDB_TEST_FAILED": "Проверка не удалась — TMDB отклонил ключ или недоступен",
+        "TMDB_CACHE": "Кэш метаданных",
+        "TMDB_CACHE_DESCRIPTION": "Загруженные метаданные хранятся локально, поэтому страницы деталей открываются мгновенно. После очистки приложение загрузит свежие данные при следующем открытии.",
+        "TMDB_CACHE_SIZE": "{{entries}} записей · {{size}}",
+        "TMDB_CACHE_CLEAR": "Очистить кэш",
+        "TMDB_CACHE_ERROR": "Не удалось прочитать кэш — попробуйте ещё раз",
         "TMDB_CREDITS": "Метаданные",
         "TMDB_ATTRIBUTION": "Этот продукт использует TMDB API, но не одобрен и не сертифицирован TMDB.",
         "APP_PREFERENCES": "Параметры приложения",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Очистка…",
         "EPG_URL_ERROR": "Введенное значение не является URL-адресом.",
         "VIDEO_PLAYER_DESCRIPTION": "Выбрать стандартный видео плеер",
+        "WEB_PLAYER_SHARED_CONTROLS": "Единые элементы управления для веб-плееров (экспериментально)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "Использовать общие элементы управления IPTVnator в HTML5, Video.js и ArtPlayer.",
+        "PLAYER_AMBIENT_MODE": "Заливка фона за плеером",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Заполнять пространство вокруг плеера размытым затемнённым постером вместо чёрных полос.",
+        "PLAYER_UP_NEXT_RAIL": "Панель следующих серий",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "В широких окнах закреплять плеер сериала слева и показывать следующие серии рядом с ним.",
         "STREAM_FORMAT_DESCRIPTION": "Выбрать формат потока по умолчанию (Xtream)",
         "LANGUAGE_DESCRIPTION": "Выбрать язык приложения",
         "THEME_DESCRIPTION": "Выбрать визуальную тему оформления",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Показать или скрыть субтитры по умолчанию.",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Показывать панель «Сейчас воспроизводится»",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Оставлять панель состояния внешнего проигрывателя видимой внизу рабочей области в настольном приложении.",
+        "STRIP_COUNTRY_PREFIX": "Удалять префиксы стран из названий каналов",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Удаляет префиксы стран/групп, такие как \"US | \" или \"UK - \", из названий каналов прямого эфира во всём приложении.",
         "VERSION_DESCRIPTION": "Текущая версия приложения",
         "ABOUT_SUBTITLE": "Версия, ссылки на проект и способы поддержать IPTVnator.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Среда выполнения встроенного MPV",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Обновить",
         "APP_UPDATE_INSTALL": "Перезагрузить приложение",
         "APP_UPDATE_OPEN_RELEASE": "Открыть GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "Что нового"
+        "APP_UPDATE_RELEASE_NOTES": "Что нового",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: движок frame-copy (экспериментально)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Видео рисуется на канвасе приложения, поэтому меню и диалоги отображаются поверх него.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Вступит в силу после перезапуска приложения."
     },
     "THEMES": {
         "DARK_THEME": "Тёмная",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Назад",
             "RETRY": "Повторить",
             "STALLED": "Запуск этого потока занимает больше времени, чем ожидалось.",
             "PLAYBACK_FAILED": "Не удалось воспроизвести через встроенный MPV.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "Назад на 10 секунд",
             "FORWARD_10_SECONDS": "Вперёд на 10 секунд",
             "LIVE_STREAM": "Прямой эфир",
+            "PLAYBACK_POSITION": "Позиция воспроизведения",
             "MUTE": "Отключить звук",
             "UNMUTE": "Включить звук",
             "MUTED": "Звук отключён",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Не удалось начать запись.",
             "RECORDING_FAILED_TO_STOP": "Не удалось остановить запись.",
             "SAVED_TO": "Сохранено в {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "Включить режим «картинка в картинке»",
+            "EXIT_PICTURE_IN_PICTURE": "Выйти из режима «картинка в картинке»",
             "ENTER_FULLSCREEN": "Во весь экран",
             "EXIT_FULLSCREEN": "Выйти из полноэкранного режима"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Удалить из списка фаворитов",
         "ADD_FAVORITE": "Добавить в избранное",
         "SHOW_DETAILS": "Показать сведения о канале",
+        "MAP_EPG": "Привязать канал EPG",
         "FAVORITES_UPDATED": "Список фаворитов был обновлен!",
         "SELECT_CHANNEL_PLAYBACK": "Пожалуйста, выберите канал для начала воспроизведения",
         "SORT_BY": "Сортировать по",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "показать ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "Привязка канала EPG",
+        "SUBTITLE": "Выберите канал EPG для \"{{channelName}}\" вручную",
+        "SEARCH_PLACEHOLDER": "Поиск каналов EPG...",
+        "CURRENT_MAPPING": "Текущая привязка",
+        "NO_MAPPING": "Привязка EPG не задана",
+        "SAVE": "Сохранить привязку",
+        "REMOVE": "Удалить привязку",
+        "CLOSE": "Закрыть",
+        "NO_RESULTS": "Каналы EPG не найдены",
+        "SEARCH_HINT": "Введите не менее {{min}} символов для поиска",
+        "SAVED": "Привязка EPG сохранена",
+        "REMOVED": "Привязка EPG удалена",
+        "SAVE_FAILED": "Не удалось обновить привязку EPG"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Да",
     "NO": "Нет",
@@ -756,6 +797,8 @@
         "ACTORS": "Актеры",
         "DIRECTOR": "Режиссёр",
         "SIMILAR": "Похожее",
+        "CREW_JOB_DIRECTOR": "Режиссёр",
+        "CREW_JOB_CREATOR": "Создатель",
         "ACTOR_FILMOGRAPHY": "Фильмография",
         "ACTOR_FILTER_ALL": "Все",
         "ACTOR_SCOPE_THIS_PORTAL": "Этот портал",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Есть в вашей библиотеке",
         "ACTOR_SEARCH_IN_PORTAL": "Искать на портале",
         "ACTOR_BORN": "Родился:",
+        "ACTOR_DIED": "Умер",
+        "SERIES_STATUS_RETURNING": "Продолжается",
+        "SERIES_STATUS_PLANNED": "Запланирован",
+        "SERIES_STATUS_IN_PRODUCTION": "В производстве",
+        "SERIES_STATUS_ENDED": "Завершён",
+        "SERIES_STATUS_CANCELED": "Закрыт",
+        "SERIES_STATUS_PILOT": "Пилот",
         "DURATION": "Продолжительность",
         "CAST": "Бросать",
         "EPISODE_RUN_TIME": "Длительность эпизода",
@@ -779,6 +829,7 @@
         "RESTART": "С начала",
         "CONTINUE_WATCHING": "Продолжить просмотр",
         "PLAY_FIRST_EPISODE": "Воспроизвести первую серию",
+        "PLAY_EPISODE": "Воспроизвести серию {{episode}}",
         "RESUME_EPISODE": "Продолжить серию",
         "PLAY_NEXT_EPISODE": "Следующая серия",
         "SERIES_WATCHED": "Сериал просмотрен",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "URL-адрес потока был скопирован в буфер обмена.",
         "COPY_STREAM_URL": "Копировать URL-адрес потока",
         "NOW_PLAYING": "Сейчас воспроизводится",
+        "UP_NEXT": "Далее",
         "CLOSE_PLAYER": "Закрыть плеер",
         "ABOUT": "Об этом",
         "SEASONS_AND_EPISODES": "Сезоны и эпизоды",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Этот контент недоступен на этом сервере",
         "PLAYBACK_ERROR": "Не удалось получить URL для воспроизведения",
         "LOADING_SEASONS": "Загрузка сезонов…",
+        "LOADING_ALL_CHANNELS": "Загрузка полного списка каналов…",
+        "REFRESH_CHANNEL_LIST": "Обновить список каналов",
+        "NO_CHANNELS_IN_CATEGORY": "В этой категории нет каналов",
+        "ITEM": "элемент",
+        "ITEMS": "элементов",
         "NO_EPISODES": "Нет доступных эпизодов",
         "ALL_RADIO": "Все радио"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Эту загрузку больше нельзя открыть в библиотеке, потому что исходный плейлист был удален.",
         "FILE_NOT_FOUND": "Этот загруженный файл больше недоступен на диске.",
         "FILE_ACTION_ERROR": "Не удалось выполнить действие с файлом.",
+        "ACTION_FAILED": "Действие не выполнено",
+        "PAUSE": "Пауза",
+        "RESUME": "Возобновить",
         "CANCEL": "Отмена",
         "RETRY": "Повторить",
         "REMOVE": "Удалить",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "Скачивается",
             "COMPLETED": "Завершено",
             "FAILED": "Ошибка",
-            "CANCELED": "Отменено"
+            "CANCELED": "Отменено",
+            "PAUSED": "На паузе"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/tr.json b/apps/web/src/assets/i18n/tr.json
index 577f4ac60..5df212dc2 100644
--- a/apps/web/src/assets/i18n/tr.json
+++ b/apps/web/src/assets/i18n/tr.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "Oynatma listesi yenileme başarısız oldu. Yerel dosya artık kullanılabilir değil. Dosya yolunu kontrol edin veya oynatma listesini yeniden içe aktarın.",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "Oynatma listesi yenileme başarısız oldu. Uygulama artık yerel dosyaya erişemiyor.",
             "AUTO_REFRESH_UPDATE_SUCCESS": "Başarılı! Oynatma listeleri başarıyla güncellendi",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "Otomatik yenileme tamamlanmadı: {{total}} oynatma listesinden {{updated}} tanesi güncellendi, {{failed}} tanesi başarısız oldu.",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "Otomatik yenileme tamamlanmadı: {{total}} oynatma listesinden {{updated}} tanesi güncellendi, {{failed}} tanesi başarısız oldu, {{skipped}} tanesi atlandı (URL veya dosya yolu yok).",
+            "AUTO_REFRESH_UPDATE_FAILED": "Oynatma listelerinin otomatik yenilenmesi başarısız oldu. {{total}} oynatma listesinin hiçbiri güncellenemedi.",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "Oynatma listesi otomatik yenileme: {{total}} listeden {{updated}} tanesi güncellendi, {{skipped}} tanesi atlandı (URL veya dosya yolu yok).",
             "AUTO_REFRESH_ENABLED": "Otomatik yenileme etkin"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "Anahtarı kontrol et",
         "TMDB_TEST_SUCCESS": "Anahtar çalışıyor — TMDB başarıyla yanıt verdi",
         "TMDB_TEST_FAILED": "Kontrol başarısız — TMDB anahtarı reddetti veya erişilemiyor",
+        "TMDB_CACHE": "Meta veri önbelleği",
+        "TMDB_CACHE_DESCRIPTION": "İndirilen meta veriler yerel olarak saklanır, böylece detay sayfaları anında açılır. Temizlediğinizde uygulama bir sonraki ziyarette yeni veri indirir.",
+        "TMDB_CACHE_SIZE": "{{entries}} kayıt · {{size}}",
+        "TMDB_CACHE_CLEAR": "Önbelleği temizle",
+        "TMDB_CACHE_ERROR": "Önbellek okunamadı — tekrar deneyin",
         "TMDB_CREDITS": "Meta veri",
         "TMDB_ATTRIBUTION": "Bu ürün TMDB API'sini kullanır ancak TMDB tarafından onaylanmamış veya sertifikalandırılmamıştır.",
         "APP_PREFERENCES": "Uygulama tercihleri",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "Temizleniyor…",
         "EPG_URL_ERROR": "Girilen değer geçerli bir URL değildir",
         "VIDEO_PLAYER_DESCRIPTION": "Varsayılan video oynatıcıyı seçin",
+        "WEB_PLAYER_SHARED_CONTROLS": "Web oynatıcıları için birleşik kontroller (deneysel)",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "HTML5, Video.js ve ArtPlayer'da IPTVnator'ın ortak kontrollerini kullan.",
+        "PLAYER_AMBIENT_MODE": "Ortam ışığı dolgusu",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "Oynatıcının çevresindeki boşluğu siyah çubuklar yerine bulanık ve karartılmış bir poster ile doldurur.",
+        "PLAYER_UP_NEXT_RAIL": "Sıradaki bölümler paneli",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "Geniş pencerelerde dizi oynatıcısını sola yaslar ve sıradaki bölümleri yanında gösterir.",
         "STREAM_FORMAT_DESCRIPTION": "Varsayılan yayın formatını seçin (xtream)",
         "LANGUAGE_DESCRIPTION": "Uygulamanın dilini seçin",
         "THEME_DESCRIPTION": "Uygulamanın görünüm temasını seçin",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "Varsayılan olarak altyazıları göster veya gizle",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "Şu an oynatılıyor altbilgisini göster",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "Masaüstünde harici oynatıcı durum çubuğunu çalışma alanının altında görünür tutun.",
+        "STRIP_COUNTRY_PREFIX": "Kanal adlarından ülke ön eklerini kaldır",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "Uygulama genelinde canlı kanal adlarından \"US | \" veya \"UK - \" gibi ülke/grup ön eklerini kaldırır.",
         "VERSION_DESCRIPTION": "Uygulamanın geçerli sürümü",
         "ABOUT_SUBTITLE": "Sürüm, proje bağlantıları ve IPTVnator'u desteklemenin yolları.",
         "EMBEDDED_MPV_NOTICE_TITLE": "Gömülü MPV çalışma zamanı",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "Embedded MPV: frame-copy motoru (deneysel)",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "Video uygulama tuvaline çizilir, böylece menüler ve iletişim kutuları üzerinde görüntülenir.",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "Uygulama yeniden başlatıldıktan sonra geçerli olur."
     },
     "THEMES": {
         "DARK_THEME": "Koyu",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "Geri",
             "RETRY": "Tekrar dene",
             "STALLED": "Bu yayının başlaması beklenenden uzun sürüyor.",
             "PLAYBACK_FAILED": "Gömülü MPV oynatması başarısız oldu.",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "10 saniye geri",
             "FORWARD_10_SECONDS": "10 saniye ileri",
             "LIVE_STREAM": "Canlı yayın",
+            "PLAYBACK_POSITION": "Oynatma konumu",
             "MUTE": "Sesi kapat",
             "UNMUTE": "Sesi aç",
             "MUTED": "Ses kapalı",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "Kayıt başlatılamadı.",
             "RECORDING_FAILED_TO_STOP": "Kayıt durdurulamadı.",
             "SAVED_TO": "{{path}} konumuna kaydedildi",
+            "ENTER_PICTURE_IN_PICTURE": "Resim içinde resim modunu aç",
+            "EXIT_PICTURE_IN_PICTURE": "Resim içinde resim modundan çık",
             "ENTER_FULLSCREEN": "Tam ekrana geç",
             "EXIT_FULLSCREEN": "Tam ekrandan çık"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "Favorilerden kaldır",
         "ADD_FAVORITE": "Favorilere ekle",
         "SHOW_DETAILS": "Kanal ayrıntılarını göster",
+        "MAP_EPG": "EPG kanalı eşle",
         "FAVORITES_UPDATED": "Favoriler güncellendi!",
         "SELECT_CHANNEL_PLAYBACK": "Lütfen oynatmaya başlamak için bir kanal seçin",
         "SORT_BY": "Sırala",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "göster ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "EPG Kanalı Eşle",
+        "SUBTITLE": "\"{{channelName}}\" için EPG kanalını elle seçin",
+        "SEARCH_PLACEHOLDER": "EPG kanallarında ara...",
+        "CURRENT_MAPPING": "Geçerli eşleme",
+        "NO_MAPPING": "EPG eşlemesi ayarlanmadı",
+        "SAVE": "Eşlemeyi kaydet",
+        "REMOVE": "Eşlemeyi kaldır",
+        "CLOSE": "Kapat",
+        "NO_RESULTS": "EPG kanalı bulunamadı",
+        "SEARCH_HINT": "Aramak için en az {{min}} karakter yazın",
+        "SAVED": "EPG eşlemesi kaydedildi",
+        "REMOVED": "EPG eşlemesi kaldırıldı",
+        "SAVE_FAILED": "EPG eşlemesi güncellenemedi"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "Evet",
     "NO": "Hayır",
@@ -756,6 +797,8 @@
         "ACTORS": "Oyuncular",
         "DIRECTOR": "Yönetmen",
         "SIMILAR": "Benzerler",
+        "CREW_JOB_DIRECTOR": "Yönetmen",
+        "CREW_JOB_CREATOR": "Yaratıcı",
         "ACTOR_FILMOGRAPHY": "Filmografi",
         "ACTOR_FILTER_ALL": "Tümü",
         "ACTOR_SCOPE_THIS_PORTAL": "Bu portal",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "Kitaplığınızda mevcut",
         "ACTOR_SEARCH_IN_PORTAL": "Portalda ara",
         "ACTOR_BORN": "Doğum:",
+        "ACTOR_DIED": "Vefat",
+        "SERIES_STATUS_RETURNING": "Devam ediyor",
+        "SERIES_STATUS_PLANNED": "Planlandı",
+        "SERIES_STATUS_IN_PRODUCTION": "Yapım aşamasında",
+        "SERIES_STATUS_ENDED": "Tamamlandı",
+        "SERIES_STATUS_CANCELED": "İptal edildi",
+        "SERIES_STATUS_PILOT": "Pilot",
         "DURATION": "Süre",
         "CAST": "Oyuncular",
         "EPISODE_RUN_TIME": "Bölüm süresi",
@@ -779,6 +829,7 @@
         "RESTART": "Baştan Başla",
         "CONTINUE_WATCHING": "İzlemeye Devam Et",
         "PLAY_FIRST_EPISODE": "İlk bölümü oynat",
+        "PLAY_EPISODE": "{{episode}}. bölümü oynat",
         "RESUME_EPISODE": "Bölüme devam et",
         "PLAY_NEXT_EPISODE": "Sonraki bölümü oynat",
         "SERIES_WATCHED": "Dizi izlendi",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "Yayın URL'si panoya kopyalandı",
         "COPY_STREAM_URL": "Yayın URL'sini kopyala",
         "NOW_PLAYING": "Şimdi oynatılıyor",
+        "UP_NEXT": "Sıradaki",
         "CLOSE_PLAYER": "Oynatıcıyı kapat",
         "ABOUT": "Hakkında",
         "SEASONS_AND_EPISODES": "Sezonlar ve Bölümler",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "Bu içerik bu sunucuda mevcut değil",
         "PLAYBACK_ERROR": "Oynatma URL'si alınamadı",
         "LOADING_SEASONS": "Sezonlar yükleniyor...",
+        "LOADING_ALL_CHANNELS": "Tüm kanal listesi yükleniyor…",
+        "REFRESH_CHANNEL_LIST": "Kanal listesini yenile",
+        "NO_CHANNELS_IN_CATEGORY": "Bu kategoride kanal yok",
+        "ITEM": "öğe",
+        "ITEMS": "öğe",
         "NO_EPISODES": "Bölüm mevcut değil",
         "ALL_RADIO": "Tüm radyolar"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "Bu indirme, kaynak oynatma listesi kaldırıldığı için kütüphanede artık açılamıyor.",
         "FILE_NOT_FOUND": "Bu indirilen dosya artık diskte mevcut değil.",
         "FILE_ACTION_ERROR": "Dosya işlemi tamamlanamadı.",
+        "ACTION_FAILED": "İşlem başarısız oldu",
+        "PAUSE": "Duraklat",
+        "RESUME": "Devam et",
         "CANCEL": "İptal",
         "RETRY": "Tekrar Dene",
         "REMOVE": "Kaldır",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "İndiriliyor",
             "COMPLETED": "Tamamlandı",
             "FAILED": "Başarısız",
-            "CANCELED": "İptal Edildi"
+            "CANCELED": "İptal Edildi",
+            "PAUSED": "Duraklatıldı"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/zh.json b/apps/web/src/assets/i18n/zh.json
index e473b0886..3f0dc3ac2 100644
--- a/apps/web/src/assets/i18n/zh.json
+++ b/apps/web/src/assets/i18n/zh.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "播放列表刷新失败。本地文件已不可用。请检查文件路径或重新导入播放列表。",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "播放列表刷新失败。应用程序无法再访问该本地文件。",
             "AUTO_REFRESH_UPDATE_SUCCESS": "成功！播放列表已成功更新",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "播放列表自动刷新未完成：{{total}} 个播放列表中已更新 {{updated}} 个，{{failed}} 个失败。",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "播放列表自动刷新未完成：{{total}} 个播放列表中已更新 {{updated}} 个，{{failed}} 个失败，跳过 {{skipped}} 个（没有 URL 或文件路径）。",
+            "AUTO_REFRESH_UPDATE_FAILED": "播放列表自动刷新失败。{{total}} 个播放列表均未更新。",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "播放列表自动刷新：{{total}} 个中已更新 {{updated}} 个，跳过 {{skipped}} 个（没有 URL 或文件路径）。",
             "AUTO_REFRESH_ENABLED": "已启用自动刷新"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "检查密钥",
         "TMDB_TEST_SUCCESS": "密钥有效 — TMDB 响应成功",
         "TMDB_TEST_FAILED": "检查失败 — TMDB 拒绝了该密钥或无法访问",
+        "TMDB_CACHE": "元数据缓存",
+        "TMDB_CACHE_DESCRIPTION": "已下载的元数据保存在本地，详情页可立即打开。清除后应用会在下次访问时重新获取。",
+        "TMDB_CACHE_SIZE": "{{entries}} 条 · {{size}}",
+        "TMDB_CACHE_CLEAR": "清除缓存",
+        "TMDB_CACHE_ERROR": "无法读取缓存 — 请重试",
         "TMDB_CREDITS": "元数据",
         "TMDB_ATTRIBUTION": "本产品使用 TMDB API，但未获得 TMDB 的认可或认证。",
         "APP_PREFERENCES": "应用偏好",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "清除中…",
         "EPG_URL_ERROR": "该值不是有效的 URL",
         "VIDEO_PLAYER_DESCRIPTION": "选择默认视频播放器",
+        "WEB_PLAYER_SHARED_CONTROLS": "Web 播放器统一控件（实验性）",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "在 HTML5、Video.js 和 ArtPlayer 中使用 IPTVnator 的共享控件。",
+        "PLAYER_AMBIENT_MODE": "环境背景填充",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "用模糊、暗淡的海报填充播放器周围的空白，而不是黑条纹。",
+        "PLAYER_UP_NEXT_RAIL": "「接下来播放」剧集栏",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "在宽窗口下，将剧集播放器停靠在左侧，并在旁边显示后续剧集。",
         "STREAM_FORMAT_DESCRIPTION": "选择默认的流格式（xtream）",
         "LANGUAGE_DESCRIPTION": "选择应用程序的语言",
         "THEME_DESCRIPTION": "选择应用程序的视觉主题",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "默认显示或隐藏字幕",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "显示「正在播放」底栏",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "在桌面端工作区底部保持外部播放器状态栏可见。",
+        "STRIP_COUNTRY_PREFIX": "移除频道名称中的国家前缀",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "从整个应用中的直播频道名称里移除国家/分组前缀，例如 \"US | \" 或 \"UK - \"。",
         "VERSION_DESCRIPTION": "应用程序的当前版本",
         "ABOUT_SUBTITLE": "版本、项目链接以及支持 IPTVnator 的方式。",
         "EMBEDDED_MPV_NOTICE_TITLE": "嵌入式 MPV 运行时",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "嵌入式 MPV：帧拷贝引擎（实验性）",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "视频渲染到应用画布上，菜单和对话框可以显示在其上方。",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "重启应用后生效。"
     },
     "THEMES": {
         "DARK_THEME": "深色",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "返回",
             "RETRY": "重试",
             "STALLED": "该流的启动时间超出预期。",
             "PLAYBACK_FAILED": "嵌入式 MPV 播放失败。",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "快退 10 秒",
             "FORWARD_10_SECONDS": "快进 10 秒",
             "LIVE_STREAM": "直播",
+            "PLAYBACK_POSITION": "播放位置",
             "MUTE": "静音",
             "UNMUTE": "取消静音",
             "MUTED": "已静音",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "录制启动失败。",
             "RECORDING_FAILED_TO_STOP": "录制停止失败。",
             "SAVED_TO": "已保存至 {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "进入画中画",
+            "EXIT_PICTURE_IN_PICTURE": "退出画中画",
             "ENTER_FULLSCREEN": "进入全屏",
             "EXIT_FULLSCREEN": "退出全屏"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "从收藏夹中删除",
         "ADD_FAVORITE": "添加到收藏",
         "SHOW_DETAILS": "显示频道详情",
+        "MAP_EPG": "映射 EPG 频道",
         "FAVORITES_UPDATED": "收藏夹已更新！",
         "SELECT_CHANNEL_PLAYBACK": "请选择一个频道开始播放",
         "SORT_BY": "排序方式",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "展开 ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "映射 EPG 频道",
+        "SUBTITLE": "为“{{channelName}}”手动选择 EPG 频道",
+        "SEARCH_PLACEHOLDER": "搜索 EPG 频道...",
+        "CURRENT_MAPPING": "当前映射",
+        "NO_MAPPING": "未设置 EPG 映射",
+        "SAVE": "保存映射",
+        "REMOVE": "移除映射",
+        "CLOSE": "关闭",
+        "NO_RESULTS": "未找到 EPG 频道",
+        "SEARCH_HINT": "输入至少 {{min}} 个字符进行搜索",
+        "SAVED": "EPG 映射已保存",
+        "REMOVED": "EPG 映射已移除",
+        "SAVE_FAILED": "无法更新 EPG 映射"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "是",
     "NO": "否",
@@ -756,6 +797,8 @@
         "ACTORS": "演员",
         "DIRECTOR": "导演",
         "SIMILAR": "类似影片",
+        "CREW_JOB_DIRECTOR": "导演",
+        "CREW_JOB_CREATOR": "主创",
         "ACTOR_FILMOGRAPHY": "参演作品",
         "ACTOR_FILTER_ALL": "全部",
         "ACTOR_SCOPE_THIS_PORTAL": "当前门户",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "已在您的媒体库中",
         "ACTOR_SEARCH_IN_PORTAL": "在门户中搜索",
         "ACTOR_BORN": "出生:",
+        "ACTOR_DIED": "逝世",
+        "SERIES_STATUS_RETURNING": "连载中",
+        "SERIES_STATUS_PLANNED": "筹备中",
+        "SERIES_STATUS_IN_PRODUCTION": "制作中",
+        "SERIES_STATUS_ENDED": "已完结",
+        "SERIES_STATUS_CANCELED": "已取消",
+        "SERIES_STATUS_PILOT": "试播",
         "DURATION": "期间",
         "CAST": "投掷",
         "EPISODE_RUN_TIME": "剧集运行时间",
@@ -779,6 +829,7 @@
         "RESTART": "从头开始",
         "CONTINUE_WATCHING": "继续观看",
         "PLAY_FIRST_EPISODE": "播放第一集",
+        "PLAY_EPISODE": "播放第 {{episode}} 集",
         "RESUME_EPISODE": "继续播放本集",
         "PLAY_NEXT_EPISODE": "播放下一集",
         "SERIES_WATCHED": "剧集已看完",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "流 URL 已复制到剪贴板",
         "COPY_STREAM_URL": "复制流 URL",
         "NOW_PLAYING": "正在播放",
+        "UP_NEXT": "接下来播放",
         "CLOSE_PLAYER": "关闭播放器",
         "ABOUT": "简介",
         "SEASONS_AND_EPISODES": "季与集",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "此服务器上没有此内容",
         "PLAYBACK_ERROR": "获取播放 URL 失败",
         "LOADING_SEASONS": "正在加载季…",
+        "LOADING_ALL_CHANNELS": "正在加载完整频道列表…",
+        "REFRESH_CHANNEL_LIST": "刷新频道列表",
+        "NO_CHANNELS_IN_CATEGORY": "此分类中没有频道",
+        "ITEM": "项",
+        "ITEMS": "项",
         "NO_EPISODES": "没有可用的剧集",
         "ALL_RADIO": "所有广播"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "由于源播放列表已被移除，此下载项无法在库中打开。",
         "FILE_NOT_FOUND": "此下载文件已不在磁盘上。",
         "FILE_ACTION_ERROR": "无法完成此文件操作。",
+        "ACTION_FAILED": "操作失败",
+        "PAUSE": "暂停",
+        "RESUME": "继续",
         "CANCEL": "取消",
         "RETRY": "重试",
         "REMOVE": "移除",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "下载中",
             "COMPLETED": "已完成",
             "FAILED": "失败",
-            "CANCELED": "已取消"
+            "CANCELED": "已取消",
+            "PAUSED": "已暂停"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/assets/i18n/zhtw.json b/apps/web/src/assets/i18n/zhtw.json
index b138661e7..042b7c831 100644
--- a/apps/web/src/assets/i18n/zhtw.json
+++ b/apps/web/src/assets/i18n/zhtw.json
@@ -127,6 +127,10 @@
             "PLAYLIST_UPDATE_FILE_NOT_FOUND": "播放清單重新整理失敗。本機檔案已不存在。請檢查檔案路徑或重新匯入播放清單。",
             "PLAYLIST_UPDATE_FILE_ACCESS_ERROR": "播放清單重新整理失敗。應用程式無法再存取本機檔案。",
             "AUTO_REFRESH_UPDATE_SUCCESS": "成功！播放清單已成功更新",
+            "AUTO_REFRESH_UPDATE_PARTIAL": "播放清單自動重新整理未完成：{{total}} 個播放清單中已更新 {{updated}} 個，{{failed}} 個失敗。",
+            "AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED": "播放清單自動重新整理未完成：{{total}} 個播放清單中已更新 {{updated}} 個，{{failed}} 個失敗，略過 {{skipped}} 個（沒有 URL 或檔案路徑）。",
+            "AUTO_REFRESH_UPDATE_FAILED": "播放清單自動重新整理失敗。{{total}} 個播放清單皆未更新。",
+            "AUTO_REFRESH_UPDATE_SKIPPED": "播放清單自動重新整理：{{total}} 個中已更新 {{updated}} 個，略過 {{skipped}} 個（沒有 URL 或檔案路徑）。",
             "AUTO_REFRESH_ENABLED": "已啟用自動重新整理"
         },
         "ADD_PLAYLIST": {
@@ -247,6 +251,11 @@
         "TMDB_TEST_BUTTON": "檢查金鑰",
         "TMDB_TEST_SUCCESS": "金鑰有效 — TMDB 回應成功",
         "TMDB_TEST_FAILED": "檢查失敗 — TMDB 拒絕該金鑰或無法連線",
+        "TMDB_CACHE": "中繼資料快取",
+        "TMDB_CACHE_DESCRIPTION": "已下載的中繼資料儲存在本機，詳細頁面可立即開啟。清除後應用程式會在下次瀏覽時重新取得。",
+        "TMDB_CACHE_SIZE": "{{entries}} 筆 · {{size}}",
+        "TMDB_CACHE_CLEAR": "清除快取",
+        "TMDB_CACHE_ERROR": "無法讀取快取 — 請重試",
         "TMDB_CREDITS": "中繼資料",
         "TMDB_ATTRIBUTION": "本產品使用 TMDB API，但未經 TMDB 認可或認證。",
         "APP_PREFERENCES": "應用程式偏好設定",
@@ -296,6 +305,12 @@
         "CLEARING_EPG_DATA": "正在清除…",
         "EPG_URL_ERROR": "該值不是有效的網址",
         "VIDEO_PLAYER_DESCRIPTION": "選擇預設影片播放器",
+        "WEB_PLAYER_SHARED_CONTROLS": "Web 播放器統一控制項（實驗性）",
+        "WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION": "在 HTML5、Video.js 和 ArtPlayer 中使用 IPTVnator 的共用控制項。",
+        "PLAYER_AMBIENT_MODE": "環境背景填充",
+        "PLAYER_AMBIENT_MODE_DESCRIPTION": "用模糊、昏暗的海報填充播放器周圍的空間，取代純黑色邊框。",
+        "PLAYER_UP_NEXT_RAIL": "即將播放集數側欄",
+        "PLAYER_UP_NEXT_RAIL_DESCRIPTION": "在較寬的視窗中，將影集播放器停靠在左側，並在旁邊顯示即將播放的集數。",
         "STREAM_FORMAT_DESCRIPTION": "選擇預設串流格式（xtream）",
         "LANGUAGE_DESCRIPTION": "選擇應用程式語言",
         "THEME_DESCRIPTION": "選擇應用程式視覺主題",
@@ -315,6 +330,8 @@
         "SHOW_CAPTIONS_DESCRIPTION": "預設顯示或隱藏字幕",
         "SHOW_EXTERNAL_PLAYBACK_BAR": "顯示「正在播放」列",
         "SHOW_EXTERNAL_PLAYBACK_BAR_DESCRIPTION": "在桌面工作區底部保留外部播放器狀態列可見。",
+        "STRIP_COUNTRY_PREFIX": "從頻道名稱中移除國家前綴",
+        "STRIP_COUNTRY_PREFIX_DESCRIPTION": "移除應用程式中直播頻道名稱裡的國家/群組前綴，例如「US | 」或「UK - 」。",
         "VERSION_DESCRIPTION": "應用程式目前版本",
         "ABOUT_SUBTITLE": "版本、專案連結，以及支持 IPTVnator 的方式。",
         "EMBEDDED_MPV_NOTICE_TITLE": "內嵌 MPV 執行環境",
@@ -428,7 +445,10 @@
         "APP_UPDATE_DOWNLOAD": "Update",
         "APP_UPDATE_INSTALL": "Restart application",
         "APP_UPDATE_OPEN_RELEASE": "Open GitHub release",
-        "APP_UPDATE_RELEASE_NOTES": "What's new"
+        "APP_UPDATE_RELEASE_NOTES": "What's new",
+        "EMBEDDED_MPV_FRAME_COPY": "內嵌 MPV：幀複製引擎（實驗性）",
+        "EMBEDDED_MPV_FRAME_COPY_DESCRIPTION": "影片會繪製到應用程式畫布上，選單和對話框可顯示在其上方。",
+        "EMBEDDED_MPV_FRAME_COPY_RESTART": "重新啟動應用程式後生效。"
     },
     "THEMES": {
         "DARK_THEME": "深色",
@@ -446,6 +466,7 @@
     },
     "EMBEDDED_MPV": {
         "PLAYER": {
+            "BACK": "返回",
             "RETRY": "重試",
             "STALLED": "此串流的啟動時間比預期長。",
             "PLAYBACK_FAILED": "內嵌 MPV 播放失敗。",
@@ -459,6 +480,7 @@
             "BACK_10_SECONDS": "倒轉 10 秒",
             "FORWARD_10_SECONDS": "快轉 10 秒",
             "LIVE_STREAM": "現場直播",
+            "PLAYBACK_POSITION": "播放位置",
             "MUTE": "靜音",
             "UNMUTE": "取消靜音",
             "MUTED": "已靜音",
@@ -483,6 +505,8 @@
             "RECORDING_FAILED_TO_START": "無法開始錄製。",
             "RECORDING_FAILED_TO_STOP": "無法停止錄製。",
             "SAVED_TO": "已儲存至 {{path}}",
+            "ENTER_PICTURE_IN_PICTURE": "進入子母畫面",
+            "EXIT_PICTURE_IN_PICTURE": "退出子母畫面",
             "ENTER_FULLSCREEN": "進入全螢幕",
             "EXIT_FULLSCREEN": "離開全螢幕"
         }
@@ -559,6 +583,7 @@
         "REMOVE_FAVORITE": "從我的最愛中移除",
         "ADD_FAVORITE": "加入我的最愛",
         "SHOW_DETAILS": "顯示頻道詳細資訊",
+        "MAP_EPG": "對應 EPG 頻道",
         "FAVORITES_UPDATED": "我的最愛已更新！",
         "SELECT_CHANNEL_PLAYBACK": "請選擇一個頻道以開始播放",
         "SORT_BY": "排序依據",
@@ -704,6 +729,21 @@
             "GROUP_EXPAND": "顯示 ›"
         }
     },
+    "EPG_MAPPING_DIALOG": {
+        "TITLE": "對應 EPG 頻道",
+        "SUBTITLE": "為「{{channelName}}」手動選擇 EPG 頻道",
+        "SEARCH_PLACEHOLDER": "搜尋 EPG 頻道...",
+        "CURRENT_MAPPING": "目前對應",
+        "NO_MAPPING": "尚未設定 EPG 對應",
+        "SAVE": "儲存對應",
+        "REMOVE": "移除對應",
+        "CLOSE": "關閉",
+        "NO_RESULTS": "找不到 EPG 頻道",
+        "SEARCH_HINT": "輸入至少 {{min}} 個字元進行搜尋",
+        "SAVED": "EPG 對應已儲存",
+        "REMOVED": "EPG 對應已移除",
+        "SAVE_FAILED": "無法更新 EPG 對應"
+    },
     "LANGUAGES": {
         "ARABIC": "العربية",
         "MOROCCAN_ARABIC": "العربية (اللهجة المغربية)",
@@ -722,7 +762,8 @@
         "BELARUSIAN": "Беларуская",
         "POLISH": "Polski",
         "PORTUGUESE": "Português",
-        "GREEK": "Ελληνικά"
+        "GREEK": "Ελληνικά",
+        "HUNGARIAN": "Magyar"
     },
     "YES": "是",
     "NO": "否",
@@ -756,6 +797,8 @@
         "ACTORS": "演員",
         "DIRECTOR": "導演",
         "SIMILAR": "類似作品",
+        "CREW_JOB_DIRECTOR": "導演",
+        "CREW_JOB_CREATOR": "主創",
         "ACTOR_FILMOGRAPHY": "參演作品",
         "ACTOR_FILTER_ALL": "全部",
         "ACTOR_SCOPE_THIS_PORTAL": "目前入口",
@@ -764,6 +807,13 @@
         "ACTOR_IN_LIBRARY": "已在您的媒體庫中",
         "ACTOR_SEARCH_IN_PORTAL": "在入口網站搜尋",
         "ACTOR_BORN": "出生:",
+        "ACTOR_DIED": "逝世",
+        "SERIES_STATUS_RETURNING": "連載中",
+        "SERIES_STATUS_PLANNED": "籌備中",
+        "SERIES_STATUS_IN_PRODUCTION": "製作中",
+        "SERIES_STATUS_ENDED": "已完結",
+        "SERIES_STATUS_CANCELED": "已取消",
+        "SERIES_STATUS_PILOT": "試播",
         "DURATION": "片長",
         "CAST": "演員陣容",
         "EPISODE_RUN_TIME": "集數時長",
@@ -779,6 +829,7 @@
         "RESTART": "從頭開始",
         "CONTINUE_WATCHING": "繼續觀看",
         "PLAY_FIRST_EPISODE": "播放第一集",
+        "PLAY_EPISODE": "播放第 {{episode}} 集",
         "RESUME_EPISODE": "繼續播放本集",
         "PLAY_NEXT_EPISODE": "播放下一集",
         "SERIES_WATCHED": "劇集已看完",
@@ -923,6 +974,7 @@
         "STREAM_URL_COPIED": "串流網址已複製到剪貼簿",
         "COPY_STREAM_URL": "複製串流網址",
         "NOW_PLAYING": "現正播放",
+        "UP_NEXT": "即將播放",
         "CLOSE_PLAYER": "關閉播放器",
         "ABOUT": "簡介",
         "SEASONS_AND_EPISODES": "季數與集數",
@@ -940,6 +992,11 @@
         "CONTENT_NOT_AVAILABLE": "此伺服器上未提供此內容",
         "PLAYBACK_ERROR": "無法取得播放網址",
         "LOADING_SEASONS": "正在載入季數...",
+        "LOADING_ALL_CHANNELS": "正在載入完整頻道清單…",
+        "REFRESH_CHANNEL_LIST": "重新整理頻道清單",
+        "NO_CHANNELS_IN_CATEGORY": "此分類中沒有頻道",
+        "ITEM": "項",
+        "ITEMS": "項",
         "NO_EPISODES": "沒有可用的集數",
         "ALL_RADIO": "所有廣播"
     },
@@ -967,6 +1024,9 @@
         "SOURCE_PLAYLIST_MISSING": "此下載項目無法在媒體庫中開啟，因為其來源播放清單已被移除。",
         "FILE_NOT_FOUND": "此下載檔案在磁碟上已不存在。",
         "FILE_ACTION_ERROR": "無法完成檔案操作。",
+        "ACTION_FAILED": "操作失敗",
+        "PAUSE": "暫停",
+        "RESUME": "繼續",
         "CANCEL": "取消",
         "RETRY": "重試",
         "REMOVE": "移除",
@@ -980,7 +1040,8 @@
             "DOWNLOADING": "下載中",
             "COMPLETED": "已完成",
             "FAILED": "失敗",
-            "CANCELED": "已取消"
+            "CANCELED": "已取消",
+            "PAUSED": "已暫停"
         }
     },
     "REMOTE_CONTROL": {
diff --git a/apps/web/src/environments/build-commit.ts b/apps/web/src/environments/build-commit.ts
new file mode 100644
index 000000000..066dc233e
--- /dev/null
+++ b/apps/web/src/environments/build-commit.ts
@@ -0,0 +1,10 @@
+/**
+ * Git commit the app was built from. Populated by
+ * tools/build/inject-build-commit.mjs during CI builds; stays empty for
+ * local/dev builds, in which case Settings > About shows the plain version.
+ *
+ * Intentionally separate from AppConfig.version: appending the SHA to the
+ * semver itself would flip electron-updater into prerelease mode and leak
+ * into installer/artifact version fields.
+ */
+export const BUILD_COMMIT = '';
diff --git a/apps/web/src/styles.scss b/apps/web/src/styles.scss
index 60e038639..4e9fc76c3 100644
--- a/apps/web/src/styles.scss
+++ b/apps/web/src/styles.scss
@@ -108,6 +108,20 @@ body.frameless-platform #epg-navigation {
 }
 
 // ─── Base ─────────────────────────────────────────────────────────────────────
+// Native UI (scrollbars, form controls, popups) must follow the app theme,
+// not the OS preference. Chromium colors unstyled/native scrollbars from the
+// element's color-scheme, so declare it explicitly for both themes.
+html {
+    color-scheme: light;
+}
+
+// The root scroller (html) sits outside body.dark-theme, so flip it via
+// :has(); the color-scheme declaration in .dark-theme below keeps the body
+// subtree covered in engines without :has() support.
+html:has(> body.dark-theme) {
+    color-scheme: dark;
+}
+
 body,
 html {
     user-select: none;
@@ -155,6 +169,7 @@ textarea,
 // ─── Dark Theme ───────────────────────────────────────────────────────────────
 .dark-theme {
     background: var(--mat-sys-surface) !important;
+    color-scheme: dark;
 
     // Refined scrollbar for dark mode
     ::-webkit-scrollbar {
@@ -167,11 +182,15 @@ textarea,
     }
 
     ::-webkit-scrollbar-thumb {
-        background-color: var(--mat-sys-outline-variant);
+        background-color: color-mix(
+            in srgb,
+            var(--app-muted-color) 70%,
+            transparent
+        );
         border-radius: 999px;
 
         &:hover {
-            background-color: var(--mat-sys-outline);
+            background-color: var(--app-muted-color);
         }
     }
 }
diff --git a/apps/web/src/test-stubs/shaka-player.js b/apps/web/src/test-stubs/shaka-player.js
new file mode 100644
index 000000000..05d80083b
--- /dev/null
+++ b/apps/web/src/test-stubs/shaka-player.js
@@ -0,0 +1,95 @@
+/**
+ * CJS test stub for the lazily imported `shaka-player` module (the real
+ * compiled bundle is huge and ESM-hostile under jest). Mirrors the surface in
+ * libs/ui/playback/src/lib/shaka-engine/shaka-module.types.ts.
+ *
+ * Specs can inspect `shaka.__instances` / reset with `shaka.__reset()`.
+ */
+class MockShakaPlayer {
+    constructor() {
+        this.configureCalls = [];
+        this.loadedUrls = [];
+        this.attachedTo = null;
+        this.destroyCount = 0;
+        this.selectTextTrackCalls = [];
+        this.listeners = new Map();
+        shaka.__instances.push(this);
+    }
+
+    attach(mediaElement) {
+        this.attachedTo = mediaElement;
+        return Promise.resolve();
+    }
+
+    configure(config) {
+        this.configureCalls.push(config);
+        return true;
+    }
+
+    load(assetUri) {
+        this.loadedUrls.push(assetUri);
+        return Promise.resolve();
+    }
+
+    destroy() {
+        this.destroyCount += 1;
+        return Promise.resolve();
+    }
+
+    addEventListener(type, listener) {
+        const set = this.listeners.get(type) || new Set();
+        set.add(listener);
+        this.listeners.set(type, set);
+    }
+
+    removeEventListener(type, listener) {
+        const set = this.listeners.get(type);
+        if (set) {
+            set.delete(listener);
+        }
+    }
+
+    dispatch(type, detail) {
+        for (const listener of this.listeners.get(type) || []) {
+            listener({ type, detail });
+        }
+    }
+
+    getAudioTracks() {
+        return [];
+    }
+
+    selectAudioTrack() {
+        return undefined;
+    }
+
+    getTextTracks() {
+        return [];
+    }
+
+    selectTextTrack(track) {
+        this.selectTextTrackCalls.push(track);
+    }
+
+    isLive() {
+        return false;
+    }
+}
+
+MockShakaPlayer.isBrowserSupported = () => true;
+
+const shaka = {
+    Player: MockShakaPlayer,
+    polyfill: {
+        installAll() {
+            return undefined;
+        },
+    },
+    __instances: [],
+    __reset() {
+        shaka.__instances.length = 0;
+    },
+};
+
+module.exports = shaka;
+module.exports.default = shaka;
diff --git a/apps/web/src/test-stubs/video-js.js b/apps/web/src/test-stubs/video-js.js
new file mode 100644
index 000000000..3d2a1855b
--- /dev/null
+++ b/apps/web/src/test-stubs/video-js.js
@@ -0,0 +1,43 @@
+// The video.js CJS bundle fails to evaluate under the web project's ESM jest
+// preset, so specs that transitively import the vjs player get this stub. It
+// stays CommonJS because videojs plugin packages require() it at module load.
+class StubComponent {
+    createEl() {
+        return {};
+    }
+}
+
+class StubPlugin {}
+
+class StubEventTarget {
+    on() {
+        return undefined;
+    }
+    off() {
+        return undefined;
+    }
+    one() {
+        return undefined;
+    }
+    trigger() {
+        return undefined;
+    }
+}
+
+const videoJs = () => ({
+    dispose: () => undefined,
+    on: () => undefined,
+    off: () => undefined,
+    src: () => undefined,
+});
+
+videoJs.getComponent = () => StubComponent;
+videoJs.registerComponent = () => undefined;
+videoJs.getPlugin = () => StubPlugin;
+videoJs.registerPlugin = () => undefined;
+videoJs.EventTarget = StubEventTarget;
+videoJs.dom = { createEl: () => ({}) };
+videoJs.browser = {};
+
+module.exports = videoJs;
+module.exports.default = videoJs;
diff --git a/apps/xtream-mock-server/README.md b/apps/xtream-mock-server/README.md
index 7228c2644..d0d7096b1 100644
--- a/apps/xtream-mock-server/README.md
+++ b/apps/xtream-mock-server/README.md
@@ -153,8 +153,12 @@ application code.
 
 ## Release Demo Artwork
 
-The `marketing:marketing` fixture uses 30 original fictional titles for release
-screenshots. Poster and backdrop PNGs are served from:
+The `marketing:marketing` fixture uses 65 original fictional titles for release
+screenshots. Its core 30-title artwork pack includes matched posters and
+backdrops; 35 additional movie-poster showcase titles use approved local poster
+PNGs and the deterministic SVG fallback for missing backdrops. The newest 20
+showcase movies are ordered first so they appear immediately in screenshot
+catalog grids. Assets are served from:
 
 ```text
 apps/xtream-mock-server/public/marketing/{poster,backdrop}/
diff --git a/apps/xtream-mock-server/project.json b/apps/xtream-mock-server/project.json
index 7a8056516..f43ed7394 100644
--- a/apps/xtream-mock-server/project.json
+++ b/apps/xtream-mock-server/project.json
@@ -9,7 +9,7 @@
             "continuous": true,
             "executor": "nx:run-commands",
             "options": {
-                "command": "pnpm tsx apps/xtream-mock-server/src/main.ts",
+                "command": "pnpm tsx --tsconfig tsconfig.base.json apps/xtream-mock-server/src/main.ts",
                 "cwd": "{workspaceRoot}",
                 "color": true,
                 "env": {
@@ -22,7 +22,7 @@
             "continuous": true,
             "executor": "nx:run-commands",
             "options": {
-                "command": "pnpm tsx watch apps/xtream-mock-server/src/main.ts",
+                "command": "pnpm tsx watch --tsconfig tsconfig.base.json apps/xtream-mock-server/src/main.ts",
                 "cwd": "{workspaceRoot}",
                 "color": true,
                 "env": {
diff --git a/apps/xtream-mock-server/public/marketing/poster/a-thousand-steps.png b/apps/xtream-mock-server/public/marketing/poster/a-thousand-steps.png
new file mode 100644
index 000000000..044ad1129
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/a-thousand-steps.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/black-harbor.png b/apps/xtream-mock-server/public/marketing/poster/black-harbor.png
new file mode 100644
index 000000000..bedb2dd8d
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/black-harbor.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/blue-current.png b/apps/xtream-mock-server/public/marketing/poster/blue-current.png
new file mode 100644
index 000000000..75231b0ee
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/blue-current.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png b/apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png
new file mode 100644
index 000000000..58bd71293
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/brass-horizon.png b/apps/xtream-mock-server/public/marketing/poster/brass-horizon.png
new file mode 100644
index 000000000..6f6a0cfaf
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/brass-horizon.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png b/apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png
new file mode 100644
index 000000000..9ddb0b197
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/cloud-hotel.png b/apps/xtream-mock-server/public/marketing/poster/cloud-hotel.png
new file mode 100644
index 000000000..7fa783c31
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/cloud-hotel.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/copper-rain.png b/apps/xtream-mock-server/public/marketing/poster/copper-rain.png
new file mode 100644
index 000000000..e614ef8ff
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/copper-rain.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/deep-green.png b/apps/xtream-mock-server/public/marketing/poster/deep-green.png
new file mode 100644
index 000000000..9f622a77d
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/deep-green.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/field-notes.png b/apps/xtream-mock-server/public/marketing/poster/field-notes.png
new file mode 100644
index 000000000..b143d4717
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/field-notes.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/first-string.png b/apps/xtream-mock-server/public/marketing/poster/first-string.png
new file mode 100644
index 000000000..fdeb2ad7b
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/first-string.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/house-of-tides.png b/apps/xtream-mock-server/public/marketing/poster/house-of-tides.png
new file mode 100644
index 000000000..432b4649a
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/house-of-tides.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/last-detour.png b/apps/xtream-mock-server/public/marketing/poster/last-detour.png
new file mode 100644
index 000000000..8f0d07074
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/last-detour.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/low-tide-letters.png b/apps/xtream-mock-server/public/marketing/poster/low-tide-letters.png
new file mode 100644
index 000000000..427f553a5
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/low-tide-letters.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/moonlight-delivery.png b/apps/xtream-mock-server/public/marketing/poster/moonlight-delivery.png
new file mode 100644
index 000000000..bab5276ab
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/moonlight-delivery.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/november-radio.png b/apps/xtream-mock-server/public/marketing/poster/november-radio.png
new file mode 100644
index 000000000..c98363c85
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/november-radio.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/open-late.png b/apps/xtream-mock-server/public/marketing/poster/open-late.png
new file mode 100644
index 000000000..0d678ab31
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/open-late.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/orchard-walls.png b/apps/xtream-mock-server/public/marketing/poster/orchard-walls.png
new file mode 100644
index 000000000..2e66d6039
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/orchard-walls.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/parallel-kitchens.png b/apps/xtream-mock-server/public/marketing/poster/parallel-kitchens.png
new file mode 100644
index 000000000..c68358c25
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/parallel-kitchens.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/quiet-thunder.png b/apps/xtream-mock-server/public/marketing/poster/quiet-thunder.png
new file mode 100644
index 000000000..5df552668
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/quiet-thunder.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/red-winter.png b/apps/xtream-mock-server/public/marketing/poster/red-winter.png
new file mode 100644
index 000000000..9361d4674
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/red-winter.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/salt-cedar.png b/apps/xtream-mock-server/public/marketing/poster/salt-cedar.png
new file mode 100644
index 000000000..fa65734c1
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/salt-cedar.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/saturday-champions.png b/apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
new file mode 100644
index 000000000..4abdfe910
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/saturday-champions.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/signal-nine.png b/apps/xtream-mock-server/public/marketing/poster/signal-nine.png
new file mode 100644
index 000000000..6e3cb1d70
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/signal-nine.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/summer-static.png b/apps/xtream-mock-server/public/marketing/poster/summer-static.png
new file mode 100644
index 000000000..9be44c6b5
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/summer-static.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/the-last-orange.png b/apps/xtream-mock-server/public/marketing/poster/the-last-orange.png
new file mode 100644
index 000000000..0a705473d
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/the-last-orange.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/the-long-museum.png b/apps/xtream-mock-server/public/marketing/poster/the-long-museum.png
new file mode 100644
index 000000000..7e1508487
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/the-long-museum.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/the-paper-astronaut.png b/apps/xtream-mock-server/public/marketing/poster/the-paper-astronaut.png
new file mode 100644
index 000000000..e14dd5a69
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/the-paper-astronaut.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/the-silent-verdict.png b/apps/xtream-mock-server/public/marketing/poster/the-silent-verdict.png
new file mode 100644
index 000000000..c7de5df2a
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/the-silent-verdict.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/the-small-hours.png b/apps/xtream-mock-server/public/marketing/poster/the-small-hours.png
new file mode 100644
index 000000000..b7bae1566
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/the-small-hours.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/under-the-floor.png b/apps/xtream-mock-server/public/marketing/poster/under-the-floor.png
new file mode 100644
index 000000000..db3933a5f
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/under-the-floor.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/unpaid-overtime.png b/apps/xtream-mock-server/public/marketing/poster/unpaid-overtime.png
new file mode 100644
index 000000000..9282f0aa4
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/unpaid-overtime.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/vesper-crown.png b/apps/xtream-mock-server/public/marketing/poster/vesper-crown.png
new file mode 100644
index 000000000..f5912078c
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/vesper-crown.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/white-room-six.png b/apps/xtream-mock-server/public/marketing/poster/white-room-six.png
new file mode 100644
index 000000000..a602c6624
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/white-room-six.png differ
diff --git a/apps/xtream-mock-server/public/marketing/poster/willow-engine.png b/apps/xtream-mock-server/public/marketing/poster/willow-engine.png
new file mode 100644
index 000000000..69d83c30a
Binary files /dev/null and b/apps/xtream-mock-server/public/marketing/poster/willow-engine.png differ
diff --git a/apps/xtream-mock-server/src/app/generators/marketing.generator.ts b/apps/xtream-mock-server/src/app/generators/marketing.generator.ts
index 000cb3fd6..855983dc1 100644
--- a/apps/xtream-mock-server/src/app/generators/marketing.generator.ts
+++ b/apps/xtream-mock-server/src/app/generators/marketing.generator.ts
@@ -1,3 +1,8 @@
+import {
+    MarketingMovieCategoryKey,
+    MarketingMovieFixture,
+    POSTER_SHOWCASE_MOVIES as SHARED_POSTER_SHOWCASE_MOVIES,
+} from '@iptvnator/shared/marketing-fixtures';
 import { RawCategory } from './categories.generator.js';
 import {
     buildEpgListing,
@@ -83,6 +88,27 @@ const VOD_CATEGORIES: RawCategory[] = [
     { category_id: '5204', category_name: 'Documentary & Drama', parent_id: 0 },
 ];
 
+const XTREAM_VOD_CATEGORY_IDS: Record<MarketingMovieCategoryKey, string> = {
+    'action-mystery': '5201',
+    'future-fantasy': '5202',
+    'family-comedy': '5203',
+    'drama-documentary': '5204',
+};
+
+function toMarketingMovie(movie: MarketingMovieFixture): MarketingMovie {
+    return {
+        actors: movie.actors,
+        categoryId: XTREAM_VOD_CATEGORY_IDS[movie.categoryKey],
+        description: movie.description,
+        director: movie.director,
+        genre: movie.genre,
+        name: movie.name,
+        rating: movie.rating,
+        tagline: movie.tagline,
+        year: movie.year,
+    };
+}
+
 const SERIES_CATEGORIES: RawCategory[] = [
     { category_id: '5301', category_name: 'Urban Drama', parent_id: 0 },
     { category_id: '5302', category_name: 'Speculative Series', parent_id: 0 },
@@ -133,7 +159,7 @@ const LIVE_CHANNELS: MarketingLiveChannel[] = [
     },
 ];
 
-const MOVIES: MarketingMovie[] = [
+const GENERATED_ARTWORK_MOVIES: MarketingMovie[] = [
     {
         categoryId: '5201',
         name: 'Crimson Skylark',
@@ -352,6 +378,14 @@ const MOVIES: MarketingMovie[] = [
     },
 ];
 
+const POSTER_SHOWCASE_MOVIES: MarketingMovie[] =
+    SHARED_POSTER_SHOWCASE_MOVIES.map(toMarketingMovie);
+
+const MOVIES: MarketingMovie[] = [
+    ...POSTER_SHOWCASE_MOVIES,
+    ...GENERATED_ARTWORK_MOVIES,
+];
+
 const SERIES: MarketingSeries[] = [
     {
         categoryId: '5301',
@@ -531,7 +565,7 @@ export function buildMarketingPortalFixture(): MarketingPortalFixture {
 
 export function listMarketingArtworkFixtures(): MarketingArtworkFixture[] {
     return [
-        ...MOVIES.map((movie) => ({
+        ...GENERATED_ARTWORK_MOVIES.map((movie) => ({
             contentType: 'movie' as const,
             description: movie.description,
             genre: movie.genre,
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c00b232d9..86da3f98d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # The Nx builds below emit platform-independent JS/static assets. During
 # multi-arch publish builds, keep that heavy build stage on the native builder
 # platform instead of running Node/Nx through QEMU for linux/arm64.
-FROM --platform=$BUILDPLATFORM node:22-alpine AS build
+FROM --platform=$BUILDPLATFORM node:24-alpine AS build
 
 RUN apk add --no-cache python3 make g++ git
 
@@ -11,14 +11,24 @@ COPY .npmrc ./
 COPY package.json pnpm-lock.yaml ./
 COPY patches ./patches
 
-RUN corepack enable && pnpm install --frozen-lockfile --ignore-scripts
+# Node 25 unbundled Corepack, so `corepack enable` cannot be the way pnpm gets
+# installed here — it would break on the next base-image major. Install the
+# exact pnpm from `packageManager` instead, which stays reproducible.
+RUN PNPM_VERSION="$(node -p 'require("./package.json").packageManager.split("@")[1].split("+")[0]')" \
+    && npm install --global "pnpm@${PNPM_VERSION}" \
+    && pnpm install --frozen-lockfile --ignore-scripts
 
 COPY . .
 
+# CI passes the git commit so Settings > About shows "<version> (<sha>)";
+# the inject script is a no-op when BUILD_COMMIT is empty (local builds).
+ARG BUILD_COMMIT=""
+RUN node tools/build/inject-build-commit.mjs
+
 RUN pnpm nx build web --configuration=pwa
 RUN pnpm nx build web-backend
 
-FROM node:22-alpine
+FROM node:24-alpine
 
 RUN apk add --no-cache gettext nginx
 
diff --git a/docs/architecture/category-management.md b/docs/architecture/category-management.md
index c9aaeaddb..77e360629 100644
--- a/docs/architecture/category-management.md
+++ b/docs/architecture/category-management.md
@@ -75,9 +75,9 @@ ALTER TABLE categories ADD COLUMN hidden INTEGER DEFAULT 0
 
 ### Store
 
-**File**: `libs/portal/xtream/data-access/src/lib/stores/xtream.store.ts`
+**File**: `libs/portal/xtream/data-access/src/lib/stores/features/with-content.feature.ts`
 
-Added `reloadCategories()` method to refresh categories from database after visibility changes, ensuring the sidebar updates immediately.
+`reloadCategories()` (exposed on the `XtreamStore` facade via feature composition) refreshes categories from the database after visibility changes, ensuring the sidebar updates immediately.
 
 ## Behavior Notes
 
@@ -133,24 +133,28 @@ apps/electron-backend/src/app/
 libs/services/src/lib/
 └── database-electron.service.ts  # Service methods (with hidden category support)
 
-libs/ui/components/src/lib/recent-playlists/
-└── recent-playlists.component.ts  # Stores hidden categories to localStorage on refresh
+libs/playlist/shared/ui/src/lib/
+├── recent-playlists/
+│   └── recent-playlists.component.ts  # Persists hidden categories (restore state) via XtreamPendingRestoreService on refresh
+└── playlist-refresh-action.service.ts # Same restore-state persistence for the header refresh action
+
+libs/services/src/lib/
+└── xtream-pending-restore.service.ts  # localStorage keyed `xtream-restore-{playlistId}`
+
+libs/workspace/shell/feature/src/lib/
+└── workspace-context-panel/
+    └── workspace-context-panel.component.ts # Tune button; lazy-loads the dialog, calls reloadCategories()
 
 libs/portal/xtream/feature/src/lib/
-├── category-management-dialog/        # Dialog component
-│   ├── category-management-dialog.component.ts
-│   ├── category-management-dialog.component.html
-│   └── category-management-dialog.component.scss
-├── xtream-main-container.component.ts # Added button & dialog
-├── xtream-main-container.component.html
-├── live-stream-layout/
-│   ├── live-stream-layout.component.ts # Added button & dialog
-│   └── live-stream-layout.component.html
+└── category-management-dialog/        # Dialog component
+    ├── category-management-dialog.component.ts
+    ├── category-management-dialog.component.html
+    └── category-management-dialog.component.scss
 
 libs/portal/xtream/data-access/src/lib/
 ├── data-sources/
 │   └── electron-xtream-data-source.ts # Reads/passes hidden categories on save
-└── stores/xtream.store.ts             # Added reloadCategories method
+└── stores/features/with-content.feature.ts # reloadCategories() (exposed on XtreamStore)
 
 apps/web/src/assets/i18n/
 └── en.json                      # Added translation keys
diff --git a/docs/architecture/dependency-security-overrides.md b/docs/architecture/dependency-security-overrides.md
new file mode 100644
index 000000000..be525ed63
--- /dev/null
+++ b/docs/architecture/dependency-security-overrides.md
@@ -0,0 +1,74 @@
+# Dependency Security Overrides
+
+How transitive CVEs are patched in this repo, and the constraint that makes
+"just bump to latest" the wrong move.
+
+## Why overrides exist
+
+Dependabot can only bump packages we declare ourselves. When the vulnerable
+package is transitive — pulled in by `video.js`, `electron-updater`,
+`electron-conf`, `axios` — the bot has no lever: it would have to wait for the
+parent to publish a release that widens its own pin. Until then the alert stays
+open regardless of how many bot PRs land.
+
+`pnpm.overrides` in the root `package.json` is that lever. Every entry uses the
+pinned-source form so an override only rewrites the exact resolution it was
+written for, and goes stale visibly instead of silently re-targeting a future
+version:
+
+```json
+"@xmldom/xmldom@0.8.11": "0.8.13"
+```
+
+## The semver ceiling
+
+**An override must stay inside the range its parent declares.** pnpm applies
+overrides without re-checking the parent's range, so an out-of-range target
+installs cleanly and then fails at runtime or under load, not at install time.
+
+For three of the five current security overrides, the newest published version
+is _outside_ the parent's range. Taking "latest" would break them:
+
+| Override         | Pinned to | Parent range                            | Latest on npm |
+| ---------------- | --------- | --------------------------------------- | ------------- |
+| `@xmldom/xmldom` | 0.8.13    | `mpd-parser` `^0.8.3`, `plist` `^0.8.8` | 0.9.x ❌      |
+| `fast-uri`       | 3.1.4     | `ajv` `^3.0.1`                          | 4.x ❌        |
+| `js-yaml`        | 4.3.0     | `electron-updater` `^4.1.0`             | 5.x ❌        |
+| `form-data`      | 4.0.6     | `axios` `^4.0.5`                        | 4.0.6 ✅      |
+| `ajv`            | 8.18.0    | `electron-conf` `^8.13.0`               | 8.20.0 ✅     |
+
+Before changing any of these, check the parent's declared range first:
+
+```bash
+npm view <parent>@<version> dependencies --json
+```
+
+## Verifying an override actually applied
+
+Grepping `pnpm-lock.yaml` for the old version still finds it, but that hit is
+not a leftover package block — pnpm removes those once nothing resolves to them.
+It is the override's own selector key, echoed in the `overrides:` block at the
+top of the lockfile:
+
+```yaml
+overrides:
+    '@xmldom/xmldom@0.8.11': 0.8.13
+```
+
+So a bare grep proves only that the override is declared, never that it took
+effect. Resolve the real path on disk instead:
+
+```bash
+node -e "console.log(require('./node_modules/.pnpm/mpd-parser@1.3.1/node_modules/@xmldom/xmldom/package.json').version)"
+```
+
+## What is deliberately not overridden
+
+`undici` carries open alerts flagged `runtime` scope, but every path to it is
+build tooling — `electron` → `@electron/get`, `@angular/build`, and
+`@module-federation/dts-plugin`. It is not in the packaged app. The `runtime`
+label is a Dependabot classification artifact, not a shipped-code claim. Bumping
+it inside the Angular/Nx toolchain risks the build for no runtime benefit.
+
+When triaging, confirm scope from the dependency graph rather than trusting the
+alert's `scope` field.
diff --git a/docs/architecture/download-manager.md b/docs/architecture/download-manager.md
index 1db7fca8c..3217951e6 100644
--- a/docs/architecture/download-manager.md
+++ b/docs/architecture/download-manager.md
@@ -1,33 +1,39 @@
 # Download Manager Architecture
 
-The download manager is a desktop-only feature that layers a curated queue, progress tracking, storage configuration, and playback controls on top of the existing Xtream (xtream-electron folder) + Stalker viewers. Backend work is handled in the Electron process while the Angular renderer surface exposes a dedicated `/downloads` route, contextual buttons, and theme-aware styling.
+The download manager is a desktop-only feature that layers a curated queue, progress tracking, storage configuration, and playback controls on top of the existing Xtream (`libs/portal/xtream`) + Stalker (`libs/portal/stalker`) portal views. Backend work is handled in the Electron process while the Angular renderer surface exposes a dedicated `/downloads` route, contextual buttons, and theme-aware styling.
 
 ## Backend responsibilities
 
 - **Queue control (`apps/electron-backend/src/app/events/database/download-runtime.ts`)**
-  `DownloadTask` mirrors the shared `DownloadItem` table plus transient cancel/progress helpers. Request validation and row creation live in `download-requests.ts`, while `downloads.events.ts` stays focused on IPC registration. `enqueueDownload()` pushes the task onto `downloadQueue` and triggers `processQueue()`. `processQueue()` keeps one active download, updates the row to `downloading`, and calls `startDownload()`.
-- **electron-dl integration**
-  `startDownload()` calls `electron-dl`'s `download()` helper. Headers (user agent, referer, origin) are attached, and the `onStarted`, `onProgress`, `onCompleted`, and `onCancel` callbacks translate the helper's payload into Drizzle updates. A cancellation requested before `onStarted` is remembered and applied as soon as Electron supplies the `DownloadItem`, so the request cannot be lost in the startup race.
+  `DownloadTask` mirrors a row of the shared `downloads` table (type `Download` in `libs/shared/database/src/lib/schema.ts`) plus transient cancel/pause/progress helpers (shared task types live in `download-task.ts`). Request validation and row creation live in `download-requests.ts`, while `downloads.events.ts` stays focused on IPC registration. `enqueueDownload()` pushes the task onto `downloadQueue` and triggers `processQueue()`. `processQueue()` keeps one active download, updates the row to `downloading`, and calls `startDownload()`. The byte transfer itself lives in `download-transfer.ts`, finalization and retained-partial persistence in `download-finalize.ts`, and the renderer update broadcast in `download-broadcast.ts`.
+- **Range-aware transfer (`download-transfer.ts`)**
+  The transfer streams the response through the backend's validated Axios redirect helper instead of `electron-dl`. Headers (user agent, referer, origin) are persisted in `request_headers` and re-applied through the same allowlist when read back on retry/resume. Active pause/cancel operations abort the current request with `AbortController`; pause keeps the partial file and cancel removes it. Resume checks the existing `.part` size (rejecting anything that is not a regular file, so a symlink planted while paused is never followed) and sends `Range: bytes=<offset>-` plus `If-Range` with the stored entity validator. The first response's strong `ETag` (or `Last-Modified`) is persisted in `resume_validator` for exactly this purpose. A `206 Partial Content` answer must start at the requested offset (`Content-Range` is verified) before bytes are appended; any other 2xx answer — the server ignoring `Range`, or `If-Range` detecting that the remote file changed — restarts the transfer from byte zero over the same `.part` instead of failing the download.
 - **Destination collision policy**
-  Existing destination files are never overwritten. Before starting Electron's
-  download, the backend atomically reserves a free numbered filename with an
-  exclusive filesystem create. Electron may overwrite that empty reservation,
-  but cannot overwrite a file that existed before the reservation. The selected
-  `filePath` and `fileName` are persisted before transfer begins. Errors,
-  cancellations, and startup recovery remove that exact partial path and clear
-  it from the row; completed downloads replace it with Electron's final values.
+  Existing destination files are never overwritten, inspected, or deleted.
+  Before starting a new transfer, the backend atomically reserves a free
+  numbered `.part` path while leaving the final destination path absent. The
+  selected final `filePath` and `fileName` are persisted before transfer
+  begins. When a retained download's recorded destination got occupied while
+  it was paused or failed (for example by a file the user created), the
+  retained `.part` is renamed aside and finalized to the next free numbered
+  destination (`Movie (1).mp4`) instead of resolving the collision by size or
+  `unlink()`. Completion creates the final `filePath` from the `.part` without
+  overwriting an existing file; cancel and ordinary transfer failures remove
+  the `.part`, while finalization failures and completed-partial failures
+  deliberately retain it (the row keeps `filePath` so a later retry can finish
+  without re-downloading); pause and restart recovery keep it for a later
+  resume. Re-downloading such a failed row from a detail page
+  (`DOWNLOADS_START`) deletes the retained `.part` before the row is reset.
 - **IPC surface**  
-  The backend exposes `DOWNLOADS_*` handlers for list retrieval, start/cancel/retry/remove operations, folder selection/reveal, and the `DOWNLOADS_UPDATE_EVENT` emitter that the renderer listens to in order to refresh its signal store.
+  The backend exposes `DOWNLOADS_*` handlers for list retrieval, start/pause/resume/cancel/retry/remove operations, folder selection/reveal, and the `DOWNLOADS_UPDATE_EVENT` emitter that the renderer listens to in order to refresh its signal store.
 
 ## Renderer architecture
 
 - **Downloads service** (`libs/services/src/lib/downloads.service.ts`)
-  Signals back the current download list while `hasDownloads` and `isAvailable` gates UI rendering. Before each download the service asks the main process for the authorized folder and calls `downloadsStart`. The backend extracts the file extension from the URL or falls back to `mp4`. `onDownloadsUpdate` updates the signal, while helper methods `retryDownload`, `removeDownload`, `cancelDownload`, and `playDownload` talk to the corresponding IPC commands so retries reuse existing rows and completed items can open the recorded path.
+  Signals back the current download list while `hasDownloads` and `isAvailable` gates UI rendering. Before each download/resume the service asks the main process for the authorized folder and calls the download IPC command. The backend extracts the file extension from the URL or falls back to `mp4`. `onDownloadsUpdate` updates the signal, while helper methods `pauseDownload`, `resumeDownload`, `retryDownload`, `removeDownload`, `cancelDownload`, and `playDownload` talk to the corresponding IPC commands so retries reuse existing rows and completed items can open the recorded path.
 - **Downloads view** (`libs/portal/downloads/feature`)  
-  A standalone page exposes the queue, desktop-only messaging, folder picker, and action buttons. `downloads.component.html` now wraps the list inside a scrollable panel (`downloads__list-wrapper`) so long queues stay reachable, and `downloads.component.scss` drives a bold two-tone aesthetic inspired by the frontend-design mandate—gradient cards, floating avatars, and theme-aware variables triggered via `body.dark-theme`.
-  Failed/canceled cards now show retry/delete controls, queued/downloading cards show a cancel icon, and completed cards render inline play/open buttons with `mat-icon` cues. The header also shows the resolved download folder and a `CHANGE FOLDER` action.
-- **Theme fixes**  
-  To keep typography legible in both modes, `app-search-result-item` now inherits color from `:host-context(body.dark-theme)` and `:host-context(body:not(.dark-theme))`, ensuring dense light-theme grids no longer show white text on white backgrounds.
+  A standalone page exposes the queue, desktop-only messaging, folder picker, and action buttons. `downloads.component.html` wraps the list inside a scrollable panel (`downloads__list-wrapper`) so long queues stay reachable, and `downloads.component.scss` drives gradient cards with theme-aware styling through Angular Material system CSS variables (`var(--mat-sys-*)`, `var(--app-*)`, `color-mix`) — theming tracks the active Material theme rather than a `body.dark-theme` hook.
+  Failed/canceled cards show retry/delete controls, queued/downloading cards show pause/cancel controls, paused cards show resume/cancel/delete controls, and completed cards render inline play/open buttons with `mat-icon` cues. Pause/resume/cancel/retry surface backend `success: false` results in a snackbar instead of failing silently. The header also shows the resolved download folder and a `CHANGE FOLDER` action. VOD and episode detail views render a paused download as an active "Resume" button (`DownloadsService.isPaused()` / `resumeDownloadByContent()`) rather than a disabled "Downloading" state.
 
 ## Global API surface
 
@@ -37,12 +43,19 @@ The download manager is a desktop-only feature that layers a curated queue, prog
 ## Routing and navigation
 
 - `/downloads` is available under both portal flavors: the Xtream routes already load `DownloadsComponent`, and the Stalker routes now import the same component so the sidebar link can target `/stalker/:id/downloads` without returning to the startup screen.
-- The navigation component already points `routerLink="./downloads"` inside the shared nav pane, so both portals reuse the same download page.
+- Downloads navigation is data-driven: `libs/portal/shared/util/src/lib/navigation/portal-rail-links.ts` emits a `downloads` section link (`path: [...root, 'downloads']`) for both portals, so they reuse the same download page.
 
 ## Queuing, persistence, and UX notes
 
-- Every download row writes to the shared `downloads` table with statuses (`queued`, `downloading`, `completed`, `failed`, `canceled`) plus metadata such as `bytesDownloaded`, `totalBytes`, `errorMessage`, and Xtream identifiers. On startup, `download-recovery.ts` deletes persisted partial reservations before stale queued/downloading rows become `failed`.
-- Queue cancellation removes a queued task or records an active cancellation request and calls `downloadItem.cancel()` when the item is available; retries reuse the same database entry, preventing duplicate rows.
+- Every download row writes to the shared `downloads` table with statuses (`queued`, `downloading`, `paused`, `completed`, `failed`, `canceled`) plus metadata such as `bytesDownloaded`, `totalBytes`, `errorMessage`, `requestHeaders`, `resumeValidator`, and Xtream identifiers. Existing SQLite tables are rebuilt on startup when their status CHECK still lacks `paused`; the `resume_validator` column is added through the idempotent column migrations.
+- On startup, `download-recovery.ts` converts stale `downloading` rows with a non-empty `.part` file to `paused`, converts stale `queued` rows to `paused` while keeping any retained `.part` (a resumed download waiting behind an active one persists as `queued` with its partial), and marks stale `downloading` rows without recoverable partial bytes as `failed`.
+- Queue cancellation removes a queued task or records an active cancellation request and aborts the request when available. Pausing follows the same abort path but persists `paused` and keeps the `.part`. Retries reuse the same database entry: a failed row with a retained `filePath` resumes its `.part` through HTTP Range, otherwise the retry starts from zero. Resume appends to the existing `.part` through HTTP Range with `If-Range` validation.
+- A `.part` that cannot be deleted (locked, permission denied) never loses its database path: cancel persists `canceled` while retaining `filePath` for later cleanup, and `DOWNLOADS_REMOVE` keeps the row and answers `success: false` (surfaced as a snackbar) so retrying the remove re-attempts the deletion once the lock is released.
+- Resume claims the row atomically (`paused` → `queued` as a conditional update) and the runtime queue rejects duplicate ids, so two rapid Resume clicks racing the status refresh can never produce two transfers for the same download.
+- A response that ends cleanly before the advertised representation size (for example a proxy that caps each response) is never committed as completed: the transfer fails with `Transfer ended before the advertised size` while retaining the `.part` and `filePath`, so a retry continues via Range from where it stopped.
+- Retained `filePath`s recorded in the database stay usable after the user switches download folders — resume/retry of a retained row does not re-require the folder to be the current selection. Fresh downloads still authorize against the currently selected folder.
+- Startup recovery recognizes a finalization that crashed between creating the final file and committing the row (`downloading` row, no partial, final file present with the recorded size) and marks it `completed` instead of failing it and orphaning the file.
+- Pause/resume is covered end to end by `apps/electron-backend-e2e/src/downloads.e2e.ts`: a throttled Range-capable mock server verifies the paused `.part` on disk, the `Range`/`If-Range` resume request, and byte-exact assembly of the final file.
 - The OS downloads path is always authorized. A custom folder becomes
   authorized only after native folder selection, and the main process persists
   that selection under Electron `userData`. Renderer settings may display the
diff --git a/docs/architecture/electron-security.md b/docs/architecture/electron-security.md
index 47332c781..d5c2f16db 100644
--- a/docs/architecture/electron-security.md
+++ b/docs/architecture/electron-security.md
@@ -9,7 +9,9 @@ explicit hardened `webPreferences` object:
 
 - `contextIsolation: true`
 - `nodeIntegration: false`
-- `sandbox: true`
+- `sandbox: !frameCopyExperiment` — `true` by default; the opt-in Embedded MPV
+  frame-copy experiment is the one path that disables the renderer sandbox
+  (`contextIsolation`/`nodeIntegration` stay hardened regardless)
 - `webSecurity: true`
 - `preload: apps/electron-backend/src/app/api/main.preload.ts`
 
@@ -98,11 +100,13 @@ produce both `dmg` and `zip` targets, and publish a single merged
 
 The Angular shell defines a baseline CSP in `apps/web/src/index.html`.
 
-The policy keeps the application self-hosted for scripts, blocks object and
-frame embedding, limits forms to the app origin, and allows IPTV playback
-sources through `media-src` and `connect-src` for `http:`, `https:`, `blob:`,
-and `data:`. The policy keeps `script-src` self-hosted and currently keeps
-`unsafe-inline` for existing inline styles.
+The policy keeps the application self-hosted for scripts, blocks object
+embedding (`object-src 'none'`) while allowing frames only from
+`https://www.youtube-nocookie.com` (`frame-src`, used for TMDB trailers),
+limits forms to the app origin, and allows IPTV playback sources through
+`media-src` and `connect-src` for `http:`, `https:`, `blob:`, and `data:`. The
+policy keeps `script-src` self-hosted and currently keeps `unsafe-inline` for
+existing inline styles.
 
 Angular production builds must not rely on inline event handlers for stylesheet
 activation. Keep `web:build:production` and `web:build:pwa` configured without
@@ -188,6 +192,26 @@ playlist or EPG source host. The `IPTVNATOR_ALLOW_INSECURE_TLS=1` escape hatch
 is only for explicitly trusted providers with invalid or self-signed
 certificates when the host-scoped UI path is not available.
 
+## Sensitive Diagnostic Logging
+
+Settings, portal requests/responses, IPC trace payloads, and remote-request
+errors can contain provider credentials. Code at those boundaries must pass
+structured values through `redactSensitiveData` from
+`@iptvnator/shared/logging`, or through the portal `createLogger`/portal-debug
+helpers that apply it. Do not send a raw settings object, request params,
+response, or `Error` directly to `console.*`.
+
+The redactor preserves non-sensitive diagnostic fields while replacing
+credential fields case-insensitively, including usernames, passwords, tokens,
+API keys, authorization/cookie headers, and MAC addresses. It also sanitizes
+URL query parameters, serialized JSON, nested query values, errors, arrays,
+and cyclic objects without mutating the original value. Depth, collection,
+object-key, and string limits keep opt-in debug traces bounded.
+
+When adding a new logging boundary, extend the closest regression test with a
+synthetic secret and assert that the exact value is absent from captured log
+output. Never use a real provider credential to validate logging.
+
 ## Filesystem Capabilities
 
 Renderer IPC payloads are not filesystem authorization.
diff --git a/docs/architecture/embedded-inline-playback.md b/docs/architecture/embedded-inline-playback.md
index 69f7c642d..3acd31898 100644
--- a/docs/architecture/embedded-inline-playback.md
+++ b/docs/architecture/embedded-inline-playback.md
@@ -121,6 +121,78 @@ Contracts:
 - Entering watch scrolls the shell to the top; leaving keeps the scroll
   position.
 
+### Inline player stage (theater + ambient fill)
+
+`PortalInlinePlayerComponent`
+(`libs/ui/playback/src/lib/portal-inline-player/`) wraps the projected
+`WebPlayerViewComponent` in a `.player-shell__viewport` "theater stage".
+The stage spans the full content width and is capped at
+`min(70vh, 720px)`; on wide-short windows it becomes wider than 16:9. The
+player is sized as the largest 16:9 box that fits the stage height and is
+centered, so the leftover is always the stage's own black background — never
+a stray strip of app surface. This is the YouTube-style letterbox and is the
+default behavior for every inline engine.
+
+The optional `playerAmbientMode` setting (Settings → Playback, default off,
+shown only for the built-in web players) renders a blurred, dimmed copy of the
+poster (`ResolvedPortalPlayback.thumbnail`) behind the player via the
+`--ambient-image` custom property, turning the letterbox margins into
+atmosphere (YouTube "Ambient mode" / Netflix backdrops). The component also
+enforces the web-player scope at runtime (HTML5, Video.js, ArtPlayer): with
+Embedded MPV selected, a persisted `playerAmbientMode=true` never renders the
+layer, keeping extra DOM out of the native-video compositing path. Live
+channels are excluded (their `thumbnail` is a logo), and only
+`http(s):`/`data:` poster URLs are accepted to avoid CSS `url()` breakout.
+
+### Up Next side rail (series)
+
+For inline **series** playback the stage can trade its centered letterbox for
+a Netflix/Plex-style layout: the player docks left and the leftover column
+becomes an "Up Next" episode rail (`app-up-next-rail`,
+`libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.ts`).
+The rail lists the currently playing episode (highlighted, click-inert)
+followed by the rest of its season and a spillover into the following
+seasons, with per-episode watch-progress bars from playback positions.
+
+- Data flow: the hosts (Xtream `SerialDetailsComponent`, Stalker
+  `StalkerSeriesViewComponent`) build the entries with
+  `buildUpNextRailItems()` (`up-next-rail.util.ts`) from their
+  season→episodes map, the inline episode state, and the playback-position
+  map, and pass them into `PortalInlinePlayerComponent` via the
+  `upNextEpisodes` input. Selection comes back through
+  `upNextEpisodeSelected`, carrying the host's raw episode object, and is
+  routed into the host's existing episode-play flow — the same path the
+  season container uses.
+- Width gating: a ResizeObserver on `.player-shell__viewport` feeds the
+  component's `stageSize` with the stage's **border-box** size, and the gate
+  computes the width the rail would actually receive — stage minus the docked
+  layout's padding, minus the 16:9 player sized to the remaining height, minus
+  the flex gap (`RAIL_STAGE_PADDING` / `RAIL_STAGE_GAP`, kept in sync with the
+  stylesheet). The rail docks in only when that is ≥ 320px
+  (`UP_NEXT_RAIL_MIN_WIDTH`). Measuring the border box matters: the docked
+  modifier adds padding to the same element being observed, so a content-box
+  measurement would change the input the moment the rail appears and could
+  oscillate around the threshold. On near-16:9 or taller windows the rail
+  auto-hides and the centered theater/ambient behavior above remains.
+- Lazy Stalker seasons: Ministra VOD-series seasons carry no episodes until
+  their tab is opened, so `StalkerSeriesViewComponent` prefetches the season
+  after the playing one while inline playback is active — otherwise the rail's
+  next-season spillover would silently stop at the current season's end. The
+  prefetch is claimed synchronously and answered seasons (including genuinely
+  empty ones) are never re-requested: a failed request leaves `episodes` empty
+  with `isLoading` back to false, which would otherwise re-run the effect that
+  issued it and loop. A *failed* request releases the claim but is pinned to
+  the episode that triggered it, so a transient portal error retries on the
+  next playback change instead of either looping or giving up permanently.
+- Gating mirrors ambient mode: the `playerUpNextRail` setting (Settings →
+  Playback, **default on**, shown only for the built-in web players) plus a
+  runtime web-engine check; the rail also requires
+  `contentInfo.contentType === 'episode'` and non-live playback, so movies
+  and live channels always keep the centered stage.
+- Layering: the rail is an opaque panel rendered on top of the stage, so the
+  ambient fill stays behind it and shows in the flexible gap between the
+  docked player and the rail on very wide stages.
+
 Season navigation inside `SeasonContainerComponent` uses season tabs
 (`SeasonTabsComponent`; a dropdown beyond 6 seasons) instead of the old
 seasons-grid + "Back to seasons" level. A season is auto-selected
@@ -176,6 +248,13 @@ When a detail view starts playback:
 The detail or collection/search host owns inline state. `PlayerService` is not
 an owner of embedded UI playback state.
 
+After a successful external episode launch, the detail host immediately
+persists that episode as the latest playback-position entry, preserving an
+existing resume offset or using zero for a newly opened episode. MPV/VLC
+position telemetry overwrites this launch marker when available. This keeps the
+last-watched season and episode correct even when an external player's progress
+interface is unavailable; exact external timestamps remain best-effort.
+
 ## Series Quick Start CTA
 
 Xtream and Stalker series detail views share the quick-start decision helper in
@@ -189,6 +268,9 @@ Current contract:
   `S01E02 · Episode title`
 - if an episode is in progress, resume the latest updated in-progress episode
   with its saved offset
+- if the newest episode entry is a successful external-player launch marker
+  with no meaningful progress yet, target it with `Play episode N` instead of
+  falling back to the first episode
 - if no episode is in progress, play the first unwatched episode in season order
 - if watched episodes end at a season boundary, play the first episode of the
   next loaded season
@@ -254,6 +336,13 @@ The diagnostic surface covers the inline player viewport when playback fails, wi
 
 URL extension metadata is filtered before diagnostics and player selection use it. Web script extensions such as `.php` are not shown as stream containers; explicit media query metadata such as `extension=ts` or `format=m3u8` is preferred when present.
 
+MKV sources are attempted through Chromium's native Matroska path. Video.js
+receives `video/matroska` for `.mkv` URLs and explicit query metadata such as
+`extension=mkv` or `container=mkv`; ArtPlayer and HTML5 continue to use their
+native video paths. This is container support rather than a universal codec
+guarantee: native source or decode failures still produce the existing
+diagnostic and explicit MPV/VLC fallback.
+
 Portal VOD and episode payloads with `contentInfo` are treated as non-live by the inline players unless `isLive` is explicitly set. If Chromium leaves the underlying MediaSource duration at `Infinity` for a finite TS VOD, the Video.js wrapper normalizes its UI duration from the finite `seekable` or `buffered` range. Embedded MPV uses the same live decision rule and shows an unknown duration placeholder for VOD/episode snapshots until MPV reports a finite duration. This removes the misleading `LIVE` control state without changing stream decoding, diagnostics, or external fallback behavior.
 
 When a diagnostic is actionable in Electron, the diagnostic surface may offer `Open in MPV`, `Open in VLC`, `Copy URL`, technical details, and `Retry`. Web builds only expose copy/help text and retry. MPV/VLC fallback requests carry the original `ResolvedPortalPlayback` payload so headers, referer, origin, user-agent, content metadata, and resume offset stay intact. Retry clears the current diagnostic and rebuilds the active inline player inputs; it does not change the saved player setting.
diff --git a/docs/architecture/embedded-mpv-native.md b/docs/architecture/embedded-mpv-native.md
index 16725080f..c143db405 100644
--- a/docs/architecture/embedded-mpv-native.md
+++ b/docs/architecture/embedded-mpv-native.md
@@ -18,6 +18,15 @@ Source files for the embedded MPV integration:
 - `libs/shared/interfaces/src/lib/embedded-mpv-session.interface.ts` defines the shared session and audio-track contract.
 - `libs/ui/playback/src/lib/embedded-mpv-player/` owns the Angular UI and controls.
 
+Frame-copy engine sources (experimental, macOS Apple Silicon, Linux x64, and
+Windows — see the "Frame-Copy Engine" section below):
+
+- `apps/electron-backend/native/helper/` — `iptvnator_mpv_helper` process (`mpv_frame_helper.cpp`, `frame_helper_render.h`, `frame_helper_gl.h`, `frame_helper_io.h`, `frame_shm.h`).
+- `apps/electron-backend/native/src/embedded_mpv_frame_reader.c` — N-API shm frame reader used by the preload frame pump.
+- `apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts` — helper-process adapter behind the `NativeEmbeddedMpvAddon` surface.
+- `apps/electron-backend/src/app/api/embedded-mpv-frame-pump.ts` — preload frame pump (shm → WebGL canvas).
+- `spikes/mpv-frame-copy/` — standalone spike, measurement log (RESULTS.md), integration design (DESIGN.md), and the original analysis (ANALYSIS.md).
+
 Generated native-addon build output:
 
 - `apps/electron-backend/native/build/`
@@ -26,13 +35,24 @@ The build directory contains files such as `Makefile`, `binding.Makefile`, `conf
 
 ## How It Is Embedded
 
-The embedded player renders MPV frames into an app-owned native video surface. macOS uses the libmpv render API in an `NSOpenGLView` because the mpv `wid` path produced a black video surface inside Electron. Windows loads `libmpv` through the native Node addon and uses mpv's `wid` option against an IPTVnator-owned child `HWND`. Linux creates an IPTVnator-owned X11/Xwayland child `Window` and starts an out-of-process `mpv --wid=<window>` instance for that child window.
+Embedded MPV has two rendering paths. The native-view engine renders into an
+app-owned platform video surface: macOS uses the libmpv render API in an
+`NSOpenGLView` because the mpv `wid` path produced a black video surface inside
+Electron; Windows loads `libmpv` through the native Node addon and uses mpv's
+`wid` option against an IPTVnator-owned child `HWND`; Linux creates an
+IPTVnator-owned X11/Xwayland child `Window` and starts an out-of-process
+`mpv --wid=<window>` instance for that child window. The frame-copy engine
+instead uploads helper-produced frames to a Chromium-owned DOM canvas.
 
 Windows packaged runtimes must preserve the MPV DLL basename referenced by the
 import library used at native-addon link time. For example, an archive that
 ships `libmpv.dll.a` and `libmpv-2.dll` must package `libmpv-2.dll`; renaming it
 to `mpv-2.dll` leaves `embedded_mpv.node` with an unresolved DLL dependency at
-startup, so the Settings support probe hides the Embedded MPV option.
+startup, so the Settings support probe hides the Embedded MPV option. The
+frame-copy helper is a separate executable and resolves that same import from
+its own directory. Package validation therefore reads the helper's PE import
+table and requires the exact referenced MPV DLL beside
+`iptvnator_mpv_helper.exe`, not only under `native/lib/`.
 
 On Linux, `embedded_mpv.node` must not link directly to `libmpv` or load libmpv in-process. Electron loads its own `libffmpeg` and Chromium graphics stack; in-process libmpv can resolve FFmpeg/GL symbols against incompatible Electron symbols, while isolated dynamic-loader namespaces introduce thread/runtime ownership problems. The Linux addon therefore owns only the X11 child-window embedding, process lifecycle, and a private MPV JSON IPC socket. It starts `mpv --wid=<window> --input-ipc-server=<socket>`, polls `time-pos`, `duration`, `volume`, and `pause`, and forwards pause/seek/volume/audio-track commands through that socket. The Linux MPV JSON IPC polling runs on an addon-owned background thread; `getSessionSnapshot()` returns the last cached snapshot and must not perform socket round trips on Electron's main thread. Linux MPV process teardown sends `SIGTERM` on the caller path, then waits and escalates to `SIGKILL` on a detached cleanup thread. A healthy Linux build lists X11/Xext as addon dependencies, but `ldd apps/electron-backend/native/build/Release/embedded_mpv.node` must not list `libmpv`. Runtime support also requires an `mpv` executable on `PATH`.
 
@@ -40,18 +60,76 @@ Linux native Wayland embedding is not implemented. When Electron is started on X
 
 ## Linux Support Matrix
 
-Embedded MPV on Linux is supported only for x64 desktop builds where Electron runs under X11 or Xwayland and an `mpv` executable is available on `PATH`. Native Wayland embedding is not supported in this implementation. Packaged Linux launchers pass `--ozone-platform=x11` so Wayland desktops use Xwayland when it is available, and `main.ts` appends the same switch on Linux when it is absent so direct binary/AppImage launches from a terminal behave like launcher starts. Explicit user intent is never overridden: both a user-provided `--ozone-platform` switch and the `ELECTRON_OZONE_PLATFORM_HINT` environment variable suppress the fallback.
+Official Linux frame-copy packaging is x64-only. The native-view and frame-copy
+engines have different runtime requirements:
 
-When the `mpv` executable probe fails inside a Flatpak or Snap sandbox (`FLATPAK_ID`/`SNAP` env present), the support reason explains that sandboxed packages cannot access a system mpv instead of asking the user to install it.
+| Engine      | Display path                  | MPV runtime                                                                |
+| ----------- | ----------------------------- | -------------------------------------------------------------------------- |
+| native-view | X11 or Xwayland               | An `mpv` executable on `PATH`; playback is an isolated `mpv --wid` process |
+| frame-copy  | Headless EGL; no window embed | A separately linked and capability-probed `iptvnator_mpv_helper`           |
 
-Current release-announcement wording should stay close to this:
+Native Wayland embedding is not implemented for native-view. Frame-copy itself
+does not embed a window and can render through EGL on a native Wayland desktop,
+although packaged launchers still default Electron to X11/Xwayland unless the
+user explicitly supplies an Ozone choice. A user-provided `--ozone-platform`
+or `ELECTRON_OZONE_PLATFORM_HINT` is never overridden.
 
-- Supported display path: X11 or Xwayland.
-- Not supported: native Wayland embedding.
-- Validated locally: Ubuntu 24.04 GNOME Wayland session with Electron forced to X11/Xwayland and system `mpv`.
-- Validated in CI: Ubuntu 22.04 standard Linux package build and Ubuntu 24.04 Flatpak package build.
-- Expected standard packages: `.deb` on Ubuntu/Debian, `pacman` on Arch/Manjaro, `.rpm` on RPM-based distributions, and AppImage on x64 glibc systems, all with system `mpv` installed.
-- Sandbox caveat: Flatpak and Snap packages build and continue to support the normal inline/external-player flows, but embedded MPV is not announced as supported there yet because the Linux backend launches `mpv --wid` and those sandboxed formats do not expose the host `mpv` executable to the app by default.
+Linux packages are built in separate passes because Electron Builder reuses
+one unpacked application layout per pass:
+
+| Profile    | Formats          | Frame-copy runtime strategy                                                                              |
+| ---------- | ---------------- | -------------------------------------------------------------------------------------------------------- |
+| `system`   | DEB, RPM, Pacman | System `libmpv.so.2` plus the helper's direct EGL/GL/GBM interfaces; exact dependencies are listed below |
+| `portable` | AppImage, Snap   | Bundled pinned LGPL-compatible runtime under `native/lib`                                                |
+| `flatpak`  | Flatpak          | The same bundled pinned LGPL-compatible runtime under `native/lib`                                       |
+
+System package dependencies are fail-closed and format-specific:
+
+- DEB: `libmpv2`, `libegl1`, `libgl1`, `libgbm1`
+- RPM: `mpv-libs`, `libglvnd-egl`, `libglvnd-glx`, `mesa-libgbm`
+- Pacman: `mpv`, `libglvnd`, `mesa`
+
+The DEB contract deliberately names `libmpv2`, not a loose `libmpv`
+alternative, and explicitly names the GLVND `libGL.so.1` interface because
+`libmpv2` does not pull it in for the helper. The helper uses `-lGL`, not
+`-lOpenGL`; this matches the graphics interface supplied by distributions and
+Snap's `mesa-core22`. Release CI verifies that contract on Ubuntu 24.04
+(Noble). Ubuntu 22.04 (Jammy) provides `libmpv1`, so its DEB cannot enable this
+system-runtime frame-copy path; use the x64 AppImage there instead.
+
+Every x64 layout contains the addon, frame reader, helper, and a normalized
+`embedded-mpv-runtime.json`. The Electron executable, Electron libraries,
+`embedded_mpv.node`, and the frame reader must not link libmpv; only the helper
+may do so. AppImage, Snap, and Flatpak retain dynamically linked, replaceable
+runtime libraries and ship the corresponding source/build metadata. Their
+native directory also contains hash-validated `embedded-mpv-notices.json`,
+`THIRD_PARTY_NOTICES.txt`, and `licenses/<package>/**`. DEB, RPM, Pacman, and
+marker-only packages intentionally contain neither a private `native/lib`
+directory nor the bundled-runtime legal payload.
+
+The build-time `electron-backend/native` tree is excluded from `app.asar`.
+`afterPack` is the only owner of
+`resources/app.asar.unpacked/electron-backend/native`, so each profile receives
+exactly its normalized payload and ARM packages cannot retain a hidden x64
+helper, runtime, manifest, or notice copy in the archive. Both unpacked-layout
+and final Linux artifact verification enumerate `app.asar` and fail if any
+entry remains below `/electron-backend/native/`.
+
+The pristine `afterPack` and unpacked-layout checks recursively inspect
+Electron-owned shared libraries. An extracted Snap has already overlaid its
+package-manager `lib/**` and `usr/lib/**` runtime trees onto that same payload
+root, so the post-target verifier excludes exactly those two target-provided
+trees while continuing to scan every other directory recursively. Electron
+libraries are still required to be regular files and free of libmpv linkage;
+Snap runtime symlinks are outside that ownership boundary.
+
+ARM Linux packages remain marker-only. They never borrow x64 native artifacts,
+even when build environment variables claim a matching staged architecture.
+Consequently frame-copy is not advertised there, and the normal inline/external
+players remain available. On x64, any missing or unusable frame-copy dependency
+falls back to native-view without crashing; if native-view also lacks X11 or a
+system `mpv` executable, Embedded MPV is reported unavailable with a stable
+diagnostic reason.
 
 The flow is:
 
@@ -61,10 +139,25 @@ The flow is:
 4. The component asks the preload API to create an embedded MPV session with the current viewport bounds and initial volume.
 5. The Electron preload forwards calls through IPC to the main process.
 6. `EmbeddedMpvNativeService` owns sessions, polls snapshots, and emits session updates to the renderer.
-7. The native addon creates an app-owned platform video host inside the Electron window.
-8. On macOS the addon configures `vo=libmpv`, creates a `mpv_render_context`, and draws into the OpenGL surface. On Windows it creates an `mpv_handle`, disables MPV's own OSC/input handling, and passes the child-window id through `wid`. On Linux it starts `mpv --wid=<x11-window>` in a separate process with a private JSON IPC socket and tracks that process until playback replacement or dispose.
-9. Resize, scroll, and fullscreen changes are measured in Angular and sent back to the addon as native bounds so the platform video host stays aligned with the Angular layout.
-10. Playback controls remain IPTVnator-owned Angular UI. MPV receives commands only through the controlled IPC surface.
+7. For the native-view engine, the addon creates an app-owned platform video
+   host inside the Electron window. For frame-copy, the preload frame pump
+   attaches the session's shared-memory reader to
+   `<canvas data-embedded-mpv-frame>`.
+8. On macOS native-view, the addon configures `vo=libmpv`, creates a
+   `mpv_render_context`, and draws into the OpenGL surface. On Windows
+   native-view, it creates an `mpv_handle`, disables MPV's own OSC/input
+   handling, and passes the child-window id through `wid`. On Linux
+   native-view, it starts `mpv --wid=<x11-window>` in a separate process with a
+   private JSON IPC socket. Frame-copy instead uses the per-session helper
+   described below.
+9. Resize, scroll, fullscreen, and devicePixelRatio changes are measured in
+   Angular and sent through bounds sync. Native-view uses them to align the
+   platform host; frame-copy uses them to resize helper rendering and the
+   canvas frame source.
+10. Playback controls remain IPTVnator-owned Angular UI. Frame-copy uses the
+    shared `app-player-controls` overlay through
+    `EmbeddedMpvControlsAdapter`; native-view keeps its compositor-safe fixed
+    dock. MPV receives commands only through the controlled IPC surface.
 
 The renderer never gets direct native-module access. It can only call the preload contract:
 
@@ -81,13 +174,289 @@ The renderer never gets direct native-module access. It can only call the preloa
 - dispose session
 - subscribe to session updates
 
-Settings uses the preload support API as an availability and capability check. Unsupported paths return before loading the addon when platform, experiment gating, addon presence, bundled runtime presence, or the Linux `mpv` executable check fails. Supported paths load `embedded_mpv.node` so the renderer can receive capability flags from the actual addon binary. Avoid calling this support API from global workspace startup paths; use an explicit user action or idle preparation path when a renderer surface only needs to reveal optional Embedded MPV UI.
+Settings uses the preload support API as an availability and capability check.
+Unsupported paths return before loading the addon when platform, experiment
+gating, native artifacts, the packaged runtime manifest, the Linux helper
+probe, or the native-view `mpv` executable check fails. Support diagnostics
+include a stable `frameCopyUnavailableReason`; it is tracing/support data, not
+user-facing copy. Supported paths load `embedded_mpv.node` so the renderer can
+receive capability flags from the actual addon binary. Avoid calling this
+support API from global workspace startup paths; use an explicit user action
+or idle preparation path when a renderer surface only needs to reveal optional
+Embedded MPV UI.
 
 When `embedded-mpv` is the saved player, the settings store schedules an idle `prepareEmbeddedMpv()` call. This intentionally moves the first native addon load away from the click-to-play path. It can still block the Electron main process briefly because Node native addon loading is synchronous, but doing it during idle is less visible than doing it when the user clicks a video. Actual MPV session creation still happens on playback because it needs the current Electron window handle and viewport bounds.
 
-The MPV video surface is a native platform view/window, not a normal DOM element. Do not place critical Angular overlays on top of the video viewport and expect CSS `z-index` to win. The embedded MPV controls use a compositor-safe control dock below the native viewport instead of a true overlay on top of the native video surface.
+For the native-view engine, the MPV video surface is a platform view/window,
+not a normal DOM element. Do not place critical Angular overlays on top of that
+video viewport and expect CSS `z-index` to win. Native-view controls use a
+compositor-safe dock below the viewport instead of a true overlay.
 
-The dock has a stable reserved height while embedded controls are enabled. Controls fade in and out inside that fixed dock, so normal show/hide behavior does not resize the native MPV viewport or make the video jump. Volume and audio-track panels replace the default transport controls inside the same dock and provide a back button to return to the default controls. Popovers and menus must stay inside that dock unless the native layering strategy changes. The native MPV view deliberately ignores hit testing so mouse movement passes through to Chromium and can reveal Angular controls even when the pointer moves quickly across the video area.
+The native-view dock has a stable reserved height while embedded controls are
+enabled. Controls fade in and out inside that fixed dock, so normal show/hide
+behavior does not resize the native MPV viewport or make the video jump. Volume
+and audio-track panels replace the default transport controls inside the same
+dock and provide a back button to return to the default controls. Popovers and
+menus must stay inside that dock unless the native layering strategy changes.
+The native MPV view deliberately ignores hit testing so mouse movement passes
+through to Chromium and can reveal Angular controls even when the pointer moves
+quickly across the video area. None of these compositor restrictions applies to
+the frame-copy canvas.
+
+## Frame-Copy Engine (Experimental, Apple Silicon, Linux and Windows)
+
+`IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY=1` (on top of the regular
+embedded MPV experiment flag) switches macOS/arm64, Linux and Windows to a
+second rendering engine that replaces the native-view compositing entirely
+(gate: `isFrameCopyPlatformSupported()` in
+`embedded-mpv-frame-copy-platform.util.ts`; the adapter imports it directly,
+while `main.ts` and the service call it transitively through the same util
+module's `isFrameCopyRuntimeUsable()` / `getFrameCopyRuntimeAvailability()`):
+
+- `apps/electron-backend/native/helper/` — `iptvnator_mpv_helper`, a
+  one-process-per-session libmpv host. It decodes (hwdec), renders
+  offscreen at viewport size (async PBO readback ring over a headless GL
+  context — `frame_helper_gl.h`: CGL on macOS; on Linux EGL, acquiring a
+  display in order surfaceless-Mesa → default display → GBM render node;
+  every tier must complete config/context/bind validation, hardware rendering
+  is preferred, and a software tier is retained only as the final fallback;
+  on Windows WGL against a hidden window, bootstrapping a 3.2 core context
+  through `wglCreateContextAttribsARB`), publishes BGRA frames into a shm
+  seqlock ring (`frame_shm.h`, 3 slots, resize creates a new `-g<N>`
+  generation — POSIX shm on macOS/Linux, a `Local\` named file mapping on
+  Windows; the protocol carries POSIX-style `/impv-*` names everywhere and
+  the native sides derive the mapping name), and plays audio directly.
+  Control protocol: tab-separated commands on stdin, JSON events on stdout;
+  the `snapshot` event mirrors `NativeEmbeddedMpvSessionSnapshot`. Status
+  semantics are ported from `embedded_mpv.mm`.
+- `apps/electron-backend/src/app/services/embedded-mpv-frame-copy.adapter.ts` —
+  implements the same `NativeEmbeddedMpvAddon` surface over the helper
+  process, so `EmbeddedMpvNativeService` (polling, diffing, power blocker,
+  recording paths) is reused unchanged. The flag routes `getAddon()` to the
+  adapter and support reports `engine: 'frame-copy'`.
+- `apps/electron-backend/native/src/embedded_mpv_frame_reader.c` — N-API
+  shm reader loaded by the preload frame pump
+  (`apps/electron-backend/src/app/api/embedded-mpv-frame-pump.ts`): copy
+  the newest complete frame into a reused ArrayBuffer once per rAF and
+  upload it to a WebGL2 texture on the renderer's
+  `<canvas data-embedded-mpv-frame>` (BGRA swizzle in the shader). Frame
+  copies whose post-copy seqlock check reports a writer race are discarded
+  without advancing the consumed sequence, so the next rAF retries instead
+  of uploading partial pixels. Frame data never crosses the contextBridge;
+  the bridge only exposes
+  `attachEmbeddedMpvFrameView`/`detachEmbeddedMpvFrameView`.
+- Renderer: `EmbeddedMpvPlayerComponent` renders the canvas when
+  `support.engine === 'frame-copy'` and skips the compositor workarounds —
+  no `HIDDEN_BOUNDS` when dialogs open; dialogs
+  and the shared `app-player-controls` overlay stack above the canvas as
+  ordinary DOM. The canvas fills the player root; the native dock's reserved
+  controls height is not applied. Legacy embedded-MPV pointer/click,
+  double-click, shortcut, cursor, menu, and recording-feedback ownership is
+  disabled for this engine. Bounds sync still runs: the helper re-renders at
+  the new viewport size (device pixels via the display scale factor), including
+  a forced current-frame render when a paused resize creates a fresh
+  shared-memory generation. Shared fullscreen uses the DOM Fullscreen API on
+  the player root, and the component's fullscreen listener still requests
+  bounds sync.
+
+Enabling it: the `Settings > Playback > Embedded MPV: frame-copy engine`
+checkbox (shown when support reports `frameCopyAvailable` or the option is
+already enabled, so it stays visible for turning off) persists to
+the main-process config store (`electron-conf`), which `main.ts` reads before
+creating the window and translates into the env flag; an explicitly set env
+var (including `0`) wins over the stored preference, but cannot bypass the
+platform/runtime safety gate. Frame-copy can relax the window sandbox only
+when embedded MPV itself is enabled for the current run (packaged app or the
+regular development experiment flag) and one process-wide capability decision
+has succeeded. On Linux x64 that decision validates the profile manifest,
+regular-file/access modes, the complete declared bundled closure and hashes,
+then runs `iptvnator_mpv_helper --runtime-probe` with a three-second timeout.
+The probe loads dependencies through the normal ELF loader, initializes an
+idle libmpv client, creates EGL/OpenGL plus mpv render contexts, then
+creates, maps, validates, and destroys a minimal `16x16` shared-memory ring
+named `/impv-fc-runtime-probe-<pid>`. It never opens media or enters the media
+or command loops. Shared-memory creation/mapping and header-initialization
+failures emit the stable helper reasons `shared-memory-create-failed` and
+`shared-memory-initialize-failed`. The probe must emit exactly one protocol-v1
+JSON line and return zero. When the helper exits nonzero with an otherwise
+exact failure line, the application availability diagnostic keeps the
+fail-closed top-level reason `helper-probe-failed` and may add only the
+allowlisted helper reason as `helperReason`. An optional `helperDetail` is
+copied only from the same exact line when it contains 1–1024 printable ASCII
+characters; an invalid detail rejects both helper fields. Malformed,
+multi-line, wrong-protocol, or unknown failure output never reaches either
+field. Every probe uses the same explicit 16 MiB aggregate captured-output
+ceiling, independent of tracing, so verbose diagnostics do not fall back to
+Node's smaller implicit buffer. When `IPTVNATOR_TRACE_PLAYER=1`, the probe also
+emits non-empty captured helper stderr separately as one JSON line. JSON
+escaping keeps embedded newlines on that single line, the `stderr` field is
+limited to the first 16,384 characters, and the `truncated` boolean is always
+present. A missing flag, empty capture, or trace-writer failure produces no
+trace and never changes the cached availability result or the application
+diagnostic's stdout protocol.
+
+The startup probe and every playback helper session use the same sanitized
+loader environment selected by the validated manifest's cached `runtimeMode`.
+Both remove ambient ELF audit/preload/origin/library overrides, direct
+EGL/GBM/GL/VA/Vulkan driver and layer paths, shell startup/options, tracing
+hooks, and exported Bash functions. The extracted-artifact verifier applies
+the same deny-set before its direct helper smoke, while preserving
+feature/debug selectors such as `LIBGL_ALWAYS_SOFTWARE`. The system profile
+then uses the default system loader without a private path. Bundled profiles
+put the validated packaged `native/lib` first. AppImage and Flatpak resolve the
+declared external graphics/audio interfaces through their normal host or
+sandbox loader.
+For the exact `com.fourgray.iptvnator` Flatpak payload under `/app`, the helper
+reconstructs Freedesktop Platform 24.08's immutable
+`__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS` value:
+`/etc/egl/egl_external_platform.d:/usr/lib/x86_64-linux-gnu/GL/egl/egl_external_platform.d:/usr/share/egl/egl_external_platform.d`.
+All ambient EGL/GBM/GL/VA/Vulkan path overrides remain removed. Freedesktop's
+GL extension `add-ld-path` is supplied through the sandbox loader cache, so no
+ambient `LD_LIBRARY_PATH` is needed. Flatpak CI runs the application-level
+`--embedded-mpv-runtime-probe`; direct helper execution is only a package
+layout check and cannot substitute for the real gate.
+The installed-Snap smoke enables `IPTVNATOR_TRACE_PLAYER=1`,
+`EGL_LOG_LEVEL=debug`, and `LIBGL_DEBUG=verbose`, so GLVND/Mesa loader failures
+remain observable through the bounded stderr record while the same hostile
+ambient-path assertions and fail-closed application gate stay active.
+Inside a genuine Snap mount, filtered absolute `SNAP_LIBRARY_PATH` entries below
+`/var/lib/snapd/lib/gl` follow `native/lib`. The exact
+`$SNAP/graphics/usr/lib/x86_64-linux-gnu` content-provider roots come next,
+followed by the core22 base `/usr/lib/x86_64-linux-gnu`, then the GNOME
+platform's fixed x64 library, Mesa, DRI, and PulseAudio roots only when
+`SNAP_DESKTOP_RUNTIME` resolves exactly to `$SNAP/gnome-platform`; generic
+`$SNAP` roots remain last. Core22 must precede that older desktop content
+runtime so its compatible `libedit.so.2` wins instead of the GNOME copy that
+requires unavailable `libtinfo.so.5`. The helper also rebuilds the GBM, GL/VA
+driver, EGL vendor/platform, and Vulkan layer variables from those trusted
+roots. Caller-provided triplets, graphics-driver paths, and out-of-root loader
+entries are ignored.
+Both the bounded probe and playback execute the helper through
+`$SNAP/graphics/bin/graphics-core22-provider-wrapper`. Before either launch,
+the app requires the mounted graphics root to be a real directory and the
+wrapper to be a regular, non-symlinked, readable executable. A missing or
+disconnected provider therefore reports the stable
+`snap-graphics-provider-unavailable` reason instead of attempting a partial
+loader setup. Because that provider wrapper is a non-interactive Bash script,
+the child environment also removes shell startup/options, exported
+`BASH_FUNC_*` functions, and tracing hooks, and fixes `PATH` to core22 system
+directories. This prevents ambient shell configuration from replacing the
+probe or its `dirname` lookup before the helper executes.
+
+The Snap is `base: core22` with strict confinement. It keeps Electron Builder's
+default plugs and adds an auto-connected private `shared-memory` plug plus the
+`graphics-core22` content plug targeting a real empty mode-0755
+`$SNAP/graphics`, with `mesa-core22` as default provider. `mesa-core22`
+supplies the shared
+EGL/GL/GLX/GBM/DRM/VA userspace; the existing GNOME content runtime supplies
+ALSA/PulseAudio. These providers are external shared snaps, so their binaries,
+source, notices, and installed bytes are not part of the IPTVnator Snap or its
+compliance archive. CI installs and explicitly connects both providers for a
+locally installed `--dangerous` artifact, then runs the application-level
+probe under strict confinement.
+
+The package carries the empty content target itself because core22 does not
+create `$SNAP` content targets while packing. Metadata verification rejects a
+missing, non-directory, symlinked, non-empty, or incorrectly permissioned
+target. It also requires exactly the canonical provider-data layouts:
+`/usr/share/libdrm` binds from `$SNAP/graphics/libdrm`, and
+`/usr/share/drirc.d` symlinks to `$SNAP/graphics/drirc.d`. No additional or
+duplicate layout entry is accepted.
+
+Private shared memory gives the app a confined, snap-specific POSIX shm
+namespace rather than global cross-snap access. The packaging-only
+`--embedded-mpv-runtime-probe` application switch invokes the same complete
+manifest, mode, hash, linkage, environment, and bounded helper probe used at
+startup before any BrowserWindow is created. It writes exactly one availability
+JSON line and exits zero only when frame-copy is usable. Consequently the
+installed-Snap smoke validates the actual confinement and shared-memory
+lifecycle required by playback, not only direct helper execution. The smoke
+first disconnects `graphics-core22` and requires the application diagnostic to
+emit `usable:false` with reason `snap-graphics-provider-unavailable` and
+controlled exit code `1`; it then reconnects the provider and requires the
+same diagnostic to succeed.
+Packaged addon, frame-reader, and helper discovery is limited to package-owned
+`app.asar.unpacked` resource locations and never falls through to writable
+cwd/dist development paths. Those fallbacks are development-only. A disabled
+base experiment or any failed capability check keeps the renderer sandbox
+enabled and falls back to the native engine. The result is cached by
+helper/manifest identity for the process lifetime, so the startup and service
+gates cannot disagree.
+Changing the toggle requires an app restart because web preferences are fixed
+at window creation.
+
+Rendering size: the helper renders at the **aspect-fit** size of the video
+(observed `dwidth`/`dheight`) inside the requested viewport and bumps a shm
+generation when it changes — letterbox bars are never baked into frames,
+frames stay as small as possible, and the canvas letterboxes with a
+transparent background (app surface shows at the sides; fullscreen keeps a
+black backdrop). Snapshots carry `videoWidth`/`videoHeight`.
+`IPTVNATOR_EMBEDDED_MPV_AUDIO_DELAY=<seconds>` passes through to mpv's
+`audio-delay` for lip-sync tuning until a calibration flow exists.
+
+Lifecycle safety: `EmbeddedMpvNativeService` watches the main window for
+`render-process-gone` and `did-navigate` (full reloads) and disposes every
+session — Angular teardown never runs on a renderer crash/hard reload, and
+without the watch helper processes (or native mpv handles) would leak until
+app shutdown. Unexpected helper exits surface as a session `error`. macOS
+and Windows package validation requires the helper
+(`iptvnator_mpv_helper` / `iptvnator_mpv_helper.exe`) and
+`embedded_mpv_frame_reader.node` next to the addon whenever the addon
+ships; on Windows the bundled mpv DLL is also copied beside the helper so
+the executable resolves it from its own directory. The after-pack hook
+restores the POSIX helper's executable mode after the asset copy, and
+optional/skipped native rebuilds remove stale helper/reader artifacts before
+reporting frame-copy availability. This cleanup prevents known leftover build
+output; the manifest and runtime probe are the compatibility check for a
+complete Linux runtime. Linux x64 packages retain the helper and frame reader:
+system packages resolve the declared `libmpv.so.2` through their package
+manager, while portable and sandboxed profiles resolve the source-built closure
+through `$ORIGIN/lib`. Foreign-architecture packages remove all native
+artifacts and contain only the unavailable marker.
+
+Trade-offs and constraints:
+
+- The frame-copy experiment flag can relax the BrowserWindow sandbox only
+  while the base embedded-MPV feature is enabled (preload must
+  `require` the reader addon); `contextIsolation` and
+  `nodeIntegration:false` stay on. The sandbox story must be revisited
+  before this engine can become a default — candidates: utilityProcess +
+  MessagePort (costs one extra copy + GC churn since Electron ports clone
+  ArrayBuffers) or a WebCodecs-based path.
+- Scope: on macOS Apple Silicon only by owner decision (2026-07-10);
+  Intel Macs keep the native-view engine. Official Linux frame-copy is x64 —
+  headless EGL, works under native Wayland since nothing embeds into a
+  window; local system builds need `libmpv-dev`, `libegl-dev`, `libgl-dev`,
+  and `libgbm-dev`. The helper links libmpv, which is legal
+  out-of-process; the in-process-libmpv ban still binds the addon and frame
+  reader. The helper logs the chosen EGL display tier and the GL renderer
+  string to stderr. If an early tier selects Mesa software rendering (for
+  example, while a proprietary NVIDIA driver is reachable through the default
+  display or GBM), it probes the remaining tiers and uses software only when
+  no hardware-backed context works. Windows (any arch with a helper, in
+  practice x64) is ported: WGL renders offscreen against a hidden window,
+  the shm ring is a session-local named file mapping, and the reader addon
+  compiles as C++ there (MSVC has no C11 `<stdatomic.h>`). The helper
+  links the vendored libmpv import library and loads the DLL from its own
+  directory. Windows 11 Smart App Control blocks unsigned locally-built
+  executables — turn it off on dev machines or the helper cannot spawn
+  (the support probe still reports available; the session errors).
+  Runtime trait, not frame-copy-specific: the vendored mpv-winbuild
+  libmpv routes http(s) through mpv's curl stream backend and ships no CA
+  bundle, so https streams currently fail TLS verification (`mpv/curl`
+  errors in the helper log); the in-process native engine links the same
+  DLL and shares the trait. Resolving the CA story belongs to Windows
+  runtime packaging, not to either engine.
+- Measured baseline (M1 Pro, spikes/mpv-frame-copy/RESULTS.md): 4K60 HEVC
+  sustained end to end, ~1.2 ms shm copy + ~3.5 ms texture upload, ~10 ms
+  produce-to-upload latency, zero torn frames over a 10-minute run.
+  Linux (i7-1165G7/Iris Xe, same RESULTS.md): 1080p60 sustained with
+  ~1.2 ms copies; the 4K rows are limited by software decode/source
+  generation on that hardware, not by the copy path; zero torn frames
+  everywhere.
+- Helper crash isolation: an unexpected helper exit surfaces as a session
+  `error` (renderer falls back); it can never take down the Electron main
+  process, unlike in-process libmpv.
 
 ## Resume And Track Handling
 
@@ -121,7 +490,14 @@ Async command/property replies are reconciled against pending request IDs on all
 
 The native addon also observes mpv's `eof-reached` property and maps a true value to `ended`. This is required because embedded sessions run with `keep-open=yes`; MPV can pause at EOF while keeping the file loaded, so relying only on `MPV_EVENT_END_FILE` can leave the renderer in a paused-at-end state and block series autoplay.
 
-Series episode navigation is owned by the portal feature components and passed through the shared inline player to `EmbeddedMpvPlayerComponent`. The embedded MPV controls show `skip_previous` and `skip_next` buttons only for non-live series playback. The shared navigation payload contains `canPrevious`, `canNext`, and `autoplayEnabled`; the component disables previous/next at the current-season boundaries and guards the output handlers as well as the button disabled state.
+Series episode navigation is owned by the portal feature components and passed
+through the shared inline player to `EmbeddedMpvPlayerComponent`. Frame-copy
+projects that state through `EmbeddedMpvControlsAdapter` and emits the shared
+controls' previous/next outputs; native-view keeps the equivalent buttons in
+its legacy dock. Both paths show navigation only for non-live series playback.
+The navigation payload contains `canPrevious`, `canNext`, and
+`autoplayEnabled`; the component guards the output handlers as well as the
+button disabled state at current-season boundaries.
 
 Autoplay is enabled by default for series playback in embedded MPV. On `ended`, Xtream and Stalker series detail views start the next episode only when the current episode has a next item in the same season. Playback stops on the last episode of the current season. Previous always switches to the previous episode in the current season; it does not implement a restart-threshold behavior.
 
@@ -137,30 +513,182 @@ Recording is session-scoped:
 - Loading a replacement stream or disposing the embedded session stops any active recording before the MPV handle is reused or destroyed.
 - `EmbeddedMpvSession.recording` carries `{ active, targetPath, startedAt, error }` so the renderer can show active elapsed time, final save path, or a failure.
 
+For frame-copy shared controls, recording command completion and session
+snapshot delivery are independent asynchronous signals. The component-scoped
+recording coordinator permits one pending toggle, ignores the pre-command
+baseline snapshot, and correlates only fresh observations from the same
+playback identity and session. It waits for command settlement and the expected
+active state before completing a successful transition, preserves addon error
+text, and uses a bounded failure timeout. Playback replacement, session
+replacement, engine handoff, or component destruction cancels pending
+ownership, timers, and stale feedback. Native-view retains its existing
+recording UI and timer path.
+
 The default recording folder is `app.getPath('downloads')`, matching the desktop download manager's fallback. Users can override it in Settings through `Settings.recordingFolder`; an empty setting means system Downloads. Recordings are intentionally not inserted into the Downloads database or queue in v1 because MPV writes from the active playback session while the download manager owns independent backend download jobs.
 
 mpv's own caveats apply: the output container is inferred from the target extension, and seeking or switching streams while recording can produce broken output. IPTVnator limits the UI to live streams and stops recording on playback replacement to avoid the most obvious corruption path, but the feature should still be treated as an experimental embedded MPV capability.
 
 ## Renderer Architecture And Reactivity
 
-The Angular side of the embedded MPV player is intentionally split so the player component stays a view-only orchestrator. The renderer files live under `libs/ui/playback/src/lib/embedded-mpv-player/`:
+The Angular side of the embedded MPV player is intentionally split so the
+player component stays a view-oriented orchestrator and engine-specific
+controls host. The renderer files live under
+`libs/ui/playback/src/lib/embedded-mpv-player/`:
 
-- `embedded-mpv-format.utils.ts` — pure helpers (`formatTime`, `audioTrackLabel`, `subtitleTrackLabel`, `speedLabel`, `aspectLabel`, `volumeIcon`, `volumeLabel`, `readStoredVolume`, `persistVolume`, `measureBounds`) and preset constants (`SPEED_PRESETS`, `ASPECT_PRESETS`, `HIDDEN_BOUNDS`, `MENU_OPEN_BOTTOM_CUTOUT_PX`).
-- `embedded-mpv-shortcuts.ts` — `EmbeddedMpvShortcuts` class with `attach(handlers)` / `detach()`. Owns the document keydown listener and routes through a callback interface; the component supplies the callbacks. Listens for Space/K (toggle), F (fullscreen), arrow keys (seek/volume), M (mute), Escape (close popovers).
-- `embedded-mpv-overlay-visibility.service.ts` — singleton service that exposes `overlayActive: signal<boolean>`. Tracks `MatDialog.afterOpened`/`afterAllClosed` for dialog-shaped overlays and falls back to a `MutationObserver` on the CDK overlay container for any remaining backdrop-bearing CDK overlays. The native MPV video host is hidden off-screen while a modal is open so DOM dialogs can paint above it.
-- `embedded-mpv-ui-state.ts` — `EmbeddedMpvMenuState` (single-open popover state machine with `volumeOpen`, `audioOpen`, `subtitleOpen`, `speedOpen`, `aspectOpen` signals plus `anyOpen` computed; `toggle`/`open`/`close`/`closeAll` helpers) and `EmbeddedMpvFeedback` (transient overlay that auto-clears after a configurable delay; used for keypress feedback).
-- `embedded-mpv-session-controller.ts` — component-scoped `Injectable` service that owns the `support`, `session`, `sessionId`, `stalled`, and `retryToken` signals. Subscribes to `onEmbeddedMpvSessionUpdate`, runs the polling-driven `stalled` timer, owns bounds-sync (resize, scroll, overlay state), and exposes the imperative IPC surface (`startSession`, `togglePaused`, `seekBy`/`seekTo`, `applyVolume`, `setAudioTrack`, `setSubtitleTrack`, `setSpeed`, `setAspect`, `startRecording`, `stopRecording`, `retry`).
-- `embedded-mpv-player.component.ts` — view-only shell. Holds view children, derived `computed` signals, DOM event listeners (pointermove, pointerdown, fullscreenchange, dblclick), and three `effect()`s.
+- `embedded-mpv-format.utils.ts` — pure helpers (`formatTime`, `audioTrackLabel`, `subtitleTrackLabel`, `speedLabel`, `aspectLabel`, `volumeIcon`, `volumeLabel`, `readStoredVolume`, `persistVolume`, `measureBounds`) and preset constants (`SPEED_PRESETS`, `ASPECT_PRESETS`, `HIDDEN_BOUNDS`).
+- `embedded-mpv-controls.adapter.ts` — component-scoped `PlayerController`
+  adapter for frame-copy. Maps session/support/playback signals to shared
+  controls state and capabilities, delegates commands to
+  `EmbeddedMpvSessionController`, and projects series navigation and recording.
+- `embedded-mpv-controls-recording.ts` — frame-copy shared-controls recording
+  coordinator. Serializes toggles, correlates command settlement with fresh
+  same-owner snapshots, and cancels pending state on ownership or engine
+  changes.
+- `embedded-mpv-controls-recording-feedback.ts` — semantic raw/translated
+  recording feedback values and late translation resolution.
+- `embedded-mpv-controls-recording-timers.ts` — frame-copy recording feedback
+  signal plus acknowledgement and message-dismiss timer ownership. Keeps
+  transient timing lifecycle out of the recording correlation state machine.
+- `embedded-mpv-legacy-interactions.ts` — native-view-only pointer listeners,
+  click/double-click arbitration, popover closing, controls auto-hide, and
+  volume-close timers. An engine handoff cancels its pending legacy
+  interactions before frame-copy takes ownership.
+- `embedded-mpv-shortcuts.ts` — native-view-only `EmbeddedMpvShortcuts` class
+  with `attach(handlers)` / `detach()`. Owns the legacy document keydown
+  listener and routes through a callback interface; the component supplies
+  callbacks for Space/K, F, arrow keys, M, and Escape. The optional
+  `arrowKeysBlocked` handler suspends the seek/volume arrows while a dock
+  chip panel owns them for chip navigation.
+- `embedded-mpv-overlay-visibility.service.ts` — singleton service that exposes
+  `overlayActive: signal<boolean>`. Tracks `MatDialog.afterOpened`/
+  `afterAllClosed` for dialog-shaped overlays and falls back to a
+  `MutationObserver` on the CDK overlay container for remaining
+  backdrop-bearing CDK overlays. Native-view uses it to move the platform host
+  off-screen; frame-copy uses it to gate shared playback shortcuts.
+- `embedded-mpv-ui-state.ts` — legacy native-view
+  `EmbeddedMpvMenuState` (single-open menu state machine, incl. the
+  `dockPanelOpen` chip-panel signal that suspends arrow shortcuts) and
+  `EmbeddedMpvFeedback` (transient keypress feedback). They are not the
+  frame-copy shared-controls state.
+- `embedded-mpv-dock-panels.ts` — native-view `EmbeddedMpvDockPanelState`:
+  builds the active horizontal chip-panel view model (audio, subtitle, speed,
+  aspect) from the menu state, routes chip selection back to the session
+  controller, and restores toggle-button focus after a panel closes.
+- `embedded-mpv-dock-panel.component.ts` — standalone
+  `app-embedded-mpv-dock-panel` that morphs the dock row inside the
+  fixed-height controls strip: back button + title + horizontally scrollable
+  chip ribbon (`role="menu"` with `aria-orientation="horizontal"`,
+  `menuitemradio` chips, wheel-to-horizontal-scroll mapping, edge fades,
+  active-chip reveal/focus, roving arrow keys, RTL-aware). Keeping the panels
+  inside the strip is what lets menus open without any MPV bounds change.
+- `embedded-mpv-command-runner.ts` — transport/track/recording IPC delegation; contains addon-side throws; reconciles a returned snapshot only when the current canonical session id and returned snapshot id both match the captured command session id.
+- `embedded-mpv-session-factory.ts` — side-effect-free loading/error placeholder factories plus `waitForStartupPaint`.
+- `embedded-mpv-stalled-tracker.ts` — owns the 30-second loading timer and `stalled` signal.
+- `embedded-mpv-session-controller.ts` — component-scoped lifecycle coordinator. It exposes `support`, `session`, `sessionId`, `stalled`, and `retryToken`; subscribes to native updates; coordinates prepare/create/load/dispose, frame-copy attachment, and bounds sync; and delegates commands, placeholders, and stalled timing.
+- `embedded-mpv-player.component.ts` — view shell and engine-specific controls
+  host. It mounts shared controls only for frame-copy and the legacy dock only
+  for native-view; holds view children, derived `computed` signals, DOM event
+  handling for fullscreen, and effects for session lifecycle, bounds sync,
+  session fan-out, playback-ended emission, engine handoff, and native-only
+  recording ticks.
 
 ### Bounds compositing strategy
 
-The native video host paints outside the normal DOM stacking model, so any DOM region it covers cannot reliably receive pointer events and any CSS `z-index` competition is unwinnable. The component compensates with a single `boundsProvider(host)` closure on the controller that returns one of three bound shapes, evaluated each time the active bounds-sync runs:
+The following strategy applies only to the native-view engine. Its video
+host paints outside the normal DOM stacking model, so any DOM region it covers
+cannot reliably receive pointer events and any CSS `z-index` competition is
+unwinnable. The component compensates with a single `boundsProvider(host)`
+closure on the controller that returns one of two bound shapes, evaluated
+each time the active bounds-sync runs:
 
 - **Modal overlay open** (any MatDialog, including the command palette) → `HIDDEN_BOUNDS`. The MPV video host moves off-screen so the dialog has the full window.
-- **Control popover open** (any of the menu states above) → host bounds with `MENU_OPEN_BOTTOM_CUTOUT_PX` (300 px) removed from the bottom. The popover region becomes DOM-receiving while video keeps playing in the upper region.
-- **Idle** → full host bounds.
+- **Otherwise** → full host bounds.
 
-The viewport DOM element also reserves `--embedded-mpv-controls-height` (64 px) at the bottom when controls are enabled, so the controls strip itself is always DOM and always reachable for hover-to-reveal even before the popover-cutout takes effect.
+Control menus never influence bounds: all five (volume, audio, subtitle,
+speed, aspect) render horizontally inside the fixed-height controls strip
+below the video host. Volume expands as an inline horizontal slider next to
+the mute button; the audio/subtitle/speed/aspect menus morph the dock row
+into `app-embedded-mpv-dock-panel` — back button, panel title, and a
+horizontally scrollable chip ribbon (vertical wheel mapped to horizontal
+scroll, edge fades as continuation hints, auto-reveal and focus of the active
+chip, roving arrow-key navigation, RTL-aware). Because the strip height never
+changes, opening or closing a menu sends no new MPV bounds and the video never
+re-letterboxes. The popover-era 300 px bottom cutout
+(`MENU_OPEN_BOTTOM_CUTOUT_PX`) is gone; while a chip panel is open, the
+global arrow-key shortcuts (seek/volume) are suspended so arrows walk the
+chips instead.
+
+The viewport DOM element reserves `--embedded-mpv-controls-height` (64 px;
+88 px under the narrow breakpoint) at the bottom when controls are enabled, so
+the controls strip — including the in-dock panels — is always DOM and always
+reachable for hover-to-reveal.
+
+For frame-copy, `boundsProvider` always returns the measured full host bounds:
+there is no `HIDDEN_BOUNDS` or reserved dock height. Dialogs
+and controls layer naturally over the canvas, while bounds sync still updates
+the helper's render size.
+
+### Coordinate spaces (CSS → native units)
+
+The renderer measures bounds in CSS pixels (`getBoundingClientRect()`), but
+the native-view engines position OS windows, not DOM nodes: the win32 child
+`HWND` (`SetWindowPos`) and the Linux child X11 window (`XMoveResizeWindow`)
+live in physical pixels, and the macOS `NSView` (`setFrame`) lives in points
+(device-independent pixels). CSS values match points only at 100% page zoom
+and match physical pixels only at 100% page zoom AND 100% display scale.
+`EmbeddedMpvNativeService` therefore converts every native-view bounds payload
+in the main process (`toNativeViewBounds` in `embedded-mpv-bounds.util.ts`):
+all platforms scale by the webContents zoom factor, win32/linux additionally
+by the scale factor of the display hosting the window. The renderer sends
+unrounded CSS edges (`measureBounds` does not round) and the conversion
+rounds exactly once, after scaling — edges first, width/height derived from
+them — so fractional CSS layouts and fractional scales cannot open 1px
+seams against the surrounding DOM UI. Skipping this conversion is issue #1145: on scaled
+displays (Windows 125%, Linux fractional scaling, HiDPI TVs) the video landed
+toward the window's top-left corner at `1/scale` of its size, in windowed and
+fullscreen mode alike.
+
+Frame-copy bounds bypass the conversion: the canvas is laid out by the DOM in
+CSS pixels, and the frame-copy adapter already multiplies the render size by
+the display scale factor itself.
+
+Because a monitor change can rescale this mapping without resizing the host
+element (moving the window to a display with a different scale keeps the DIP
+layout), the session controller also watches `devicePixelRatio` through a
+re-armed `matchMedia('(resolution: …dppx)')` query and re-syncs bounds when
+it changes; page zoom changes are covered by the same watch plus the ordinary
+resize-driven syncs.
+
+### Controls ownership by engine
+
+`EmbeddedMpvPlayerComponent` selects one control owner from
+`support.engine`:
+
+- **Frame-copy** mounts `app-player-controls` with the component-scoped
+  `EmbeddedMpvControlsAdapter`. The shared layer owns surface pointer/click/
+  double-click behavior, document playback shortcuts, cursor hiding, menus,
+  recording feedback, and DOM fullscreen. Setting `showControls` to false
+  detaches the shared surface and playback shortcuts. A modal/backdrop overlay
+  disables shared playback shortcuts.
+- **Native-view** mounts the legacy fixed dock. Its existing component
+  handlers, `EmbeddedMpvShortcuts`, menu state, cursor logic, recording
+  feedback, and recording elapsed timer stay authoritative. The shared
+  recording adapter is inert outside frame-copy.
+
+An engine handoff asks `EmbeddedMpvLegacyInteractions` to clear native
+controls-hide/click/volume timers and close native menus when frame-copy takes
+ownership. Legacy feedback is cleared on each engine transition and its overlay
+is never rendered for frame-copy, so a late native command completion cannot
+paint above shared controls. The handoff also changes the shared recording
+owner, which cancels pending operations, acknowledgement/message timers, and
+feedback. This prevents both systems from acting on the same session.
+
+Both engines keep the component's `fullscreenchange` listener because
+fullscreen changes require bounds sync. Frame-copy's shared
+`ControlsFullscreen` additionally synchronizes when its DOM surface attaches or
+changes, including when the root is already fullscreen. Native-view does not
+gain a transparent-window, native-fullscreen, or native-surface overlay path
+from this integration.
 
 ### Reactivity rules (signals and effects)
 
@@ -175,15 +703,18 @@ Concrete bugs from the audit, recorded so they don't get reintroduced:
 - **Infinite session-create loop.** `EmbeddedMpvSessionController.startSession` once wrote `this.support.set(prepared)` after the `prepareEmbeddedMpv` round-trip. The component's session-creation effect tracks `this.support()`, so the write fired the effect → cleanup disposed the session → new session was created → prepare ran again → support was set again. Symptom: endless "Loading stream…" spinner. Fix: do not write `support` inside `startSession`; the constructor's `loadSupport()` already populates it including capabilities.
 - **Stream restart on volume change.** The session-creation effect once read `this.volume()` directly to pass to `startSession`'s `initialVolume`. Each volume tick re-ran the effect, disposing and recreating the session — for VOD/series this restarted playback from the beginning. Fix: read it via `untracked(() => this.volume())`. Subsequent volume changes flow through `controller.applyVolume()`, never through the effect graph.
 - **Spurious `timeUpdate` re-emits and `volume.set` calls.** The session-fan-out effect calls `scheduleControlsHide()`, which reads `isPlaying`, `menus.anyOpen`, `statusLabel`, and `controlsVisible`. Those reads became tracked deps, so opening any popover, pausing, or hovering re-ran the body. No loop in isolation, but a parent that wires `timeUpdate` back into `playback.startTime` would have hit the volume-restart bug class. Fix: wrap the side-effect block in `untracked()` so the effect listens only to session changes.
-- **2 Hz no-op stalled-tracker re-runs.** The controller's stalled effect tracked the full `session` signal, which updates on every position-poll snapshot. `handleStalledTracking` is a no-op for non-loading status, so the re-runs cost nothing useful. Fix: track a `sessionStatus = computed(() => this.session()?.status ?? null)` instead so the effect fires only on real status transitions.
+- **2 Hz no-op stalled-tracker re-runs.** Position polling updates `session` around 2 Hz. Tracking the full session would re-run stalled logic for snapshots with unchanged status, so the controller tracks only `sessionStatus` and invokes `EmbeddedMpvStalledTracker.track` inside `untracked()`, avoiding full-session reruns.
 
 When adding a new effect, audit it the same way: list every tracked signal read explicitly, justify each one as a _re-trigger source_, and wrap everything else in `untracked()`. When extending an existing helper that is called from inside an effect, treat the helper's signal reads as if they were inline in the effect.
 
 ### IPC safety
 
-Renderer-side IPC methods on the controller use the canonical `sessionId()` signal as the gate, **not** `session()?.id`. The session payload during the loading window carries a placeholder id (`embedded-mpv-starting`) set by `createLoadingSession()`; pushing that placeholder to the addon would hit `getSessionOrThrow` for a session that does not exist. The native side throws `Napi::Error` rather than `std::runtime_error` so that misuse surfaces as a JS exception rather than a process abort, but the renderer should still gate properly so the addon never sees the placeholder.
+Renderer command IPC in `EmbeddedMpvCommandRunner` uses the canonical `sessionId()` signal as the gate, **not** `session()?.id`. The session payload during the loading window carries a placeholder id (`embedded-mpv-starting`) set by `createLoadingSession()`; pushing that placeholder to the addon would hit `getSessionOrThrow` for a session that does not exist. The native side throws `Napi::Error` rather than `std::runtime_error` so that misuse surfaces as a JS exception rather than a process abort, but the renderer should still gate properly so the addon never sees the placeholder.
 
-Every IPC call goes through a `guardIpc` helper that swallows addon-side throws — sessions can be torn down while a call is in flight, and snapshot polling will resync state on the next tick.
+- **Playback-load teardown.** If teardown happens while `loadEmbeddedMpvPlayback` is in flight, the asynchronous startup task exits immediately after the load resolves, before frame attachment or bounds scheduling. The teardown path owns disposal of that session.
+- **Command identity.** Renderer commands capture the canonical `sessionId` before starting IPC. Default recording-folder resolution is asynchronous preflight before the recording-command IPC. The runner revalidates the captured id immediately after that preflight and skips IPC when it no longer matches, preventing a late recording command from being issued against the superseded session.
+- **Reply reconciliation.** `EmbeddedMpvCommandRunner` applies a returned snapshot only when both the current canonical `sessionId` and the returned snapshot id match the captured command session id. Late or mismatched replies are ignored. Its `guardIpc` helper contains addon-side errors, and the next broadcast session update resynchronizes state.
+- **Frame-attachment teardown.** If teardown happens during asynchronous frame attachment, the asynchronous startup task exits immediately after the attachment await, before bounds scheduling. The preload detach/attachment epochs abort pending frame setup, so the teardown's detach is not followed by a second late global detach.
 
 ### Power management
 
@@ -194,39 +725,84 @@ The Electron main process holds an `electron.powerSaveBlocker` of type `prevent-
 Current development behavior:
 
 - The addon build supports `darwin`, `win32`, and `linux`; Windows and Linux builds require running on that target OS.
-- The build script first looks for a staged runtime at `vendor/embedded-mpv/<platform>-<arch>/`.
-- The staged runtime/build inputs must contain `include/mpv/client.h` and `runtime-manifest.json`. macOS and Windows staging also contains the platform runtime files that are bundled into the app.
+- The build script first looks for staged inputs at `vendor/embedded-mpv/<platform>-<arch>/`. On Linux, local development can fall back to distribution `libmpv-dev` headers and libraries. `LIBMPV_INCLUDE_DIR` overrides the header root. `LINUX_NATIVE_LIBRARY_DIR` is a link-time override and must name a directory already visible to the system dynamic loader; it is never inherited as helper `LD_LIBRARY_PATH`.
+- When the staged-input path is used, it must contain `include/mpv/client.h`,
+  `runtime-manifest.json`, and the platform runtime/build files. The Linux
+  source builder also stages the complete declared `.so` closure.
 - The compiled `.node` addon is copied into `dist/apps/electron-backend/native/embedded_mpv.node`.
-- Bundled runtime files are copied into `dist/apps/electron-backend/native/lib/` for macOS and Windows. macOS copies `.dylib` and non-`.dylib` Mach-O dependencies; Windows copies the staged `mpv-2.dll`/`libmpv-2.dll`/`mpv.dll`/`libmpv.dll` runtime name plus import libraries. Linux writes an `external-mpv-process` manifest and intentionally leaves `libmpv.so` out of the package.
-- Linux does not bundle or load `libmpv` in the Electron process. Its native addon still requires staged MPV headers, but runtime support depends on the X11/Xwayland window handle plus an `mpv` executable on `PATH`.
+- Bundled runtime files are copied into
+  `dist/apps/electron-backend/native/lib/`. macOS copies `.dylib` and
+  non-`.dylib` Mach-O dependencies; Windows copies the staged
+  `mpv-2.dll`/`libmpv-2.dll`/`mpv.dll`/`libmpv.dll` runtime name plus import
+  libraries. Linux source-runtime builds copy only the manifest-declared
+  closure.
+- Linux never bundles or loads libmpv in the Electron process. The native-view
+  addon remains X11/process-only; the inverse rule applies to frame-copy:
+  `iptvnator_mpv_helper` must link exactly the declared `libmpv.so.2`, while
+  the addon and frame reader must not.
 - `afterPack` copies `dist/apps/electron-backend/native/` into `app.asar.unpacked/electron-backend/native/` on macOS, Windows, and Linux so the addon, manifest, and runtime libraries are filesystem-addressable.
+- Electron Builder excludes `electron-backend/native{,/**/*}` from `app.asar`;
+  package verification rejects any archived native entry so `afterPack`
+  remains the single profile-aware owner.
 
-Current release caveat:
+Linux release profiles:
 
-- Release packaging requires a `vendored-lgpl` runtime manifest on macOS and Windows, and an `external-mpv-process` manifest on Linux.
-- The Linux addon is built once per CI host architecture (x64). Linux packages for other architectures (arm64, armv7l) must not ship that foreign addon: `afterPack` replaces the native directory with an `embedded-mpv-unavailable.txt` marker explaining that embedded MPV is not bundled for that architecture, and package-layout verification rejects a foreign-architecture `embedded_mpv.node` while requiring the marker.
+- `IPTVNATOR_LINUX_FRAME_COPY_PROFILE=system` builds DEB, RPM, and Pacman.
+  `afterPack` removes the private `lib` directory, writes a
+  `system-libmpv-frame-copy` manifest, and package metadata requires the exact
+  libmpv plus EGL/GL/GBM package set listed above. The DEB path is verified
+  on Ubuntu 24.04+; Ubuntu 22.04 users need the x64 AppImage because Jammy only
+  provides `libmpv1`.
+- `IPTVNATOR_LINUX_FRAME_COPY_PROFILE=portable` builds AppImage and Snap with
+  the pinned source-built closure and a `bundled-lgpl-frame-copy` manifest.
+- `IPTVNATOR_LINUX_FRAME_COPY_PROFILE=flatpak` builds Flatpak with the same
+  source-built closure and manifest origin. Its app-level probe reconstructs
+  only the exact Freedesktop 24.08 EGL external-platform search path inside the
+  trusted `/app` payload.
+- Flatpak is an isolated packaging pass and keeps `iptvnator` as the real
+  Electron ELF so Electron Builder's `electron-wrapper` passes it directly to
+  Zypak. Other Linux targets retain the conditional `iptvnator` wrapper and
+  `iptvnator.bin`. Mixed Flatpak/non-Flatpak target sets fail before mutation.
+- Linux packages for other architectures (arm64, armv7l) must not ship x64
+  native artifacts. `afterPack` replaces the native directory with
+  `embedded-mpv-unavailable.txt`, and package verification requires that marker.
+- Every packaged manifest names its exact artifacts, profile/targets, libmpv
+  SONAME, loader closure, byte sizes, SHA-256 hashes, package dependencies, and
+  native-view fallback. Artifact modes and ELF dependency isolation are
+  verified after packaging.
 - macOS release packaging rejects embedded MPV binaries linked to `/opt/homebrew` or `/usr/local`.
-- Windows release packaging verifies that the platform runtime file is present when Embedded MPV is required. Linux release packaging verifies that the addon and manifest are present and that no bundled `libmpv.so` files slipped into the package.
+- Windows release packaging verifies that the platform runtime file is present
+  when Embedded MPV is required.
 - Local development can opt into Homebrew `libmpv` only by setting `IPTVNATOR_EMBEDDED_MPV_ALLOW_HOMEBREW=1`; packaged release validation rejects that runtime origin.
 
-Before public release, packaging must:
+Release packaging must:
 
-- stage an LGPL-compatible `libmpv` runtime for each macOS/Windows release platform/architecture, and stage Linux MPV headers/build metadata for Linux
+- stage an LGPL-compatible libmpv runtime for each bundled release
+  platform/architecture, including the pinned Linux x64 source runtime
 - collect indirect macOS dependencies expressed as absolute paths, `@loader_path`, or `@rpath`
 - rewrite macOS install names and dependency paths to app-relative paths such as `@loader_path`
 - code-sign and notarize the full macOS dependency set
 - ensure Windows runtime staging includes both the DLL and the import library used by `node-gyp`
-- ensure Linux native builds do not gain a direct `libmpv` dependency; the runtime playback path is `mpv --wid` in a separate process
-- publish the corresponding FFmpeg/libmpv source and build metadata for bundled macOS/Windows runtimes; Linux should document the distribution package versions used as build inputs
+- ensure Linux Electron/addon/reader binaries do not gain a direct libmpv
+  dependency and the helper does
+- execute the helper capability probe in each intended x64 package environment
+- publish corresponding source archives, git/submodule records, checksums,
+  exact flags, local patches, and build scripts for every bundled runtime
 
-Users on macOS and Windows do not need the MPV GUI application for this architecture. Linux currently requires an `mpv` executable because the supported backend is process-isolated. If the native addon/runtime prerequisites or Linux `mpv` executable are missing, embedded MPV is hidden/unsupported and the existing inline/external players remain available.
+Users on macOS and Windows do not need the MPV GUI application for this
+architecture. Linux native-view still requires an `mpv` executable. Linux
+frame-copy system packages need their declared libmpv and EGL/GL/GBM
+packages, while AppImage, Snap, and Flatpak carry their own runtime closure.
+If frame-copy prerequisites are missing, x64 falls back to native-view; if all
+Embedded MPV prerequisites are unavailable, the existing inline/external
+players remain available.
 
 ## Runtime Staging
 
 Runtime staging tooling lives in:
 
-- `/Users/4gray/Code/iptvnator/tools/embedded-mpv/`
-- `/Users/4gray/Code/iptvnator/vendor/embedded-mpv/`
+- `tools/embedded-mpv/`
+- `vendor/embedded-mpv/`
 
 Release runtime policy:
 
@@ -250,11 +826,83 @@ pnpm embedded-mpv:build-runtime -- arm64 /tmp/embedded-mpv-prefix
 pnpm embedded-mpv:stage-runtime -- darwin arm64 /tmp/embedded-mpv-prefix
 ```
 
-During temporary PR and `master` artifact testing, CI can restore an exact-keyed GitHub Actions cache for the staged `vendor/embedded-mpv/<platform>-<arch>/` runtime and skip the expensive source build or archive staging path where one exists. The cache only contains `include/`, `lib/`, and `runtime-manifest.json`; it never contains the compiled `embedded_mpv.node` addon because that target depends on Electron headers, ABI, architecture, and build environment. Runtime cache entries are saved only from trusted repository refs, and tagged public macOS release builds continue to rebuild from pinned sources until a dedicated signed and attested runtime artifact flow exists. Windows CI uses a checksum-pinned `win32-x64` runtime archive configured through `IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL` and `IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256` repository variables or secrets on cache miss. Non-tag artifact builds have a pinned `zhongfly/mpv-winbuild` `mpv-dev-lgpl-x86_64` fallback so PR builds can produce a Windows embedded MPV artifact before repository variables are configured; tagged releases still require explicit repository configuration. The Windows archive helper accepts normal `lib/` + `bin/` prefixes and common `mpv-dev-lgpl` flat archives, including `libmpv-2.dll` names, and preserves the DLL basename expected by the import library; when the archive does not include `runtime-manifest.json`, it generates a minimal manifest from the archive URL/path and checksum. Linux stages Ubuntu package build inputs only; adding pinned source builders for Windows and Linux remains a separate release-hardening task.
+Linux x64 builds the release runtime from pinned source inputs and stages it
+before compiling the helper:
 
-The CI builder pins FFmpeg `8.1`, mpv `0.41.0`, libplacebo `7.360.1`, libass `0.17.3`, FreeType `2.13.3`, FriBidi `1.0.16`, and HarfBuzz `8.5.0`. FFmpeg disables autodetected external libraries so Homebrew libraries cannot silently enter the runtime. Libplacebo is checked out from git with the submodules required by its Meson build because the generated GitHub archive does not include submodule contents. Even with Vulkan disabled, libplacebo still compiles Vulkan stubs and needs `3rdparty/Vulkan-Headers`. The generated manifest records source URLs, archive SHA-256 values where applicable, libplacebo git commit/submodule metadata, FFmpeg configure flags, and mpv Meson flags. The staging step normalizes macOS/Windows manifests to `origin: vendored-lgpl`, which release package validation requires on those platforms.
+```bash
+pnpm embedded-mpv:build-runtime:linux -- /tmp/embedded-mpv-linux-prefix
+pnpm embedded-mpv:stage-runtime -- linux x64 /tmp/embedded-mpv-linux-prefix
+```
 
-The Electron backend build consumes the staged runtime/build inputs and copies macOS/Windows runtime files into the native build output. Linux consumes the staged MPV headers, writes an `external-mpv-process` manifest, and does not copy `libmpv.so` into the package. macOS additionally rewrites Mach-O paths so `embedded_mpv.node` loads `@loader_path/lib/libmpv.2.dylib` instead of a machine-local Homebrew path. After `install_name_tool` rewrites any addon or runtime binary, the build re-signs that binary with an ad-hoc signature for local development. Release packaging still performs the normal app signing and notarization later.
+The Linux builder is intentionally host-restricted to Linux x64. It checks
+minimum build-tool versions, uses an owned staging directory plus atomic
+publish, rejects host pkg-config/runtime leakage, rewrites every bundled
+library to an `$ORIGIN` RUNPATH, and enforces the portable ABI ceilings
+`GLIBC_2.35` and `GLIBCXX_3.4.30`. It also verifies the exact libmpv SONAME,
+complete dependency closure, and absence of build-prefix paths.
+
+CI may restore exact-keyed caches for staged
+`vendor/embedded-mpv/<platform>-<arch>/` runtimes. The Linux cache contains
+only generated headers, libraries, the runtime manifest, and immutable source
+inputs: exact archives, a clean recursive libplacebo checkout, and collected
+license inputs. It never contains `embedded_mpv.node`, generated notices, or
+the finished source-compliance archive. Runtime cache entries are saved only
+from trusted repository refs. The Linux cache key covers the builder/stager,
+notice generator, pinned sources, and toolchain. On every run, including a
+cache hit, CI validates the cached hashes and clean checkout, regenerates the
+notices for the current runtime manifest, converts libplacebo into a
+VCS-metadata-free working-tree snapshot while retaining the validated
+commit/submodule record, and creates
+`linux-frame-copy-runtime-sources.tar.xz` for the current repository revision
+and binary diff with normalized tar metadata.
+
+The workflow keeps the macOS/Windows package matrix independent from the Linux
+runtime prerequisite. Only the three Linux profile jobs depend on the runtime
+builder; both matrices reuse one YAML-anchored step list to prevent packaging
+logic drift. Draft release assembly still requires both matrices, so a public
+release cannot silently omit a promised platform.
+
+Windows CI uses a checksum-pinned `win32-x64` runtime archive configured
+through `IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL` and
+`IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256`. Non-tag artifact builds have
+a pinned `zhongfly/mpv-winbuild` `mpv-dev-lgpl-x86_64` fallback; tagged
+releases require explicit repository configuration. Upstream retains only its
+latest 30 daily builds, so the fallback and any repository-variable copy must
+be refreshed as one URL/checksum pair before expiry. A long-lived mirror must
+publish the matching source/build records and license notices with the binary.
+The archive helper accepts normal `lib/` + `bin/` prefixes and common flat
+archives, preserves the DLL basename encoded by the import library, and
+generates minimal build metadata only when the archive lacks it.
+
+The Linux builder pins FFmpeg `8.1`, mpv `0.41.0`, libplacebo `7.360.1`,
+libass `0.17.3`, FreeType `2.13.3`, FriBidi `1.0.16`, HarfBuzz `8.5.0`,
+Expat `2.8.2`, Fontconfig `2.16.0`, OpenSSL `3.5.7`, hwdata `0.409`, and
+libdisplay-info `0.1.1`. FFmpeg disables autodetected external libraries.
+Libplacebo is checked out at an exact git commit with all required submodules.
+The hwdata archive and its `pnp.ids` build input are pinned so
+libdisplay-info cannot silently consume `/usr/share/hwdata` from the builder.
+The generated manifest records source URLs/checksums or git commits,
+submodules, licenses, exact flags, build-host/toolchain data, runtime hashes,
+and the dynamic closure. FFmpeg/mpv remain LGPL-compatible and dynamically
+linked; codecs outside that build configuration are not implied.
+
+`generate-linux-runtime-notices.cjs` collects the exact upstream license files
+for every pinned package and all recursive libplacebo submodules. Generation
+is fail-closed for a missing, undeclared, symlinked, size-mismatched, or
+hash-mismatched file. Portable and Flatpak package hooks copy only the
+validated notice manifest, aggregate notice, and per-package license tree;
+package-layout verification revalidates that legal payload against the
+embedded source-runtime manifest.
+
+The Electron backend build consumes the staged runtime/build inputs. On Linux
+it links the helper against the verified staged `libmpv.so.2`, never against a
+generic host `-lmpv`, then verifies the helper's `DT_NEEDED` and
+`$ORIGIN/lib` RUNPATH with `readelf`. The addon and frame reader are checked
+for the opposite invariant. The profile-aware packaging hook later retains or
+removes the private closure. Local Linux builds may still use distribution
+headers/libraries, but a required package build must use the staged manifest.
+macOS additionally rewrites Mach-O paths and re-signs modified local binaries;
+release signing/notarization still happens later.
 
 For local development before the vendored runtime exists, Homebrew can be used explicitly:
 
@@ -296,7 +944,88 @@ For tagged macOS builds, CI must:
 
 For Windows builds, CI must restore the `win32-x64` staged runtime cache or stage the checksum-pinned runtime archive before `pnpm run build:backend`. The Windows job must set `IPTVNATOR_EMBEDDED_MPV_PLATFORM=win32`, `IPTVNATOR_EMBEDDED_MPV_ARCH=x64`, and `IPTVNATOR_REQUIRE_EMBEDDED_MPV=1` for backend build, package make, and package-layout verification. CI narrows `electron-builder.json` to x64 Windows targets while only a `win32-x64` runtime is available. The Windows job is pinned to `windows-2022` until the Electron `node-gyp` toolchain can identify Visual Studio 18 from `windows-latest`.
 
-For Linux builds, CI must set `IPTVNATOR_EMBEDDED_MPV_PLATFORM=linux`, `IPTVNATOR_EMBEDDED_MPV_ARCH=x64`, and `IPTVNATOR_REQUIRE_EMBEDDED_MPV=1` after staging the Ubuntu package build inputs. Linux package verification checks the `external-mpv-process` manifest and confirms that no bundled `libmpv.so` files are present.
+For Linux builds, CI first builds or restores the pinned x64 source runtime and
+stages it under `vendor/embedded-mpv/linux-x64`. It then runs three isolated
+packaging passes with `IPTVNATOR_EMBEDDED_MPV_PLATFORM=linux`,
+`IPTVNATOR_EMBEDDED_MPV_ARCH=x64`,
+`IPTVNATOR_REQUIRE_EMBEDDED_MPV=1`, and one exact
+`IPTVNATOR_LINUX_FRAME_COPY_PROFILE`. Each produced artifact is extracted and
+verified, and the x64 helper probe runs in the intended runtime environment.
+The packaged x64 Playwright smoke first runs its fixture-contract target and
+passes Chromium `--ignore-gpu-blocklist` so Mesa llvmpipe can expose WebGL2 in
+CI. That launch-only flag does not bypass any manifest, hash, loader, or helper
+capability check; `--no-sandbox` is added only when the runner is root.
+Bundled package layouts must include the generated notices and exact license
+tree. The separately uploaded
+`linux-frame-copy-runtime-sources.tar.xz` contains the exact archive set,
+the VCS-metadata-free libplacebo working tree plus the exact pinned commit and
+six recursive submodule records, notice/license inputs, runtime metadata,
+current revision/diff, and build tooling. Each submodule record is canonical
+`full-commit safe/path`; clone-depth-dependent `git describe` annotations are
+discarded. The source index also records a
+globally sorted exact inventory
+of every libplacebo directory, regular file, and symlink. File hashes, sizes,
+normalized executable bits, link targets, aggregate counts/bytes, and the
+canonical inventory digest must match the trusted pinned v7.360.1 checkout;
+an arbitrary or incomplete self-declared tree is rejected. Its tar metadata is
+normalized, its member/type layout is exact, and
+`metadata/archive-sha256.txt` must describe the actual source archive bytes.
+Tar listing continues past every end marker, so concatenated xz/tar streams
+cannot hide undeclared members. ARM artifacts are independently verified as
+marker-only and never run the x64 helper.
+
+After constructing the final
+`linux-frame-copy-runtime-sources.tar.xz`, CI hashes its exact bytes and stages
+`source-archive-binding.json` beside the x64 runtime. AppImage, Snap, and
+Flatpak manifests copy that binding unchanged as `sourceArchive`, including the
+SHA-256 and repository revision. System-package manifests and marker-only
+non-x64 packages must not carry it, so a portable package cannot advertise
+source correspondence inherited from another profile or architecture.
+
+The build workflow creates a draft GitHub release but never publishes Snap in
+parallel with that draft. The separate Snap workflow runs only for a public
+`release.published` event whose tag starts with `v`; before any Store upload it
+requires at least one exact `.snap` asset and exactly one non-empty
+`linux-frame-copy-runtime-sources.tar.xz` in that public release. It hashes and
+safely inspects the bounded downloaded archive, requires regular metadata,
+archive, legal, and tooling member/type set, validates link targets and the
+archive checksum metadata, and requires the clean checkout and source index to
+match the released tag. It verifies the actual pinned source-member hashes,
+the six recursive libplacebo submodule records, license-input and notice
+hashes, the exact VCS-free libplacebo tree inventory/digest, and byte-identical
+tooling from the released tag. Checkout and both artifact-transfer actions use
+full pinned commits, and checkout sets `persist-credentials: false`.
+The bounded SquashFS preflight and extraction then require the canonical
+`/usr/lib/iptvnator` layout and reuse the static package validator for every
+selected Snap. The public-release verifier separately reapplies the exact
+strict `meta/snap.yaml` graphics/shared-memory/layout contract and enumerates
+the extracted `resources/app.asar`; any archived
+`electron-backend/native/**` entry fails before Store publication. The bounded
+ASAR header reader uses only Node built-ins plus released local tooling, keeping
+this check runnable from the clean tag checkout without `node_modules`. Exactly
+one x64 Snap must contain a bundled portable manifest
+whose exact `sourceArchive` and `sourceRuntime` match the archive; non-x64
+Snaps must remain marker-only. Repository credentials are scoped to the two
+GitHub asset steps. The secretless verification job copies downloaded files
+through no-follow descriptors into a private snapshot, hashes them before and
+after inspection, writes an exact receipt, root-seals the snapshot, and reruns
+the complete source/package verifier against those bytes. It then transfers
+only the sealed data through the pinned artifact service, publishes the exact
+receipt digest separately as a job output, and terminates.
+
+The dependent publish job runs on a bounded GitHub-hosted `ubuntu-latest`
+runner with no checkout or release-tag code. It requires the separately
+transmitted receipt digest, validates the exact receipt schema and every asset
+size/hash, accepts only the expected regular `.snap`, source archive, and
+receipt layout, rejects links and extra entries, and root-seals the transferred
+files again before installing the official stable Snapcraft snap.
+Only its final fixed shell step receives the Store credential. That step uses a
+bounded Bash glob, resolves no PATH command, executes no released code, and
+passes the credential only to each exact
+`/snap/bin/snapcraft upload --release=edge` process. Any verification or
+transfer mismatch aborts before Store credentials are available.
+Candidate/stable promotion is manual after installed-Snap frame-copy and
+missing-runtime fallback smoke; GitHub Actions never promotes automatically.
 
 During temporary artifact tests, CI may also set `IPTVNATOR_REQUIRE_EMBEDDED_MPV=1` for PR and `master` push jobs where a runtime is known to exist. After the artifacts are manually validated, remove temporary conditions so ordinary development builds leave `IPTVNATOR_REQUIRE_EMBEDDED_MPV` unset or `0`. This keeps the native feature in-tree without making every non-release build depend on runtime artifacts.
 
@@ -308,7 +1037,8 @@ The feature is still experimental. The largest risks are native-process risks, n
 - packaging can fail if `libmpv` or one of its platform runtime dependencies is missing, unsigned where signing applies, or linked to the wrong runtime path
 - macOS graphics behavior can vary across Intel, Apple Silicon, external displays, fullscreen transitions, and hardware decoding paths
 - Windows `HWND` and Linux X11/Xwayland embedding need packaged-app smoke coverage for focus, resize, and fullscreen behavior
-- Linux native Wayland is unsupported until a dedicated Wayland embedding path exists
+- Linux native-view remains unsupported on native Wayland; frame-copy has no
+  window-embedding dependency but still requires a working EGL probe
 - Homebrew `libmpv` builds can target a newer macOS version than IPTVnator's declared deployment target
 
 It is reasonable to ship the code in-tree behind the current experiment flag. It is not yet safe to make it the default player. It can be exposed as desktop experimental if support detection is strict, the UI clearly labels it experimental, and fallback to Video.js or external MPV/VLC stays available.
@@ -319,8 +1049,18 @@ If an embedded session fails to initialize, the app should keep the user in cont
 
 Do not expose embedded MPV broadly until these pass on every supported target:
 
-- macOS/Windows packaged app starts without system `mpv` installed; Linux reports Embedded MPV unsupported with a clear message when system `mpv` is missing
-- bundled `libmpv` and dependent runtime files pass macOS/Windows package validation; Linux package validation confirms the external-process manifest and absence of bundled `libmpv.so`
+- macOS/Windows packaged apps start without system `mpv`; Linux x64
+  frame-copy starts in each declared package profile, and a missing frame-copy
+  dependency falls back without crashing
+- bundled libmpv and dependent runtime files pass package validation;
+  DEB/RPM/Pacman contain no private closure and declare the exact system
+  dependency
+- Electron, its shipped libraries, `embedded_mpv.node`, and the frame reader
+  have no direct libmpv `DT_NEEDED`; the helper resolves the exact declared
+  libmpv runtime
+- AppImage, DEB, RPM, Pacman, Snap, and Flatpak payloads pass extraction,
+  manifest/mode/ELF checks and the applicable helper probe; ARM payloads are
+  marker-only
 - macOS bundled `libmpv` and dependent dylibs pass code signing and notarization
 - VOD resume starts near the saved offset
 - series EOF emits `ended` and embedded MPV auto-continues only inside the current season
diff --git a/docs/architecture/iptvnator-ui-guidelines.md b/docs/architecture/iptvnator-ui-guidelines.md
index d0d3f9f29..6fb85b0b2 100644
--- a/docs/architecture/iptvnator-ui-guidelines.md
+++ b/docs/architecture/iptvnator-ui-guidelines.md
@@ -88,10 +88,10 @@ Do not add extra badges, left rails, or second selection systems unless there is
 
 ## Detail Views
 
-VOD and series detail screens share the `detail-view` Sass mixin from
-`libs/ui/styles/_detail-view.scss`. Feature-local `styles/detail-view.scss`
-files should only import that mixin and pass small typography overrides when a
-provider needs them.
+VOD and series detail screens share the detail-view Sass mixin (`@mixin base`)
+from `libs/ui/styles/_detail-view.scss`. Feature-local `styles/detail-view.scss`
+files should only `@use` that module and `@include detail-view.base(...)` with
+small typography overrides when a provider needs them.
 
 Do not copy the full detail-view stylesheet into feature libraries. Add shared
 layout changes to the mixin, and keep provider-specific differences explicit in
@@ -201,7 +201,8 @@ The shared row should be reused instead of rebuilding channel markup per view.
 ### EPG Card
 
 - Radius:
-  `14px`
+  `11px` (`.epg-timeline__block` in
+  `libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.scss`)
 - Neutral cards use low-contrast surface treatment
 - Current card uses selection surface and selection border
 - Description should clamp rather than overflow
diff --git a/docs/architecture/m3u-playlist-module.md b/docs/architecture/m3u-playlist-module.md
index 54dbaeb90..6c177858f 100644
--- a/docs/architecture/m3u-playlist-module.md
+++ b/docs/architecture/m3u-playlist-module.md
@@ -42,36 +42,309 @@ The M3U playlist module provides:
 └─────────────────────────────────────────────────────────────────────┘
 ```
 
+## M3U Parsing (`iptv-playlist-parser` fork)
+
+All four parse call sites (Electron `playlist-source.ts` import, `playlist-refresh.worker.ts`, `web-backend` `/parse`, PWA `playlists.service.ts`) use the
+[4gray/iptv-playlist-parser](https://github.com/4gray/iptv-playlist-parser) fork, pinned by commit SHA in `package.json`. The fork tracks upstream
+`freearhey/iptv-playlist-parser` (currently synced to v0.15.2) plus three deliberate deltas iptvnator depends on:
+
+- **`radio` attribute** — `item.radio` (string, `'true'` triggers the radio player, EPG suppression, and external-player gating app-wide). Upstream does not have this field; it must survive every upstream sync.
+- **Pipe stripping** — `item.url` is cut at the first `|`; `|User-Agent=` / `|Referer=` params still land in `item.http`. Upstream 0.15.0 stopped stripping, but iptvnator consumes `item.url` verbatim in hls.js/mpv/vlc, catch-up URL building, and url-keyed favorites.
+- **`#KODIPROP` lines before `#EXTINF` are preserved** (since `v0.15.2-iptvnator.2`) — Kodi property lines apply to the _next_ list entry, so ones placed above the `#EXTINF` are buffered and attached to that item's `raw` in file order (case-insensitive prefix); other stray `#` lines outside an open item are still dropped. The DASH + ClearKey feature extracts `inputstream.adaptive.license_*` config from `item.raw`, so this delta must survive every upstream sync.
+
+There is intentionally **no URL validation** (upstream removed it in 0.15.0): any non-empty non-`#` line after `#EXTINF` becomes the item URL. This is what fixes issue #1189 (Pluto TV JWT URLs longer than validator's 2084-char IE-era limit used to be rejected, and the stalled item index collapsed the whole playlist into one channel). `#` comment lines and unknown directives are appended to `item.raw` and never treated as URLs.
+
+The behavioral contract is guarded by `apps/web/src/app/iptv-playlist-parser.contract.spec.ts` (jest maps the module to the real parser source) and by the fork's own test suite.
+
+## Initial URL Import Performance Benchmark (Electron)
+
+The Electron E2E project has a deterministic initial-import benchmark for
+10,000-, 50,000-, and 100,000-channel M3U playlists. It uses only generated
+fixtures served by an ephemeral `127.0.0.1` HTTP server; provider URLs,
+credentials, and playlist data must never be used. Each formal scenario runs
+one warm-up, five measured iterations, and one diagnostic iteration in a fresh
+Electron process and data directory:
+
+```bash
+perf_output="$PWD/dist/performance/$(date -u +%Y%m%dT%H%M%SZ)-m3u-import"
+IPTVNATOR_PERF_OUTPUT_DIR="$perf_output" \
+IPTVNATOR_PERF_VARIANT=baseline \
+pnpm nx run electron-backend-e2e:benchmark-m3u-import
+```
+
+Use a new output directory and `IPTVNATOR_PERF_VARIANT=after` for the identical
+post-change run. Formal runs require a clean worktree and record the commit,
+source-state hash, runtime, and exact fixture identity. A development smoke run
+uses one warm-up, one measured iteration, and one diagnostic iteration per
+size:
+
+```bash
+IPTVNATOR_PERF_OUTPUT_DIR="$PWD/dist/performance/<timestamp>-m3u-import-smoke" \
+IPTVNATOR_PERF_VARIANT=smoke \
+IPTVNATOR_PERF_SMOKE=1 \
+pnpm nx run electron-backend-e2e:benchmark-m3u-import
+```
+
+Smoke runs may use a dirty worktree and validate only the harness; they cannot
+support a performance claim. If another local application owns port 9222, smoke
+only may set `IPTVNATOR_PERF_CDP_PORT` to an unused loopback port; formal runs
+fail closed unless CDP uses `127.0.0.1:9222`. Raw captures and JSON results stay
+under the gitignored `dist/performance/` tree; preflight rejects a symbolic
+link in any existing output-path component before creating artifacts. Headline
+distributions contain only the five measured runs: warm-up and diagnostic
+profiles are never mixed into them.
+
+The benchmark attributes these non-additive intervals:
+
+| Field | Boundary |
+| --- | --- |
+| `dataAcquireMs` | loopback response acquisition |
+| `m3uParsingMs` | parser call |
+| `normalizationMs` | parsed-item normalization |
+| `mainToRendererCloneProxyMs` | sum of normalized import-result delivery plus the upsert and GET main-response-to-preload-success legs |
+| `storeImportDispatchMs` | renderer import dispatch |
+| `rendererToMainCloneProxyMs` | sum of the upsert and GET preload-source-to-main-request legs |
+| `mainToDatabaseWorkerCloneProxyMs` | sum of the upsert and GET main-request-to-worker-receive legs |
+| `playlistSerializationMs` | database-worker playlist JSON serialization |
+| `sqliteWriteMs` | SQLite upsert, including its autocommit |
+| `sqliteReadMs` | SQLite read of the newly persisted playlist |
+| `playlistDeserializationMs` | database-worker `parseAppPlaylist`, including playlist JSON parsing |
+| `databaseWorkerToMainCloneProxyMs` | sum of the upsert and GET worker-response-post-to-main-response legs |
+| `storePublishChannelsMs` | renderer channel publication |
+| `angularRenderingMs` | publication end to the terminal two-frame paint proof |
+
+`ipcStructuredCloneProxyMs` is the explicit sum of the four directional proxy
+fields. Each directional field can combine the applicable initial-result,
+upsert, and `DB_GET_APP_PLAYLIST` legs. The worker stamps
+`responsePostedEpochMs` after request profiling is finalized and immediately
+before each response is posted; the database-worker-to-main proxy ends when
+main receives that response. These fields are attribution aids, not an additive
+waterfall: scheduler work and gaps can remain inside total wall time, and a
+proxy can include response construction, dispatch overhead, and structured
+clone work. Initial import does not create indexes; `indexAndCommitMs` is
+therefore `N/A` with
+`indexes-not-created-during-import;sqlite-autocommit-included-in-sqlite-write`.
+
+Instrumentation is development-only, opt-in, fail-neutral, and count-only. It
+must not scan or log playlist payloads to generate metadata. Renderer
+long-task, frame-gap, and heartbeat samples are clipped to the measured
+operation boundary. Main capture stops only after the upsert and route-reload
+GET responses plus both asynchronous preload success markers have arrived, so
+return-clone attribution cannot race capture shutdown. Formal comparison fails
+closed after writing raw results if exact-window renderer RSS, database-worker
+peak heap/external samples, or the database worker's explicit post-GC heap is
+missing or incoherent. Both initial-import database requests in every measured
+run must also contain coherent event-loop delay, event-loop utilization, and
+thread-CPU metrics; the validity record exposes the exact expected and valid
+request counts rather than silently dropping nullable samples. An iteration
+failure idempotently stops renderer timers, closes trace listeners/output, and
+starts best-effort probe/session teardown without waiting on a wedged renderer
+before Electron is closed. A partial capture-start failure performs the same
+rollback before it escapes to the benchmark lifecycle.
+Diagnostic artifacts require separate renderer, main, and database-worker CPU
+profiles plus renderer/main/database-worker heap snapshots and a Chromium
+trace; raw profiles remain ignored.
+
+## Playlist Refresh And Startup Auto-Update (Electron)
+
+Two paths re-download an M3U playlist from its original source:
+
+- **Explicit refresh** — `PLAYLIST_REFRESH` runs in `playlist-refresh.worker.ts`, reports
+  progress through `PLAYLIST_REFRESH_EVENT`, and is cancellable via
+  `PLAYLIST_CANCEL_REFRESH`. Cancellation is owned by the main process: it first
+  sends the cooperative cancel message, then terminates the one-shot worker
+  without waiting for its event loop. The cancel IPC resolves only after the
+  worker has stopped, the correlated `cancelled` event has been emitted with the
+  last known phase, and a structured cancellation result is ready. That result
+  crosses both Electron IPC and the context bridge unchanged;
+  `PlaylistRefreshService` converts it into a renderer-local `AbortError`.
+  Relying on an error created in main or preload would lose its `name` at one of
+  those serialization boundaries. A cancelled refresh must not update the
+  renderer store or reach SQLite.
+- **Startup auto-update** — after `loadPlaylistsSuccess`, `AppComponent` sends
+  `AUTO_UPDATE_PLAYLISTS` for every playlist with `autoRefresh === true`. The main
+  process fulfils it in `playlist-auto-update.ts` on top of `playlist-source.ts`.
+
+Both share one download contract, because this path is unattended and a hostile or
+dead source must never stall startup (issue #931):
+
+- Every HTTP hop uses the idle timeout `PLAYLIST_FETCH_TIMEOUT_MS` (30s, exported by
+  `playlist-source.ts`). Without it a host that accepts the connection and then goes
+  silent keeps the request pending forever. Redirects are followed one hop at a time,
+  so each hop is bounded separately.
+- Auto-update refreshes at most `AUTO_UPDATE_CONCURRENCY` (3) playlists at a time.
+  Sequential refreshes let one slow host delay every remaining playlist; an unbounded
+  fan-out would download and parse arbitrarily many large M3U files in the main
+  process at once.
+- Each playlist's failure is isolated and logged; the successful ones are still
+  returned, in the order they were requested. Playlists with neither a URL nor a file
+  path are skipped with a warning.
+- `preserveAutoUpdatedPlaylistFields()` re-applies the user-owned fields (`_id`,
+  `autoRefresh`, `favorites`, `userAgent`) onto the freshly parsed playlist.
+- Playlist URLs frequently carry Xtream-style `username`/`password` query parameters,
+  so refresh logging goes through `redactSensitiveData()` from
+  `@iptvnator/shared/logging`.
+
+### Refresh Cancellation Performance Regression
+
+The Electron E2E project includes a deterministic 100,000-channel cancellation
+benchmark. It uses only a loopback synthetic M3U server, performs one warm-up,
+five measured runs, and one diagnostic run, and writes summaries plus raw
+profiles below the gitignored `dist/performance/` directory:
+
+```bash
+perf_output="$PWD/dist/performance/$(date -u +%Y%m%dT%H%M%SZ)-m3u-refresh-cancel"
+IPTVNATOR_PERF_OUTPUT_DIR="$perf_output" \
+IPTVNATOR_PERF_VARIANT=after \
+pnpm nx run electron-backend-e2e:benchmark-m3u-refresh-cancellation
+```
+
+The output path must be an absolute, previously unused descendant of
+`dist/performance/`. A formal run fails on a dirty worktree and records the
+commit, source-state hash, OS/architecture, Node, Electron, and fixture identity
+in its manifest. Commit the harness first and capture `baseline` from that clean
+commit; commit the production change separately, rebuild, and capture `after`
+with the same harness and machine. Set `IPTVNATOR_PERF_SMOKE=1` for one measured
+run during harness development; smoke runs may be dirty and must not support
+before/after claims.
+
+The target reserves and verifies CDP port 9222, freezes renderer long-task,
+frame-gap, and heartbeat probes before forced post-GC heap collection, and
+builds the Electron main process, renderer, and workers with optimized,
+source-mapped performance configurations before enabling opt-in worker
+profiling. Renderer RSS is scoped to the Playwright page's exact
+`BrowserWindow` and `webContents`: every sample matches `getOSProcessId()` to
+one exact `app.getAppMetrics()` PID and creation time, while responsive and
+unresponsive events come only from that window. Identity changes, missing or
+ambiguous process metrics, and invalid working-set values fail closed with a
+raw reason and nullable RSS; summaries exclude unavailable RSS instead of
+reporting zero. Formal runs also list every invalid measured capture under
+`summary.validity.rendererRss` and fail after persisting the raw summary unless
+all measured iterations contribute one valid exact-window RSS value. Each
+worker response retains a raw
+request-scoped record containing request/operation identity, received/work/flush
+timestamps, thread CPU, event-loop utilization, event-loop delay, and fixed
+unavailability or invalid reasons. Missing or malformed profiling metadata
+still produces an outcome with its request identity, nullable metrics, and a
+fixed capture-unavailable reason. A worker terminated before it can flush the
+capture reports the metric as unavailable rather than zero.
+
+Database-worker post-GC heap is not inferred from a heap snapshot. The harness
+selects exactly one current-generation database worker independently of its
+sampling timer, waits for any in-flight sample plus one final sample, stops the
+worker CPU profile, sends an explicit-GC one-shot probe over a transferred
+`MessagePort`, and takes an optional diagnostic snapshot only afterward.
+Capture stop first closes a synchronous request cutoff and stops the main CPU
+profile, so worker profile writes and heap snapshots cannot appear as
+application stacks in `main.cpuprofile`. A database request observed after that
+cutoff cannot restart worker sampling or profiling; it records
+`database-worker-activity-after-cutoff` and invalidates the post-GC value.
+Worker artifacts include a stable isolate ordinal in their filename so an
+invalid multiple-worker capture cannot overwrite another isolate's profile.
+The raw heap and unavailability reason form a strict XOR; playlist workers
+terminated during cancellation report `worker-force-terminated-before-gc`
+instead of a snapshot-derived heap. Warm-up and measured cancellation invoke
+the real worker termination before best-effort finalization so profiling cannot
+delay headline acknowledgement metrics. The separate diagnostic iteration
+stops its CPU profile before termination; its timings are excluded from
+headline distributions. That pre-termination drain is bounded; timeout
+invalidates the profile and worker termination still proceeds. Late
+termination completions are generation-gated so they cannot mutate a reused
+record or append timeline events after an atomic capture rollover. The
+benchmark fails closed unless the diagnostic iteration observed cancellation,
+its profile is inside the iteration directory and parses with non-empty nodes
+and samples, and the dying worker has no heap snapshot.
+
+Headline worker memory distributions include every matching isolate and
+exclude only nullable unavailable values. This aggregation is not used as a
+validity shortcut. Runs that reach database persistence must independently
+contain exactly one database worker with a coherent numeric post-GC heap.
+Parsing cancellation happens before the renderer dispatches persistence, so a
+run with no database request is explicitly `N/A:
+operation-cancelled-before-database-phase`, not a missing capture. Any database
+activity in a run that observed the cancellation effect is unrelated
+contamination and invalidates the run. Duplicate, busy, late, timed-out, or
+malformed captures are listed under
+`summary.validity.databaseWorkerPostGc` and invalidate the benchmark. The
+benchmark writes `manifest.json` and `summary.json` first, then fails the formal
+run so the raw evidence remains available without supporting a before/after
+claim. A formal cancellation run also requires the cancellation effect in every
+measured iteration. Database-worker values are comparable only when every
+measured iteration reaches that phase and has one valid capture.
+
+Seed setup runs inside its own capture generation. The harness requires an
+observed seed database request, a completed playlist upsert, and no pending
+request, then persists that generation as `seed-main-capture.json`. Main
+capture finalization validates one idle database worker with a coherent
+explicit-GC result and atomically rolls the clean cutoff into the measured
+generation before yielding. A request before rollover remains late and rejects
+the transition; a request after rollover belongs to the measured generation.
+This prevents seed writes or an unobserved stop/start gap from crossing into
+measured main RSS, worker peaks, or profiles; generation selection also
+excludes the seed worker record. Since the production M3U database payload
+deliberately omits the refresh operation ID, the benchmark correlates only a
+valid preload `start` marker to the exact database operation and playlist. A
+missing or ambiguous marker leaves the raw operation ID `null` with a fixed
+reason; it does not infer identity from timing alone.
+
+Headline worker fields named `*WorkerRequest*` are distributions of individual
+request metrics. In particular, request p95/p99 distributions are not presented
+as an operation-wide or process-wide percentile, and database request
+percentiles are never collapsed with `Math.max`. Diagnostic CPU profiles, heap
+snapshots, and Chromium traces are excluded from the five-run headline
+distributions.
+
+### Reporting The Auto-Update Result
+
+Because auto-update isolates failures, it must also report them — otherwise a
+dropped playlist is indistinguishable from a successful refresh. `autoUpdatePlaylists()`
+returns `AutoUpdatePlaylistsResult`
+(`libs/shared/interfaces/src/lib/playlist-auto-update.interface.ts`): the refreshed
+`playlists` plus one `outcome` per requested playlist, in request order.
+
+| Outcome status | Meaning                                                                         |
+| -------------- | ------------------------------------------------------------------------------- |
+| `updated`      | Source fetched/read and parsed; playlist is in `playlists`                      |
+| `failed`       | Source unreachable, unreadable or unparsable                                    |
+| `skipped`      | Playlist has neither a URL nor a file path, so there is nothing to refresh from |
+
+`ElectronService` dispatches `updateManyPlaylists` with the refreshed playlists only,
+logs the titles of unresolved playlists, then derives the snackbar from those outcomes
+(`apps/web/src/app/services/auto-update-playlists-feedback.ts`):
+`AUTO_REFRESH_UPDATE_SUCCESS` when everything updated,
+`AUTO_REFRESH_UPDATE_PARTIAL` / `AUTO_REFRESH_UPDATE_FAILED` (error styling,
+dismissable) when some or all playlists failed, and `AUTO_REFRESH_UPDATE_SKIPPED` when
+the only unrefreshed playlists lacked a source. A batch that both failed and skipped
+uses `AUTO_REFRESH_UPDATE_PARTIAL_WITH_SKIPPED`, because the plain partial message names
+only `updated`/`total`/`failed` and would leave the skipped playlists as an unexplained
+remainder. Every count the user sees must reconcile with `total`, and success is never
+reported unconditionally — a silently dropped playlist used to look like a successful
+refresh.
+`playlist-auto-refresh.e2e.ts` guards this by restarting the app against a killed
+playlist server.
+
 ## State Management (libs/m3u-state/)
 
 ### State Structure
 
 ```typescript
+// libs/m3u-state/src/lib/state.ts
 interface PlaylistState {
-    // Active channel being played
-    active: Channel | undefined;
+    active: Channel | undefined; // Active channel being played
+    activePlaybackUrl: string | null;
+    activeEpgProgram: EpgProgram | undefined;
+    currentEpgProgram: EpgProgram | undefined;
+    epgAvailable: boolean;
+    channelsLoading: boolean; // Route still resolving channel data
+    channels: Channel[]; // All channels from current playlist
+    playlists: PlaylistMetaState; // Playlist metadata (entity adapter)
+}
 
-    // Whether the current route is still resolving channel data
-    channelsLoading: boolean;
-
-    // All channels from current playlist
-    channels: Channel[];
-
-    // EPG state
-    epg: {
-        epgAvailable: boolean;
-        activeEpgProgram: EpgProgram | undefined;
-        currentEpgProgram: EpgProgram | undefined;
-    };
-
-    // Playlist metadata (entity adapter)
-    playlistsMeta: {
-        ids: string[];
-        entities: Record<string, PlaylistMeta>;
-        selectedId: string | undefined;
-        allPlaylistsLoaded: boolean;
-        selectedFilters: PlaylistSourceFilter[];
-    };
+// libs/m3u-state/src/lib/playlists.state.ts
+interface PlaylistMetaState extends EntityState<PlaylistMeta> {
+    selectedId: string;
+    allPlaylistsLoaded: boolean;
+    selectedFilters: string[]; // 'm3u' | 'xtream' | 'stalker'
 }
 ```
 
@@ -86,7 +359,7 @@ used by the groups view to remember which group titles the user has hidden.
 | **PlaylistActions**  | `loadPlaylists`, `addPlaylist`, `removePlaylist`, `parsePlaylist`, `setActivePlaylist` | Playlist CRUD                  |
 | **ChannelActions**   | `setChannels`, `setActiveChannel`, `setAdjacentChannelAsActive`                        | Channel selection & navigation |
 | **EpgActions**       | `setActiveEpgProgram`, `setCurrentEpgProgram`, `setEpgAvailableFlag`                   | EPG state                      |
-| **FavoritesActions** | `updateFavorites`, `setFavorites`                                                      | Favorites management           |
+| **FavoritesActions** | `updateFavorites`, `setFavorites`, `hydrateFavorites`                                  | Favorites management           |
 | **FilterActions**    | `setSelectedFilters`                                                                   | Playlist type filtering        |
 
 ### Key Selectors
@@ -101,7 +374,7 @@ selectFavorites; // Favorite channel URLs
 // Playlist selectors
 selectAllPlaylistsMeta; // All playlists
 selectActivePlaylistId; // Selected playlist ID
-selectCurrentPlaylist; // Active playlist object
+selectActivePlaylist; // Active playlist object
 selectPlaylistTitle; // Title with "Global favorites" fallback
 
 // EPG selectors
@@ -121,20 +394,25 @@ channel-list-container/
 ├── channel-list-container.component.html
 ├── channel-list-container.component.scss
 │
-├── all-channels-tab/                      # Virtual scroll + search
-│   ├── all-channels-tab.component.ts
-│   ├── all-channels-tab.component.html
-│   └── all-channels-tab.component.scss
+├── all-channels-view/                     # Virtual scroll + debounced search
+│   ├── all-channels-view.component.ts
+│   ├── all-channels-view.component.html
+│   └── all-channels-view.component.scss
 │
-├── groups-tab/                            # Expansion panels + infinite scroll
-│   ├── groups-tab.component.ts
-│   ├── groups-tab.component.html
-│   └── groups-tab.component.scss
+├── groups-view/                           # Expansion panels + infinite scroll
+│   ├── groups-view.component.ts
+│   ├── groups-view.component.html
+│   └── groups-view.component.scss
 │
-├── favorites-tab/                         # Drag-drop reordering
-│   ├── favorites-tab.component.ts
-│   ├── favorites-tab.component.html
-│   └── favorites-tab.component.scss
+├── favorites-view/                        # Drag-drop reordering
+│   ├── favorites-view.component.ts
+│   ├── favorites-view.component.html
+│   └── favorites-view.component.scss
+│
+├── recent-view/                           # Recently viewed channels
+│   ├── recent-view.component.ts
+│   ├── recent-view.component.html
+│   └── recent-view.component.scss
 │
 └── channel-list-item/                     # Individual channel display
     ├── channel-list-item.component.ts
@@ -179,6 +457,10 @@ channel-list-container/
 
 - `M3uWorkspaceRouteSession` owns route-driven channel loading for the player/sidebar routes: `all` and `groups`.
 - The route session sets `channelsLoading` before `getPlaylist()` resolves and clears it when `ChannelActions.setChannels` lands.
+- The route session dispatches reducer-only `FavoritesActions.hydrateFavorites`
+  after that persisted read. Hydration must not use the persistence-bearing
+  `setFavorites` action: doing so reads and rewrites the complete M3U payload
+  again just to store favorites that already came from SQLite.
 - `ChannelListContainerComponent` now renders a dedicated skeleton state while `channelsLoading` is true.
 - `ChannelListContainerComponent` no longer clears `channels` on destroy; route/session code is the single owner of shared list lifecycle during navigation.
 - The dedicated `/workspace/playlists/:id/favorites` and `/workspace/playlists/:id/recent` collection routes do not drive the shared sidebar channel list; they default to the `playlist` scope so rail links always open the current playlist view, not the last persisted global scope.
@@ -222,14 +504,17 @@ channel-list-container/
   rendering. Playlist order avoids cloning the full list when no search term is
   active.
 
-### EnrichedChannel Pattern
+### ChannelEpgMetadata Pattern
 
-For performance optimization, channels are pre-enriched with EPG data:
+For performance optimization, EPG data is kept in a side-car map instead of
+being cloned onto every channel (the older `EnrichedChannel` pattern that
+spread-cloned every channel on every ~30 s tick was removed —
+`channel-list-container/epg-enrichment.util.ts`):
 
 ```typescript
-interface EnrichedChannel extends Channel {
+// libs/ui/components/src/lib/channel-list-container/epg-enrichment.util.ts
+interface ChannelEpgMetadata {
     epgProgram: EpgProgram | null | undefined;
-    logo: string; // Playlist tvg-logo first, XMLTV icon fallback second
     progressPercentage: number; // Pre-computed by parent
 }
 ```
@@ -270,7 +555,7 @@ per-tab EPG logic:
 
 The programme guide under the player renders in one of **two interchangeable
 views**, chosen by the **`epgViewMode`** setting (`'timeline'` default, or
-`'list'`; Settings → EPG → *Guide view*):
+`'list'`; Settings → EPG → _Guide view_):
 
 - **Timeline** — a horizontal **ribbon** (`app-epg-timeline`,
   `libs/ui/epg/src/lib/epg-timeline/`).
@@ -341,7 +626,7 @@ activation, and the details dialog behave identically to the timeline.
   `isLivePlayback`, `loading`, `emptyReason`, `selectedDate`, `collapsed`,
   `summary` and emits `programActivated`, `returnToLive`, `selectedDateChange`,
   `openEpgSettings`, `retry`, `collapsedChange`. The host layout owns playback,
-  persists the collapse state (`liveEpgPanelState` in localStorage), and (for
+  persists the collapse state (`live-epg-panel-state` in localStorage), and (for
   the M3U player) the `EpgActions.setCurrentEpgProgram` / `setEpgAvailableFlag`
   / `setActiveEpgProgram` dispatches. The timeline owns the **single** panel
   bar — collapse chevron + channel name on the left, return-to-live / jump /
@@ -363,7 +648,8 @@ activation, and the details dialog behave identically to the timeline.
   no-EPG-anywhere states and while loading. Return-to-live is a playback control
   (`!isLivePlayback()`) and is independent of EPG state.
 - **State-driven affordances.** Blocks are coloured past / now / future, with a
-  red "now" playhead. Catch-up "Watch" appears on past blocks only when
+  red "now" playhead. Catch-up "Watch" appears on past blocks — and as a
+  start-over replay button on the currently-airing block — only when
   `archivePlaybackAvailable` (Xtream `tv_archive`, M3U `catchup-*`); Stalker is
   schedule-only (dimmed past + a notice, no false buttons). The "i" button opens
   the shared `app-epg-item-description` dialog with a state-aware action.
@@ -543,25 +829,25 @@ These URLs are playlist-scoped by default:
 #### AllChannelsViewComponent
 
 - **Inputs**: `channels`, `channelEpgMap`, `channelIconMap`, `progressTick`, `shouldShowEpg`, `itemSize`, `activeChannelUrl`, `favoriteIds`
-- **Outputs**: `channelSelected`, `favoriteToggled`
+- **Outputs**: `channelSelected`, `channelPlaybackRequested`, `favoriteToggled`, `sidebarToggleRequested`
 - **Features**: Workspace search, persisted channel sorting, virtual scrolling, no-results placeholder
 
 #### GroupsViewComponent
 
-- **Inputs**: Same as AllChannelsTab + `groupedChannels`
-- **Outputs**: `channelSelected`, `favoriteToggled`
+- **Inputs**: Same as AllChannelsViewComponent + `groupedChannels`
+- **Outputs**: `channelSelected`, `channelPlaybackRequested`, `favoriteToggled`, `hiddenGroupTitlesChanged`, sidebar sizing outputs
 - **Features**: Resizable groups rail, local group search, group visibility management, persisted selected-group channel sorting
 
 #### FavoritesViewComponent
 
 - **Inputs**: `favorites`, `channelEpgMap`, `channelIconMap`, `progressTick`, `shouldShowEpg`, `activeChannelUrl`
-- **Outputs**: `channelSelected`, `favoriteToggled`, `favoritesReordered`
+- **Outputs**: `channelSelected`, `channelPlaybackRequested`, `favoriteToggled`, `favoritesReordered`
 - **Features**: Drag-and-drop reordering with CDK DragDrop, read-only channel details context menu
 
 #### RecentViewComponent
 
 - **Inputs**: recent channels, `channelEpgMap`, `channelIconMap`, `progressTick`, `shouldShowEpg`, `activeChannelUrl`
-- **Outputs**: `channelSelected`, `favoriteToggled`, `recentItemRemoved`
+- **Outputs**: `channelSelected`, `channelPlaybackRequested`, `removeRecent`
 - **Features**: Read-only channel details context menu, row-level and context-menu removal
 
 ## EPG Integration
@@ -663,6 +949,75 @@ class EpgService {
   for a programme the user clicked, both hosts surface a
   `EPG.TIMELINE.CATCHUP_FAILED` snackbar instead of doing nothing.
 
+### DASH + ClearKey Playback
+
+MPEG-DASH (`.mpd`) channels play through a Shaka Player _source engine_ inside
+the existing built-in players — exactly like hls.js/mpegts.js. There is no new
+player in settings.
+
+**DRM data flow** (M3U module only; Xtream/Stalker have no DRM concept):
+
+1. The playlist parser fork does not interpret `#KODIPROP:` lines, but
+   preserves them in `item.raw` for **both** layouts: unknown lines between
+   `#EXTINF` and the stream URL are kept as before, and since parser pin
+   `v0.15.2-iptvnator.2` `#KODIPROP` lines placed _before_ the `#EXTINF` are
+   buffered and attached to the **next** entry's `raw` in file order (Kodi
+   semantics, case-insensitive prefix). Other stray `#` lines outside an open
+   item are still dropped, matching upstream.
+2. `extractDrmFromRaw()` (`libs/shared/m3u-utils/src/lib/kodiprop.utils.ts`)
+   post-processes `raw` inside `createPlaylistObject()` — the single funnel
+   for all four import paths (Electron URL/file import, refresh worker,
+   web-backend `/parse`, client-side upload). It reads
+   `inputstream.adaptive.license_type`, `license_key`, and the combined
+   `drm_legacy` property. ClearKey key formats: `kid:key` hex (single or
+   comma-separated), the W3C ClearKey license JSON, and a plain `{kid: key}`
+   JSON map. Unsupported license types (Widevine, PlayReady, license-server
+   URLs, malformed values) are preserved as `supported: false` — never a
+   throw.
+3. The typed result lands on `Channel.drm` (`ChannelDrm` in
+   `@iptvnator/shared/interfaces`), travels through
+   `ResolvedPortalPlayback.drm` into `WebPlayerViewComponent`'s synthetic
+   channel, and reaches the engine. Persistence is free for newly imported or
+   refreshed playlists (playlist JSON blob / IndexedDB object). Playlists
+   imported **before** the DRM feature carry no `drm` field yet, but the raw
+   `#KODIPROP` block survived in the stored items — the M3U player page falls
+   back to `extractDrmFromRaw(channel.raw)` at playback time, so encrypted
+   channels of pre-upgrade playlists work without a re-import.
+
+**Engine selection and routing:**
+
+- `ShakaVideoSession` (`libs/ui/playback/src/lib/shaka-engine/`) owns the
+  engine: lazy `import('shaka-player')` on first use (the module is a separate
+  lazy chunk, ~217 KB transfer), `drm.clearKeys` configuration, an operation
+  queue + generation guard against channel-switch races, and Shaka-error →
+  `PlaybackDiagnostic` classification (`PlaybackDiagnosticSource.Shaka`).
+  Channels with `drm.supported === false` emit a `DrmOrEncryption` diagnostic
+  without starting an engine.
+- HTML5 player: `extension === 'mpd'` branch in `playChannel()`. ArtPlayer:
+  `customType.mpd` in `ArtPlayerSourceSession`. Shared-controls bridge:
+  `WebVideoControlsSource` kind `'shaka'` + `WebVideoShakaControls`
+  (audio/text tracks via the Shaka 5 API — selecting a text track shows it,
+  `selectTextTrack(null)` hides).
+- DASH channels always play inline (radio precedent): `isDashChannel()` gates
+  `shouldShowInlinePlayer()`, the MPV/VLC auto-launch in `m3u-state` effects
+  (`shouldAutoLaunchExternalPlayer()`), and the `playerOverride` passed to
+  `app-web-player-view` — ArtPlayer stays ArtPlayer, every other configured
+  player (Video.js without a DASH bridge, embedded/external MPV, VLC) falls
+  back to the HTML5 player. External players cannot receive KODIPROP ClearKey
+  configuration (VLC upstream feature request #29465).
+- ClearKey EME works in stock Electron (`org.w3.clearkey`; no Widevine CDM
+  required) — EME needs a secure context, which `file://` (packaged) and
+  `http://localhost` (dev/PWA) both satisfy. Widevine/FairPlay are out of
+  scope (castLabs fork + VMP signing).
+
+**Testing:** offline VP9+Opus CENC fixtures in
+`apps/web-e2e/src/fixtures/dash/` (generated with ffmpeg + Shaka Packager —
+see the README there for why), e2e suites `web-e2e:src/dash-clearkey.e2e.ts`
+(Chromium; the Angular service worker is blocked because SW-routed requests
+bypass Playwright interception) and
+`electron-backend-e2e:src/dash-clearkey.e2e.ts` (real ClearKey EME in
+Electron).
+
 ## Interfaces
 
 ### Channel Interface
@@ -689,6 +1044,8 @@ interface Channel {
         'user-agent': string;
         origin: string;
     };
+    /** ClearKey DRM extracted from #KODIPROP lines (DASH channels). */
+    drm?: ChannelDrm;
 }
 ```
 
@@ -722,16 +1079,21 @@ interface EpgProgram {
 
 ## Routes
 
+Routes live in `libs/playlist/m3u/feature-player/src/lib/m3u-workspace.routes.ts`
+(`createM3uWorkspaceRoutes()`), nested under the workspace shell:
+
 ```
-/playlists/:id          # Video player with playlist
-/iptv                   # Default IPTV route
+/workspace/playlists/:id            # M3U player (redirects to .../all)
+/workspace/playlists/:id/favorites  # Favorites collection view
+/workspace/playlists/:id/recent     # Recently viewed collection view
+/workspace/playlists/:id/:view      # Video player with channel list view
 ```
 
 ## Adding New Features
 
-### To add a new tab to channel list:
+### To add a new view to channel list:
 
-1. Create component in `channel-list-container/new-tab/`
+1. Create component in `channel-list-container/new-view/`
 2. Accept inputs: `channels`, `channelEpgMap`, `progressTick`, `shouldShowEpg`, `activeChannelUrl`
 3. Emit `channelSelected` output
 4. Add to parent template and imports
@@ -746,4 +1108,6 @@ interface EpgProgram {
 
 1. Dispatch `FavoritesActions.updateFavorites` for toggle
 2. Dispatch `FavoritesActions.setFavorites` for reordering
-3. Effects automatically persist to database
+3. Dispatch `FavoritesActions.hydrateFavorites` only when copying values that
+   were already read from persistence into NgRx
+4. Effects persist the two user-mutation actions; hydration is reducer-only
diff --git a/docs/architecture/nx-workspace-boundaries.md b/docs/architecture/nx-workspace-boundaries.md
index 44a43772c..17c085040 100644
--- a/docs/architecture/nx-workspace-boundaries.md
+++ b/docs/architecture/nx-workspace-boundaries.md
@@ -92,6 +92,9 @@ pulling the lazy-loaded workspace shell feature bundle into the initial chunk.
 ## CI Enforcement
 
 The `Lint` job in `.github/workflows/ci.yml` runs
-`pnpm nx run-many --target=lint --all` on every PR, so
+`pnpm nx affected --target=lint` on PRs and
+`pnpm nx run-many --target=lint --all` on master pushes, so
 `@nx/enforce-module-boundaries` violations, legacy bare-alias imports, and
-`max-lines` violations fail CI. Run `pnpm run lint` locally before pushing.
+`max-lines` violations fail CI. Root config or lockfile changes mark every
+project affected, so the boundary rules cannot be dodged on PRs. Run
+`pnpm run lint` locally before pushing.
diff --git a/docs/architecture/player-controls-contract.md b/docs/architecture/player-controls-contract.md
new file mode 100644
index 000000000..9a8778b07
--- /dev/null
+++ b/docs/architecture/player-controls-contract.md
@@ -0,0 +1,726 @@
+# Player-Controls Contract
+
+This document is the canonical reference for IPTVnator's additive,
+engine-agnostic player-controls contract and shared default controls.
+Embedded MPV rendering and native-view bounds behavior remain documented in
+[embedded-mpv-native.md](./embedded-mpv-native.md).
+
+## Current status
+
+The shared-controls foundation from PR #1148 now supports four runtime
+consumers and includes:
+
+- the `PlayerController` contract, default state, and capability presets;
+- the standalone `app-player-controls` presentation component and its
+  transient-state collaborators;
+- a generic `WebVideoControlsAdapter` plus small host helpers;
+- standard element picture-in-picture through that adapter for the guarded web
+  consumers;
+- a persisted, default-off web-player preference resolved through an immutable
+  per-host rollout token;
+- the component-scoped `EmbeddedMpvControlsAdapter`;
+- an `EmbeddedMpvPlayerComponent` host integration for the frame-copy engine;
+- a preference-guarded `HtmlVideoPlayerComponent` integration backed by
+  `WebVideoControlsAdapter` and a player-local engine bridge;
+- a preference-guarded `VjsPlayerComponent` integration backed by a
+  component-scoped `WebVideoControlsAdapter` and Video.js bridge;
+- a preference-guarded `ArtPlayerComponent` integration backed by a
+  component-scoped `WebVideoControlsAdapter`, neutral web-video source bridge,
+  and player-local source/video sessions; and
+- focused unit/component tests.
+
+When Embedded MPV reports `engine: 'frame-copy'`, the component mounts
+`app-player-controls` over the DOM canvas and routes state and commands through
+`EmbeddedMpvControlsAdapter`. When it reports the native-view engine, the
+component keeps the existing compositor-safe controls dock. Exactly one of
+those control systems is active at a time.
+
+When `WEB_PLAYER_SHARED_CONTROLS` is enabled, the built-in HTML5 player mounts
+the same presentation component over its real player shell and disables the
+native video controls. Its neutral source bridge supplies HLS/Shaka/native tracks,
+corrected MPEG-TS VOD duration, and authoritative live/VOD metadata to the
+generic web adapter. When the host token resolves to false, the native controls
+and legacy series navigation remain unchanged and the adapter is not attached.
+
+Video.js consumes the same token and shared presentation atomically. Its bridge
+binds the adapter to the current Video.js Tech `<video>` and rebinds after
+`playerreset`, while focused collaborators expose Video.js audio/text tracks
+and manage raw MPEG-TS playback. When the host token resolves to false, Video.js
+keeps its existing skin and legacy series navigation.
+
+ArtPlayer is the fourth consumer. Its source session owns HLS, MPEG-TS, native
+source selection, and delayed `customType` callbacks, while the neutral
+web-video source bridge exposes HLS/Shaka/native tracks, caption preference, and
+MPEG-TS VOD duration to the adapter. Its video session owns native media and
+ArtPlayer event listeners. Shared mode uses authoritative live/VOD metadata,
+reapplies the app volume directly to the media element after ArtPlayer restores
+its own stored volume, disables vendor chrome/hotkeys, and places a transparent
+event-capture layer over ArtPlayer so shared controls exclusively own surface
+clicks and double-clicks. Playback diagnostics gate shared interaction and exit
+only the ArtPlayer shell's own fullscreen. Source replacement and teardown
+remove exact listeners and engines, and destroyed sessions ignore stale delayed
+`customType` callbacks. When the host token resolves to false, the existing
+ArtPlayer skin, source behavior, and legacy series navigation remain unchanged.
+
+With shared controls enabled, HTML5, Video.js, and ArtPlayer expose standard
+element picture-in-picture through the adapter's attached `<video>`. Shared
+ArtPlayer keeps its vendor `pip` option disabled so the shared button is the
+only PiP owner. The preference-off native/vendor paths remain unchanged.
+Embedded MPV advertises no PiP capability and its command is a no-op.
+
+`Settings.webPlayerSharedControls` remains default-off. `WebPlayerViewComponent`
+snapshots it into `WEB_PLAYER_SHARED_CONTROLS` when a new player host is
+created, so HTML5, Video.js, and ArtPlayer switch atomically without an
+application restart. The parent `/workspace` route awaits the initial
+`SettingsStore` load, including for cold-start direct links to workspace
+children, before any player host can take this snapshot. Existing sessions
+never change controls mode in place.
+
+The shared-controls architecture remains engine-selective: frame-copy can use
+normal DOM layering, while the native platform view cannot. The integration
+also includes a recording coordinator that correlates asynchronous snapshots
+with the active playback/session owner, serializes toggles, and cancels pending
+ownership when the session, playback, engine, or component changes.
+
+## Why this exists
+
+Historically each playback engine owned both media integration and controls UI.
+That made behavior drift likely and made a controls redesign depend on each
+engine's implementation details.
+
+The shared contract separates:
+
+- **presentation** — what the controls render and which interactions they own;
+- **state and capabilities** — the engine-neutral snapshot the UI reads; and
+- **commands** — the small imperative surface an engine adapter implements.
+
+Rendering and compositing remain engine responsibilities. In particular, the
+contract does not make a native video surface behave like DOM content.
+
+## Landed architecture
+
+```text
+┌──────────────────────────────────────────────────────────────────────┐
+│ app-player-controls                                                  │
+│ Standalone shared presentation component                            │
+│ Menus · feedback · auto-hide · DOM fullscreen · shortcuts · scrub UI│
+└───────────────────────────────┬──────────────────────────────────────┘
+                                │ input.required<PlayerController>()
+                                ▼
+┌──────────────────────────────────────────────────────────────────────┐
+│ PlayerController                                                     │
+│ capabilities: Signal<PlayerControlsCapabilities>                    │
+│ state:        Signal<PlayerControlsState>                           │
+│ commands:     PlayerControlsCommands                                │
+└───────────────────────────────┬──────────────────────────────────────┘
+                                │
+                   adapters implement this boundary
+                                │
+             ┌──────────────────┴──────────────────┐
+             ▼                                     ▼
+┌──────────────────────────────┐     ┌──────────────────────────────┐
+│ WebVideoControlsAdapter      │     │ EmbeddedMpvControlsAdapter   │
+│ Generic, component-scoped    │     │ Component-scoped             │
+└──────────────┬───────────────┘     └──────────────┬───────────────┘
+               │                                    │
+               ▼                                    ▼
+┌──────────────────────────────┐     ┌──────────────────────────────┐
+│ Per-host preference snapshot │     │ EmbeddedMpvPlayerComponent   │
+│ HTML5 + Video.js + ArtPlayer │     │ frame-copy: shared controls  │
+│ true: shared controls        │     │ native-view: legacy dock     │
+│ false: existing controls     │     └──────────────────────────────┘
+└──────────────────────────────┘
+```
+
+The embedded host selects controls from the reported engine before rendering
+them. It never mounts the shared overlay and legacy dock together.
+The HTML5, Video.js, and ArtPlayer hosts likewise select their existing or
+shared controls before rendering and never attach the web adapter while the
+preference-off path is active.
+
+## The contract
+
+The contract is defined in
+`libs/ui/playback/src/lib/player-controls/player-controls.model.ts`.
+
+```ts
+interface PlayerController {
+    readonly capabilities: Signal<PlayerControlsCapabilities>;
+    readonly state: Signal<PlayerControlsState>;
+    readonly commands: PlayerControlsCommands;
+}
+```
+
+### Capabilities
+
+`PlayerControlsCapabilities` contains booleans for `seek`, `volume`,
+`audioTracks`, `subtitles`, `playbackSpeed`, `aspectRatio`, `recording`,
+`pictureInPicture`, `fullscreen`, and `seriesNavigation`.
+
+The default is all-false. An adapter enables only features that its engine and
+current runtime support. Capability flags primarily control whether optional UI
+is rendered; state such as `canSeek`, `canPreviousEpisode`, and
+`canNextEpisode` guards the corresponding action at runtime.
+
+### State
+
+`PlayerControlsState` is one reactive engine-neutral snapshot:
+
+- playback status, loading/error message, and stalled state;
+- current position, optional duration, live/VOD classification, and seekability;
+- volume;
+- pre-labelled audio/subtitle tracks and subtitle-enabled state;
+- playback speed and aspect-ratio selections/presets;
+- recording state;
+- picture-in-picture active state and runtime availability; and
+- previous/next episode availability.
+
+Adapters translate engine types into this model. The controls component must not
+import Video.js, hls.js, ArtPlayer, libmpv, Electron IPC, or native-view types.
+Recording state may expose a `transitionKey` that identifies its current
+playback/session owner. When that key changes, shared feedback adopts the new
+active baseline without flashing a start or saved transition from the previous
+owner.
+
+### Commands
+
+`PlayerControlsCommands` is an imperative, fire-and-forget surface:
+
+- `togglePlay`
+- `seekTo` / `seekBy`
+- `setVolume`
+- `setAudioTrack` / `setSubtitleTrack`
+- `setPlaybackSpeed`
+- `setAspectRatio`
+- `toggleRecording`
+- `togglePictureInPicture`
+
+Episode navigation is deliberately exposed as component outputs
+(`previousEpisodeRequested` and `nextEpisodeRequested`) because the owning
+playlist/portal feature decides which item to play.
+
+Fullscreen is also outside the engine command contract. The landed component
+uses `ControlsFullscreen`, which operates on the supplied DOM player surface
+through `requestFullscreen()` / `document.exitFullscreen()`. There is no
+fullscreen delegate or native-fullscreen IPC path. `ControlsFullscreen.sync()`
+reconciles state when a surface attaches or changes, including when that
+surface is already fullscreen. The Embedded MPV host's existing
+`fullscreenchange` listener still triggers bounds sync so frame-copy render
+size follows the fullscreen DOM surface.
+
+## Shared default controls
+
+`PlayerControlsComponent` is a standalone presentation component. The
+frame-copy Embedded MPV host mounts it over its DOM canvas, and the guarded
+HTML5, Video.js, and ArtPlayer hosts mount it over
+`.html-video-player-shell`, `.vjs-player-shell`, and `.art-player-shell`,
+respectively.
+
+It owns only transient presentation behavior:
+
+- `ControlsMenuState` — single-open popovers;
+- `ControlsFeedback` — temporary action feedback;
+- `ControlsVisibility` — reveal and auto-hide state;
+- `ControlsFullscreen` — DOM fullscreen;
+- `ControlsVolume` — persisted/optimistic volume state reconciled from
+  controller state;
+- `ControlsShortcuts` — document keyboard routing;
+- `ControlsSurface` — pointer/click/double-click surface interactions;
+- `ControlsTimeline` — scrub state and timeline projections; and
+- `controls-view-model.ts` — derived display state.
+
+### Fullscreen media title
+
+The component accepts an optional `mediaTitle` input
+(`PlayerMediaTitle { primary, secondary? }`) with display-ready strings — the
+movie title, channel name, or series name, plus an optional second line such
+as the `S01E03` episode label. The overlay renders at the top of the player
+only in fullscreen while the controls are revealed, follows the same
+auto-hide transition as the bottom bar, and is pointer-transparent. Outside
+fullscreen the surrounding page chrome already names the content, so the
+overlay stays hidden.
+
+Hosts supply the value: `WebPlayerViewComponent` derives a single-line title
+from the resolved playback (skipping raw stream-URL fallbacks) unless its own
+`mediaTitle` input was set, and `PortalInlinePlayerComponent` builds the
+two-line series form from its `seriesTitle` input plus the episode metadata
+label. The Xtream and Stalker series detail views pass the series name via
+`seriesTitle`; movie and live hosts need no extra wiring because
+`playback.title` already names the content.
+
+### Keyboard ownership
+
+Unmodified Space/K, F, arrow keys, and M are playback shortcuts. Playback keys
+with Meta/Cmd, Control, or Alt are ignored and are not prevented, so app and OS
+accelerators retain ownership. Escape remains available to close controls
+popovers even when a modifier is held or playback shortcuts are unavailable.
+Buttons, form controls, links, ARIA menu controls, and content-editable targets
+are also ignored anywhere in the event's composed path.
+
+Action-specific keys are prevented only when the active controller can handle
+them: seek requires both capability and current seekability, volume/mute
+requires volume capability, and fullscreen requires an available DOM
+fullscreen path. Unsupported keys retain their browser or application default.
+
+When multiple shared-controls instances are mounted, the first attached
+instance owns shortcuts initially. Pointer, focus, or control interaction
+activates that instance through the normal reveal path. If the active instance
+becomes unavailable, playback shortcuts fall back to the most recently attached
+available instance; detaching the active instance also transfers ownership.
+Escape remains a global dismissal action and closes popovers on every mounted
+controls instance.
+
+Auto-hide pauses while the pointer is over the controls bar or keyboard focus
+is anywhere inside it. Focus entering a hidden bar reveals it; moving focus
+between controls does not restart hiding, and leaving the bar resumes the normal
+hide delay. In fullscreen playback, hiding the controls also hides the pointer
+over both the controls host and the supplied player surface; revealing controls
+or destroying the component restores the surface's previous inline cursor.
+
+Open popovers are reconciled against the current capability and state snapshot.
+If controls are hidden, a capability is removed, or the corresponding track
+list becomes unavailable, the stale popover closes instead of pinning the
+controls visible or consuming the next surface click.
+
+Setting `showControls` to false also detaches playback-surface pointer, click,
+and double-click handling. A hidden shared-controls instance therefore cannot
+reveal, pause, or fullscreen the player underneath another UI layer.
+
+The frame-copy Embedded MPV host also disables shared playback shortcuts while
+a modal/backdrop overlay is active, so transport, seek, volume, and fullscreen
+actions cannot leak through it. Escape keeps the shared component's generic
+popover-dismissal behavior.
+
+The HTML5, Video.js, and ArtPlayer hosts apply the same ownership rule while a
+playback diagnostic is visible: `WebPlayerViewComponent` passes
+`interactionEnabled = visiblePlaybackDiagnostic() === null`, and all three
+components bind that value to `showControls` and
+`shortcutsEnabled`. If the active player shell owns DOM fullscreen, its host
+exits fullscreen before hiding the controls so the sibling diagnostic banner
+and its retry/fallback actions remain visible; fullscreen owned by another
+element is left untouched. Retrying playback or clearing the diagnostic
+restores both interaction paths.
+
+Frame-copy recording transitions use the adapter's playback/session identity as
+their `transitionKey`. Session disposal, retry, channel changes, and engine
+handoff therefore clear stale recording ownership without showing a false
+`RECORDING_SAVED` confirmation.
+
+### Timeline scrubbing
+
+Timeline input is previewed locally while the user drags. The slider value,
+played progress, accessible value text, and current-time label all render the
+preview. The component sends exactly one `seekTo` command on the committed
+`change` event, then clears the preview and returns to controller-reported
+state. Non-finite values are ignored and finite values are clamped to the
+available `[0, duration]` range.
+
+The scrub slider and seek shortcuts require both the `seek` capability and
+seekable runtime state. When seek is unsupported, the slider is omitted while
+live and recording status remain visible. Volume shortcuts likewise require the
+`volume` capability.
+
+When a volume-capable controller first attaches, an existing `localStorage`
+volume preference is applied before the first controller snapshot can reconcile
+the optimistic value. With no saved preference, the controller snapshot remains
+authoritative. If the same controller loses and later regains the volume
+capability, initialization runs again for the new capability epoch. The volume
+slider intentionally remains continuous: each volume `input` applies the
+optimistic volume immediately.
+
+## Web adapter and web-engine bridges
+
+`WebVideoControlsAdapter` can translate an `HTMLVideoElement` into the shared
+contract. It uses DOM/media events and accepts optional engine-specific track
+accessors through `WebVideoControlsOptions`, so the adapter itself stays usable
+in the PWA and does not import a concrete web engine.
+
+### Caption preference in both modes
+
+The `Settings.showCaptions` preference is **not** part of the rollout gate. It
+is engine state, not controls UI, so HTML5, Video.js, and ArtPlayer apply it
+whether or not their host snapshot enables `WEB_PLAYER_SHARED_CONTROLS`. Shared
+controls route it through their controls bridge; the preference-off paths use
+the same helpers without an adapter — `WebVideoSourceTracks` for HTML5 and
+ArtPlayer, `VjsLegacyTracks` for Video.js. Both apply the preference when a
+source binds and re-apply it as the engine adds or switches text tracks, which
+a one-shot check at playback start could not do (#1155).
+
+The two modes differ in **how long** the preference stays enforced, because
+they differ in who owns the caption UI:
+
+- **Shared controls: authoritative.** The preference holds for the whole
+  session; user intent arrives through `setSubtitleTrack`, which records an
+  explicit override (including `-1` for off) that wins until the source changes.
+- **Vendor chrome: source-default.** The engine still renders its own caption
+  menu, so the preference only seeds each new source and is released once the
+  media element reports `playing`. Enforcing it for the whole session would
+  make that menu inert.
+
+The mode is selected by passing a `playbackStarted` probe to the track helpers;
+shared controls omit it. All three helpers take it — HLS, native text tracks,
+and Shaka. For DASH the seed happens inside `ShakaVideoSession.start()` once the
+manifest is loaded, so the helper only has to stop re-suppressing afterwards. `WebVideoSourceTracks` owns the probe for HTML5 and
+ArtPlayer (a `playing` listener on the media element, reset on every
+`setSource`); `VjsLegacyTracks` owns it for Video.js (the player's own `playing`
+event, reset on every `clear`). In source-default mode the HLS helper also
+_deselects_ the track (`subtitleTrack = -1`) instead of hiding it: hls.js
+applies `subtitleDisplay` to whatever the vendor menu picks, so suppressing
+display would silently override the user, and a `-1` assignment additionally
+clears hls.js' own default-track selection so it cannot reselect one later.
+
+`WebPlayerViewComponent` reads the preference from `SettingsStore` rather than
+from a host input, so every host — the M3U player, Xtream and Stalker live
+layouts, and the portal detail inline player — gets it without wiring.
+
+### Standard element picture-in-picture
+
+Picture-in-picture is part of the existing default-off shared web-controls
+rollout. It is available through standard element PiP for HTML5, Video.js, and
+ArtPlayer only when their host snapshot enables `WEB_PLAYER_SHARED_CONTROLS`.
+The preference-off HTML5 native controls, Video.js skin, and ArtPlayer vendor
+controls keep their previous behavior. Shared ArtPlayer explicitly keeps vendor
+`pip: false`, leaving the shared action as the single PiP owner.
+
+The contract exposes:
+
+- capability `pictureInPicture`;
+- state `pictureInPictureActive` and `canPictureInPicture`; and
+- command `togglePictureInPicture()`.
+
+The shared button renders only when the capability is present, immediately
+before fullscreen. It uses the active state for pressed, icon, and enter/exit
+semantics. When inactive, entry requires
+`readyState >= HTMLMediaElement.HAVE_METADATA`; when active, exact-owner exit
+remains available regardless of entry readiness or request support, provided
+the exit API exists. Any pending PiP operation disables the action.
+
+`WebVideoControlsAdapter` delegates standard PiP API access and operation
+lifecycle to `WebVideoPictureInPictureController`, which reads the adapter's
+current binding and the attached `HTMLVideoElement`'s `ownerDocument`. Browser
+`enterpictureinpicture`/`leavepictureinpicture` events and the document's exact
+`pictureInPictureElement` remain authoritative; command completion never
+optimistically changes the active state.
+
+The controller invokes `requestPictureInPicture()` or `exitPictureInPicture()`
+synchronously from `togglePictureInPicture()` so browser user activation is
+preserved, then contains asynchronous settlement. Only one enter/exit operation
+may be pending. A binding generation plus exact video identity prevents a stale
+completion from clearing or changing the new binding. Replacement or teardown
+exits PiP only when the old video is the document's exact owner; a stale
+successful entry receives the same exact-owner cleanup and never exits an
+unrelated PiP element.
+
+Video.js Tech reset and ArtPlayer video rebuild paths detach the old binding,
+perform exact-owner cleanup, and bind the replacement video. HTML5 source
+changes on a retained video target, along with ordinary same-element
+source/media events, preserve active PiP.
+
+Standard element PiP displays the browser/OS video surface, not Angular shared
+control chrome. Subtitle rendering in that surface is browser-dependent.
+AirPlay, Cast, Document Picture-in-Picture, a PiP keyboard shortcut, and an
+Embedded MPV popup or native mini-window are out of scope.
+
+Native media events refresh the adapter automatically. An engine host must call
+the public `refresh()` hook after engine-specific getters change
+without a corresponding media event, including track lists, corrected duration,
+or live/VOD classification. Source, readiness, progress, seeking, and playback
+events that can invalidate the snapshot are observed directly.
+
+Audio and subtitle capabilities are advertised only when the injected getter
+returns a selectable list and the corresponding setter exists. Track setters
+may complete synchronously or asynchronously; the adapter refreshes after
+successful completion and contains synchronous throws or rejected promises
+while an engine is changing source.
+
+An injected non-`NaN` duration is authoritative, including positive infinity;
+`NaN` falls back to the video element. Without an explicit `isLive` accessor,
+only positive infinity implies live playback, so unknown duration is not
+temporarily mislabeled as live. An attached element with no resource maps to
+`idle`, paused preload/warm-up remains playable, and only actively playing media
+with insufficient data maps to `loading`.
+
+`WebVideoSourceControlsBridge` is the neutral source bridge shared by the HTML5
+and ArtPlayer integrations. The HTML5-local bridge/helper filenames remain
+compatibility aliases. The bridge attaches the adapter to the host video element
+and delegates HLS and native-text-track behavior to focused collaborators. HLS
+track IDs remain the list indices accepted by hls.js. Native caption/subtitle
+IDs remain stable for the lifetime of a source through a `WeakMap`, even when
+the browser removes or reorders tracks. Source replacement removes track
+listeners before the old HLS instance is destroyed, resets per-source subtitle
+state, and leaves exactly one engine source bound.
+
+Live/VOD classification comes from `WebPlayerViewComponent.resolvedIsLive`:
+explicit `ResolvedPortalPlayback.isLive` wins, otherwise content metadata means
+VOD and its absence means live. The same computed value configures Video.js,
+the HTML5 and ArtPlayer bridges, ArtPlayer itself, and mpegts.js; media duration
+is never used to infer the classification. Changing authoritative metadata
+restarts an active source when its engine must be recreated with a different
+live/VOD mode.
+
+Raw MPEG-TS VOD can expose `video.duration === Infinity`. For that source only,
+the neutral bridge used by HTML5 and ArtPlayer uses the first finite positive
+value from `video.duration`, the last valid seekable end, or the last valid
+buffered end. Without a known duration it keeps the source classified as VOD
+while seeking remains unavailable.
+
+`VjsPlayerControlsBridge` attaches the component-scoped adapter to the current
+Video.js Tech `<video>`. Video.js can replace that element during `reset()`, so
+the component reacquires it after `playerreset`, rebinds native media events,
+and attaches the bridge to the replacement before activating the new source.
+Audio and subtitle helpers assign source-lifetime IDs through `WeakMap`s, so
+track reordering or list refreshes do not change the IDs exposed to shared
+controls.
+
+Video.js subtitle selection preserves an explicit shared-controls override,
+including the `-1` off selection. Without an override, disabling the global
+caption preference suppresses the currently showing track and restores that
+same track when the preference returns, if it still belongs to the active
+source. Source changes reset both stable-ID maps and per-source subtitle state.
+The bridge reads duration through `player.duration()` because Video.js may
+correct or project a value that differs from the current Tech element.
+
+For reset-driven source changes, raw MPEG-TS activation is deferred until
+`playerreset`. Video.js can otherwise defer `reset()` behind a pending
+`play()`, so a dedicated coordinator pauses first and calls `reset()` only
+after `player.paused()` is true. Multiple reset-required changes coalesce, and
+every `playerreset` rebinds the current Tech before applying only the latest
+desired source. The coordinator snapshots actual Video.js volume, suppresses
+the reset-generated volume=1 event, restores the snapshot, and tracks whether a
+pre-ready reset already applied the source. An authoritative live/VOD metadata
+change restarts active raw MPEG-TS with the corrected mode. For MPEG-TS VOD,
+the session projects the last finite seekable or buffered end through
+`player.duration()`.
+
+`web-video-controls.host.ts` still contains small generic
+attachment/projection helpers. Video.js uses its dedicated bridge directly.
+HTML5 and ArtPlayer share the neutral source bridge and HLS/native-track
+collaborators under `web-video-support/`.
+
+The rollout symbols and setting are:
+
+| Symbol / setting                     |          Default | Current effect                                                          |
+| ------------------------------------ | ---------------: | ----------------------------------------------------------------------- |
+| `Settings.webPlayerSharedControls`   |          `false` | Persisted experimental opt-in shown for HTML5, Video.js, and ArtPlayer. |
+| `WEB_PLAYER_SHARED_CONTROLS_ENABLED` |          `false` | Default-off fallback for direct component use and focused tests.        |
+| `WEB_PLAYER_SHARED_CONTROLS`         | session snapshot | Component-scoped immutable value consumed by the three web engines.     |
+
+With the token enabled, Video.js also disables native controls, Video.js
+single-click and double-click actions, Video.js hotkeys, and spatial navigation.
+This leaves surface clicks, double-click fullscreen, and playback shortcuts
+owned exclusively by `app-player-controls`. With the token disabled, existing
+Video.js options, plugins, skin, audio-track menu, and series navigation remain
+unchanged.
+
+With the token enabled, ArtPlayer disables optional vendor chrome, hotkeys, and
+gestures. A transparent capture layer above ArtPlayer's video surface blocks
+its always-installed click and double-click handlers while still bubbling
+events to the shared controls surface. The shared path reapplies the app volume
+directly to `player.video` after ArtPlayer restores `artplayer_settings.volume`,
+so vendor storage cannot override the app-wide preference. With the token
+disabled, the existing ArtPlayer options, HLS audio settings, skin, source
+semantics, stored volume behavior, and series navigation remain unchanged.
+
+## Embedded MPV rendering constraints
+
+The shared contract does not replace either Embedded MPV renderer. The host
+uses the renderer's reported engine to choose the compatible controls UI.
+
+The web-player preference does not affect Embedded MPV. Frame-copy always uses
+the shared DOM controls, while native-view keeps its compositor-safe legacy
+dock.
+
+`EmbeddedMpvControlsAdapter` reports `pictureInPicture: false`,
+`pictureInPictureActive: false`, and `canPictureInPicture: false`;
+`togglePictureInPicture()` is a no-op. Neither renderer opens an MPV
+popup/mini-window.
+
+### Frame-copy engine
+
+The experimental frame-copy engine uploads helper-produced frames to
+`<canvas data-embedded-mpv-frame>`. The canvas is ordinary DOM, so controls,
+dialogs, and other DOM layers can stack above it normally. This path is the
+first runtime consumer of `app-player-controls`, backed by a component-scoped
+`EmbeddedMpvControlsAdapter`.
+
+The shared controls receive the whole player root as their DOM surface. Turning
+`showControls` off detaches surface interaction and playback-shortcut
+ownership; Escape remains available for generic popover dismissal.
+Backdrop-bearing overlays disable playback shortcuts. Fullscreen uses the DOM
+Fullscreen API on that root, while the Embedded MPV component continues bounds
+sync so the helper renders at the current viewport size.
+
+Recording snapshots arrive independently from command promise settlement. The
+adapter therefore treats snapshots as observations rather than acknowledgments
+by themselves: it accepts only fresh same-session transitions, permits only one
+pending toggle, waits for command settlement and the expected state, preserves
+addon error text, and cancels pending state/feedback when playback, session, or
+engine ownership changes. Command replies are reconciled by snapshot freshness:
+a same-session broadcast that arrived while IPC was pending wins over an older
+or same-timestamp reply, so a latched recording acknowledgement cannot be rolled
+back to the command's stale baseline.
+
+### Native-view engine
+
+The native MPV surface paints outside Chromium's DOM stacking model. It keeps
+the compositor-safe fixed controls dock below the viewport. Modal overlays hide
+the native surface with `HIDDEN_BOUNDS`; control menus render as horizontal
+panels inside the fixed-height dock strip, so they stay interactive without
+any bounds change.
+
+The transparent BrowserWindow / `NSWindowBelow` tunnel-and-backdrop approach is
+not the shipped architecture. The shared-controls integration does not add
+transparency changes, backdrop holes, native fullscreen IPC, native-view
+attachment APIs, or bounds-tick machinery.
+
+See [embedded-mpv-native.md](./embedded-mpv-native.md) for the authoritative
+renderer, bounds, and platform details.
+
+## Follow-up integrations
+
+The remaining design seams are:
+
+1. **Native-view UI** — retain the compositor-safe dock unless the native
+   engine's compositing architecture changes independently. A native-view
+   migration is not part of the frame-copy rollout.
+2. **Background playback** — introduce a persistent player/session host above
+   route-scoped views. The contract is lifecycle-agnostic; this integration
+   does not add that host or change current teardown behavior.
+
+## File map
+
+Landed in #1148:
+
+```text
+libs/ui/playback/src/lib/player-controls/
+├── player-controls.model.ts
+├── player-controls-defaults.ts
+├── player-controls.component.ts
+├── player-controls.component.html
+├── player-controls.component.scss
+├── controls-feedback.ts
+├── controls-format.utils.ts
+├── controls-fullscreen.ts
+├── controls-menu-selection.ts
+├── controls-menu-state.ts
+├── controls-shortcuts.ts
+├── controls-surface.ts
+├── controls-view-model.ts
+├── controls-visibility.ts
+├── controls-volume.ts
+├── web-player-controls.flag.ts
+├── web-video-controls.adapter.ts
+├── web-video-controls.host.ts
+├── web-video-controls.media-helpers.ts
+├── web-video-picture-in-picture.controller.ts
+└── index.ts
+```
+
+Focused specs live beside these files. The subtree is exported from
+`libs/ui/playback/src/index.ts`.
+
+The Embedded MPV integration lives in:
+
+```text
+libs/ui/playback/src/lib/embedded-mpv-player/
+├── embedded-mpv-controls.adapter.ts
+├── embedded-mpv-controls-recording.ts
+├── embedded-mpv-controls-recording-feedback.ts
+├── embedded-mpv-player.component.ts
+├── embedded-mpv-player.component.html
+└── embedded-mpv-session-controller.ts
+```
+
+The adapter and recording helpers are component-scoped through
+`EmbeddedMpvPlayerComponent`.
+
+The neutral web-video source support shared by HTML5 and ArtPlayer lives in:
+
+```text
+libs/ui/playback/src/lib/web-video-support/
+├── web-video-hls-controls.ts
+├── web-video-native-text-tracks.ts
+├── web-video-source-tracks.ts
+└── web-video-source-controls.bridge.ts
+```
+
+`WebVideoSourceTracks` owns source-local HLS/Shaka/native track projection,
+caption preference and explicit subtitle-off state, and exact track-list
+listener cleanup. It has no controls dependency, so the preference-off players
+use it directly. `WebVideoSourceControlsBridge` wraps it for shared controls
+and adds adapter attach/detach, adapter refresh, and MPEG-TS VOD duration
+correction.
+
+The guarded HTML5 integration lives in:
+
+```text
+libs/ui/playback/src/lib/html-video-player/
+├── html-video-element-session.ts
+├── html-video-player-controls.bridge.ts
+├── html-video-player-hls-controls.ts
+├── html-video-player-native-text-tracks.ts
+├── html-video-player.component.ts
+└── html-video-player.component.html
+```
+
+`HtmlVideoPlayerComponent` provides a component-scoped
+`WebVideoControlsAdapter`. Its bridge/helper filenames re-export the neutral
+web-video support so existing imports and focused specs remain stable.
+`HtmlVideoElementSession` separately owns native video-event attachment,
+persisted volume, and start-time/time/ended propagation. Captions are not its
+concern in either mode: the component binds `WebVideoSourceTracks` alongside
+its controls bridge and feeds both the same active source.
+
+The guarded Video.js integration lives in:
+
+```text
+libs/ui/playback/src/lib/vjs-player/
+├── vjs-audio-tracks.ts
+├── vjs-legacy-tracks.ts
+├── vjs-mpegts-session.ts
+├── vjs-player-controls.bridge.ts
+├── vjs-player-reset-coordinator.ts
+├── vjs-player-setup.ts
+├── vjs-player.component.ts
+├── vjs-player.component.html
+├── vjs-text-tracks.ts
+└── vjs-video-element-session.ts
+```
+
+`VjsPlayerComponent` provides a component-scoped `WebVideoControlsAdapter`.
+Its bridge and track helpers own current-Tech attachment, source-lifetime track
+identity, caption preference/override projection, and exact listener cleanup.
+`VjsMpegTsSession` owns raw MPEG-TS attachment and VOD duration correction,
+`VjsPlayerResetCoordinator` owns pause/coalesced-reset ordering and volume
+preservation, while `VjsVideoElementSession` owns native Tech-element
+playback/ended events.
+
+The guarded ArtPlayer integration lives in:
+
+```text
+libs/ui/playback/src/lib/art-player/
+├── art-player-audio-tracks.ts
+├── art-player-setup.ts
+├── art-player-source-session.ts
+├── art-player-video-session.ts
+├── art-player.component.ts
+├── art-player.component.html
+└── art-player.component.scss
+```
+
+`ArtPlayerComponent` provides a component-scoped `WebVideoControlsAdapter`.
+`ArtPlayerSourceSession` owns HLS/DASH(Shaka)/MPEG-TS/native engines, the neutral source
+bridge, exact engine/listener cleanup, and a destroyed-session guard for
+ArtPlayer's delayed `customType` dispatch. `ArtPlayerVideoSession` owns native
+media errors, readiness, volume persistence, ended/time updates, and exact
+event cleanup. The setup helper preserves the legacy option set when the host
+token resolves to false and disables vendor interaction owners when it resolves
+to true; the component's transparent capture layer blocks ArtPlayer's core
+surface handlers.
+
+Focused specs cover each web engine's preference-off compatibility path,
+shared-controls rendering and diagnostic interaction gating, source/element
+replacement, track-list lifecycle and stable IDs, caption preference and
+explicit-off behavior, MPEG-TS live/VOD handling and duration projection,
+volume preservation/authority, stale ArtPlayer `customType` callbacks, and
+collaborator teardown. Persistent/background player ownership has not landed.
diff --git a/docs/architecture/playlist-backup-restore.md b/docs/architecture/playlist-backup-restore.md
index 3a4589bf8..2f3f6f045 100644
--- a/docs/architecture/playlist-backup-restore.md
+++ b/docs/architecture/playlist-backup-restore.md
@@ -5,7 +5,9 @@ settings screen.
 
 ## Entry Points
 
-- UI: `/Users/4gray/Code/iptvnator/apps/web/src/app/settings/settings.component.ts`
+- UI: `/Users/4gray/Code/iptvnator/apps/web/src/app/settings/settings-backup-section.component.ts`
+  (embedded in `settings.component.html`), with the file read/handoff in
+  `/Users/4gray/Code/iptvnator/apps/web/src/app/settings/settings-backup.facade.ts`
 - Backup service: `/Users/4gray/Code/iptvnator/libs/services/src/lib/playlist-backup.service.ts`
 - Manifest types: `/Users/4gray/Code/iptvnator/libs/shared/interfaces/src/lib/playlist-backup.interface.ts`
 - Xtream pending restore storage:
@@ -102,7 +104,9 @@ Only EPG source URLs are backed up at the app-settings level.
 
 ## Import Flow
 
-The settings component hands file contents to `PlaylistBackupService`.
+The settings backup facade (`settings-backup.facade.ts`, driven by
+`settings-backup-section.component.ts`) reads the file (`file.text()`) and
+hands its contents to `PlaylistBackupService.importBackup()`.
 
 The service:
 
@@ -146,6 +150,18 @@ Runtime contract:
     - settings backup import
     - Xtream content initialization
 
+Restore state originates from untrusted sources (user-supplied backup files,
+stale localStorage entries), so every read and write goes through
+`normalizeXtreamPendingRestoreState` (`libs/shared/interfaces`). Entries in
+`hiddenCategories`, `favorites`, and `recentlyViewed` without a usable numeric
+`xtreamId` are dropped rather than restored: backups exported by builds
+affected by issue #1017 contain ID-less hidden-category entries, and matching
+them against category rows would otherwise degrade to a type-only comparison
+that hides every category of that type. Category rows themselves cross the DB
+worker IPC boundary in the snake_case wire shape declared by
+`XCategoryFromDb`/`XtreamCategoryFromDb`; the category operations project
+their Drizzle rows explicitly to keep that contract true.
+
 Electron restore behavior:
 
 1. Category import reads pending hidden-category state while saving categories.
diff --git a/docs/architecture/portal-detail-navigation.md b/docs/architecture/portal-detail-navigation.md
index 68ded27f2..8b2d08717 100644
--- a/docs/architecture/portal-detail-navigation.md
+++ b/docs/architecture/portal-detail-navigation.md
@@ -23,6 +23,12 @@ Related:
 - Dashboard `Global Favorites` and `Recently Watched` widgets hand off Xtream and
   Stalker movies/series into the matching global collection route with detail
   pre-opened.
+- Dashboard Continue Watching handoffs for Xtream series may additionally carry
+  a one-shot season/episode resume target. The collection-owned Xtream detail
+  consumes it after its episode positions load and starts that exact episode;
+  opening the series from the collection grid itself remains detail-only. If the
+  positions load fails, the target stays unconsumed and the handoff degrades to
+  detail-only rather than starting the episode at offset zero.
 - Do not force both portals into the same browse/detail behavior unless the full
   portal detail architecture is being changed.
 
@@ -44,7 +50,7 @@ Implication:
 
 Current code paths:
 
-- `libs/portal/xtream/feature/src/lib/favorites/favorites.component.ts`
+- `libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.ts` (favorites + recent, with shared UI from `libs/portal/shared/ui/src/lib/components/favorites-layout/`)
 - `libs/portal/xtream/feature/src/lib/search-results/search-results.component.ts`
 - `libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts`
 
@@ -73,6 +79,14 @@ Dashboard behavior to preserve:
   Xtream movie/series items into `/workspace/global-favorites` or
   `/workspace/global-recent` with collection detail pre-opened from navigation
   state.
+- When an Xtream series recent has a saved episode position, the dashboard hero
+  and Continue Watching card should include that exact series/episode target in
+  the navigation state. It is a one-shot playback request and must not leak into
+  normal favorites, search, category, or collection-grid navigation. Only
+  position rows that name their parent `seriesXtreamId` produce a target:
+  episode-keyed recents make `item.xtream_id` an episode id, so legacy rows
+  without the pointer stay detail-only instead of promoting the episode id to a
+  series id.
 - Back from the collection detail should return to the dashboard handoff state,
   not switch the active playlist.
 
@@ -99,8 +113,7 @@ Implication:
 
 Current code paths:
 
-- `libs/portal/stalker/feature/src/lib/stalker-favorites/stalker-favorites.component.ts`
-- `libs/portal/stalker/feature/src/lib/recently-viewed/recently-viewed.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-collection-route.component.ts` (favorites + recent via `mode` route data) -> `stalker-collection-detail.component.ts`
 - `libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`
 - `libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts` (Stalker branch)
 
diff --git a/docs/architecture/pwa-self-hosted.md b/docs/architecture/pwa-self-hosted.md
index da799457d..d95ee24ab 100644
--- a/docs/architecture/pwa-self-hosted.md
+++ b/docs/architecture/pwa-self-hosted.md
@@ -175,7 +175,10 @@ browser sidecar data.
 The Docker image has two stages:
 
 1. Build stage installs dependencies and runs `web:pwa` plus `web-backend`.
-2. Runtime stage uses `node:22-alpine` with nginx installed. nginx serves
+   pnpm is installed globally at the exact `packageManager` version rather than
+   through Corepack, which Node 25 unbundled, so the base-image major stays
+   free to move.
+2. Runtime stage uses `node:24-alpine` with nginx installed. nginx serves
    `dist/apps/web` and proxies `/api/*` to the local Express backend.
    The entrypoint renders the nginx config from a `${PORT}` template, starts the
    backend, waits for `/health`, and then starts nginx. If either process exits
diff --git a/docs/architecture/remote-control.md b/docs/architecture/remote-control.md
index 60b1b4993..5db0429c1 100644
--- a/docs/architecture/remote-control.md
+++ b/docs/architecture/remote-control.md
@@ -28,11 +28,11 @@ Current capabilities:
 1. User opens remote web UI (`http://<local-ip>:<port>`).
 2. Remote web app calls `/api/remote-control/*`.
 3. Electron main handles API request and sends IPC to renderer:
-   - `CHANNEL_CHANGE` for up/down
-   - `REMOTE_CONTROL_COMMAND` for numeric/volume commands
+    - `CHANNEL_CHANGE` for up/down
+    - `REMOTE_CONTROL_COMMAND` for numeric/volume commands
 4. Renderer-specific feature module (M3U/Xtream/Stalker) applies action.
 5. Renderer pushes status snapshots back to main via:
-   - `REMOTE_CONTROL_STATUS_UPDATE`
+    - `REMOTE_CONTROL_STATUS_UPDATE`
 6. Remote web app polls `/api/remote-control/status` and updates UI.
 
 ## Backend (Electron Main)
@@ -41,11 +41,16 @@ Current capabilities:
 
 - File: `apps/electron-backend/src/app/server/http-server.ts`
 - Responsibilities:
-  - Serves static remote app from:
-    - dev: `dist/apps/remote-control-web/browser`
-    - prod: `<appPath>/remote-control-web/browser`
-  - Routes `/api/remote-control/*` to registered handlers.
-  - Starts/stops/restarts on settings updates.
+    - Serves static remote app from:
+        - dev: `dist/apps/remote-control-web/browser`
+        - prod: `<appPath>/remote-control-web/browser`
+    - Keeps every non-API request inside that configured static root: the request
+      pathname is decoded once, malformed encoding and NUL bytes fail closed,
+      and the platform-specific resolved path must remain the root or its
+      descendant. Angular route fallback may serve only that root's `index.html`;
+      it must never bypass the containment check.
+    - Routes `/api/remote-control/*` to registered handlers.
+    - Starts/stops/restarts on settings updates.
 
 ### Remote control event module
 
@@ -66,8 +71,8 @@ IPC emitted to renderer:
 
 - `CHANNEL_CHANGE` payload: `{ direction: 'up' | 'down' }`
 - `REMOTE_CONTROL_COMMAND` payload:
-  - `{ type: 'channel-select-number', number }`
-  - `{ type: 'volume-up' | 'volume-down' | 'volume-toggle-mute' }`
+    - `{ type: 'channel-select-number', number }`
+    - `{ type: 'volume-up' | 'volume-down' | 'volume-toggle-mute' }`
 
 Status ingestion from renderer:
 
@@ -78,7 +83,7 @@ Status ingestion from renderer:
 
 - Main handler: `apps/electron-backend/src/app/events/settings.events.ts`
 - On `SETTINGS_UPDATE`, reads `remoteControl` and `remoteControlPort`, persists to store, and calls:
-  - `httpServer.updateSettings(enabled, port)`
+    - `httpServer.updateSettings(enabled, port)`
 
 ## Preload Bridge
 
@@ -122,23 +127,23 @@ Used by M3U, Xtream, and Stalker live integrations.
 Implemented behavior:
 
 - Subscribes to:
-  - `onChannelChange` (up/down)
-  - `onRemoteControlCommand` (number + volume)
+    - `onChannelChange` (up/down)
+    - `onRemoteControlCommand` (number + volume)
 - Applies channel up/down by active channel URL over `channels$`
 - Applies number select through existing `switchToChannelByNumber(...)`
 - Dispatches remote channel changes as explicit playback requests so MPV/VLC starts immediately even when mouse channel rows require double-click before external playback.
 - Applies volume commands:
-  - up/down in 0.1 increments
-  - toggle mute with last non-zero volume restore
-  - persists to `localStorage`
-  - propagates to built-in inline players: Video.js, HTML5, ArtPlayer, and radio `AudioPlayerComponent`
-  - does not control external MPV/VLC sessions or the experimental Embedded MPV player
+    - up/down in 0.1 increments
+    - toggle mute with last non-zero volume restore
+    - persists to `localStorage`
+    - propagates to built-in inline players: Video.js, HTML5, ArtPlayer, and radio `AudioPlayerComponent`
+    - does not control external MPV/VLC sessions or the experimental Embedded MPV player
 - Publishes status snapshots via `updateRemoteControlStatus(...)`:
-  - `portal: 'm3u'`
-  - `isLiveView: true`
-  - channel name/number
-  - EPG now fields
-  - `supportsVolume: true`, `volume`, `muted`
+    - `portal: 'm3u'`
+    - `isLiveView: true`
+    - channel name/number
+    - EPG now fields
+    - `supportsVolume: true`, `volume`, `muted`
 - Cleans listeners/subscriptions in `ngOnDestroy`.
 
 ## Xtream integration (live view)
@@ -148,20 +153,20 @@ Implemented behavior:
 Implemented behavior:
 
 - Subscribes to:
-  - `onChannelChange` for up/down
-  - `onRemoteControlCommand` for number select
+    - `onChannelChange` for up/down
+    - `onRemoteControlCommand` for number select
 - Up/down:
-  - Uses selected live item `selectedItem().xtream_id`
-  - Navigates inside `selectItemsFromSelectedCategory()`
-  - Calls `playLive(nextItem, true)` so remote actions explicitly start playback
+    - Uses selected live item `selectedItem().xtream_id`
+    - Navigates inside `selectItemsFromSelectedCategory()`
+    - Calls `playLive(nextItem, true)` so remote actions explicitly start playback
 - Number select:
-  - Maps number to item in current category list
-  - Calls `playLive(channel, true)` so remote actions explicitly start playback
+    - Maps number to item in current category list
+    - Calls `playLive(channel, true)` so remote actions explicitly start playback
 - Publishes status via effect:
-  - `portal: 'xtream'`
-  - `isLiveView` only when selected content type is `live` and item is selected
-  - channel name/number + current EPG item
-  - `supportsVolume: false`
+    - `portal: 'xtream'`
+    - `isLiveView` only when selected content type is `live` and item is selected
+    - channel name/number + current EPG item
+    - `supportsVolume: false`
 - Cleans listeners in `ngOnDestroy`.
 
 ## Stalker integration (ITV live view)
@@ -171,20 +176,20 @@ Implemented behavior:
 Implemented behavior:
 
 - Subscribes to:
-  - `onChannelChange` for up/down
-  - `onRemoteControlCommand` for number select
+    - `onChannelChange` for up/down
+    - `onRemoteControlCommand` for number select
 - Up/down:
-  - Uses `selectedItem().id`
-  - Navigates inside `itvChannels()`
-  - Calls `playChannel(nextItem, true)` so remote actions explicitly start playback
+    - Uses `selectedItem().id`
+    - Navigates inside `itvChannels()`
+    - Calls `playChannel(nextItem, true)` so remote actions explicitly start playback
 - Number select:
-  - Maps number into `itvChannels()`
-  - Calls `playChannel(channel, true)` so remote actions explicitly start playback
+    - Maps number into `itvChannels()`
+    - Calls `playChannel(channel, true)` so remote actions explicitly start playback
 - Publishes status via effect:
-  - `portal: 'stalker'`
-  - `isLiveView` only for selected content type `itv` with active item
-  - channel name/number + current EPG item
-  - `supportsVolume: false`
+    - `portal: 'stalker'`
+    - `isLiveView` only for selected content type `itv` with active item
+    - channel name/number + current EPG item
+    - `supportsVolume: false`
 - Cleans listeners in `ngOnDestroy`.
 
 ## Remote Web App
@@ -199,11 +204,11 @@ Implemented behavior:
 ### Shared remote UI library
 
 - Component:
-  - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.ts`
-  - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.html`
-  - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.scss`
+    - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.ts`
+    - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.html`
+    - `libs/ui/remote-control/src/lib/remote-control/remote-control.component.scss`
 - Service:
-  - `libs/ui/remote-control/src/lib/remote-control/remote-control.service.ts`
+    - `libs/ui/remote-control/src/lib/remote-control/remote-control.service.ts`
 
 Implemented UI behavior:
 
@@ -217,23 +222,25 @@ Implemented UI behavior:
 ## Settings UI and discoverability
 
 - Files:
-  - `apps/web/src/app/settings/settings.component.ts`
-  - `apps/web/src/app/settings/settings.component.html`
+    - `apps/web/src/app/settings/settings-remote-control-section.component.ts`
+      (+ `.html`) — the section rendered by `settings.component.html`
+    - `apps/web/src/app/settings/settings-remote-control.facade.ts` — LAN
+      address lookup and QR-code visibility state
 - Features:
-  - Toggle `remoteControl`
-  - Configure `remoteControlPort`
-  - Display local URLs and QR codes for remote access
-  - Local IP list loaded via `getLocalIpAddresses()`
+    - Toggle `remoteControl`
+    - Configure `remoteControlPort`
+    - Display local URLs and QR codes for remote access
+    - Local IP list loaded via `getLocalIpAddresses()`
 
 ## Feature Matrix (Current)
 
-| Capability | M3U | Xtream Live | Stalker ITV |
-|---|---|---|---|
-| Channel up/down | Yes | Yes | Yes |
-| Number select | Yes | Yes | Yes |
-| Status publish | Yes | Yes | Yes |
-| Volume command handling | Yes, for built-in inline M3U players | No | No |
-| `supportsVolume` in status | true | false | false |
+| Capability                 | M3U                                  | Xtream Live | Stalker ITV |
+| -------------------------- | ------------------------------------ | ----------- | ----------- |
+| Channel up/down            | Yes                                  | Yes         | Yes         |
+| Number select              | Yes                                  | Yes         | Yes         |
+| Status publish             | Yes                                  | Yes         | Yes         |
+| Volume command handling    | Yes, for built-in inline M3U players | No          | No          |
+| `supportsVolume` in status | true                                 | false       | false       |
 
 ## Known limitations
 
diff --git a/docs/architecture/sqlite-db-worker.md b/docs/architecture/sqlite-db-worker.md
index 09693bccd..54f8bc266 100644
--- a/docs/architecture/sqlite-db-worker.md
+++ b/docs/architecture/sqlite-db-worker.md
@@ -56,6 +56,15 @@ Keep SQL-heavy logic here so the worker entry remains a thin dispatcher:
 2. `apps/electron-backend/src/app/database/operations/content.operations.ts`
 3. `apps/electron-backend/src/app/database/operations/playlist.operations.ts`
 4. `apps/electron-backend/src/app/database/operations/xtream.operations.ts`
+5. `apps/electron-backend/src/app/database/operations/favorites.operations.ts`
+6. `apps/electron-backend/src/app/database/operations/recently-viewed.operations.ts`
+7. `apps/electron-backend/src/app/database/operations/playback-position.operations.ts`
+8. `apps/electron-backend/src/app/database/operations/content-backdrop.operations.ts`
+9. `apps/electron-backend/src/app/database/operations/title-match.operations.ts`
+10. `apps/electron-backend/src/app/database/operations/tmdb.operations.ts`
+11. `apps/electron-backend/src/app/database/operations/epg-mapping.operations.ts`
+
+(plus the shared cancellation helper `operation-control.ts` in the same directory)
 
 ## Worker Architecture
 
@@ -109,6 +118,111 @@ The worker contract lives in
 3. `DbWorkerEventMessage`
 4. `DbOperationEvent`
 
+### Opt-in request performance capture
+
+`IPTVNATOR_PERF_WORKER_PROFILING=1` adds development/test-only performance
+metadata to each database-worker response. It is disabled by default and must
+stay disabled for production launches.
+
+Each enabled request gets a fresh event-loop-delay histogram and records:
+
+- `requestReceivedEpochMs`, `workStartedEpochMs`, `workEndedEpochMs`, and
+  `histogramFlushedEpochMs`
+- `responsePostedEpochMs`, sampled after profiling finalization and immediately
+  before the worker posts the response to main
+- worker-thread CPU user/system microseconds from `process.threadCpuUsage()`
+- event-loop utilization across the exact work interval
+- event-loop-delay max/p95/p99 from the request's own histogram
+- fixed invalid or unavailable reasons whenever a metric cannot be attributed
+
+Histogram arming waits until the histogram has a sample; flushing waits for its
+sample count to advance after work ends. Both waits use condition-based timer
+polling. Each wait stops after 50 ms of observed monotonic time or its bounded
+poll count; arming and flushing have separate caps, and timer scheduling may
+overshoot wall-clock time. A timeout or profiling API failure never replaces
+the business response: timestamps and any independently available CPU/ELU
+metrics remain valid, while event-loop delay is `null` with a fixed reason.
+
+The long-lived database worker still executes concurrent requests without a
+profiling queue. If captures overlap, every overlapping response carries
+`invalidReason: "overlapping-database-worker-requests"` and all attributable
+CPU, ELU, and event-loop-delay values are `null`. This avoids assigning shared
+worker activity to one request while preserving normal worker concurrency.
+`responsePostedEpochMs` remains a separate response boundary: the initial M3U
+benchmark subtracts it from main's response receipt to attribute the
+database-worker-to-main structured-clone proxy without folding that interval
+into worker execution.
+
+Initial M3U import profiling requires exact operation-specific phase pairs:
+
+- `DB_UPSERT_APP_PLAYLIST`: `serialize.playlist`, then `sqlite.write`. The
+  first covers playlist JSON serialization; the second covers the SQLite
+  upsert and its autocommit.
+- `DB_GET_APP_PLAYLIST`: `sqlite.read`, then `deserialize.playlist`. The first
+  covers the awaited single-row SQLite select; the second covers
+  `parseAppPlaylist`, including JSON parsing and persisted-field hydration.
+
+Missing, partial, reordered, or cross-operation phase sequences fail closed.
+Markers carry item counts only and do not scan or copy the payload to compute
+profiling metadata. The import creates no indexes, so there is no separate
+index/transaction-commit phase. Across the upsert and GET requests, the formal
+benchmark reports renderer-to-main, main-to-database-worker,
+database-worker-to-main, and main-to-renderer structured-clone proxies; their
+explicit sum is `ipcStructuredCloneProxyMs`. See
+[M3U Playlist Module Architecture](./m3u-playlist-module.md#initial-url-import-performance-benchmark-electron)
+for the complete cross-process attribution.
+
+Formal initial-import comparison also requires both request-scoped captures in
+every measured run to have coherent event-loop delay, event-loop utilization,
+and worker-thread CPU values with no unavailable or invalid reason. Summary
+validity records the exact expected and valid request counts; nullable metrics
+remain in raw results but cannot be silently omitted from comparison
+distributions.
+
+The main-process benchmark samples the database worker's V8
+`used_heap_size` and `external_memory` independently. Raw output includes a
+valid-sample count for each metric. A peak is numeric only after at least one
+finite, non-negative isolate sample; otherwise it is `null` with a fixed
+unavailability reason. An initialized zero is never used as evidence of a
+successful sample. Formal initial-import comparisons require valid peak
+samples from exactly one database worker in every measured run. Worker RSS is
+not available per thread and remains part of the separately reported Electron
+main-process RSS together with native and SQLite memory.
+
+### Opt-in post-GC heap capture
+
+The same `IPTVNATOR_PERF_WORKER_PROFILING=1` opt-in enables a development/test
+one-shot `performance:collect-post-gc-heap` request. The benchmark transfers a
+dedicated `MessagePort`; the database worker accepts the request only while no
+request performance capture is active, calls exposed `globalThis.gc()`, reads
+its own V8 isolate through `v8.getHeapStatistics()`, posts one result, and
+closes the port. Production launches do not expose GC or send this request.
+
+The response is a strict XOR: either a non-negative
+`postGcHeapUsedBytes` with a `null` reason, or a `null` heap with a fixed
+unavailability reason. Disabled profiling, a busy worker, unavailable GC, and
+capture failure all fail closed without changing the database operation or
+terminating the worker. The performance launcher supplies
+`--js-flags=--expose-gc` to Electron itself; worker `execArgv` remains
+untouched.
+
+The main-process benchmark selects exactly one current-generation database
+worker, waits for its final sampling call, stops its CPU profile, performs the
+explicit-GC probe, and only then takes an optional diagnostic heap snapshot.
+Profile or snapshot failure cannot overwrite an already captured post-GC
+value. Capture stop closes a synchronous cutoff before awaiting profile or
+snapshot work. A database request after that cutoff cannot restart sampling;
+it records `database-worker-activity-after-cutoff` and invalidates the result.
+Missing, multiple, busy, timed-out, or malformed worker captures remain raw
+nullable outcomes and make a database-applicable measured run invalid for
+comparison. A scenario cancelled before its database phase reports the worker
+metric as not applicable rather than manufacturing an idle database request.
+Before a measured generation, the M3U benchmark persists and validates its seed
+capture, then atomically rolls a clean stopping cutoff into the next active
+generation. This closes the otherwise unobservable gap between separate
+stop/start calls: pre-rollover requests remain late and fatal, while
+post-rollover requests are attributed to the new generation.
+
 ### Progress event contract
 
 The worker now emits request-scoped events with:
@@ -241,7 +355,20 @@ Xtream-only row shape:
    short first tokens such as `tv` stay anchored to the start of the title, so
    `TV Sport` matches but `Test TV` does not. These short first-token queries
    bypass trigram FTS and use the `idx_content_title` prefix index path because
-   trigram tokenization cannot match 1-2 character terms.
+   trigram tokenization cannot match 1-2 character terms. Punctuation-joined
+   words such as `A&E` or `X-Men` are an exception: tokenization splits them
+   into short fragments, so the intact word is preserved as a "compound word"
+   (`content-search.util.ts`) that additionally matches as an exact substring —
+   a supplemental trigram FTS `MATCH '"a&e"'` query for the Xtream arm (merged
+   and deduped with the prefix-index candidates), intact-word `LIKE` contains
+   patterns for the per-playlist and M3U payload prefilters, and a
+   space-bounded whole-phrase check in the ranking step. All compound arms
+   keep the remaining words of the query as SQL constraints — the FTS
+   supplement AND-s the non-compound tokens as `LIKE` conditions and the
+   `LIKE` prefilters compose per word — so `A&E HD` cannot fill the bounded
+   candidate window with titles that only contain `A&E`. This lets `A&E`
+   find `US: A&E` anywhere in the title while single short tokens stay
+   prefix-anchored (issue #1161).
 6. `excludeHidden` still filters hidden Xtream categories and also filters M3U
    channels whose `group.title` is listed in the playlist payload's
    `hiddenGroupTitles`.
@@ -335,11 +462,15 @@ Current sources:
 Main-process EPG ownership is split across focused event modules:
 
 1. `apps/electron-backend/src/app/events/epg.events.ts` registers EPG IPC
-   handlers and owns freshness/fetch orchestration.
-2. `apps/electron-backend/src/app/events/epg-worker.service.ts` owns EPG
+   handlers and delegates to the modules below.
+2. `apps/electron-backend/src/app/events/epg-fetch.service.ts` owns EPG
+   freshness checks and multi-URL fetch orchestration.
+3. `apps/electron-backend/src/app/events/epg-mapping.service.ts` owns manual
+   EPG channel-mapping resolution and CRUD at the IPC boundary.
+4. `apps/electron-backend/src/app/events/epg-worker.service.ts` owns EPG
    worker creation, renderer progress updates, fetch worker lifecycle, and
    clear-worker lifecycle.
-3. `apps/electron-backend/src/app/events/epg-query.service.ts` owns EPG
+5. `apps/electron-backend/src/app/events/epg-query.service.ts` owns EPG
    channel/program database lookups, metadata resolution, and DB row mapping.
 
 Keep worker lifecycle state out of the IPC registration layer. Add new EPG DB
@@ -496,6 +627,51 @@ A running Electron app keeps using the worker bundle it already loaded at
 startup. This is a common reason a worker fix appears "not working" in manual
 verification even when the source patch is correct.
 
+## Gotchas
+
+### Prepared-statement writes inside a transaction must use `.run()`, not `.execute()`
+
+Drizzle's `PreparedQuery.execute()` on the `better-sqlite3` driver returns a
+**promise** and defers the actual SQL to a microtask. Our bulk writers run their
+statements inside a **synchronous** `db.transaction(() => { ... })` callback,
+which cannot `await`. If the statement is dispatched with `.execute()`, the
+transaction commits before the deferred promise settles, so the write is a
+**silent no-op** — no error, no rows changed.
+
+Always call the synchronous `.run(placeholderValues)` on prepared statements
+executed inside a synchronous transaction callback:
+
+```ts
+// favorites is playlist-scoped: filter by (contentId, playlistId), otherwise
+// a same-contentId favorite in another playlist gets rewritten too.
+const stmt = db
+    .update(schema.favorites)
+    .set({ position: sql<number>`${sql.placeholder('position')}` })
+    .where(
+        and(
+            eq(schema.favorites.contentId, sql.placeholder('contentId')),
+            eq(schema.favorites.playlistId, sql.placeholder('playlistId'))
+        )
+    )
+    .prepare();
+
+db.transaction(() => {
+    for (const { content_id, playlist_id, position } of chunk) {
+        // NOT .execute()
+        stmt.run({ position, contentId: content_id, playlistId: playlist_id });
+    }
+});
+```
+
+This bit `reorderGlobalFavorites` and `removeRecentItemsBatch` (issue #1137):
+custom favorites drag-and-drop order silently never persisted for the
+per-playlist ("this playlist") view. Global ("all playlists") favorites masked
+it because that path also persists an order to the `appState`
+`global-favorites-channel-order-v1` key and re-applies it on read, independent
+of the DB `position` column. The mocked operations specs did not catch it —
+a jest mock records an `.execute()` call the same as a `.run()` call, so the
+regression tests explicitly assert `.run()` is used and `.execute()` is not.
+
 ## Testing
 
 ### Unit coverage added
@@ -631,11 +807,16 @@ CI=1 NX_TASKS_RUNNER_DYNAMIC_OUTPUT=false pnpm nx run electron-backend:build --s
 
 These are intentionally still out of scope for this first cut:
 
-1. request cancellation
-2. moving network-heavy Xtream fetches off the current path
-3. migrating every remaining small SQLite IPC handler to the worker
-4. richer delete progress reporting for bulk destructive operations
-5. repo-wide Angular/Jest cleanup for the currently failing web test baseline
+1. moving network-heavy Xtream fetches off the current path
+2. migrating every remaining small SQLite IPC handler to the worker
+3. richer delete progress reporting for bulk destructive operations
+4. repo-wide Angular/Jest cleanup for the currently failing web test baseline
+
+(Request cancellation, originally listed here, has since shipped — see the
+"Cancellation contract" section above: `DB_CANCEL_OPERATION` in
+`apps/electron-backend/src/app/api/main.preload.ts`, `AbortError` production in
+`database.worker.ts`, and `DatabaseService.cancelOperation` in
+`libs/services/src/lib/database-electron.service.ts`.)
 
 ## Extending The Worker
 
diff --git a/docs/architecture/stalker-epg.md b/docs/architecture/stalker-epg.md
index 80bf997fe..437f251be 100644
--- a/docs/architecture/stalker-epg.md
+++ b/docs/architecture/stalker-epg.md
@@ -15,9 +15,19 @@ Stalker now uses two EPG paths with different purposes:
 - The active channel EPG panel uses `get_epg_info` as a bulk endpoint, fetches a
   7-day window once per playlist session, caches programs by channel id, and
   renders the selected channel through the shared `app-epg-timeline` component.
-- Channel rows no longer send preview EPG requests during initial category load.
-  They stay empty until bulk EPG has been fetched once, then derive their
-  current program and progress bar from the cached bulk map.
+- Channel rows never send per-row EPG requests. The bulk EPG load is triggered
+  **eagerly when a category's channels first render** (a constructor effect in
+  `StalkerLiveStreamLayoutComponent` calls `ensureBulkItvEpg(168)` once ITV
+  channels are present) — not only after the first channel is played — so the
+  row "now playing" previews and the EPG panel populate immediately. Rows derive
+  their current program and progress bar from the cached bulk map.
+  - Effect ordering matters: the eager-EPG effect is registered **after** the
+    playlist-change effect that calls `clearBulkItvEpgCache()`. On a portal
+    switch the cache is cleared first and then refilled; if the order is
+    reversed the clear clobbers the just-loaded bulk EPG on initial render.
+  - `ensureBulkItvEpg` de-duplicates (via `isLoadingBulkItvEpg` /
+    `bulkItvEpgLoaded` + matching playlist/period), so the eager trigger and the
+    play-time `loadEpgForChannel` path never double-fetch.
 - If a portal does not return usable bulk data for the selected channel, the
   active panel falls back to `get_short_epg`.
 
@@ -263,6 +273,29 @@ advantage of the richer bulk API when it is available. Row previews do not
 fallback to per-channel requests in this mode; they remain empty until bulk EPG
 is available.
 
+## Manual EPG Mapping
+
+Stalker channels carry no XMLTV identifier, so when the portal's own EPG is
+missing or wrong the only uploaded-EPG entry point is a **manual mapping**:
+right-click a channel in the ITV sidebar (or in global favorites) and pick
+"Map EPG channel" to attach it to a channel from an uploaded XMLTV guide.
+
+- Mappings are stored in the shared `epg_channel_mappings` table under the
+  playlist-scoped key `stalker:{playlistId}:{channelId}`
+  (`buildStalkerEpgMappingKey` in
+  `libs/shared/interfaces/src/lib/epg-mapping-key.util.ts`).
+- `withStalkerEpg().applyMappedItvEpg(channelIds)` batch-resolves mappings
+  (one `getEpgMappingsBatch` IPC per new id set) and overlays the mapped
+  XMLTV programs onto `bulkItvEpgByChannel`, so both the active panel and
+  the row previews pick them up with no template changes. Overrides are
+  re-merged whenever `ensureBulkItvEpg` replaces the bulk record and are
+  re-checked after the mapping dialog closes with a change.
+- The collection views (global favorites/recent) resolve the same keys in
+  `StreamResolverService` (`loadStalkerEpgItems` for the detail panel,
+  `loadStalkerEpgBatch` + `prefetchEpgMappings` for row previews).
+- Everything is gated behind `supportsEpgMapping`, so the PWA never shows
+  the menu entry.
+
 ## Future Enhancements
 
 - add cache refresh / invalidation for long-running live sessions
diff --git a/docs/architecture/stalker-mock-server.md b/docs/architecture/stalker-mock-server.md
index 60458d092..932c610d4 100644
--- a/docs/architecture/stalker-mock-server.md
+++ b/docs/architecture/stalker-mock-server.md
@@ -14,6 +14,7 @@ The mock server enables:
 1. **Local development** without access to a real Stalker portal
 2. **Playwright E2E testing** with predictable, deterministic data
 3. **Scenario-based testing** via predefined MAC addresses that map to specific data shapes
+4. **Screenshot-safe marketing capture** with committed fictional posters shared with the Xtream mock
 
 ## Key Design Decisions
 
@@ -22,7 +23,7 @@ The mock server enables:
 Per-request random data would break navigation: if category IDs change between calls, content fetched under a category ID won't match the category list. Instead:
 
 - Data is generated **once per MAC address** on first request, then cached in memory.
-- `@faker-js/faker` is seeded with a numeric value derived from the MAC address before generation.
+- `@faker-js/faker` is seeded with the scenario's `seed` value before generation: predefined scenario MACs use fixed seeds from `scenarios.ts`; unknown MACs derive the seed from the MAC via `macToSeed()`.
 - Same MAC → identical data on every server restart.
 - Restart the server to reshuffle all data.
 
@@ -41,7 +42,7 @@ No files or databases are written. All state (generated content + favorites) liv
 ## Data Generation Pipeline
 
 ```
-faker.seed(macToNumber(mac))
+faker.seed(config.seed)   // scenario seed; unknown MACs: macToSeed(mac)
 │
 ├── generateCategories('itv', N)  → itvCategories[]
 │     └── generateChannels()      → channels Map<categoryId, channel[]>
@@ -56,6 +57,11 @@ faker.seed(macToNumber(mac))
 │           ├── is_series=1 items (fraction, Ministra flow)
 │           └── embedded series[] items (fraction)
 │
+├── marketingFixture?             → shared curated VOD catalog
+│     ├── @iptvnator/shared/marketing-fixtures
+│     ├── vod Map<categoryId, item[]>
+│     └── vodOrder[] preserves screenshot catalog order
+│
 └── generateCategories('series', N) → seriesCategories[]
       └── generateSeriesItems()    → series Map<categoryId, item[]>
             └── generateSeasons()  → seasons Map<seriesItemId, season[]>
@@ -123,7 +129,7 @@ marker and an `ffrt4://radio/...` command.
       "id": "30001-s1",
       "name": "Season 1",
       "cmd": "ffrt4://series/30001/season/1",
-      "series": ["30001-s1-e1", "30001-s1-e2", ...],
+      "series": ["1", "2", "3", ...],
       "screenshot_uri": "https://picsum.photos/seed/30001-s1/300/200",
       "director": "...",
       "actors": "...",
@@ -217,9 +223,29 @@ interface ScenarioConfig {
   episodesPerSeason: number;
   isSeriesFraction: number;      // 0–1: fraction of VOD with is_series=1
   embeddedSeriesFraction: number; // 0–1: fraction of VOD with embedded series[]
+  supportsGetAllChannels?: boolean; // default true; false mimics legacy portals
+                                    // without the ITV get_all_channels action
+  marketingFixture?: true;          // replace generated VOD with shared posters
 }
 ```
 
+The `legacy-pagination` scenario (`00:1A:79:00:00:06`) sets
+`supportsGetAllChannels: false`: `get_all_channels` then answers with an error
+payload so clients fall back to the paginated `get_ordered_list` crawl. For
+supporting scenarios, `get_all_channels` (`get-all-channels.handler.ts`,
+`type=itv` only) returns the complete ITV channel list in one
+`{ js: { data, total_items } }` response, excluding channels from censored
+(adult) genres.
+
+The `marketing-demo` scenario (`00:1A:79:00:00:07`) replaces faker-generated
+VOD with the 35-movie provider-neutral showcase catalog from
+`@iptvnator/shared/marketing-fixtures`. Its newest 20 movies are returned first
+for the wildcard VOD listing. Fixtures keep deployment-neutral poster paths,
+then the JSON middleware resolves them against the request origin (including
+forwarded host/protocol) as
+`<portal-origin>/assets/marketing/poster/<slug>.png`. `main.ts` serves the
+committed PNG directory directly, so the Xtream server does not need to run.
+
 ### Adding a New Scenario
 
 1. Add an entry to the `SCENARIOS` map in `src/app/scenarios.ts`.
@@ -257,7 +283,7 @@ Playwright waits for both servers to be healthy before starting tests. If either
 
 Each stalker e2e test calls `POST http://localhost:3210/reset` in `beforeEach` to clear in-memory state. This ensures tests don't bleed favorites or other mutable state into each other.
 
-The generated content (categories, items) is **not** cleared on reset — it's deterministic and doesn't need to be. Only in-memory favorites are cleared.
+`resetAll()` clears both the generated-content cache and in-memory favorites (`data-store.ts`). Because generation is seed-deterministic, the next request regenerates identical content, so the observable data does not change across resets.
 
 ### Recommended Test Structure
 
diff --git a/docs/architecture/stalker-portal.md b/docs/architecture/stalker-portal.md
index 42b3f4b20..930b2c554 100644
--- a/docs/architecture/stalker-portal.md
+++ b/docs/architecture/stalker-portal.md
@@ -29,52 +29,56 @@ Stalker support covers:
 
 ## Routing Structure
 
-Primary route tree lives in `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-feature.routes.ts`.
+Primary route tree lives in
+`libs/portal/stalker/feature/src/lib/stalker-feature.routes.ts`.
 
-- `/stalker/:id/vod`
-- `/stalker/:id/series`
+- `/stalker/:id/vod` (plus `vod/:categoryId` child)
+- `/stalker/:id/series` (plus `series/:categoryId` child)
 - `/stalker/:id/itv`
 - `/stalker/:id/radio`
 - `/stalker/:id/favorites`
 - `/stalker/:id/recent`
 - `/stalker/:id/search`
-- `/stalker/:id/downloads` (shared downloads module from Xtream UI)
+- `/stalker/:id/actor/:personId`
+- `/stalker/:id/downloads` (shared `DownloadsComponent` from `@iptvnator/portal/downloads/feature`)
 
 ## Runtime Architecture
 
 1. Angular Stalker screens call methods/resources in `StalkerStore`.
 2. `StalkerStore` builds request params based on selected content type and current view state.
 3. Requests go through `DataService.sendIpcEvent(STALKER_REQUEST, ...)` or `StalkerSessionService` (full portal auth).
-4. Electron main process handles `STALKER_REQUEST` in `/Users/4gray/Code/iptvnator/apps/electron-backend/src/app/events/stalker.events.ts`.
-5. Axios calls Stalker `load.php` API with required headers/cookies and returns normalized payloads to renderer.
+4. Electron main process handles `STALKER_REQUEST` in
+   `apps/electron-backend/src/app/events/stalker.events.ts`.
+5. Axios calls Stalker `load.php` API with required headers/cookies and returns the raw `response.data` to the renderer; normalization happens in the store feature slices.
 
 ## Main UI Components
 
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-main-container.component.ts`
-    - Category + content layout for `vod` and `series`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts`
+- `CategoryContentViewComponent` from `@iptvnator/portal/catalog/feature` (`libs/portal/catalog/feature`)
+    - Shared category + content layout used by the `vod` and `series` routes (wired in `stalker-feature.routes.ts` via `loadCategoryContentViewComponent`)
+- `libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts`
     - ITV live playback, radio playback, channel/station navigation, EPG panel integration
-- `/Users/4gray/Code/iptvnator/libs/ui/playback/src/lib/audio-player/audio-player.component.ts`
+- `libs/ui/playback/src/lib/audio-player/audio-player.component.ts`
     - Shared inline audio player used by M3U radio channels and Stalker radio stations
-- `/Users/4gray/Code/iptvnator/libs/ui/components/src/lib/stalker-series-view/stalker-series-view.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts`
     - Season/episode UI for all Stalker series modes
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-favorites/stalker-favorites.component.ts`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/recently-viewed/recently-viewed.component.ts`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-collection-route.component.ts`
+    - Favorites and recently-viewed collection views (`mode = 'favorites' | 'recent'` route data), rendering `stalker-collection-detail.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`
 
 ## Store and Data Flow
 
 Stalker store is now feature-composed:
 
-- Facade: `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/stalker.store.ts`
-- Feature slices: `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/stores/features/*`
-- Shared helpers: `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/*`
+- Facade: `libs/portal/stalker/data-access/src/lib/stalker.store.ts`
+- Feature slices: `libs/portal/stalker/data-access/src/lib/stores/features/*`
+- Shared helpers: `libs/portal/stalker/data-access/src/lib/*`
 
 Important store responsibilities:
 
 - Selected content/category/item state
 - Category and paginated content resources
-- ITV channel list + pagination
+- ITV channel list + pagination (full-list session cache when the portal
+  supports it, legacy 14-per-page lazy loading otherwise)
 - Radio category/station list + pagination
 - Regular series seasons resource
 - VOD-series (`is_series=1`) seasons + episodes resources
@@ -140,6 +144,9 @@ The Stalker live route and radio route intentionally share
 - `itv` uses `type=itv&action=get_ordered_list`, stores results in
   `itvChannels`, resolves playback through `resolveItvPlayback(...)`, and keeps
   the EPG panel visible.
+- ITV additionally loads the COMPLETE channel list once per portal session (see
+  "Full ITV channel list cache" below), so category views and search are not
+  limited to the lazily loaded 14-item pages.
 - `radio` uses `type=radio&action=get_ordered_list`, stores results in
   `radioChannels`, resolves playback through `resolveRadioPlayback(...)`, and
   renders `AudioPlayerComponent` instead of a video player.
@@ -155,6 +162,107 @@ The Stalker live route and radio route intentionally share
   falls back to a synthetic `PORTALS.ALL_RADIO` category with
   `category_id: '*'` so the station list can still be loaded.
 
+## Full ITV Channel List Cache
+
+Stalker portals paginate `get_ordered_list` with a server-side page size
+(typically 14 items), so lazy loading alone can never power a complete local
+search — this used to limit ITV search to whatever pages the user had scrolled
+through. `StalkerItvCacheService`
+(`libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.ts`) fixes
+this with a per-portal, in-memory session cache of the complete live channel
+list:
+
+- Load strategy: first try the Ministra `get_all_channels` action (`type=itv`,
+  returns ALL channels in one response — the same call STB clients use); if
+  the portal does not implement it, crawl `get_ordered_list` pages
+  (`category=*`, `genre=*`, concurrency 4, one retry per page, early stop on
+  an empty page **or a page that adds no new channel ids** — some portals
+  ignore `p` and repeat — 30k-channel hard cap) with progress reporting. The
+  assembled list is de-duplicated by channel id (both strategies) so it never
+  collides with the template's `track item.id`. The loading strategy itself is
+  a stateless helper (`stalker-itv-channel-loader.ts`); the service owns state.
+- Outcomes: a well-formed but unusable response marks the portal
+  `unsupported` for the session (legacy paged flow stays in charge); a
+  transient failure (network, or a page that failed both attempts) is retried
+  later but throttled by a per-portal cooldown (`ERROR_COOLDOWN_MS`, 30s) so a
+  deterministically-failing page can't trigger an unbounded re-crawl loop.
+- Per-portal reactivity: the "cache ready / refreshed" trigger is a
+  **per-portal** version signal (`versionFor(playlist)`), not one global
+  counter, and the content resource reads it **only for ITV**. This is
+  load-bearing: a global counter re-fired the resource for whatever was on
+  screen (radio, another portal), and the legacy paged branch appends at
+  `pageIndex > 1`, so an unrelated load completing duplicated the visible page
+  (colliding `track item.id` → NG0955). The `isCurrentRequest` guard is scoped
+  the same way.
+- Integration: the `getContentResource` loader in
+  `with-stalker-content.feature.ts` serves ITV categories from the cache when
+  ready (local `tv_genre_id` filtering via `filterItvChannelsByGenre`,
+  `hasMoreChannels=false`), and otherwise runs the legacy paged fetch while
+  `ensureLoaded()` fills the cache in the background; the resource re-fires
+  via the `cacheVersion` signal once the full list arrives.
+- UI: `StalkerLiveStreamLayoutComponent` windows the rendered list
+  (100-item chunks extended by the existing scroll handler) so multi-thousand
+  channel lists do not blow up the DOM; the header count and search cover the
+  whole category; a refresh button re-loads the list in place; a progress line
+  shows crawl status.
+- Loading state contract (important — regressions here strand the sidebar on a
+  skeleton): in full-list mode the content loader serves the filtered list
+  **synchronously** from the cache. The category-change reset effect therefore
+  must NOT `setItvChannels([])` while `itvFullListActive()` is true — it runs
+  after the store resource and would clobber the freshly served list, leaving
+  every category after the first stuck on a skeleton. The initial-loading
+  skeleton (`isInitialChannelsLoading`) must key off an actual in-flight load
+  (`itvFullListLoading()` or `isPaginatedContentLoading()`), not merely an empty
+  channel list; an empty result once loading has settled is an empty category
+  and renders `PORTALS.NO_CHANNELS_IN_CATEGORY`, not a spinner.
+- Search: with the cache active, the header search spans the ENTIRE portal
+  (all genres) — filtering the store's `itvFullChannelList`, not just the
+  selected category — so searching "CNN" while a "Sports" genre is selected
+  still finds it; clearing the term returns to the selected category. The
+  workspace shell drops the `degraded-loaded-only` / "loaded only" status for
+  Stalker ITV once `itvFullListActive`; radio (no full-list cache) always keeps
+  the loaded-only hint (`workspace-shell-search.service.ts`).
+- Windowed selection: remote channel-up/down and numeric select operate over
+  the full filtered category, so the render window (`renderLimit`) grows to
+  include a selection beyond it (`ensureChannelWithinRenderWindow`) instead of
+  drifting off-screen.
+- Category count badges: the context panel shows per-genre channel counts on
+  Stalker **Live TV** categories (like Xtream/M3U), fed by the store computed
+  `itvCategoryItemCounts` (the full list grouped by numeric `tv_genre_id`; the
+  `'*'` "All" row's total is stored under the `NaN` key that
+  `Number('*')` produces). Badges are ITV-only — VOD/series/radio still page
+  lazily so their per-category totals are unknown — and show a loading shimmer
+  while the full list is still loading (`workspace-context-panel` →
+  `stalkerShowCounts` / `stalkerCountDisplayMode`).
+- Censored (adult) genres: portals typically EXCLUDE these channels from
+  `get_all_channels` (sometimes without even flagging the genre `censored` in
+  `get_genres`), so the cache legitimately has zero channels for them. The
+  content loader therefore serves a genre from the cache only when the
+  genre-filtered result is non-empty; otherwise it falls back to the legacy
+  paged `get_ordered_list` fetch, which still returns those channels. The
+  store computed `itvSelectedCategoryFromCache` is the single source of truth
+  for this mode — the live layout keys windowing/infinite-scroll/`loadMore`
+  and the category-change reset off it, NOT off `itvFullListActive`. Count
+  badges: genres with no cached channels get NO map entry and the category
+  view omits their badge (`omitMissingCounts`) instead of showing a
+  misleading "0". The mock server ships a censored `For adults` ITV category
+  (id 1099) to exercise this path.
+- Eager preload + all-channels view (Xtream parity): entering the Live TV
+  section immediately starts the full-list load (`preloadItvChannels()`, fired
+  from an effect in `StalkerLiveStreamLayoutComponent` — not from the first
+  category click), so the count badges and the all-channels view are available
+  right away. Before a category is selected, the main area shows
+  `StalkerItvAllItemsComponent` — a paginated card grid of every channel in
+  the portal (client-side pagination only; it must never touch the store's
+  legacy `page` state, which would re-fire portal requests). Clicking a card
+  runs the same `playChannel` flow as the sidebar. Portals without a usable
+  full list keep the "select a category" placeholder.
+- Scope: ITV only. VOD/series keep server-side search; radio keeps legacy
+  paging (station lists are small).
+- The stalker-mock-server implements `get_all_channels` and provides the
+  `legacy-pagination` scenario MAC (`00:1A:79:00:00:06`) to exercise the
+  crawl fallback.
+
 ## VOD/Series Modes
 
 Stalker has multiple real-world data shapes. The current implementation supports all three:
@@ -163,6 +271,14 @@ Stalker has multiple real-world data shapes. The current implementation supports
 
 - Seasons come from API resource (`serialSeasonsResource`).
 - Episodes are derived from season payload.
+- This is the only mode that sets `selectedSerialId`, which is what drives
+  `serialSeasonsResource`. It is set purely from `selectedContentType ===
+'series'` — the `series` detail branch renders `<app-stalker-series-view />`
+  with no `vodWithSeries` input, so the API resource is its only episode
+  source and the fetch must never be gated on item shape.
+- Modes 2 and 3 below are always opened under the `vod` content type, which
+  leaves the id unset — otherwise every VOD detail open would fire a
+  `get_ordered_list&type=series` request whose result is discarded.
 
 2. VOD with Embedded `series[]`:
 
@@ -185,6 +301,9 @@ Stalker has multiple real-world data shapes. The current implementation supports
 - For unloaded VOD-series seasons, the CTA target label is derived from season
   metadata and rendered as `SxxE01` until episode details are loaded.
 - Uses unique generated tracking IDs for episode playback position compatibility.
+- Quick-start actions preserve both their translation key and interpolation
+  parameters when adapted for the Stalker CTA. Dropping `labelParams` exposes
+  the raw `{{episode}}` placeholder.
 
 Series inline playback behavior is shared across all three modes:
 
@@ -194,11 +313,30 @@ Series inline playback behavior is shared across all three modes:
 - Inline series autoplay is enabled by default. On player EOF (`ended`), Stalker starts the next episode only when it already exists in the current season's mapped episode list.
 - Autoplay and Next stop at the last episode of the current season. They do not jump to the next season and do not lazy-load an unloaded `is_series=1` season. Quick start remains the only flow that may load another VOD-series season before playback.
 - Previous is disabled on the first episode of the current season and otherwise switches directly to the previous episode.
+- Before either inline or external playback starts, the resolved content info
+  includes the parent `seriesXtreamId` and the mapped `seasonNumber` /
+  `episodeNumber`. Future playback-position rows therefore carry enough
+  metadata for workspace surfaces to render an episode badge. Existing rows
+  without those fields are intentionally not migrated and remain badge-less
+  until the episode is played again.
+- Ministra payloads may omit `season_number`. Episode mapping and lazy
+  quick-start labels share the same naturally ordered season fallback so later
+  seasons are not persisted as season 1.
+
+The VOD-series contract is cross-surface:
+
+- Favorites and recently viewed records preserve the raw `is_series` flag and
+  VOD origin so reopening still uses the lazy Ministra resources.
+- `extractStalkerItemType()` normalizes those activity records to dashboard
+  type `series`.
+- The dashboard resolves episode progress by the parent `seriesXtreamId` and
+  renders the saved season/episode metadata. It does not infer episode numbers
+  from provider payloads.
 
 Core decision logic and normalization are centralized in:
 
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/models/*.ts`
+- `libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts`
+- `libs/portal/stalker/data-access/src/lib/models/*.ts`
 
 ## Favorites and Recently Viewed
 
@@ -213,10 +351,10 @@ Current implementation is shared via Stalker-specific helpers:
 
 Where this is used:
 
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-favorites/stalker-favorites.component.ts`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/recently-viewed/recently-viewed.component.ts`
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`
-- `/Users/4gray/Code/iptvnator/libs/ui/components/src/lib/stalker-favorites-button/stalker-favorites-button.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.ts` (favorites + recently viewed)
+- `libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-catalog-detail/stalker-catalog-detail.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-favorites-button/stalker-favorites-button.component.ts`
 
 Navigation rule to preserve:
 
@@ -232,6 +370,36 @@ Navigation rule to preserve:
   branch.
 - See [Portal Detail Navigation](./portal-detail-navigation.md).
 
+### Embedded-series snapshot refresh
+
+Favorites and recently-viewed rows store the whole Stalker item as a JSON
+snapshot, so an embedded `series[]` episode list (and its playback `cmd`)
+freezes at the moment the row was written — newly released episodes would
+never appear when the item is reopened from favorites, recents, or the
+dashboard rails. `withStalkerSnapshotRefresh()`
+(`stores/features/with-stalker-snapshot-refresh.feature.ts`) fixes this with a
+snapshot-first + background re-fetch contract:
+
+- The stored snapshot renders immediately; the store method
+  `refreshEmbeddedSeriesSelection()` then re-fetches the item via a portal
+  title search (`get_ordered_list&type=vod&search=<title>`, item matched by
+  id, paginated up to 5 pages, wildcard-category retry) in the background.
+- When the episode list or `cmd` changed, the selection is patched in place.
+  The guard requires both the item id **and** the active playlist id to be
+  unchanged, because Stalker ids are only unique per portal.
+- Only the in-memory selection is patched — the stored snapshot row is
+  deliberately left alone. Every entry path into the detail view runs this
+  refresh, so a stale stored episode list is never rendered for longer than
+  one background request, and writing it back would add an uncontrolled
+  background writer to the whole-playlist read-modify-write that every
+  favorite/recent mutation performs (lost-update risk).
+- Triggers: `stalker-collection-detail.component.ts` (favorites/recent tabs,
+  global collections, dashboard handoffs) and the optional catalog-facade hook
+  `refreshSnapshotSelection()` for snapshot-injected browse detail
+  (`openStalkerItem` navigation state).
+- Regular `type=series` and Ministra `is_series` favorites are unaffected —
+  their seasons/episodes are always fetched fresh on open.
+
 ## Backup and Restore
 
 Versioned playlist backups include Stalker connection metadata plus playlist-
@@ -264,7 +432,7 @@ Import rule:
 
 Stalker live remote control is implemented in:
 
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts`
 
 Supported today:
 
@@ -279,7 +447,7 @@ See full backend and web-remote flow in [Remote Control Architecture](./remote-c
 Stalker ITV now splits EPG usage:
 
 - active channel panel: bulk `get_epg_info` cached once per playlist and rendered
-  through shared `app-epg-list`
+  through the shared EPG panel (`app-epg-timeline`, or `app-epg-list-view` in list mode)
 - channel row preview: no pre-playback network requests; previews are derived
   from cached bulk EPG only after the first active-channel fetch succeeds
 - active panel fallback: `get_short_epg` when bulk EPG is missing or unsupported
@@ -299,9 +467,12 @@ This reduces duplicate UI logic across portal types and keeps compatibility beha
 
 ## Regression Coverage
 
-Focused regression tests for Stalker VOD mode branching live in:
+Focused regression tests for Stalker VOD mode branching and the cross-surface
+series contract live in:
 
-- `/Users/4gray/Code/iptvnator/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts`
+- `libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts`
+- `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts`
+- `libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts`
 
 Covered scenarios include:
 
@@ -310,3 +481,7 @@ Covered scenarios include:
 - VOD-backed series favorites keep VOD-series loading semantics when opened from
   favorites/global favorites
 - Favorite toggle helper path invokes the expected add/remove flow
+- Quick-start episode labels interpolate their episode number
+- Inline and external episode handoffs carry resolved season/episode metadata
+- Dashboard activity classifies `is_series` VOD as series and resolves its
+  saved episode position
diff --git a/docs/architecture/stalker-store-api-baseline.md b/docs/architecture/stalker-store-api-baseline.md
index bfb4bb4aa..b062fd7ca 100644
--- a/docs/architecture/stalker-store-api-baseline.md
+++ b/docs/architecture/stalker-store-api-baseline.md
@@ -123,7 +123,15 @@ Consumer directories sampled:
 
 ## Invariants to Preserve During Refactor
 
-- Selection IDs (`selectedVodId`, `selectedSerialId`, `selectedItvId`) are synchronized in `setSelectedItem`.
+- Selection IDs (`selectedVodId`, `selectedItvId`) are synchronized in `setSelectedItem`.
+- `selectedSerialId` is set only when `selectedContentType` is `series`, and is
+  cleared for every other content type. `serialSeasonsResource` fires a
+  `get_ordered_list&type=series` portal request on each change of that id, and
+  it is the only episode source for a `series` selection — while VOD-context
+  shapes (embedded `series[]`, Ministra `is_series`) resolve their episodes
+  elsewhere, so carrying the id there only wastes a request. The gate must stay
+  on content type alone: gating it on item shape would leave a series-section
+  item that happens to carry `is_series`/`series[]` with an empty episode list.
 - `setSelectedCategory(...)` resets `page` to `0`.
 - `getPaginatedContent()` and `getCategoryResource()` always return arrays,
   even when the underlying request fails.
diff --git a/docs/architecture/tmdb-metadata-enrichment.md b/docs/architecture/tmdb-metadata-enrichment.md
index cac28e6ba..146bfa063 100644
--- a/docs/architecture/tmdb-metadata-enrichment.md
+++ b/docs/architecture/tmdb-metadata-enrichment.md
@@ -6,6 +6,8 @@ service layer, the SQLite cache, and the Xtream detail-view integration.
 
 Related:
 
+- [TMDB Capability Roadmap](./tmdb-roadmap.md) — follow-up backlog: unused
+  API surface, known defects, and what we deliberately will not build
 - [SQLite DB Worker](./sqlite-db-worker.md)
 - [Nx Workspace Boundaries](./nx-workspace-boundaries.md)
 
@@ -34,19 +36,21 @@ without creating dependency cycles (`portal/shared/data-access` already
 depends on `portal/xtream/data-access`, so it cannot host code the Xtream
 store imports):
 
-| File | Responsibility |
-| --- | --- |
-| `tmdb-config.ts` | API/image base URLs, embedded default API key, cache TTLs, app-language → TMDB-language mapping |
-| `tmdb.types.ts` | TMDB v3 response shapes (search, details with credits) |
-| `tmdb-api.service.ts` | Thin `fetch`-based client (TMDB supports CORS; works in Electron renderer and PWA). Accepts v3 keys (`api_key` param) and v4 tokens (Bearer) |
-| `tmdb-matcher.ts` | Title normalization, year extraction, and the match-confidence gate (pure functions) |
-| `tmdb-cache.service.ts` | Environment-aware cache (Electron IPC bridge vs in-memory LRU capped at 300 entries) with caller-supplied TTLs |
-| `tmdb-merge.ts` | Field-level merge into `XtreamVodInfo` / `XtreamSerieInfo` (pure functions, no mutation) |
-| `tmdb-runtime.service.ts` | Shared runtime context: opt-in gate, effective API key, language resolution |
-| `tmdb-enrichment.service.ts` | Movie/TV orchestrator and facade: id resolution → details fetch → cache; delegates person/season lookups |
-| `tmdb-person.service.ts` | Cached person details + combined filmography (`person:<id>` rows) |
-| `tmdb-season.service.ts` | Cached lazy per-season episode lists (`id:<id>\|season:<n>` rows) |
-| `tmdb-trending.service.ts` | Weekly trending (movie + tv merged by popularity, `trending:week` rows, 1-day TTL) |
+| File                         | Responsibility                                                                                                                               |
+| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| `tmdb-config.ts`             | API/image base URLs, embedded default API key, cache TTLs, app-language → TMDB-language mapping                                              |
+| `tmdb.types.ts`              | TMDB v3 response shapes (search, details with credits)                                                                                       |
+| `tmdb-api.service.ts`        | Thin `fetch`-based client (TMDB supports CORS; works in Electron renderer and PWA). Accepts v3 keys (`api_key` param) and v4 tokens (Bearer) |
+| `tmdb-matcher.ts`            | Title normalization, year extraction, and the match-confidence gate (pure functions)                                                         |
+| `tmdb-cache.service.ts`      | Environment-aware cache (Electron IPC bridge vs in-memory LRU capped at 300 entries) with caller-supplied TTLs                               |
+| `tmdb-merge.ts`              | Field-level merge into `XtreamVodInfo` / `XtreamSerieInfo` (pure functions, no mutation)                                                     |
+| `tmdb-credits.ts`            | People out of credit payloads: display cast, person chips, and the two-shape union a series cast needs                                       |
+| `tmdb-cache-payload.ts`      | Trims a details payload before caching (aggregate roles/crew) without changing what a merge over it produces                                 |
+| `tmdb-runtime.service.ts`    | Shared runtime context: opt-in gate, effective API key, language resolution                                                                  |
+| `tmdb-enrichment.service.ts` | Movie/TV orchestrator and facade: id resolution → details fetch → cache; delegates person/season lookups                                     |
+| `tmdb-person.service.ts`     | Cached person details + combined filmography (`person:<id>` rows)                                                                            |
+| `tmdb-season.service.ts`     | Cached lazy per-season episode lists (`id:<id>\|season:<n>` rows)                                                                            |
+| `tmdb-trending.service.ts`   | Weekly trending (movie + tv merged by popularity, `trending:week` rows, 1-day TTL)                                                           |
 
 Integration glue per portal:
 
@@ -65,16 +69,52 @@ Integration glue per portal:
 
 Components read the selection through signals and re-render when the merged
 item lands. Enriched cast (`tmdb_cast` with profile photos) renders as
-avatar chips in the detail views; a "check key" button in the settings
-section validates the API key against `/configuration`.
+avatar chips in the detail views, and so do directors/creators
+(`tmdb_directors`: movie directors from `credits.crew` with
+`job === 'Director'`, series creators from `created_by`) — both chip kinds
+carry `tmdbPersonId` and open the same person page. Series detail views
+also show a production-status chip (`tmdb_status`): TMDB returns `status`
+as an ENGLISH string regardless of the request language, so it is
+normalized to a token (`normalizeSeriesStatus`) and rendered through
+translated labels (`seriesStatusLabelKey`) — the raw value never reaches
+the UI. Unknown values are dropped rather than displayed. A "check key"
+button in the settings section validates the API key against
+`/configuration`, and a cache panel beside it shows the stored row count
+plus payload size and can drop the lot (`DB_GET_TMDB_CACHE_STATS` /
+`DB_CLEAR_TMDB_METADATA`, in-memory map in the PWA). Sizing is a full
+scan, so it only runs once the TMDB section is the active one. Clearing
+costs nothing but the next few requests — enrichment refetches on demand
+— and it is also the escape hatch when a lookup-key version bump orphans
+rows, since a bump makes them unreachable rather than deleting them.
 
 ## Match Confidence
 
 Wrong metadata is worse than no metadata, so id resolution is conservative:
 
 1. If the provider returns a usable `tmdb_id` (Xtream VOD info often does),
-   it is trusted fully and no search runs. Series have no show-level
-   `tmdb_id`, so they always go through search.
+   its details are fetched directly and normally used as-is. Series have no
+   show-level `tmdb_id`, so they always go through search. The id is a
+   strong hint rather than gospel — panels ship dead and stale ones — so
+   the payload it returns is weighed against the provider item
+   (`assessProviderId`):
+    - a matching title **or** a compatible release year (±1; for series,
+      any earlier premiere) → **corroborated**, use it;
+    - both years known and incompatible → **contradicted**, the stale-id
+      signature ("Blade Runner 2049" carrying the 1982 film's id): the
+      title search may take over, and does so only if it finds a confident
+      match of its own;
+    - title differs with no year to arbitrate → **inconclusive**, keep the
+      details. TMDB returns titles in the request language and
+      normalization strips stylized prefixes ("IT - Chapter Two" →
+      "chapter two"), so a name mismatch alone says more about our inputs
+      than about the id.
+
+   A 404 is the one hard verdict: the id is recorded as dead
+   (`badProviderId:<id>` row), skipped next time, and the title search
+   takes over. Transient failures (auth, rate limit, 5xx, offline) neither
+   disable the id nor trigger a search — that request would hit the same
+   outage, and a title match that did come back would be weaker evidence
+   than the id already in hand.
 2. Otherwise `/search/movie` (or `/search/tv`) runs with the normalized
    title. Normalization strips bracketed tags, quality markers (`4K`,
    `1080p`, `MULTI`, …), leading language prefixes (`EN - `), diacritics,
@@ -101,7 +141,7 @@ The year filter is applied client-side rather than via TMDB's strict
 when the provider's year is off by one.
 
 **Non-Latin titles**: TMDB matches translated titles but returns `title` in
-the *request* language, so a Cyrillic query issued with `en-US` would come
+the _request_ language, so a Cyrillic query issued with `en-US` would come
 back with an English title and fail the exact-match gate.
 `tmdbSearchLanguageForTitle` detects Cyrillic queries and issues the search
 with `ru-RU` (unless the app language is already Cyrillic-based); details
@@ -111,7 +151,19 @@ are still fetched in the app language afterwards.
 
 Details are fetched with
 `/movie/{id}?append_to_response=credits,videos,recommendations` (`/tv/{id}`
-for series). Credits provide cast/director; videos supply the best YouTube
+for series). Credits provide cast/director — for series the request also
+appends `aggregate_credits`, because TMDB documents a TV id's `credits` as
+the **latest season's** credits. What `aggregate_credits` covers is
+described in one self-contradicting sentence — "it does not return the
+newest season. Instead, it is a view of all the entire cast & crew for all
+episodes belonging to a TV show" — so it is either the whole run minus the
+newest season or the whole run. `unifiedTvCast` is written not to care:
+it unions the two by set difference (whole-run billing order first, then
+anyone `credits` has that the aggregate lacks), which under the second
+reading appends nothing. Either way, long-running shows neither lose
+departed regulars nor miss new ones. Payloads cached
+before this landed have no `aggregate_credits` and fall back to the old
+behaviour until they are refetched; videos supply the best YouTube
 trailer (official trailer > trailer > teaser, merged into
 `youtube_trailer` / `tmdb_trailer`); recommendations power the "Similar"
 rail. In Xtream detail views the rail shows only recommendations that
@@ -173,10 +225,33 @@ detail views lazily fetch `/tv/{tmdbId}/season/{n}` via
 - episodes without a TMDB counterpart (by episode number) pass through
   untouched
 
+The season number `{n}` is the provider's episode season number, with one
+correction (`resolveEnrichmentSeasonNumber` in
+`libs/shared/interfaces/src/lib/season-marker.util.ts`): providers often
+slice a show into per-season catalog items ("The Mandalorian (2 season)",
+"Пацаны 2 сезон", "The Boys S05") and renumber the single contained season
+to 1. When the item contains exactly ONE season and the raw title carries
+an explicit season marker (`extractSeasonFromTitle`: `s02`, `season 2`,
+`2 season`, `2nd season`, `сезон 2`, `2-й сезон`, `staffel`/`temporada`/
+`saison` forms, bracketed or not) that differs from the provider's number,
+the marker wins and that TMDB season is fetched. Multi-season items always
+keep provider numbering. `normalizeTitleKeys` strips the same markers
+(including number-first forms like "2 сезон") from search titles, so the
+show-level match is unaffected by them.
+
 Wiring: Xtream — `XtreamStore.enrichSelectedSerialSeason(seasonKey)` fired
 from the serial detail's `(seasonSelected)`; Stalker — the series view
 keeps a `${tmdbId}|${seasonKey}`-keyed map and overlays it inside its
-`mappedSeasons` computed. Without a show-level match or with enrichment
+`mappedSeasons` computed. Each Stalker entry records the RESOLVED season
+it was fetched for: per-season slices of one show share
+(tmdbId, provider key "1") but resolve to different seasons, and a fetch
+made with stale detail-to-detail navigation context is overwritten once
+the real context re-resolves. The fetch effect gates on coherence rather
+than timing: it waits while the season resource reloads and requires the
+selected key to exist in the map with episodes. The retained season
+selection deliberately survives navigation — the season container
+deduplicates `seasonSelected` emissions, so items sharing one season-key
+set would otherwise never re-trigger enrichment. Without a show-level match or with enrichment
 disabled everything is a no-op — the `SeasonContainer` UI already renders
 every episode field conditionally.
 
@@ -187,7 +262,11 @@ Cast chips carry the TMDB person id (`tmdbPersonId` on
 current portal. The page loads `/person/{id}?append_to_response=
 combined_credits` via `TmdbEnrichmentService.getPersonDetails` (cached
 under `person:{id}` with media_type `person`) and renders the shared
-`ActorViewComponent` (`libs/ui/shared-portals`).
+`ActorViewComponent` (`libs/ui/shared-portals`). The filmography merges
+acting credits (`combined_credits.cast`) with directing/creating credits
+(`combined_credits.crew`, jobs `Director`/`Creator`) into one list —
+acting wins the per-title dedup, directing-only titles show the job in
+the character slot — so the page serves actors and directors alike.
 
 Filmography has two scopes:
 
@@ -210,14 +289,18 @@ Filmography has two scopes:
 
 ## Cache
 
-Single table with two row kinds discriminated by `lookup_key` prefix:
+Single table with several row kinds discriminated by the `lookup_key`
+prefix:
 
 ```
 tmdb_metadata (
   media_type  'movie' | 'tv' | 'person',
-  lookup_key  'id:<tmdbId>'                  -- details payload row
-              'title:<normalized>|year:<y>'  -- search resolution row
+  lookup_key  'id:<tmdbId>|v2'               -- details payload row
+              'id:<tmdbId>|season:<n>'       -- season payload row
+              'title:<normalized>|year:<y>|v2' -- search resolution row
               'person:<personId>'            -- person payload row
+              'trending:week'                -- trending list row
+              'badProviderId:<tmdbId>'       -- id confirmed 404 by TMDB
   language    TEXT,       -- TMDB language code
   tmdb_id     INTEGER,    -- NULL on a search row = negative cache
   payload     TEXT,       -- raw JSON details, NULL for search rows
@@ -229,15 +312,43 @@ tmdb_metadata (
 TTLs (enforced at read time in `TmdbCacheService.isFresh`): details and
 positive matches 30 days, negative matches 7 days.
 
+Search and details keys carry a `|v2` version suffix (`buildDetailsLookupKey`
+in `tmdb-matcher.ts`): for search rows so normalization changes cannot reuse
+stale positive or negative resolutions, for details rows because payloads now
+include videos via `append_to_response` and pre-videos cache rows had to be
+invalidated. Database startup deletes the obsolete
+unversioned search rows once and records
+`migration:tmdb-search-lookup-v2-cache-cleanup:v1` in `app_state`; details and
+person cache rows are unaffected.
+
 Electron IPC path (follows the standard DB worker contract, see
 [SQLite DB Worker](./sqlite-db-worker.md)):
 
-- Worker ops: `DB_GET_TMDB_METADATA`, `DB_SET_TMDB_METADATA`
+- Worker ops: `DB_GET_TMDB_METADATA`, `DB_SET_TMDB_METADATA`, plus the two
+  maintenance ops behind the settings cache panel,
+  `DB_GET_TMDB_CACHE_STATS` and `DB_CLEAR_TMDB_METADATA`
   (`database-worker.types.ts`, `database.worker.ts`,
   `operations/tmdb.operations.ts`)
 - IPC registration: `events/database/tmdb.events.ts`
-- Preload bridge: `dbGetTmdbMetadata` / `dbSetTmdbMetadata` on
-  `window.electron` (typed in `ElectronBridgeApi`)
+- Preload bridge: `dbGetTmdbMetadata` / `dbSetTmdbMetadata` /
+  `dbGetTmdbCacheStats` / `dbClearTmdbMetadata` on `window.electron` (typed
+  in `ElectronBridgeApi`)
+
+`TmdbCacheService` treats the maintenance pair as optional on the bridge: an
+Electron shell that predates them reports `null` (unsupported) rather than
+falling back to the renderer map, which is always empty in Electron and
+would claim the SQLite cache is empty. A `clear()` first awaits the writes
+already in flight so they land and are deleted with everything else, and
+holds the clear promise for its duration so a write starting meanwhile
+queues behind the delete instead of racing it. Rows written after the user
+cleared are deliberately kept.
+
+The panel's full path — settings button, preload bridge, DB worker, real
+SQLite — is covered by `@settings @electron @persistence sizes and clears
+the TMDB metadata cache` in `apps/electron-backend-e2e/src/settings.e2e.ts`.
+It seeds a row through `dbSetTmdbMetadata` rather than through enrichment,
+which needs an API key that builds outside the release pipeline do not
+carry.
 
 The PWA uses a session-scoped in-memory map (acceptable for phase 1; TMDB
 supports CORS so the PWA calls the API directly).
@@ -246,7 +357,12 @@ supports CORS so the PWA calls the API directly).
 
 `Settings.tmdb?: { enabled: boolean; apiKey?: string }`
 (`libs/shared/interfaces/src/lib/tmdb.interface.ts`). The settings page has
-a "Metadata (TMDB)" section (enable toggle + optional API key override).
+a "Metadata (TMDB)" section: enable toggle, optional API key override with a
+"check key" button (validates against `/configuration`), and a cache panel
+showing the stored row count plus payload size with a button that drops the
+lot. Sizing is a full table scan, so it runs only once that section is the
+active one, and a failed read or clear says so instead of showing an empty
+cache.
 
 The embedded default key lives in `DEFAULT_TMDB_API_KEY`
 (`libs/services/src/lib/tmdb/tmdb-config.ts`) and is an **empty placeholder
@@ -297,3 +413,18 @@ dashboard rail, artwork upgrade for M3U VOD, persistent PWA cache
   heroes additionally show the tracked "S{n}·E{n}" badge from the playback
   position (no TMDB involved); the watch-progress bar is limited to
   movie/series heroes.
+
+### `badProviderId:` rows
+
+Providers ship `tmdb_id` values that do not exist. A failed details fetch
+caches nothing, so without a marker the same 404 is re-issued on every
+detail open, forever. These rows record that verdict: `tmdb_id` NULL,
+language `any` (a dead id is dead in every language), read with the
+negative-match TTL.
+
+Only a **confirmed 404** is recorded. Transient failures (401, 429, 5xx,
+offline) leave no marker — they say nothing about the id. Neither does a
+title mismatch: that id exists and may be correct for a *different* item,
+and since the row is keyed by id alone and shared across playlists,
+recording per-item mismatches here would deny the direct lookup to every
+other item that legitimately uses the same id.
diff --git a/docs/architecture/tmdb-roadmap.md b/docs/architecture/tmdb-roadmap.md
new file mode 100644
index 000000000..dbe0344e2
--- /dev/null
+++ b/docs/architecture/tmdb-roadmap.md
@@ -0,0 +1,277 @@
+# TMDB Capability Roadmap
+
+Follow-up backlog for the TMDB metadata subsystem: what the API still
+offers that we do not use, what it would cost, and what we deliberately
+will not build. Companion to
+[TMDB Metadata Enrichment](./tmdb-metadata-enrichment.md), which
+documents what already ships.
+
+Produced by a multi-agent audit (2026-07-24) that cross-checked our code
+against the official TMDB API reference and against how Plex, Jellyfin,
+Emby, Stremio and Kodi present metadata. Line numbers reference the state
+of the repo at that date and will drift — treat them as pointers, not
+addresses.
+
+> Three items in here are **defects in shipped code**, not features:
+> A1 (broken provider `tmdb_id` suppresses enrichment), A2 (series cast is
+> latest-season-only) and F1 (cache retention exceeds the TMDB ToS limit).
+> They come first.
+
+## 0. The one decision that gates everything
+
+`buildDetailsLookupKey` (`libs/services/src/lib/tmdb/tmdb-matcher.ts:79-83`) is `id:{tmdbId}|v2`. Six separate ideas below each "need a v3 bump", and a bump invalidates **every cached details row for every user**. Make this decision **once**:
+
+**One consolidated append PR** — add `images,release_dates,content_ratings,alternative_titles,aggregate_credits` to the two detail calls (`tmdb-api.service.ts:62,74`), trim `images` down to the chosen logo + top posters _before_ `TmdbCacheService.set`, and bump the key to `v3` — scoped by `mediaType` so movie rows aren't invalidated by the TV-only `aggregate_credits` addition. Everything downstream then ships as pure presentation PRs with no further refetch events.
+
+Ship the **cache retention sweep first** (§4, #8) so the bump's orphaned rows have a reaper.
+
+---
+
+## 1. Zero-extra-call wins — data already on disk today
+
+These read fields already sitting in `tmdb_metadata.payload` (stored verbatim per `tmdb.types.ts:1-5`). **No new HTTP, no cache-key bump, no schema change.** This is the cheapest tier in the entire roadmap.
+
+| Feature                                                            | Field already cached                                                                                                                                             | Cost                         |
+| ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------- |
+| **Extras shelf** (Featurette / BTS / Bloopers / Clips)             | `videos.results[]` — `pickTrailerKey` (`tmdb-merge.ts:110-119`) keeps 1 of ~15                                                                                   | L/M                          |
+| **Series structure** (status chip, season posters, episode counts) | `/tv/{id}` base: `seasons[]`, `status`, `in_production`, `next_episode_to_air`, `number_of_seasons` — **none typed** in `TmdbTvDetails` (`tmdb.types.ts:99-107`) | L/M                          |
+| **Franchise strip**                                                | `belongs_to_collection` on every enriched movie — untyped, discarded                                                                                             | (needs 1 call for `parts[]`) |
+| **Tagline** on detail hero                                         | `tagline` on both detail responses                                                                                                                               | S                            |
+| **Full cast beyond 10 / whole crew**                               | `credits.cast[]` (30-100 entries, `MAX_CAST_NAMES=10`), `credits.crew[]` (writers, composers, DoP — filtered to `job==='Director'`)                              | M                            |
+| **Recommendations 13-20 + their overviews/backdrops/ratings**      | `recommendations.results[]` (20 cached, 12 kept, 4 of 15 fields kept)                                                                                            | S                            |
+| **`deathday` on actor pages**                                      | Already parsed into `ActorProfile` (`tmdb-person.ts:51`), never rendered                                                                                         | **XS — one template line**   |
+| **Episode runtimes, "Season Finale" badges**                       | Season payload `runtime`, `episode_type`, `vote_count` (typed, unused)                                                                                           | S                            |
+| **"Because you watched X"**                                        | `recommendations` on any opened title                                                                                                                            | M                            |
+
+⚠️ **Caveat on all of them:** the `merge*WithTmdb` functions write a _fixed projection_. Reading a new field means extending the merge (three interfaces + `NormalizedVodMeta` + both normalizers in `vod-details-adapters.ts`) **or** a lazy cache read via `TmdbCacheService.get(mediaType, buildDetailsLookupKey(id), lang)` — the pattern `TmdbSeasonService.originalShowLanguage` already uses (`tmdb-season.service.ts:77-92`).
+
+⚠️ **Second caveat, non-English locales:** TMDB language-filters `videos`, so the extras shelf is frequently empty for ru/ar/ja users. Reuse the existing original-language fallback payload (`tmdb-language-fallback.ts`) rather than adding `include_video_language` — that param would force the shelf into the v3 bump.
+
+---
+
+## 2. Themes, ordered by value-to-effort within each
+
+### Theme A — Match accuracy (HIGH LEVERAGE: fixes the existing integration)
+
+These add **no surface area**. They make what already ships correct. High leverage: every one of them multiplies the value of every other TMDB feature, because nothing renders when the match fails.
+
+| #   | Idea                                                                                                                                                                                                                                                                                                             | Effort  | Note                                                                                                                                                                           |
+| --- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| A1  | **Distrust broken provider `tmdb_id`** — a garbage-but-integer id short-circuits title search; `getDetails` 404s, outer catch swallows, **zero enrichment on an item title search would have handled**. Worse: a _stale-but-valid_ id returns a confidently-wrong payload with **no title sanity check at all**. | **S/M** | Confirmed bug. Xtream movies only (`xtream-tmdb-enrichment.ts:56` is the sole path passing `tmdbId`), but that's the highest-traffic detail view.                              |
+| A2  | **`aggregate_credits` for TV** — `/tv/{id}/credits` is documented as "the latest season credits". **Our series cast chips are quietly wrong for long-running shows.** Closer to a bug fix than a feature.                                                                                                        | **M**   | Append `credits,aggregate_credits` together and union — TMDB's own docs say aggregate "does not return the newest season".                                                     |
+| A3  | **`alternative_titles` synonym index** — write one cache row per normalized alternate title pointing at the resolved `tmdb_id`, using the existing search-lookup-key shape so lookups stay point-shaped.                                                                                                         | M       | Chicken-and-egg: only helps titles we already matched. Real payoff arrives after a warm pass.                                                                                  |
+| A4  | **`/search/multi` for ambiguous media type only** (Stalker `is_series`, Ministra VOD)                                                                                                                                                                                                                            | M       | ⚠️ Do **not** frame as "halves search calls" — we search one type, not two. It's a _typing_ fix. And multi's single mixed 20-result page can _lower_ recall as a primary path. |
+| A5  | **Network resilience** — typed `TmdbApiError`, in-flight coalescing, 429/5xx backoff, a visible bad-key signal                                                                                                                                                                                                   | M       | 401 currently indistinguishable from "TMDB doesn't have this title".                                                                                                           |
+
+**Dropped from this theme:** `/find/{external_id}`. Verified — **no provider interface in this repo carries an IMDb or TVDB id**, only `rating_imdb` (a score). M3U `tvg-id` is an XMLTV _channel_ id, and M3U has no TMDB enrichment at all. It has no inbound caller.
+
+**Before shipping A3/A4: add match/miss instrumentation.** There is no measurement today, so "fixes the 33% miss" is currently unfalsifiable.
+
+### Theme B — Artwork & cinematic polish
+
+| #   | Idea                                                     | Effort | Note                                                                                                                                                                                                                        |
+| --- | -------------------------------------------------------- | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| B1  | **Title logos (clearlogo) on detail + dashboard heroes** | M/H    | Plex, Emby, Kodi and Jellyfin all independently converged on the same `clearlogo` asset. Biggest perceived-quality delta available. **Zero new i18n keys.**                                                                 |
+| B2  | **Localized poster / textless backdrop selection**       | M      | Same `images` append. Pure merge-output change, both environments.                                                                                                                                                          |
+| B3  | **Extras shelf**                                         | L/M    | See §1.                                                                                                                                                                                                                     |
+| B4  | **Editorial meta rail** (tagline + certification plate)  | M      | Tagline is free today; certification joins the v3 append.                                                                                                                                                                   |
+| B5  | Poster-derived ambient palette                           | M/H    | `image.tmdb.org` returns `access-control-allow-origin: *`, so the canvas is untainted. But it must **not** animate over the Embedded MPV transparency hole, and needs an owning service with teardown-on-navigation. Defer. |
+
+⚠️ B1 gotcha: `include_image_language` takes **ISO 639-1** codes, but `TmdbRuntimeService.language()` returns region-suffixed (`ru-RU`). A `.split('-')[0]` helper doesn't exist yet. And the param is **mandatory** — without it, appended images inherit `language=ru-RU` and return near-empty logos for all 17 non-English locales.
+
+⚠️ B1 honesty: logo coverage is thin for the regional/older fare that dominates IPTV catalogs. A fixed-height title box changes layout for 100% of titles to serve maybe half. That's a deliberate design call, not a free win.
+
+### Theme C — Series / anime handling
+
+| #   | Idea                                                                         | Effort   |
+| --- | ---------------------------------------------------------------------------- | -------- |
+| C1  | **Series structure**: status chip, season posters, per-season episode counts | L/M      |
+| C2  | **Next-episode line**, gated on `TmdbCacheService.isFresh(entry, ~2 days)`   | S        |
+| C3  | Season completeness ("portal has 6 of 8 seasons")                            | S, gated |
+
+⚠️ C1: TMDB returns `status` as an **English string** (`"Ended"`, `"Returning Series"`) even under `language=ru-RU`. Map to i18n keys — never render raw into 18 locales.
+⚠️ C2: the details TTL is 30 days, so `next_episode_to_air` will routinely be a date **weeks in the past**. Suppress when stale; never refetch.
+⚠️ C3: compare season **numbers** present against `seasons[]` filtered to `season_number > 0`, not counts. A provider dumping every episode under season 1 would otherwise produce a false "missing 7 seasons" claim. Suppress entirely on any misalignment, and phrase strictly as an observation about the portal.
+
+**Anime absolute-vs-aired ordering (`episode_groups`): deprioritized.** IPTV providers name episodes arbitrarily; there's no stable key to map onto a TMDB group order. High risk of playing the wrong episode. If ever built: display-only toggle, never mutating stored identity or playback positions (the Sonarr #6547 lesson — upstream numbering changes physically reshuffled users' libraries).
+
+### Theme D — Browse & discovery
+
+| #   | Idea                                                 | Effort          |
+| --- | ---------------------------------------------------- | --------------- |
+| D1  | **"Because you watched X" rail**                     | M               |
+| D2  | **Franchise strip** (owned/unowned)                  | M               |
+| D3  | Genre / decade / rating facets over your own catalog | **H — blocked** |
+| D4  | Mood shelves from keywords (pill row only)           | M               |
+
+⚠️ **The recurring architectural trap:** every catalog-first rail surfaces content the user cannot play. The Trending rail already solves this with batched `DB_MATCH_TITLES`. **Hide the rail on zero matches** — an empty shelf is worse than no shelf.
+
+⚠️ D3 is hard-blocked. `content` (`schema.ts:92-127`) has no `year`, `genre`, `runtime` or `tmdb_id`, and there is **no joinable key to `tmdb_metadata`**. Filtering isn't even SQL — `filteredAndSortedContent()` (`with-selection.feature.ts:339-444`) is in-memory over the loaded array. This needs the metadata index below.
+
+⚠️ D4's dashboard-shelf half is not currently possible: `TmdbCacheService` is **point-lookup only**, there is no scan op over `tmdb_metadata`, and cache rows carry no back-reference to a content row. Ship the pill row alone. Also: TMDB keywords are an **English-only controlled vocabulary** — they'll render as English lowercase strings next to fully localized genres in 18 locales.
+
+### Theme E — Library index (the prerequisite everything blocked is blocked on)
+
+Canonical titles in grids, rating/year badges on cards, genre/decade browse, family mode, cross-surface artwork overrides — **all five reduce to the same missing primitive.** They cannot ship without it and should not be scheduled separately.
+
+**The right shape** (correcting the obvious approach): a **side table `content_tmdb` keyed on `(playlist_id, content_type, xtream_id)`** — _not_ columns on `content`. `clearXtreamImportCache` (`content.operations.ts:1063-1100`) deletes content rows, and `content.id` is an autoincrement surrogate that isn't stable across re-import; denormalized columns would be wiped on every catalog refresh.
+
+**Blockers, all hard:**
+
+- **The shared release key.** `.github/workflows/build-and-make.yaml:402-406` injects one `TMDB_API_KEY` into every installed copy. Bulk backfill on that key is exactly the traffic shape TMDB throttles ("upper limits to help mitigate needlessly high bulk scraping"). Must be **hard-gated to a user-supplied personal key**, not merely "explicit consent".
+- **No 429/backoff machinery exists** (Theme A5 is a prerequisite).
+- **Per-item IPC.** 40k warm writes = 40k+ worker round-trips. Batched cache ops are a prerequisite, not an optimization.
+- **6-month retention** must ship _with_ it, not after — bulk warming is precisely a mechanism for maximizing held TMDB data.
+- **Coverage:** Xtream + Electron only. Stalker, M3U and every PWA user get zero. Cannot be sold as "my library".
+
+Realistic: **H, multi-PR.** Worth doing eventually; not worth doing next.
+
+### Theme F — Correctness & compliance hygiene
+
+| #   | Idea                                       | Effort |
+| --- | ------------------------------------------ | ------ |
+| F1  | **6-month cache TTL sweep + purge button** | L+     |
+| F2  | **"Wrong movie?" manual match override**   | M      |
+
+F1 is a **live compliance gap in shipped code**, not a feature. `tmdb.operations.ts` has only `get`/`set`; `setTmdbMetadata` uses `onConflictDoUpdate`, so untouched rows persist forever. The ToS caps retention at 6 months. `fetched_at` already exists (`schema.ts:376`).
+
+### Theme G — Cross-device / accounts
+
+**Deliberately empty.** See §5.
+
+---
+
+## 3. Top-8 ranked shortlist
+
+| #     | What it is                                                                                                                            | Endpoint                                                     | Why it matters for IPTV specifically                                                                                                                                                                                                                                  | Effort  | Type                               |
+| ----- | ------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ---------------------------------- |
+| **1** | **Distrust broken provider `tmdb_id`** — try details, fall back to title search on 404 _or_ title mismatch; negative-cache the bad id | none (uses existing `/movie\|tv/{id}` + `/search/*`)         | IPTV providers ship _garbage_ `tmdb_id` values. Every bad id is a detail page with **no plot, no cast, no poster** — for an item title search would have matched. Zero i18n.                                                                                          | **S/M** | **Quick win** ⚡ **high leverage** |
+| **2** | **6-month TTL sweep + purge button**                                                                                                  | none                                                         | Live ToS violation in shipped code. Also the escape hatch for the v3 bump's orphaned rows.                                                                                                                                                                            | **L+**  | Quick win (risk removal)           |
+| **3** | **Extras shelf** (Featurette/BTS/Bloopers)                                                                                            | `videos` — **already appended**                              | Plex _pays a licensing fee_ for extras; Emby/Infuse need local files. IPTVnator can't have either — YouTube-hosted extras are the only possible implementation, and the nocookie embed + Electron Referer shim already ship.                                          | **L/M** | **Quick win** ⚡                   |
+| **4** | **`aggregate_credits` for TV**                                                                                                        | `append_to_response=credits,aggregate_credits` on `/tv/{id}` | `/tv/{id}/credits` returns **only the latest season**. Our series cast chips are wrong today for every long-running show. Bug fix wearing a feature costume.                                                                                                          | **M**   | **Quick win** ⚡ **high leverage** |
+| **5** | **Series structure** (status chip, season posters, episode counts)                                                                    | `/tv/{id}` base fields — **already cached**                  | IPTV series come as an undifferentiated pile of season folders with no art and no signal. Season posters + "Ended / Returning" + episode counts turn that into something navigable. Zero calls, zero bump.                                                            | **L/M** | **Quick win** ⚡                   |
+| **6** | **Title logos on heroes**                                                                                                             | `append_to_response=images` + `include_image_language`       | The single largest perceived-quality upgrade available, and the pattern all five incumbents converged on independently. Zero new i18n keys across 18 locales.                                                                                                         | **M/H** | **Strategic bet**                  |
+| **7** | **"Because you watched X" rail**                                                                                                      | `recommendations` — **already appended & cached**            | >80% of Netflix viewing comes from rails, not search. IPTVnator's dashboard is _all history rails_ — a user with three playlists and no watch history gets no discovery at all. This is the first rail that answers "what should I watch".                            | **M**   | **Strategic bet**                  |
+| **8** | **"Wrong movie?" manual match override**                                                                                              | `/search/multi` (one call per dialog open, user-typed)       | The honest complement to #1: automated matching will still fail on polluted catalogs, and today there is **no recovery path** — the user sees the wrong film's plot forever. Precedent exists: `epg-mapping-dialog` binds a dirty provider entity to a canonical one. | **M**   | **Strategic bet**                  |
+
+**Just outside:** franchise strip (M, but `belongs_to_collection` is null for most catalog titles — rare payoff); network resilience A5 (M, prerequisite for anything bulk); `alternative_titles` synonym index (M, but low standalone gain until a warm pass exists).
+
+---
+
+## 4. Deliberately NOT building
+
+| Idea                                                   | Why not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| ------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Family mode / certification gate + PIN**             | Enrichment is lazy and per-open, so a gate **fails open on every unmatched title** (passes everything) or **fails closed** (empty app on day one). Structurally impossible for PWA (no catalog DB), Stalker (server-paginated) and M3U (no enrichment at all) — and TMDB covers **no live channels**, which is where IPTV family risk actually concentrates. An age gate that silently passes unmatched titles is worse than none, because parents will trust it. **Ship instead:** adult-category keyword blocklist + Stalker's existing `censored` flag + PIN, with TMDB certification as a per-title **badge only**. Never describe the badge as a safety feature, in UI copy or release notes. |
+| **`/find/{external_id}`**                              | Verified: no provider interface in this repo exposes an IMDb or TVDB **id** — only `rating_imdb` (a score). M3U `tvg-id` is an XMLTV _channel_ id, and M3U has no TMDB path. The only `imdb_id` obtainable comes from TMDB itself, which is circular. No inbound caller exists.                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| **`watch/providers`**                                  | Tells the user a title is on Netflix. In a player whose premise is the user's _own_ streams, this reads as an ad for a competitor and drags in a mandatory JustWatch attribution obligation on top of ours. Direct conflict with the product stance.                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| **TMDB / Trakt account sync (v3 session or v4 OAuth)** | Requires every user to hold a TMDB account and complete a browser OAuth flow, to sync data we already store _better_ — our favorites are playlist-scoped and playlist-aware; TMDB's are not. High friction, new credential surface, low payoff. Guest sessions expire in 60 min with no reattachment — a dead end.                                                                                                                                                                                                                                                                                                                                                                                 |
+| **Quality/rating badges on grid cards**                | No join key from `content` to `tmdb_metadata`, no batched cache-read IPC op, and near-zero coverage without a bulk warm pass. Blocked behind Theme E. _Salvage now:_ the subtitle-consistency fix + a **provider**-rating badge on `app-content-card`.                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| **Canonical titles in grids**                          | Same missing join key — plus a sharper unnamed regression: search runs trigram FTS over `content_title_fts`, which holds **provider** titles. Show "The Matrix", the user types "The Matrix", the indexed `"EN - Matrix, The 1080p 2019"` doesn't match. Cleaning display titles without indexing canonical titles **actively makes search worse**. _Ship the cheap subset:_ canonical title on the **detail hero only**, provider string demoted into the About block.                                                                                                                                                                                                                            |
+| **Empty-state artwork mosaic**                         | Wrong reuse target (`portal-empty-state` is live-TV-only), and it cannot render in the first-run case it's designed for — TMDB is default-off and the library is empty. _Salvage:_ the `/search/multi` teaching message on a genuine zero-result search ("_Dune: Part Two_ exists, but it isn't in this playlist") — points at the user's own playlist, never outward.                                                                                                                                                                                                                                                                                                                             |
+| **User-facing smart-collection rule builder**          | Kometa's 3.4k stars represent real but self-selecting power-user demand. Large UI surface, and IPTV catalogs churn — saved rules rot silently between refreshes. Ship a handful of curated dynamic rails instead: ~90% of the value, ~10% of the surface.                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| **Audio/subtitle language badges from TMDB**           | TMDB has **no subtitle data at all**; `spoken_languages` describes the _work_, not the _stream_. A wrong badge is worse than no badge. Correct sources are Xtream `get_vod_info` codec fields and HLS `#EXT-X-MEDIA` at playback time. Explicitly out of scope for TMDB work.                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| **Anime absolute-vs-aired episode ordering**           | Provider episode labels are arbitrary — no stable key to map onto a TMDB group order. High risk of playing the wrong episode. `episode_groups` `type` integers aren't even in the official spec.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+| **Poster-derived ambient palette (for now)**           | Technically viable (CORS verified), but it's a global mutable style channel needing an owning service with navigation teardown, dual-theme WCAG clamping, and — critically — it must not animate over the Embedded MPV transparency hole, the exact class of change that broke native-view before. Not worth it yet.                                                                                                                                                                                                                                                                                                                                                                               |
+
+---
+
+## 5. Implementation sketches — top 3
+
+### #1 — Distrust broken provider `tmdb_id`
+
+**The bug**, in `libs/services/src/lib/tmdb/tmdb-enrichment.service.ts` `enrich()`:
+
+```ts
+const tmdbId = parseProviderTmdbId(query.tmdbId) ?? (await this.resolveIdBySearch(...));
+if (tmdbId === null) return null;
+return await this.getDetails(mediaType, tmdbId);
+```
+
+A garbage-but-integer provider id short-circuits the search entirely. `getDetails` → `fetchDetails` → `api.request()` throws on the 404, the outer catch logs and returns `null`. **Zero enrichment, permanently, for an item title search would have resolved.** The stale-but-_valid_ id case is worse — it never throws, and there is no title sanity check, so it silently renders another film's plot and cast.
+
+**Files:**
+
+- New `libs/services/src/lib/tmdb/tmdb-id-resolver.ts` — `resolveTmdbId(mediaType, query, {api, cache, runtime}) → number | null`. Extraction is needed regardless: `tmdb-enrichment.service.ts` is **290 lines, at the ceiling**, and idea #8 needs the same extraction.
+- `tmdb-enrichment.service.ts` — inject the resolver; `enrich()` becomes try-details-then-fall-back-to-search.
+- `tmdb-matcher.ts` (166 lines, room) — reuse `normalizeTitle` + `buildSearchTitleVariants` for the sanity check; add a `badProviderId:{id}` negative-cache key builder.
+
+**Logic:** if `parseProviderTmdbId` yields an id, attempt `getDetails`. On throw **or** on a resolved title whose `normalizeTitle()` matches none of `buildSearchTitleVariants(query.title, query.originalTitle)` → fall through to `resolveIdBySearch`.
+
+> **Correction, as shipped (#1239).** Two refinements to the sketch above.
+> A title mismatch must **not** discard the payload: TMDB returns titles in
+> the *request* language, so a localized provider title legitimately fails
+> the check. It only lets the search compete, and the provider payload is
+> kept when the search finds nothing confident. And the `badProviderId:`
+> row is written **only for a confirmed 404** — never for transient
+> failures (401/429/5xx/offline) and never for mismatches, since that row
+> is keyed by id alone and shared across playlists, so a per-item verdict
+> there would disable the id for every other item that uses it correctly. **The negative cache is not optional** — a failed details fetch currently caches nothing, so every re-open retries the 404 forever; without it you trade one wasted request for two, permanently.
+
+**Regression spec:** (a) a provider `tmdb_id` that 404s still produces enrichment via title search; (b) a provider `tmdb_id` resolving to a mismatched title is rejected; (c) the happy path issues exactly one details request and **no** search.
+
+Zero i18n keys. Zero UI change.
+
+---
+
+### #2 — Cache retention sweep + purge button
+
+**Files (the five DB-worker sync points, plus two fixtures):**
+
+- `apps/electron-backend/src/app/database/operations/tmdb.operations.ts` — add `purgeTmdbMetadataOlderThan(db, cutoff)` and `getTmdbMetadataStats(db)` beside the existing `get`/`set`.
+- `apps/electron-backend/src/app/workers/database-worker.types.ts:52-54`
+- `apps/electron-backend/src/app/workers/database.worker.ts:596-620`
+- `apps/electron-backend/src/app/events/database/tmdb.events.ts`
+- `apps/electron-backend/src/app/api/main.preload.ts:784-792`
+- `libs/shared/interfaces/src/lib/electron-api.interface.ts:816-823`
+- Fixtures: `main.preload.spec-data.ts:364`, `worker-ipc-contract.spec-data.ts`
+- UI: `apps/web/src/app/settings/settings-tmdb-section.component.{ts,html}` (87/113 lines, headroom)
+
+**Two defects to design around:**
+
+1. `setTmdbMetadata` writes `fetched_at` as an **ISO-8601 string**, but the column DEFAULT is `datetime('now')` (space-separated, no `Z`). A naive `WHERE fetched_at < ?` string compare is **wrong** — `'T'` sorts after `' '`. Use `julianday(fetched_at)`.
+2. Do **not** reuse the `appState` one-off migration-guard pattern. A retention sweep is _recurring_; the key must store a **last-swept timestamp**, not a boolean, or it runs exactly once in the app's lifetime.
+
+**Sweep:** fire from the DB worker **after first paint** (never on the startup critical path), ≥24h cadence, `DELETE WHERE julianday('now') - julianday(fetched_at) > 180`.
+
+**Panel:** "Metadata cache: N entries, X MB" + Clear button. Compute size **only on section expand** — `SUM(...)` is a full scan. Use `LENGTH(CAST(payload AS BLOB))`; SQLite `LENGTH()` on TEXT counts _characters_, not bytes.
+
+**Regression spec:** rows at 179 and 181 days survive / are deleted; both `fetched_at` formats handled.
+
+**Doc note** in `docs/architecture/tmdb-metadata-enrichment.md`: the Clear button is also the escape hatch for the v3 key bump — a bump _orphans_ rows rather than deleting them, so without this they sit until the 180-day sweep reaches them.
+
+**Out-of-scope note worth recording:** `downloads.poster_url` (`schema.ts:334`) can hold an `image.tmdb.org` URL when a download starts from an enriched detail page. The purge doesn't cover it.
+
+---
+
+### #3 — Extras shelf
+
+**Prerequisite split.** `libs/services/src/lib/tmdb/tmdb-merge.ts` is **302 lines** — over the 300 target. Extract into `libs/services/src/lib/tmdb/tmdb-videos.ts`:
+
+- `pickTrailerKey` — **unchanged**, so nothing downstream breaks
+- `groupVideosByType(details, {limit: 6})` → `{key, type, name, language}[]`, filtered to `site === 'YouTube'`, deduped by key, **official-preferred rather than official-only** (plenty of genuine studio featurettes carry `official: false`; a hard filter empties the shelf on most catalog titles), excluding the key already used as the trailer
+
+**Data path** (the merge writes a _fixed projection_ — this is not "read the payload in the component"):
+
+- `tmdb_videos?: TmdbVideoRef[]` on `XtreamVodInfo`, `XtreamSerieInfo`, `StalkerVodInfo`
+- populated in all three of `mergeVodInfoWithTmdb` (`:168`), `mergeSerieInfoWithTmdb` (`:215`), `mergeStalkerInfoWithTmdb` (`:257`)
+- through `NormalizedVodMeta` (`libs/shared/interfaces/src/lib/vod-details-item.interface.ts`) + **both** normalizers in `vod-details-adapters.ts` — the single convergence point where Xtream and Stalker meet
+
+**Component.** New standalone `app-tmdb-extras-shelf` in `libs/ui/shared-portals`. It must **not** go inline: `libs/ui/playback/src/lib/vod-details/vod-details.component.ts` is **388 lines and is NOT in `tools/eslint/max-lines-baseline.mjs`** — roughly 12 lines of headroom against the hard 400 lint cap.
+
+**Render** into the `detail-extras` projection slot at **four** sites (`vod-details.component.html:225`, `serial-details.component.html:201`, `vod-details-route.component.html:247`, `stalker-series-view.component.html:202`) — note Xtream `serial-details` has no trailer block today, so it either gains one or the shelf lands inconsistently. Reuse the existing nocookie iframe + `| safe` pipe so the Electron Referer shim keeps working; clicking swaps the embed `src` rather than opening a new player. Cards use `https://img.youtube.com/vi/{key}/hqdefault.jpg` (CSP verified: `img-src` covers it, `frame-src https://www.youtube-nocookie.com` covers the embed). `@if (extras().length > 1)` … `@else` the existing single-trailer markup **verbatim**.
+
+**Labels** come from translation keys on the TMDB type enum, **never** from `video.name` (5-6 keys × 18 locales via the `i18n-fill` skill).
+
+**Coverage honesty:** ship the en-correct version first. For non-English locales the shelf is empty on most titles until either the original-language fallback payload is reused or `include_video_language` lands — and the latter forces the v3 bump, so it belongs in the consolidated append PR, not here.
+
+---
+
+## 6. Suggested sequence
+
+1. **A1** (broken `tmdb_id`) + **F1** (retention sweep) — correctness and compliance, no new surface, no cache bump
+2. **Extras shelf** + **series structure** — pure zero-call presentation wins off already-cached payloads
+3. **Consolidated v3 append PR** — `images` + `release_dates`/`content_ratings` + `alternative_titles` + `aggregate_credits`, with payload trimming, mediaType-scoped key
+4. **Title logos**, **certification plate**, **aggregate-credits cast fix** — all ride the bump landed in step 3
+5. **"Because you watched X"** + **"Wrong movie?" override** — the two strategic bets
+6. **Theme E** (library index) — only after A5 (backoff), batched cache ops, and a personal-key gate exist
diff --git a/docs/architecture/validation-map.md b/docs/architecture/validation-map.md
index 387bfcea7..c41c042e9 100644
--- a/docs/architecture/validation-map.md
+++ b/docs/architecture/validation-map.md
@@ -30,8 +30,9 @@ pnpm run lint                 # nx run-many --target=lint --all
 pnpm nx lint <project>        # single project
 ```
 
-The CI workflow (`.github/workflows/ci.yml`) runs lint for every project on
-each PR. This enforces `@nx/enforce-module-boundaries` (scope/domain/type tag
+The CI workflow (`.github/workflows/ci.yml`) lints affected projects on PRs
+(`nx affected`) and every project on master pushes.
+This enforces `@nx/enforce-module-boundaries` (scope/domain/type tag
 constraints), the legacy bare-alias ban, and the `max-lines` file-size rule
 (hard maximum 400 lines per TypeScript file). Files that predate the
 `max-lines` rule are baselined in `tools/eslint/max-lines-baseline.mjs`; after
@@ -48,13 +49,38 @@ project is missing from the policy, a listed project no longer exists, or a
 Tier A entry has no test target. CI runs Tier A with coverage (uploaded to
 Codecov) and each Tier B/C project's `validationCommand` (falling back to
 `nx test`) without coverage; projects with an `e2e` target are skipped there
-because the E2E workflow already runs them on every PR.
+because the E2E workflow already runs them on every PR that touches app code.
+Docs-only changes (Markdown, `docs/`, `.plans/`, `.codex/`, `.claude/`) and
+`apps/website/**` changes skip the E2E workflow via `paths-ignore` — for those
+PRs no E2E validation runs in CI, which is intentional: they cannot affect app
+behavior.
 
-| Tier | Rule | Validation |
-| --- | --- | --- |
-| A | Product/runtime Angular, Electron, backend, data-access, portal, playlist, workspace, playback, EPG, and shared UI code collects source coverage. | `pnpm run coverage:ci` |
-| B | Validate behavior without percentage coverage, such as `website`, `packaging`, and Playwright E2E projects. | `pnpm nx test website`, `pnpm nx test packaging`, or the closest E2E target |
-| C | Excluded from the source coverage baseline, such as mock servers, test helper libraries, and untested feature shells. | Validate through dependent flows, or add focused tests when changing behavior directly |
+Tier A coverage is fail-closed. `coverage:unit:ci` relays Jest output but exits
+nonzero on a `Failed to collect coverage` marker, a missing or invalid project
+report, or a runtime-owning production TypeScript file absent from that report.
+`coverage:merge` requires every configured Tier A report before replacing the
+merged output. Strict health validation also requires the merged Istanbul map
+itself to contain usable instrumentation for every runtime-owning Tier A file,
+recomputes its summary, and then applies aggregate and selected critical-file
+ratchets.
+
+Runtime-owning files are discovered from the TypeScript AST. Specs,
+declarations, test setup and stubs, generated and environment files, `index.ts`,
+type-only files, and pure re-export shims are excluded. Ratchets live under
+`reporting.coverageRatchet` in `tools/coverage/coverage-policy.json`; update
+them only from a fresh full `coverage:ci` report when every value stays level
+or rises, and never lower one to accept a regression. The only exception is an
+explicitly reviewed production source shrink: `minimumCovered` may follow a
+lower total statement count when the PR documents the removed executable
+statements and fresh coverage proves that the corresponding
+`minimumPercent`, every aggregate ratchet, and the remaining behavioral
+coverage do not decrease.
+
+| Tier | Rule                                                                                                                                              | Validation                                                                             |
+| ---- | ------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
+| A    | Product/runtime Angular, Electron, backend, data-access, portal, playlist, workspace, playback, EPG, and shared UI code collects source coverage. | `pnpm run coverage:ci`                                                                 |
+| B    | Validate behavior without percentage coverage, such as `website`, `packaging`, and Playwright E2E projects.                                       | `pnpm nx test website`, `pnpm nx test packaging`, or the closest E2E target            |
+| C    | Excluded from the source coverage baseline, such as mock servers, test helper libraries, and untested feature shells.                             | Validate through dependent flows, or add focused tests when changing behavior directly |
 
 `apps/website` is an Astro marketing site. Its useful signal is a successful
 static build plus targeted output checks, not a merged code coverage percentage.
@@ -64,9 +90,10 @@ Projects with a test target but no specs, such as `remote-control-web` and
 For local coverage inspection:
 
 ```bash
+pnpm run coverage:tools:test
 pnpm run coverage:unit:ci
 pnpm run coverage:merge
-pnpm run coverage:health
+pnpm run coverage:health -- --require-report
 ```
 
 The merged report is written to `coverage/merged/` as HTML, LCOV, Cobertura,
diff --git a/docs/architecture/workspace-dashboard.md b/docs/architecture/workspace-dashboard.md
index 011a3a86a..79942c6e7 100644
--- a/docs/architecture/workspace-dashboard.md
+++ b/docs/architecture/workspace-dashboard.md
@@ -12,8 +12,12 @@ Related:
 - The dashboard is the default `/workspace` landing page.
 - It is a **rail-based** content surface (Netflix / Apple TV pattern), not a
   customizable widget grid.
-- Layout is static and curated — there is no edit mode, drag-drop, size
-  stepper, show/hide toggle, or persisted layout. Rails auto-hide when empty.
+- Layout order is static and curated — there is no edit mode, drag-drop, or
+  size stepper. Each rail has a persisted show/hide toggle
+  (`Settings.dashboardRails`, `DashboardRailsSettings` in
+  `libs/shared/interfaces/src/lib/settings.interface.ts`, surfaced under
+  Settings → Dashboard); every template rail is gated by
+  `dashboardRails().<key>`. Rails additionally auto-hide when empty.
 - First-run users see the shared welcome empty-state with a single primary
   CTA to add their first playlist.
 
@@ -38,14 +42,23 @@ Core implementation:
 │  Continue Watching · See all →                                      │
 │  [poster][poster][poster][poster] →→                                │
 ├─────────────────────────────────────────────────────────────────────┤
-│  Live now on your favorites / Continue with live TV · See all →     │
+│  Live now on your favorites · See all →                             │
 │  [channel][channel][channel][channel] →→                            │
 ├─────────────────────────────────────────────────────────────────────┤
+│  Recently watched live TV · See all →                               │
+│  [channel][channel][channel][channel] →→                            │
+├─────────────────────────────────────────────────────────────────────┤
+│  Favorite movies & series · See all →                               │
+│  [poster][poster][poster][poster] →→                                │
+├─────────────────────────────────────────────────────────────────────┤
 │  Recently Used Sources · See all →                                  │
 │  [tile][tile][tile][tile] →→                                        │
 ├─────────────────────────────────────────────────────────────────────┤
 │  Recently Added on Xtream (aggregated across providers)             │
 │  [poster][poster][poster] →→                                        │
+├─────────────────────────────────────────────────────────────────────┤
+│  Trending this week (TMDB, opt-in, Electron-only)                   │
+│  [poster][poster][poster] →→                                        │
 └─────────────────────────────────────────────────────────────────────┘
 ```
 
@@ -55,7 +68,7 @@ Render rules:
    page no longer uses `dashboardReady()` as a page-wide skeleton gate.
    Initial hero/recent/favorites loading states render scoped skeletons so one
    slow rail does not hide already available content.
-2. `hasPlaylists() === false` → render `<app-empty-state type="welcome">`
+2. `hasPlaylists() === false` → render `<app-empty-state [type]="'welcome-dashboard'">`
    full-bleed. All rails and the hero are skipped.
 3. `hero()` = `globalRecentItems()[0]`. If present, render the hero panel.
 4. Each rail is emitted via `@if (cards.length > 0)`. Empty rails are hidden
@@ -63,9 +76,11 @@ Render rules:
 5. The continue-watching hero prefers a stored Xtream `backdrop_url`; when it
    is missing the UI falls back to a blurred poster treatment instead of
    showing a flat panel.
-6. The mixed global favorites rail is not rendered on the dashboard. Live
-   favorites are promoted into the live rail, while mixed favorites stay on
-   `/workspace/global-favorites`.
+6. Live favorites are promoted into their own live rail; movie/series
+   favorites render in a separate `Favorite movies & series` rail
+   (`favoriteMoviesAndSeriesCards`, `data-test-id="dashboard-favorite-vod-rail"`,
+   mapped from `globalFavoriteItems()` filtered to movie/series). Full mixed
+   favorites management stays on `/workspace/global-favorites`.
 7. The live favorites rail keeps its scoped skeleton until the initial global
    favorites load has completed for both Xtream-backed and playlist-backed
    favorites. This avoids first-paint partial counts such as a single Stalker
@@ -93,13 +108,23 @@ Render rules:
 2. It derives the dashboard surface via `computed()`:
     1. `hero` — first item of `globalRecentItems()`.
     2. `continueWatchingCards` — maps `globalRecentVodItems()` to movie/series
-       cover cards. Xtream playback positions are bulk-loaded per playlist so
+       cover cards. Portal playback positions are bulk-loaded per playlist so
        hero and cards can show progress, remaining time, and series season/
-       episode badges. Series lookup uses keyed maps for both direct episode ids
-       and series ids; card renders must not scan the full playback-position map.
-    3. `liveOnFavoritesCardsEnriched` — maps favorited live channels first,
-       falling back to recently watched live channels when no live favorites
-       exist. M3U cards carry an `epg_lookup_key` using the app-wide XMLTV
+       episode badges. This includes Stalker VOD activity normalized to series
+       through `is_series`. Series lookup uses keyed maps for both direct
+       episode ids and parent series ids; card renders must not scan the full
+       playback-position map. The badge uses saved `seasonNumber` /
+       `episodeNumber` metadata and does not infer it from provider payloads;
+       legacy rows without that metadata remain badge-less until replay.
+       Dashboard-originated Xtream series clicks also carry that exact episode
+       target through the global-recent inline-detail handoff. Once the series
+       metadata and playback positions load, the detail player consumes the
+       target once and resumes the saved episode. Opening the same item normally
+       from the global recent grid remains a detail-only action.
+    3. `liveFavoriteCardsEnriched` and `recentLiveCardsEnriched` — two
+       independent rails (`dashboard-live-favorites-rail` and
+       `dashboard-recent-live-rail`); there is no fallback from one to the
+       other. M3U cards carry an `epg_lookup_key` using the app-wide XMLTV
        fallback order (`tvg-id` -> `tvg-name` -> channel name); EPG enrichment
        must use that key before falling back to the card title.
     4. `xtreamRecentlyAddedCards` — maps `xtreamRecentlyAddedItems()` to rail
@@ -121,7 +146,10 @@ Render rules:
 3. `DashboardDataService` is passive on construction. The dashboard feature
    owns the initial reloads for recent items, favorites, and Xtream recently
    added rows on page entry.
-4. No `Layout` state, no localStorage keys, no migrations.
+4. No dashboard-local `Layout` state, no localStorage keys, no migrations.
+   Per-rail visibility is the one persisted preference, and it lives in the
+   global settings store (`Settings.dashboardRails`), not in a
+   dashboard-owned layout blob.
 5. Navigation state + deep-link targets come from the existing
    `getRecentItemLink()` / `getGlobalFavoriteLink()` / `getPlaylistLink()`
    helpers on `DashboardDataService` and reuse the workspace navigation
@@ -153,7 +181,7 @@ Render rules:
 ## Empty State
 
 The welcome state is rendered via the existing
-`EmptyStateComponent` (`type="welcome"`) from
+`EmptyStateComponent` (`type="welcome-dashboard"`) from
 `libs/playlist/shared/ui`:
 
 1. Illustration + headline + description from the existing M3U welcome
@@ -174,11 +202,15 @@ The welcome state is rendered via the existing
    rails have data.
 5. Navigation from a rail card must deep-link into the appropriate workspace
    route without switching the active playlist in the header switcher.
-6. `Recently Used Sources` reflects recent source usage across all provider
+6. Xtream series hero/Continue Watching clicks with a saved episode position
+   must resume that exact episode while preserving the collection-owned detail
+   and Back behavior. Do not apply autoplay to ordinary collection-grid clicks.
+7. `Recently Used Sources` reflects recent source usage across all provider
    types, not just recent imports.
-7. The live rail title key must match the rendered source: favorites use
-   `WORKSPACE.DASHBOARD.LIVE_FAVORITES`; recently watched fallback uses
-   `WORKSPACE.DASHBOARD.LIVE_RECENT`.
+8. The live rail title key must match the rendered source: favorites use
+   `WORKSPACE.DASHBOARD.LIVE_FAVORITES`; the recently-watched-live rail uses
+   `WORKSPACE.DASHBOARD.RECENTLY_WATCHED_LIVE_TV`
+   (`liveRailTitleKeyForSource` in `rails/dashboard-rail.utils.ts`).
 
 ## Adding Or Changing Rails
 
@@ -198,8 +230,9 @@ Current workflow:
 
 Intentionally out of scope:
 
-1. Customizable layout (drag/drop, resize, show/hide toggles, layout
-   persistence). Removed in favor of a curated, opinionated order.
+1. Customizable layout (drag/drop, resize, freeform reordering). The rail
+   order stays curated and opinionated. (Per-rail show/hide toggles have
+   since shipped via `Settings.dashboardRails` — see Summary.)
 2. Freeform widget grid with collision management.
 3. External data rails such as RSS, sports, or news adapters.
 4. Per-user A/B variants of rail ordering.
diff --git a/docs/architecture/workspace-shell.md b/docs/architecture/workspace-shell.md
index f5a7d14a8..9b984e897 100644
--- a/docs/architecture/workspace-shell.md
+++ b/docs/architecture/workspace-shell.md
@@ -38,10 +38,15 @@ Core implementation:
 Current workspace routes:
 
 1. `/` -> `/workspace`
-2. `/workspace` -> `/workspace/dashboard`
+2. `/workspace` -> functional redirect `workspaceEntryRedirect`
+   (`WorkspaceStartupPreferencesService.resolveInitialWorkspacePath()`;
+   `/workspace/dashboard` by default, `/workspace/sources` when the dashboard
+   is disabled, or the last restorable route under
+   `StartupBehavior.RestoreLastView` — `dashboard` itself is guarded by
+   `dashboardAccessGuard`)
 3. `/workspace/dashboard`
 4. `/workspace/sources`
-5. `/workspace/playlists/:id/:view`
+5. `/workspace/playlists/:id/:view` (plus `favorites` and `recent` siblings)
 6. `/workspace/global-favorites`
 7. `/workspace/global-recent`
 8. `/workspace/search`
@@ -250,10 +255,25 @@ handlers in `apps/electron-backend/src/app/events/window.events.ts`):
    WebContents. Close goes through `win.close()` so the existing
    window-bounds persistence in `app.ts` still runs.
 2. `WINDOW:STATE_CHANGED` is pushed main → renderer on
-   maximize/unmaximize/enter-full-screen/leave-full-screen so the
-   maximize/restore glyph stays correct for externally triggered changes
-   (double-click on a drag region, OS snap, F11). The controls hide
-   themselves while the window is fullscreen.
+   maximize/unmaximize and on the fullscreen events —
+   `enter/leave-full-screen` plus the `enter/leave-html-full-screen`
+   variants emitted for HTML-element fullscreen (video player
+   fullscreen) — so the maximize/restore glyph stays correct for
+   externally triggered changes (double-click on a drag region, OS
+   snap, F11). The controls hide themselves while the window is
+   fullscreen.
+
+   Window state is **never re-read at event time**. `attachWindowStateEvents`
+   seeds `{ isMaximized, isFullScreen }` once at window creation and each
+   event patches only the flag it names; every push carries a copy of that
+   tracked state. On Windows both getters can still report the
+   pre-transition value while the matching event fires — `isFullScreen()`
+   stays `true` during an HTML fullscreen exit, and `isMaximized()` reads
+   `false` while the window is fullscreen. Because the renderer replaces
+   both flags on every push and no later event corrects a stale one,
+   polling left the controls hidden forever after leaving fullscreen and
+   stuck the maximize/restore glyph on the wrong icon. Regression coverage:
+   `app-window-state.spec.ts` and `window-controls.e2e.ts`.
 
 Layout integration:
 
@@ -292,6 +312,10 @@ Toolchain notes for the Electron 41 upgrade:
 2. The pnpm override `node-abi@3.85.0 -> 3.92.0` is required so
    `@electron/rebuild` (via `electron-builder install-app-deps`) can map
    Electron 41 to its ABI.
+3. Local development needs **Node >= 22.12**, declared in `engines`.
+   `electron-builder` 26.15.3 pulls `@electron/rebuild` 4, which sets that
+   floor, and the root `postinstall` runs `install-app-deps` on every
+   `pnpm install`. CI already runs Node 22.
 
 Known caveats:
 
diff --git a/docs/architecture/xtream-mock-server.md b/docs/architecture/xtream-mock-server.md
index a41f89880..6a96fd7b0 100644
--- a/docs/architecture/xtream-mock-server.md
+++ b/docs/architecture/xtream-mock-server.md
@@ -273,8 +273,14 @@ labels instead of trusting provider-local strings.
 
 This scenario is reserved for release screenshots and marketing materials:
 
-- VOD and series data use 30 curated fictional titles instead of faker-generated
+- VOD and series data use 65 curated fictional titles instead of faker-generated
   titles or real media metadata
+- the core 30-title generated artwork pack keeps matched posters and backdrops;
+  35 additional movie-poster showcase titles use approved local poster PNGs and
+  the deterministic SVG fallback for their missing backdrops; the newest 20
+  appear first in the VOD catalog
+- showcase metadata comes from the provider-neutral
+  `@iptvnator/shared/marketing-fixtures` catalog shared with the Stalker mock
 - posters and backdrops are served from committed PNG files in
   `apps/xtream-mock-server/public/marketing/{poster,backdrop}/`
 - `tools/release/generate-marketing-artwork.ts` generates the PNGs with
@@ -284,8 +290,9 @@ This scenario is reserved for release screenshots and marketing materials:
   including documentary, noir, animated family, retro rescue drama, cyberpunk,
   anime-inspired space school, and workplace dramedy styles
 - screenshot capture remains deterministic and offline because
-  `tools/release/capture-v020-screenshots.ts` consumes the local mock server
-  assets and never calls OpenAI
+  `tools/release/capture-release-screenshots.ts` consumes the local mock server
+  assets and never calls OpenAI; its guards additionally verify that the
+  service answering on the mock port really is this fixture server
 - the SVG renderer in `marketing.generator.ts` remains the fallback for missing
   assets, live logos, season covers, and episode thumbnails
 
diff --git a/docs/architecture/xtream-portal-compatibility.md b/docs/architecture/xtream-portal-compatibility.md
index 4572bc1cb..1f90dbc2b 100644
--- a/docs/architecture/xtream-portal-compatibility.md
+++ b/docs/architecture/xtream-portal-compatibility.md
@@ -111,3 +111,12 @@ playable. MPEG-TS is preferred before HLS when the provider allows it because
 some portals return a valid HLS manifest while the first media segment fails in
 Chromium/video.js. PWA fallback keeps the REST MPEG-TS URL when no Electron
 probe API is available.
+
+Catch-up is offered from the Xtream Live TV tab and from the unified
+collection surfaces (per-playlist and global Favorites and Recent). The
+`tv_archive` / `tv_archive_duration` columns are carried through the
+favorites and recently-viewed DB projections and mapped onto
+`UnifiedCollectionItem.tvArchive` / `tvArchiveDuration` so the shared live
+tab can gate the timeline's archive window. `tv_archive_duration` is
+interpreted as **days** everywhere, matching
+`live-stream-layout.controlledArchiveDays` (issue #1138).
diff --git a/docs/superpowers/plans/2026-07-16-frame-copy-shared-controls.md b/docs/superpowers/plans/2026-07-16-frame-copy-shared-controls.md
new file mode 100644
index 000000000..0d39327ce
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-16-frame-copy-shared-controls.md
@@ -0,0 +1,354 @@
+# Frame-Copy Shared Controls Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Mount the shared player controls over embedded MPV's frame-copy canvas while preserving the native-view controls dock unchanged.
+
+**Architecture:** A component-scoped `EmbeddedMpvControlsAdapter` maps `EmbeddedMpvSessionController` into the existing `PlayerController` contract. `EmbeddedMpvPlayerComponent` renders shared controls only for `support.engine === 'frame-copy'` and disables its legacy interaction handlers on that path.
+
+**Tech Stack:** Angular standalone components, signals, ngx-translate, Jest/TestBed, Nx, Electron frame-copy playback.
+
+---
+
+### Task 1: Add the embedded-MPV controls adapter
+
+**Files:**
+
+- Create: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts`
+- Create: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts`
+- Create: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.messages.spec.ts`
+
+- [ ] **Step 1: Write failing state and command tests**
+
+Cover a supported VOD session, live session, optional support capabilities,
+audio/subtitle labels, series navigation, missing/unsupported/loading/error
+states, and every `PlayerControlsCommands` method.
+
+Use a fake controller with writable signals:
+
+```ts
+const controller = {
+    support: signal<EmbeddedMpvSupport | null>(supported()),
+    session: signal<EmbeddedMpvSession | null>(baseSession()),
+    stalled: signal(false),
+    togglePaused: jest.fn().mockResolvedValue(undefined),
+    seekTo: jest.fn().mockResolvedValue(undefined),
+    seekBy: jest.fn().mockResolvedValue(true),
+    applyVolume: jest.fn().mockResolvedValue(undefined),
+    setAudioTrack: jest.fn().mockResolvedValue(undefined),
+    setSubtitleTrack: jest.fn().mockResolvedValue(undefined),
+    setSpeed: jest.fn().mockResolvedValue(undefined),
+    setAspect: jest.fn().mockResolvedValue(undefined),
+    startRecording: jest.fn(),
+    stopRecording: jest.fn(),
+};
+```
+
+- [ ] **Step 2: Verify the adapter tests fail**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPattern=embedded-mpv-controls.adapter
+```
+
+Expected: failure because `EmbeddedMpvControlsAdapter` does not exist.
+
+- [ ] **Step 3: Implement the adapter state and commands**
+
+Create an injectable class that implements `PlayerController`, accepts the host
+context once, and derives state with `computed()`:
+
+```ts
+export interface EmbeddedMpvControlsContext {
+    playback: Signal<ResolvedPortalPlayback>;
+    seriesNavigation: Signal<SeriesPlaybackNavigation | null>;
+    recordingFolder: Signal<string>;
+}
+
+@Injectable()
+export class EmbeddedMpvControlsAdapter implements PlayerController {
+    private context: EmbeddedMpvControlsContext | null = null;
+
+    configure(context: EmbeddedMpvControlsContext): void {
+        this.context = context;
+    }
+
+    readonly commands: PlayerControlsCommands = {
+        togglePlay: () => void this.controller.togglePaused(),
+        seekTo: (seconds) => void this.controller.seekTo(seconds),
+        seekBy: (delta) => void this.controller.seekBy(delta),
+        setVolume: (value) => void this.controller.applyVolume(value),
+        setAudioTrack: (id) => void this.controller.setAudioTrack(id),
+        setSubtitleTrack: (id) => void this.controller.setSubtitleTrack(id),
+        setPlaybackSpeed: (speed) => void this.controller.setSpeed(speed),
+        setAspectRatio: (value) => void this.controller.setAspect(value),
+        toggleRecording: () => void this.toggleRecording(),
+    };
+}
+```
+
+Use the existing `audioTrackLabel`, `subtitleTrackLabel`, and
+`readStoredVolume` helpers from `embedded-mpv-format.utils.ts`.
+
+- [ ] **Step 4: Add failing recording and translation tests**
+
+Cover all three ngx-translate event sources, successful start, successful stop
+with saved path, detailed and generic failures, elapsed time, replacement of an
+auto-dismissed message, and destroy-time timer cleanup.
+
+- [ ] **Step 5: Implement message reactivity and cleanup**
+
+Use:
+
+```ts
+private readonly translationsTick = toSignal(
+    merge(
+        this.translate.onLangChange,
+        this.translate.onTranslationChange,
+        this.translate.onDefaultLangChange
+    ),
+    { initialValue: null }
+);
+```
+
+Register `DestroyRef.onDestroy()` to clear the recording-message timeout. Use an
+`effect()` cleanup for the one-second elapsed-time interval.
+
+- [ ] **Step 6: Run focused adapter tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPattern=embedded-mpv-controls.adapter
+```
+
+Expected: both adapter suites pass.
+
+- [ ] **Step 7: Commit the adapter**
+
+```bash
+git add libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter*
+git commit -m "feat(embedded-mpv): adapt frame-copy sessions to shared controls"
+```
+
+### Task 2: Mount shared controls for frame-copy
+
+**Files:**
+
+- Modify: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts`
+- Modify: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.html`
+- Modify: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.scss`
+- Create: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-controls.spec.ts`
+- Modify: `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.spec.ts`
+
+- [ ] **Step 1: Write failing engine-selection tests**
+
+Assert:
+
+```ts
+expect(query(By.directive(PlayerControlsComponent))).not.toBeNull();
+expect(query(By.css('.embedded-mpv-player__controls'))).toBeNull();
+expect(query(By.css('[data-embedded-mpv-frame]'))).not.toBeNull();
+```
+
+for `engine: 'frame-copy'`, and the inverse controls assertions for
+`engine: 'native'`.
+
+- [ ] **Step 2: Verify the host integration test fails**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPattern=embedded-mpv-player.component.shared-controls
+```
+
+Expected: failure because the component does not import or render
+`PlayerControlsComponent`.
+
+- [ ] **Step 3: Add the component-scoped adapter and template branch**
+
+Add `PlayerControlsComponent` to component imports and
+`EmbeddedMpvControlsAdapter` to providers. Configure it with the component input
+signals and expose the player root element:
+
+```ts
+readonly sharedControls = inject(EmbeddedMpvControlsAdapter);
+readonly playerSurface = computed(
+    () => this.playerRoot()?.nativeElement ?? null
+);
+
+this.sharedControls.configure({
+    playback: this.playback,
+    seriesNavigation: this.seriesNavigation,
+    recordingFolder: this.recordingFolder,
+});
+```
+
+Render:
+
+```html
+@if (isFrameCopyEngine() && isSupported()) {
+<app-player-controls
+    [controller]="sharedControls"
+    [playerSurface]="playerSurface()"
+    [showControls]="showControls()"
+    (previousEpisodeRequested)="requestPreviousEpisode()"
+    (nextEpisodeRequested)="requestNextEpisode()"
+/>
+}
+```
+
+Render the existing `.embedded-mpv-player__controls` only when the engine is not
+frame-copy. Apply `.embedded-mpv-player--controls-enabled` only to that legacy
+path so the frame-copy canvas fills the player.
+
+- [ ] **Step 4: Add failing exactly-once interaction tests**
+
+Cover click-to-pause, double-click fullscreen, keyboard play/pause, disabled
+shared controls, and previous/next outputs. Spy on controller methods and assert
+one invocation after the 250 ms single-click grace period.
+
+- [ ] **Step 5: Disable legacy interaction ownership for frame-copy**
+
+Make the old shortcut availability predicate require
+`!this.isFrameCopyEngine()`. Return early from legacy player interaction,
+viewport click, double-click, and document pointer handlers on frame-copy.
+Keep the fullscreen listener's bounds-sync call for both engines, but reveal
+legacy controls only for native-view.
+
+- [ ] **Step 6: Preserve native regression fixtures**
+
+Make existing component specs explicitly set:
+
+```ts
+engine: 'native',
+```
+
+so every legacy dock, timeline, popover, and shortcut assertion remains pinned
+to the native-view path.
+
+- [ ] **Step 7: Run component and shared-controls tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPattern='embedded-mpv-player.component|player-controls'
+```
+
+Expected: all selected suites pass.
+
+- [ ] **Step 8: Commit host integration**
+
+```bash
+git add libs/ui/playback/src/lib/embedded-mpv-player/
+git commit -m "feat(embedded-mpv): use shared controls for frame-copy"
+```
+
+### Task 3: Update canonical architecture documentation
+
+**Files:**
+
+- Modify: `docs/architecture/player-controls-contract.md`
+- Modify: `docs/architecture/embedded-mpv-native.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+
+- [ ] **Step 1: Update player-controls ownership**
+
+Change the current-status section from “no existing player consumes this layer”
+to state that frame-copy embedded MPV is the first consumer. Keep web engines
+default-off and native-view on its dock.
+
+- [ ] **Step 2: Update embedded-MPV renderer architecture**
+
+Add `embedded-mpv-controls.adapter.ts` to the renderer file map. Document that
+frame-copy mounts shared controls over the canvas and native-view retains
+compositor workarounds.
+
+- [ ] **Step 3: Keep agent guidance synchronized**
+
+Update the matching embedded-MPV/shared-controls statements in `AGENTS.md` and
+`CLAUDE.md` with the same ownership boundary.
+
+- [ ] **Step 4: Verify Markdown and commit**
+
+Run:
+
+```bash
+git diff --check
+rg -n "no existing player consumes|not wired" \
+  docs/architecture/player-controls-contract.md AGENTS.md CLAUDE.md
+```
+
+Expected: no stale claim that every player is unwired.
+
+Commit:
+
+```bash
+git add docs/architecture/player-controls-contract.md \
+  docs/architecture/embedded-mpv-native.md AGENTS.md CLAUDE.md
+git commit -m "docs(embedded-mpv): document frame-copy shared controls"
+```
+
+### Task 4: Full validation and PR preparation
+
+**Files:**
+
+- Verify all files changed by Tasks 1-3.
+
+- [ ] **Step 1: Run UI playback tests**
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand
+```
+
+Expected: all suites pass.
+
+- [ ] **Step 2: Run lint, typecheck, and i18n validation**
+
+```bash
+pnpm nx lint ui-playback --skip-nx-cache
+pnpm run typecheck:ci
+pnpm run i18n:check
+```
+
+Expected: all commands pass; the existing identical-English i18n warning is
+acceptable.
+
+- [ ] **Step 3: Run Electron smoke coverage**
+
+```bash
+pnpm nx run electron-backend-e2e:e2e-ci--src/smoke.e2e.ts --skip-nx-cache
+```
+
+Expected: smoke tests pass. If the local frame-copy runtime is absent, record
+that native frame rendering could not be exercised locally and rely on
+cross-platform PR CI for the packaged runtime gate.
+
+- [ ] **Step 4: Run repository hygiene checks**
+
+```bash
+pnpm exec prettier --check \
+  libs/ui/playback/src/lib/embedded-mpv-player \
+  docs/architecture/player-controls-contract.md \
+  docs/architecture/embedded-mpv-native.md \
+  AGENTS.md CLAUDE.md
+git diff --check origin/master..HEAD
+git status --short
+```
+
+Expected: formatting passes, no whitespace errors, and the worktree is clean.
+
+- [ ] **Step 5: Request review and merge only after the exact-head gate**
+
+Push the branch, open a focused replacement PR, request Greptile and Codex
+reviews, address actionable findings with regression tests, and merge only when
+all exact-head CI checks pass, Greptile reports 5/5, Codex is clean, and no
+review thread remains unresolved.
+
+The replacement PR is complete only after this exact-head gate passes.
diff --git a/docs/superpowers/plans/2026-07-16-html5-shared-controls.md b/docs/superpowers/plans/2026-07-16-html5-shared-controls.md
new file mode 100644
index 000000000..dfe8c7564
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-16-html5-shared-controls.md
@@ -0,0 +1,620 @@
+# HTML5 Shared Controls Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Rebuild the useful HTML5 portion of #1152 so the built-in `<video>` player can use shared controls behind the existing default-off feature flag, with correct live/VOD metadata, track lifecycle, diagnostics gating, and cleanup.
+
+**Architecture:** A player-local `HtmlVideoPlayerControlsBridge` owns HLS/native track projection, MPEG-TS VOD duration correction, caption preference, and adapter lifecycle. `HtmlVideoPlayerComponent` owns playback engines and chooses native versus shared chrome from `WEB_PLAYER_SHARED_CONTROLS`; `WebPlayerViewComponent` supplies authoritative playback metadata and interaction availability.
+
+**Tech Stack:** Angular standalone components and signals, hls.js 1.6, mpegts.js, DOM media/text-track APIs, Jest/TestBed, Nx.
+
+---
+
+### Task 1: Add the HTML5 engine-to-controls bridge
+
+**Files:**
+
+- Create: `libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.ts`
+- Create: `libs/ui/playback/src/lib/html-video-player/html-video-player-hls-controls.ts`
+- Create: `libs/ui/playback/src/lib/html-video-player/html-video-player-native-text-tracks.ts`
+- Create: focused `html-video-player-controls.*.spec.ts` suites and
+  `html-video-player-controls.spec-fixtures.ts`
+- Modify: `libs/ui/playback/tsconfig.lib.json` to exclude test-only fixture
+  modules from the production TypeScript program
+
+- [x] **Step 1: Write failing MPEG-TS duration tests**
+
+Create a video fixture whose `duration`, `seekable`, and `buffered` properties
+can be replaced. Cover:
+
+```ts
+expect(readState({ duration: 120, seekableEnd: 115 }).durationSeconds).toBe(
+    120
+);
+expect(
+    readState({ duration: Infinity, seekableEnd: 115 }).durationSeconds
+).toBe(115);
+expect(
+    readState({
+        duration: Infinity,
+        seekableEnd: NaN,
+        bufferedEnd: 112,
+    }).durationSeconds
+).toBe(112);
+expect(
+    readState({
+        duration: Infinity,
+        seekableThrows: true,
+        bufferedThrows: true,
+    }).durationSeconds
+).toBeNull();
+```
+
+Assert all cases remain `isLive: false`, and that `canSeek` is false until a
+seekable range exists.
+
+- [x] **Step 2: Run the focused test and verify the red state**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns=html-video-player-controls.bridge
+```
+
+Expected: failure because `HtmlVideoPlayerControlsBridge` does not exist.
+
+- [x] **Step 3: Add the bridge lifecycle and corrected-duration source**
+
+Define:
+
+```ts
+export type HtmlVideoControlsSource =
+    | { kind: 'native' }
+    | { kind: 'mpegts' }
+    | { kind: 'hls'; hls: Hls };
+
+export interface HtmlVideoPlayerControlsBridgeConfig {
+    video: HTMLVideoElement;
+    adapter: WebVideoControlsAdapter;
+    isLive: () => boolean;
+    showCaptions: () => boolean;
+}
+```
+
+Implement an exported class with:
+
+```ts
+attach(): void;
+setSource(source: HtmlVideoControlsSource): void;
+refreshInputs(): void;
+clearSource(): void;
+destroy(): void;
+```
+
+`attach()` must be idempotent and call:
+
+```ts
+this.adapter.attach(this.video, {
+    isLive: this.isLive,
+    getDuration: () => this.readDuration(),
+    getAudioTracks: () => this.getAudioTracks(),
+    setAudioTrack: (id) => this.setAudioTrack(id),
+    getSubtitleTracks: () => this.getSubtitleTracks(),
+    setSubtitleTrack: (id) => this.setSubtitleTrack(id),
+});
+```
+
+For non-live mpegts sources, `readDuration()` must return the first finite,
+positive value from the video duration, last seekable end, then last buffered
+end. For every other source return `NaN`, allowing the adapter to read the
+native element duration.
+
+- [x] **Step 4: Write failing HLS projection and lifecycle tests**
+
+Use a fake HLS object with stable `on`/`off` spies and mutable:
+
+```ts
+audioTracks;
+audioTrack;
+subtitleTracks;
+subtitleTrack;
+subtitleDisplay;
+```
+
+Cover:
+
+- audio IDs are current-list indices and selection follows `audioTrack`;
+- subtitle selection requires both `subtitleDisplay` and matching index;
+- labels prefer `name`, then `lang`, then `Audio N` / `Subtitle N`;
+- valid audio/subtitle choices update HLS;
+- subtitle `-1` disables display and selection;
+- non-integer, stale, and out-of-range IDs are no-ops;
+- adapter refresh occurs for `AUDIO_TRACKS_UPDATED`,
+  `AUDIO_TRACK_SWITCHING`, `AUDIO_TRACK_SWITCHED`,
+  `SUBTITLE_TRACKS_UPDATED`, `SUBTITLE_TRACKS_CLEARED`,
+  `SUBTITLE_TRACK_SWITCH`, and `MANIFEST_LOADING`;
+- rebinding unregisters the exact old callback references before the old HLS
+  instance can be destroyed.
+
+- [x] **Step 5: Implement HLS track mapping and listeners**
+
+Use current-list indices:
+
+```ts
+return hls.audioTracks.map((track, index) => ({
+    id: index,
+    label: track.name || track.lang || `Audio ${index + 1}`,
+    selected: index === hls.audioTrack,
+}));
+```
+
+Use the corresponding subtitle projection:
+
+```ts
+selected: hls.subtitleDisplay === true && index === hls.subtitleTrack;
+```
+
+Register one named refresh callback per bridge/source and unregister it with
+the same function reference. Do not call `hls.off(event)` without a listener.
+
+- [x] **Step 6: Write failing native text-track and preference tests**
+
+Provide a fake `TextTrackList` implementing indexed access and
+`addEventListener`/`removeEventListener`. Cover:
+
+- only `captions` and `subtitles` tracks are projected;
+- labels prefer `label`, then `language`, then `Subtitle N`;
+- IDs remain stable when an earlier track is removed;
+- selecting a valid ID shows it and hides other eligible tracks;
+- selecting `-1` hides all eligible tracks;
+- invalid/stale IDs are no-ops;
+- `addtrack`, `removetrack`, and `change` refresh the adapter;
+- `showCaptions = false` suppresses a default track arriving later;
+- without a user override, returning the preference to true restores the
+  engine/default showing state that was suppressed;
+- explicit selection and explicit off survive later track events and
+  `refreshInputs()` calls;
+- source replacement clears the override and resets per-source IDs; and
+- destroy removes all listeners and detaches the adapter exactly once even
+  when called twice.
+
+- [x] **Step 7: Implement native tracks, caption preference, and cleanup**
+
+Use per-source maps:
+
+```ts
+private nativeTrackIds = new WeakMap<TextTrack, number>();
+private suppressedNativeModes = new WeakMap<TextTrack, TextTrackMode>();
+private nextNativeTrackId = 0;
+private subtitleOverride: number | null = null;
+```
+
+On preference suppression, remember a track's original mode only once and
+hide any showing caption/subtitle. When preference returns to true and no
+explicit override exists, restore remembered modes. Track selection sets the
+override before changing modes. `clearSource()` resets all per-source maps and
+the override, removes listeners, clears the active source, and refreshes the
+adapter. `destroy()` calls `clearSource()` and `adapter.detach()` once.
+
+- [x] **Step 8: Run bridge tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns=html-video-player-controls.bridge
+```
+
+Expected: all bridge tests pass.
+
+- [x] **Step 9: Commit the bridge**
+
+```bash
+git add \
+  libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.ts \
+  libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.spec.ts
+git commit -m "feat(html-player): bridge engine state to shared controls"
+```
+
+### Task 2: Mount shared controls in the HTML5 player
+
+**Files:**
+
+- Modify: `libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts`
+- Modify: `libs/ui/playback/src/lib/html-video-player/html-video-player.component.html`
+- Create: focused `html-video-player.component.shared-controls*.spec.ts` suites
+  and `html-video-player.component.shared-controls.spec-fixtures.ts`
+- Modify: `libs/ui/playback/src/lib/html-video-player/html-video-player.component.spec.ts`
+
+- [x] **Step 1: Write failing feature-flag selection tests**
+
+In the default-off suite assert:
+
+```ts
+expect(video.controls).toBe(true);
+expect(query(By.directive(PlayerControlsComponent))).toBeNull();
+expect(queryLegacySeriesControls()).not.toBeNull();
+expect(adapter.attach).not.toHaveBeenCalled();
+```
+
+In a dedicated flag-on suite override:
+
+```ts
+{ provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true }
+```
+
+and assert one shared-controls instance, `video.controls === false`, and no
+legacy series-controls instance.
+
+- [x] **Step 2: Write failing surface, interaction, and context tests**
+
+For the shared-controls instance assert:
+
+```ts
+expect(playerControls.playerSurface()).toBe(
+    fixture.debugElement.query(By.css('.html-video-player-shell')).nativeElement
+);
+expect(playerControls.showControls()).toBe(false);
+expect(playerControls.shortcutsEnabled()).toBe(false);
+```
+
+after setting `interactionEnabled = false`. Change `seriesNavigation` after
+initial render and assert the adapter state/capabilities reflect the new value.
+
+- [x] **Step 3: Verify the component tests fail**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns='html-video-player.component'
+```
+
+Expected: failures because the HTML5 component does not yet import shared
+controls or expose the new inputs.
+
+- [x] **Step 4: Add feature-flagged template ownership**
+
+Import and provide:
+
+```ts
+(PlayerControlsComponent, WEB_PLAYER_SHARED_CONTROLS, WebVideoControlsAdapter);
+```
+
+Add:
+
+```ts
+readonly sharedControls = inject(WEB_PLAYER_SHARED_CONTROLS);
+readonly controlsAdapter = inject(WebVideoControlsAdapter);
+private readonly seriesNavigationSignal =
+    signal<SeriesPlaybackNavigation | null>(null);
+
+@Input() isLive = true;
+@Input() interactionEnabled = true;
+```
+
+Use the actual shell as the template surface:
+
+```html
+<div #playerRoot class="html-video-player-shell">
+    <video
+        #videoPlayer
+        id="video-player"
+        autoplay
+        [controls]="!sharedControls"
+    ></video>
+
+    @if (sharedControls) {
+    <app-player-controls
+        [controller]="controlsAdapter"
+        [playerSurface]="playerRoot"
+        [showControls]="interactionEnabled"
+        [shortcutsEnabled]="interactionEnabled"
+        (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+        (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+    />
+    } @else {
+    <app-series-playback-navigation-controls
+        [navigation]="seriesNavigation"
+        (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+        (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+    />
+    }
+</div>
+```
+
+- [x] **Step 5: Write failing source-order and mpegts metadata tests**
+
+Cover the Angular initial order where `ngOnChanges` starts a source before
+`ngOnInit` creates the bridge. Assert that the retained HLS source is bound
+after initialization.
+
+For a raw TS channel assert:
+
+```ts
+expect(mpegts.createPlayer).toHaveBeenCalledWith({
+    type: 'mpegts',
+    isLive: false,
+    url: expect.any(String),
+});
+```
+
+when the input is VOD. Replace HLS with native playback and assert old HLS
+listeners are removed before `destroy()`.
+
+- [x] **Step 6: Integrate bridge and source lifecycle**
+
+Make `hls` nullable and retain:
+
+```ts
+private controlsBridge: HtmlVideoPlayerControlsBridge | null = null;
+private controlsSource: HtmlVideoControlsSource | null = null;
+```
+
+In `ngOnInit`, only for the enabled flag:
+
+```ts
+this.controlsAdapter.setContext({
+    seriesNavigation: this.seriesNavigationSignal,
+});
+this.controlsBridge = new HtmlVideoPlayerControlsBridge({
+    video: this.videoPlayer.nativeElement,
+    adapter: this.controlsAdapter,
+    isLive: () => this.isLive,
+    showCaptions: () => this.showCaptions,
+});
+this.controlsBridge.attach();
+if (this.controlsSource) {
+    this.controlsBridge.setSource(this.controlsSource);
+}
+```
+
+At the start of every source replacement:
+
+```ts
+this.controlsBridge?.clearSource();
+this.controlsSource = null;
+```
+
+Then tear down old mpegts/HLS engines. After creating a new engine, assign and
+bind exactly one source:
+
+```ts
+this.controlsSource = { kind: 'hls', hls: this.hls };
+this.controlsBridge?.setSource(this.controlsSource);
+```
+
+Use `{ kind: 'mpegts' }` or `{ kind: 'native' }` for the other paths. Pass
+`this.isLive` into `mpegts.createPlayer`.
+
+In `ngOnChanges`, update the series signal and call `refreshInputs()` when
+`isLive` or `showCaptions` changes. Keep the existing flag-off
+`handlePlayOperation()` caption behavior unchanged.
+
+- [x] **Step 7: Make destruction idempotent and ordered**
+
+Destroy the controls bridge before destroying the HLS instance so listener
+removal is observable and deterministic:
+
+```ts
+this.controlsBridge?.destroy();
+this.controlsBridge = null;
+this.controlsSource = null;
+```
+
+Then perform existing mpegts/HLS teardown and set the engine fields to null.
+
+- [x] **Step 8: Run HTML5 component and bridge tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns='html-video-player'
+```
+
+Expected: all HTML5 suites pass in both flag states.
+
+- [x] **Step 9: Commit the host integration**
+
+```bash
+git add libs/ui/playback/src/lib/html-video-player/
+git commit -m "feat(html-player): add feature-flagged shared controls"
+```
+
+### Task 3: Supply playback metadata and diagnostic interaction gating
+
+**Files:**
+
+- Modify: `libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts`
+- Modify: `libs/ui/playback/src/lib/web-player-view/web-player-view.component.html`
+- Modify: `libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts`
+- Create:
+  `libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts`
+
+- [x] **Step 1: Extend the HTML5 test stub and write failing metadata tests**
+
+Add stub inputs:
+
+```ts
+readonly isLive = input(true);
+readonly interactionEnabled = input(true);
+```
+
+Cover:
+
+```ts
+{ isLive: false }                         // explicit VOD wins
+{ isLive: true, contentInfo: vodInfo }    // explicit live wins
+{ contentInfo: vodInfo }                  // inferred VOD
+{}                                        // inferred live
+```
+
+Select the HTML5 player and assert the stub receives the resolved value.
+
+- [x] **Step 2: Write failing diagnostic interaction tests**
+
+Select HTML5, emit a playback issue, and assert:
+
+```ts
+expect(htmlPlayer.interactionEnabled()).toBe(false);
+```
+
+Call `retryPlayback()` and assert it becomes true. Also call
+`handlePlaybackIssue(null)` after a new issue and assert interactions are
+re-enabled. When the HTML5 player shell owns DOM fullscreen, assert the
+diagnostic transition exits that shell; an unrelated fullscreen element must
+remain untouched.
+
+- [x] **Step 3: Verify web-player-view tests fail**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns=web-player-view.component
+```
+
+Expected: failures because the HTML5 inputs and public computed values do not
+exist.
+
+- [x] **Step 4: Add shared authoritative computed values**
+
+Replace the private duplicated classification helper with:
+
+```ts
+readonly resolvedIsLive = computed(() => {
+    const playback = this.resolvedPlayback();
+    return typeof playback.isLive === 'boolean'
+        ? playback.isLive
+        : !playback.contentInfo;
+});
+
+readonly playbackInteractionEnabled = computed(
+    () => this.visiblePlaybackDiagnostic() === null
+);
+```
+
+Read `resolvedIsLive()` inside the constructor effect and use it for
+`setVjsOptions`. Use it again in `retryPlayback()`.
+
+- [x] **Step 5: Pass values to HTML5**
+
+Add:
+
+```html
+[isLive]="resolvedIsLive()" [interactionEnabled]="playbackInteractionEnabled()"
+```
+
+to the `app-html-video-player` branch.
+
+- [x] **Step 6: Run focused view and HTML5 tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns='web-player-view.component|html-video-player'
+```
+
+Expected: all selected suites pass.
+
+- [x] **Step 7: Commit metadata and gating**
+
+```bash
+git add \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.html \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts
+git commit -m "feat(html-player): use authoritative playback metadata"
+```
+
+### Task 4: Document and validate the HTML5 consumer
+
+**Files:**
+
+- Modify: `docs/architecture/player-controls-contract.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+- Add: `docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md`
+- Add: `docs/superpowers/plans/2026-07-16-html5-shared-controls.md`
+
+- [x] **Step 1: Update canonical player-controls documentation**
+
+Document:
+
+- HTML5 is the second shared-controls consumer, behind the default-off web
+  feature flag;
+- the player-local bridge owns HLS/native tracks and MPEG-TS duration;
+- live/VOD state comes from resolved playback metadata;
+- diagnostics disable shared pointer and keyboard ownership; and
+- Video.js/ArtPlayer remain future migrations.
+
+- [x] **Step 2: Mirror the ownership contract**
+
+Update the shared-player-controls sections in `AGENTS.md` and `CLAUDE.md` with
+the same behavior and key file paths. Keep the mirrored process text
+consistent.
+
+- [x] **Step 3: Run the complete validation ladder**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand
+pnpm nx lint ui-playback --skip-nx-cache
+pnpm run typecheck:ci
+pnpm run i18n:check
+pnpm exec prettier --check \
+  libs/ui/playback/src/lib/html-video-player \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.html \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts \
+  docs/architecture/player-controls-contract.md \
+  docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md \
+  docs/superpowers/plans/2026-07-16-html5-shared-controls.md \
+  AGENTS.md CLAUDE.md
+git diff --check
+```
+
+Expected: every command exits successfully.
+
+- [x] **Step 4: Perform the test-impact pass**
+
+Record that:
+
+- `ui-playback` unit tests cover the flag switch, track lifecycle, metadata,
+  diagnostics, and cleanup;
+- no new runtime behavior is enabled by default;
+- broad Electron E2E is deferred to PR CI because the shared-controls flag is
+  compile-time default-off; and
+- manual visual verification is required before enabling the flag globally,
+  not before merging this guarded integration.
+
+Recorded on 2026-07-16:
+
+- `ui-playback`: 51 suites and 492 tests passed;
+- `ui-playback` lint, repository web/backend typecheck, i18n drift check,
+  Prettier, and `git diff --check` passed;
+- no E2E suite was added because the compile-time rollout flag remains
+  default-off and the existing runtime workflow is unchanged; and
+- visual/manual playback verification remains a prerequisite for changing the
+  rollout default, not for merging this guarded consumer.
+
+- [x] **Step 5: Commit docs and final validation fixes**
+
+```bash
+git add \
+  docs/architecture/player-controls-contract.md \
+  docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md \
+  docs/superpowers/plans/2026-07-16-html5-shared-controls.md \
+  AGENTS.md CLAUDE.md
+git commit -m "docs(player-controls): describe HTML5 shared-controls bridge"
+```
+
+- [x] **Step 6: Review the complete branch**
+
+Run a spec-compliance review followed by a code-quality review against
+`origin/master...HEAD`. Resolve every important finding, rerun affected tests,
+then request GitHub Codex and Greptile reviews after opening the fresh PR.
diff --git a/docs/superpowers/plans/2026-07-16-videojs-shared-controls.md b/docs/superpowers/plans/2026-07-16-videojs-shared-controls.md
new file mode 100644
index 000000000..95ed6ac8a
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-16-videojs-shared-controls.md
@@ -0,0 +1,200 @@
+# Video.js Shared Controls Replacement Implementation Plan
+
+> Execute with test-driven development. Each behavior change starts with a
+> focused failing test, then the minimum implementation, then targeted and broad
+> verification.
+
+## Task 1: Extract focused Video.js types
+
+Files:
+
+- Add `libs/ui/playback/src/lib/vjs-player/vjs-player.types.ts`.
+- Update `vjs-player.component.ts` imports.
+
+Steps:
+
+1. Move only the API shapes shared by collaborators.
+2. Preserve existing runtime behavior.
+3. Run the existing Video.js component spec.
+
+## Task 2: Extract and harden audio-track ownership
+
+Files:
+
+- Add `vjs-audio-tracks.ts`.
+- Add `vjs-audio-tracks.spec.ts`.
+- Update `vjs-player.component.ts`.
+
+Tests first:
+
+- project labels and stable IDs;
+- select exactly one valid track;
+- stale/invalid ID is a no-op;
+- legacy menu remains available flag-off;
+- add/remove/change/labelchange refresh through stable callbacks;
+- identity-aware bind and exact cleanup.
+
+Implementation:
+
+- Preserve the useful logging/menu behavior from #1153.
+- Reset IDs at each source boundary.
+- Use the same collaborator in legacy and shared modes.
+
+## Task 3: Add Video.js subtitle-track ownership
+
+Files:
+
+- Add `vjs-text-tracks.ts`.
+- Add `vjs-text-tracks.spec.ts`.
+
+Tests first:
+
+- filter captions/subtitles;
+- stable IDs within a source;
+- select one track and disable the rest;
+- `-1` explicitly disables all tracks;
+- stale ID is a no-op;
+- global caption suppression/restoration;
+- explicit off survives preference and track-list events;
+- source reset and exact listener cleanup.
+
+Implementation:
+
+- Use `player.textTracks()`.
+- Keep the helper Video.js-specific.
+
+## Task 4: Extract raw MPEG-TS session
+
+Files:
+
+- Add `vjs-mpegts-session.ts`.
+- Add `vjs-mpegts-session.spec.ts`.
+- Remove the corresponding code from `vjs-player.component.ts`.
+
+Tests first:
+
+- source detection including query-declared HLS;
+- authoritative live/VOD option;
+- attach/load/play on the supplied current Tech video;
+- VOD duration normalization;
+- error classification;
+- missing video handling;
+- idempotent destroy and exact listener cleanup.
+
+Implementation:
+
+- Keep raw MPEG-TS attachment in the session and put pause/coalesced-reset
+  ordering in a focused reset coordinator.
+- Make `start` accept the current Tech video explicitly.
+
+## Task 5: Add a rebindable Tech video session
+
+Files:
+
+- Add `vjs-video-element-session.ts`.
+- Add `vjs-video-element-session.spec.ts`.
+
+Tests first:
+
+- attach once;
+- rebind A → B removes all listeners from A and adds them once to B;
+- loaded/playing clear the diagnostic;
+- ended emits once;
+- destroy is idempotent.
+
+## Task 6: Add the shared-controls bridge
+
+Files:
+
+- Add `vjs-player-controls.bridge.ts`.
+- Add `vjs-player-controls.bridge.spec.ts`.
+
+Tests first:
+
+- attach to the current Tech video;
+- adapter accessors expose live/VOD, duration, audio, and subtitles;
+- rebind detaches A and attaches B exactly once;
+- source clear resets track state;
+- input refresh reapplies captions and classification;
+- destroy cleans track listeners and adapter exactly once.
+
+Implementation:
+
+- Use the component-scoped `WebVideoControlsAdapter`.
+- Delegate track ownership to the focused collaborators.
+
+## Task 7: Integrate the component and host
+
+Files:
+
+- Update `vjs-player.component.ts`, `.html`, and focused specs.
+- Add `vjs-player.component.shared-controls.spec.ts`.
+- Update `web-player-view.component.html`.
+- Update `web-player-view.component.shared-controls.spec.ts`.
+
+Tests first:
+
+- flag-off preserves Video.js chrome and legacy navigation;
+- flag-on renders exactly one shared controls UI;
+- flag-on disables native controls, Video.js gestures/hotkeys, and spatial nav;
+- shared controls use the real shell;
+- diagnostic gating disables controls/shortcuts and exits owned fullscreen;
+- both host Video.js branches receive `showCaptions` and
+  `interactionEnabled`;
+- `playerreset` rebinds the video session and controls bridge;
+- reset-required changes coalesce while applying only the latest desired
+  source;
+- active playback pauses before `reset()`, and reset volume=1 never overwrites
+  the user's actual volume;
+- pre-ready reset does not start MPEG-TS twice;
+- raw MPEG-TS restarts when authoritative live/VOD metadata changes.
+
+Implementation ordering:
+
+1. Create Video.js and register stable player lifecycle handlers.
+2. On initial ready, bind the current Tech video and active source.
+3. Before reset, snapshot actual volume, pause, and coalesce the latest desired
+   source.
+4. On any `playerreset`, restore volume, rebind sessions, and apply only the
+   latest desired source before starting MPEG-TS.
+5. Track whether the current Tech already has its source so pre-ready reset
+   cannot double-start playback.
+6. Destroy coordinator/bridge/session collaborators before `player.dispose()`.
+
+## Task 8: Reduce file baselines and update canonical docs
+
+Files:
+
+- Update `tools/eslint/max-lines-baseline.mjs`.
+- Update `docs/architecture/player-controls-contract.md`.
+- Update `AGENTS.md` and `CLAUDE.md` only where their current shared-controls
+  description becomes stale.
+- Update `web-player-controls.flag.ts` documentation.
+
+Checks:
+
+- `vjs-player.component.ts` is below 400 lines.
+- Split the component spec if needed and remove stale max-lines baselines.
+
+## Task 9: Verification and PR loop
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache
+pnpm nx lint ui-playback --skip-nx-cache
+pnpm run typecheck:ci
+pnpm run coverage:ci
+pnpm run lint
+git diff --check
+```
+
+Then:
+
+1. Push the replacement branch.
+2. Open a replacement PR that credits #1153 and states it supersedes it.
+3. Trigger fresh Codex and Greptile reviews.
+4. Resolve only verified findings.
+5. Require full green CI.
+6. Squash merge the replacement.
+7. Close #1153 with thanks and a link to the merged replacement.
diff --git a/docs/superpowers/plans/2026-07-17-linux-embedded-mpv-frame-copy-packaging.md b/docs/superpowers/plans/2026-07-17-linux-embedded-mpv-frame-copy-packaging.md
new file mode 100644
index 000000000..a090863f3
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-17-linux-embedded-mpv-frame-copy-packaging.md
@@ -0,0 +1,658 @@
+# Linux Embedded MPV Frame-Copy Packaging Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Ship a verified Linux x64 frame-copy runtime in AppImage, DEB, RPM, Pacman, Snap, and Flatpak while preserving out-of-process libmpv isolation and honest native-view fallback.
+
+**Architecture:** Split official Linux packaging into system-runtime and bundled-runtime passes because Electron Builder reuses one unpacked layout per pass. A versioned manifest plus a real helper `--runtime-probe` gates frame-copy before BrowserWindow creation; only the helper may link libmpv, and foreign-architecture packages retain the unavailable marker.
+
+**Tech Stack:** Electron 41, Node/TypeScript, C++17/N-API, libmpv render API, EGL/OpenGL/GBM, ELF/RPATH tooling, electron-builder 26, Nx/Jest/node:test, Playwright, GitHub Actions, AppImage/DEB/RPM/Pacman/Snap/Flatpak.
+
+---
+
+## File Map
+
+### Runtime contracts and staging
+
+- Create `tools/embedded-mpv/linux-runtime-manifest.cjs`
+    - Parse, normalize, and validate Linux frame-copy runtime manifests.
+- Create `tools/embedded-mpv/build-linux-runtime.mjs`
+    - Build the pinned LGPL-compatible FFmpeg/libass/libplacebo/libmpv prefix.
+- Modify `tools/embedded-mpv/stage-runtime.mjs`
+    - Stage Linux shared libraries and reject incomplete release manifests.
+- Modify `apps/electron-backend/build-embedded-mpv.js`
+    - Build against staged Linux libmpv, copy the bundled closure, and emit the
+      profile-neutral build manifest.
+- Modify `apps/electron-backend/native/binding.gyp`
+    - Keep helper RPATH relative and remove build-host RPATH.
+- Modify `package.json`
+    - Expose the Linux runtime build command.
+
+### Packaging profiles and validation
+
+- Create `tools/packaging/linux-frame-copy-profile.cjs`
+    - Own profile names, target sets, manifest origins, and package dependencies.
+- Create `tools/packaging/linux-frame-copy-profile.test.mjs`
+    - Verify profile/target/dependency mapping and invalid combinations.
+- Modify `electron-builder.json`
+    - Declare DEB/RPM/Pacman libmpv dependencies.
+- Modify `tools/packaging/embedded-mpv-frame-copy-files.cjs`
+    - Package Linux helper/reader and select/remove private runtime by profile.
+- Modify `tools/packaging/embedded-mpv-packaging.cjs`
+    - Validate Linux ELF linkage, manifest, files, modes, RPATH, and isolation.
+- Modify `tools/packaging/embedded-mpv-arch.test.mjs`
+    - Cover system, bundled, malformed, and foreign-architecture layouts.
+- Modify `tools/packaging/electron-after-pack.cjs`
+    - Pass the required Linux profile into preparation and validation.
+- Modify `tools/packaging/verify-electron-package-layout.mjs`
+    - Verify the expected profile for every unpacked layout.
+- Modify `tools/packaging/project.json`
+    - Add new tests and source inputs.
+
+### Runtime capability probe
+
+- Modify `apps/electron-backend/native/helper/frame_helper_gl.h`
+    - Provide a context-only probe that does not create a playback session.
+- Modify `apps/electron-backend/native/helper/mpv_frame_helper.cpp`
+    - Implement the versioned `--runtime-probe` JSON protocol.
+- Create `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts`
+    - Validate manifest/files and run/cache the bounded helper probe.
+- Create `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.spec.ts`
+    - Cover all fail-closed paths and success caching.
+- Modify `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.ts`
+    - Resolve an artifact set and delegate usability to the runtime probe.
+- Modify `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.spec.ts`
+    - Keep path/security coverage and add manifest/probe integration cases.
+- Modify `apps/electron-backend/src/app/services/embedded-mpv-native.service.ts`
+    - Surface stable fallback diagnostics without changing native-view safety.
+
+### Linux CI, package smoke, and documentation
+
+- Create `tools/packaging/verify-linux-frame-copy-runtime.mjs`
+    - Inspect real package payload ELF/modes/manifest and invoke the helper probe.
+- Create `tools/packaging/verify-linux-frame-copy-runtime.test.mjs`
+    - Unit-test verifier parsing and failure reporting with fixtures.
+- Create `apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts`
+    - Exercise packaged capability, a deterministic media frame, and fallback.
+- Modify `.github/workflows/build-and-make.yaml`
+    - Build/cache runtime, split profiles, inspect every format, and run sandbox
+      and container smoke coverage.
+- Modify `docs/architecture/embedded-mpv-native.md`
+- Modify `tools/embedded-mpv/README.md`
+- Modify `vendor/embedded-mpv/README.md`
+- Modify `AGENTS.md`
+- Modify `CLAUDE.md`
+    - Document the final contract and verification matrix.
+
+## Task 1: Define Linux Packaging Profiles
+
+**Files:**
+
+- Create: `tools/packaging/linux-frame-copy-profile.cjs`
+- Create: `tools/packaging/linux-frame-copy-profile.test.mjs`
+- Modify: `electron-builder.json`
+- Modify: `tools/packaging/project.json`
+
+- [ ] **Step 1: Write failing profile tests**
+
+Cover the exact public API:
+
+```js
+assert.deepEqual(resolveLinuxFrameCopyProfile('system'), {
+    name: 'system',
+    runtimeMode: 'system',
+    targets: ['deb', 'rpm', 'pacman'],
+    manifestOrigin: 'system-libmpv-frame-copy',
+});
+assert.deepEqual(resolveLinuxFrameCopyProfile('portable').targets, [
+    'appimage',
+    'snap',
+]);
+assert.deepEqual(resolveLinuxFrameCopyProfile('flatpak').targets, ['flatpak']);
+assert.throws(() => resolveLinuxFrameCopyProfile('standard'), /Unsupported/);
+assert.deepEqual(LINUX_SYSTEM_PACKAGE_DEPENDENCIES, {
+    deb: 'libmpv2',
+    rpm: 'mpv-libs',
+    pacman: 'mpv',
+});
+assert.deepEqual(validateLinuxProfileTargets('system', ['deb', 'AppImage']), [
+    'Linux frame-copy profile "system" cannot build target "appimage".',
+]);
+```
+
+- [ ] **Step 2: Run RED**
+
+```bash
+node --test tools/packaging/linux-frame-copy-profile.test.mjs
+```
+
+Expected: FAIL because the profile module does not exist.
+
+- [ ] **Step 3: Implement the profile module and package dependencies**
+
+Export immutable `LINUX_FRAME_COPY_PROFILES`,
+`LINUX_SYSTEM_PACKAGE_DEPENDENCIES`, `resolveLinuxFrameCopyProfile()`, and
+`validateLinuxProfileTargets()`. Add `deb.depends += libmpv2`,
+`rpm.depends += mpv-libs`, and `pacman.depends += mpv` without replacing
+Electron Builder's existing defaults.
+
+- [ ] **Step 4: Register and run GREEN**
+
+Add the new test to `packaging:test`, then run:
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add electron-builder.json tools/packaging
+git commit -m "feat(packaging): define Linux frame-copy profiles"
+```
+
+## Task 2: Stage A Pinned LGPL Linux Runtime
+
+**Files:**
+
+- Create: `tools/embedded-mpv/linux-runtime-manifest.cjs`
+- Create: `tools/embedded-mpv/linux-runtime-manifest.test.mjs`
+- Create: `tools/embedded-mpv/build-linux-runtime.mjs`
+- Modify: `tools/embedded-mpv/stage-runtime.mjs`
+- Modify: `package.json`
+- Modify: `tools/packaging/project.json`
+
+- [ ] **Step 1: Write failing manifest/staging tests**
+
+Use temporary prefixes to prove:
+
+```js
+assert.equal(validateLinuxRuntimeManifest(validManifest).length, 0);
+assert.match(
+    validateLinuxRuntimeManifest({
+        ...validManifest,
+        ffmpeg: { configureFlags: ['--enable-gpl'] },
+    })[0],
+    /--enable-gpl/
+);
+assert.match(
+    validateLinuxRuntimeManifest({
+        ...validManifest,
+        mpv: { mesonFlags: ['-Dgpl=true'] },
+    })[0],
+    /-Dgpl=false/
+);
+```
+
+Exercise `stage-runtime.mjs linux x64 <prefix>` and assert it copies
+`libmpv.so.2` plus all manifest-declared `.so` files and records byte sizes.
+
+- [ ] **Step 2: Run RED**
+
+```bash
+node --test tools/embedded-mpv/linux-runtime-manifest.test.mjs
+```
+
+Expected: FAIL because the validator/build/staging contract is absent.
+
+- [ ] **Step 3: Implement the source builder**
+
+Reuse the pinned package versions already used by the macOS builder. Linux
+FFmpeg flags must include:
+
+```text
+--enable-shared --disable-static --disable-programs --disable-doc
+--disable-debug --disable-autodetect --disable-gpl --disable-nonfree
+--enable-pic --enable-pthreads
+```
+
+Linux mpv flags must include:
+
+```text
+-Dgpl=false -Dlibmpv=true -Dcplayer=false -Dtests=false
+-Dlua=disabled -Djavascript=disabled -Dcplugins=disabled
+-Dlibarchive=disabled -Dlibbluray=disabled -Ddvdnav=disabled
+-Dcdda=disabled -Ddvbin=disabled -Dvulkan=disabled
+-Dplain-gl=enabled -Degl=enabled -Dgbm=enabled
+```
+
+Record downloaded SHA-256 values, git commits/submodules, exact flags, runtime
+file names/sizes, and source-distribution obligations. Pin the hwdata v0.409
+archive and record its `pnp.ids` as a build input to libdisplay-info 0.1.1.
+Stage private `hwdata.pc` metadata and run libdisplay-info's Meson setup with a
+prefix-only pkg-config environment so the upstream
+`/usr/share/hwdata/pnp.ids` fallback is unreachable. Include the exact hwdata
+archive and its `GPL-2.0-or-later OR XFree86-1.0` notice in the release source
+bundle.
+
+- [ ] **Step 4: Implement Linux staging**
+
+Require `include/mpv/client.h`, a versioned `libmpv.so.*`, and a valid manifest.
+Copy only manifest-declared shared libraries and preserve SONAME symlinks as
+materialized regular files so Electron Builder cannot lose them.
+
+- [ ] **Step 5: Run GREEN and static policy checks**
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+node --check tools/embedded-mpv/build-linux-runtime.mjs
+node --check tools/embedded-mpv/stage-runtime.mjs
+```
+
+Expected: PASS and no GPL/nonfree-enabling flag in generated policy fixtures.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add package.json tools/embedded-mpv tools/packaging/project.json
+git commit -m "feat(embedded-mpv): stage LGPL Linux runtime"
+```
+
+## Task 3: Build A Relocatable Isolated Helper
+
+**Files:**
+
+- Modify: `apps/electron-backend/native/binding.gyp`
+- Modify: `apps/electron-backend/build-embedded-mpv.js`
+- Test: `apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts`
+
+- [ ] **Step 1: Extend source-policy tests**
+
+Assert the Linux helper has `$ORIGIN/lib` and no absolute build-host RPATH,
+the addon does not use `-lmpv`, the staged closure is copied, and the build
+manifest identifies both allowed package modes.
+
+- [ ] **Step 2: Run RED**
+
+```bash
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns=embedded-mpv-native-source.spec
+```
+
+Expected: FAIL on the current absolute `LINUX_NATIVE_LIBRARY_DIR` RPATH and
+`external-mpv-process`-only manifest.
+
+- [ ] **Step 3: Update native build integration**
+
+Link the helper against staged `libmpv.so`, retain only:
+
+```text
+-Wl,--enable-new-dtags
+-Wl,-rpath,$ORIGIN/lib
+```
+
+Copy the staged shared-library closure to build output for downstream bundled
+profiles, but keep `embedded_mpv.node` dynamically independent of libmpv.
+Write a build manifest that carries the runtime metadata without prematurely
+choosing `system` versus `portable`.
+
+- [ ] **Step 4: Run GREEN**
+
+```bash
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns=embedded-mpv-native-source.spec
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add apps/electron-backend/native/binding.gyp \
+  apps/electron-backend/build-embedded-mpv.js \
+  apps/electron-backend/src/app/services/embedded-mpv-native-source.spec.ts
+git commit -m "feat(embedded-mpv): build relocatable Linux helper"
+```
+
+## Task 4: Package And Validate Each Runtime Mode
+
+**Files:**
+
+- Modify: `tools/packaging/embedded-mpv-frame-copy-files.cjs`
+- Modify: `tools/packaging/embedded-mpv-packaging.cjs`
+- Modify: `tools/packaging/embedded-mpv-arch.test.mjs`
+- Modify: `tools/packaging/electron-after-pack.cjs`
+- Modify: `tools/packaging/verify-electron-package-layout.mjs`
+
+- [ ] **Step 1: Write failing package-layout tests**
+
+Create realistic temp layouts and prove:
+
+- system mode requires executable helper, reader, system manifest, no
+  `native/lib/libmpv*`;
+- bundled mode requires all manifest files and rejects missing/runtime-prefix
+  links;
+- helper mode `0644` is rejected;
+- reader symlinks/directories are rejected;
+- Linux addon or Electron `DT_NEEDED libmpv` is rejected;
+- helper without `DT_NEEDED libmpv.so.2` is rejected;
+- foreign-arch layout contains only the unavailable marker.
+
+- [ ] **Step 2: Run RED**
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+```
+
+Expected: FAIL because Linux helpers are deleted and validation forbids them.
+
+- [ ] **Step 3: Implement profile-aware preparation**
+
+For x64:
+
+- restore helper mode `0755`;
+- always retain the frame reader;
+- `system`: remove private runtime and write normalized system manifest;
+- `portable`/`flatpak`: retain only manifest-declared closure and write bundled
+  manifest;
+- reject missing `IPTVNATOR_LINUX_FRAME_COPY_PROFILE` when Embedded MPV is
+  required.
+
+For foreign architectures, keep the current unavailable marker behavior and
+remove every native artifact.
+
+- [ ] **Step 4: Implement ELF/package validation**
+
+Use `readelf -d` for `NEEDED` and RPATH/RUNPATH inspection. Resolve bundled
+closure recursively from the private directory and permit only a documented
+glibc/driver/system allowlist outside it. Keep validation host-aware: pure
+manifest/mode checks run everywhere; ELF inspection is required on Linux CI.
+
+- [ ] **Step 5: Run GREEN**
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns=embedded-mpv-native-source.spec
+```
+
+Expected: PASS.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add tools/packaging
+git commit -m "feat(packaging): ship Linux frame-copy artifacts"
+```
+
+## Task 5: Add The Real Runtime Capability Probe
+
+**Files:**
+
+- Modify: `apps/electron-backend/native/helper/frame_helper_gl.h`
+- Modify: `apps/electron-backend/native/helper/mpv_frame_helper.cpp`
+- Create: `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.ts`
+- Create: `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime.spec.ts`
+- Modify: `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.ts`
+- Modify: `apps/electron-backend/src/app/services/embedded-mpv-frame-copy-platform.util.spec.ts`
+- Modify: `apps/electron-backend/src/app/services/embedded-mpv-native.service.ts`
+
+- [ ] **Step 1: Write failing TypeScript probe tests**
+
+Inject filesystem and `spawnSync` collaborators. Cover:
+
+```ts
+expect(probeRuntime(validArtifacts, successSpawn).usable).toBe(true);
+expect(probeRuntime(validArtifacts, timeoutSpawn).reason).toBe(
+    'helper-probe-timeout'
+);
+expect(probeRuntime(validArtifacts, nonzeroSpawn).reason).toBe(
+    'helper-probe-failed'
+);
+expect(probeRuntime(validArtifacts, invalidJsonSpawn).reason).toBe(
+    'helper-probe-invalid-output'
+);
+expect(probeRuntime(missingManifest, successSpawn).reason).toBe(
+    'runtime-manifest-missing'
+);
+expect(successSpawn).toHaveBeenCalledTimes(1);
+```
+
+The last assertion calls the public probe twice and proves process-lifetime
+caching.
+
+- [ ] **Step 2: Run RED**
+
+```bash
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns=embedded-mpv-frame-copy-runtime.spec
+```
+
+Expected: FAIL because the runtime probe module does not exist.
+
+- [ ] **Step 3: Implement helper `--runtime-probe`**
+
+Emit exactly one line:
+
+```json
+{ "protocol": 1, "usable": true, "libmpv": "2.x", "renderApi": "egl" }
+```
+
+Exit nonzero with a JSON `reason` when `mpv_create`, `mpv_initialize`, or the
+EGL/OpenGL context probe fails. Do not create shared memory, open a URL, or
+enter the normal command loop.
+
+- [ ] **Step 4: Implement fail-closed main-process probing**
+
+Validate manifest/artifacts first, then run:
+
+```ts
+spawnSync(helperPath, ['--runtime-probe'], {
+    encoding: 'utf8',
+    timeout: 3000,
+    windowsHide: true,
+    env: probeEnvironment,
+});
+```
+
+Cache by helper/manifest identity. Never throw across startup; return a stable
+reason and make `isFrameCopyRuntimeUsable()` depend on `.usable`.
+
+- [ ] **Step 5: Run GREEN and related regression tests**
+
+```bash
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns='embedded-mpv-frame-copy-(runtime|platform).util.spec|app.spec|embedded-mpv-native.service.spec'
+```
+
+Expected: PASS; unavailable runtime keeps sandbox enabled and selects native.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add apps/electron-backend/native/helper \
+  apps/electron-backend/src/app/services
+git commit -m "feat(embedded-mpv): probe Linux frame-copy runtime"
+```
+
+## Task 6: Split Linux CI And Inspect Every Artifact
+
+**Files:**
+
+- Create: `tools/packaging/verify-linux-frame-copy-runtime.mjs`
+- Create: `tools/packaging/verify-linux-frame-copy-runtime.test.mjs`
+- Modify: `.github/workflows/build-and-make.yaml`
+- Modify: `tools/packaging/project.json`
+
+- [ ] **Step 1: Write failing verifier tests**
+
+Test payload discovery for `.AppImage`, `.deb`, `.rpm`, Pacman archive,
+`.snap`, and `.flatpak`, plus clear errors for a missing helper, wrong mode,
+wrong profile, direct addon libmpv linkage, and unresolved helper dependency.
+
+- [ ] **Step 2: Run RED**
+
+```bash
+node --test tools/packaging/verify-linux-frame-copy-runtime.test.mjs
+```
+
+Expected: FAIL because the verifier does not exist.
+
+- [ ] **Step 3: Implement artifact verification**
+
+Provide `--artifact <path> --profile <name>`. Extract/mount into a temp
+directory, find the native layout, run manifest/mode/ELF checks, and execute
+`iptvnator_mpv_helper --runtime-probe` in the package's intended environment.
+Always clean temporary mounts/directories.
+
+- [ ] **Step 4: Split and harden CI**
+
+Change Linux matrix entries to:
+
+```yaml
+- os: linux
+  linux_profile: system
+- os: linux
+  linux_profile: portable
+- os: linux
+  linux_profile: flatpak
+```
+
+Filter targets exactly per profile and set
+`IPTVNATOR_LINUX_FRAME_COPY_PROFILE`. Build/cache the pinned runtime once per
+source/tool hash. Add format-specific extraction/installation tools and invoke
+the verifier for every produced artifact.
+
+Run system formats in matching containers with `libmpv2`, `mpv-libs`, or
+`mpv`; run AppImage directly with extraction fallback; install and probe Snap
+and Flatpak inside their sandboxes.
+
+- [ ] **Step 5: Run GREEN and workflow source regressions**
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+pnpm nx test electron-backend --skip-nx-cache --runInBand \
+  --testPathPatterns=embedded-mpv-native-source.spec
+```
+
+Expected: PASS and source tests prove all three profiles and six formats.
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add .github/workflows/build-and-make.yaml tools/packaging
+git commit -m "ci: verify Linux frame-copy packages"
+```
+
+## Task 7: Add Packaged Playback And Fallback Smoke Coverage
+
+**Files:**
+
+- Create: `apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts`
+- Modify: `.github/workflows/build-and-make.yaml`
+
+- [ ] **Step 1: Write the packaged E2E**
+
+Use the existing Electron test fixtures and a generated two-second local media
+fixture. Assert the support response reports `frameCopyAvailable: true`,
+activate the engine, load the fixture, observe a nonzero frame generation and
+playing/paused snapshot, then relaunch with the runtime hidden and assert
+native engine selection without a main-process crash.
+
+- [ ] **Step 2: Run the closest local parse/list check**
+
+```bash
+pnpm nx lint electron-backend-e2e
+pnpm nx show project electron-backend-e2e
+```
+
+Expected: PASS on macOS; the actual test is Linux-packaged-only.
+
+- [ ] **Step 3: Wire the Linux packaged smoke**
+
+Run the spec against the unpacked x64 bundled layout under software EGL
+(`LIBGL_ALWAYS_SOFTWARE=1`) and keep a hardware-enabled smoke as a separate
+non-blocking diagnostic when the CI runner exposes DRI.
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add apps/electron-backend-e2e/src/embedded-mpv-frame-copy-packaged.e2e.ts \
+  .github/workflows/build-and-make.yaml
+git commit -m "test(embedded-mpv): smoke packaged Linux frame-copy"
+```
+
+## Task 8: Update Canonical Documentation
+
+**Files:**
+
+- Modify: `docs/architecture/embedded-mpv-native.md`
+- Modify: `tools/embedded-mpv/README.md`
+- Modify: `vendor/embedded-mpv/README.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+
+- [ ] **Step 1: Replace the dev-only Linux contract**
+
+Document x64 support across all six formats, the three profiles, dependency
+names, runtime manifest/probe, codec baseline, source obligations, fallback,
+and ARM unavailable behavior. Keep `AGENTS.md` and `CLAUDE.md` synchronized.
+
+- [ ] **Step 2: Verify documentation consistency**
+
+```bash
+rg -n "dev-build-only|stripped from packages|must not bundle libmpv" \
+  AGENTS.md CLAUDE.md docs/architecture/embedded-mpv-native.md \
+  tools/embedded-mpv/README.md vendor/embedded-mpv/README.md
+git diff --check
+```
+
+Expected: no stale Linux frame-copy shipping claim; any remaining
+“must not bundle” text applies specifically to Electron/addon or system
+profiles.
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add AGENTS.md CLAUDE.md docs/architecture/embedded-mpv-native.md \
+  tools/embedded-mpv/README.md vendor/embedded-mpv/README.md
+git commit -m "docs: document Linux frame-copy packages"
+```
+
+## Task 9: Final Verification Matrix
+
+**Files:** No production edits unless verification exposes a defect.
+
+- [ ] **Step 1: Run local project discovery and affected checks**
+
+```bash
+pnpm nx show projects
+pnpm nx test packaging --skip-nx-cache
+pnpm nx test electron-backend --skip-nx-cache --runInBand
+pnpm nx lint packaging --skip-nx-cache
+pnpm nx lint electron-backend --skip-nx-cache
+pnpm nx lint electron-backend-e2e --skip-nx-cache
+pnpm nx build electron-backend --configuration=production --skip-nx-cache
+```
+
+Expected: PASS or an explicitly recorded platform-only native-build skip on
+macOS without a vendored runtime.
+
+- [ ] **Step 2: Verify isolation source and local artifacts**
+
+```bash
+rg -n -- '-lmpv|libmpv' apps/electron-backend/native/binding.gyp \
+  tools/packaging apps/electron-backend/build-embedded-mpv.js
+git diff --check origin/master...HEAD
+git status --short
+```
+
+Expected: only the helper target links libmpv; no unstaged/unexplained files.
+
+- [ ] **Step 3: Record the exact evidence matrix**
+
+Report separately:
+
+- verified locally on macOS: Node/Jest/lint/build/static/package-policy tests;
+- structurally verified but not executable locally: Linux runtime builder and
+  artifact extraction code;
+- requires Linux CI: ELF resolution, actual six-format packages, package
+  managers, Snap/Flatpak confinement, EGL/GBM, frame production, and fallback
+  with libmpv removed.
+
+- [ ] **Step 4: Stop before publication**
+
+Do not push, open a PR, publish artifacts, or merge. Leave the fully checked
+local branch ready for explicit user confirmation in a new task.
diff --git a/docs/superpowers/plans/2026-07-17-shared-web-picture-in-picture.md b/docs/superpowers/plans/2026-07-17-shared-web-picture-in-picture.md
new file mode 100644
index 000000000..6978ee8a3
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-17-shared-web-picture-in-picture.md
@@ -0,0 +1,1206 @@
+# Shared Web Picture-in-Picture Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use
+> superpowers:subagent-driven-development (recommended) or
+> superpowers:executing-plans to implement this plan task-by-task. Steps use
+> checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Add one capability-gated Picture-in-Picture action to IPTVnator's
+shared controls for HTML5, Video.js, and ArtPlayer while keeping Embedded MPV,
+AirPlay, Cast, and the legacy controls paths unchanged.
+
+**Architecture:** Extend `PlayerController` with PiP capability/state/command
+fields. `WebVideoControlsAdapter` owns standard element PiP against its current
+`HTMLVideoElement`, including Video.js Tech replacement, exact ownership,
+pending-operation serialization, and stale-request cleanup. The shared Angular
+component renders one accessible action; Embedded MPV implements only
+capability-false contract compatibility.
+
+**Tech Stack:** Angular signals and standalone components, TypeScript 5.9 DOM
+PiP APIs, Jest 30 + jsdom 26, Nx, ngx-translate.
+
+**Design:** `docs/superpowers/specs/2026-07-17-shared-web-picture-in-picture-design.md`
+
+---
+
+## File structure
+
+### New files
+
+- `libs/ui/playback/src/lib/player-controls/player-controls-defaults.spec.ts`
+  proves the new contract remains default-off.
+- `libs/ui/playback/src/lib/player-controls/picture-in-picture.spec-helpers.ts`
+  provides reversible jsdom PiP API doubles shared by focused and engine
+  integration specs.
+- `libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.picture-in-picture.spec.ts`
+  owns browser API, readiness, pending, ownership, detach, and stale-completion
+  regression coverage.
+
+### Modified production files
+
+- `libs/ui/playback/src/lib/player-controls/player-controls.model.ts`
+  declares PiP capability/state/command fields.
+- `libs/ui/playback/src/lib/player-controls/player-controls-defaults.ts`
+  supplies safe `false` defaults.
+- `libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts`
+  implements standard element PiP against the active web-engine video.
+- `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts`
+  remains explicitly capability-false with a no-op command.
+- `libs/ui/playback/src/lib/player-controls/player-controls.component.ts`
+  gates and dispatches the shared action.
+- `libs/ui/playback/src/lib/player-controls/player-controls.component.html`
+  renders the accessible PiP button immediately before fullscreen.
+- `apps/web/src/assets/i18n/*.json` adds enter/exit labels to all 18 locales.
+
+### Modified tests and docs
+
+- Typed command fakes:
+  `controls-menu-selection.spec.ts`,
+  `player-controls.component.contract.spec.ts`,
+  `player-controls.component.interactions.spec.ts`,
+  `player-controls.component.spec.ts`,
+  `player-controls.component.surface.spec.ts`, and
+  `player-controls.component.timeline.spec.ts`.
+- Engine coverage:
+  `html-video-player.component.shared-controls.spec.ts`,
+  `vjs-player.component.reset.spec.ts`,
+  `art-player.component.shared-controls.spec.ts`, and
+  `embedded-mpv-controls.adapter.spec.ts`.
+- Canonical docs:
+  `docs/architecture/player-controls-contract.md`, `AGENTS.md`, and
+  `CLAUDE.md`.
+
+---
+
+### Task 1: Extend the controller contract with safe default-off PiP fields
+
+**Files:**
+
+- Create:
+  `libs/ui/playback/src/lib/player-controls/player-controls-defaults.spec.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/player-controls.model.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/player-controls-defaults.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts`
+- Modify:
+  `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts`
+- Modify:
+  `libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts`
+- Modify the six typed command-fake specs listed in the file-structure section.
+
+- [ ] **Step 1: Write the failing defaults test**
+
+Create the focused spec with an indexed read so RED is an assertion failure
+rather than a TypeScript declaration failure:
+
+```ts
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+
+describe('player-controls defaults', () => {
+    it('defaults Picture-in-Picture to unsupported and inactive', () => {
+        expect(
+            (DEFAULT_PLAYER_CAPABILITIES as Record<string, unknown>)[
+                'pictureInPicture'
+            ]
+        ).toBe(false);
+        expect(createEmptyControlsState()).toMatchObject({
+            pictureInPictureActive: false,
+            canPictureInPicture: false,
+        });
+    });
+});
+```
+
+- [ ] **Step 2: Run RED and confirm the missing defaults are detected**
+
+Run:
+
+```bash
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/player-controls --runInBand"
+```
+
+Expected: FAIL in `player-controls-defaults.spec.ts`, because the PiP
+capability/state fields are absent.
+
+- [ ] **Step 3: Add the contract and defaults**
+
+Add the following flat fields:
+
+```ts
+export interface PlayerControlsCapabilities {
+    seek: boolean;
+    volume: boolean;
+    audioTracks: boolean;
+    subtitles: boolean;
+    playbackSpeed: boolean;
+    aspectRatio: boolean;
+    recording: boolean;
+    pictureInPicture: boolean;
+    fullscreen: boolean;
+    seriesNavigation: boolean;
+}
+```
+
+```ts
+export interface PlayerControlsState {
+    // Existing playback, track, speed, aspect, and recording fields stay here.
+    pictureInPictureActive: boolean;
+    canPictureInPicture: boolean;
+    canPreviousEpisode: boolean;
+    canNextEpisode: boolean;
+}
+```
+
+```ts
+export interface PlayerControlsCommands {
+    // Existing commands stay unchanged.
+    toggleRecording(): void;
+    togglePictureInPicture(): void;
+}
+```
+
+Add to `DEFAULT_PLAYER_CAPABILITIES`:
+
+```ts
+pictureInPicture: false,
+```
+
+Add to `createEmptyControlsState()`:
+
+```ts
+pictureInPictureActive: false,
+canPictureInPicture: false,
+```
+
+Remove the temporary indexed cast from the new defaults test:
+
+```ts
+expect(DEFAULT_PLAYER_CAPABILITIES.pictureInPicture).toBe(false);
+```
+
+- [ ] **Step 4: Make both production controllers contract-complete**
+
+Keep the web adapter temporarily default-off until Task 2:
+
+```ts
+// WebVideoControlsAdapter capability result
+pictureInPicture: false,
+```
+
+```ts
+// WebVideoControlsAdapter state result
+pictureInPictureActive: false,
+canPictureInPicture: false,
+```
+
+```ts
+// WebVideoControlsAdapter commands
+togglePictureInPicture: () => undefined,
+```
+
+Keep Embedded MPV explicitly unsupported:
+
+```ts
+// EmbeddedMpvControlsAdapter capability result
+pictureInPicture: false,
+```
+
+```ts
+// EmbeddedMpvControlsAdapter state result
+pictureInPictureActive: false,
+canPictureInPicture: false,
+```
+
+```ts
+// EmbeddedMpvControlsAdapter commands
+togglePictureInPicture: () => undefined,
+```
+
+Update both exact capability objects in
+`embedded-mpv-controls.adapter.spec.ts` to contain:
+
+```ts
+pictureInPicture: false,
+```
+
+Add this exact command fake to each of the six typed fake files:
+
+```ts
+togglePictureInPicture: jest.fn(),
+```
+
+The capability/state fakes already spread `DEFAULT_PLAYER_CAPABILITIES` and
+`createEmptyControlsState()`, so do not duplicate new state literals there.
+
+- [ ] **Step 5: Verify GREEN for contract and Embedded MPV**
+
+Run:
+
+```bash
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/player-controls --runInBand"
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/embedded-mpv-player --runInBand"
+```
+
+Expected: PASS. Embedded MPV must report PiP unsupported and retain no
+PiP-related backend/native command.
+
+- [ ] **Step 6: Commit the contract**
+
+```bash
+git add \
+  libs/ui/playback/src/lib/player-controls \
+  libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts \
+  libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts
+git commit -m "feat(playback): add picture-in-picture controls contract"
+```
+
+---
+
+### Task 2: Implement owned web-video PiP with race-safe lifecycle
+
+**Files:**
+
+- Create:
+  `libs/ui/playback/src/lib/player-controls/picture-in-picture.spec-helpers.ts`
+- Create:
+  `libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.picture-in-picture.spec.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts`
+- Modify:
+  `libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec.ts`
+- Modify:
+  `libs/ui/playback/src/lib/vjs-player/vjs-player.component.reset.spec.ts`
+- Modify:
+  `libs/ui/playback/src/lib/art-player/art-player.component.shared-controls.spec.ts`
+
+- [ ] **Step 1: Add a reversible jsdom PiP environment**
+
+Create a test-only helper with configurable document properties, exact
+ownership, and ready-state control:
+
+```ts
+export interface Deferred<T> {
+    readonly promise: Promise<T>;
+    resolve(value: T): void;
+    reject(reason?: unknown): void;
+}
+
+export function deferred<T>(): Deferred<T> {
+    let resolve!: (value: T) => void;
+    let reject!: (reason?: unknown) => void;
+    const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+        resolve = resolvePromise;
+        reject = rejectPromise;
+    });
+    return { promise, resolve, reject };
+}
+
+export class PictureInPictureTestEnvironment {
+    private activeElement: Element | null = null;
+    private enabled = true;
+    private readonly enabledDescriptor = Object.getOwnPropertyDescriptor(
+        document,
+        'pictureInPictureEnabled'
+    );
+    private readonly elementDescriptor = Object.getOwnPropertyDescriptor(
+        document,
+        'pictureInPictureElement'
+    );
+    private readonly exitDescriptor = Object.getOwnPropertyDescriptor(
+        document,
+        'exitPictureInPicture'
+    );
+
+    readonly exit = jest.fn<Promise<void>, []>(async () => {
+        const previous = this.activeElement;
+        this.activeElement = null;
+        previous?.dispatchEvent(new Event('leavepictureinpicture'));
+    });
+
+    constructor() {
+        Object.defineProperty(document, 'pictureInPictureEnabled', {
+            configurable: true,
+            get: () => this.enabled,
+        });
+        Object.defineProperty(document, 'pictureInPictureElement', {
+            configurable: true,
+            get: () => this.activeElement,
+        });
+        Object.defineProperty(document, 'exitPictureInPicture', {
+            configurable: true,
+            value: this.exit,
+        });
+    }
+
+    setEnabled(value: boolean): void {
+        this.enabled = value;
+    }
+
+    setActive(element: Element | null, emit = true): void {
+        const previous = this.activeElement;
+        this.activeElement = element;
+        if (!emit) {
+            return;
+        }
+        if (previous && previous !== element) {
+            previous.dispatchEvent(new Event('leavepictureinpicture'));
+        }
+        if (element && previous !== element) {
+            element.dispatchEvent(new Event('enterpictureinpicture'));
+        }
+    }
+
+    installVideo(
+        video: HTMLVideoElement,
+        request: () => Promise<PictureInPictureWindow> = async () => {
+            this.setActive(video);
+            return {} as PictureInPictureWindow;
+        }
+    ): jest.Mock<Promise<PictureInPictureWindow>, []> {
+        const requestMock = jest.fn(request);
+        Object.defineProperty(video, 'requestPictureInPicture', {
+            configurable: true,
+            value: requestMock,
+        });
+        Object.defineProperty(video, 'disablePictureInPicture', {
+            configurable: true,
+            writable: true,
+            value: false,
+        });
+        return requestMock;
+    }
+
+    setReadyState(video: HTMLVideoElement, value: number): void {
+        Object.defineProperty(video, 'readyState', {
+            configurable: true,
+            value,
+        });
+    }
+
+    restore(): void {
+        restoreDocumentProperty(
+            'pictureInPictureEnabled',
+            this.enabledDescriptor
+        );
+        restoreDocumentProperty(
+            'pictureInPictureElement',
+            this.elementDescriptor
+        );
+        restoreDocumentProperty('exitPictureInPicture', this.exitDescriptor);
+    }
+}
+
+function restoreDocumentProperty(
+    property:
+        | 'pictureInPictureEnabled'
+        | 'pictureInPictureElement'
+        | 'exitPictureInPicture',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+    delete (document as unknown as Record<string, unknown>)[property];
+}
+```
+
+If the installed Jest type signature accepts only the newer single generic
+form, use `jest.fn<() => Promise<void>>()` and
+`jest.MockedFunction<() => Promise<PictureInPictureWindow>>`; do not introduce
+`any`.
+
+- [ ] **Step 2: Write focused failing adapter tests**
+
+Use `PictureInPictureTestEnvironment` and add separate tests with these exact
+outcomes:
+
+```ts
+it.each([
+    ['document disabled', false, false],
+    ['element disabled', true, true],
+] as const)(
+    'does not advertise PiP when %s',
+    (_label, documentDisabled, elementDisabled) => {
+        environment.setEnabled(!documentDisabled);
+        const video = createVideo(1);
+        environment.installVideo(video);
+        video.disablePictureInPicture = elementDisabled;
+
+        adapter.attach(video);
+
+        expect(adapter.capabilities().pictureInPicture).toBe(false);
+        expect(adapter.state().canPictureInPicture).toBe(false);
+    }
+);
+
+it('advertises support before metadata but enables the action after metadata', () => {
+    const video = createVideo(0);
+    environment.installVideo(video);
+    adapter.attach(video);
+
+    expect(adapter.capabilities().pictureInPicture).toBe(true);
+    expect(adapter.state().canPictureInPicture).toBe(false);
+
+    environment.setReadyState(video, 1);
+    video.dispatchEvent(new Event('loadedmetadata'));
+
+    expect(adapter.state().canPictureInPicture).toBe(true);
+});
+
+it('requests entry synchronously and serializes a pending request', async () => {
+    const pending = deferred<PictureInPictureWindow>();
+    const video = createVideo(1);
+    const request = environment.installVideo(video, () => pending.promise);
+    adapter.attach(video);
+
+    adapter.commands.togglePictureInPicture();
+    adapter.commands.togglePictureInPicture();
+
+    expect(request).toHaveBeenCalledTimes(1);
+    expect(adapter.state().canPictureInPicture).toBe(false);
+
+    pending.resolve({} as PictureInPictureWindow);
+    await pending.promise;
+    await Promise.resolve();
+    expect(adapter.state().canPictureInPicture).toBe(true);
+});
+
+it('uses browser enter and leave events as active-state authority', () => {
+    const video = createVideo(1);
+    environment.installVideo(video);
+    adapter.attach(video);
+
+    environment.setActive(video);
+    expect(adapter.state().pictureInPictureActive).toBe(true);
+
+    environment.setActive(null);
+    expect(adapter.state().pictureInPictureActive).toBe(false);
+});
+
+it('keeps an owned exit available after request support is disabled', () => {
+    const video = createVideo(0);
+    environment.installVideo(video);
+    adapter.attach(video);
+    environment.setActive(video);
+    video.disablePictureInPicture = true;
+    adapter.refresh();
+
+    expect(adapter.capabilities().pictureInPicture).toBe(true);
+    expect(adapter.state().canPictureInPicture).toBe(true);
+
+    adapter.commands.togglePictureInPicture();
+    expect(environment.exit).toHaveBeenCalledTimes(1);
+});
+```
+
+Also add individual tests for:
+
+- missing `requestPictureInPicture` and missing `exitPictureInPicture`;
+- synchronous throws and rejected promises for request and exit;
+- pending exit serialization;
+- `loadstart`, `emptied`, and `loadedmetadata` on the same target never calling
+  exit;
+- active old target to replacement target calling exit exactly once;
+- unrelated `pictureInPictureElement` never being exited;
+- repeated detach being idempotent;
+- old target events not refreshing/mutating a new binding;
+- a stale successful ENTER cleaning up the old target if it becomes owner after
+  replacement; and
+- a stale completion never clearing the replacement target's newer pending
+  operation.
+
+For the final two regressions, use two `Deferred<PictureInPictureWindow>`
+instances and assert both `adapter.state().canPictureInPicture === false` for
+the replacement while its own request remains unresolved and
+`environment.exit` is called only when the old target is the exact owner.
+
+- [ ] **Step 3: Add failing integration assertions before production code**
+
+HTML5 shared mode:
+
+```ts
+const video = fixture.debugElement.query(By.css('video'))
+    .nativeElement as HTMLVideoElement;
+environment.installVideo(video);
+environment.setReadyState(video, 1);
+video.dispatchEvent(new Event('loadedmetadata'));
+expect(adapter.capabilities().pictureInPicture).toBe(true);
+expect(adapter.state().canPictureInPicture).toBe(true);
+```
+
+Video.js reset:
+
+```ts
+environment.installVideo(initialVideo);
+environment.setReadyState(initialVideo, 1);
+environment.setActive(initialVideo);
+
+playerHarness.currentVideo = replacementVideo;
+environment.installVideo(replacementVideo);
+environment.setReadyState(replacementVideo, 1);
+playerHarness.emit('playerreset');
+
+expect(environment.exit).toHaveBeenCalledTimes(1);
+expect(component.controlsAdapter.state().pictureInPictureActive).toBe(false);
+expect(component.controlsAdapter.capabilities().pictureInPicture).toBe(true);
+```
+
+ArtPlayer rebuild:
+
+```ts
+const firstVideo = artPlayerInstances[0].video;
+environment.installVideo(firstVideo);
+environment.setReadyState(firstVideo, 1);
+firstVideo.dispatchEvent(new Event('loadedmetadata'));
+environment.setActive(firstVideo);
+
+fixture.componentRef.setInput('channel', replacementChannel);
+fixture.detectChanges();
+
+expect(environment.exit).toHaveBeenCalledTimes(1);
+expect(component.controlsAdapter.state().pictureInPictureActive).toBe(false);
+```
+
+Preserve the existing ArtPlayer assertion that shared mode passes
+`pip: false`; legacy `art-player-setup.spec.ts` must continue asserting
+`pip: true`.
+
+- [ ] **Step 4: Run RED for focused and engine suites**
+
+Run:
+
+```bash
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/player-controls --runInBand"
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/html-video-player --runInBand"
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/vjs-player --runInBand"
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/art-player --runInBand"
+```
+
+Expected: FAIL because the web adapter still reports PiP unsupported and does
+not request/exit/rebind PiP.
+
+- [ ] **Step 5: Implement feature detection and operation identity**
+
+Add constants/types near the existing media constants:
+
+```ts
+const HAVE_METADATA = 1;
+const PICTURE_IN_PICTURE_ACTION = {
+    ENTER: 'enter',
+    EXIT: 'exit',
+} as const;
+
+type PictureInPictureAction =
+    (typeof PICTURE_IN_PICTURE_ACTION)[keyof typeof PICTURE_IN_PICTURE_ACTION];
+
+interface PictureInPictureOperation {
+    readonly action: PictureInPictureAction;
+    readonly generation: number;
+    readonly video: HTMLVideoElement;
+}
+
+interface PictureInPictureSnapshot {
+    readonly active: boolean;
+    readonly canExit: boolean;
+    readonly canRequest: boolean;
+    readonly canToggle: boolean;
+    readonly supported: boolean;
+}
+```
+
+Append exact browser events:
+
+```ts
+'enterpictureinpicture',
+'leavepictureinpicture',
+```
+
+Add fields:
+
+```ts
+private bindingGeneration = 0;
+private pictureInPictureOperation: PictureInPictureOperation | null = null;
+```
+
+Read one safe snapshot per capability/state computation:
+
+```ts
+private readPictureInPicture(
+    video: HTMLVideoElement
+): PictureInPictureSnapshot {
+    try {
+        const ownerDocument = video.ownerDocument;
+        const active = ownerDocument.pictureInPictureElement === video;
+        const canExit =
+            typeof ownerDocument.exitPictureInPicture === 'function';
+        const canRequest =
+            ownerDocument.pictureInPictureEnabled === true &&
+            typeof video.requestPictureInPicture === 'function' &&
+            canExit &&
+            video.disablePictureInPicture !== true;
+        const supported = canRequest || (active && canExit);
+        const ready = video.readyState >= HAVE_METADATA;
+        return {
+            active,
+            canExit,
+            canRequest,
+            supported,
+            canToggle:
+                this.pictureInPictureOperation === null &&
+                ((active && canExit) || (canRequest && ready)),
+        };
+    } catch {
+        return {
+            active: false,
+            canExit: false,
+            canRequest: false,
+            canToggle: false,
+            supported: false,
+        };
+    }
+}
+```
+
+Project it into the public contract:
+
+```ts
+const pictureInPicture = this.readPictureInPicture(this.video);
+
+return {
+    ...DEFAULT_PLAYER_CAPABILITIES,
+    // existing capabilities
+    pictureInPicture: pictureInPicture.supported,
+};
+```
+
+```ts
+const pictureInPicture = this.readPictureInPicture(video);
+
+return {
+    // existing state
+    pictureInPictureActive: pictureInPicture.active,
+    canPictureInPicture: pictureInPicture.canToggle,
+};
+```
+
+- [ ] **Step 6: Implement synchronous command invocation and stale cleanup**
+
+Wire the command:
+
+```ts
+togglePictureInPicture: () => this.togglePictureInPicture(),
+```
+
+Implement:
+
+```ts
+private togglePictureInPicture(): void {
+    const video = this.video;
+    if (!video || this.pictureInPictureOperation) {
+        return;
+    }
+
+    const snapshot = this.readPictureInPicture(video);
+    if (!snapshot.canToggle) {
+        return;
+    }
+
+    if (snapshot.active && snapshot.canExit) {
+        this.startPictureInPictureOperation(
+            PICTURE_IN_PICTURE_ACTION.EXIT,
+            video,
+            () => video.ownerDocument.exitPictureInPicture()
+        );
+        return;
+    }
+
+    if (snapshot.canRequest) {
+        this.startPictureInPictureOperation(
+            PICTURE_IN_PICTURE_ACTION.ENTER,
+            video,
+            () => video.requestPictureInPicture()
+        );
+    }
+}
+
+private startPictureInPictureOperation(
+    action: PictureInPictureAction,
+    video: HTMLVideoElement,
+    invoke: () => Promise<unknown>
+): void {
+    const operation: PictureInPictureOperation = {
+        action,
+        generation: this.bindingGeneration,
+        video,
+    };
+    this.pictureInPictureOperation = operation;
+    this.refresh();
+
+    let result: Promise<unknown>;
+    try {
+        result = invoke();
+    } catch {
+        this.settlePictureInPictureOperation(operation, false);
+        return;
+    }
+
+    void Promise.resolve(result).then(
+        () => this.settlePictureInPictureOperation(operation, true),
+        () => this.settlePictureInPictureOperation(operation, false)
+    );
+}
+
+private settlePictureInPictureOperation(
+    operation: PictureInPictureOperation,
+    succeeded: boolean
+): void {
+    const isCurrent =
+        this.pictureInPictureOperation === operation &&
+        this.bindingGeneration === operation.generation &&
+        this.video === operation.video;
+
+    if (isCurrent) {
+        this.pictureInPictureOperation = null;
+        this.refresh();
+        return;
+    }
+
+    if (
+        succeeded &&
+        operation.action === PICTURE_IN_PICTURE_ACTION.ENTER
+    ) {
+        this.exitPictureInPictureIfOwned(operation.video);
+    }
+}
+
+private exitPictureInPictureIfOwned(video: HTMLVideoElement): void {
+    try {
+        const ownerDocument = video.ownerDocument;
+        if (
+            ownerDocument.pictureInPictureElement !== video ||
+            typeof ownerDocument.exitPictureInPicture !== 'function'
+        ) {
+            return;
+        }
+        const result = ownerDocument.exitPictureInPicture();
+        void Promise.resolve(result).then(
+            () => undefined,
+            () => undefined
+        );
+    } catch {
+        // PiP teardown is best-effort during target replacement.
+    }
+}
+```
+
+Do not defer `invoke()` through a microtask: `requestPictureInPicture()` must be
+called synchronously inside the user click.
+
+- [ ] **Step 7: Make attach/detach generation-safe**
+
+After `this.detach()` in `attach`, capture the current generation and guard the
+event callback:
+
+```ts
+const generation = this.bindingGeneration;
+const onEvent = () => {
+    if (this.video === video && this.bindingGeneration === generation) {
+        this.refresh();
+    }
+};
+```
+
+Replace detach ordering with:
+
+```ts
+detach(): void {
+    const previousVideo = this.video;
+    this.bindingGeneration += 1;
+    this.detachFn?.();
+    this.detachFn = null;
+    this.video = null;
+    this.opts = {};
+    this.pictureInPictureOperation = null;
+    if (previousVideo) {
+        this.exitPictureInPictureIfOwned(previousVideo);
+    }
+    this.refresh();
+}
+```
+
+This cleanup must recheck exact ownership immediately before global document
+exit. It must not close another element's PiP.
+
+- [ ] **Step 8: Run GREEN for all focused and engine suites**
+
+Repeat the four commands from Step 4.
+
+Expected: PASS with no unhandled rejection warnings.
+
+- [ ] **Step 9: Commit web PiP behavior**
+
+```bash
+git add \
+  libs/ui/playback/src/lib/player-controls \
+  libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec.ts \
+  libs/ui/playback/src/lib/vjs-player/vjs-player.component.reset.spec.ts \
+  libs/ui/playback/src/lib/art-player/art-player.component.shared-controls.spec.ts
+git commit -m "feat(playback): add shared web picture-in-picture"
+```
+
+---
+
+### Task 3: Add the accessible shared PiP action and translations
+
+**Files:**
+
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/player-controls.component.spec.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/player-controls.component.ts`
+- Modify:
+  `libs/ui/playback/src/lib/player-controls/player-controls.component.html`
+- Modify all JSON files in `apps/web/src/assets/i18n/`.
+
+- [ ] **Step 1: Write failing shared-component tests**
+
+Add English fixture values:
+
+```ts
+ENTER_PICTURE_IN_PICTURE: 'Enter picture-in-picture',
+EXIT_PICTURE_IN_PICTURE: 'Exit picture-in-picture',
+```
+
+Extend the "all optional controls hidden" assertion:
+
+```ts
+expect(query('[aria-label="Enter picture-in-picture"]')).toBeNull();
+```
+
+Add separate tests:
+
+```ts
+it('disables Picture-in-Picture while the engine cannot toggle it', () => {
+    setCapabilities({ pictureInPicture: true });
+    setState({ canPictureInPicture: false });
+    fixture.detectChanges();
+
+    const button = query(
+        '[aria-label="Enter picture-in-picture"]'
+    ) as HTMLButtonElement;
+    expect(button.disabled).toBe(true);
+    expect(button.getAttribute('aria-pressed')).toBe('false');
+});
+
+it('exposes the active Picture-in-Picture state', () => {
+    setCapabilities({ pictureInPicture: true });
+    setState({
+        canPictureInPicture: true,
+        pictureInPictureActive: true,
+    });
+    fixture.detectChanges();
+
+    const button = query(
+        '[aria-label="Exit picture-in-picture"]'
+    ) as HTMLButtonElement;
+    expect(button.disabled).toBe(false);
+    expect(button.getAttribute('aria-pressed')).toBe('true');
+    expect(button.textContent?.trim()).toBe('picture_in_picture_alt');
+});
+
+it('invokes Picture-in-Picture exactly once when available', () => {
+    setCapabilities({ pictureInPicture: true });
+    setState({ canPictureInPicture: true });
+    fixture.detectChanges();
+
+    query('[aria-label="Enter picture-in-picture"]')?.click();
+
+    expect(fake.commands.togglePictureInPicture).toHaveBeenCalledTimes(1);
+});
+```
+
+- [ ] **Step 2: Run RED**
+
+Run the focused player-controls command from Task 1.
+
+Expected: FAIL because no PiP button or component command exists.
+
+- [ ] **Step 3: Implement the guarded component command**
+
+Add:
+
+```ts
+togglePictureInPicture(): void {
+    this.reveal();
+    if (
+        !this.capabilities().pictureInPicture ||
+        !this.state().canPictureInPicture
+    ) {
+        return;
+    }
+    this.controller().commands.togglePictureInPicture();
+}
+```
+
+- [ ] **Step 4: Render the action immediately before fullscreen**
+
+Add:
+
+```html
+@if (capabilities().pictureInPicture) {
+<button
+    mat-icon-button
+    type="button"
+    class="player-controls__button"
+    [disabled]="!state().canPictureInPicture"
+    [attr.aria-pressed]="state().pictureInPictureActive"
+    (click)="togglePictureInPicture()"
+    [attr.aria-label]="
+            (state().pictureInPictureActive
+                ? 'EMBEDDED_MPV.PLAYER.EXIT_PICTURE_IN_PICTURE'
+                : 'EMBEDDED_MPV.PLAYER.ENTER_PICTURE_IN_PICTURE'
+            ) | translate
+        "
+    [matTooltip]="
+            (state().pictureInPictureActive
+                ? 'EMBEDDED_MPV.PLAYER.EXIT_PICTURE_IN_PICTURE'
+                : 'EMBEDDED_MPV.PLAYER.ENTER_PICTURE_IN_PICTURE'
+            ) | translate
+        "
+    matTooltipPosition="above"
+>
+    <mat-icon
+        >{{ state().pictureInPictureActive ? 'picture_in_picture_alt' :
+        'picture_in_picture' }}</mat-icon
+    >
+</button>
+}
+```
+
+No SCSS, menu, view-model, surface, or shortcut change is needed.
+
+- [ ] **Step 5: Add localized labels to all 18 locales**
+
+Add `ENTER_PICTURE_IN_PICTURE` and `EXIT_PICTURE_IN_PICTURE` beside fullscreen
+labels using this exact value map:
+
+| Locale | Enter                                  | Exit                                    |
+| ------ | -------------------------------------- | --------------------------------------- |
+| `ar`   | `تشغيل صورة داخل صورة`                 | `إنهاء صورة داخل صورة`                  |
+| `ary`  | `شغّل صورة داخل صورة`                  | `خرج من صورة داخل صورة`                 |
+| `by`   | `Уключыць рэжым «выява ў выяве»`       | `Выйсці з рэжыму «выява ў выяве»`       |
+| `de`   | `Bild-in-Bild starten`                 | `Bild-in-Bild beenden`                  |
+| `el`   | `Έναρξη εικόνας εντός εικόνας`         | `Έξοδος από εικόνα εντός εικόνας`       |
+| `en`   | `Enter picture-in-picture`             | `Exit picture-in-picture`               |
+| `es`   | `Activar imagen en imagen`             | `Salir de imagen en imagen`             |
+| `fr`   | `Activer le mode image dans l’image`   | `Quitter le mode image dans l’image`    |
+| `it`   | `Attiva Picture-in-Picture`            | `Esci da Picture-in-Picture`            |
+| `ja`   | `ピクチャーインピクチャーを開始`       | `ピクチャーインピクチャーを終了`        |
+| `ko`   | `PIP 모드 시작`                        | `PIP 모드 종료`                         |
+| `nl`   | `Beeld-in-beeld starten`               | `Beeld-in-beeld sluiten`                |
+| `pl`   | `Włącz obraz w obrazie`                | `Wyłącz obraz w obrazie`                |
+| `pt`   | `Ativar imagem em imagem`              | `Sair de imagem em imagem`              |
+| `ru`   | `Включить режим «картинка в картинке»` | `Выйти из режима «картинка в картинке»` |
+| `tr`   | `Resim içinde resim modunu aç`         | `Resim içinde resim modundan çık`       |
+| `zh`   | `进入画中画`                           | `退出画中画`                            |
+| `zhtw` | `進入子母畫面`                         | `退出子母畫面`                          |
+
+Format and validate:
+
+```bash
+pnpm exec prettier --write apps/web/src/assets/i18n/*.json
+pnpm run i18n:check
+```
+
+Expected: every locale has zero missing/extra keys.
+
+- [ ] **Step 6: Run GREEN and commit UI/locales**
+
+Run:
+
+```bash
+pnpm nx run ui-playback:test --skip-nx-cache \
+  --command="node ./tools/testing/run-web-esm-lib-tests.mjs libs/ui/playback/src/lib/player-controls --runInBand"
+pnpm run i18n:check
+```
+
+Expected: PASS.
+
+Commit:
+
+```bash
+git add \
+  libs/ui/playback/src/lib/player-controls/player-controls.component.ts \
+  libs/ui/playback/src/lib/player-controls/player-controls.component.html \
+  libs/ui/playback/src/lib/player-controls/player-controls.component.spec.ts \
+  apps/web/src/assets/i18n
+git commit -m "feat(playback): expose shared picture-in-picture action"
+```
+
+---
+
+### Task 4: Update canonical architecture and agent guidance
+
+**Files:**
+
+- Modify: `docs/architecture/player-controls-contract.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+
+- [ ] **Step 1: Update the canonical contract**
+
+Document:
+
+- `pictureInPicture` capability;
+- `pictureInPictureActive` and `canPictureInPicture` state;
+- `togglePictureInPicture()` command;
+- standard element PiP support/readiness gating;
+- browser events as authoritative state;
+- exact ownership and target-replacement cleanup;
+- same-element source preservation;
+- Video.js Tech replacement and ArtPlayer rebuild behavior;
+- OS/browser-managed PiP controls and browser-dependent subtitles;
+- no keyboard shortcut; and
+- explicit non-support for Embedded MPV, AirPlay, Cast, and Document PiP.
+
+Update the Commands section so only fullscreen and episode navigation remain
+outside the controller contract.
+
+- [ ] **Step 2: Mirror concise behavior in both living guidance files**
+
+Add the same concise claim to `AGENTS.md` and the Shared player-controls
+paragraph in `CLAUDE.md`:
+
+```md
+Shared web controls expose standard element Picture-in-Picture through
+`WebVideoControlsAdapter` for HTML5, Video.js, and ArtPlayer when the browser
+supports it. Browser enter/leave events own active state; pending requests are
+serialized, same-element source changes preserve PiP, and adapter detach or
+Video.js/ArtPlayer video replacement exits only PiP owned by the old element.
+Embedded MPV, AirPlay, Cast, and Document PiP remain out of scope.
+```
+
+- [ ] **Step 3: Format and verify documentation**
+
+Run:
+
+```bash
+pnpm exec prettier --write \
+  docs/architecture/player-controls-contract.md \
+  AGENTS.md \
+  CLAUDE.md
+pnpm exec prettier --check \
+  docs/architecture/player-controls-contract.md \
+  docs/superpowers/specs/2026-07-17-shared-web-picture-in-picture-design.md \
+  docs/superpowers/plans/2026-07-17-shared-web-picture-in-picture.md \
+  AGENTS.md \
+  CLAUDE.md
+git diff --check
+```
+
+Expected: formatting passes and no whitespace errors.
+
+- [ ] **Step 4: Commit documentation**
+
+```bash
+git add docs/architecture/player-controls-contract.md AGENTS.md CLAUDE.md
+git commit -m "docs(playback): document shared web picture-in-picture"
+```
+
+---
+
+### Task 5: Run full validation and perform a real-runtime smoke test
+
+**Files:**
+
+- No expected source changes. If validation exposes a defect, add the closest
+  regression test first, observe RED, then fix and rerun the affected ladder.
+
+- [ ] **Step 1: Run the complete project test target**
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand
+```
+
+Expected: all `ui-playback` suites pass with zero unhandled promise warnings.
+
+- [ ] **Step 2: Run lint, translation parity, and the consuming web build**
+
+```bash
+pnpm nx lint ui-playback --skip-nx-cache
+pnpm run i18n:check
+pnpm nx build web --configuration=development --skip-nx-cache
+```
+
+Expected: all commands exit 0.
+
+- [ ] **Step 3: Audit the explicit scope exclusions**
+
+Run:
+
+```bash
+git diff origin/master -- \
+  apps/electron-backend \
+  libs/ui/playback/src/lib/embedded-mpv-player \
+  | rg -i "airplay|cast|picture.?in.?picture|popup|browserwindow" || true
+```
+
+Expected: only the Embedded MPV adapter's contract-false state/no-op and its
+unit assertion appear; no backend, native addon, popup, AirPlay, or Cast
+implementation exists.
+
+- [ ] **Step 4: Perform real Chromium/Electron smoke coverage**
+
+Use the repository's Electron CDP workflow and a playable local or test stream.
+For each HTML5, Video.js, and ArtPlayer:
+
+1. enable unified web controls in Settings;
+2. open a stream and wait for metadata;
+3. confirm the PiP button appears before fullscreen;
+4. enter PiP and confirm the OS-managed window opens;
+5. return and exit PiP;
+6. change source on a retained video and confirm PiP remains;
+7. switch/rebuild the player and confirm old owned PiP closes; and
+8. disable unified controls and confirm native/vendor PiP remains unchanged.
+
+Record any platform limitation explicitly. If the current automation
+environment cannot inspect the OS-managed window, verify the user-gesture
+request and browser enter/leave events through CDP and report the OS-window
+check as manual follow-up rather than claiming it.
+
+- [ ] **Step 5: Review the final diff against every requirement**
+
+Check:
+
+```bash
+git status --short
+git diff --check origin/master...HEAD
+git diff --stat origin/master...HEAD
+git log --oneline origin/master..HEAD
+```
+
+Requirement checklist:
+
+- HTML5, Video.js, and ArtPlayer shared controls expose PiP.
+- Unsupported/not-ready/pending states are correctly gated.
+- Active state is browser-event authoritative.
+- Target replacement and stale requests cannot orphan or cross-close PiP.
+- Embedded MPV has no PiP implementation or popup.
+- AirPlay and Cast are untouched.
+- Legacy controls paths remain unchanged.
+- Tests, lint, i18n parity, build, docs, and smoke evidence are accounted for.
+
+Expected: no missing requirement and a clean worktree.
diff --git a/docs/superpowers/plans/2026-07-17-web-player-shared-controls-setting.md b/docs/superpowers/plans/2026-07-17-web-player-shared-controls-setting.md
new file mode 100644
index 000000000..771b355c7
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-17-web-player-shared-controls-setting.md
@@ -0,0 +1,898 @@
+# Web-Player Shared Controls Setting Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Add a persisted experimental Playback checkbox that enables the existing shared controls for newly created HTML5, Video.js, and ArtPlayer sessions without restarting IPTVnator.
+
+**Architecture:** `SettingsStore` owns a default-off `webPlayerSharedControls` boolean and the Settings form exposes it only for the three web engines. `WebPlayerViewComponent` resolves the saved value into a component-scoped, immutable `WEB_PLAYER_SHARED_CONTROLS` snapshot, preserving each engine's construction-time legacy/shared split while leaving Embedded MPV and external players unchanged.
+
+**Tech Stack:** Angular standalone components and reactive forms, NgRx Signal Store, Angular DI, Angular Material, ngx-translate JSON locales, Jest/TestBed, Playwright, Nx.
+
+---
+
+## File Map
+
+### Settings contract and persistence
+
+- Modify `libs/shared/interfaces/src/lib/settings.interface.ts`
+    - Declare the optional persisted boolean.
+- Modify `libs/services/src/lib/settings-store.service.ts`
+    - Add the default, normalize stored input, and include the resolved value in
+      complete settings serialization.
+- Modify `libs/services/src/lib/settings-store.service.spec.ts`
+    - Cover missing, enabled, malformed, and persisted values.
+
+### Settings form and presentation
+
+- Modify `apps/web/src/app/settings/settings-form.utils.ts`
+    - Add the form control and form-to-settings mapping.
+- Modify `apps/web/src/app/settings/settings-playback-section.component.ts`
+    - Identify whether the selected engine is one of the three web players.
+- Modify `apps/web/src/app/settings/settings-playback-section.component.html`
+    - Render the conditional Material checkbox.
+- Modify `apps/web/src/app/settings/settings-playback-section.component.spec.ts`
+    - Cover visibility and checkbox binding.
+- Modify `apps/web/src/app/settings/settings.component.spec.ts`
+    - Keep the canonical test fixture shape current and verify hydration/save.
+- Modify all JSON files under `apps/web/src/assets/i18n/`
+    - Add the same two `SETTINGS` keys with localized values.
+
+### Playback session wiring
+
+- Modify `libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts`
+    - Provide an immutable, settings-backed controls token per player host.
+- Modify
+  `libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts`
+    - Verify enabled/disabled resolution and per-host snapshot behavior.
+
+### End-to-end coverage and documentation
+
+- Modify `apps/web-e2e/src/settings.e2e.ts`
+    - Verify browser persistence after Save and reload.
+- Modify `apps/electron-backend-e2e/src/settings.e2e.ts`
+    - Verify desktop persistence across restart and shared controls on the next
+      HTML5 playback session.
+- Modify `README.md`
+    - Mention the optional unified built-in web-player controls.
+- Modify `docs/architecture/player-controls-contract.md`
+    - Replace compile-time-only rollout language with the persisted setting and
+      per-session snapshot.
+- Modify `AGENTS.md` and `CLAUDE.md`
+    - Keep their shared-controls descriptions synchronized.
+
+## Task 1: Persist the Default-Off Settings Contract
+
+**Files:**
+
+- Modify: `libs/shared/interfaces/src/lib/settings.interface.ts`
+- Modify: `libs/services/src/lib/settings-store.service.ts`
+- Test: `libs/services/src/lib/settings-store.service.spec.ts`
+
+- [ ] **Step 1: Write failing store behavior tests**
+
+Add these cases to `libs/services/src/lib/settings-store.service.spec.ts`.
+The temporary intersections keep the red test compiling before the shared
+interface declares the field:
+
+```ts
+it('defaults shared web controls to false when the stored field is missing', async () => {
+    const store = injector.get(SettingsStore);
+
+    await store.loadSettings();
+
+    const settings = store.getSettings() as ReturnType<
+        typeof store.getSettings
+    > & {
+        webPlayerSharedControls?: unknown;
+    };
+    expect(settings.webPlayerSharedControls).toBe(false);
+});
+
+it('restores an enabled shared web controls preference', async () => {
+    storedSettings = {
+        webPlayerSharedControls: true,
+    } as Partial<Settings> & { webPlayerSharedControls: boolean };
+    const store = injector.get(SettingsStore);
+
+    await store.loadSettings();
+
+    const settings = store.getSettings() as ReturnType<
+        typeof store.getSettings
+    > & {
+        webPlayerSharedControls?: unknown;
+    };
+    expect(settings.webPlayerSharedControls).toBe(true);
+});
+
+it('normalizes a malformed shared web controls preference to false', async () => {
+    storedSettings = {
+        webPlayerSharedControls: 'enabled',
+    } as unknown as Partial<Settings>;
+    const store = injector.get(SettingsStore);
+
+    await store.loadSettings();
+
+    const settings = store.getSettings() as ReturnType<
+        typeof store.getSettings
+    > & {
+        webPlayerSharedControls?: unknown;
+    };
+    expect(settings.webPlayerSharedControls).toBe(false);
+});
+
+it('persists the resolved shared web controls preference', async () => {
+    const store = injector.get(SettingsStore);
+
+    await store.updateSettings({
+        webPlayerSharedControls: true,
+    } as Partial<Settings> & { webPlayerSharedControls: boolean });
+
+    expect(storage.set).toHaveBeenCalledWith(
+        STORE_KEY.Settings,
+        expect.objectContaining({
+            webPlayerSharedControls: true,
+        })
+    );
+});
+```
+
+- [ ] **Step 2: Run the focused store test and verify the red state**
+
+Run:
+
+```bash
+pnpm nx test services --skip-nx-cache --runInBand \
+  --testPathPatterns=settings-store.service.spec
+```
+
+Expected: FAIL because `getSettings()` omits
+`webPlayerSharedControls`, and the preference is not persisted.
+
+- [ ] **Step 3: Add the shared settings field**
+
+Add this property beside `player` in
+`libs/shared/interfaces/src/lib/settings.interface.ts`:
+
+```ts
+/**
+ * Use IPTVnator's shared controls in HTML5, Video.js, and ArtPlayer.
+ * Missing values remain off for compatibility with older saved settings.
+ */
+webPlayerSharedControls?: boolean;
+```
+
+- [ ] **Step 4: Normalize and serialize the setting**
+
+In `libs/services/src/lib/settings-store.service.ts`, add the default:
+
+```ts
+webPlayerSharedControls: false,
+```
+
+Insert it immediately after `player: VideoPlayer.VideoJs` in
+`DEFAULT_SETTINGS`. After `...storedSettings` in `loadSettings()`, override
+untrusted stored input with an exact boolean:
+
+```ts
+patchState(store, {
+    ...DEFAULT_SETTINGS,
+    ...storedSettings,
+    webPlayerSharedControls: storedSettings.webPlayerSharedControls === true,
+    dashboardRails: normalizeDashboardRailsSettings(
+        storedSettings.dashboardRails
+    ),
+});
+```
+
+Include the resolved field in `getSettings()`:
+
+```ts
+webPlayerSharedControls:
+    store.webPlayerSharedControls?.() === true,
+```
+
+Insert it immediately after `player: store.player()`.
+
+Once the interface exists, simplify the four new tests to use direct typed
+access and typed updates:
+
+```ts
+expect(store.getSettings().webPlayerSharedControls).toBe(false);
+expect(store.getSettings().webPlayerSharedControls).toBe(true);
+await store.updateSettings({ webPlayerSharedControls: true });
+```
+
+Keep the `unknown as Partial<Settings>` cast only in the malformed-value test.
+
+- [ ] **Step 5: Run contract and store tests**
+
+Run:
+
+```bash
+pnpm nx build shared-interfaces
+pnpm nx test services --skip-nx-cache --runInBand \
+  --testPathPatterns=settings-store.service.spec
+```
+
+Expected: both commands PASS; missing/malformed values resolve to `false`, and
+`true` is restored and persisted.
+
+- [ ] **Step 6: Commit the settings contract**
+
+```bash
+git add libs/shared/interfaces/src/lib/settings.interface.ts \
+  libs/services/src/lib/settings-store.service.ts \
+  libs/services/src/lib/settings-store.service.spec.ts
+git commit -m "feat(settings): persist shared web controls preference"
+```
+
+## Task 2: Add the Conditional Playback Checkbox
+
+**Files:**
+
+- Modify: `apps/web/src/app/settings/settings-form.utils.ts`
+- Modify: `apps/web/src/app/settings/settings-playback-section.component.ts`
+- Modify: `apps/web/src/app/settings/settings-playback-section.component.html`
+- Test: `apps/web/src/app/settings/settings-playback-section.component.spec.ts`
+- Test: `apps/web/src/app/settings/settings.component.spec.ts`
+- Modify: `apps/web/src/assets/i18n/ar.json`
+- Modify: `apps/web/src/assets/i18n/ary.json`
+- Modify: `apps/web/src/assets/i18n/by.json`
+- Modify: `apps/web/src/assets/i18n/de.json`
+- Modify: `apps/web/src/assets/i18n/el.json`
+- Modify: `apps/web/src/assets/i18n/en.json`
+- Modify: `apps/web/src/assets/i18n/es.json`
+- Modify: `apps/web/src/assets/i18n/fr.json`
+- Modify: `apps/web/src/assets/i18n/it.json`
+- Modify: `apps/web/src/assets/i18n/ja.json`
+- Modify: `apps/web/src/assets/i18n/ko.json`
+- Modify: `apps/web/src/assets/i18n/nl.json`
+- Modify: `apps/web/src/assets/i18n/pl.json`
+- Modify: `apps/web/src/assets/i18n/pt.json`
+- Modify: `apps/web/src/assets/i18n/ru.json`
+- Modify: `apps/web/src/assets/i18n/tr.json`
+- Modify: `apps/web/src/assets/i18n/zh.json`
+- Modify: `apps/web/src/assets/i18n/zhtw.json`
+
+- [ ] **Step 1: Write failing visibility and binding tests**
+
+Add `webPlayerSharedControls` to the local `createForm()` helper in
+`settings-playback-section.component.spec.ts`:
+
+```ts
+webPlayerSharedControls: new FormControl(false),
+```
+
+Add the following tests:
+
+```ts
+it.each([VideoPlayer.VideoJs, VideoPlayer.Html5Player, VideoPlayer.ArtPlayer])(
+    'shows shared controls for the %s web player',
+    (player) => {
+        fixture.componentRef.setInput('form', createForm(player));
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement.querySelector(
+                '[data-test-id="web-player-shared-controls-setting"]'
+            )
+        ).not.toBeNull();
+    }
+);
+
+it.each([VideoPlayer.EmbeddedMpv, VideoPlayer.MPV, VideoPlayer.VLC])(
+    'hides shared web controls for the %s player',
+    (player) => {
+        fixture.componentRef.setInput('form', createForm(player));
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement.querySelector(
+                '[data-test-id="web-player-shared-controls-setting"]'
+            )
+        ).toBeNull();
+    }
+);
+
+it('binds the shared controls checkbox to the settings form', () => {
+    const form = createForm(VideoPlayer.VideoJs);
+    form.controls['webPlayerSharedControls'].setValue(true);
+    fixture.componentRef.setInput('form', form);
+    fixture.detectChanges();
+
+    expect(
+        fixture.nativeElement.querySelector<HTMLInputElement>(
+            '[data-test-id="web-player-shared-controls-toggle"] input[type="checkbox"]'
+        )?.checked
+    ).toBe(true);
+});
+```
+
+In `settings.component.spec.ts`, add this field to `DEFAULT_SETTINGS`:
+
+```ts
+webPlayerSharedControls: false,
+```
+
+Add explicit hydration and save assertions:
+
+```ts
+it('hydrates the shared web controls preference', () => {
+    const mockStore = settingsStore as unknown as MockSettingsStore;
+    mockStore._setSettings({
+        webPlayerSharedControls: true,
+    });
+
+    component.setSettings();
+
+    expect(component.settingsForm.get('webPlayerSharedControls')?.value).toBe(
+        true
+    );
+});
+
+it('saves the shared web controls preference', async () => {
+    const mockStore = settingsStore as unknown as MockSettingsStore;
+    mockStore.updateSettings.mockResolvedValue(undefined);
+
+    component.settingsForm.get('webPlayerSharedControls')?.setValue(true);
+    component.onSubmit();
+    await fixture.whenStable();
+
+    expect(mockStore.updateSettings).toHaveBeenCalledWith(
+        expect.objectContaining({
+            webPlayerSharedControls: true,
+        })
+    );
+});
+```
+
+- [ ] **Step 2: Run focused web tests and verify the red state**
+
+Run:
+
+```bash
+pnpm nx test web --skip-nx-cache --runInBand \
+  --testPathPatterns='settings-playback-section.component.spec|settings.component.spec'
+```
+
+Expected: FAIL because the production form and Playback section do not yet
+declare or render the preference.
+
+- [ ] **Step 3: Add form hydration and serialization**
+
+In `createSettingsForm()` in
+`apps/web/src/app/settings/settings-form.utils.ts`, add:
+
+```ts
+webPlayerSharedControls: false,
+```
+
+Insert it immediately after the existing `player` control.
+
+In `createSettingsFromFormValue()`, add:
+
+```ts
+webPlayerSharedControls: value.webPlayerSharedControls ?? false,
+```
+
+Insert it immediately after the existing `player` mapping.
+
+The existing `SettingsComponent.setSettings()` `patchValue()` call then
+hydrates the checkbox without a new component-specific code path.
+
+- [ ] **Step 4: Add the selected-engine predicate and checkbox**
+
+Add this method to
+`apps/web/src/app/settings/settings-playback-section.component.ts`:
+
+```ts
+isWebPlayerSelected(): boolean {
+    const player = this.form().value.player;
+    return (
+        player === VideoPlayer.VideoJs ||
+        player === VideoPlayer.Html5Player ||
+        player === VideoPlayer.ArtPlayer
+    );
+}
+```
+
+Insert this row in
+`apps/web/src/app/settings/settings-playback-section.component.html` after the
+stream-format selector:
+
+```html
+@if (isWebPlayerSelected()) {
+<div class="setting-item" data-test-id="web-player-shared-controls-setting">
+    <div class="setting-item__meta">
+        <h4>{{ 'SETTINGS.WEB_PLAYER_SHARED_CONTROLS' | translate }}</h4>
+        <p>
+            {{ 'SETTINGS.WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION' | translate }}
+        </p>
+    </div>
+    <div class="setting-item__control setting-item__toggle">
+        <mat-checkbox
+            formControlName="webPlayerSharedControls"
+            data-test-id="web-player-shared-controls-toggle"
+        ></mat-checkbox>
+    </div>
+</div>
+}
+```
+
+- [ ] **Step 5: Run focused web tests and verify the green state**
+
+Run:
+
+```bash
+pnpm nx test web --skip-nx-cache --runInBand \
+  --testPathPatterns='settings-playback-section.component.spec|settings.component.spec'
+```
+
+Expected: PASS for all three visible web players, all three hidden non-web
+players, form hydration, and Save serialization.
+
+- [ ] **Step 6: Add exact locale values**
+
+Add `WEB_PLAYER_SHARED_CONTROLS` and
+`WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION` beside
+`VIDEO_PLAYER_DESCRIPTION` inside `SETTINGS` in all 18 locale files:
+
+| Locale | `WEB_PLAYER_SHARED_CONTROLS`                                           | `WEB_PLAYER_SHARED_CONTROLS_DESCRIPTION`                                                 |
+| ------ | ---------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
+| `en`   | Unified controls for web players (experimental)                        | Use IPTVnator's shared controls in HTML5, Video.js, and ArtPlayer.                       |
+| `ru`   | Единые элементы управления для веб-плееров (экспериментально)          | Использовать общие элементы управления IPTVnator в HTML5, Video.js и ArtPlayer.          |
+| `de`   | Einheitliche Steuerung für Web-Player (experimentell)                  | Verwendet die gemeinsamen IPTVnator-Steuerelemente in HTML5, Video.js und ArtPlayer.     |
+| `es`   | Controles unificados para reproductores web (experimental)             | Usa los controles compartidos de IPTVnator en HTML5, Video.js y ArtPlayer.               |
+| `fr`   | Commandes unifiées pour les lecteurs web (expérimental)                | Utilise les commandes partagées d’IPTVnator dans HTML5, Video.js et ArtPlayer.           |
+| `it`   | Controlli unificati per i player web (sperimentale)                    | Usa i controlli condivisi di IPTVnator in HTML5, Video.js e ArtPlayer.                   |
+| `pt`   | Controlos unificados para leitores web (experimental)                  | Usa os controlos partilhados do IPTVnator em HTML5, Video.js e ArtPlayer.                |
+| `nl`   | Uniforme bediening voor webspelers (experimenteel)                     | Gebruik de gedeelde IPTVnator-bediening in HTML5, Video.js en ArtPlayer.                 |
+| `pl`   | Ujednolicone sterowanie odtwarzaczami internetowymi (eksperymentalne)  | Używaj wspólnych elementów sterowania IPTVnator w HTML5, Video.js i ArtPlayer.           |
+| `tr`   | Web oynatıcıları için birleşik kontroller (deneysel)                   | HTML5, Video.js ve ArtPlayer'da IPTVnator'ın ortak kontrollerini kullan.                 |
+| `el`   | Ενοποιημένα στοιχεία ελέγχου για web players (πειραματικό)             | Χρησιμοποιήστε τα κοινά στοιχεία ελέγχου του IPTVnator σε HTML5, Video.js και ArtPlayer. |
+| `ja`   | Webプレーヤーの統一コントロール（試験的）                              | HTML5、Video.js、ArtPlayerでIPTVnator共通のコントロールを使用します。                    |
+| `ko`   | 웹 플레이어 통합 컨트롤(실험적)                                        | HTML5, Video.js 및 ArtPlayer에서 IPTVnator 공통 컨트롤을 사용합니다.                     |
+| `zh`   | Web 播放器统一控件（实验性）                                           | 在 HTML5、Video.js 和 ArtPlayer 中使用 IPTVnator 的共享控件。                            |
+| `zhtw` | Web 播放器統一控制項（實驗性）                                         | 在 HTML5、Video.js 和 ArtPlayer 中使用 IPTVnator 的共用控制項。                          |
+| `ar`   | عناصر تحكم موحّدة لمشغلات الويب (تجريبي)                               | استخدم عناصر التحكم المشتركة في IPTVnator مع HTML5 وVideo.js وArtPlayer.                 |
+| `ary`  | عناصر تحكم موحدة لمشغلات الويب (تجريبية)                               | استعمل عناصر التحكم المشتركة ديال IPTVnator مع HTML5 وVideo.js وArtPlayer.               |
+| `by`   | Адзіныя элементы кіравання для вэб-прайгравальнікаў (эксперыментальна) | Выкарыстоўваць агульныя элементы кіравання IPTVnator у HTML5, Video.js і ArtPlayer.      |
+
+- [ ] **Step 7: Validate locale parity and the full Settings project**
+
+Run:
+
+```bash
+pnpm run i18n:check
+pnpm nx test web --skip-nx-cache
+pnpm nx lint web --skip-nx-cache
+```
+
+Expected: all commands PASS, with no missing or extra locale keys.
+
+- [ ] **Step 8: Commit the Settings UI**
+
+```bash
+git add apps/web/src/app/settings/settings-form.utils.ts \
+  apps/web/src/app/settings/settings-playback-section.component.ts \
+  apps/web/src/app/settings/settings-playback-section.component.html \
+  apps/web/src/app/settings/settings-playback-section.component.spec.ts \
+  apps/web/src/app/settings/settings.component.spec.ts \
+  apps/web/src/assets/i18n
+git commit -m "feat(settings): expose shared web controls toggle"
+```
+
+## Task 3: Resolve an Immutable Controls Mode per Player Host
+
+**Files:**
+
+- Modify: `libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts`
+- Test:
+  `libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts`
+
+- [ ] **Step 1: Write a failing host-provider test**
+
+Update the Angular import in
+`web-player-view.component.shared-controls.spec.ts`:
+
+```ts
+import { Component, input, output, signal } from '@angular/core';
+```
+
+Import the store and rollout token:
+
+```ts
+import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
+import { WEB_PLAYER_SHARED_CONTROLS } from '../player-controls';
+```
+
+Add a mutable mock signal beside the suite variables:
+
+```ts
+const webPlayerSharedControls = signal(false);
+```
+
+Reset and provide it in `beforeEach()`:
+
+```ts
+webPlayerSharedControls.set(false);
+
+{
+    provide: SettingsStore,
+    useValue: { webPlayerSharedControls },
+},
+```
+
+Insert the provider object into the existing TestBed `providers` array.
+
+Add this test:
+
+```ts
+it('snapshots the saved shared-controls mode for each player host', () => {
+    webPlayerSharedControls.set(true);
+    fixture.detectChanges();
+
+    expect(fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)).toBe(
+        true
+    );
+
+    webPlayerSharedControls.set(false);
+    expect(fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)).toBe(
+        true
+    );
+
+    fixture.destroy();
+    fixture = TestBed.createComponent(WebPlayerViewComponent);
+    component = fixture.componentInstance;
+    fixture.componentRef.setInput(
+        'streamUrl',
+        'https://example.com/new-session.ts'
+    );
+    fixture.detectChanges();
+
+    expect(fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)).toBe(
+        false
+    );
+});
+```
+
+This proves both required properties: Save affects the next host, and an
+existing host does not mix construction modes.
+
+- [ ] **Step 2: Run the host test and verify the red state**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns=web-player-view.component.shared-controls
+```
+
+Expected: FAIL because the root token still resolves the compile-time `false`
+constant instead of the `SettingsStore` signal.
+
+- [ ] **Step 3: Add the component-scoped token provider**
+
+Update the services import in
+`libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts`:
+
+```ts
+import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
+```
+
+Import the rollout symbols:
+
+```ts
+import {
+    WEB_PLAYER_SHARED_CONTROLS,
+    WEB_PLAYER_SHARED_CONTROLS_ENABLED,
+} from '../player-controls';
+```
+
+Add a focused factory before the component decorator:
+
+```ts
+function resolveWebPlayerSharedControls(): boolean {
+    const storedValue = inject(SettingsStore).webPlayerSharedControls?.();
+
+    return typeof storedValue === 'boolean'
+        ? storedValue
+        : WEB_PLAYER_SHARED_CONTROLS_ENABLED;
+}
+```
+
+Add the component-scoped provider:
+
+```ts
+providers: [
+    {
+        provide: WEB_PLAYER_SHARED_CONTROLS,
+        useFactory: resolveWebPlayerSharedControls,
+    },
+],
+```
+
+Insert this property into the existing `@Component` metadata.
+
+Angular creates and caches this primitive in the `WebPlayerViewComponent`
+element injector. HTML5, Video.js, and ArtPlayer descendants receive one
+immutable value for their shared construction-time branch. Embedded MPV does
+not inject this token and therefore remains engine-driven.
+
+- [ ] **Step 4: Run focused and complete playback tests**
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand \
+  --testPathPatterns='web-player-view.component|web-player-controls.flag'
+pnpm nx test ui-playback --skip-nx-cache
+pnpm nx lint ui-playback --skip-nx-cache
+```
+
+Expected: all commands PASS. Existing engine suites continue to prove that
+flag-off preserves vendor controls and flag-on mounts exactly one shared UI.
+
+- [ ] **Step 5: Commit the playback wiring**
+
+```bash
+git add libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts \
+  libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts
+git commit -m "feat(playback): resolve shared controls from settings"
+```
+
+## Task 4: Prove Persistence and Next-Session Activation End to End
+
+**Files:**
+
+- Modify: `apps/web-e2e/src/settings.e2e.ts`
+- Modify: `apps/electron-backend-e2e/src/settings.e2e.ts`
+
+- [ ] **Step 1: Add browser Save/reload persistence coverage**
+
+Add this test to `apps/web-e2e/src/settings.e2e.ts`:
+
+```ts
+test('@settings @web Enable shared web player controls', async ({ page }) => {
+    await openSettings(page);
+
+    const setting = page.locator(
+        '[data-test-id="web-player-shared-controls-setting"]'
+    );
+    const checkbox = setting.locator('input[type="checkbox"]');
+
+    await expect(setting).toBeVisible();
+    await expect(checkbox).not.toBeChecked();
+    await checkbox.check();
+    await saveSettings(page);
+
+    await page.reload();
+    await openSettings(page);
+
+    await expect(checkbox).toBeChecked();
+});
+```
+
+- [ ] **Step 2: Extend the Electron restart-persistence test**
+
+In the existing
+`persists changed desktop settings across app restart` test, immediately after
+selecting `html5`, enable the new checkbox:
+
+```ts
+const sharedControlsCheckbox = firstLaunch.mainWindow
+    .getByTestId('web-player-shared-controls-setting')
+    .locator('input[type="checkbox"]');
+await expect(sharedControlsCheckbox).toBeVisible();
+await sharedControlsCheckbox.check();
+```
+
+After the second launch confirms that HTML5 is selected, assert:
+
+```ts
+await expect(
+    secondLaunch.mainWindow
+        .getByTestId('web-player-shared-controls-setting')
+        .locator('input[type="checkbox"]')
+).toBeChecked();
+```
+
+- [ ] **Step 3: Add a desktop next-session playback smoke test**
+
+Add this test to `apps/electron-backend-e2e/src/settings.e2e.ts`:
+
+```ts
+test('@settings @playback @electron applies shared controls to the next HTML5 session', async ({
+    dataDir,
+}) => {
+    const app = await launchElectronApp(dataDir);
+
+    try {
+        await openSettings(app.mainWindow);
+        await selectSettingsOption(
+            app.mainWindow,
+            'select-video-player',
+            'html5'
+        );
+        await app.mainWindow
+            .getByTestId('web-player-shared-controls-setting')
+            .locator('input[type="checkbox"]')
+            .check();
+        await saveSettings(app.mainWindow);
+
+        await goToDashboard(app.mainWindow);
+        await importM3uPlaylistFromNativeDialog(app, m3uFixturePath);
+        await app.mainWindow.waitForURL(/\/workspace\/playlists\/.+/);
+
+        const firstChannel = channelItemByTitle(
+            app.mainWindow,
+            'Channel 1'
+        ).first();
+        await expect(firstChannel).toBeVisible({ timeout: 20000 });
+        await firstChannel.click();
+
+        await expect(
+            app.mainWindow.locator('app-html-video-player app-player-controls')
+        ).toBeVisible();
+        await expect(
+            app.mainWindow.locator('app-html-video-player video[controls]')
+        ).toHaveCount(0);
+    } finally {
+        await closeElectronApp(app);
+    }
+});
+```
+
+- [ ] **Step 4: Run atomized web and Electron settings E2E**
+
+Run:
+
+```bash
+pnpm nx run web-e2e:e2e-ci--src/settings.e2e.ts
+pnpm nx run electron-backend-e2e:e2e-ci--src/settings.e2e.ts
+```
+
+Expected: both targets PASS. Browser settings survive reload, desktop settings
+survive a full app restart, and the first HTML5 session after Save renders
+`app-player-controls` without native video controls.
+
+- [ ] **Step 5: Commit E2E coverage**
+
+```bash
+git add apps/web-e2e/src/settings.e2e.ts \
+  apps/electron-backend-e2e/src/settings.e2e.ts
+git commit -m "test(playback): cover shared controls setting"
+```
+
+## Task 5: Update Canonical Documentation and Run the Validation Ladder
+
+**Files:**
+
+- Modify: `README.md`
+- Modify: `docs/architecture/player-controls-contract.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+
+- [ ] **Step 1: Update the top-level Playback feature list**
+
+Add this bullet under `README.md` → `Features` → `Playback`:
+
+```md
+- Optional unified IPTVnator controls for HTML5, Video.js, and ArtPlayer, enabled in **Settings → Playback** _(experimental)_
+```
+
+- [ ] **Step 2: Update the canonical controls contract**
+
+In `docs/architecture/player-controls-contract.md`:
+
+1. Replace “a default-off web rollout token” in the current-status list with:
+
+```md
+- a persisted, default-off web-player preference resolved through an immutable
+  per-host rollout token;
+```
+
+2. Replace the compile-time-only current-status paragraph with:
+
+```md
+`Settings.webPlayerSharedControls` remains default-off. `WebPlayerViewComponent`
+snapshots it into `WEB_PLAYER_SHARED_CONTROLS` when a new player host is
+created, so HTML5, Video.js, and ArtPlayer switch atomically without an
+application restart. Existing sessions never change controls mode in place.
+```
+
+3. Replace the rollout-symbol table rows with:
+
+```md
+| Symbol / setting                     |          Default | Current effect                                                          |
+| ------------------------------------ | ---------------: | ----------------------------------------------------------------------- |
+| `Settings.webPlayerSharedControls`   |          `false` | Persisted experimental opt-in shown for HTML5, Video.js, and ArtPlayer. |
+| `WEB_PLAYER_SHARED_CONTROLS_ENABLED` |          `false` | Default-off fallback for direct component use and focused tests.        |
+| `WEB_PLAYER_SHARED_CONTROLS`         | session snapshot | Component-scoped immutable value consumed by the three web engines.     |
+```
+
+4. State next to the Embedded MPV section:
+
+```md
+The web-player preference does not affect Embedded MPV. Frame-copy always uses
+the shared DOM controls, while native-view keeps its compositor-safe legacy
+dock.
+```
+
+- [ ] **Step 3: Keep agent documentation synchronized**
+
+In both `AGENTS.md` and `CLAUDE.md`, update the shared-player-controls
+description to include these exact facts:
+
+```md
+- The persisted `Settings.webPlayerSharedControls` preference is default-off
+  and appears only when HTML5, Video.js, or ArtPlayer is selected.
+- `WebPlayerViewComponent` snapshots the preference into the component-scoped
+  `WEB_PLAYER_SHARED_CONTROLS` token for each new host; an existing session
+  never changes controls mode in place.
+- Embedded MPV ignores this preference: frame-copy always uses shared controls,
+  native-view retains the legacy dock, and external MPV/VLC own their UI.
+```
+
+Preserve the existing engine lifecycle details around these sentences.
+
+- [ ] **Step 4: Format and inspect documentation**
+
+Run:
+
+```bash
+pnpm exec prettier --write README.md \
+  docs/architecture/player-controls-contract.md AGENTS.md CLAUDE.md
+git diff --check
+```
+
+Expected: Prettier completes successfully and `git diff --check` prints no
+errors.
+
+- [ ] **Step 5: Run the complete regression ladder**
+
+Run:
+
+```bash
+pnpm nx build shared-interfaces --skip-nx-cache
+pnpm nx test services --skip-nx-cache
+pnpm nx test web --skip-nx-cache
+pnpm nx test ui-playback --skip-nx-cache
+pnpm nx run-many --target=lint \
+  --projects=shared-interfaces,services,web,ui-playback,web-e2e,electron-backend-e2e \
+  --skip-nx-cache
+pnpm run typecheck:web
+pnpm run i18n:check
+pnpm nx build web --configuration=production --skip-nx-cache
+pnpm nx run web-e2e:e2e-ci--src/settings.e2e.ts
+pnpm nx run electron-backend-e2e:e2e-ci--src/settings.e2e.ts
+git diff --check
+```
+
+Expected: every command exits `0`. Record command results in the final handoff;
+if a platform-dependent Electron E2E cannot run, report the exact environment
+constraint and the strongest completed substitute instead of claiming it
+passed.
+
+- [ ] **Step 6: Review the final diff against the approved design**
+
+Confirm all of the following before committing:
+
+- Default and malformed stored values resolve to `false`.
+- Only HTML5, Video.js, and ArtPlayer expose the checkbox.
+- Save affects the next player host without an app restart.
+- One host receives one immutable boolean mode.
+- Frame-copy Embedded MPV still always uses shared controls.
+- Native-view Embedded MPV and external MPV/VLC remain unchanged.
+- All 18 locales contain both keys.
+- Unit, lint, typecheck, build, web E2E, and Electron E2E results are recorded.
+- `README.md`, `docs/architecture/player-controls-contract.md`, `AGENTS.md`,
+  and `CLAUDE.md` describe the shipped behavior consistently.
+
+- [ ] **Step 7: Commit documentation and final integration**
+
+```bash
+git add README.md docs/architecture/player-controls-contract.md \
+  AGENTS.md CLAUDE.md
+git commit -m "docs(playback): document shared controls preference"
+```
diff --git a/docs/superpowers/plans/2026-07-18-flatpak-zypak-launcher.md b/docs/superpowers/plans/2026-07-18-flatpak-zypak-launcher.md
new file mode 100644
index 000000000..bfb47f0af
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-18-flatpak-zypak-launcher.md
@@ -0,0 +1,738 @@
+# Flatpak Zypak Launcher Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use
+> superpowers:subagent-driven-development (recommended) or
+> superpowers:executing-plans to implement this plan task-by-task. Steps use
+> checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Keep the Flatpak `iptvnator` entry as the real Electron ELF so
+Electron Builder passes it directly to Zypak, while preserving the existing
+Linux sandbox wrapper for every other package target.
+
+**Architecture:** A small CommonJS launcher-layout contract resolves the
+Electron binary name from normalized target names and rejects mixed Flatpak
+passes. The afterPack hook, unpacked-layout validators, final-artifact
+validator, and CI all consume the same target-dependent contract.
+
+**Tech Stack:** Node.js CommonJS/ESM, `node:test`, Nx packaging targets,
+Electron Builder 26, Flatpak/Zypak, GitHub Actions.
+
+---
+
+### Task 1: Add the shared launcher contract and fix afterPack
+
+**Files:**
+
+- Create: `tools/packaging/linux-launcher-layout.cjs`
+- Create: `tools/packaging/linux-after-pack.test.mjs`
+- Modify: `tools/packaging/linux-after-pack.cjs`
+- Modify: `tools/packaging/electron-after-pack.cjs`
+- Modify: `tools/packaging/project.json`
+
+- [ ] **Step 1: Write the failing isolated-Flatpak hook test**
+
+Create a temporary executable with ELF magic, call the real hook, and assert
+that Flatpak retains the exact original file:
+
+```js
+test('preserves the Electron ELF for an isolated Flatpak target', async (t) => {
+    const fixture = createLauncherFixture();
+    t.after(() => fs.rmSync(fixture.root, { recursive: true, force: true }));
+
+    await linuxAfterPack(createAfterPackParams(fixture.appOutDir, ['flatpak']));
+
+    assert.deepEqual(
+        fs.readFileSync(fixture.executablePath),
+        fixture.executableBytes
+    );
+    assert.equal(fs.existsSync(`${fixture.executablePath}.bin`), false);
+});
+```
+
+- [ ] **Step 2: Run the test and verify RED**
+
+Run:
+
+```bash
+node --test tools/packaging/linux-after-pack.test.mjs
+```
+
+Expected: FAIL because the current hook replaces `iptvnator` with a Bash
+script and creates `iptvnator.bin`.
+
+- [ ] **Step 3: Add the pure launcher-layout resolver**
+
+Implement a strict resolver with this public contract:
+
+```js
+function resolveLinuxLauncherLayout(targets, executableName = 'iptvnator') {
+    if (!Array.isArray(targets) || targets.length === 0) {
+        throw new Error(
+            'Linux launcher layout requires at least one Electron Builder target.'
+        );
+    }
+
+    const targetNames = targets.map((target) => {
+        const value = typeof target === 'string' ? target : target?.name;
+        const name = String(value ?? '')
+            .trim()
+            .toLowerCase();
+        if (!name) {
+            throw new Error(
+                'Linux launcher targets must expose a non-empty name.'
+            );
+        }
+        return name;
+    });
+
+    if (new Set(targetNames).size !== targetNames.length) {
+        throw new Error('Linux launcher targets must be unique.');
+    }
+
+    const flatpak = targetNames.includes('flatpak');
+    if (flatpak && targetNames.length !== 1) {
+        throw new Error(
+            'Flatpak must be packaged in an isolated Electron Builder pass so Zypak receives the Electron ELF directly.'
+        );
+    }
+
+    return {
+        targetNames,
+        electronBinaryName: flatpak ? executableName : `${executableName}.bin`,
+        wrapperRequired: !flatpak,
+    };
+}
+```
+
+Export `resolveLinuxLauncherLayout`.
+
+- [ ] **Step 4: Make the Linux hook preserve isolated Flatpak**
+
+Resolve the layout before any filesystem mutation. For Flatpak, log that the
+ELF is preserved and return. For other targets, rename to the resolved
+`electronBinaryName` and create the unchanged sandbox wrapper:
+
+```js
+async function afterPackHook(params, { targetNames = params.targets } = {}) {
+    if (params.electronPlatformName !== 'linux') {
+        return;
+    }
+
+    const layout = resolveLinuxLauncherLayout(
+        targetNames,
+        params.packager.executableName
+    );
+    if (!layout.wrapperRequired) {
+        log('preserving Flatpak Electron ELF for direct Zypak launch');
+        return;
+    }
+
+    const executable = path.join(
+        params.appOutDir,
+        params.packager.executableName
+    );
+    const electronBinary = path.join(
+        params.appOutDir,
+        layout.electronBinaryName
+    );
+
+    try {
+        await fs.rename(executable, electronBinary);
+        await fs.writeFile(
+            executable,
+            createLoaderScript({
+                executableName: params.packager.executableName,
+                productName: params.packager.appInfo.productName,
+            })
+        );
+        await fs.chmod(executable, 0o755);
+    } catch (error) {
+        log(`failed to create launcher wrapper: ${error.message}`);
+        throw new Error('Failed to create launcher wrapper');
+    }
+
+    log('Linux launcher sandbox fix applied');
+}
+```
+
+Pass `linuxPackagingContext?.targetNames` from `electron-after-pack.cjs` so
+the hook consumes the already validated afterPack target names:
+
+```js
+await linuxAfterPack(params, {
+    targetNames: linuxPackagingContext?.targetNames,
+});
+```
+
+- [ ] **Step 5: Add non-Flatpak and mixed-target regression cases**
+
+Use the real hook to prove:
+
+```js
+test('keeps the sandbox wrapper for non-Flatpak targets', async (t) => {
+    for (const targetName of ['appimage', 'deb', 'rpm', 'pacman', 'snap']) {
+        const fixture = createLauncherFixture();
+        t.after(() =>
+            fs.rmSync(fixture.root, { recursive: true, force: true })
+        );
+        await linuxAfterPack(
+            createAfterPackParams(fixture.appOutDir, [targetName])
+        );
+        assert.deepEqual(
+            fs.readFileSync(`${fixture.executablePath}.bin`),
+            fixture.executableBytes
+        );
+        assert.match(
+            fs.readFileSync(fixture.executablePath, 'utf8'),
+            /exec "\$SCRIPT_DIR\/iptvnator\.bin"/
+        );
+    }
+});
+
+test('rejects a mixed Flatpak pass before mutating the executable', async (t) => {
+    const fixture = createLauncherFixture();
+    t.after(() => fs.rmSync(fixture.root, { recursive: true, force: true }));
+    await assert.rejects(
+        linuxAfterPack(
+            createAfterPackParams(fixture.appOutDir, ['flatpak', 'appimage'])
+        ),
+        /Flatpak must be packaged in an isolated Electron Builder pass/
+    );
+    assert.deepEqual(
+        fs.readFileSync(fixture.executablePath),
+        fixture.executableBytes
+    );
+    assert.equal(fs.existsSync(`${fixture.executablePath}.bin`), false);
+});
+```
+
+- [ ] **Step 6: Register and run the focused test**
+
+Add `linux-after-pack.test.mjs` to the explicit `packaging:test` command and
+inputs in `tools/packaging/project.json`.
+
+Run:
+
+```bash
+node --test tools/packaging/linux-after-pack.test.mjs
+```
+
+Expected: all launcher tests PASS.
+
+- [ ] **Step 7: Commit Task 1**
+
+```bash
+git add tools/packaging/linux-launcher-layout.cjs \
+  tools/packaging/linux-after-pack.cjs \
+  tools/packaging/linux-after-pack.test.mjs \
+  tools/packaging/electron-after-pack.cjs \
+  tools/packaging/project.json
+git commit -m "fix(packaging): preserve Flatpak Electron ELF"
+```
+
+### Task 2: Make unpacked-layout validation target-aware
+
+**Files:**
+
+- Modify: `tools/packaging/embedded-mpv-packaging.cjs`
+- Modify: `tools/packaging/embedded-mpv-arch.test.mjs`
+- Modify: `tools/packaging/verify-electron-package-layout.mjs`
+- Modify: `tools/packaging/electron-package-identity.test.mjs`
+
+- [ ] **Step 1: Change the Flatpak fixture and verify RED**
+
+In `prepares portable and Flatpak manifests with the exact bundled closure`,
+rename only the Flatpak fixture's Electron binary:
+
+```js
+fs.renameSync(
+    join(flatpak.appOutDir, 'iptvnator.bin'),
+    join(flatpak.appOutDir, 'iptvnator')
+);
+```
+
+Teach the test ELF inspector about both legitimate basenames:
+
+```js
+['iptvnator', { needed: ['libc.so.6'], rpath: [], runpath: [] }],
+['iptvnator.bin', { needed: ['libc.so.6'], rpath: [], runpath: [] }],
+```
+
+Run:
+
+```bash
+node --test --test-name-pattern='prepares portable and Flatpak manifests' \
+  tools/packaging/embedded-mpv-arch.test.mjs
+```
+
+Expected: FAIL with a missing `iptvnator.bin` validation error.
+
+- [ ] **Step 2: Resolve the pristine Electron ELF through the shared contract**
+
+Require `resolveLinuxLauncherLayout` in
+`embedded-mpv-packaging.cjs`. In `inspectLinuxElfIsolation`, resolve from
+`options.targetNames` and use its `electronBinaryName`:
+
+```js
+let launcherLayout;
+try {
+    launcherLayout = resolveLinuxLauncherLayout(
+        options.targetNames,
+        options.executableName ?? 'iptvnator'
+    );
+} catch (error) {
+    errors.push(
+        `Unable to resolve Linux launcher layout: ${
+            error instanceof Error ? error.message : String(error)
+        }`
+    );
+    return;
+}
+
+const inspectedPaths = {
+    electron: path.join(
+        path.dirname(resourceDir),
+        launcherLayout.electronBinaryName
+    ),
+    addon: path.join(nativeDir, linuxFrameCopyArtifacts.addon.name),
+    reader: path.join(nativeDir, linuxFrameCopyArtifacts.frameReader.name),
+    helper: path.join(nativeDir, linuxFrameCopyArtifacts.helper.name),
+};
+for (const [index, libraryPath] of listElectronShippedLinuxLibraries(
+    resourceDir,
+    { artifactFormat: options.artifactFormat }
+).entries()) {
+    inspectedPaths[`electronLibrary:${index}`] = libraryPath;
+}
+```
+
+Pass the normalized `targetNames` already calculated by
+`validateLinuxPackagedEmbeddedMpv` into the inspection options.
+
+- [ ] **Step 3: Make the general package-layout verifier profile-aware**
+
+Require the same resolver in `verify-electron-package-layout.mjs`, change
+`verifyLinuxLauncher` to accept `targetNames`, and call it with
+`linuxTargetNames`.
+
+For Flatpak:
+
+```js
+if (!layout.wrapperRequired) {
+    if (fileExists(`${launcherPath}.bin`)) {
+        errors.push(
+            `Flatpak must not contain the Linux sandbox wrapper binary: ${launcherPath}.bin`
+        );
+    }
+    if (!fileHasElfMagic(launcherPath)) {
+        errors.push(
+            `Flatpak launcher target must be an ELF executable: ${launcherPath}`
+        );
+    }
+    return;
+}
+
+const launcherBinaryPath = path.join(appDir, layout.electronBinaryName);
+if (!fileExists(launcherBinaryPath)) {
+    errors.push(
+        `Missing Linux launcher binary in ${appDir}: ${path.basename(launcherBinaryPath)}`
+    );
+    return;
+}
+if (!fileExists(launcherPath)) {
+    errors.push(
+        `Missing Linux launcher wrapper in ${appDir}: ${path.basename(launcherPath)}`
+    );
+    return;
+}
+
+const launcherScript = fs.readFileSync(launcherPath, 'utf8');
+const requiredMarkers = [
+    'SCRIPT_PATH="${BASH_SOURCE[0]}"',
+    'readlink -f "$SCRIPT_PATH"',
+    `exec "$SCRIPT_DIR/${linuxExecutableName}.bin"`,
+];
+const missingMarkers = requiredMarkers.filter(
+    (marker) => !launcherScript.includes(marker)
+);
+if (missingMarkers.length > 0) {
+    errors.push(
+        [
+            `Linux launcher wrapper is missing symlink-safe logic in ${launcherPath}.`,
+            'Missing markers:',
+            ...missingMarkers.map((marker) => `- ${marker}`),
+        ].join('\n')
+    );
+}
+```
+
+Implement `fileHasElfMagic` with one four-byte `fs.readSync` call and always
+close the descriptor:
+
+```js
+function fileHasElfMagic(filePath) {
+    const descriptor = fs.openSync(filePath, 'r');
+    try {
+        const magic = Buffer.alloc(4);
+        return (
+            fs.readSync(descriptor, magic, 0, magic.length, 0) ===
+                magic.length &&
+            magic.equals(Buffer.from([0x7f, 0x45, 0x4c, 0x46]))
+        );
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+```
+
+- [ ] **Step 4: Extend the package-identity source contract test**
+
+Assert that the general verifier imports the shared resolver, calls
+`verifyLinuxLauncher(resourceDir, linuxTargetNames, errors)`, checks ELF magic,
+and does not unconditionally set `launcherBinaryPath` before resolving target
+layout.
+
+- [ ] **Step 5: Run targeted validation**
+
+```bash
+node --test --test-name-pattern='prepares portable and Flatpak manifests' \
+  tools/packaging/embedded-mpv-arch.test.mjs
+node --test --test-name-pattern='package layout verifier uses' \
+  tools/packaging/electron-package-identity.test.mjs
+```
+
+Expected: both commands PASS.
+
+- [ ] **Step 6: Commit Task 2**
+
+```bash
+git add tools/packaging/embedded-mpv-packaging.cjs \
+  tools/packaging/embedded-mpv-arch.test.mjs \
+  tools/packaging/verify-electron-package-layout.mjs \
+  tools/packaging/electron-package-identity.test.mjs
+git commit -m "fix(packaging): validate Flatpak launcher ELF"
+```
+
+### Task 3: Update final-artifact verification, CI, and documentation
+
+**Files:**
+
+- Modify: `tools/packaging/verify-linux-frame-copy-runtime.mjs`
+- Modify: `tools/packaging/verify-linux-frame-copy-runtime.test.mjs`
+- Modify: `.github/workflows/build-and-make.yaml`
+- Modify: `tools/packaging/configure-linux-frame-copy-build.test.mjs`
+- Modify: `docs/architecture/embedded-mpv-native.md`
+- Modify: `tools/embedded-mpv/README.md`
+- Modify: `docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md`
+- Modify: `AGENTS.md`
+- Modify: `CLAUDE.md`
+
+- [ ] **Step 1: Add a failing extracted-Flatpak regression**
+
+Allow the fixture helper to select the Electron filename:
+
+```js
+function createSystemPayload({
+    architecture = 'x64',
+    electronBinaryName = 'iptvnator.bin',
+} = {}) {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-layout-')
+    );
+    const appDir = path.join(root, 'opt', 'IPTVnator');
+    const resourceDir = path.join(appDir, 'resources');
+    const nativeDir = path.join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(nativeDir, { recursive: true });
+    fs.writeFileSync(
+        path.join(appDir, electronBinaryName),
+        elfHeader(architecture)
+    );
+
+    if (architecture === 'x64') {
+        fs.writeFileSync(path.join(nativeDir, 'embedded_mpv.node'), 'addon', {
+            mode: 0o644,
+        });
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded_mpv_frame_reader.node'),
+            'reader',
+            { mode: 0o644 }
+        );
+        fs.writeFileSync(
+            path.join(nativeDir, 'iptvnator_mpv_helper'),
+            'helper',
+            { mode: 0o755 }
+        );
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded-mpv-runtime.json'),
+            `${JSON.stringify(SYSTEM_MANIFEST, null, 2)}\n`,
+            { mode: 0o644 }
+        );
+    } else {
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded-mpv-unavailable.txt'),
+            `Unavailable for ${architecture}\n`
+        );
+    }
+
+    return { root, appDir, resourceDir, nativeDir };
+}
+```
+
+Use a foreign-architecture marker fixture so this test isolates launcher
+selection without needing a bundled x64 manifest:
+
+```js
+test('validates a marker-only Flatpak with an unwrapped Electron ELF', () => {
+    const fixture = createSystemPayload({
+        architecture: 'arm64',
+        electronBinaryName: 'iptvnator',
+    });
+    try {
+        assert.deepEqual(
+            verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'flatpak',
+                profileName: 'flatpak',
+                packageDependencies: [],
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    assert.fail(
+                        'foreign Flatpak must not run the helper probe'
+                    );
+                },
+            }),
+            []
+        );
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+```
+
+Run:
+
+```bash
+node --test --test-name-pattern='marker-only Flatpak with an unwrapped' \
+  tools/packaging/verify-linux-frame-copy-runtime.test.mjs
+```
+
+Expected: FAIL because the verifier reads `iptvnator.bin`.
+
+- [ ] **Step 2: Resolve every final-artifact Electron path consistently**
+
+Require `resolveLinuxLauncherLayout` and add:
+
+```js
+function resolveElectronBinaryPath(resourceDir, artifactFormat) {
+    const layout = resolveLinuxLauncherLayout([artifactFormat]);
+    return path.join(path.dirname(resourceDir), layout.electronBinaryName);
+}
+```
+
+Use it in:
+
+- `validateElectronIsolation`;
+- `verifyExtractedLinuxFrameCopyRuntime` architecture detection;
+- the architecture returned from `verifyLinuxFrameCopyArtifact`.
+
+Keep Snap/AppImage/DEB/RPM/Pacman expectations on `iptvnator.bin`.
+
+- [ ] **Step 3: Add an outer artifact-verifier Flatpak regression**
+
+Create a temporary `.flatpak` file, inject an extractor that writes
+`iptvnator` ELF and the marker-only native directory under its supplied
+destination, and assert:
+
+```js
+assert.deepEqual(
+    verifyLinuxFrameCopyArtifact({
+        artifactPath,
+        profileName: 'flatpak',
+        extractArtifact({ destination }) {
+            const appDir = path.join(
+                destination,
+                'files',
+                'lib',
+                'com.fourgray.iptvnator'
+            );
+            const resourceDir = path.join(appDir, 'resources');
+            const nativeDir = path.join(
+                resourceDir,
+                'app.asar.unpacked',
+                'electron-backend',
+                'native'
+            );
+            fs.mkdirSync(nativeDir, { recursive: true });
+            fs.writeFileSync(
+                path.join(appDir, 'iptvnator'),
+                elfHeader('arm64')
+            );
+            fs.writeFileSync(
+                path.join(nativeDir, 'embedded-mpv-unavailable.txt'),
+                'Unavailable for arm64\n'
+            );
+            return destination;
+        },
+        metadataReader: () => ({
+            declaredArch: 'arm64',
+            dependencies: [],
+        }),
+        elfInspector: validElfInspector,
+        probeRunner() {
+            assert.fail('foreign Flatpak must not probe');
+        },
+    }),
+    {
+        artifactPath: path.resolve(artifactPath),
+        format: 'flatpak',
+        profileName: 'flatpak',
+        architecture: 'arm64',
+    }
+);
+```
+
+- [ ] **Step 4: Invert the installed-Flatpak CI layout assertion**
+
+Inside the existing sandbox shell check:
+
+```bash
+LAUNCHER_PATH="$(readlink -f /app/bin/iptvnator)"
+test -f "${LAUNCHER_PATH}"
+test ! -e "${LAUNCHER_PATH}.bin"
+ELF_MAGIC="$(od -An -tx1 -N4 "${LAUNCHER_PATH}" | tr -d "[:space:]")"
+test "${ELF_MAGIC}" = "7f454c46"
+```
+
+Capture the application-level probe output and fail on the historical Zypak
+diagnostics:
+
+```bash
+PROBE_OUTPUT="$(
+    xvfb-run -a dbus-run-session -- flatpak run \
+        --env=LIBGL_ALWAYS_SOFTWARE=1 \
+        com.fourgray.iptvnator \
+        --embedded-mpv-runtime-probe 2>&1
+)"
+printf '%s\n' "${PROBE_OUTPUT}"
+if printf '%s\n' "${PROBE_OUTPUT}" |
+    grep -Eq 'not an ELF file|Zypak needs to be called directly'; then
+    echo "::error::Flatpak launched a wrapper instead of the Electron ELF."
+    exit 1
+fi
+```
+
+Update `configure-linux-frame-copy-build.test.mjs` to require the ELF magic
+check, `.bin` rejection, warning guard, and absence of the old wrapper-marker
+greps.
+
+- [ ] **Step 5: Update canonical launcher documentation**
+
+Document the exact invariant in all listed documentation:
+
+```text
+Flatpak is an isolated packaging pass and keeps `iptvnator` as the real
+Electron ELF so Electron Builder's `electron-wrapper` passes it directly to
+Zypak. Other Linux targets retain the conditional `iptvnator` wrapper and
+`iptvnator.bin`. Mixed Flatpak/non-Flatpak target sets fail before mutation.
+```
+
+In the earlier frame-copy design, replace the unconditional
+`Electron executable (iptvnator.bin)` wording with
+`iptvnator for Flatpak; iptvnator.bin for other Linux targets`.
+
+- [ ] **Step 6: Run targeted tests and formatting**
+
+```bash
+node --test --test-name-pattern='Flatpak|Linux CI verifies' \
+  tools/packaging/verify-linux-frame-copy-runtime.test.mjs \
+  tools/packaging/configure-linux-frame-copy-build.test.mjs
+pnpm prettier --check \
+  tools/packaging/verify-linux-frame-copy-runtime.mjs \
+  tools/packaging/verify-linux-frame-copy-runtime.test.mjs \
+  tools/packaging/configure-linux-frame-copy-build.test.mjs \
+  .github/workflows/build-and-make.yaml \
+  docs/architecture/embedded-mpv-native.md \
+  tools/embedded-mpv/README.md \
+  docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md \
+  AGENTS.md CLAUDE.md
+```
+
+Expected: tests and formatting PASS.
+
+- [ ] **Step 7: Commit Task 3**
+
+```bash
+git add tools/packaging/verify-linux-frame-copy-runtime.mjs \
+  tools/packaging/verify-linux-frame-copy-runtime.test.mjs \
+  .github/workflows/build-and-make.yaml \
+  tools/packaging/configure-linux-frame-copy-build.test.mjs \
+  docs/architecture/embedded-mpv-native.md \
+  tools/embedded-mpv/README.md \
+  docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md \
+  AGENTS.md CLAUDE.md
+git commit -m "test(packaging): enforce direct Flatpak Zypak launch"
+```
+
+### Task 4: Verify the integrated fix
+
+**Files:**
+
+- Verify only; do not add unrelated changes.
+
+- [ ] **Step 1: Run the complete packaging tests**
+
+```bash
+pnpm nx test packaging --skip-nx-cache
+```
+
+Expected: all tests PASS, including the new launcher tests.
+
+- [ ] **Step 2: Run packaging lint**
+
+```bash
+pnpm nx lint packaging --skip-nx-cache
+```
+
+Expected: zero ESLint errors.
+
+- [ ] **Step 3: Run repository formatting checks for changed files**
+
+```bash
+pnpm prettier --check \
+  tools/packaging/linux-launcher-layout.cjs \
+  tools/packaging/linux-after-pack.cjs \
+  tools/packaging/linux-after-pack.test.mjs \
+  tools/packaging/electron-after-pack.cjs \
+  tools/packaging/embedded-mpv-packaging.cjs \
+  tools/packaging/embedded-mpv-arch.test.mjs \
+  tools/packaging/verify-electron-package-layout.mjs \
+  tools/packaging/electron-package-identity.test.mjs \
+  tools/packaging/verify-linux-frame-copy-runtime.mjs \
+  tools/packaging/verify-linux-frame-copy-runtime.test.mjs \
+  tools/packaging/configure-linux-frame-copy-build.test.mjs \
+  tools/packaging/project.json \
+  .github/workflows/build-and-make.yaml \
+  docs/architecture/embedded-mpv-native.md \
+  tools/embedded-mpv/README.md \
+  docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md \
+  docs/superpowers/specs/2026-07-18-flatpak-zypak-launcher-design.md \
+  docs/superpowers/plans/2026-07-18-flatpak-zypak-launcher.md \
+  AGENTS.md CLAUDE.md
+```
+
+Expected: all changed files use repository formatting.
+
+- [ ] **Step 4: Inspect the final diff**
+
+```bash
+git diff 8fdac824..HEAD --check
+git status --short
+```
+
+Expected: no whitespace errors and only scoped launcher, validator, CI, test,
+plan, and documentation changes.
diff --git a/docs/superpowers/plans/2026-07-20-hide-homogeneous-catalog-type-badges.md b/docs/superpowers/plans/2026-07-20-hide-homogeneous-catalog-type-badges.md
new file mode 100644
index 000000000..19a13d667
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-20-hide-homogeneous-catalog-type-badges.md
@@ -0,0 +1,243 @@
+# Hide Homogeneous Catalog Type Badges Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Remove redundant `LIVE`, `VOD`, and `SERIES` badges from homogeneous Stalker and Xtream catalog grids while preserving type badges in mixed-content cards.
+
+**Architecture:** Remove the type-badge presentation from the shared `GridListComponent`, whose current consumers are homogeneous catalog grids. Keep its `type` input because artwork placeholders and live-title normalization still depend on it; do not modify `ContentCardComponent`, which owns badges for mixed-content surfaces.
+
+**Tech Stack:** Angular standalone components, Angular signal inputs, SCSS, Jest through Nx, Playwright E2E through Nx.
+
+---
+
+### Task 0: Bootstrap the Nx workspace
+
+**Files:**
+- Verify only: `package.json`
+- Verify only: `pnpm-lock.yaml`
+
+- [ ] **Step 1: Install the locked workspace dependencies**
+
+Run:
+
+```bash
+pnpm install --frozen-lockfile
+```
+
+Expected: exit 0 without changing `pnpm-lock.yaml`.
+
+- [ ] **Step 2: Verify Nx project discovery**
+
+Run:
+
+```bash
+pnpm nx show projects
+```
+
+Expected: exit 0 and output containing `portal-shared-ui`,
+`portal-catalog-feature`, and `web-e2e`.
+
+### Task 1: Remove the redundant grid-list badge
+
+**Files:**
+- Modify: `libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts`
+- Modify: `libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts`
+- Modify: `libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss`
+
+- [ ] **Step 1: Write the failing regression test**
+
+In `grid-list.component.spec.ts`, change the existing live-logo test so it only
+asserts logo-card rendering, then add this parameterized test inside
+`describe('GridListComponent', ...)`:
+
+```typescript
+it.each(['live', 'vod', 'series'] as const)(
+    'does not render a redundant %s type badge in homogeneous grids',
+    (type) => {
+        fixture.componentRef.setInput('items', [
+            {
+                name: 'Catalog item',
+                stream_icon: 'catalog-item.png',
+            },
+        ]);
+        fixture.componentRef.setInput('type', type);
+
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.query(By.css('.type-badge'))
+        ).toBeNull();
+    }
+);
+```
+
+The updated live-logo test must retain these assertions:
+
+```typescript
+expect(card.nativeElement.classList).toContain('grid-card--logo');
+expect(image.nativeElement.getAttribute('src')).toBe('channel-logo.png');
+```
+
+It must no longer query or assert `.type-badge`.
+
+- [ ] **Step 2: Run the focused test to verify RED**
+
+Run:
+
+```bash
+pnpm nx test portal-shared-ui --testPathPattern=grid-list.component.spec.ts --runInBand
+```
+
+Expected: FAIL for `live`, `vod`, and `series` because
+`GridListComponent` still renders `.type-badge`.
+
+- [ ] **Step 3: Remove the badge markup**
+
+In the inline template in `grid-list.component.ts`, remove only this block:
+
+```html
+@if (type()) {
+    <div
+        class="type-badge"
+        [class.live]="type() === 'live'"
+        [class.movie]="type() === 'vod'"
+        [class.series]="type() === 'series'"
+    >
+        {{ type() }}
+    </div>
+}
+```
+
+Keep the `type` input and every remaining use of `type()` unchanged.
+
+- [ ] **Step 4: Remove the now-unused grid badge styles**
+
+In `grid-list.component.scss`, delete the entire `.type-badge` rule, including
+its `.live`, `.movie`, and `.series` variants:
+
+```scss
+.type-badge {
+    position: absolute;
+    top: 6px;
+    left: 6px;
+    z-index: 1;
+    padding: 3px 6px;
+    border-radius: 5px;
+    font-size: 0.58rem;
+    font-weight: 700;
+    line-height: 1;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    background: rgba(0, 0, 0, 0.85);
+    color: #fff;
+
+    &.live {
+        color: #ef5350;
+    }
+
+    &.movie {
+        color: #42a5f5;
+    }
+
+    &.series {
+        color: #66bb6a;
+    }
+}
+```
+
+Do not change the separate content-card badge mixin or
+`content-card.component.*`.
+
+- [ ] **Step 5: Run the focused test to verify GREEN**
+
+Run:
+
+```bash
+pnpm nx test portal-shared-ui --testPathPattern=grid-list.component.spec.ts --runInBand
+```
+
+Expected: PASS, including the three type-badge regression cases and the
+existing placeholder/title behavior.
+
+- [ ] **Step 6: Run affected unit and lint targets**
+
+Run:
+
+```bash
+pnpm nx test portal-shared-ui
+pnpm nx test portal-catalog-feature
+pnpm nx lint portal-shared-ui
+```
+
+Expected: all commands exit 0 with no failed tests or lint errors.
+
+- [ ] **Step 7: Verify mixed-content badge ownership is untouched**
+
+Run:
+
+```bash
+git diff -- libs/portal/shared/ui/src/lib/components/content-card libs/portal/xtream/feature/src/lib/search-results libs/portal/stalker/feature/src/lib/stalker-search
+```
+
+Expected: no output. `ContentCardComponent` and both mixed search surfaces
+remain unchanged.
+
+- [ ] **Step 8: Commit the implementation**
+
+```bash
+git add \
+  libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts \
+  libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts \
+  libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss
+git commit -m "fix(portal): remove redundant catalog type badges"
+```
+
+Expected: one commit containing only the grid-list behavior and regression
+coverage.
+
+### Task 2: Validate the portal workflows
+
+**Files:**
+- Verify only: `apps/web-e2e/src/xtream.e2e.ts`
+- Verify only: `apps/web-e2e/src/stalker.e2e.ts`
+- Verify only: `docs/architecture/iptvnator-ui-guidelines.md`
+
+- [ ] **Step 1: Run the Xtream portal E2E target**
+
+Run:
+
+```bash
+pnpm nx run web-e2e:e2e-ci--src/xtream.e2e.ts
+```
+
+Expected: PASS for the Xtream category and content-list workflows.
+
+- [ ] **Step 2: Run the Stalker portal E2E target**
+
+Run:
+
+```bash
+pnpm nx run web-e2e:e2e-ci--src/stalker.e2e.ts
+```
+
+Expected: PASS for the Stalker category and content-list workflows.
+
+- [ ] **Step 3: Perform the final diff and documentation-impact check**
+
+Run:
+
+```bash
+git diff HEAD^ --check
+git show --stat --oneline HEAD
+git status --short
+```
+
+Expected:
+
+- `git diff --check` exits 0;
+- the implementation commit contains only the three grid-list files;
+- the worktree contains only this implementation plan if it has not been
+  committed separately;
+- no canonical documentation update is needed because
+  `docs/architecture/iptvnator-ui-guidelines.md` already directs contributors
+  not to add redundant badges or secondary selection systems.
diff --git a/docs/superpowers/plans/2026-07-20-stalker-is-series-playback-metadata.md b/docs/superpowers/plans/2026-07-20-stalker-is-series-playback-metadata.md
new file mode 100644
index 000000000..a47a677e4
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-20-stalker-is-series-playback-metadata.md
@@ -0,0 +1,552 @@
+# Stalker `is_series` Playback Metadata Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Correct Stalker/Ministra VOD-backed series quick-start translations and persist episode coordinates so the workspace dashboard can show its season/episode badge.
+
+**Architecture:** Keep the provider-neutral dashboard contract unchanged. Preserve the shared quick-start translation parameters in the Stalker button view model, then enrich resolved Stalker series playback at the feature boundary by resolving the selected episode against the existing normalized `mappedSeasons()` data.
+
+**Tech Stack:** Angular standalone components and signals, ngx-translate, TypeScript, Jest, Nx, Markdown repository documentation.
+
+---
+
+### Task 1: Establish the implementation branch and workspace
+
+**Files:**
+- Verify: `package.json`
+- Verify: `pnpm-lock.yaml`
+
+- [ ] **Step 1: Create the feature branch**
+
+Run:
+
+```bash
+git switch -c agent/fix-stalker-is-series-metadata
+```
+
+Expected: Git reports a new branch named
+`agent/fix-stalker-is-series-metadata`.
+
+- [ ] **Step 2: Install the frozen workspace dependencies**
+
+Run:
+
+```bash
+pnpm install --frozen-lockfile
+```
+
+Expected: installation completes without changing `pnpm-lock.yaml`.
+
+- [ ] **Step 3: Verify Nx workspace discovery**
+
+Run:
+
+```bash
+pnpm nx show projects
+```
+
+Expected: output includes `portal-stalker-feature`,
+`workspace-dashboard-data-access`, and `web`.
+
+### Task 2: Add failing Stalker quick-start and playback regressions
+
+**Files:**
+- Modify: `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts`
+
+- [ ] **Step 1: Make the test translate pipe expose missing parameters**
+
+Change the `MockPipe(TranslatePipe, ...)` transform to render the problematic
+translation with its parameter:
+
+```ts
+MockPipe(
+    TranslatePipe,
+    (
+        value: string | null | undefined,
+        params?: Record<string, number>
+    ) => {
+        if (value === 'XTREAM.PLAY_EPISODE') {
+            return `Play episode ${params?.['episode'] ?? '{{episode}}'}`;
+        }
+        return value ?? '';
+    }
+),
+```
+
+- [ ] **Step 2: Add a quick-start interpolation regression**
+
+Add a component test that uses a loaded `is_series` episode with a non-resume,
+non-watched position:
+
+```ts
+it('interpolates the episode number for a recently started VOD is_series episode', async () => {
+    selectedContentType.set('vod');
+    selectedItem.set({
+        id: '50001',
+        is_series: true,
+        info: {
+            name: 'VOD Flagged Series',
+            description: 'Lazy seasons',
+            movie_image: 'vod-series.jpg',
+        },
+    });
+    serialSeasonsResource.set([]);
+    vodSeriesSeasonsResource.set([]);
+
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.componentInstance.vodSeriesSeasons.set([
+        {
+            id: 'season-1',
+            video_id: '50001',
+            season_number: '1',
+            name: 'Season 1',
+            episodes: [
+                {
+                    id: 'episode-1',
+                    series_number: 1,
+                    name: 'Pilot',
+                },
+            ],
+            isLoading: false,
+            isExpanded: false,
+        },
+    ]);
+    const episode = fixture.componentInstance.mappedSeasons()['1'][0];
+    fixture.componentInstance.episodePlaybackPositions.set(
+        new Map([
+            [
+                Number(episode.id),
+                {
+                    contentXtreamId: Number(episode.id),
+                    contentType: 'episode',
+                    seriesXtreamId: 50001,
+                    positionSeconds: 5,
+                    durationSeconds: 100,
+                },
+            ],
+        ])
+    );
+    fixture.detectChanges();
+
+    const button: HTMLButtonElement | null =
+        fixture.nativeElement.querySelector(
+            '[data-testid="series-quick-start"]'
+        );
+
+    expect(button?.textContent).toContain('Play episode 1');
+    expect(button?.textContent).not.toContain('{{episode}}');
+});
+```
+
+- [ ] **Step 3: Extend the existing external `is_series` quick-start test**
+
+After clicking the quick-start button, assert that the external playback object
+contains episode coordinates:
+
+```ts
+expect(openResolvedPlayback).toHaveBeenCalledWith(
+    expect.objectContaining({
+        contentInfo: expect.objectContaining({
+            seasonNumber: 1,
+            episodeNumber: 1,
+        }),
+    }),
+    true
+);
+```
+
+- [ ] **Step 4: Extend the existing inline `is_series` playback test**
+
+After `onEpisodeClicked(firstEpisode)`, assert:
+
+```ts
+expect(inlinePlayer.playback()).toEqual(
+    expect.objectContaining({
+        contentInfo: expect.objectContaining({
+            seasonNumber: 1,
+            episodeNumber: 1,
+        }),
+    })
+);
+```
+
+- [ ] **Step 5: Run the Stalker feature tests and verify RED**
+
+Run:
+
+```bash
+pnpm nx test portal-stalker-feature
+```
+
+Expected: the new interpolation and playback-coordinate assertions fail for
+the missing `labelParams`, `seasonNumber`, and `episodeNumber`.
+
+### Task 3: Preserve translation parameters and enrich Stalker playback
+
+**Files:**
+- Modify: `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts`
+- Modify: `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html`
+- Modify: `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts`
+- Test: `libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts`
+
+- [ ] **Step 1: Preserve label parameters in the Stalker button model**
+
+Add the optional field:
+
+```ts
+export interface StalkerQuickStartButton {
+    labelKey: string;
+    labelParams?: Record<string, number>;
+    episodeLabel: string | null;
+    icon: string;
+    disabled: boolean;
+    action: SeriesQuickStartAction | null;
+    lazySeason: VodSeriesSeasonVm | null;
+}
+```
+
+Copy it from a loaded action:
+
+```ts
+return {
+    labelKey: action.labelKey,
+    labelParams: action.labelParams,
+    episodeLabel: action.episodeLabel,
+    icon: action.icon,
+    disabled: action.disabled,
+    action,
+    lazySeason: null,
+};
+```
+
+- [ ] **Step 2: Pass parameters to the Stalker translate pipe**
+
+Replace the quick-start label expression with:
+
+```html
+{{
+    action.labelKey
+        | translate: action.labelParams
+}}
+```
+
+- [ ] **Step 3: Resolve episode coordinates before playback handoff**
+
+In `startPlayback(...)`, derive normalized episode state from the existing
+mapped seasons and enrich only episode playback:
+
+```ts
+const episodeState =
+    episodeId === undefined
+        ? null
+        : resolveSeriesPlaybackEpisodeState({
+              episodesBySeason: this.mappedSeasons(),
+              currentEpisodeId: episodeId,
+              fallbackEpisodeNumber: episodeNum,
+          });
+const resolvedPlayback =
+    episodeState && playback.contentInfo?.contentType === 'episode'
+        ? {
+              ...playback,
+              contentInfo: {
+                  ...playback.contentInfo,
+                  seasonNumber: episodeState.seasonNumber,
+                  episodeNumber: episodeState.episodeNumber,
+              },
+          }
+        : playback;
+```
+
+Use `resolvedPlayback` for both branches:
+
+```ts
+if (this.portalPlayer.isEmbeddedPlayer()) {
+    this.inlinePlayback.set(resolvedPlayback);
+    return;
+}
+
+this.closeInlinePlayer();
+void this.portalPlayer.openResolvedPlayback(resolvedPlayback, true);
+```
+
+- [ ] **Step 4: Run the Stalker feature tests and verify GREEN**
+
+Run:
+
+```bash
+pnpm nx test portal-stalker-feature
+```
+
+Expected: all Stalker feature tests pass.
+
+- [ ] **Step 5: Commit the focused Stalker fix**
+
+Run:
+
+```bash
+git add libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts
+git commit -m "fix(stalker): preserve series episode metadata"
+```
+
+Expected: one commit containing the Stalker tests and minimal production fix.
+
+### Task 4: Lock the dashboard’s existing `is_series` contract
+
+**Files:**
+- Modify: `libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts`
+
+- [ ] **Step 1: Add Stalker dashboard contract coverage**
+
+Add a test that supplies a Stalker playlist-backed recent item and its saved
+episode position:
+
+```ts
+it('resolves episode metadata for a Stalker VOD is_series recent item', async () => {
+    playlistsSignal.set([
+        ...createDefaultPlaylists(),
+        {
+            _id: 'stalker-series',
+            title: 'Ministra Portal',
+            count: 1,
+            importDate: '2026-01-01T00:00:00.000Z',
+            autoRefresh: false,
+            macAddress: '00:11:22:33:44:55',
+            recentlyViewed: [
+                {
+                    id: '50001',
+                    title: 'VOD Flagged Series',
+                    category_id: 'vod',
+                    is_series: '1',
+                    added_at: '2026-07-20T12:00:00.000Z',
+                },
+            ],
+        },
+    ]);
+    playbackPositionsMock.getAllPlaybackPositions.mockImplementation(
+        async (playlistId: string) =>
+            playlistId === 'stalker-series'
+                ? [
+                      {
+                          playlistId,
+                          contentXtreamId: 5000101,
+                          contentType: 'episode',
+                          seriesXtreamId: 50001,
+                          seasonNumber: 1,
+                          episodeNumber: 1,
+                          positionSeconds: 120,
+                          durationSeconds: 1800,
+                      },
+                  ]
+                : []
+    );
+
+    await service.reloadPlaybackPositions();
+
+    const item = service
+        .globalRecentItems()
+        .find((recent) => recent.playlist_id === 'stalker-series');
+    expect(item?.type).toBe('series');
+    expect(service.getPlaybackPositionForItem(item!)).toEqual(
+        expect.objectContaining({
+            seasonNumber: 1,
+            episodeNumber: 1,
+        })
+    );
+});
+```
+
+- [ ] **Step 2: Run the dashboard data-access tests**
+
+Run:
+
+```bash
+pnpm nx test workspace-dashboard-data-access
+```
+
+Expected: all tests pass, proving that the dashboard already consumes the
+metadata without a provider-specific branch.
+
+- [ ] **Step 3: Commit the dashboard contract test**
+
+Run:
+
+```bash
+git add libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts
+git commit -m "test(dashboard): cover Stalker is_series positions"
+```
+
+Expected: one test-only commit.
+
+### Task 5: Document the cross-surface `is_series` contract
+
+**Files:**
+- Modify: `docs/architecture/stalker-portal.md`
+- Modify: `docs/architecture/workspace-dashboard.md`
+- Modify: `.codex/skills/stalker-portal/SKILL.md`
+
+- [ ] **Step 1: Update Stalker architecture documentation**
+
+Add these rules to the `VOD/Series Modes` and regression sections:
+
+```markdown
+- All three series modes must preserve shared quick-start translation
+  parameters.
+- Episode playback must carry `seriesXtreamId`, `seasonNumber`, and
+  `episodeNumber` through both inline and external player handoffs.
+- Playlist-backed activity keeps `is_series` so dashboard normalization
+  classifies the VOD-origin record as `series`.
+- Existing playback rows without episode coordinates remain badge-less until
+  the next episode playback; the dashboard must not query the portal to infer
+  them.
+```
+
+- [ ] **Step 2: Update workspace dashboard documentation**
+
+Generalize the playback-position contract from Xtream-only wording and record:
+
+```markdown
+Stalker VOD-backed `is_series` activity is normalized as series activity.
+New Stalker episode positions include season/episode coordinates, so the hero
+and Continue Watching cards use the same badge path as Xtream. Legacy rows
+without those fields remain valid but do not show a badge.
+```
+
+- [ ] **Step 3: Add an agent-facing `is_series` checklist**
+
+In `.codex/skills/stalker-portal/SKILL.md`, require every Stalker series change
+to verify:
+
+```markdown
+1. Detail mode selection for regular, embedded `series[]`, and `is_series`.
+2. Parameterized quick-start labels.
+3. Recent/favorite normalization retaining VOD origin and series identity.
+4. Playback `seriesXtreamId` plus season/episode coordinates.
+5. Dashboard hero and Continue Watching consumption.
+```
+
+- [ ] **Step 4: Verify Markdown changes**
+
+Run:
+
+```bash
+git diff --check
+```
+
+Expected: no whitespace errors.
+
+- [ ] **Step 5: Commit the documentation**
+
+Run:
+
+```bash
+git add docs/architecture/stalker-portal.md docs/architecture/workspace-dashboard.md .codex/skills/stalker-portal/SKILL.md
+git commit -m "docs(stalker): record is_series cross-surface contract"
+```
+
+Expected: one documentation commit.
+
+### Task 6: Validate the complete change
+
+**Files:**
+- Verify: `libs/portal/stalker/feature/project.json`
+- Verify: `libs/workspace/dashboard/data-access/project.json`
+- Verify: `apps/web/project.json`
+
+- [ ] **Step 1: Run targeted unit tests**
+
+Run:
+
+```bash
+pnpm nx test portal-stalker-feature
+pnpm nx test workspace-dashboard-data-access
+```
+
+Expected: both targets pass.
+
+- [ ] **Step 2: Run affected lint targets**
+
+Run:
+
+```bash
+pnpm nx lint portal-stalker-feature
+pnpm nx lint workspace-dashboard-data-access
+```
+
+Expected: both targets pass.
+
+- [ ] **Step 3: Compile the Angular application**
+
+Run:
+
+```bash
+pnpm nx build web
+```
+
+Expected: the web build completes successfully, proving the updated template
+and TypeScript compile together.
+
+- [ ] **Step 4: Perform the test-impact audit**
+
+Confirm that no Stalker/Ministra fixture-backed E2E target covers lazy
+`is_series` playback. Record that targeted unit coverage plus the Angular build
+is the strongest automated validation if no such target exists.
+
+- [ ] **Step 5: Inspect the final diff and history**
+
+Run:
+
+```bash
+git diff master...HEAD --check
+git status --short
+git log --oneline master..HEAD
+```
+
+Expected: no diff errors, a clean worktree, and intentional commits only.
+
+### Task 7: Independent review, PR creation, and review loop
+
+**Files:**
+- Review: all files in `git diff master...HEAD`
+
+- [ ] **Step 1: Dispatch an independent subagent review**
+
+Ask a separate subagent to inspect the complete diff for correctness,
+regressions, type safety, test sufficiency, and adherence to the approved
+design. Require file/line evidence for every actionable finding.
+
+- [ ] **Step 2: Address validated subagent findings**
+
+For each finding, reproduce or confirm it, add or adjust tests first when
+behavior changes, implement the smallest correction, and rerun the affected
+validation targets. Commit any corrections separately.
+
+- [ ] **Step 3: Create the pull request**
+
+Push `agent/fix-stalker-is-series-metadata` and create a ready PR with:
+
+```text
+Summary:
+- interpolate Stalker series quick-start episode labels
+- persist season/episode coordinates for all Stalker series modes
+- document and test the Ministra is_series dashboard contract
+
+Validation:
+- pnpm nx test portal-stalker-feature
+- pnpm nx test workspace-dashboard-data-access
+- pnpm nx lint portal-stalker-feature
+- pnpm nx lint workspace-dashboard-data-access
+- pnpm nx build web
+```
+
+- [ ] **Step 4: Inspect GitHub reviews, comments, and checks**
+
+Wait for initial PR checks and review-bot feedback. Read every unresolved review
+thread and failed check, classify each item as actionable or non-actionable
+with evidence, and address all actionable findings.
+
+- [ ] **Step 5: Repeat until clean**
+
+After each correction, rerun affected validation, push the new commit, and
+re-check PR reviews/comments/checks. Stop only when checks are green and no
+actionable unresolved feedback remains.
diff --git a/docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md b/docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md
new file mode 100644
index 000000000..9a2543990
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md
@@ -0,0 +1,2003 @@
+# Coverage Integrity And Electron Runtime Boundaries Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Make Tier A coverage fail closed and add meaningful regression coverage for the HTTP server, remote control, settings, and download-file Electron boundaries.
+
+**Architecture:** A shared pure Node module classifies runtime-owning TypeScript, validates per-project Istanbul reports, scans child output for collection failures, and evaluates aggregate/per-file ratchets. Existing Electron contracts stay unchanged except for the TDD-backed rejection of a discovered static-path traversal escape; tests use real loopback/filesystem behavior where practical and mock only process, persistence, or native-shell boundaries.
+
+**Tech Stack:** Node.js ESM and `node:test`, TypeScript compiler API, Istanbul coverage maps, Jest/ts-jest, Electron main-process IPC, Node HTTP streams, Angular Jest configuration, Nx, Playwright.
+
+**Execution note (2026-07-26):** The branch was rebased onto
+`origin/master` commit `7e8c2ccce16b71d72a64c45f1d96dd090dc8e077`
+before the final ratchet run. A real-loopback HTTP regression exposed a Windows
+double-leading-slash traversal escape; the implementation adds a tested pure
+resolver and a user-facing Electron fix note. A final integrity follow-up also
+validates the merged Istanbul map itself before evaluating its recomputed
+summary and ratchets.
+
+---
+
+## Scope And File Map
+
+Create:
+
+- `tools/coverage/coverage-integrity.mjs` — shared source classification,
+  report validation, output scanning, and ratchet evaluation.
+- `tools/coverage/coverage-integrity.test.mjs` — deterministic Node tests using
+  temporary source/report fixtures.
+- `apps/electron-backend/src/app/server/http-server.spec.ts` — real loopback
+  and temporary-directory HTTP server contracts.
+- `apps/electron-backend/src/app/events/remote-control.events.spec.ts` —
+  registered HTTP handler, IPC, status, validation, and size-limit contracts.
+
+Modify:
+
+- `tools/coverage/run-tier-a-coverage.mjs` — stream child output, detect
+  collection failures, require complete project reports.
+- `tools/coverage/merge-coverage.mjs` — reject missing/invalid Tier A inputs
+  before touching merged output.
+- `tools/coverage/coverage-health.mjs` — independently validate completeness
+  and ratchets.
+- `tools/coverage/coverage-policy.json` — store achieved aggregate and
+  critical-file ratchets.
+- `package.json` — run coverage-tool unit tests inside `coverage:ci`.
+- `libs/m3u-state/tsconfig.spec.json` — use bundler resolution and include the
+  shared Electron window declaration so `effects.ts` instruments.
+- `apps/electron-backend/src/app/server/http-server.ts` — optional static-root
+  and server-factory seam, port `0` support for loopback tests, and a tested
+  static-root containment resolver.
+- `apps/electron-backend/src/app/events/remote-control.events.ts` — export the
+  class for isolated instances while preserving the default singleton.
+- `apps/electron-backend/src/app/events/settings.events.spec.ts` — persistence,
+  normalization, remote-control reconciliation, and redaction contracts.
+- `apps/electron-backend/src/app/events/database/downloads.events.spec.ts` —
+  managed-path checks before native shell access.
+- `docs/architecture/validation-map.md` — canonical fail-closed and ratchet
+  maintenance workflow.
+- `docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md`
+  — retain the corrected Istanbul-rounded baseline values.
+
+Do not modify:
+
+- `apps/electron-backend/src/app/workers/database.worker.ts`;
+- workspace dashboard or Stalker search production code;
+- type-only/shared-interface source for percentage gain;
+- `AGENTS.md` or `CLAUDE.md`, unless execution discovers that the implemented
+  commands contradict text already present there.
+
+### Task 0: Rebase And Bootstrap Immediately Before Implementation
+
+**Files:**
+
+- Verify only: `package.json`
+- Verify only: `pnpm-lock.yaml`
+- Verify only: `tools/coverage/coverage-policy.json`
+
+- [ ] **Step 1: Load the execution skills**
+
+Read completely before code changes:
+
+```text
+using-superpowers
+executing-plans
+test-driven-development
+electron-pro
+typescript
+angular-testing
+iptvnator-nx-architecture
+```
+
+Use `systematic-debugging` before changing code in response to any unexpected
+failure, and `verification-before-completion`, `release-notes`, and
+`github-pr` during the final tasks.
+
+- [ ] **Step 2: Confirm a clean branch and rebase onto fresh master**
+
+Run:
+
+```bash
+git status --short --branch
+git fetch origin master --prune
+git rebase origin/master
+git status --short --branch
+git log -2 --oneline --decorate
+```
+
+Expected: the branch is `agent/coverage-integrity-runtime-boundaries`, the
+rebase exits 0, and only the committed design/plan are ahead of the latest
+`origin/master`. If master changed a scoped source, spec, Jest config, or
+coverage tool, re-run the baseline checks below and update this plan's numeric
+seed before implementation rather than resolving by assumption.
+
+- [ ] **Step 3: Refresh locked dependencies and Nx discovery**
+
+Run:
+
+```bash
+pnpm install --frozen-lockfile
+pnpm nx show projects
+pnpm nx show projects --withTarget test
+```
+
+Expected: all commands exit 0; the project list contains
+`electron-backend`, `electron-backend-e2e`, and `m3u-state`; the lockfile stays
+unchanged.
+
+- [ ] **Step 4: Reconfirm the fresh baseline**
+
+Run even when Step 2 reports no new master commits:
+
+```bash
+NX_SKIP_NX_CACHE=true pnpm run coverage:ci
+```
+
+Expected on unchanged
+`7e8c2ccce16b71d72a64c45f1d96dd090dc8e077`: the command exits 0 while printing
+`Failed to collect coverage` for `libs/m3u-state/src/lib/effects.ts`, and the
+30 project reports merge 709 files while omitting that runtime-owning source.
+The aggregate remains 69.27/58.92/67.44/69.57, with HTTP and remote control at
+0%, settings at 16 / 27 (59.25%), and downloads at 69 / 147 (46.93%). Record
+the fresh aggregate and selected-file values. If master changed them, replace
+the numeric ratchet seed in Task 3; do not lower a baseline already present on
+newer master.
+
+### Task 1: Build And Unit-Test The Shared Coverage Integrity Module
+
+**Files:**
+
+- Create: `tools/coverage/coverage-integrity.test.mjs`
+- Create: `tools/coverage/coverage-integrity.mjs`
+
+- [ ] **Step 1: Write the failing source-classification and output-scanner tests**
+
+Create `tools/coverage/coverage-integrity.test.mjs` with Node built-ins and
+these contracts:
+
+```javascript
+import assert from 'node:assert/strict';
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, it } from 'node:test';
+
+import {
+    createCoverageOutputScanner,
+    evaluateCoverageRatchets,
+    hasRuntimeOwnedStatement,
+    validateProjectCoverage,
+    validateRequiredProjectReports,
+} from './coverage-integrity.mjs';
+
+const temporaryRoots = [];
+
+afterEach(() => {
+    for (const root of temporaryRoots.splice(0)) {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+
+describe('hasRuntimeOwnedStatement', () => {
+    it('excludes type-only, import-only, and pure re-export source', () => {
+        assert.equal(
+            hasRuntimeOwnedStatement(
+                'import type { Settings } from "./settings";'
+            ),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('interface Settings { enabled: boolean }'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('export type Mode = "live" | "vod";'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('export { value } from "./value";'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('declare const injected: string;'),
+            false
+        );
+    });
+
+    it('includes emitted declarations and executable statements', () => {
+        assert.equal(
+            hasRuntimeOwnedStatement('export const enabled = true;'),
+            true
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement(
+                'export class RuntimeBoundary { start() {} }'
+            ),
+            true
+        );
+        assert.equal(hasRuntimeOwnedStatement('console.log("runtime");'), true);
+    });
+});
+
+describe('createCoverageOutputScanner', () => {
+    it('detects an ANSI-colored marker split across chunks', () => {
+        const scanner = createCoverageOutputScanner(128);
+
+        scanner.push('\u001b[31mFailed to collect');
+        scanner.push(' coverage from /workspace/effects.ts\u001b[39m');
+
+        assert.equal(scanner.collectionFailed, true);
+    });
+
+    it('keeps only a bounded rolling tail', () => {
+        const scanner = createCoverageOutputScanner(32);
+
+        scanner.push('x'.repeat(256));
+
+        assert.equal(scanner.tail.length, 32);
+        assert.equal(scanner.collectionFailed, false);
+    });
+});
+```
+
+- [ ] **Step 2: Add failing temporary-report tests**
+
+In the same file, add helpers that write one runtime source plus a synthetic
+Istanbul entry:
+
+```javascript
+function makeProjectFixture() {
+    const workspaceRoot = mkdtempSync(
+        path.join(tmpdir(), 'iptvnator-coverage-integrity-')
+    );
+    temporaryRoots.push(workspaceRoot);
+    const sourceRoot = 'libs/example/src';
+    const projectRoot = 'libs/example';
+    const sourcePath = path.join(workspaceRoot, sourceRoot, 'runtime.ts');
+    const reportPath = path.join(
+        workspaceRoot,
+        'coverage',
+        projectRoot,
+        'coverage-final.json'
+    );
+
+    mkdirSync(path.dirname(sourcePath), { recursive: true });
+    mkdirSync(path.dirname(reportPath), { recursive: true });
+    writeFileSync(sourcePath, 'export const runtime = true;\n');
+
+    const project = {
+        name: 'example',
+        root: projectRoot,
+        sourceRoot,
+    };
+
+    return { project, reportPath, sourcePath, workspaceRoot };
+}
+
+function coverageEntry(filePath, hits = [0]) {
+    const statementMap = Object.fromEntries(
+        hits.map((_, index) => [
+            index,
+            {
+                start: { line: index + 1, column: 0 },
+                end: { line: index + 1, column: 28 },
+            },
+        ])
+    );
+    const statementHits = Object.fromEntries(
+        hits.map((hit, index) => [index, hit])
+    );
+
+    return {
+        path: filePath,
+        statementMap,
+        fnMap: {},
+        branchMap: {},
+        s: statementHits,
+        f: {},
+        b: {},
+    };
+}
+
+describe('validateProjectCoverage', () => {
+    it('accepts a report containing every runtime-owning file', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath),
+            })
+        );
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.deepEqual(result.errors, []);
+        assert.equal(result.report?.project.name, 'example');
+    });
+
+    it('reports a runtime-owning source omitted from a valid report', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(fixture.reportPath, '{}');
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.equal(result.errors.length, 1);
+        assert.match(result.errors[0], /runtime\.ts/);
+    });
+
+    it('reports missing and invalid project reports', () => {
+        const missing = makeProjectFixture();
+        const invalid = makeProjectFixture();
+        writeFileSync(invalid.reportPath, '{ invalid json');
+
+        assert.match(
+            validateProjectCoverage(missing).errors[0],
+            /did not produce/
+        );
+        assert.match(
+            validateProjectCoverage(invalid).errors[0],
+            /invalid JSON/
+        );
+    });
+
+    it('requires every configured Tier A report', () => {
+        const fixture = makeProjectFixture();
+
+        const result = validateRequiredProjectReports({
+            projects: [fixture.project],
+            workspaceRoot: fixture.workspaceRoot,
+        });
+
+        assert.equal(result.reports.length, 0);
+        assert.match(result.errors[0], /example/);
+    });
+});
+```
+
+- [ ] **Step 3: Add failing aggregate and critical-file ratchet tests**
+
+Add:
+
+```javascript
+describe('evaluateCoverageRatchets', () => {
+    it('reports aggregate percentage regression', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: {
+                statements: { covered: 68, total: 100, pct: 68 },
+                branches: { covered: 57, total: 100, pct: 57 },
+                functions: { covered: 67, total: 100, pct: 67 },
+                lines: { covered: 69, total: 100, pct: 69 },
+            },
+            ratchet: {
+                merged: {
+                    statements: 68.86,
+                    branches: 58.66,
+                    functions: 67.19,
+                    lines: 69.2,
+                },
+                criticalFiles: [],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.equal(errors.length, 4);
+        assert.match(errors[0], /statements.*68.*68\.86/);
+    });
+
+    it('requires both covered statements and percentage for a critical file', () => {
+        const workspaceRoot = '/workspace';
+        const filePath = path.join(workspaceRoot, 'apps/runtime.ts');
+        const errors = evaluateCoverageRatchets({
+            coverageData: {
+                [filePath]: coverageEntry(filePath, [1, 0]),
+            },
+            mergedSummary: {
+                statements: { covered: 1, total: 1, pct: 100 },
+                branches: { covered: 0, total: 0, pct: 100 },
+                functions: { covered: 0, total: 0, pct: 100 },
+                lines: { covered: 1, total: 1, pct: 100 },
+            },
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: 'apps/runtime.ts',
+                        statements: {
+                            minimumCovered: 2,
+                            minimumPercent: 75,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot,
+        });
+
+        assert.equal(errors.length, 2);
+        assert.match(errors[0], /apps\/runtime\.ts/);
+    });
+
+    it('reports a critical file missing from merged coverage', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: {
+                statements: { covered: 0, total: 0, pct: 100 },
+                branches: { covered: 0, total: 0, pct: 100 },
+                functions: { covered: 0, total: 0, pct: 100 },
+                lines: { covered: 0, total: 0, pct: 100 },
+            },
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: 'apps/missing.ts',
+                        statements: {
+                            minimumCovered: 1,
+                            minimumPercent: 0,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.match(errors[0], /missing from merged coverage/);
+    });
+});
+```
+
+- [ ] **Step 4: Run the Node tests to verify RED**
+
+Run:
+
+```bash
+node --test tools/coverage/coverage-integrity.test.mjs
+```
+
+Expected: FAIL with `ERR_MODULE_NOT_FOUND` for
+`tools/coverage/coverage-integrity.mjs`.
+
+- [ ] **Step 5: Implement source classification and the bounded scanner**
+
+Create `tools/coverage/coverage-integrity.mjs`. Use `unknown`-equivalent
+runtime validation rather than trusting parsed JSON shapes. The core
+classification and scanner must follow:
+
+```javascript
+import { createRequire } from 'node:module';
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import path from 'node:path';
+import ts from 'typescript';
+
+const require = createRequire(import.meta.url);
+const { createCoverageMap } = require('istanbul-lib-coverage');
+
+export const COVERAGE_COLLECTION_FAILURE = 'Failed to collect coverage';
+const ANSI_ESCAPE = /\u001b\[[0-?]*[ -/]*[@-~]/g;
+
+function toPosix(filePath) {
+    return filePath.split(path.sep).join('/');
+}
+
+function hasDeclareModifier(statement) {
+    const modifiers = ts.canHaveModifiers(statement)
+        ? (ts.getModifiers(statement) ?? [])
+        : [];
+    return modifiers.some(
+        (modifier) => modifier.kind === ts.SyntaxKind.DeclareKeyword
+    );
+}
+
+export function hasRuntimeOwnedStatement(sourceText, fileName = 'source.ts') {
+    const source = ts.createSourceFile(
+        fileName,
+        sourceText,
+        ts.ScriptTarget.Latest,
+        true
+    );
+
+    return source.statements.some((statement) => {
+        if (hasDeclareModifier(statement)) {
+            return false;
+        }
+        return !(
+            ts.isImportDeclaration(statement) ||
+            ts.isImportEqualsDeclaration(statement) ||
+            ts.isInterfaceDeclaration(statement) ||
+            ts.isTypeAliasDeclaration(statement) ||
+            ts.isExportDeclaration(statement) ||
+            ts.isEmptyStatement(statement)
+        );
+    });
+}
+
+export function createCoverageOutputScanner(maxCharacters = 4096) {
+    let tail = '';
+    let collectionFailed = false;
+
+    return {
+        get collectionFailed() {
+            return collectionFailed;
+        },
+        get tail() {
+            return tail;
+        },
+        push(chunk) {
+            tail = `${tail}${String(chunk).replace(ANSI_ESCAPE, '')}`.slice(
+                -maxCharacters
+            );
+            if (tail.includes(COVERAGE_COLLECTION_FAILURE)) {
+                collectionFailed = true;
+            }
+        },
+    };
+}
+```
+
+Add recursive enumeration with exactly these exclusions:
+
+```javascript
+function isExcludedSource(filePath) {
+    const file = toPosix(filePath);
+    return (
+        /\.(spec|test)\.ts$/.test(file) ||
+        file.endsWith('.d.ts') ||
+        file.endsWith('/test-setup.ts') ||
+        file.includes('/test-stubs/') ||
+        /\.generated\./.test(file) ||
+        file.includes('/environments/') ||
+        file.endsWith('/index.ts')
+    );
+}
+```
+
+`runtimeOwningSourceFiles(workspaceRoot, sourceRoot)` must recursively read
+only `.ts` files, apply `isExcludedSource`, parse the file, and return sorted
+absolute paths whose source has a runtime-owned statement.
+
+- [ ] **Step 6: Implement report validation**
+
+Implement these stable return shapes:
+
+```javascript
+// validateProjectCoverage(...)
+{
+    errors: string[],
+    report: undefined | {
+        data: Record<string, object>,
+        path: string,
+        project: object,
+    },
+}
+
+// validateRequiredProjectReports(...)
+{
+    errors: string[],
+    reports: Array<{
+        data: Record<string, object>,
+        path: string,
+        project: object,
+    }>,
+}
+```
+
+`validateProjectCoverage({ workspaceRoot, project })` must:
+
+1. resolve `coverage/<project.root>/coverage-final.json`;
+2. report a missing file using the project name and relative report path;
+3. parse JSON and reject arrays, `null`, and invalid JSON;
+4. normalize report keys with `path.resolve`;
+5. compare them to `runtimeOwningSourceFiles`; and
+6. emit one diagnostic per missing source, including project and relative
+   source path.
+
+`validateRequiredProjectReports` must call it for every project and preserve
+policy order in `reports`.
+
+- [ ] **Step 7: Implement ratchet evaluation**
+
+`evaluateCoverageRatchets` must:
+
+- compare each merged metric with its numeric minimum;
+- build an Istanbul map from `coverageData`;
+- require every critical path to exist;
+- obtain `fileCoverage.toSummary().toJSON().statements`;
+- compare both `covered` and `pct`; and
+- return diagnostics rather than exiting.
+
+Use messages of the form:
+
+```text
+Merged statements coverage regressed: observed 68%, required at least 68.86%.
+Critical coverage apps/runtime.ts statements covered regressed: observed 1, required at least 2.
+Critical coverage apps/runtime.ts statements percent regressed: observed 50%, required at least 75%.
+```
+
+- [ ] **Step 8: Run the module tests to verify GREEN**
+
+Run:
+
+```bash
+node --test tools/coverage/coverage-integrity.test.mjs
+```
+
+Expected: all classification, marker, report, and ratchet tests pass.
+
+- [ ] **Step 9: Commit the pure integrity module**
+
+Run:
+
+```bash
+git add \
+  tools/coverage/coverage-integrity.mjs \
+  tools/coverage/coverage-integrity.test.mjs
+git commit -m "test(coverage): add integrity primitives"
+```
+
+Expected: one commit containing only the pure module and its Node tests.
+
+### Task 2: Wire The Gate And Fix The Real `m3u-state` Instrumentation Failure
+
+**Files:**
+
+- Modify: `tools/coverage/run-tier-a-coverage.mjs`
+- Modify: `tools/coverage/merge-coverage.mjs`
+- Modify: `tools/coverage/coverage-health.mjs`
+- Modify: `package.json`
+- Modify: `libs/m3u-state/tsconfig.spec.json`
+
+- [ ] **Step 1: Replace synchronous inherited child output with streamed scanning**
+
+In `run-tier-a-coverage.mjs`, replace `spawnSync` with `spawn`, import
+`createCoverageOutputScanner` and `validateProjectCoverage`, and add:
+
+```javascript
+async function runCoverageProject(project) {
+    const args = buildNxArgs(project);
+    console.log(`\n==> Collecting coverage for ${project.name}`);
+    console.log(`pnpm ${args.join(' ')}`);
+
+    const scanner = createCoverageOutputScanner();
+    const child = spawn('pnpm', args, {
+        cwd: workspaceRoot,
+        env: {
+            ...process.env,
+            CI: process.env.CI ?? 'true',
+            NX_TASKS_RUNNER_DYNAMIC_OUTPUT: 'false',
+        },
+        stdio: ['inherit', 'pipe', 'pipe'],
+    });
+
+    for (const [stream, destination] of [
+        [child.stdout, process.stdout],
+        [child.stderr, process.stderr],
+    ]) {
+        stream.on('data', (chunk) => {
+            scanner.push(chunk);
+            destination.write(chunk);
+        });
+    }
+
+    const result = await new Promise((resolve, reject) => {
+        child.once('error', reject);
+        child.once('close', (code, signal) => resolve({ code, signal }));
+    });
+
+    if (result.code !== 0 || result.signal) {
+        return result.code ?? 1;
+    }
+    if (scanner.collectionFailed) {
+        console.error(
+            `Coverage collection failed while testing ${project.name}.`
+        );
+        return 1;
+    }
+
+    const validation = validateProjectCoverage({
+        project,
+        workspaceRoot,
+    });
+    for (const error of validation.errors) {
+        console.error(`Error: ${error}`);
+    }
+    return validation.errors.length === 0 ? 0 : 1;
+}
+```
+
+Replace the final `spawnSync` loop with top-level awaited sequential calls.
+Exit immediately after a nonzero project result so later projects cannot hide
+the failed owner.
+
+- [ ] **Step 2: Make merge input fail closed before output mutation**
+
+In `merge-coverage.mjs`, remove the `.filter(existsSync)` construction. Call:
+
+```javascript
+const validation = validateRequiredProjectReports({
+    projects: policy.unitCoverage.tierA,
+    workspaceRoot,
+});
+
+if (validation.errors.length > 0) {
+    for (const error of validation.errors) {
+        console.error(`Error: ${error}`);
+    }
+    process.exit(1);
+}
+
+const coverageInputs = validation.reports;
+```
+
+Perform this before `rmSync(outputDir, ...)`. Merge each `input.data` instead
+of reopening its path. Log `coverageInputs.length`, which must be exactly 30
+on the current policy.
+
+- [ ] **Step 3: Add independent health validation**
+
+In `coverage-health.mjs`:
+
+- import `evaluateCoverageRatchets`, `validateMergedCoverage`,
+  `validateProjectCoverage`, and `validateRequiredProjectReports`;
+- under `--require-report`, validate every Tier A report and append all
+  diagnostics to `errors`;
+- without `--require-report`, validate only report files that actually exist,
+  treating invalid JSON or missing runtime source in a present report as an
+  error rather than printing 30 missing-report warnings;
+- after loading merged `coverage-summary.json`, load and independently validate
+  merged `coverage-final.json` for every runtime-owning Tier A file;
+- recompute the aggregate summary from the validated merged map, compare it
+  with the serialized summary, and evaluate
+  `policy.reporting.coverageRatchet` when the policy has one.
+
+Do not change existing source-root/spec ownership checks, E2E tag warnings, or
+changed-file warnings.
+
+- [ ] **Step 4: Run targeted `m3u-state` coverage to verify the real RED**
+
+Run:
+
+```bash
+node --test tools/coverage/coverage-integrity.test.mjs
+pnpm run coverage:unit:ci -- --projects=m3u-state
+```
+
+Expected:
+
+- Node tests PASS.
+- Targeted coverage exits nonzero after relaying the existing TypeScript
+  diagnostics and reports `Coverage collection failed while testing
+m3u-state`.
+
+This is the real regression proof: before the runner wiring, the same Jest
+failure exited 0.
+
+- [ ] **Step 5: Align the `m3u-state` spec compiler configuration**
+
+Replace `libs/m3u-state/tsconfig.spec.json` with:
+
+```json
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../dist/out-tsc",
+        "module": "preserve",
+        "target": "es2016",
+        "types": ["jest", "node"],
+        "moduleResolution": "bundler"
+    },
+    "files": ["src/test-setup.ts", "../../global.d.ts"],
+    "include": [
+        "jest.config.ts",
+        "src/**/*.test.ts",
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
+    ]
+}
+```
+
+This matches the working Angular services test compiler mode, lets TypeScript
+honor Angular Material package exports, and includes the shared
+`Window.electron` contract. Do not add a local fake Material declaration to
+`m3u-state`.
+
+- [ ] **Step 6: Add coverage-tool tests to `coverage:ci`**
+
+In `package.json`, add:
+
+```json
+"coverage:tools:test": "node --test tools/coverage/coverage-integrity.test.mjs"
+```
+
+Change `coverage:ci` so it starts with:
+
+```json
+"coverage:ci": "pnpm run coverage:tools:test && pnpm run coverage:policy:check && pnpm run coverage:unit:ci && pnpm run coverage:merge && node tools/coverage/coverage-health.mjs --require-report"
+```
+
+- [ ] **Step 7: Verify targeted instrumentation is GREEN and complete**
+
+Run:
+
+```bash
+pnpm run coverage:tools:test
+pnpm nx test m3u-state --skip-nx-cache --runInBand
+pnpm run coverage:unit:ci -- --projects=m3u-state
+node --input-type=module -e 'import fs from "node:fs"; import path from "node:path"; const report=JSON.parse(fs.readFileSync("coverage/libs/m3u-state/coverage-final.json","utf8")); const target=path.resolve("libs/m3u-state/src/lib/effects.ts"); if (!report[target]) throw new Error(`${target} missing`); console.log("effects.ts present");'
+```
+
+Expected: all commands exit 0, no `Failed to collect coverage` appears, and
+the final command prints `effects.ts present`.
+
+- [ ] **Step 8: Commit the fail-closed runner and instrumentation fix**
+
+Run:
+
+```bash
+git add \
+  package.json \
+  tools/coverage/run-tier-a-coverage.mjs \
+  tools/coverage/merge-coverage.mjs \
+  tools/coverage/coverage-health.mjs \
+  libs/m3u-state/tsconfig.spec.json
+git commit -m "fix(coverage): fail on incomplete instrumentation"
+```
+
+Expected: one commit with the gate wiring and the real `effects.ts` fix.
+
+### Task 3: Establish A Real Failing Critical-File Ratchet
+
+**Files:**
+
+- Modify but do not yet commit:
+  `tools/coverage/coverage-policy.json`
+
+- [ ] **Step 1: Add the provisional ratchet**
+
+Under `reporting`, add:
+
+```json
+"coverageRatchet": {
+    "merged": {
+        "statements": 68.86,
+        "branches": 58.66,
+        "functions": 67.19,
+        "lines": 69.2
+    },
+    "criticalFiles": [
+        {
+            "path": "apps/electron-backend/src/app/server/http-server.ts",
+            "statements": {
+                "minimumCovered": 1,
+                "minimumPercent": 0
+            }
+        },
+        {
+            "path": "apps/electron-backend/src/app/events/remote-control.events.ts",
+            "statements": {
+                "minimumCovered": 1,
+                "minimumPercent": 0
+            }
+        },
+        {
+            "path": "apps/electron-backend/src/app/events/settings.events.ts",
+            "statements": {
+                "minimumCovered": 17,
+                "minimumPercent": 59.25
+            }
+        },
+        {
+            "path": "apps/electron-backend/src/app/events/database/downloads.events.ts",
+            "statements": {
+                "minimumCovered": 70,
+                "minimumPercent": 46.93
+            }
+        }
+    ]
+}
+```
+
+The existing files use their fresh master percentage and require one
+additional covered statement. The two 0% files require one covered statement.
+These are minimal progress probes, not final thresholds.
+
+- [ ] **Step 2: Verify the critical acceptance test is RED**
+
+Use the fresh baseline reports from Task 0:
+
+```bash
+pnpm run coverage:merge
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: merge succeeds with exactly 30 reports; health exits nonzero and
+names all selected files still below the provisional ratchet. In particular,
+`http-server.ts` and `remote-control.events.ts` report zero covered
+statements.
+
+- [ ] **Step 3: Keep the provisional policy change unstaged**
+
+Run:
+
+```bash
+git status --short
+```
+
+Expected: only `tools/coverage/coverage-policy.json` is intentionally dirty.
+Do not stage it in Tasks 4–7; it remains the real red acceptance test until
+the behavioral suites raise the observed values.
+
+### Task 4: Cover The HTTP Server Through Real Loopback And Filesystem Contracts
+
+**Files:**
+
+- Create: `apps/electron-backend/src/app/server/http-server.spec.ts`
+- Modify: `apps/electron-backend/src/app/server/http-server.ts`
+
+- [ ] **Step 1: Write the complete HTTP contract suite before the seam exists**
+
+The spec must:
+
+- create a temporary static directory with `index.html`, `app.js`,
+  `styles.css`, `data.json`, and an unknown-extension asset;
+- inject a real `http.createServer` wrapper that captures the Node server;
+- call `start(0)`, await `listening`, and request
+  `127.0.0.1:<assigned-port>`;
+- stop and remove the temporary tree in `afterEach`.
+
+Use these test helpers:
+
+```typescript
+interface HttpResponseSnapshot {
+    body: Buffer;
+    contentType: string | undefined;
+    statusCode: number;
+}
+
+function request(
+    port: number,
+    requestPath: string,
+    method = 'GET'
+): Promise<HttpResponseSnapshot> {
+    return new Promise((resolve, reject) => {
+        const req = http.request(
+            {
+                host: '127.0.0.1',
+                method,
+                path: requestPath,
+                port,
+            },
+            (res) => {
+                const chunks: Buffer[] = [];
+                res.on('data', (chunk: Buffer) => chunks.push(chunk));
+                res.on('end', () =>
+                    resolve({
+                        body: Buffer.concat(chunks),
+                        contentType: res.headers['content-type'],
+                        statusCode: res.statusCode ?? 0,
+                    })
+                );
+            }
+        );
+        req.once('error', reject);
+        req.end();
+    });
+}
+```
+
+Add assertions for:
+
+1. `/` returns the exact index body as `text/html`;
+2. `.js`, `.css`, `.json`, and an unknown extension return the expected MIME;
+3. a client route falls back to the exact index body;
+4. missing index returns plain-text 404;
+5. a registered API handler receives the request and bypasses static serving;
+6. unknown `/api/remote-control/...` returns JSON 404;
+7. `/../../outside-secret.txt` never returns an outside file;
+8. duplicate `start` creates/listens once;
+9. disable stops the server; and
+10. an enabled port change stops then starts once with the new port.
+
+- [ ] **Step 2: Run the focused spec to verify RED**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=http-server.spec.ts \
+  --runInBand
+```
+
+Expected: FAIL at TypeScript compilation because `HttpServer` does not yet
+accept the injected `distPath` and `createServer` options, and `start(0)`
+currently ignores port zero.
+
+- [ ] **Step 3: Add the minimal constructor seam**
+
+In `http-server.ts`, add flat types:
+
+```typescript
+type HttpServerFactory = (requestListener: http.RequestListener) => http.Server;
+
+interface HttpServerOptions {
+    createServer?: HttpServerFactory;
+    distPath?: string;
+}
+```
+
+Add a factory field and constructor:
+
+```typescript
+private readonly createServer: HttpServerFactory;
+
+constructor(options: HttpServerOptions = {}) {
+    this.createServer =
+        options.createServer ??
+        ((requestListener) => http.createServer(requestListener));
+    this.distPath = options.distPath ?? null;
+}
+```
+
+Replace:
+
+```typescript
+if (port) {
+```
+
+with:
+
+```typescript
+if (port !== undefined) {
+```
+
+and replace the direct `http.createServer` call with `this.createServer`.
+Leave the production singleton as:
+
+```typescript
+export const httpServer = new HttpServer();
+```
+
+No production caller passes port zero or constructor options, so normal
+runtime behavior stays unchanged.
+
+- [ ] **Step 4: Run HTTP tests and Electron coverage**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=http-server.spec.ts \
+  --runInBand
+pnpm run coverage:unit:ci -- --projects=electron-backend
+pnpm run coverage:merge
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected:
+
+- the focused suite PASSes;
+- `http-server.ts` is nonzero;
+- health remains RED only for the not-yet-expanded selected boundaries and any
+  aggregate dip caused by adding `effects.ts`.
+
+- [ ] **Step 5: Commit only the HTTP slice**
+
+Run:
+
+```bash
+git add \
+  apps/electron-backend/src/app/server/http-server.ts \
+  apps/electron-backend/src/app/server/http-server.spec.ts
+git commit -m "test(electron): cover remote HTTP server"
+```
+
+Expected: the provisional policy remains unstaged.
+
+### Task 5: Cover Remote-Control HTTP, IPC, And Renderer Dispatch
+
+**Files:**
+
+- Create:
+  `apps/electron-backend/src/app/events/remote-control.events.spec.ts`
+- Modify:
+  `apps/electron-backend/src/app/events/remote-control.events.ts`
+
+- [ ] **Step 1: Write the isolated remote-control suite**
+
+Mock only:
+
+- `BrowserWindow.getAllWindows`;
+- `ipcMain.handle` and `ipcMain.on`;
+- `httpServer.registerRemoteControlHandler` and `httpServer.start`; and
+- `store.get`.
+
+Import a named `RemoteControlEvents` class and instantiate it in each test.
+Capture registered handlers in maps. Use a `PassThrough` request for JSON body
+tests and a response recorder with typed `writeHead`/`end` methods.
+
+Use this complete exchange helper:
+
+```typescript
+interface ResponseSnapshot {
+    body: string;
+    headers: Record<string, string>;
+    statusCode: number;
+}
+
+function createExchange(method: string) {
+    const requestStream = new PassThrough();
+    Object.defineProperty(requestStream, 'method', { value: method });
+
+    let resolveResponse!: (snapshot: ResponseSnapshot) => void;
+    const snapshot: ResponseSnapshot = {
+        body: '',
+        headers: {},
+        statusCode: 0,
+    };
+    const completed = new Promise<ResponseSnapshot>((resolve) => {
+        resolveResponse = resolve;
+    });
+    const response = {
+        writeHead(statusCode: number, headers: Record<string, string>) {
+            snapshot.statusCode = statusCode;
+            snapshot.headers = headers;
+            return response;
+        },
+        end(body?: string) {
+            snapshot.body = body ?? '';
+            resolveResponse(snapshot);
+            return response;
+        },
+    };
+
+    return {
+        completed,
+        request: requestStream as unknown as http.IncomingMessage,
+        requestStream,
+        response: response as unknown as http.ServerResponse,
+    };
+}
+
+function getHttpHandler(path: string) {
+    const handler = mockRegisteredHttpHandlers.get(path);
+    if (!handler) {
+        throw new Error(`Expected remote-control HTTP handler for ${path}`);
+    }
+    return handler;
+}
+```
+
+Add exact contract cases:
+
+```typescript
+it.each([
+    ['/api/remote-control/channel/up', 'CHANNEL_CHANGE', { direction: 'up' }],
+    [
+        '/api/remote-control/channel/down',
+        'CHANNEL_CHANGE',
+        { direction: 'down' },
+    ],
+    [
+        '/api/remote-control/volume/up',
+        'REMOTE_CONTROL_COMMAND',
+        { type: 'volume-up' },
+    ],
+    [
+        '/api/remote-control/volume/down',
+        'REMOTE_CONTROL_COMMAND',
+        { type: 'volume-down' },
+    ],
+    [
+        '/api/remote-control/volume/toggle-mute',
+        'REMOTE_CONTROL_COMMAND',
+        { type: 'volume-toggle-mute' },
+    ],
+] as const)(
+    'dispatches POST %s to the first renderer',
+    async (path, channel, payload) => {
+        const exchange = createExchange('POST');
+
+        getHttpHandler(path)(exchange.request, exchange.response);
+        exchange.requestStream.end();
+        const response = await exchange.completed;
+
+        expect(response.statusCode).toBe(200);
+        expect(response.body).toBe(JSON.stringify({ success: true }));
+        expect(mockWebContentsSend).toHaveBeenCalledWith(channel, payload);
+    }
+);
+```
+
+Also test:
+
+- all seven endpoint paths are registered;
+- stored enabled/port starts HTTP once; disabled does not;
+- GET on POST-only handlers and POST on status return 405 without dispatch;
+- select-number accepts `7.9` and sends integer `7`;
+- missing, zero, negative, `Infinity`, and nonnumeric values return 400;
+- malformed JSON returns 400 and sends nothing;
+- a 10,241-byte body returns 413, destroys the request, and sends nothing;
+- partial status IPC updates merge with previous state and refresh
+  `updatedAt`;
+- GET status returns that merged state; and
+- no BrowserWindow logs a warning but does not throw.
+
+- [ ] **Step 2: Run the focused spec to verify RED**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=remote-control.events.spec.ts \
+  --runInBand
+```
+
+Expected: FAIL because `RemoteControlEvents` is not exported as a named class.
+
+- [ ] **Step 3: Export the existing class without changing its singleton**
+
+Change:
+
+```typescript
+class RemoteControlEvents {
+```
+
+to:
+
+```typescript
+export class RemoteControlEvents {
+```
+
+Keep:
+
+```typescript
+export default new RemoteControlEvents();
+```
+
+Do not change endpoint names, methods, payloads, body limit, stored defaults,
+or renderer channels unless a correct regression assertion exposes an actual
+defect. If that happens, invoke `systematic-debugging`, keep the failing test,
+and document the separately justified behavior fix.
+
+- [ ] **Step 4: Verify remote-control behavior and coverage**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=remote-control.events.spec.ts \
+  --runInBand
+pnpm run coverage:unit:ci -- --projects=electron-backend
+pnpm run coverage:merge
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: the focused suite PASSes, `remote-control.events.ts` is nonzero, and
+health no longer reports either formerly 0% selected file.
+
+- [ ] **Step 5: Commit only the remote-control slice**
+
+Run:
+
+```bash
+git add \
+  apps/electron-backend/src/app/events/remote-control.events.ts \
+  apps/electron-backend/src/app/events/remote-control.events.spec.ts
+git commit -m "test(electron): cover remote control events"
+```
+
+Expected: the provisional policy remains unstaged.
+
+### Task 6: Expand Settings Runtime Reconciliation Coverage
+
+**Files:**
+
+- Modify:
+  `apps/electron-backend/src/app/events/settings.events.spec.ts`
+- Verify only:
+  `apps/electron-backend/src/app/events/settings.events.ts`
+
+- [ ] **Step 1: Make the existing test harness deterministic**
+
+Keep real `normalizeExternalPlayerArguments`. Add stable mocks:
+
+```typescript
+type SettingsUpdateHandler = (
+    event: unknown,
+    settings: Record<string, unknown>
+) => void;
+
+const mockStoreGet = jest.fn();
+const mockStoreSet = jest.fn();
+const mockUpdateSettings = jest.fn();
+let handler: SettingsUpdateHandler;
+```
+
+Include every imported key in the store mock:
+
+```typescript
+EMBEDDED_MPV_FRAME_COPY: 'embeddedMpvFrameCopy',
+MPV_PLAYER_ARGUMENTS: 'mpvPlayerArguments',
+MPV_REUSE_INSTANCE: 'mpvReuseInstance',
+VLC_PLAYER_ARGUMENTS: 'vlcPlayerArguments',
+VLC_REUSE_INSTANCE: 'vlcReuseInstance',
+store: {
+    get: mockStoreGet,
+    set: mockStoreSet,
+},
+```
+
+In `beforeEach`, clear the handler map, reset modules and mocks, silence
+`console.log`, import `./settings.events`, and retrieve the registered
+`SETTINGS_UPDATE` handler. Preserve both existing credential-redaction tests.
+
+- [ ] **Step 2: Confirm the provisional settings ratchet is RED before new cases**
+
+Run:
+
+```bash
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: settings reports fewer than the provisional 17 covered statements or
+less than its retained 59.25% floor.
+
+- [ ] **Step 3: Add normalization and defined-only persistence assertions**
+
+Add:
+
+```typescript
+it('normalizes player arguments and preserves explicit false reuse flags', () => {
+    handler(
+        {},
+        {
+            mpvPlayerArguments: [' --screen=1 ', '', ' --hwdec=auto-safe '],
+            mpvReuseInstance: false,
+            vlcPlayerArguments: ' --fullscreen \n\n --no-video-title-show ',
+            vlcReuseInstance: false,
+        }
+    );
+
+    expect(mockStoreSet).toHaveBeenCalledWith(
+        'mpvPlayerArguments',
+        '--screen=1\n--hwdec=auto-safe'
+    );
+    expect(mockStoreSet).toHaveBeenCalledWith('mpvReuseInstance', false);
+    expect(mockStoreSet).toHaveBeenCalledWith(
+        'vlcPlayerArguments',
+        '--fullscreen\n--no-video-title-show'
+    );
+    expect(mockStoreSet).toHaveBeenCalledWith('vlcReuseInstance', false);
+});
+
+it('does not persist undefined settings', () => {
+    handler({}, {});
+
+    expect(mockStoreSet).not.toHaveBeenCalled();
+    expect(mockUpdateSettings).not.toHaveBeenCalled();
+});
+
+it('coerces the frame-copy startup preference to boolean', () => {
+    handler({}, { embeddedMpvFrameCopy: 1 });
+
+    expect(mockStoreSet).toHaveBeenCalledWith('embeddedMpvFrameCopy', true);
+});
+```
+
+- [ ] **Step 4: Add partial remote-control reconciliation assertions**
+
+Add two tests:
+
+```typescript
+it('uses the stored port when only remote-control enabled changes', () => {
+    mockStoreGet.mockImplementation((key: string) =>
+        key === 'remoteControlPort' ? 9988 : undefined
+    );
+
+    handler({}, { remoteControl: true });
+
+    expect(mockStoreSet).toHaveBeenCalledWith('remoteControl', true);
+    expect(mockStoreSet).not.toHaveBeenCalledWith(
+        'remoteControlPort',
+        expect.anything()
+    );
+    expect(mockUpdateSettings).toHaveBeenCalledWith(true, 9988);
+});
+
+it('uses stored enabled state when only the remote-control port changes', () => {
+    mockStoreGet.mockImplementation((key: string) =>
+        key === 'remoteControl' ? true : undefined
+    );
+
+    handler({}, { remoteControlPort: 9123 });
+
+    expect(mockStoreSet).toHaveBeenCalledWith('remoteControlPort', 9123);
+    expect(mockStoreSet).not.toHaveBeenCalledWith(
+        'remoteControl',
+        expect.anything()
+    );
+    expect(mockUpdateSettings).toHaveBeenCalledWith(true, 9123);
+});
+```
+
+- [ ] **Step 5: Run settings tests and refresh Electron coverage**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=settings.events.spec.ts \
+  --runInBand
+pnpm run coverage:unit:ci -- --projects=electron-backend
+pnpm run coverage:merge
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: all settings tests PASS; settings covered statements and percentage
+are above the fresh master baseline. These are characterization tests for
+unchanged behavior, so no production edit is expected.
+
+- [ ] **Step 6: Commit only the settings spec**
+
+Run:
+
+```bash
+git add apps/electron-backend/src/app/events/settings.events.spec.ts
+git commit -m "test(electron): cover settings runtime updates"
+```
+
+Expected: the provisional policy remains unstaged.
+
+### Task 7: Expand Download Managed-Path Security Coverage
+
+**Files:**
+
+- Modify:
+  `apps/electron-backend/src/app/events/database/downloads.events.spec.ts`
+- Verify only:
+  `apps/electron-backend/src/app/events/database/downloads.events.ts`
+
+- [ ] **Step 1: Add filesystem and shell spies to the existing harness**
+
+Add:
+
+```typescript
+const mockExistsSync = jest.fn();
+const mockOpenPath = jest.fn();
+const mockShowItemInFolder = jest.fn();
+```
+
+Return the two shell spies from the existing Electron mock. Reset them in
+`beforeEach`; make `mockOpenPath` resolve an empty string by default.
+Before importing `downloads.events`, register:
+
+```typescript
+jest.doMock('node:fs', () => ({
+    existsSync: mockExistsSync,
+}));
+```
+
+Add a database helper whose `limit(1)` returns either `[{ id: 42 }]`, `[]`, or
+rejects:
+
+```typescript
+function mockManagedPath(result: 'managed' | 'unmanaged' | 'error') {
+    const limit =
+        result === 'error'
+            ? jest.fn().mockRejectedValue(new Error('database unavailable'))
+            : jest
+                  .fn()
+                  .mockResolvedValue(result === 'managed' ? [{ id: 42 }] : []);
+    mockGetDatabase.mockResolvedValue({
+        select: jest.fn(() => ({
+            from: jest.fn(() => ({
+                where: jest.fn(() => ({ limit })),
+            })),
+        })),
+    });
+}
+```
+
+- [ ] **Step 2: Confirm the provisional downloads ratchet is RED**
+
+Run:
+
+```bash
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: downloads is below the provisional 70-covered-statement target or
+its retained 46.93% floor.
+
+- [ ] **Step 3: Add the managed-path rejection cases**
+
+For both `DOWNLOADS_REVEAL_FILE` and `DOWNLOADS_PLAY_FILE`, assert:
+
+```typescript
+it.each(['DOWNLOADS_REVEAL_FILE', 'DOWNLOADS_PLAY_FILE'])(
+    '%s rejects a path not owned by a download row',
+    async (channel) => {
+        mockManagedPath('unmanaged');
+        mockExistsSync.mockReturnValue(true);
+
+        await expect(
+            getHandler(channel)(null, '/tmp/unmanaged.mp4')
+        ).resolves.toEqual({
+            error: 'File not found',
+            success: false,
+        });
+
+        expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        expect(mockOpenPath).not.toHaveBeenCalled();
+    }
+);
+
+it.each(['DOWNLOADS_REVEAL_FILE', 'DOWNLOADS_PLAY_FILE'])(
+    '%s rejects a managed path missing on disk',
+    async (channel) => {
+        mockManagedPath('managed');
+        mockExistsSync.mockReturnValue(false);
+
+        await expect(
+            getHandler(channel)(null, '/downloads/missing.mp4')
+        ).resolves.toEqual({
+            error: 'File not found',
+            success: false,
+        });
+
+        expect(mockShowItemInFolder).not.toHaveBeenCalled();
+        expect(mockOpenPath).not.toHaveBeenCalled();
+    }
+);
+```
+
+- [ ] **Step 4: Add the authorized shell and database-failure cases**
+
+Add one reveal success, one play success, and a parameterized database failure:
+
+```typescript
+it('reveals only a managed file that exists', async () => {
+    mockManagedPath('managed');
+    mockExistsSync.mockReturnValue(true);
+
+    await expect(
+        getHandler('DOWNLOADS_REVEAL_FILE')(null, '/downloads/movie.mp4')
+    ).resolves.toEqual({ success: true });
+
+    expect(mockShowItemInFolder).toHaveBeenCalledWith('/downloads/movie.mp4');
+});
+
+it('opens only a managed file that exists', async () => {
+    mockManagedPath('managed');
+    mockExistsSync.mockReturnValue(true);
+
+    await expect(
+        getHandler('DOWNLOADS_PLAY_FILE')(null, '/downloads/movie.mp4')
+    ).resolves.toEqual({ success: true });
+
+    expect(mockOpenPath).toHaveBeenCalledWith('/downloads/movie.mp4');
+});
+```
+
+For the database-error cases, silence `console.error`, use
+`mockManagedPath('error')`, expect the existing structured not-found response,
+and assert neither shell spy ran.
+
+- [ ] **Step 5: Run download tests and refresh Electron coverage**
+
+Run:
+
+```bash
+pnpm nx test electron-backend \
+  --testPathPattern=downloads.events.spec.ts \
+  --runInBand
+pnpm run coverage:unit:ci -- --projects=electron-backend
+pnpm run coverage:merge
+node tools/coverage/coverage-health.mjs --require-report
+```
+
+Expected: all existing destructive cleanup/pause/resume tests and all new
+managed-path tests PASS. Downloads covered statements and percentage exceed
+the fresh master values.
+
+- [ ] **Step 6: Commit only the downloads spec**
+
+Run:
+
+```bash
+git add \
+  apps/electron-backend/src/app/events/database/downloads.events.spec.ts
+git commit -m "test(electron): cover managed download paths"
+```
+
+Expected: the provisional policy remains the only unstaged source change.
+
+### Task 8: Record Achieved Ratchets And Document The Integrity Contract
+
+**Files:**
+
+- Modify:
+  `tools/coverage/coverage-policy.json`
+- Modify:
+  `docs/architecture/validation-map.md`
+- Modify:
+  `docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md`
+- Modify:
+  `docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md`
+- Create:
+  `.changes/electron-remote-static-paths.md`
+
+- [ ] **Step 1: Generate a complete fresh candidate report**
+
+Run:
+
+```bash
+NX_SKIP_NX_CACHE=true pnpm run coverage:ci
+```
+
+Expected: 30 Tier A reports, no `Failed to collect coverage`, no missing
+runtime-owning files, and all four aggregate metrics at or above the fresh
+master baseline. If any metric is lower, do not lower the baseline. Inspect
+the approved boundary cases for a missing meaningful assertion, add that
+failing assertion, and rerun the directly affected suite before repeating this
+command.
+
+- [ ] **Step 2: Print exact achieved aggregate and per-file values**
+
+Run:
+
+```bash
+node --input-type=module <<'NODE'
+import { createRequire } from 'node:module';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const require = createRequire(import.meta.url);
+const { createCoverageMap } = require('istanbul-lib-coverage');
+const data = JSON.parse(
+    fs.readFileSync('coverage/merged/coverage-final.json', 'utf8')
+);
+const map = createCoverageMap(data);
+const targets = [
+    'apps/electron-backend/src/app/server/http-server.ts',
+    'apps/electron-backend/src/app/events/remote-control.events.ts',
+    'apps/electron-backend/src/app/events/settings.events.ts',
+    'apps/electron-backend/src/app/events/database/downloads.events.ts',
+];
+const criticalFiles = targets.map((file) => {
+    const statements = map
+        .fileCoverageFor(path.resolve(file))
+        .toSummary()
+        .toJSON().statements;
+    return {
+        path: file,
+        statements: {
+            minimumCovered: statements.covered,
+            minimumPercent: statements.pct,
+        },
+    };
+});
+const summary = map.getCoverageSummary().toJSON();
+console.log(
+    JSON.stringify(
+        {
+            merged: {
+                statements: summary.statements.pct,
+                branches: summary.branches.pct,
+                functions: summary.functions.pct,
+                lines: summary.lines.pct,
+            },
+            criticalFiles,
+        },
+        null,
+        4
+    )
+);
+NODE
+```
+
+Expected: a complete `coverageRatchet` value with nonzero HTTP/remote values
+and settings/download values no lower than their baseline. Copy this exact
+JSON object over the provisional `reporting.coverageRatchet`; do not round
+manually or retain the provisional one-statement probes.
+
+- [ ] **Step 3: Verify the achieved ratchet passes and rejects regressions**
+
+Run:
+
+```bash
+pnpm run coverage:health -- --require-report
+node --test tools/coverage/coverage-integrity.test.mjs
+```
+
+Expected: both exit 0. The synthetic Node tests still prove below-ratchet
+metrics, missing critical files, missing reports, and collection markers fail.
+
+- [ ] **Step 4: Update the canonical validation map**
+
+Under `## Coverage Tiers` in `docs/architecture/validation-map.md`, add:
+
+```markdown
+Tier A coverage is fail-closed. `coverage:unit:ci` relays Jest output but exits
+nonzero on `Failed to collect coverage`, a missing/invalid project report, or
+a runtime-owning production TypeScript file absent from that report.
+`coverage:merge` requires every configured Tier A report before replacing the
+merged output, and `coverage:health --require-report` repeats completeness plus
+aggregate and critical-file ratchets.
+
+Runtime-owning files are discovered from the TypeScript AST. Specs, declarations,
+test setup/stubs, generated/environment files, `index.ts`, type-only files, and
+pure re-export shims do not count as executable coverage inputs.
+
+Ratchets live under `reporting.coverageRatchet` in
+`tools/coverage/coverage-policy.json`. Update them only from a fresh full
+`coverage:ci` report when every value stays level or rises; never lower a
+ratchet to accept a regression. The only exception is a reviewed production
+source shrink: `minimumCovered` may follow a lower statement total when the PR
+identifies the removed executable statements and fresh coverage proves that
+the file percentage, aggregate ratchets, and remaining behavioral coverage do
+not decrease.
+```
+
+Also include `pnpm run coverage:tools:test` in the local coverage command block.
+
+- [ ] **Step 5: Confirm documentation and release-note decisions**
+
+Because the real-loopback regression exposed and fixed an observable Windows
+static-path traversal escape, add `.changes/electron-remote-static-paths.md`:
+
+```markdown
+---
+type: fix
+area: electron
+---
+
+The desktop remote-control server now blocks crafted static paths from escaping
+bundled web files on Windows.
+```
+
+Run:
+
+```bash
+pnpm exec prettier --check \
+  docs/architecture/validation-map.md \
+  docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md \
+  docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md \
+  .changes/electron-remote-static-paths.md
+pnpm run release:notes:validate
+```
+
+Expected: both pass. The release note records the narrow user-visible security
+fix; do not apply `no-release-note` in Task 10.
+
+- [ ] **Step 6: Commit ratchets and docs**
+
+Run:
+
+```bash
+git add \
+  tools/coverage/coverage-policy.json \
+  docs/architecture/validation-map.md \
+  docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md \
+  docs/superpowers/plans/2026-07-25-coverage-integrity-runtime-boundaries.md \
+  .changes/electron-remote-static-paths.md
+git commit -m "ci(coverage): ratchet runtime boundaries"
+```
+
+Expected: the provisional policy is replaced by achieved values, the security
+fix has a valid release note, and the worktree becomes clean.
+
+### Task 9: Run Fresh Validation And Audit The Final Diff
+
+**Files:**
+
+- Verify only: all changed files
+- Verify only:
+  `apps/electron-backend-e2e/src/downloads.e2e.ts`
+- Verify only:
+  `apps/electron-backend-e2e/src/remote-control.e2e.ts`
+- Verify only:
+  `apps/electron-backend-e2e/src/settings.e2e.ts`
+
+- [ ] **Step 1: Run targeted unit, lint, and type checks**
+
+Run:
+
+```bash
+pnpm run coverage:tools:test
+pnpm nx test electron-backend --skip-nx-cache --runInBand
+pnpm nx test m3u-state --skip-nx-cache --runInBand
+pnpm nx lint electron-backend --skip-nx-cache
+pnpm nx lint m3u-state --skip-nx-cache
+pnpm run typecheck:backend
+```
+
+Expected: every command exits 0; no Jest suite, lint rule, or backend type
+check fails.
+
+- [ ] **Step 2: Run the three existing Electron E2E contracts**
+
+Run:
+
+```bash
+pnpm nx run electron-backend-e2e:e2e-ci--src/downloads.e2e.ts --skip-nx-cache
+pnpm nx run electron-backend-e2e:e2e-ci--src/remote-control.e2e.ts --skip-nx-cache
+pnpm nx run electron-backend-e2e:e2e-ci--src/settings.e2e.ts --skip-nx-cache
+```
+
+Expected: all targets PASS. These prove the real packaged-style Electron IPC,
+native folder/download flow, remote loopback server, renderer command, and
+settings persistence contracts beyond unit mocks.
+
+- [ ] **Step 3: Build the production Electron target**
+
+Run:
+
+```bash
+pnpm nx build electron-backend \
+  --configuration=production \
+  --skip-nx-cache
+```
+
+Expected: exit 0, including worker, web, and remote-control-web dependencies.
+
+- [ ] **Step 4: Run final full coverage from scratch**
+
+Run:
+
+```bash
+NX_SKIP_NX_CACHE=true pnpm run coverage:ci
+```
+
+Expected:
+
+- all coverage-tool tests PASS;
+- policy sees 30 Tier A projects;
+- all 30 project reports are merged;
+- `effects.ts` is present;
+- no collection marker or runtime-owning source omission is reported;
+- achieved aggregate and critical-file ratchets PASS.
+
+- [ ] **Step 5: Inspect exact metrics and scoped diff**
+
+Run:
+
+```bash
+git diff origin/master...HEAD --check
+git diff --stat origin/master...HEAD
+git diff --name-only origin/master...HEAD
+git status --short --branch
+```
+
+Expected:
+
+- no whitespace errors;
+- only the files in this plan appear;
+- no database worker, dashboard, Stalker search, type-only interface, lockfile,
+  AGENTS, or CLAUDE changes appear;
+- the worktree is clean.
+
+- [ ] **Step 6: Apply verification-before-completion**
+
+Read and follow `verification-before-completion`. Record, without paraphrasing
+away failures:
+
+- exact unit suite/test counts;
+- exact E2E results;
+- lint/typecheck/build exit results;
+- 30/30 Tier A report integrity;
+- aggregate before/after;
+- all selected-file before/after values;
+- docs and release-note decisions.
+
+Do not claim completion from cached or earlier output.
+
+### Task 10: Recheck Master, Push, And Open The Draft PR
+
+**Files:**
+
+- Verify only: current branch history and GitHub PR metadata
+
+- [ ] **Step 1: Recheck master before publication**
+
+Run:
+
+```bash
+git fetch origin master --prune
+git log --oneline HEAD..origin/master
+```
+
+Expected: no output. If master advanced, rebase, rerun dependency bootstrap and
+all of Task 9, then refresh ratchets only upward before publication.
+
+- [ ] **Step 2: Review conventional history**
+
+Run:
+
+```bash
+git log --oneline origin/master..HEAD
+git status --short --branch
+```
+
+Expected: concise conventional commits, including the design and plan docs,
+with a clean worktree.
+
+- [ ] **Step 3: Push the agent branch**
+
+Run:
+
+```bash
+git push -u origin agent/coverage-integrity-runtime-boundaries
+```
+
+Expected: push succeeds and sets the upstream.
+
+- [ ] **Step 4: Create a draft PR**
+
+Read and follow `github-pr`. Create a draft targeting `master` with title:
+
+```text
+test(electron): harden runtime coverage integrity
+```
+
+The body must contain:
+
+- fresh baseline commit and aggregate metrics;
+- exact after metrics;
+- selected-file before/after table;
+- behavioral contracts for HTTP, remote control, settings, and downloads;
+- the two behavior-preserving production seams;
+- the `effects.ts` compiler/instrumentation correction;
+- runner, merge, health, and ratchet behavior;
+- exact validation commands/results;
+- docs update;
+- the Electron fix release note for Windows static-path containment; and
+- deferred `database.worker.ts`, dashboard rails, and Stalker search.
+
+Use:
+
+```bash
+gh pr create \
+  --draft \
+  --base master \
+  --head agent/coverage-integrity-runtime-boundaries \
+  --title "test(electron): harden runtime coverage integrity" \
+  --body-file -
+```
+
+Provide the fully populated body on standard input; do not leave metric or
+validation placeholders.
+
+- [ ] **Step 5: Verify release-note metadata**
+
+Run:
+
+```bash
+gh pr view --json url,isDraft,headRefName,baseRefName,labels,files,commits,statusCheckRollup
+```
+
+Expected: the PR is draft, head/base are correct,
+`.changes/electron-remote-static-paths.md` is included, `no-release-note` is
+absent, and the command prints the PR URL.
+
+- [ ] **Step 6: Return the exact handoff**
+
+Return:
+
+- draft PR URL;
+- branch;
+- final commit SHA;
+- aggregate and selected-file before/after metrics;
+- exact command results and any explicit environment-only skip;
+- docs updated (`docs/architecture/validation-map.md`);
+- release note added (`.changes/electron-remote-static-paths.md`) with no
+  `no-release-note` label;
+- deferred zero-coverage follow-ups.
diff --git a/docs/superpowers/plans/2026-07-25-first-fictional-poster-pair.md b/docs/superpowers/plans/2026-07-25-first-fictional-poster-pair.md
new file mode 100644
index 000000000..3a8ea3f20
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-25-first-fictional-poster-pair.md
@@ -0,0 +1,184 @@
+# First Fictional Poster Pair Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Generate and validate two contrasting fictional movie posters that establish the approved live-action drama and family-animation directions before producing the remaining eight.
+
+**Architecture:** Each poster is generated independently with the built-in image-generation tool and an exact genre-specific prompt. The selected native portrait output is copied into the mock-server poster directory, downscaled to 512 × 768, and visually inspected at final size. The two files remain uncommitted until the user approves the visual direction.
+
+**Tech Stack:** Built-in `image_gen`, PNG assets, macOS `sips`, `file`, `shasum`
+
+---
+
+### Task 1: Generate `ORCHARD WALLS`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/orchard-walls.png`
+
+- [ ] **Step 1: Generate the native portrait image**
+
+Use the built-in `image_gen` tool once with this exact prompt:
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical movie poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable poster for a quiet contemporary drama titled “ORCHARD WALLS”; it must look like an ordinary professionally distributed live-action film rather than cinematic concept art
+Scene/backdrop: a modest rural apple orchard in early autumn, one low weathered stone wall, pale overcast sky, soft distant hills
+Subject: one entirely fictional man in his late 50s wearing plain faded work clothes, seated on the wall beneath a fruit tree and looking toward the empty orchard; natural posture, restrained expression, no celebrity resemblance
+Style/medium: straightforward realistic movie-poster photography, modest independent-film polish, natural texture, slightly muted print color, no hyperreal detail
+Composition/framing: vertical 2:3; the man occupies about one third of the image; one tree and one wall form the whole composition; generous quiet sky; strong silhouette readable at thumbnail size
+Lighting/mood: soft cloudy daylight with a small patch of warm late-afternoon light, humane, reflective, hopeful but unsentimental
+Color palette: faded olive, stone gray, muted rust, pale cream
+Text (verbatim): “ORCHARD WALLS” exactly once, large restrained uppercase serif lettering centered in the upper sky, clearly legible
+Constraints: original fictional person and setting; title only; no actor names; no tagline; no credit block; no logos; no brands; no watermark
+Avoid: prison corridors, uniforms, guards, electric chairs, supernatural light, famous actors, glossy face montage, dramatic teal-orange grading, volumetric rays, excessive detail, copied movie-poster layouts, malformed hands, extra text, misspelled title
+```
+
+Expected result: a restrained one-character drama poster with the exact title
+`ORCHARD WALLS`, no other text, and no recognizable person or existing-film
+motif.
+
+- [ ] **Step 2: Inspect the generated image before saving**
+
+Use `view_image` on the exact absolute path returned by `image_gen`.
+
+Reject and regenerate if the title is misspelled, any extra text appears, the
+person resembles a recognizable actor, the hands are visibly malformed, or the
+image reads as elaborate concept art instead of a simple drama poster.
+
+- [ ] **Step 3: Save and downscale the selected image**
+
+Copy the exact generated path returned by the successful tool call to:
+
+```text
+apps/xtream-mock-server/public/marketing/poster/orchard-walls.png
+```
+
+Then run:
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/orchard-walls.png
+```
+
+Expected result: `orchard-walls.png` is rewritten at 512 × 768.
+
+- [ ] **Step 4: Verify the final asset**
+
+Run:
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/orchard-walls.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/orchard-walls.png
+```
+
+Expected `file` output includes:
+
+```text
+PNG image data, 512 x 768, 8-bit/color RGB
+```
+
+Use `view_image` on the final workspace file and confirm the title remains
+legible after downscaling.
+
+### Task 2: Generate `BLUE CURRENT`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/blue-current.png`
+
+- [ ] **Step 1: Generate the native portrait image**
+
+Use the built-in `image_gen` tool once with this exact prompt:
+
+```text
+Use case: ads-marketing
+Asset type: original fictional animated-family-movie poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable poster for an original family animation titled “BLUE CURRENT”; it should resemble professional theatrical animation marketing in clarity and charm without imitating any studio or existing film
+Scene/backdrop: open blue ocean with two broad curved current ribbons, a softly lit sandy shelf far below, and only a few simple sea plants
+Subject: one entirely original young royal-blue nudibranch sea slug with leaf-shaped golden frills, a compact rounded body, two expressive eyes, and a curious determined expression; it swims diagonally upward while carrying one tiny smooth white pebble
+Style/medium: polished but simple stylized 3D family animation, appealing clear shapes, moderate detail, soft materials, not photorealistic and not concept art
+Composition/framing: vertical 2:3; one large character centered slightly below the middle; current ribbons create a clean upward curve; uncluttered background; readable at very small thumbnail size
+Lighting/mood: bright filtered daylight from above, cheerful, adventurous, gentle
+Color palette: ocean blue, turquoise, golden yellow, small white accent
+Text (verbatim): “BLUE CURRENT” exactly once, large friendly rounded uppercase lettering centered at the top, clearly legible
+Constraints: wholly original character design; title only; no actor names; no tagline; no credit block; no studio logo; no brand; no watermark
+Avoid: clownfish, orange-and-white striped fish, parent-and-child fish pairs, sea turtles, forgetful blue fish, coral-reef ensemble casts, recognizable animation-studio character styling, copied poster layouts, hyper-detailed underwater scenery, scary teeth, extra text, misspelled title
+```
+
+Expected result: a bright one-character animated poster with the exact title
+`BLUE CURRENT`, no other text, and a protagonist unrelated to recognizable
+underwater-film characters.
+
+- [ ] **Step 2: Inspect the generated image before saving**
+
+Use `view_image` on the exact absolute path returned by `image_gen`.
+
+Reject and regenerate if the title is misspelled, extra text or a studio mark
+appears, the protagonist resembles a known character, the design is too
+detailed, or the image contains an ensemble instead of one clear protagonist.
+
+- [ ] **Step 3: Save and downscale the selected image**
+
+Copy the exact generated path returned by the successful tool call to:
+
+```text
+apps/xtream-mock-server/public/marketing/poster/blue-current.png
+```
+
+Then run:
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/blue-current.png
+```
+
+Expected result: `blue-current.png` is rewritten at 512 × 768.
+
+- [ ] **Step 4: Verify the final asset**
+
+Run:
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/blue-current.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/blue-current.png
+```
+
+Expected `file` output includes:
+
+```text
+PNG image data, 512 x 768, 8-bit/color RGB
+```
+
+Use `view_image` on the final workspace file and confirm the title and
+protagonist remain readable after downscaling.
+
+### Task 3: Present the Review Checkpoint
+
+**Files:**
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/orchard-walls.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/blue-current.png`
+
+- [ ] **Step 1: Verify the two-file scope**
+
+Run:
+
+```bash
+git status --short -- apps/xtream-mock-server/public/marketing/poster
+```
+
+Expected result: the two new sample files appear. The earlier
+`signal-nine.png` draft may also remain untracked but must not be modified by
+this plan.
+
+- [ ] **Step 2: Report the generation details**
+
+Show both final workspace images to the user. Report:
+
+- the two absolute workspace paths;
+- the exact final dimensions and PNG color mode;
+- that the built-in image-generation path was used;
+- that the two prompts above were used;
+- whether any output required regeneration and why.
+
+- [ ] **Step 3: Pause for visual approval**
+
+Do not generate the remaining eight posters and do not commit the two sample
+assets until the user approves both the live-action and animated directions.
diff --git a/docs/superpowers/plans/2026-07-25-remaining-fictional-posters.md b/docs/superpowers/plans/2026-07-25-remaining-fictional-posters.md
new file mode 100644
index 000000000..88891a5dc
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-25-remaining-fictional-posters.md
@@ -0,0 +1,458 @@
+# Remaining Fictional Posters Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Generate, review, and save the remaining eight original fictional movie posters in the approved ten-poster collection.
+
+**Architecture:** Each poster is an independent built-in `image_gen` generation with a genre-specific prompt and no visual dependency on existing repository posters. Every native result is inspected, saved as a 512 × 768 RGB PNG, checked for exact title text and originality, then committed separately after spec and visual-quality review. The existing `signal-nine.png` draft is explicitly replaced because the user requested a simpler real-film direction.
+
+**Tech Stack:** Built-in `image_gen`, PNG assets, macOS `sips`, `file`, `shasum`, Git
+
+---
+
+## Shared Execution Contract
+
+For every task:
+
+1. Read the image-generation skill and its shared prompting references.
+2. Do not inspect or use existing poster images as visual references.
+3. Use one built-in `image_gen` call with the task's exact prompt.
+4. Inspect the native result with `view_image`.
+5. Regenerate once if the title is misspelled, extra text appears, anatomy is
+   malformed, a recognizable actor or franchise motif appears, or the result
+   violates the task's simplicity requirement.
+6. Do not use CLI fallback. If a transient network error repeats, report
+   `BLOCKED`.
+7. Copy the accepted native result to the exact task path and run the task's
+   `sips` command.
+8. Verify the final workspace file with `file`, `shasum -a 256`, and
+   `view_image`.
+9. Add and commit only the task's poster file after its spec and visual-quality
+   reviews pass.
+
+### Task 1: Replace `SIGNAL NINE`
+
+**Files:**
+- Replace: `apps/xtream-mock-server/public/marketing/poster/signal-nine.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical thriller poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable poster for a contemporary urban conspiracy thriller titled “SIGNAL NINE”; it must look like conventional professionally distributed key art, not hyper-detailed science-fiction concept art
+Scene/backdrop: a mostly dark underground train platform reduced to simple soft-focus shapes, one stopped silver train, one circular red signal lamp
+Subject: two entirely fictional adult leads with no celebrity resemblance; one large close portrait of a female radio journalist in her late 30s, calm but alert, with a smaller male transit investigator in his early 40s standing near the train in the lower background
+Style/medium: realistic commercial movie-poster photography with a restrained clean composite, natural faces, subtle print grain, limited detail
+Composition/framing: vertical 2:3; one dominant face taking the upper-right half, one small standing figure below-left, red signal as the only graphic accent, strong black negative space; clear at thumbnail size
+Lighting/mood: cool charcoal and steel blue with one muted red light, tense, grounded, contemporary
+Text (verbatim): “SIGNAL NINE” exactly once, large condensed uppercase sans-serif in off-white at the bottom, clearly legible
+Constraints: original fictional people; title only; no actor names; no tagline; no credits; no logos; no brands; no watermark
+Avoid: green code rain, sunglasses, leather trench coats, pills, guns, explosions, futuristic cityscapes, neon overload, superhero poses, multiple face montage, recognizable actors, copied poster layouts, excessive skin detail, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/signal-nine.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/signal-nine.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/signal-nine.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/signal-nine.png
+git commit -m "feat(mock-server): add Signal Nine poster"
+```
+
+### Task 2: Generate `CHECKOUT AT NOON`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical comedy poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable mainstream comedy poster titled “CHECKOUT AT NOON”; bright, human, and professionally photographed rather than glossy concept art
+Scene/backdrop: a seamless warm butter-yellow studio background with one simple hotel luggage cart
+Subject: three entirely fictional adults with no celebrity resemblance arranged in an awkward group pose around the cart: an exhausted hotel manager in a burgundy blazer, a cheerful traveler sitting on one suitcase, and a stern older guest holding a tiny room key; natural comedic expressions, contemporary ordinary clothing
+Style/medium: clean commercial ensemble photography, lightly playful retouching, crisp simple shapes, moderate realism
+Composition/framing: vertical 2:3; full and three-quarter figures, triangular ensemble arrangement, luggage cart as one clear prop, generous clean margins; readable as a small catalog tile
+Lighting/mood: soft bright studio light, warm, upbeat, gently chaotic
+Color palette: butter yellow, burgundy, cobalt blue, cream
+Text (verbatim): “CHECKOUT AT NOON” exactly once, large bold cobalt uppercase sans-serif in three compact lines near the top-left, clearly legible
+Constraints: three original fictional adults; title only; no actor names; no tagline; no credits; no hotel logo; no brand; no watermark
+Avoid: oversized objects, slapstick action, floating luggage, celebrity likenesses, glamour fashion poses, busy hotel lobby, explosions, weapons, copied comedy-poster poses, excessive detail, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, three plausible people,
+one luggage cart, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png
+git commit -m "feat(mock-server): add Checkout at Noon poster"
+```
+
+### Task 3: Generate `VESPER CROWN`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/vesper-crown.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical fantasy poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable fantasy-adventure poster titled “VESPER CROWN”; one strong original image rather than an epic character montage
+Scene/backdrop: a vast pale salt flat at violet dusk with a thin horizon and one distant dark mountain
+Subject: one entirely fictional young female royal archivist in a practical dark plum travel coat, seen from behind in the lower third; above the horizon floats one large weathered copper crown made from seven uneven geometric arcs, softly suspended without flames
+Style/medium: restrained live-action fantasy key art, realistic landscape photography with one practical-looking symbolic object, subtle print texture
+Composition/framing: vertical 2:3; small lone figure below, large crown silhouette centered in open sky, minimal elements, iconic thumbnail readability
+Lighting/mood: violet twilight, cool quiet mystery, thin copper highlights
+Color palette: dusty violet, pale salt white, oxidized copper, dark plum
+Text (verbatim): “VESPER CROWN” exactly once, elegant uppercase serif in pale copper near the bottom, clearly legible
+Constraints: original person, costume, object, and world; title only; no actor names; no tagline; no credits; no logos; no brands; no watermark
+Avoid: swords, dragons, thrones, castles, elves, medieval armor, fire, magical energy beams, floating face montage, recognizable fantasy-franchise motifs, overly ornate crown, excessive particles, copied poster layouts, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/vesper-crown.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/vesper-crown.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/vesper-crown.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, one figure and one
+seven-arc copper crown, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/vesper-crown.png
+git commit -m "feat(mock-server): add Vesper Crown poster"
+```
+
+### Task 4: Generate `LAST DETOUR`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/last-detour.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical road-action poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable road-action thriller poster titled “LAST DETOUR”; grounded and physical, not a blockbuster explosion montage
+Scene/backdrop: an empty two-lane mountain road at dry late afternoon, one sharp bend, low scrub, distant gray ridges
+Subject: one weathered olive-green 1990s compact hatchback stopped diagonally at the roadside; two entirely fictional adults with no celebrity resemblance stand beside it, an older female mechanic in a faded tan work jacket and a younger male courier in a dark red sweatshirt, both looking back down the road
+Style/medium: realistic location photography shaped into clean theatrical key art, subtle grain, restrained action tone
+Composition/framing: vertical 2:3; car occupies lower middle, two figures form a simple diagonal, road leads into distance, no montage, readable at thumbnail size
+Lighting/mood: hard warm sun and long cool shadows, wary, urgent, grounded
+Color palette: sun-bleached tan, olive green, asphalt gray, dark red
+Text (verbatim): “LAST DETOUR” exactly once, bold slightly condensed uppercase lettering in warm off-white across the lower road, clearly legible
+Constraints: original fictional people and unbranded car; title only; no actor names; no tagline; no credits; no logos; no watermark
+Avoid: car brands, luxury sports cars, racing, explosions, guns, helicopters, flying debris, urban skyline, celebrity likenesses, franchise action poses, teal-orange grading, multiple vehicles, excessive detail, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/last-detour.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/last-detour.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/last-detour.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, one unbranded hatchback
+and two plausible people, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/last-detour.png
+git commit -m "feat(mock-server): add Last Detour poster"
+```
+
+### Task 5: Generate `BORROWED SUMMER`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical romantic-drama poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable romantic-drama poster titled “BORROWED SUMMER”; intimate naturalistic photography rather than glossy romance advertising
+Scene/backdrop: the open window of an old local bus parked beside a quiet lakeside road at golden hour, softly blurred reeds and water beyond
+Subject: two entirely fictional adults in their early 30s with no celebrity resemblance; one woman sits inside the bus by the open window while one man stands outside, their faces separated by the window frame, sharing a restrained almost-smile rather than touching
+Style/medium: naturalistic live-action film photography, warm grain, gentle lens softness, modest festival-film poster finish
+Composition/framing: vertical 2:3; two profiles occupy opposite sides of the window frame, simple geometric separation, lake and sunlight remain soft; clear emotional read at thumbnail size
+Lighting/mood: warm low sun, tender, fleeting, bittersweet, unforced
+Color palette: honey gold, faded bus green, lake blue-gray, soft skin tones
+Text (verbatim): “BORROWED SUMMER” exactly once, modest lowercase-style serif rendered in uppercase letters near the bottom, warm cream and clearly legible
+Constraints: two original fictional adults; title only; no actor names; no tagline; no credits; no bus logo; no brand; no watermark
+Avoid: kissing, wedding imagery, glamour retouching, dramatic tears, heart shapes, celebrity likenesses, backlit face halos, Korean or other extra text, copied romance-poster poses, montage, excessive detail, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, two plausible original
+profiles separated by the bus window, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png
+git commit -m "feat(mock-server): add Borrowed Summer poster"
+```
+
+### Task 6: Generate `UNDER THE FLOOR`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/under-the-floor.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical horror poster for IPTV mock data, portrait 2:3
+Primary request: create a minimal believable supernatural-horror poster titled “UNDER THE FLOOR”; one unsettling image with no monster reveal and no gore
+Scene/backdrop: an empty modest child's bedroom at night, faded cream wallpaper, simple iron bed partly visible, old dark wooden floorboards
+Subject: one floorboard near the center is lifted by two centimeters, revealing only a narrow black gap; a single thin red sewing thread crosses the floor and disappears into the gap
+Style/medium: realistic restrained horror photography, practical set lighting, subtle film grain, minimal graphic design
+Composition/framing: vertical 2:3; low camera angle close to floor, lifted board and red thread as the only focal point, large quiet wall area above, instantly readable silhouette
+Lighting/mood: cold moonlight from one unseen window, faint warm hallway spill, silent and deeply uneasy
+Color palette: blue-gray, aged cream, dark brown, one restrained red accent
+Text (verbatim): “UNDER THE FLOOR” exactly once, narrow uppercase serif in faded cream centered high on the wall, clearly legible
+Constraints: title only; no people; no actor names; no tagline; no credits; no logos; no brands; no watermark; no visible creature
+Avoid: eyes in darkness, hands, dolls, clowns, blood, gore, teeth, faces, pentagrams, haunted-house exterior, jump-scare imagery, famous horror motifs, extreme darkness that hides the floorboard, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/under-the-floor.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/under-the-floor.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/under-the-floor.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, one lifted floorboard
+and one red thread, no person, creature, gore, or extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/under-the-floor.png
+git commit -m "feat(mock-server): add Under the Floor poster"
+```
+
+### Task 7: Generate `RED WINTER`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/red-winter.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical space-survival poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable science-fiction survival poster titled “RED WINTER”; minimal, physical, and lonely rather than elaborate space concept art
+Scene/backdrop: a frozen exoplanet plain covered in pale red snow, one low black ridge, nearly empty dusty-pink sky, one small pale ringed moon
+Subject: one tiny entirely fictional planetary botanist in a practical off-white insulated field suit walking away from camera while dragging a narrow sample sled; no visible face, no weapon
+Style/medium: restrained live-action science-fiction key art with realistic location texture, simple matte-composite finish, subtle print grain
+Composition/framing: vertical 2:3; person and sled occupy the bottom fifth, long single trail crosses the red snow, moon small in upper sky, strong negative space and thumbnail silhouette
+Lighting/mood: diffuse frozen daylight, isolated, resilient, quiet
+Color palette: pale brick red, dusty rose, off-white, charcoal
+Text (verbatim): “RED WINTER” exactly once, wide uppercase sans-serif in off-white centered in the upper sky, clearly legible
+Constraints: original world, suit, and character; title only; no actor names; no tagline; no credits; no mission logo; no brand; no watermark
+Avoid: Mars landmarks, orange desert, giant astronaut close-up, space station, spaceship, laser, glowing helmet, explosions, storm debris, famous space-film compositions, excessive stars, excessive detail, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/red-winter.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/red-winter.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/red-winter.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, one small botanist, one
+sled, one trail, and one small ringed moon, no extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/red-winter.png
+git commit -m "feat(mock-server): add Red Winter poster"
+```
+
+### Task 8: Generate `SATURDAY CHAMPIONS`
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/saturday-champions.png`
+
+- [ ] **Step 1: Generate the poster**
+
+```text
+Use case: ads-marketing
+Asset type: original fictional theatrical family sports-comedy poster for IPTV mock data, portrait 2:3
+Primary request: create a simple believable family sports-comedy poster titled “SATURDAY CHAMPIONS”; warm ensemble photography with ordinary kids, not an exaggerated sports spectacle
+Scene/backdrop: a muddy community soccer field on a bright cloudy Saturday, plain chain-link fence and small neighborhood clubhouse softly blurred behind
+Subject: six entirely fictional children aged 10–12 with varied appearances in mismatched unbranded green-and-yellow soccer uniforms posing for an awkward team photo; one child holds a normal scuffed soccer ball, one goalkeeper wears gloves slightly too large, all expressions natural and distinct
+Style/medium: cheerful realistic family-film photography, clean theatrical poster composite, modest color polish, no hyperreal detail
+Composition/framing: vertical 2:3; two standing rows of three children, simple team-photo geometry with slight comic imperfection, ball visible near center, generous sky for title, clear at thumbnail size
+Lighting/mood: soft bright daylight after rain, optimistic, funny, sincere
+Color palette: grass green, warm yellow, muddy brown, sky blue-gray
+Text (verbatim): “SATURDAY CHAMPIONS” exactly once, large friendly uppercase slab-serif in warm yellow across the upper sky, clearly legible
+Constraints: six original fictional children; safe age-appropriate presentation; title only; no actor names; no tagline; no credits; no team badge; no brand; no watermark
+Avoid: professional stadium, famous club colors or kits, oversized soccer ball, adults, trophy, fireworks, acrobatic action, celebrity likenesses, glamour poses, copied sports-film ensemble layouts, extra limbs, malformed hands, extra text, misspelled title
+```
+
+- [ ] **Step 2: Save and downscale**
+
+```bash
+sips -z 768 512 apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+```
+
+- [ ] **Step 3: Verify**
+
+```bash
+file apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+shasum -a 256 apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+```
+
+Expected: RGB PNG, exactly 512 × 768, exact title once, exactly six plausible
+children, one ball, no badges, brands, or extra text.
+
+- [ ] **Step 4: Commit after both reviews pass**
+
+```bash
+git add -- apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+git commit -m "feat(mock-server): add Saturday Champions poster"
+```
+
+### Task 9: Validate the Complete Collection
+
+**Files:**
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/signal-nine.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/orchard-walls.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/blue-current.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/vesper-crown.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/last-detour.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/under-the-floor.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/red-winter.png`
+- Inspect: `apps/xtream-mock-server/public/marketing/poster/saturday-champions.png`
+
+- [ ] **Step 1: Verify file properties**
+
+```bash
+file \
+  apps/xtream-mock-server/public/marketing/poster/signal-nine.png \
+  apps/xtream-mock-server/public/marketing/poster/orchard-walls.png \
+  apps/xtream-mock-server/public/marketing/poster/blue-current.png \
+  apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png \
+  apps/xtream-mock-server/public/marketing/poster/vesper-crown.png \
+  apps/xtream-mock-server/public/marketing/poster/last-detour.png \
+  apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png \
+  apps/xtream-mock-server/public/marketing/poster/under-the-floor.png \
+  apps/xtream-mock-server/public/marketing/poster/red-winter.png \
+  apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+```
+
+Expected: all ten files are 512 × 768, 8-bit RGB PNGs.
+
+- [ ] **Step 2: Verify final hashes**
+
+```bash
+shasum -a 256 \
+  apps/xtream-mock-server/public/marketing/poster/signal-nine.png \
+  apps/xtream-mock-server/public/marketing/poster/orchard-walls.png \
+  apps/xtream-mock-server/public/marketing/poster/blue-current.png \
+  apps/xtream-mock-server/public/marketing/poster/checkout-at-noon.png \
+  apps/xtream-mock-server/public/marketing/poster/vesper-crown.png \
+  apps/xtream-mock-server/public/marketing/poster/last-detour.png \
+  apps/xtream-mock-server/public/marketing/poster/borrowed-summer.png \
+  apps/xtream-mock-server/public/marketing/poster/under-the-floor.png \
+  apps/xtream-mock-server/public/marketing/poster/red-winter.png \
+  apps/xtream-mock-server/public/marketing/poster/saturday-champions.png
+```
+
+Expected: ten non-empty SHA-256 values with no duplicate hashes.
+
+- [ ] **Step 3: Perform pairwise visual review**
+
+Inspect all ten final files. Confirm that the collection communicates ten
+different releases through distinct genre, palette, composition, type style,
+and medium while retaining small-thumbnail readability. Reject a poster if it
+looks like a template reuse, has obvious AI artifacts, or resembles a known
+film property.
+
+- [ ] **Step 4: Validate repository scope**
+
+```bash
+git status --short
+git log --oneline -12
+```
+
+Expected: no uncommitted poster assets or plan changes remain. The local
+`.superpowers/` visual-companion directory may remain untracked and is excluded
+from the asset scope.
diff --git a/docs/superpowers/plans/2026-07-26-twenty-shared-marketing-posters.md b/docs/superpowers/plans/2026-07-26-twenty-shared-marketing-posters.md
new file mode 100644
index 000000000..a5fa1dd3a
--- /dev/null
+++ b/docs/superpowers/plans/2026-07-26-twenty-shared-marketing-posters.md
@@ -0,0 +1,109 @@
+# Twenty Shared Marketing Posters Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Generate 20 original posters and expose the complete approved poster showcase through both Xtream and Stalker marketing fixtures.
+
+**Architecture:** A new pure Nx library owns provider-neutral poster-showcase metadata. Xtream and Stalker adapt the same ordered fixtures into their respective protocol shapes and independently serve the shared local PNG files.
+
+**Tech Stack:** TypeScript, Nx, Jest, Express, built-in image generation, PNG/sips validation
+
+---
+
+### Task 1: Create the shared fixture library
+
+**Files:**
+- Create: `libs/shared/marketing-fixtures/project.json`
+- Create: `libs/shared/marketing-fixtures/src/index.ts`
+- Create: `libs/shared/marketing-fixtures/src/lib/marketing-movie.fixture.ts`
+- Create: `libs/shared/marketing-fixtures/src/lib/marketing-movie.fixture.spec.ts`
+- Create: `libs/shared/marketing-fixtures/tsconfig.json`
+- Create: `libs/shared/marketing-fixtures/tsconfig.lib.json`
+- Create: `libs/shared/marketing-fixtures/tsconfig.spec.json`
+- Create: `libs/shared/marketing-fixtures/jest.config.ts`
+- Modify: `tsconfig.base.json`
+
+- [ ] Define a provider-neutral fixture type with category key, title, slug,
+  description, director, actors, genre, rating, tagline, and year.
+- [ ] Move the existing 15 poster-showcase fixtures into the library.
+- [ ] Add the 20 approved new fixtures before the existing fixtures.
+- [ ] Add Jest coverage for exact counts, unique titles/slugs, ordering, and
+  valid category keys.
+- [ ] Run `pnpm nx test shared-marketing-fixtures` and
+  `pnpm nx lint shared-marketing-fixtures`.
+
+### Task 2: Generate the 20 posters
+
+**Files:**
+- Create: `apps/xtream-mock-server/public/marketing/poster/black-harbor.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/the-paper-astronaut.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/summer-static.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/house-of-tides.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/open-late.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/white-room-six.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/field-notes.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/a-thousand-steps.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/the-small-hours.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/copper-rain.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/willow-engine.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/quiet-thunder.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/parallel-kitchens.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/first-string.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/the-long-museum.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/cloud-hotel.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/unpaid-overtime.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/deep-green.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/november-radio.png`
+- Create: `apps/xtream-mock-server/public/marketing/poster/the-last-orange.png`
+
+- [ ] Issue one built-in image-generation request per title.
+- [ ] Inspect title spelling, composition, originality, and forbidden text.
+- [ ] Copy approved outputs into the project and downscale with
+  `sips -z 768 512`.
+- [ ] Verify every file is an RGB PNG at exactly 512 × 768.
+- [ ] Build and inspect a 5 × 4 contact sheet of the final project files.
+
+### Task 3: Adapt Xtream to the shared showcase
+
+**Files:**
+- Modify: `apps/xtream-mock-server/src/app/generators/marketing.generator.ts`
+- Modify: `apps/xtream-mock-server/README.md`
+- Modify: `docs/architecture/xtream-mock-server.md`
+
+- [ ] Replace the local `POSTER_SHOWCASE_MOVIES` metadata with a mapping from
+  the shared fixture library.
+- [ ] Put showcase movies before generated-artwork movies in `MOVIES`.
+- [ ] Keep `listMarketingArtworkFixtures()` limited to the original generated
+  artwork pack.
+- [ ] Update documented title counts from 45 to 65.
+- [ ] Run `pnpm nx lint xtream-mock-server`.
+
+### Task 4: Add the Stalker marketing scenario
+
+**Files:**
+- Modify: `apps/stalker-mock-server/src/app/scenarios.ts`
+- Modify: `apps/stalker-mock-server/src/app/data-generator.ts`
+- Modify: `apps/stalker-mock-server/src/main.ts`
+- Modify: `apps/stalker-mock-server/README.md`
+- Modify: `docs/architecture/stalker-mock-server.md`
+
+- [ ] Add `marketingFixture?: true` and MAC `00:1A:79:00:00:07`.
+- [ ] Build deterministic Stalker VOD categories/items from the shared fixture.
+- [ ] Add the local poster asset route backed by the shared PNG directory.
+- [ ] Document credentials, offline artwork behavior, and screenshot use.
+- [ ] Run `pnpm nx lint stalker-mock-server`.
+
+### Task 5: Verify both providers
+
+**Files:**
+- Inspect all files changed above.
+
+- [ ] Run `pnpm nx test shared-marketing-fixtures`.
+- [ ] Start both mock servers with Nx.
+- [ ] Assert Xtream returns all 35 showcase titles and the 20 new titles first.
+- [ ] Assert Stalker marketing VOD returns all 35 showcase titles and the 20 new
+  titles first.
+- [ ] Fetch every new poster URL from both servers and assert `image/png`.
+- [ ] Run `pnpm run release:notes:validate` and `git diff --check`.
+- [ ] Confirm docs are updated; skip a release note because mock-server and
+  documentation paths are release-gate exempt.
diff --git a/docs/superpowers/specs/2026-07-16-frame-copy-shared-controls-design.md b/docs/superpowers/specs/2026-07-16-frame-copy-shared-controls-design.md
new file mode 100644
index 000000000..b05b1b92e
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-16-frame-copy-shared-controls-design.md
@@ -0,0 +1,161 @@
+# Frame-Copy Shared Controls Design
+
+## Status
+
+Approved as part of the embedded-MPV merge plan: reuse the shared player
+contract from #1148, keep the frame-copy renderer from #1169/#1171/#1175, and
+replace the obsolete transparent-window/native-fullscreen direction from
+#1150/#1151.
+
+## Goal
+
+Use `app-player-controls` as the controls UI for embedded MPV when the active
+engine is `frame-copy`, while preserving the current compositor-safe controls
+dock and behavior for the `native` engine.
+
+## Non-goals
+
+- Do not make the Electron `BrowserWindow` transparent.
+- Do not place the macOS native MPV surface below Chromium.
+- Do not add native fullscreen IPC, fill-mode IPC, native-view attachment
+  APIs, or bounds-tick machinery.
+- Do not change the shared `PlayerController` contract.
+- Do not migrate the native-view engine to overlay controls.
+- Do not change HTML5, Video.js, or ArtPlayer in this PR.
+
+## Alternatives
+
+### 1. Rebase and merge old #1150
+
+Rejected. Its component and layout depend on a transparent macOS window,
+`NSWindowBelow`, immersive backdrop/tunnel services, and compositor hooks that
+#1149 deliberately removed. It also predates the frame-copy canvas.
+
+### 2. Extend shared controls with native fullscreen delegates
+
+Rejected. #1148 intentionally owns fullscreen through the DOM Fullscreen API.
+Adding a native delegate would expand the shared contract and Electron IPC for
+one engine while the frame-copy canvas already behaves like normal DOM.
+
+### 3. Frame-copy-only shared-controls adapter
+
+Selected. The frame-copy canvas can use ordinary DOM stacking and DOM
+fullscreen. The native-view engine retains its existing dock and compositor
+workarounds. This is the smallest change that validates the shared-controls
+architecture in production playback without reviving the discarded overlay
+design.
+
+## Architecture
+
+### Embedded MPV adapter
+
+Add a component-scoped `EmbeddedMpvControlsAdapter` implementing
+`PlayerController`.
+
+The adapter reads the canonical state and commands from
+`EmbeddedMpvSessionController`. The host configures it once with signal
+references for:
+
+- the current `ResolvedPortalPlayback`;
+- optional `SeriesPlaybackNavigation`; and
+- the recording folder.
+
+The adapter derives:
+
+- status and translated status message;
+- position, duration, live/VOD classification, and seekability;
+- volume;
+- translated audio/subtitle track labels;
+- playback-speed and aspect-ratio presets;
+- recording capability, active state, elapsed time, and feedback message; and
+- previous/next episode availability.
+
+Every control command delegates to the session controller. Async command
+failures remain contained by the existing command runner. Recording feedback is
+owned by the adapter only for the shared-controls path; the native controls
+keep their existing component-owned feedback.
+
+Translation-dependent state reacts to language, translation-file, and default
+language events. Recording intervals and dismissal timers are released when
+the component-scoped adapter is destroyed.
+
+### Host selection
+
+`EmbeddedMpvPlayerComponent` chooses exactly one controls system:
+
+- `support.engine === 'frame-copy'`: render `app-player-controls` over the
+  existing canvas and pass the player root as `playerSurface`;
+- every other embedded-MPV engine: render the current bespoke controls dock.
+
+The frame-copy canvas uses the full player box. The native engine continues to
+reserve the controls-dock height and keeps modal hiding and popover cutouts.
+
+The legacy shortcut, pointer, click, double-click, cursor, and document-pointer
+handlers become unavailable while frame-copy shared controls are active. This
+prevents duplicate commands because `PlayerControlsComponent` owns those
+interactions for its surface.
+
+The existing component-level `fullscreenchange` listener remains responsible
+for triggering embedded-MPV bounds synchronization. For frame-copy it does not
+reveal the legacy controls; `PlayerControlsComponent` handles its own
+fullscreen presentation state.
+
+### Loading and error presentation
+
+The current centered loading, stalled, unsupported, and error surfaces remain
+in `EmbeddedMpvPlayerComponent`. Shared controls receive the same status through
+the adapter so their visibility logic stays consistent, but this PR does not
+redesign the central status layer.
+
+### Series navigation
+
+Shared-controls previous/next outputs forward through the component's existing
+guarded episode outputs. Live playback never advertises series navigation.
+
+## Error handling
+
+- Missing or unsupported embedded MPV maps to the existing translated status
+  messages.
+- Command promises remain fire-and-forget at the shared contract boundary.
+- Recording start/stop failures produce persistent messages; successful stop
+  messages auto-dismiss after five seconds.
+- A newer recording message cancels the previous dismissal timer.
+- Destroying the adapter clears timers so late callbacks cannot update a dead
+  view.
+
+## Testing
+
+### Adapter unit coverage
+
+- capability mapping;
+- live/VOD and series-navigation mapping;
+- state/status mapping;
+- translated track labels and translation-event reactivity;
+- every delegated command;
+- recording success/failure messages;
+- elapsed recording time;
+- stale timer protection and destroy cleanup.
+
+### Host integration coverage
+
+- frame-copy renders the canvas plus shared controls and no legacy dock;
+- native renders the legacy dock and no shared controls;
+- shared surface clicks, double-clicks, and keyboard shortcuts execute once;
+- `showControls=false` detaches shared surface and shortcut behavior;
+- DOM fullscreen targets the player root and still triggers bounds sync;
+- previous/next outputs preserve navigation guards;
+- changing the reported engine never leaves both controls systems active.
+
+### Regression and validation
+
+Keep existing native embedded-MPV tests by making their support fixtures
+explicitly report `engine: 'native'`. Run focused UI playback tests and lint,
+repository typecheck/i18n checks, the Electron smoke E2E, and manual/CDP checks
+when a local frame-copy runtime is available.
+
+## Documentation impact
+
+Update the canonical controls and embedded-MPV architecture documents to state
+that frame-copy is the first shared-controls consumer while native-view remains
+on its dock. Update `AGENTS.md` and `CLAUDE.md` because both describe the
+embedded-MPV/player-controls ownership boundary.
diff --git a/docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md b/docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md
new file mode 100644
index 000000000..aaed92115
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-16-html5-shared-controls-design.md
@@ -0,0 +1,259 @@
+# HTML5 Shared Controls Design
+
+## Status
+
+Implemented and branch-validated as part of the
+embedded-MPV/shared-controls merge plan. This rebuilds the unique HTML5
+integration proposed in #1152 on top of the merged shared-controls contract and
+frame-copy implementation, without merging the obsolete stacked history from
+#1150/#1151. The guarded integration is pending pull-request review and merge;
+the rollout default remains off.
+
+## Goal
+
+Use `app-player-controls` as the optional controls UI for the built-in HTML5
+player while preserving its current native controls and behavior when
+`WEB_PLAYER_SHARED_CONTROLS` is disabled.
+
+## Non-goals
+
+- Do not enable `WEB_PLAYER_SHARED_CONTROLS` by default.
+- Do not change the generic `PlayerController` or
+  `WebVideoControlsAdapter` contracts.
+- Do not infer live/VOD state from `HTMLVideoElement.duration`.
+- Do not migrate Video.js or ArtPlayer in this PR.
+- Do not redesign playback diagnostics or replace their existing banner.
+- Do not add engine-specific knowledge to the generic shared-controls adapter.
+
+## Why the old #1152 commit is not merged directly
+
+The old commit correctly identified the HTML5 `<video>` element as a natural
+consumer of `WebVideoControlsAdapter`, but its implementation predates the
+current playback metadata, diagnostic overlay, MPEG-TS VOD handling, and
+track-lifecycle requirements. In particular, it:
+
+- classified live playback from `video.duration`;
+- attached only a bare video adapter with no HLS/native track bridge;
+- did not cleanly rebind engine listeners on source replacement;
+- did not disable interactions while playback diagnostics own the UI; and
+- used the custom-element host instead of the actual player shell as the
+  fullscreen and pointer surface.
+
+The new implementation keeps the useful feature-flagged UI switch while
+rebuilding its lifecycle against the current architecture.
+
+## Architecture
+
+### Authoritative playback classification
+
+`WebPlayerViewComponent` exposes one `resolvedIsLive` computed value:
+
+1. an explicit `ResolvedPortalPlayback.isLive` value wins;
+2. otherwise playback with `contentInfo` is VOD; and
+3. playback without `contentInfo` is live.
+
+The same value configures Video.js and is passed to
+`HtmlVideoPlayerComponent`. The HTML5 player passes it to mpegts.js and to the
+shared-controls adapter. Media duration is never used to decide whether a
+source is live.
+
+### HTML5 controls bridge
+
+Add a player-local `HtmlVideoPlayerControlsBridge`. It owns all glue between
+the engine-specific source lifecycle and the engine-agnostic
+`WebVideoControlsAdapter`:
+
+```ts
+type HtmlVideoControlsSource =
+    | { kind: 'native' }
+    | { kind: 'mpegts' }
+    | { kind: 'hls'; hls: Hls };
+
+interface HtmlVideoPlayerControlsBridgeConfig {
+    video: HTMLVideoElement;
+    adapter: WebVideoControlsAdapter;
+    isLive: () => boolean;
+    showCaptions: () => boolean;
+}
+```
+
+The bridge:
+
+- attaches the adapter once;
+- supplies authoritative live/VOD and corrected duration accessors;
+- projects HLS audio and subtitle tracks into shared `PlayerTrack` values;
+- projects native text tracks for native and mpegts.js sources;
+- refreshes the adapter when engine track state changes;
+- applies caption preference until the user makes an explicit per-source
+  subtitle choice;
+- removes listeners before an HLS instance is destroyed; and
+- supports idempotent source clearing and destruction.
+
+The implementation keeps the bridge focused by delegating HLS projection and
+caption policy to `HtmlVideoPlayerHlsControls`, and native text-track identity
+and policy to `HtmlVideoPlayerNativeTextTracks`.
+
+`HtmlVideoPlayerComponent` remains responsible for creating and destroying
+native, HLS, and mpegts.js playback engines. Before replacing a source it asks
+the bridge to clear the current source, then tears down the old engine. Once
+the new engine exists it binds the corresponding source to the bridge.
+
+`HtmlVideoElementSession` owns the native video-element listeners, persisted
+volume, start-time/time/ended propagation, and the legacy post-play caption
+behavior. It initializes lazily because initial `ngOnChanges` may start
+playback before `ngOnInit` attaches the native event listeners.
+
+Angular calls the initial `ngOnChanges` before `ngOnInit`, so the component
+retains the current controls source even when playback starts before the bridge
+is created. `ngOnInit` creates the bridge, attaches the adapter, and binds that
+retained source.
+
+### MPEG-TS VOD duration
+
+Raw MPEG-TS VOD can leave `video.duration` at `Infinity`. For a non-live
+mpegts.js source, the corrected duration accessor uses the first finite,
+positive value from:
+
+1. `video.duration`;
+2. the last finite, positive `video.seekable.end(index)` value; and
+3. the last finite, positive `video.buffered.end(index)` value.
+
+Ranges are scanned from the end and accessor failures are ignored. If no
+duration is known, the accessor returns `NaN`. The adapter still classifies the
+source as VOD, but disables seeking until a positive duration and seekable
+range are available.
+
+### HLS tracks
+
+Shared track IDs are HLS list indices because the hls.js setters accept list
+indices.
+
+Audio tracks:
+
+- map `hls.audioTracks`;
+- select the item whose index equals `hls.audioTrack`;
+- label with `name`, then `lang`, then a translated-neutral numbered fallback;
+- reject non-integer and out-of-range selections; and
+- refresh on `AUDIO_TRACKS_UPDATED`, `AUDIO_TRACK_SWITCHING`, and
+  `AUDIO_TRACK_SWITCHED`.
+
+Subtitle tracks:
+
+- map `hls.subtitleTracks`;
+- mark a track selected only when `hls.subtitleDisplay` is true and its index
+  equals `hls.subtitleTrack`;
+- selecting `-1` sets `subtitleTrack = -1` and disables
+  `subtitleDisplay`;
+- selecting a valid index enables `subtitleDisplay` and assigns the index;
+- reject other invalid values; and
+- refresh on `SUBTITLE_TRACKS_UPDATED`, `SUBTITLE_TRACKS_CLEARED`, and
+  `SUBTITLE_TRACK_SWITCH`.
+
+The bridge also refreshes on `MANIFEST_LOADING`, because the installed hls.js
+version clears its internal audio/subtitle groups at manifest start without
+emitting an audio-track-cleared event.
+
+### Native text tracks
+
+Native and mpegts.js sources expose `video.textTracks`. The bridge includes
+only `subtitles` and `captions` tracks and assigns stable numeric IDs through a
+per-source `WeakMap<TextTrack, number>`, so removals or reordering do not change
+the identity of remaining tracks.
+
+It listens for `addtrack`, `removetrack`, and `change`. Selecting a valid ID
+sets that track to `showing` and hides other caption/subtitle tracks. Selecting
+`-1` hides all of them. A stale or invalid ID is a no-op.
+
+### Caption preference and user override
+
+Each source starts without an explicit subtitle override:
+
+- `showCaptions = false` actively hides default tracks, including tracks added
+  after playback starts;
+- `showCaptions = true` preserves the engine-selected/default state and does
+  not arbitrarily select the first track. If the bridge previously suppressed
+  that state while the preference was off, it restores the remembered engine
+  modes when the preference returns to on.
+
+Once the user selects a subtitle track or explicitly turns subtitles off, that
+choice wins over later track events and settings emissions for the rest of the
+source. Replacing or clearing the source resets the override.
+
+The feature-flag-off path keeps the current post-play caption behavior
+unchanged.
+
+### Shared-controls host and interaction ownership
+
+When `WEB_PLAYER_SHARED_CONTROLS` is enabled,
+`HtmlVideoPlayerComponent`:
+
+- removes the native video skin;
+- renders exactly one `app-player-controls`;
+- passes `.html-video-player-shell` as `playerSurface`;
+- forwards series-navigation events; and
+- uses a reactive signal for series-navigation context.
+
+When the flag is disabled, the native video controls and existing standalone
+series-navigation controls remain unchanged and the adapter is never attached.
+
+`WebPlayerViewComponent` derives
+`playbackInteractionEnabled = visiblePlaybackDiagnostic() === null` and passes
+it to the HTML5 player. The HTML5 shared-controls instance binds both
+`showControls` and `shortcutsEnabled` to that input. This hides the bar,
+detaches click/double-click ownership, and disables shortcuts while the
+diagnostic banner is active. Retrying or clearing the diagnostic re-enables
+interactions. Because the diagnostic banner is outside the HTML5 fullscreen
+shell, disabling interactions also exits fullscreen when that shell is the
+current fullscreen owner; unrelated fullscreen elements are not affected.
+
+## Error handling and cleanup
+
+- Invalid or stale track selections are ignored.
+- Track/range accessors tolerate transient browser exceptions.
+- Old HLS listeners are removed before `hls.destroy()`.
+- `clearSource()` and `destroy()` are idempotent.
+- Destroying the component removes native media listeners, destroys active
+  playback engines, removes text/HLS track listeners, and detaches the adapter.
+
+## Testing
+
+### Bridge unit coverage
+
+- MPEG-TS duration priority, invalid ranges, and throwing range accessors;
+- HLS audio/subtitle projection, selection, off state, and invalid IDs;
+- HLS update/switch refresh;
+- native text-track filtering, stable IDs, selection, and off state;
+- native add/remove/change refresh;
+- suppression of late default captions when the preference is off;
+- preservation of explicit selection/off across later events and preference
+  changes;
+- source replacement resetting the override;
+- old HLS listener removal on rebind; and
+- listener/adapter cleanup with idempotent destroy.
+
+### Component integration coverage
+
+- flag on: one shared-controls instance, no native skin or legacy series
+  controls;
+- flag off: native skin and legacy series controls, no adapter attachment;
+- the player shell is the interaction/fullscreen surface;
+- the interaction input gates both shared-controls inputs;
+- a diagnostic exits only the HTML5 player's own fullscreen shell;
+- series-navigation context remains reactive;
+- mpegts.js receives authoritative live/VOD metadata; and
+- source replacement does not retain old HLS tracks/listeners.
+
+### Web-player-view coverage
+
+- explicit `isLive` wins;
+- otherwise `contentInfo` means VOD and its absence means live;
+- the resolved value reaches the HTML5 player;
+- a visible diagnostic disables HTML5 shared interactions; and
+- retrying or clearing the diagnostic re-enables them.
+
+## Documentation impact
+
+Update `docs/architecture/player-controls-contract.md`, `AGENTS.md`, and
+`CLAUDE.md` to document the feature-flagged HTML5 consumer, authoritative
+live/VOD metadata, engine track bridge, and diagnostic interaction gating.
+The root README remains unchanged while the feature flag defaults to off.
diff --git a/docs/superpowers/specs/2026-07-16-videojs-shared-controls-design.md b/docs/superpowers/specs/2026-07-16-videojs-shared-controls-design.md
new file mode 100644
index 000000000..89c61285b
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-16-videojs-shared-controls-design.md
@@ -0,0 +1,174 @@
+# Video.js Shared Controls Replacement Design
+
+## Context
+
+PR #1153 proposed wiring Video.js into the shared `app-player-controls`
+layer. Its Video.js-specific ideas remain useful, but the stacked PR also
+contains superseded embedded-MPV and HTML5 work and cannot be merged directly.
+
+The replacement is built on the current `master`, after:
+
+- #1193 established frame-copy embedded MPV with shared controls.
+- #1194 established the current web-player controls contract, authoritative
+  live/VOD metadata, diagnostic interaction gating, and source-owned cleanup.
+
+The shared-controls feature flag remains disabled by default. Flag-off behavior
+must stay unchanged.
+
+## Goals
+
+- Render the shared controls over Video.js when the feature flag is enabled.
+- Preserve the native Video.js chrome and legacy series navigation when it is
+  disabled.
+- Expose Video.js audio and subtitle tracks through the common adapter.
+- Rebind all DOM-backed state when Video.js replaces its Tech `<video>`.
+- Keep diagnostics usable by disabling player interaction and exiting only the
+  fullscreen session owned by the Video.js shell.
+- Reduce `vjs-player.component.ts` below the 400-line hard limit.
+
+## Non-goals
+
+- Enable shared web controls by default.
+- Add Video.js quality selection to the generic controls contract.
+- Add generic aspect-ratio or PiP commands.
+- Generalize the HTML5 text-track helper before a second implementation proves
+  the abstractions are identical.
+
+## Key lifecycle decision
+
+Video.js 8.23.4 replaces the Tech `<video>` after `player.reset()`. A one-time
+adapter attachment is therefore invalid.
+
+The replacement must treat the Tech video as a session-owned resource:
+
+1. Acquire it from `player.tech({ IWillNotUseThisInPlugins: true }).el()`.
+2. Detach listeners and the adapter from the previous element.
+3. Attach them to the current element.
+4. Repeat after every `playerreset`.
+5. Destroy the bridge/session before `player.dispose()`.
+
+Raw MPEG-TS startup must wait for `playerreset`, but Video.js does not attach a
+request token to that event and can defer `reset()` behind a pending
+`play()`. The component therefore pauses first, coalesces reset-required source
+changes, and calls `reset()` only after `player.paused()` is true. Every
+`playerreset` rebinds the current Tech and applies the latest desired source,
+so a late reset cannot restore a superseded source.
+
+## Component boundaries
+
+### `vjs-player.types.ts`
+
+Owns the focused Video.js API types used by the component and collaborators.
+
+### `vjs-video-element-session.ts`
+
+Owns native Tech video listeners used in both flag states:
+
+- `loadeddata` / `playing` clear playback diagnostics.
+- `ended` emits the playback-ended output.
+
+### `vjs-player-reset-coordinator.ts`
+
+Owns pause-before-reset ordering, coalescing, actual-volume snapshots, reset
+volume-change suppression, and whether the desired source is already applied
+to the current Tech. This also prevents a pre-ready `playerreset` from starting
+raw MPEG-TS twice.
+
+- Rebind detaches the old video before attaching the new one.
+
+### `vjs-audio-tracks.ts`
+
+Owns:
+
+- legacy Video.js audio-menu logging/setup;
+- stable per-source IDs for shared controls;
+- valid selection and exact track-list listener cleanup.
+
+Invalid or stale IDs are no-ops.
+
+### `vjs-text-tracks.ts`
+
+Uses `player.textTracks()` because VHS remote subtitles are represented there.
+It:
+
+- exposes only `captions` and `subtitles`;
+- assigns stable per-source IDs with a `WeakMap`;
+- treats `-1` as explicit off;
+- keeps explicit off through preference and track-list events;
+- suppresses the selected default track while global captions are disabled;
+- disables non-selected tracks so VHS does not keep multiple tracks active.
+
+### `vjs-mpegts-session.ts`
+
+Owns raw MPEG-TS create/attach/load/play, VOD duration normalization,
+diagnostics, listener cleanup, and idempotent teardown.
+
+### `vjs-player-controls.bridge.ts`
+
+Owns the component-scoped `WebVideoControlsAdapter` binding:
+
+- attaches to the current Tech video;
+- rebinds only when the Tech element changes;
+- delegates audio/subtitle access to the track collaborators;
+- uses `player.duration()` as the corrected duration source;
+- clears source-specific IDs before source replacement;
+- refreshes live/VOD and caption inputs;
+- detaches exactly once on destroy.
+
+## Interaction ownership
+
+When shared controls are enabled:
+
+- the template does not expose native `controls`;
+- Video.js receives `controls: false`;
+- Video.js `userActions.click`, `doubleClick`, and `hotkeys` are disabled;
+- Video.js spatial navigation is disabled;
+- the stable `.vjs-player-shell` is the shared interaction/fullscreen surface;
+- `showControls` and `shortcutsEnabled` follow `interactionEnabled`;
+- a diagnostic exits fullscreen only when that shell owns
+  `document.fullscreenElement`.
+
+When the flag is disabled, existing Video.js options, chrome, plugins, and
+legacy series navigation remain unchanged.
+
+## Source transitions
+
+### Normal Video.js source
+
+1. Clear source-specific bridge/track state.
+2. Destroy any raw MPEG-TS session.
+3. Call `player.src(newSource)`.
+4. Activate the new bridge source and refresh classification.
+
+### Raw MPEG-TS source or empty source
+
+1. Clear source-specific bridge/track state.
+2. Destroy the current raw MPEG-TS session.
+3. Record the latest desired source and request one coalesced reset.
+4. Snapshot the actual Video.js volume and pause active playback.
+5. Call `player.reset()` only after `player.paused()` is true.
+6. On any `playerreset`, suppress/reset Video.js's temporary volume=1 change,
+   restore the snapshot, and rebind the current Tech video.
+7. Apply only the latest desired source and start mpegts.js when applicable.
+
+If authoritative `isLive` metadata changes for an active raw MPEG-TS URL, the
+same reset flow restarts mpegts.js with the corrected live/VOD mode and duration
+listener policy.
+
+## Testing strategy
+
+- Focused unit suites for video-session, audio tracks, text tracks, MPEG-TS,
+  and the controls bridge.
+- Component integration tests for both flag states, fullscreen/diagnostic
+  gating, reset ordering, and output forwarding.
+- Host tests that pass `interactionEnabled` and `showCaptions` to both
+  Video.js template branches.
+- Existing `ui-playback` tests/lint, workspace typecheck, coverage, full lint,
+  Web E2E, and Electron E2E before merge.
+
+## Attribution
+
+The replacement preserves the useful Video.js-specific direction from Lars
+Emig's #1153, especially the audio-track extraction and default-off dual-chrome
+model, while rebuilding it against the current lifecycle and controls
+architecture.
diff --git a/docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md b/docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md
new file mode 100644
index 000000000..096e50531
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-17-linux-embedded-mpv-frame-copy-packaging-design.md
@@ -0,0 +1,269 @@
+# Linux Embedded MPV Frame-Copy Packaging Design
+
+**Date:** 2026-07-17
+
+**Status:** Approved
+
+## Goal
+
+Ship a genuinely usable Embedded MPV frame-copy runtime in every official
+Linux x64 package format produced by IPTVnator: AppImage, DEB, RPM, Pacman,
+Snap, and Flatpak. Keep libmpv outside the Electron process, retain the
+existing native-view engine as a safe fallback, and never advertise
+frame-copy from artifact presence alone.
+
+Linux arm64 and armv7l remain out of scope for native Embedded MPV artifacts.
+The current CI cross-packages those architectures from an x64 host and cannot
+produce or exercise matching native addons. Those packages must continue to
+carry an explicit unavailable marker and must not contain x64 native binaries.
+
+## Evidence From The Existing Implementation
+
+- `apps/electron-backend/native/binding.gyp` builds three distinct artifacts:
+  the native-view addon, the N-API shared-memory frame reader, and the
+  `iptvnator_mpv_helper` process. On Linux only the helper links `-lmpv`; the
+  addon uses X11/Xext/dlopen and must remain free of libmpv linkage.
+- `tools/packaging/embedded-mpv-frame-copy-files.cjs` deliberately deletes the
+  helper from every Linux package.
+- `tools/packaging/embedded-mpv-packaging.cjs` rejects Linux packages that
+  contain either the helper or libmpv, and accepts only the
+  `external-mpv-process` manifest origin.
+- `resolveFrameCopyHelperPath()` currently treats an executable helper plus a
+  readable reader addon as a usable runtime. It does not prove that the ELF
+  loader can resolve libmpv or that libmpv/EGL initialization works.
+- `.github/workflows/build-and-make.yaml` builds and verifies the Linux helper
+  against Ubuntu's system libmpv, then relies on the after-pack hook to remove
+  it. The same x64 build output is used for foreign-architecture Linux
+  packages, which receive the unavailable marker.
+- Electron Builder creates one unpacked application layout before producing
+  multiple distributable targets. A system-runtime layout and a bundled
+  portable-runtime layout therefore cannot safely share one packaging pass.
+
+## Selected Distribution Strategy
+
+Linux packaging is split into explicit profiles:
+
+| Profile    | Formats          | libmpv strategy                                                            |
+| ---------- | ---------------- | -------------------------------------------------------------------------- |
+| `system`   | DEB, RPM, Pacman | Depend on the distribution package and resolve `libmpv.so.2` from the host |
+| `portable` | AppImage, Snap   | Bundle the pinned LGPL-compatible runtime closure under `native/lib`       |
+| `flatpak`  | Flatpak          | Bundle the same pinned LGPL-compatible runtime closure under `native/lib`  |
+
+The official CI matrix must run these profiles independently. The packaging
+hook receives the profile through a required environment value and validates
+that the selected target set matches the runtime mode. It must fail closed if
+an official x64 package is requested with an absent, incomplete, or ambiguous
+profile.
+
+Flatpak is an isolated packaging pass and keeps `iptvnator` as the real
+Electron ELF so Electron Builder's `electron-wrapper` passes it directly to
+Zypak. Other Linux targets retain the conditional `iptvnator` wrapper and
+`iptvnator.bin`. Mixed Flatpak/non-Flatpak target sets fail before mutation.
+
+System package dependencies are:
+
+- DEB: `libmpv2`, `libegl1`, `libgl1`, `libgbm1`
+- RPM: `mpv-libs`, `libglvnd-egl`, `libglvnd-glx`, `mesa-libgbm`
+- Pacman: `mpv`, `libglvnd`, `mesa`
+
+These names match the current Debian, Fedora, and Arch package databases and
+cover every direct helper interface: libmpv, EGL, GL, and GBM. The helper
+links `libGL.so.1` rather than `libOpenGL.so.0`, matching both the distro
+contracts and Snap's graphics provider. System
+packages do not copy libmpv into IPTVnator. The helper keeps an `$ORIGIN/lib`
+RUNPATH first for a consistent binary, but naturally resolves the system SONAME
+when the private directory is absent.
+
+Portable and sandboxed packages use a source-built runtime rather than copying
+the Ubuntu runner's mpv package. The runtime build is checksum/version pinned,
+uses FFmpeg without GPL/nonfree switches and mpv with `-Dgpl=false`, records
+sources and exact flags in the manifest, and keeps shared libraries replaceable
+under the LGPL. The minimal codec baseline is FFmpeg's built-in LGPL decoders,
+demuxers, protocols, and software scaling/resampling plus libass text
+subtitles. Hardware decoding remains opportunistic through host Mesa/driver
+interfaces and must fall back to software decoding.
+
+The source build also pins the `hwdata` v0.409 archive and its SHA-256 because
+libdisplay-info 0.1.1 compiles `pnp.ids` into its generated vendor lookup
+table. The builder stages that file with private `hwdata.pc` metadata and
+restricts libdisplay-info's native pkg-config search to the staged prefix, so
+Meson's `/usr/share/hwdata/pnp.ids` fallback cannot make the runtime depend on
+unrecorded host data. The runtime manifest records this build-input
+relationship. Release source bundles must include the exact hwdata archive and
+its dual-license notice (`GPL-2.0-or-later OR XFree86-1.0`) alongside the
+MIT-licensed libdisplay-info source.
+
+The strict Snap uses `base: core22`, a private `shared-memory` plug, and an
+exact `graphics-core22` content plug targeting a real empty mode-0755
+`$SNAP/graphics` with external `mesa-core22` as default provider. The graphics provider supplies
+EGL/GL/GLX/GBM/DRM/VA; Electron Builder's GNOME content runtime supplies
+ALSA/PulseAudio. Those shared providers are not copied into IPTVnator's Snap or
+source/notices archive. Because core22 does not synthesize `$SNAP` content
+targets, the package hook creates the empty directory and extracted-artifact
+validation checks its type and emptiness. The metadata also declares exactly
+the canonical graphics layouts: `/usr/share/libdrm` binds from
+`$SNAP/graphics/libdrm`, and `/usr/share/drirc.d` symlinks to
+`$SNAP/graphics/drirc.d`. Locally installed `--dangerous` artifacts explicitly
+install and connect both providers in CI, disconnect `graphics-core22` to
+require an unavailable application diagnostic with exit code `1`, then
+reconnect it and require success.
+
+## Runtime Layout And Linkage
+
+The x64 packaged native directory is:
+
+```text
+resources/app.asar.unpacked/electron-backend/native/
+  embedded_mpv.node
+  embedded_mpv_frame_reader.node
+  iptvnator_mpv_helper
+  embedded-mpv-runtime.json
+  lib/
+    libmpv.so.2
+    libavcodec.so.*
+    libavformat.so.*
+    libavutil.so.*
+    libavfilter.so.*
+    libswresample.so.*
+    libswscale.so.*
+    libass.so.*
+    ...other non-system runtime dependencies
+```
+
+For `system`, `lib/` is absent and the manifest declares the required SONAME
+and package-family dependency. For `portable` and `flatpak`, `lib/` contains
+the complete non-system dependency closure. ELF dependencies inside that
+closure and the helper use only SONAMEs plus `$ORIGIN`-relative RPATH/RUNPATH;
+they may not retain build-prefix paths.
+
+`embedded_mpv.node`, the Electron executable (`iptvnator` for Flatpak;
+`iptvnator.bin` for other Linux targets), and Electron's shipped libraries must
+not have a direct `DT_NEEDED` entry for libmpv.
+`iptvnator_mpv_helper` must have one. Process isolation is an invariant, not a
+profile-specific choice. The source `electron-backend/native{,/**/*}` tree is
+excluded from `app.asar`; `afterPack` is the sole owner of the normalized
+unpacked native directory, and package checks reject every archived native
+entry. The pristine Electron tree is scanned recursively
+before target packaging. Because Snap later overlays package-manager
+`lib/**`/`usr/lib/**` trees into the payload root, its extracted-target scan
+excludes exactly those two target-provided trees while remaining recursive
+everywhere else. Electron-library symlinks outside those roots fail closed.
+
+The manifest records:
+
+- schema version, platform, architecture, profile, and runtime origin;
+- required helper/reader names and executable/readable expectations;
+- libmpv SONAME and either system package requirements or bundled files;
+- source package versions, URLs/checksums, license identifiers, and exact
+  FFmpeg/mpv build flags for bundled profiles;
+- the pinned hwdata `pnp.ids` build input consumed by libdisplay-info;
+- runtime closure and total byte size;
+- the native-view backend contract and the fact that only the helper links
+  libmpv.
+
+## Honest Capability Detection
+
+The helper gains a side-effect-free `--runtime-probe` mode. It must:
+
+1. load through the normal ELF loader and therefore prove that all `DT_NEEDED`
+   dependencies resolve;
+2. create and initialize an idle libmpv handle with `vo=libmpv`;
+3. create the platform render pipeline far enough to prove EGL/OpenGL/GBM
+   availability without opening media;
+4. create, map, validate, and destroy the minimal shared-memory ring required
+   by playback;
+5. emit one versioned JSON result and exit promptly with status zero only on
+   success.
+
+The main process invokes this probe synchronously with a bounded timeout before
+BrowserWindow creation. Probe success is cached for the process lifetime.
+The probe environment prepends the packaged `native/lib` directory only when
+the manifest declares a bundled runtime. The system profile does not inject a
+private loader path. Snap additionally rebuilds its loader and graphics-driver
+variables from validated host GL, `$SNAP/graphics`, exact GNOME-platform, and
+generic core22 roots; ambient preload/audit/library/driver overrides and
+caller-provided architecture triplets are not inherited. The direct provider
+wrapper launch also removes shell startup/options, tracing hooks, and exported
+functions and fixes `PATH` to immutable core22 system directories.
+
+Packaging CI invokes the full main-process gate with the exact
+`--embedded-mpv-runtime-probe` application switch. It executes before
+BrowserWindow startup, writes one availability JSON line, and exits zero only
+for a usable runtime. CI does not treat a direct helper invocation or an
+environment opt-in as proof of packaged capability.
+
+Frame-copy is usable only when all of the following are true:
+
+- platform and architecture are supported;
+- helper and reader are regular files with correct access modes;
+- the runtime manifest is present, parses, matches Linux/x64, names the actual
+  artifacts, and uses an allowed profile/origin;
+- every manifest-declared bundled file exists as a readable regular file;
+- `--runtime-probe` succeeds and returns the expected protocol version.
+
+Any failure returns `false`, keeps the renderer sandbox enabled, and makes the
+native service choose native-view. The capability result includes a stable
+reason code for tracing and diagnostics but does not crash startup.
+
+If dependencies disappear after startup, helper spawn/early-exit remains a
+session error and follows the existing renderer fallback path. The helper is
+never loaded into Electron as a library.
+
+## Packaging And CI Validation
+
+Unit and packaging tests cover:
+
+- profile-to-target mapping and rejection of mixed system/bundled passes;
+- Linux runtime staging, manifest normalization, closure collection, RPATH,
+  file modes, and stale-artifact cleanup;
+- package validation for system, portable, Flatpak, foreign architecture, and
+  malformed/incomplete manifests;
+- capability probe timeout, nonzero exit, invalid JSON, manifest mismatch,
+  missing dependency, and successful result caching;
+- exclusion of all native payloads from `app.asar`, including marker-only ARM
+  and system-package stale x64 artifacts;
+- helper probe protocol and failure behavior;
+- package metadata dependencies for DEB/RPM/Pacman.
+
+Linux CI must:
+
+1. build or restore the pinned x64 LGPL runtime;
+2. build the addon, reader, and helper once against that staged runtime;
+3. prove with `readelf`/`ldd` that Electron and `embedded_mpv.node` do not link
+   libmpv and the helper does;
+4. package the three profiles independently;
+5. unpack or mount each produced format and validate its real payload, modes,
+   manifest, RPATH, dependency closure, and profile;
+6. install/run the application-level packaged gate inside the actual Snap and
+   Flatpak (with the exact Freedesktop 24.08 EGL external-platform path
+   reconstructed inside `/app`), and probe the AppImage payload;
+7. install system packages in matching disposable distro containers and run
+   the helper probe after the declared libmpv dependency is installed;
+8. run a packaged Electron smoke test that confirms frame-copy capability,
+   creates a helper session against a deterministic local media fixture, sees
+   at least one frame/snapshot, and then repeats with libmpv hidden or removed
+   to prove non-crashing native-view fallback.
+
+Checks that require Linux kernel/package tooling or GPU/EGL are CI-only.
+macOS development can run all pure Node/Jest tests and static source checks,
+but cannot establish Linux ELF, package-manager, sandbox, or rendering
+behavior.
+
+## Documentation And Release Compliance
+
+Update `docs/architecture/embedded-mpv-native.md`,
+`tools/embedded-mpv/README.md`, `vendor/embedded-mpv/README.md`,
+`AGENTS.md`, and `CLAUDE.md`. The docs must describe the x64 format matrix,
+profile selection, manifest/probe contract, process-isolation invariant,
+fallback behavior, source-distribution obligations, codec baseline, and ARM
+status.
+
+Release artifacts must publish the generated runtime manifest and exact source
+archives/metadata required by the recorded LGPL source-distribution statement.
+The libplacebo payload is a VCS-metadata-free working-tree snapshot with exact
+commit/submodule records, so clone-local `.git` state cannot perturb the
+compliance tar. Automated Snap publication must wait for a public `v*` release
+that already contains both the Snap assets and the exact source archive. Snap
+Store publication remains outside this implementation and requires its
+separate release workflow; repository integration follows explicit maintainer
+authorization.
diff --git a/docs/superpowers/specs/2026-07-17-shared-web-picture-in-picture-design.md b/docs/superpowers/specs/2026-07-17-shared-web-picture-in-picture-design.md
new file mode 100644
index 000000000..823d9bd66
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-17-shared-web-picture-in-picture-design.md
@@ -0,0 +1,272 @@
+# Shared Web Picture-in-Picture Design
+
+## Status
+
+Selected as the first follow-up to the shared web-player controls rollout.
+
+## Goal
+
+Restore Picture-in-Picture (PiP) in IPTVnator's shared controls for the three
+`<video>`-backed web engines:
+
+- HTML5/hls.js;
+- Video.js; and
+- ArtPlayer.
+
+The feature must use the same button, accessibility behavior, capability
+gating, and lifecycle rules in all three engines.
+
+## Non-goals
+
+- Do not add PiP, a popup, or an always-on-top mini-player for Embedded MPV.
+- Do not add AirPlay or Cast.
+- Do not implement Document Picture-in-Picture.
+- Do not move IPTVnator's Angular controls into the operating-system PiP
+  window.
+- Do not add a PiP keyboard shortcut.
+- Do not change the default-off rollout behavior of shared web controls.
+- Do not alter the existing vendor/native controls when shared controls are
+  disabled.
+
+## Architecture decision
+
+PiP becomes an explicit part of the engine-neutral `PlayerController`
+contract:
+
+```ts
+interface PlayerControlsCapabilities {
+    pictureInPicture: boolean;
+}
+
+interface PlayerControlsState {
+    pictureInPictureActive: boolean;
+    canPictureInPicture: boolean;
+}
+
+interface PlayerControlsCommands {
+    togglePictureInPicture(): void;
+}
+```
+
+`WebVideoControlsAdapter` owns the standard browser PiP integration because it
+already owns and rebinds the current `HTMLVideoElement`. This is especially
+important for Video.js, which can replace its Tech `<video>` after
+`playerreset`.
+
+The shared presentation remains independent of HTML5, Video.js, and ArtPlayer:
+it reads the generic capability/state and invokes the generic command.
+
+Embedded MPV advertises `pictureInPicture: false`, reports inactive/unavailable
+state, and implements a no-op command. This is contract compatibility only; no
+Embedded MPV PiP surface or popup is introduced.
+
+### Rejected alternatives
+
+Passing a separate `HTMLVideoElement` input to `app-player-controls` would keep
+PiP outside the controller, like DOM fullscreen, but would require bespoke
+target wiring and replacement handling in every web-player host.
+
+Calling Video.js and ArtPlayer vendor PiP APIs directly would duplicate
+feature detection, ownership, failure handling, and lifecycle behavior. It
+would also leave the HTML5 player on a separate implementation.
+
+## Capability and state semantics
+
+`pictureInPictureActive` is true only when
+`document.pictureInPictureElement === attachedVideo`.
+
+The adapter can request PiP when all of the following hold:
+
+- an `HTMLVideoElement` is attached;
+- `document.pictureInPictureEnabled === true`;
+- `video.requestPictureInPicture` is a function;
+- `document.exitPictureInPicture` is a function; and
+- `video.disablePictureInPicture !== true`.
+
+The `pictureInPicture` capability is true when the adapter can request PiP or
+when the attached video is already active and the browser still exposes
+`document.exitPictureInPicture()`. This keeps the exit action available if the
+element's disable flag or the document support flag changes after entry.
+
+`canPictureInPicture` is false while an enter/exit operation is pending.
+Otherwise, it is true when:
+
+- the attached video is already the active PiP owner and the browser exposes
+  `document.exitPictureInPicture()`, so the user can exit; or
+- the adapter can request PiP and the video has loaded metadata
+  (`readyState >= 1`, equivalent to `HTMLMediaElement.HAVE_METADATA`).
+
+Browser `enterpictureinpicture` and `leavepictureinpicture` events are
+authoritative. The adapter does not optimistically report an active state
+before the browser confirms entry. Settled promises trigger a reconciliation
+refresh as a fallback for unusual browser event ordering.
+
+## Command behavior
+
+`togglePictureInPicture()` is fire-and-forget, matching the existing command
+contract:
+
+- when the attached video owns PiP, call `document.exitPictureInPicture()`;
+- otherwise, call `video.requestPictureInPicture()`;
+- ignore the command when capability/readiness gating fails;
+- ignore an additional toggle while an enter/exit operation is pending;
+- contain synchronous exceptions and rejected promises; and
+- never emit an unhandled rejection.
+
+The request call starts synchronously inside the button click so browser user
+activation is preserved.
+
+Fullscreen and PiP remain separate browser-managed presentation modes.
+IPTVnator does not await one transition before requesting the other, because
+that can consume the initiating user activation. The adapter and fullscreen
+helper reconcile the browser's resulting events.
+
+## Lifecycle and ownership
+
+The adapter attaches exact `enterpictureinpicture` and
+`leavepictureinpicture` listeners to its current video alongside the existing
+media listeners.
+
+Source replacement on the same video element does not exit PiP. This allows a
+normal HTML5 or Video.js source change that retains its current video element
+to continue in the existing PiP window and show the new source. ArtPlayer
+currently rebuilds its player and video element on channel changes, so that
+replacement follows the owned-target cleanup below and exits PiP.
+
+When the adapter detaches or rebinds to a replacement video:
+
+1. it removes listeners from the old video;
+2. if and only if the old video currently owns PiP, it best-effort exits PiP;
+3. it clears local active/pending state;
+4. it invalidates old asynchronous completions; and
+5. it binds the replacement video as the only authoritative target.
+
+An unrelated document PiP element must never be closed by this adapter.
+Stale events or promise completions from an old target must not mutate the new
+target's state.
+
+Video.js Tech replacement therefore exits PiP owned by the old Tech and does
+not automatically enter PiP on the replacement Tech. Automatic re-entry would
+require a new user gesture and is intentionally not attempted.
+
+Destroying HTML5, Video.js, or ArtPlayer performs the same owned-target cleanup.
+A playback diagnostic hiding shared controls does not itself close PiP; the
+browser-provided PiP window still has its own close affordance, and target
+teardown remains the ownership boundary.
+
+## Shared controls UI
+
+The PiP action is rendered immediately before fullscreen.
+
+- It is omitted when `pictureInPicture` is false.
+- It is disabled while `canPictureInPicture` is false.
+- `aria-pressed` reflects `pictureInPictureActive`.
+- Tooltip and accessible text use
+  `EMBEDDED_MPV.PLAYER.ENTER_PICTURE_IN_PICTURE` and
+  `EMBEDDED_MPV.PLAYER.EXIT_PICTURE_IN_PICTURE`.
+- The inactive and active states use distinct Material icons.
+- Clicking it reveals the controls and invokes the command exactly once.
+
+Both translation keys are added to every locale file. No shortcut is added in
+this change.
+
+Standard element PiP displays video frames in an OS/browser-managed window. It
+does not display IPTVnator's Angular control bar or other DOM overlays.
+Subtitle display inside PiP remains dependent on browser support for the
+active native text track.
+
+## Engine behavior
+
+### HTML5
+
+The existing shared-controls bridge attaches `WebVideoControlsAdapter` to the
+component's real `<video>`. No separate PiP host wiring is required.
+
+### Video.js
+
+The existing bridge attaches to the current Tech `<video>` and rebinds after
+`playerreset`. The adapter's owned-target cleanup handles PiP during that
+replacement. Video.js's vendor PiP button remains available when shared
+controls are disabled.
+
+### ArtPlayer
+
+The existing neutral source bridge attaches to `player.video`. Shared mode
+keeps ArtPlayer's vendor `pip: false` option so exactly one PiP button is
+rendered. Legacy mode keeps the existing `pip: true` behavior.
+
+### Embedded MPV
+
+Both frame-copy and native-view Embedded MPV remain without PiP. No window,
+popup, frame-copy routing, or native addon behavior is added.
+
+## Error handling
+
+PiP can fail because of missing metadata, browser policy, lost user activation,
+or an OS-level denial. Such failures:
+
+- do not change playback state;
+- do not create persistent error UI;
+- do not mark PiP active;
+- clear the pending gate; and
+- leave the button available for a later user retry when the runtime still
+  reports support.
+
+## Testing strategy
+
+### Contract and shared UI
+
+- defaults keep PiP capability/state false;
+- the button is absent without capability;
+- supported-but-not-ready state renders a disabled action;
+- inactive and active labels/icons/`aria-pressed` are correct; and
+- a click invokes `togglePictureInPicture()` once.
+
+### Web adapter
+
+- feature-detection matrix for document/video APIs and
+  `disablePictureInPicture`;
+- metadata readiness gating;
+- request when inactive and exit when active;
+- authoritative enter/leave event reconciliation;
+- pending-toggle serialization;
+- synchronous throw and rejected-promise containment;
+- listener cleanup;
+- same-element source refresh preserving active PiP;
+- active old video to replacement video exits only the old owner;
+- stale old-video events/completions cannot mutate the replacement; and
+- detach never exits an unrelated PiP element.
+
+### Engine integrations
+
+- HTML5 shared mode exposes web PiP through its attached video;
+- Video.js Tech replacement rebinds PiP authority and cleans up the old owner;
+- ArtPlayer shared mode exposes shared PiP while vendor PiP stays disabled;
+- ArtPlayer channel rebuild exits PiP owned by the replaced video;
+- all three flag-off paths retain their existing native/vendor chrome; and
+- Embedded MPV remains capability-false.
+
+### Validation
+
+Run:
+
+```bash
+pnpm nx test ui-playback --skip-nx-cache --runInBand
+pnpm nx lint ui-playback --skip-nx-cache
+pnpm nx build web --configuration=development --skip-nx-cache
+```
+
+Unit tests cannot prove that an OS-managed PiP window opens. Perform a manual
+smoke test in a supported Chromium/Electron runtime for each web engine:
+
+1. open a playable stream;
+2. enter and exit PiP;
+3. change source on the same element where applicable;
+4. switch or destroy the player host; and
+5. confirm the legacy controls path is unchanged.
+
+## Documentation impact
+
+Update `docs/architecture/player-controls-contract.md` with the capability,
+state, command, lifecycle, and browser limitations. Mirror the concise shared
+controls summary in `AGENTS.md` and `CLAUDE.md`.
diff --git a/docs/superpowers/specs/2026-07-17-web-player-shared-controls-setting-design.md b/docs/superpowers/specs/2026-07-17-web-player-shared-controls-setting-design.md
new file mode 100644
index 000000000..1e055419e
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-17-web-player-shared-controls-setting-design.md
@@ -0,0 +1,210 @@
+# Web-Player Shared Controls Setting Design
+
+## Context
+
+The shared `app-player-controls` presentation is already integrated with four
+playback paths:
+
+- Embedded MPV frame-copy uses it unconditionally because its video is rendered
+  into a DOM canvas.
+- HTML5, Video.js, and ArtPlayer can use it behind the default-off
+  `WEB_PLAYER_SHARED_CONTROLS` rollout token.
+
+The web-player token currently resolves from the compile-time
+`WEB_PLAYER_SHARED_CONTROLS_ENABLED = false` constant. Enabling the integrations
+therefore requires a code change, rebuild, and application restart. The
+integrations are ready for opt-in testing, so the rollout choice should be a
+persisted user setting instead.
+
+The Settings route does not keep an active player mounted. The setting can
+therefore be applied when the next playback session is created; changing an
+already-running engine or preserving an active playback position is not
+required.
+
+## Goals
+
+- Add an experimental Playback checkbox for opting HTML5, Video.js, and
+  ArtPlayer into the shared controls.
+- Persist the choice in the canonical `SettingsStore`.
+- Apply the saved choice to the next web-player session without restarting or
+  reloading the application.
+- Keep the controls mode immutable for the lifetime of a player session.
+- Preserve default-off behavior and compatibility with existing stored
+  settings.
+- Keep Embedded MPV and external-player behavior unchanged.
+
+## Non-goals
+
+- Make shared web controls the default.
+- Change an active player between legacy and shared controls.
+- Add separate preferences for HTML5, Video.js, and ArtPlayer.
+- Make Embedded MPV native-view use a DOM overlay.
+- Allow frame-copy Embedded MPV to fall back to the legacy controls dock.
+- Control the native UI of external MPV or VLC processes.
+
+## Embedded MPV Semantics
+
+The new checkbox is intentionally web-player-specific.
+
+Embedded MPV has two rendering paths:
+
+- **Frame-copy:** video is uploaded to a renderer canvas. It always uses
+  `app-player-controls`; a second controls toggle would only duplicate an
+  already-required part of this engine.
+- **Native-view:** video is hosted in a platform-native surface. DOM controls
+  cannot reliably stack above that surface, so the compositor-safe legacy dock
+  remains required.
+
+The existing `embeddedMpvFrameCopy` setting continues to select the rendering
+engine and continues to require an application restart. It is independent from
+the new web-player controls preference.
+
+External MPV and VLC processes continue to own their own controls UI.
+
+## Considered Approaches
+
+### 1. Conditional global web-player preference
+
+Selected.
+
+One setting controls HTML5, Video.js, and ArtPlayer together. Its checkbox is
+shown only while one of those players is selected. This matches the existing
+single rollout token, keeps the Settings UI relevant to the selected player,
+and avoids suggesting that the option changes Embedded MPV or external
+players.
+
+### 2. Always-visible "shared controls where available" preference
+
+Rejected because it would be a no-op for frame-copy Embedded MPV, unsupported
+for native-view, and outside the app for external players. The resulting
+conditional semantics would be harder to explain than a web-player-specific
+label.
+
+### 3. Separate preference for every playback engine
+
+Rejected because the three web integrations deliberately share one rollout
+contract. Per-engine preferences would add settings and test combinations
+without a current product requirement.
+
+## Settings Contract
+
+Add an optional boolean to the shared settings interface:
+
+```ts
+webPlayerSharedControls?: boolean;
+```
+
+The canonical default is `false`. Loading an older settings object without the
+field must normalize to `false`, and saving settings must write the complete
+resolved value back to storage.
+
+The settings form adds a `webPlayerSharedControls` control with a `false`
+default. Form hydration, serialization, reset behavior, backup/export, and the
+existing Save workflow continue to use the normal complete `Settings` object.
+This is renderer-only state; Electron main-process behavior and preload IPC do
+not need a new command.
+
+## Runtime Data Flow
+
+The existing `WEB_PLAYER_SHARED_CONTROLS` injection token remains the
+immutable, test-overridable session seam used by the three engine components.
+The compile-time constant remains only as the default-off fallback for direct
+component use and focused tests.
+
+Normal runtime resolution moves to `WebPlayerViewComponent`:
+
+1. `SettingsStore` loads `webPlayerSharedControls`, defaulting to `false`.
+2. The Settings page updates and persists it through the existing Save action.
+3. Leaving Settings destroys that route; no player is active during the
+   change.
+4. The next `WebPlayerViewComponent` resolves a component-scoped boolean
+   snapshot from `SettingsStore`.
+5. HTML5, Video.js, or ArtPlayer receives that snapshot through
+   `WEB_PLAYER_SHARED_CONTROLS` and constructs exactly one controls system.
+6. The snapshot does not change until that player host is destroyed and a new
+   playback session is created.
+
+This preserves the construction-time requirements of Video.js and ArtPlayer:
+vendor controls, hotkeys, gestures, plugins, source bridges, and the shared
+adapter are configured atomically. A reactive boolean must not flip only the
+template while leaving the engine configured for the other mode.
+
+Embedded MPV does not consume the setting. Its component continues to choose
+shared controls for `engine === 'frame-copy'` and the legacy dock for the
+native-view engine.
+
+## Settings UI
+
+Add one standard `setting-item` to the Playback section, using the existing
+Material checkbox and layout styles.
+
+- Label meaning: **Use unified controls for web players (experimental)**.
+- Description meaning: use IPTVnator's common controls in HTML5, Video.js, and
+  ArtPlayer.
+- Visibility: selected player is `videojs`, `html5`, or `artplayer`.
+- Hidden for Embedded MPV, external MPV, and VLC.
+- Add a stable test selector to the row and checkbox.
+- Add the label and description keys to every locale file so the i18n key sets
+  remain aligned.
+
+No new colors, spacing rules, or one-off UI components are required.
+
+## Failure and Compatibility Behavior
+
+- Missing or malformed non-boolean stored values resolve to `false`.
+- A storage write failure is reported through the existing
+  `SettingsStore.updateSettings()` rejection and must not require
+  player-specific recovery.
+- Legacy mode remains the safe fallback whenever the setting cannot be
+  resolved.
+- Direct engine tests can continue overriding
+  `WEB_PLAYER_SHARED_CONTROLS` with `true` or `false`.
+- The setting does not relax Electron sandboxing and does not alter the
+  frame-copy engine opt-in.
+
+## Testing Strategy
+
+### Shared interfaces and settings store
+
+- Default is `false`.
+- Older stored settings without the field load as `false`.
+- A stored `true` value is restored.
+- `updateSettings()` persists the complete resolved value.
+
+### Settings form and UI
+
+- Form creation and serialization include the new field.
+- The checkbox hydrates from stored settings and is included in the Save
+  payload.
+- The row is visible for HTML5, Video.js, and ArtPlayer.
+- The row is hidden for Embedded MPV, external MPV, and VLC.
+- Translation key parity remains valid across all locales.
+
+### Playback host
+
+- A newly created HTML5, Video.js, or ArtPlayer session receives the saved
+  boolean snapshot.
+- `false` preserves the existing vendor/native UI.
+- `true` mounts the shared controls path.
+- Embedded MPV selection ignores the web-player preference.
+- One session never renders or initializes both controls systems.
+
+### Validation
+
+- Run focused Settings form/component and `SettingsStore` tests.
+- Run the complete `ui-playback` test target because all three web engines
+  share the rollout seam.
+- Run affected lint targets and the workspace typecheck.
+- Run the settings E2E flow for checkbox visibility, persistence, and use after
+  returning to playback.
+- Run the closest Electron playback smoke/E2E coverage because the same
+  Settings surface is used in the desktop app.
+
+## Documentation Impact
+
+Update `docs/architecture/player-controls-contract.md` and the shared-controls
+sections of `AGENTS.md` and `CLAUDE.md` to replace the compile-time-only
+default-off rollout description with the persisted experimental preference.
+The Embedded MPV architecture documentation only needs clarification if its
+existing distinction between frame-copy shared controls and the native-view
+legacy dock would otherwise become ambiguous.
diff --git a/docs/superpowers/specs/2026-07-18-flatpak-zypak-launcher-design.md b/docs/superpowers/specs/2026-07-18-flatpak-zypak-launcher-design.md
new file mode 100644
index 000000000..96b996a1d
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-18-flatpak-zypak-launcher-design.md
@@ -0,0 +1,69 @@
+# Flatpak Zypak Launcher Design
+
+## Goal
+
+Package Flatpak so Electron Builder's generated `electron-wrapper` passes the
+real IPTVnator ELF executable directly to Zypak. Preserve the existing
+conditional Linux sandbox wrapper for AppImage, DEB, RPM, Pacman, and Snap.
+
+## Root Cause
+
+The common Linux `afterPack` hook currently renames the Electron executable
+from `iptvnator` to `iptvnator.bin` and writes a shell script at `iptvnator`.
+Electron Builder's Flatpak launcher calls `zypak-wrapper iptvnator`, so Zypak
+receives the shell script instead of an ELF executable. Zypak rejects that
+layout; the shell script can then mask the failure by adding `--no-sandbox` on
+hosts with restricted user namespaces.
+
+## Launcher Contract
+
+Introduce one packaging-owned launcher-layout helper:
+
+- an isolated Flatpak target uses `iptvnator` as the Electron ELF and does not
+  apply the custom Linux sandbox wrapper;
+- every other supported Linux target keeps the existing `iptvnator` shell
+  wrapper and `iptvnator.bin` Electron ELF;
+- a target set containing Flatpak and any other target fails before filesystem
+  mutation because Electron Builder shares one unpacked application tree
+  across those targets;
+- target matching is case-insensitive and uses Electron Builder's documented
+  `AfterPackContext.targets[].name` values, not output paths or environment
+  heuristics.
+
+The launcher hook, pristine-layout validation, and extracted-artifact
+validation must all resolve the Electron ELF path through this contract.
+
+## Validation
+
+Regression coverage will prove the following:
+
+1. The Linux launcher hook preserves the original executable bytes and creates
+   no `.bin` file for an isolated Flatpak target.
+2. The hook retains the existing wrapper layout for a non-Flatpak Linux target.
+3. A mixed Flatpak/non-Flatpak target set fails before renaming the executable.
+4. Pristine Flatpak validation inspects `iptvnator`, while other profiles
+   inspect `iptvnator.bin`.
+5. Extracted Flatpak verification reads architecture and checks process
+   isolation from `iptvnator`.
+6. CI asserts that the installed Flatpak target is an ELF, rejects a sibling
+   `.bin` layout, and fails on the known Zypak wrapper warnings.
+
+The existing application-level `--embedded-mpv-runtime-probe` remains the
+sandboxed launch check. Once the custom wrapper is absent, it can no longer
+silently add `--no-sandbox`; reaching the Electron main-process probe therefore
+also verifies the corrected Zypak entry path.
+
+## Documentation
+
+Update the canonical Linux Embedded MPV packaging documentation and the living
+`AGENTS.md`/`CLAUDE.md` summaries to state the launcher split explicitly.
+Correct the earlier Linux frame-copy design document's claim that every Linux
+Electron executable is named `iptvnator.bin`.
+
+## Non-Goals
+
+- Changing the Chromium GPU/Video.js behavior reported in issue #1203.
+- Removing the conditional sandbox wrapper from non-Flatpak Linux packages.
+- Adding `--no-sandbox`, changing `chrome-sandbox` permissions, or bypassing
+  Zypak.
+- Changing the bundled Embedded MPV runtime or Flatpak permissions.
diff --git a/docs/superpowers/specs/2026-07-20-hide-homogeneous-catalog-type-badges-design.md b/docs/superpowers/specs/2026-07-20-hide-homogeneous-catalog-type-badges-design.md
new file mode 100644
index 000000000..b02705a9a
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-20-hide-homogeneous-catalog-type-badges-design.md
@@ -0,0 +1,53 @@
+# Hide Type Badges in Homogeneous Portal Catalogs
+
+## Context
+
+The shared `GridListComponent` renders catalog items after the user has already
+selected Live TV, VOD, or Series in the portal rail. Every item in these grids
+has the same content type, so the `LIVE`, `VOD`, and `SERIES` badges repeat
+information that is already established by the surrounding navigation.
+
+Mixed-content surfaces such as portal search use `ContentCardComponent`, where
+the type badge remains useful for distinguishing results.
+
+## Design
+
+Remove the type-badge markup and its dedicated styles from
+`GridListComponent`.
+
+Keep the component's `type` input. It still controls provider-neutral behavior
+that is unrelated to the badge:
+
+- choosing artwork placeholder icons;
+- limiting country-prefix stripping to live content;
+- selecting poster/logo presentation behavior.
+
+Do not change `ContentCardComponent` or any search, favorites, recently added,
+or dashboard surface. Their badges remain unchanged.
+
+## Affected Portals and Views
+
+Because Xtream and Stalker both route their category pages through the shared
+portal catalog view, removing the badge from `GridListComponent` covers:
+
+- Xtream Live TV, VOD, and Series homogeneous grids;
+- Stalker Live TV, VOD, and Series homogeneous grids;
+- the Xtream Live TV all-items grid.
+
+## Testing
+
+Update the focused `GridListComponent` tests to prove that no `.type-badge` is
+rendered for `live`, `vod`, or `series`, while the `type` input continues to
+drive existing title and placeholder behavior.
+
+Run the affected shared portal UI test target and the closest catalog feature
+test target. Since this is a visible portal workflow change, run the closest
+Xtream and Stalker Playwright coverage when available; otherwise perform the
+strongest available targeted validation and document any skipped UI automation.
+
+## Documentation Impact
+
+The canonical UI guideline already says not to add redundant badges or a
+second selection system. No canonical documentation change is required beyond
+this design record because no route, architecture boundary, setup workflow, or
+subsystem contract changes.
diff --git a/docs/superpowers/specs/2026-07-20-stalker-is-series-playback-metadata-design.md b/docs/superpowers/specs/2026-07-20-stalker-is-series-playback-metadata-design.md
new file mode 100644
index 000000000..0d8422ac1
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-20-stalker-is-series-playback-metadata-design.md
@@ -0,0 +1,135 @@
+# Stalker `is_series` Playback Metadata Design
+
+## Context
+
+Some Stalker/Ministra portals expose series inside the VOD catalog by setting
+`is_series=1`. IPTVnator already normalizes this provider-specific shape and
+loads its seasons and episodes lazily, but two cross-surface contracts are
+incomplete:
+
+1. The Stalker quick-start button renders `XTREAM.PLAY_EPISODE` without the
+   translation parameters supplied by the shared series quick-start action.
+   The result is a visible `{{episode}}` placeholder.
+2. Stalker episode playback does not add `seasonNumber` and `episodeNumber` to
+   `ResolvedPortalPlayback.contentInfo`. Playback positions therefore lack the
+   metadata used by the workspace dashboard hero and Continue Watching cards
+   to render their season/episode badge.
+
+The dashboard already classifies raw Stalker records carrying `is_series` as
+series activity. No new dashboard-specific content-type branch is required.
+
+## Goals
+
+- Render parameterized Stalker quick-start translations correctly.
+- Persist season and episode numbers for future Stalker episode playback,
+  including VOD-backed `is_series` series.
+- Let the existing dashboard position lookup and badge rendering consume that
+  metadata without provider-specific duplication.
+- Document `is_series` as a cross-surface compatibility contract so future
+  changes cover detail rendering, activity persistence, playback metadata, and
+  dashboard presentation together.
+
+## Non-goals
+
+- Migrating or reconstructing existing playback-position rows that do not
+  contain season/episode metadata.
+- Loading Stalker catalog data from the dashboard to infer missing metadata.
+- Changing Stalker season-loading behavior, episode ordering, tracking IDs, or
+  playback URLs.
+- Redesigning the detail-page or dashboard UI.
+
+## Design
+
+### Quick-start translation
+
+`StalkerQuickStartButton` will expose the optional `labelParams` already
+provided by `SeriesQuickStartAction`. For loaded episode actions, the Stalker
+adapter will copy those parameters into its button view model. Lazy-season
+actions will leave the field undefined because their label keys do not require
+an episode parameter.
+
+The Stalker series template will call the translate pipe with
+`action.labelParams`, matching the established Xtream series template. This
+keeps translation-key selection in the shared quick-start utility and keeps
+template behavior consistent across providers.
+
+### Playback metadata
+
+`StalkerSeriesViewComponent` already maps all three supported series shapes to
+`Record<string, XtreamSerieEpisode[]>`:
+
+- regular Stalker series;
+- VOD with an embedded `series[]`;
+- VOD with `is_series=1`.
+
+When an episode is selected, the component will use the mapped episode identity
+to resolve its normalized season and episode numbers. After
+`StalkerStore.resolveVodPlayback(...)` returns, the component will enrich the
+episode `contentInfo` with those two fields before handing the playback object
+to either the inline player or an external player.
+
+If no mapped episode state can be resolved, the component will preserve the
+existing playback object unchanged. Missing metadata must never block
+playback.
+
+This placement avoids expanding the positional `resolveVodPlayback(...)`
+contract and ensures both inline and external playback receive the same
+metadata. Subsequent playback-position writes will therefore carry:
+
+```text
+playlistId
+contentXtreamId
+contentType = episode
+seriesXtreamId
+seasonNumber
+episodeNumber
+```
+
+### Dashboard behavior
+
+No new dashboard branching will be introduced. Existing behavior remains:
+
+1. `extractStalkerItemType(...)` normalizes `is_series` activity to `series`.
+2. `DashboardDataService` finds the newest episode position by
+   `seriesXtreamId`.
+3. The dashboard hero and Continue Watching cards render the season/episode
+   badge when both metadata fields are present.
+
+Existing positions without these fields will remain badge-less until the user
+plays an episode again and a new position is saved.
+
+## Tests
+
+Regression coverage will be added before production changes:
+
+1. Stalker series quick-start view-model/component coverage will demonstrate
+   that a parameterized `PLAY_EPISODE` action carries and renders the episode
+   number instead of `{{episode}}`.
+2. Stalker `is_series` component coverage will demonstrate that resolved
+   playback contains the mapped season and episode numbers.
+3. Dashboard coverage will use a Stalker `is_series` recent item plus an
+   episode playback position and assert that the hero exposes the expected
+   season/episode badge.
+
+Targeted Nx tests will run for the affected Stalker feature and workspace
+dashboard projects. Broader validation will be selected after checking the
+available project targets.
+
+## Documentation
+
+The implementation will update:
+
+- `docs/architecture/stalker-portal.md` with the activity/playback/dashboard
+  contract for all three series modes;
+- `docs/architecture/workspace-dashboard.md` with Stalker episode-position
+  badge behavior and the forward-only limitation;
+- `.codex/skills/stalker-portal/SKILL.md` with a cross-surface `is_series`
+  checklist for future agents.
+
+## Compatibility and failure handling
+
+- Raw `true`, `1`, and `"1"` `is_series` forms continue to normalize through
+  existing Stalker helpers.
+- Existing series tracking IDs and saved positions remain valid.
+- Playback remains functional when season/episode metadata cannot be derived.
+- Old position rows are read unchanged and are not rewritten speculatively.
diff --git a/docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md b/docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md
new file mode 100644
index 000000000..b6ebb5ee6
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-25-coverage-integrity-runtime-boundaries-design.md
@@ -0,0 +1,447 @@
+# Coverage Integrity And Electron Runtime Boundaries Design
+
+## Status
+
+Approved in the delegated coverage-audit task on 2026-07-25.
+
+Before recording the final ratchets, the implementation branch was rebased
+onto fresh `origin/master` commit
+`7e8c2ccce16b71d72a64c45f1d96dd090dc8e077`.
+
+## Goal
+
+Increase confidence in security-sensitive and runtime-sensitive Electron
+behavior while making the merged Tier A coverage report fail closed when Jest
+cannot instrument executable production source.
+
+This is a risk-weighted first change. It does not try to maximize a global
+percentage by testing type-only modules, re-export shims, or low-risk code.
+
+## Fresh Baseline
+
+An uncached `pnpm run coverage:ci` on
+`7e8c2ccce16b71d72a64c45f1d96dd090dc8e077` completed successfully and reported:
+
+| Metric     | Covered / total | Percent |
+| ---------- | --------------: | ------: |
+| Statements | 24,982 / 36,062 |  69.27% |
+| Branches   | 17,465 / 29,637 |  58.92% |
+| Functions  |   5,785 / 8,577 |  67.44% |
+| Lines      | 24,323 / 34,959 |  69.57% |
+
+The successful command nevertheless printed `Failed to collect coverage` for
+`libs/m3u-state/src/lib/effects.ts`. TypeScript could not resolve
+`@angular/material/snack-bar`, inferred the injected snack bar as `unknown`,
+and did not see the shared `window.electron` declaration under the project's
+spec compiler configuration (`TS2307` once, `TS2571` twice, and `TS2551`
+once). The file was absent from both the project report and
+`coverage/merged/coverage-final.json`.
+
+All 30 Tier A projects produced a `coverage-final.json`, so 31 report files
+including the merged report existed. The current merge included all 30 project
+reports and 709 files while still missing an executable file. This demonstrates
+that project-level report existence is necessary but not sufficient.
+
+The audit file status on the same baseline is:
+
+| File                                                                                    | Statement coverage |
+| --------------------------------------------------------------------------------------- | -----------------: |
+| `apps/electron-backend/src/app/workers/database.worker.ts`                              |       0 / 207 (0%) |
+| `apps/electron-backend/src/app/events/remote-control.events.ts`                         |       0 / 115 (0%) |
+| `apps/electron-backend/src/app/server/http-server.ts`                                   |        0 / 73 (0%) |
+| `apps/electron-backend/src/app/events/database/downloads.events.ts`                     |  69 / 147 (46.93%) |
+| `apps/electron-backend/src/app/events/settings.events.ts`                               |   16 / 27 (59.25%) |
+| `libs/workspace/dashboard/feature/src/lib/rails/workspace-dashboard-rails.component.ts` |       0 / 206 (0%) |
+| `libs/portal/stalker/feature/src/lib/stalker-search/stalker-search.component.ts`        |       0 / 166 (0%) |
+| `libs/m3u-state/src/lib/effects.ts`                                                     |             absent |
+
+The original audit is therefore partly stale: `downloads.events.ts` gained a
+meaningful regression suite on master, and `settings.events.ts` already had
+logging coverage. Both remain in this PR because their uncovered IPC
+contracts are part of the approved Electron boundary, but new tests must cover
+missing behavior rather than repeat existing assertions.
+
+## Scope
+
+### Included
+
+- Add behavioral coverage for `HttpServer` routing, static serving, traversal
+  containment, MIME responses, and lifecycle.
+- Add behavioral coverage for the remote-control HTTP and IPC boundary:
+  method checks, renderer commands, status, channel-number validation,
+  malformed JSON, and the 10 KiB body limit.
+- Extend settings IPC coverage for argument normalization, defined-only
+  persistence, frame-copy boolean normalization, remote-control fallback, and
+  runtime server reconciliation while preserving redacted logging.
+- Extend downloads IPC coverage around the managed-file authorization boundary
+  before revealing or opening local paths. Preserve the existing destructive
+  cleanup and pause/resume regression tests.
+- Fix the `m3u-state` spec compiler configuration so `effects.ts` can be
+  instrumented and appears in its report.
+- Add a fail-closed integrity gate for instrumentation errors, missing Tier A
+  reports, missing executable source files, merged metric regressions, and
+  regressions in the selected critical Electron files.
+- Document the resulting coverage workflow in
+  `docs/architecture/validation-map.md`.
+
+### Deferred
+
+- `database.worker.ts`: its 950-line worker-thread dispatcher and database
+  operation surface deserve a dedicated worker-contract design and PR.
+- `workspace-dashboard-rails.component.ts`: the existing same-name spec tests
+  extracted helpers but never instantiates the 660-line component. Component
+  coverage belongs in a focused Angular dashboard change.
+- `stalker-search.component.ts`: the 510-line search surface and portal store
+  interactions belong in a focused Stalker search change.
+- Broadly raising every current 0% Tier A file.
+- Adding tests to type-only/shared interfaces or pure re-export modules to
+  inflate aggregate metrics.
+- Unrelated production behavior changes.
+
+## Coverage Integrity Architecture
+
+### Shared integrity module
+
+Create a pure Node module under `tools/coverage/` that owns:
+
+- source-file exclusion rules;
+- TypeScript AST classification of runtime-owning files;
+- coverage path normalization;
+- project- and merged-report completeness checks;
+- instrumentation-error marker detection;
+- merged and critical-file ratchet evaluation; and
+- diagnostic formatting.
+
+The runner, merge script, health script, and Node unit tests use this module so
+the definition of an expected executable file does not drift between stages.
+
+### Runtime-owning source classification
+
+For each Tier A `sourceRoot`, recursively consider production `.ts` files.
+Exclude:
+
+- `*.spec.ts` and `*.test.ts`;
+- `*.d.ts`;
+- `test-setup.ts`, test stubs, and generated files;
+- environment files; and
+- `index.ts`, matching the existing Jest collection exclusions.
+
+Parse each candidate with the TypeScript compiler API. A file is expected in
+coverage when it has at least one top-level runtime-owning statement.
+Import declarations, interfaces, type aliases, pure export declarations,
+empty statements, and ambient `declare` statements do not make a file
+runtime-owning by themselves. Classes, functions, variables, enums,
+expressions, control flow, and other emitted statements do.
+
+This rule intentionally checks executable ownership rather than all TypeScript
+text. It excludes type-only contracts and re-export shims without maintaining
+a large hand-authored manifest. A discovery prototype over the fresh baseline
+classified 591 of 655 Tier A TypeScript source files as runtime-owning and
+identified exactly one absent file: `libs/m3u-state/src/lib/effects.ts`.
+
+Coverage keys and expected source paths are normalized to absolute POSIX-style
+paths before comparison so diagnostics are stable across supported CI
+platforms.
+
+### Runner behavior
+
+`run-tier-a-coverage.mjs` must continue relaying each child process's stdout and
+stderr as it arrives. It also scans a bounded rolling text window, with ANSI
+escapes removed, for Jest's `Failed to collect coverage` marker.
+
+After each project command finishes, the runner must fail if:
+
+- the Nx/Jest command exits nonzero or terminates by signal;
+- the output contains an instrumentation failure marker;
+- `coverage/<project-root>/coverage-final.json` is missing or invalid; or
+- a runtime-owning file under that project's source root is absent from the
+  report.
+
+The implementation should use asynchronous child-process streams rather than
+buffering the full multi-project Jest output in memory.
+
+### Merge behavior
+
+`merge-coverage.mjs` must require exactly one valid report for every configured
+Tier A project. It must list all missing or invalid reports and exit before
+deleting or rewriting `coverage/merged`.
+
+The current `.filter(existsSync)` behavior is removed because it silently
+merges partial input.
+
+### Health behavior
+
+`coverage-health.mjs --require-report` independently reruns:
+
+- per-project report existence and JSON validity;
+- runtime-owning source completeness;
+- merged-report completeness and usable instrumentation for every
+  runtime-owning Tier A file;
+- merged metric ratchets; and
+- selected critical-file ratchets.
+
+It computes the aggregate summary from that validated merged map before
+checking the serialized summary and ratchets. This defense in depth catches
+stale, incomplete, or manually merged reports even when the runner was not the
+process that generated them. Local health checks without `--require-report`
+retain their current warning behavior when report artifacts are not available,
+but any present invalid report remains an error.
+
+### Ratchets
+
+The policy stores four merged minimum percentages and per-file statement
+minimums for:
+
+- `http-server.ts`;
+- `remote-control.events.ts`;
+- `settings.events.ts`; and
+- `downloads.events.ts`.
+
+The implementation begins with the fresh master aggregate baseline shown
+above. After the approved behavioral suites and the `effects.ts`
+instrumentation fix are complete, the policy is updated to the reproducible
+post-change values. Those final values become the ratchet: they may stay level
+or rise in future changes, but must not be lowered merely to make CI green.
+
+Per-file minimums are likewise recorded from the achieved behavioral suites,
+not from an arbitrary aspirational percentage. The two currently uncovered
+files must become nonzero; the existing `settings` and `downloads` coverage
+must not regress. A reviewed production source shrink is the sole exception to
+the normally monotonic absolute `minimumCovered`: a PR may lower it only when
+it identifies the removed executable statements and a fresh full report proves
+that the file's `minimumPercent`, all aggregate ratchets, and coverage of the
+remaining behavior stay level or rise.
+
+## Behavioral Test Design
+
+### HTTP server
+
+Use a temporary static directory and a real loopback Node HTTP server. Verify:
+
+- `/` serves `index.html`;
+- known static assets return their content and correct MIME type;
+- an unknown client-side route falls back to `index.html`;
+- a missing `index.html` returns a plain-text 404;
+- registered remote-control API routes bypass static serving;
+- unknown remote-control API routes return JSON 404;
+- normalized traversal input cannot escape the configured static root;
+- `start`, duplicate `start`, `stop`, enable/disable, and port-change restart
+  preserve the current lifecycle contract.
+
+Tests should prefer public behavior over direct calls to private methods. If
+an ephemeral port or temporary static root is not observable through the
+current API, introduce only the smallest constructor dependency seam required
+to use real Node HTTP and filesystem behavior. The production singleton keeps
+identical defaults.
+
+### Remote control events
+
+Capture the HTTP handlers registered during bootstrap and exercise them with
+real readable request streams plus response-contract assertions. Verify:
+
+- bootstrap registers every documented endpoint and starts the server only
+  when stored settings enable it;
+- channel up/down and volume commands accept only their documented HTTP
+  methods and send the expected renderer event;
+- channel selection accepts finite positive values, floors fractional input,
+  and rejects missing, non-finite, or sub-one values;
+- status updates merge partial IPC state and refresh `updatedAt`;
+- status reads return the latest merged state;
+- malformed JSON returns 400 without dispatching a command;
+- payloads over 10 KiB return 413, destroy the request, and do not dispatch;
+  and
+- missing BrowserWindows are contained without throwing.
+
+The existing Electron E2E remote-control suite remains the end-to-end check for
+real volume commands and renderer status.
+
+### Settings events
+
+Extend the existing same-name spec. Use the real external-player argument
+normalizer and mocked persistent store/server boundaries to verify:
+
+- MPV and VLC arguments are normalized before persistence;
+- undefined values are not written;
+- reuse flags preserve explicit false values;
+- frame-copy persistence coerces to boolean;
+- a partial remote-control update reads the missing half from the store;
+- only explicitly supplied remote-control fields are persisted; and
+- `httpServer.updateSettings` receives the resolved enabled/port pair.
+
+Retain the existing assertions that logging redacts TMDB and player-argument
+credentials.
+
+### Downloads events
+
+Extend the current event suite rather than replacing its destructive cleanup
+coverage. Verify the local-file boundary:
+
+- a path not present in the downloads database is never revealed or opened,
+  even when it exists on disk;
+- a database-managed path missing on disk is never revealed or opened;
+- only a database-managed path that exists reaches
+  `shell.showItemInFolder` or `shell.openPath`; and
+- a database lookup failure returns the existing structured not-found response
+  and never reaches the shell.
+
+Folder authorization internals remain covered by
+`download-directory-authorization.spec.ts`; this event suite tests only the
+IPC-to-authorizer and managed-path integration where it adds distinct signal.
+
+## TDD Sequence
+
+1. Add failing Node tests for runtime classification, ANSI instrumentation
+   marker detection, missing/invalid reports, partial merge input, aggregate
+   ratchets, and critical-file ratchets.
+2. Implement the shared integrity module and wire the runner, merge, and health
+   scripts until those tests pass.
+3. Enable the selected critical-file policy; confirm fresh targeted coverage
+   fails because `http-server.ts` and `remote-control.events.ts` are 0%.
+4. For each Electron boundary, add one contract test at a time, observe the
+   intended failure, and make only the smallest testability refactor needed to
+   pass it.
+5. Add a failing integrity assertion for the absent `effects.ts`, align the
+   `m3u-state` spec compiler configuration, and confirm the real file appears.
+6. If a behavioral test exposes a production defect, add a direct regression
+   assertion first and make a separately justified minimal fix. Otherwise
+   preserve production behavior.
+7. Record fresh aggregate and per-file post-change ratchets only after all
+   behavioral suites are green.
+
+## Error Handling And Diagnostics
+
+Integrity failures must identify:
+
+- the project;
+- the expected report path;
+- each missing runtime-owning source path;
+- the metric or critical file that fell below its ratchet; and
+- the observed and required values.
+
+The runner must preserve the original Nx/Jest output and child exit semantics.
+Integrity diagnostics are additive and must not hide the underlying
+instrumentation error.
+
+Tests use temporary directories and deterministic synthetic coverage maps.
+They must not depend on a previously generated workspace `coverage/` tree.
+
+## Success Criteria
+
+- Fresh `pnpm run coverage:ci` exits nonzero for synthetic or real
+  instrumentation collection failures.
+- All 30 Tier A project reports are mandatory merge inputs.
+- Every runtime-owning Tier A TypeScript source file is present in its project
+  report.
+- `libs/m3u-state/src/lib/effects.ts` is present in coverage.
+- The four selected Electron boundary files meet their recorded behavioral
+  statement ratchets; `http-server.ts` and `remote-control.events.ts` are no
+  longer 0%.
+- Final merged statements, branches, functions, and lines are each at least
+  the fresh master baseline and become the new ratchet.
+- Assertions verify observable contracts rather than merely invoking mocks for
+  line execution.
+- No untested production behavior change or unrelated source change is
+  included.
+- Deferred database worker, dashboard, and Stalker search coverage is listed
+  in the draft PR.
+
+## Implementation Outcome
+
+The fresh uncached implementation run merged all 30 required Tier A reports
+into the 31st `coverage-final.json` and included 710 files, with no
+collection-failure marker or missing runtime-owning source. The achieved
+ratchets are:
+
+| Metric     | Covered / total | Percent |
+| ---------- | --------------: | ------: |
+| Statements | 25,204 / 36,241 |  69.54% |
+| Branches   | 17,573 / 29,748 |  59.07% |
+| Functions  |   5,824 / 8,635 |  67.44% |
+| Lines      | 24,543 / 35,136 |  69.85% |
+
+The selected Electron boundary statement coverage changed as follows:
+
+| File                       |          Baseline |              After |
+| -------------------------- | ----------------: | -----------------: |
+| `http-server.ts`           |       0 / 73 (0%) |   83 / 92 (90.21%) |
+| `remote-control.events.ts` |      0 / 115 (0%) | 112 / 116 (96.55%) |
+| `settings.events.ts`       |  16 / 27 (59.25%) |   26 / 27 (96.29%) |
+| `downloads.events.ts`      | 69 / 147 (46.93%) |  86 / 147 (58.50%) |
+
+The integrity correction makes the denominator honest:
+`libs/m3u-state/src/lib/effects.ts` is now present at 0 / 159 statements
+instead of silently disappearing. The aggregate improvement therefore holds
+even after surfacing those 159 previously unreported uncovered statements.
+Strict health validation also rechecks the merged map itself, so a
+runtime-owning file cannot disappear between valid project reports and the
+merged artifact while permissive percentages still pass.
+
+Two production seams were sufficient for isolated contract tests:
+`HttpServer` accepts an optional server factory and static distribution path,
+and `RemoteControlEvents` is a named export while the production singleton is
+unchanged. Real loopback HTTP tests also exposed a Windows
+double-leading-slash traversal escape in the prior static-path normalization.
+A direct failing regression preceded the narrow fix: production now uses the
+pure, platform-testable `resolveStaticFilePath` resolver to decode once, reject
+malformed or NUL paths, strip leading separators, resolve against the static
+root, and enforce containment. This is a tested behavior and security fix, not
+a behavior-preserving refactor.
+
+The release decision follows that observable fix:
+`.changes/electron-remote-static-paths.md` records it as an Electron bug fix,
+so the draft PR must not carry `no-release-note`. The canonical coverage
+workflow is documented in `docs/architecture/validation-map.md`; `AGENTS.md`
+and `CLAUDE.md` do not describe the changed coverage contract or HTTP path
+logic and require no update.
+
+The deferred production files remain uncovered in this change:
+`database.worker.ts` at 0 / 207, `workspace-dashboard-rails.component.ts` at
+0 / 206, and `stalker-search.component.ts` at 0 / 166. They retain the
+separate follow-up scopes described above.
+
+## Validation Ladder
+
+Run fresh, uncached validation in this order:
+
+```bash
+node --test tools/coverage/*.test.mjs
+pnpm nx test electron-backend --skip-nx-cache --runInBand
+pnpm nx test m3u-state --skip-nx-cache --runInBand
+pnpm run coverage:unit:ci -- --projects=electron-backend,m3u-state
+pnpm nx lint electron-backend --skip-nx-cache
+pnpm nx lint m3u-state --skip-nx-cache
+pnpm run typecheck:backend
+pnpm nx run electron-backend-e2e:e2e-ci--src/downloads.e2e.ts
+pnpm nx run electron-backend-e2e:e2e-ci--src/remote-control.e2e.ts
+pnpm nx run electron-backend-e2e:e2e-ci--src/settings.e2e.ts
+pnpm nx build electron-backend --configuration=production --skip-nx-cache
+pnpm run coverage:ci
+```
+
+The final report records exact command results, aggregate before/after metrics,
+and before/after metrics for the selected critical files. If an environment
+prevents an Electron E2E or production build, report the exact blocker and run
+the strongest available lower-level contract validation; do not silently omit
+it.
+
+## Documentation Impact
+
+Update `docs/architecture/validation-map.md` to make the fail-closed coverage
+contract and ratchet maintenance workflow canonical.
+
+`AGENTS.md` and `CLAUDE.md` do not currently describe coverage commands or
+integrity behavior, so no update is expected unless implementation changes a
+process they do describe.
+
+## Draft PR Handoff
+
+The draft PR body will include:
+
+- fresh master baseline and post-change aggregate metrics;
+- selected-file before/after metrics;
+- behavioral contracts added;
+- any production-only testability refactor and why it preserves behavior;
+- coverage integrity and ratchet changes;
+- all validation commands and results;
+- the documentation decision; and
+- deferred 0%-coverage follow-ups.
diff --git a/docs/superpowers/specs/2026-07-25-movie-poster-series-design.md b/docs/superpowers/specs/2026-07-25-movie-poster-series-design.md
new file mode 100644
index 000000000..dede4077b
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-25-movie-poster-series-design.md
@@ -0,0 +1,88 @@
+# Fictional Movie Poster Series Design
+
+## Objective
+
+Create ten original fictional movie posters for IPTVnator mock data and
+marketing screenshots. The posters should feel like unrelated real theatrical
+releases collected by a streaming service, rather than a coordinated AI art
+series.
+
+The existing poster assets are not visual references. The user-provided
+streaming-catalog screenshot is a collection-level reference for simplicity,
+genre legibility, and commercial poster conventions only. No individual poster
+from it may be reproduced or closely imitated.
+
+## Output Contract
+
+- Destination:
+  `apps/xtream-mock-server/public/marketing/poster/`
+- Format: RGB PNG
+- Final dimensions: 512 × 768 pixels
+- Typography: the English movie title only
+- Exclude actor names, taglines, credit blocks, studios, brands, and watermarks
+- Use lowercase kebab-case filenames derived from the title
+
+## Visual Direction
+
+The series uses different visual languages by genre:
+
+- thrillers may use large faces and one restrained environmental cue;
+- dramas may use a quiet scene or a single symbolic composition;
+- comedies may use bright studio backgrounds and simple ensemble poses;
+- animation may use one expressive original character and a clear environment;
+- fantasy and science fiction may use one hero or silhouette with one large
+  world-building motif.
+
+Every poster should remain readable as a small catalog thumbnail. Prefer one
+clear idea, one dominant focal point, a limited palette, and no more than three
+prominent characters. Avoid hyper-detailed concept art, excessive cinematic
+lighting, glossy AI-style texture, and dense montage unless the genre requires
+a restrained ensemble.
+
+All characters, settings, titles, costumes, props, and graphic devices must be
+original. Do not use recognizable actors or reproduce franchise characters,
+signature symbols, famous poses, or identifiable poster layouts.
+
+## Poster Lineup
+
+1. `SIGNAL NINE` — urban conspiracy thriller; two leads and a subway signal.
+2. `ORCHARD WALLS` — humane drama; one character in a quiet landscape.
+3. `BLUE CURRENT` — family animation; an original underwater protagonist.
+4. `CHECKOUT AT NOON` — comedy; a bright ensemble composition.
+5. `VESPER CROWN` — fantasy; one hero and one large symbolic object.
+6. `LAST DETOUR` — road action film; a car and two characters.
+7. `BORROWED SUMMER` — romantic drama; two people in warm natural light.
+8. `UNDER THE FLOOR` — horror; one minimal unsettling image.
+9. `RED WINTER` — space survival film; a silhouette and a planet.
+10. `SATURDAY CHAMPIONS` — family sports comedy; a colorful team composition.
+
+## Production Sequence
+
+Use the built-in image-generation tool, with one distinct prompt and generation
+call per poster. Generate at the tool's native portrait size, inspect the
+result, then downscale the selected output to 512 × 768 and save it in the
+destination directory.
+
+Begin with two contrasting samples, `ORCHARD WALLS` and `BLUE CURRENT`, so the
+user can validate both live-action and animated directions. Generate the
+remaining eight only after that review.
+
+## Acceptance Checks
+
+For each poster:
+
+1. Confirm the title is spelled exactly once and remains legible at thumbnail
+   size.
+2. Confirm the subject, composition, and palette clearly communicate the genre.
+3. Reject recognizable actors, existing characters, franchise motifs, copied
+   layouts, malformed faces or hands, extra text, logos, and watermarks.
+4. Confirm the final file is an RGB PNG at exactly 512 × 768 pixels.
+5. Inspect the final downscaled asset, not only the native generated image.
+
+## Repository Impact
+
+This work adds mock-server marketing assets only. It does not change runtime
+behavior, architecture, data flow, or public APIs. Canonical repository
+documentation, release notes, unit tests, and E2E tests are not required.
+Validation is limited to file format, dimensions, visual inspection, and final
+workspace status.
diff --git a/docs/superpowers/specs/2026-07-26-shared-marketing-poster-catalog-design.md b/docs/superpowers/specs/2026-07-26-shared-marketing-poster-catalog-design.md
new file mode 100644
index 000000000..9f54fa04b
--- /dev/null
+++ b/docs/superpowers/specs/2026-07-26-shared-marketing-poster-catalog-design.md
@@ -0,0 +1,96 @@
+# Shared Marketing Poster Catalog Design
+
+## Goal
+
+Add 20 original fictional movie posters in the same approved theatrical style
+as the existing poster showcase, then expose the complete showcase through both
+the Xtream and Stalker mock servers for deterministic screenshot capture.
+
+## Poster set
+
+The new titles are:
+
+1. Black Harbor — maritime crime thriller
+2. The Paper Astronaut — stop-motion family animation
+3. Summer Static — coming-of-age drama
+4. House of Tides — gothic coastal mystery
+5. Open Late — workplace comedy
+6. White Room Six — psychological thriller
+7. Field Notes — nature documentary
+8. A Thousand Steps — mountain sports drama
+9. The Small Hours — urban romantic drama
+10. Copper Rain — neo-noir
+11. Willow Engine — family fantasy
+12. Quiet Thunder — contemporary western drama
+13. Parallel Kitchens — science-fiction comedy
+14. First String — music drama
+15. The Long Museum — art mystery
+16. Cloud Hotel — family animation
+17. Unpaid Overtime — office satire
+18. Deep Green — survival adventure
+19. November Radio — period drama
+20. The Last Orange — Mediterranean family drama
+
+Every poster is an RGB PNG at exactly 512 × 768 pixels. The artwork uses one
+clear theatrical key image, a legible English title exactly once, original
+fictional people or characters, and no actor names, taglines, credits, brands,
+logos, watermarks, or copied franchise imagery.
+
+## Shared fixture boundary
+
+A new pure Nx utility library owns the manually approved movie metadata:
+
+`libs/shared/marketing-fixtures`
+
+Its public API exports the fixture type, the existing 15 showcase movies, the
+new 20 movies, and the combined 35-title showcase. The fixture uses provider-
+neutral category keys. Xtream and Stalker translate those keys to their own
+category identifiers and response shapes.
+
+This keeps one source of truth without making either mock application import
+from the other application. The existing 30-title generated artwork manifest
+remains separate: it still owns its matched poster/backdrop generation jobs,
+while the shared showcase owns manually approved local posters and uses each
+server's deterministic backdrop fallback where needed.
+
+## Xtream integration
+
+`marketing.generator.ts` imports the shared showcase and adapts it to
+`MarketingMovie`. Showcase movies are ordered before the original generated
+artwork movies so their posters appear in initial marketing catalog grids.
+The existing `marketing:marketing` credentials remain unchanged.
+
+The existing Xtream artwork route continues to serve PNGs from
+`apps/xtream-mock-server/public/marketing/poster/`, even though catalog URLs
+end in `.svg` for fallback compatibility.
+
+## Stalker integration
+
+Stalker adds a dedicated `marketing` scenario at MAC
+`00:1A:79:00:00:07`. For this scenario, VOD categories and items come from the
+shared showcase instead of faker. The list uses ordinary non-series VOD shapes,
+stable IDs, local cover URLs, fictional metadata, and deterministic playback
+commands.
+
+Stalker also exposes `/assets/marketing/poster/:slug` and reads the same
+committed PNG directory. It serves the asset itself rather than depending on
+the Xtream server being online. Missing files return 404; the marketing
+scenario must never emit a missing poster URL.
+
+## Screenshot visibility
+
+The 20 new movies are first in the combined showcase. Both provider adapters
+preserve that order, making new posters visible on the first catalog pages
+used for screenshots. All artwork is local and requires no internet access.
+
+## Verification
+
+- Shared fixture tests prove exactly 35 unique titles/slugs, with the 20 new
+  entries first and valid provider-neutral category keys.
+- All 20 new PNGs are inspected and verified as RGB 512 × 768 images.
+- Xtream `marketing:marketing` returns all 35 showcase titles and every new
+  poster URL responds with `image/png`.
+- Stalker MAC `00:1A:79:00:00:07` returns the same showcase and every new cover
+  URL responds with `image/png`.
+- Run the shared fixture tests, both mock-server lints, release-note validation,
+  and targeted HTTP smoke checks.
diff --git a/electron-builder.json b/electron-builder.json
index a874298dd..fca1b100e 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -20,6 +20,7 @@
             "filter": ["**/*"]
         },
         "electron-backend/**/*",
+        "!electron-backend/native{,/**/*}",
         "web/**/*",
         "!**/*.map"
     ],
@@ -130,8 +131,32 @@
         "grade": "stable",
         "summary": "IPTV application for M3U playlists, Xtream Codes API, and Stalker portals",
         "executableArgs": ["--ozone-platform=x11"],
+        "plugs": [
+            "default",
+            {
+                "graphics-core22": {
+                    "interface": "content",
+                    "target": "$SNAP/graphics",
+                    "default-provider": "mesa-core22"
+                }
+            },
+            {
+                "shared-memory": {
+                    "interface": "shared-memory",
+                    "private": true
+                }
+            }
+        ],
         "environment": {
             "DISABLE_WAYLAND": "1"
+        },
+        "layout": {
+            "/usr/share/libdrm": {
+                "bind": "$SNAP/graphics/libdrm"
+            },
+            "/usr/share/drirc.d": {
+                "symlink": "$SNAP/graphics/drirc.d"
+            }
         }
     },
     "win": {
diff --git a/jest.web-esm.workspace.ts b/jest.web-esm.workspace.ts
index d10d1b943..d22c06e22 100644
--- a/jest.web-esm.workspace.ts
+++ b/jest.web-esm.workspace.ts
@@ -31,6 +31,7 @@ export default {
         tslib: 'tslib/tslib.es6.js',
         '^iptv-playlist-parser$':
             '<rootDir>/apps/web/src/test-stubs/iptv-playlist-parser.mjs',
+        '^shaka-player$': '<rootDir>/apps/web/src/test-stubs/shaka-player.js',
         '^rxjs': '<rootDir>/node_modules/rxjs/dist/bundles/rxjs.umd.js',
         '^uuid$': '<rootDir>/node_modules/uuid/wrapper.mjs',
     },
diff --git a/libs/epg/data-access/src/lib/epg-runtime-bridge.service.ts b/libs/epg/data-access/src/lib/epg-runtime-bridge.service.ts
index 8e48fb452..b8c3d5815 100644
--- a/libs/epg/data-access/src/lib/epg-runtime-bridge.service.ts
+++ b/libs/epg/data-access/src/lib/epg-runtime-bridge.service.ts
@@ -1,14 +1,16 @@
 import { inject, Injectable } from '@angular/core';
 import {
+    ELECTRON_BRIDGE_EPG_PROGRESS_STATUSES,
     ElectronBridgeApi,
     ElectronBridgeEpgFetchResult,
+    ElectronBridgeEpgMapping,
     ElectronBridgeEpgProgress,
     ElectronBridgeEpgProgressStats,
     ElectronBridgeEpgProgressStatus,
+    ElectronBridgeEpgSearchResult,
     ElectronBridgeEpgChannelWithPrograms,
     ElectronBridgeEpgFreshnessResult,
     ElectronBridgeEpgLookupOptions,
-    ELECTRON_BRIDGE_EPG_PROGRESS_STATUSES,
     ElectronBridgeResult,
     ElectronBridgeTrustOptions,
     EpgChannelMetadata,
@@ -38,6 +40,11 @@ type EpgElectronBridge = Pick<
     | 'getEpgChannelsByRange'
     | 'onEpgProgress'
     | 'searchEpgPrograms'
+    | 'getEpgMapping'
+    | 'getEpgMappingsBatch'
+    | 'setEpgMapping'
+    | 'deleteEpgMapping'
+    | 'searchEpgChannels'
 >;
 
 @Injectable({ providedIn: 'root' })
@@ -80,6 +87,10 @@ export class EpgRuntimeBridgeService {
         return this.runtime.supportsEpgProgramSearch;
     }
 
+    get supportsEpgMapping(): boolean {
+        return this.runtime.supportsEpgMapping;
+    }
+
     fetchEpg(
         urls: string[],
         options?: ElectronBridgeTrustOptions
@@ -221,6 +232,66 @@ export class EpgRuntimeBridgeService {
         );
     }
 
+    getEpgMapping(
+        channelKey: string
+    ): Promise<ElectronBridgeEpgMapping | null> {
+        if (!this.supportsEpgMapping) {
+            return Promise.resolve(null);
+        }
+
+        return this.bridge?.getEpgMapping?.(channelKey) ?? Promise.resolve(null);
+    }
+
+    getEpgMappingsBatch(
+        channelKeys: string[]
+    ): Promise<Record<string, string> | null> {
+        if (!this.supportsEpgMapping || channelKeys.length === 0) {
+            return Promise.resolve(null);
+        }
+
+        return (
+            this.bridge?.getEpgMappingsBatch?.(channelKeys) ??
+            Promise.resolve(null)
+        );
+    }
+
+    setEpgMapping(
+        channelKey: string,
+        epgChannelId: string,
+        playlistId?: string
+    ): Promise<ElectronBridgeResult | null> {
+        if (!this.supportsEpgMapping) {
+            return Promise.resolve(null);
+        }
+
+        return (
+            this.bridge?.setEpgMapping?.(channelKey, epgChannelId, playlistId) ??
+            Promise.resolve(null)
+        );
+    }
+
+    deleteEpgMapping(channelKey: string): Promise<ElectronBridgeResult | null> {
+        if (!this.supportsEpgMapping) {
+            return Promise.resolve(null);
+        }
+
+        return this.bridge?.deleteEpgMapping?.(channelKey) ?? Promise.resolve(null);
+    }
+
+    searchEpgChannels(
+        searchTerm: string,
+        limit?: number
+    ): Promise<ElectronBridgeEpgSearchResult[] | null> {
+        if (!this.supportsEpgMapping) {
+            return Promise.resolve(null);
+        }
+
+        return (
+            this.bridge?.searchEpgChannels?.(searchTerm, limit) ??
+            Promise.resolve(null)
+        );
+    }
+
     onProgress(callback: (data: EpgImportProgress) => void): void {
         if (!this.supportsProgress) {
             return;
diff --git a/libs/m3u-state/src/lib/actions.ts b/libs/m3u-state/src/lib/actions.ts
index d2ea2baee..3f6008509 100644
--- a/libs/m3u-state/src/lib/actions.ts
+++ b/libs/m3u-state/src/lib/actions.ts
@@ -1,5 +1,10 @@
 import { createActionGroup, emptyProps, props } from '@ngrx/store';
-import { Channel, EpgProgram, Playlist, PlaylistMeta } from '@iptvnator/shared/interfaces';
+import {
+    Channel,
+    EpgProgram,
+    Playlist,
+    PlaylistMeta,
+} from '@iptvnator/shared/interfaces';
 
 export const PlaylistActions = createActionGroup({
     source: 'Playlists',
@@ -11,6 +16,11 @@ export const PlaylistActions = createActionGroup({
         'Remove Playlist': props<{ playlistId: string }>(),
         'Update Playlist Meta': props<{ playlist: PlaylistMeta }>(),
         'Update Playlist': props<{
+            /**
+             * Instrumentation-only; stripped before the DB invoke.
+             * Never enters the DB worker payload or persisted playlist data.
+             */
+            operationId?: string;
             playlist: Playlist;
             playlistId: string;
             refreshEpg?: boolean;
@@ -71,6 +81,7 @@ export const FavoritesActions = createActionGroup({
     events: {
         'Update Favorites': props<{ channel: Channel }>(),
         'Set Favorites': props<{ channelIds: string[] }>(),
+        'Hydrate Favorites': props<{ channelIds: string[] }>(),
     },
 });
 
diff --git a/libs/m3u-state/src/lib/effects.spec.ts b/libs/m3u-state/src/lib/effects.spec.ts
index 525953cf8..553cd1f20 100644
--- a/libs/m3u-state/src/lib/effects.spec.ts
+++ b/libs/m3u-state/src/lib/effects.spec.ts
@@ -1,6 +1,9 @@
-import { Channel, EpgProgram } from '@iptvnator/shared/interfaces';
+import { Channel, EpgProgram, VideoPlayer } from '@iptvnator/shared/interfaces';
 import { EpgActions } from './actions';
-import { buildExternalPlayerPayload } from './external-player-payload.util';
+import {
+    buildExternalPlayerPayload,
+    shouldAutoLaunchExternalPlayer,
+} from './external-player-payload.util';
 import { resolveActiveEpgProgramAction } from './resolve-active-epg-program.util';
 
 describe('buildExternalPlayerPayload', () => {
@@ -44,6 +47,99 @@ describe('buildExternalPlayerPayload', () => {
             origin: 'https://origin.example.com',
         });
     });
+
+    describe('shouldAutoLaunchExternalPlayer', () => {
+        const mpvSettings = { player: VideoPlayer.MPV };
+
+        it('launches the configured external player for regular channels', () => {
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    mpvSettings,
+                    true,
+                    activeChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(true);
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    mpvSettings,
+                    true,
+                    activeChannel,
+                    VideoPlayer.VLC
+                )
+            ).toBe(false);
+        });
+
+        it('never launches external players for DASH (.mpd) channels', () => {
+            const dashChannel: Channel = {
+                ...activeChannel,
+                url: 'https://streams.example.com/live.mpd',
+            };
+
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    mpvSettings,
+                    true,
+                    dashChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(false);
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    { player: VideoPlayer.VLC },
+                    true,
+                    dashChannel,
+                    VideoPlayer.VLC
+                )
+            ).toBe(false);
+        });
+
+        it('never launches external players for radio channels', () => {
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    mpvSettings,
+                    true,
+                    { ...activeChannel, radio: 'true' },
+                    VideoPlayer.MPV
+                )
+            ).toBe(false);
+        });
+
+        it('respects the double-click setting and missing settings', () => {
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    { ...mpvSettings, openStreamOnDoubleClick: true },
+                    undefined,
+                    activeChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(false);
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    { ...mpvSettings, openStreamOnDoubleClick: true },
+                    true,
+                    activeChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(true);
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    null,
+                    true,
+                    activeChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(false);
+            expect(
+                shouldAutoLaunchExternalPlayer(
+                    {},
+                    true,
+                    activeChannel,
+                    VideoPlayer.MPV
+                )
+            ).toBe(false);
+        });
+    });
 });
 
 describe('resolveActiveEpgProgramAction', () => {
diff --git a/libs/m3u-state/src/lib/effects.ts b/libs/m3u-state/src/lib/effects.ts
index 3931aafca..d827eb6cd 100644
--- a/libs/m3u-state/src/lib/effects.ts
+++ b/libs/m3u-state/src/lib/effects.ts
@@ -2,7 +2,11 @@ import { inject, Injectable } from '@angular/core';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Router } from '@angular/router';
 import { EpgService } from '@iptvnator/epg/data-access';
-import { normalizeEpgUrls } from '@iptvnator/shared/m3u-utils';
+import {
+    isDashChannel,
+    isDashStreamUrl,
+    normalizeEpgUrls,
+} from '@iptvnator/shared/m3u-utils';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { StorageMap } from '@ngx-pwa/local-storage';
@@ -45,9 +49,13 @@ import {
     selectFavorites,
 } from './selectors';
 import { resolveChannelEpgLookupKey } from './channel-epg-lookup.util';
-import { buildExternalPlayerPayload } from './external-player-payload.util';
+import {
+    buildExternalPlayerPayload,
+    shouldAutoLaunchExternalPlayer,
+} from './external-player-payload.util';
 import { resolvePlaylistScopedEpgFetchPlan } from './playlist-scoped-epg-fetch.util';
 import { resolveActiveEpgProgramAction } from './resolve-active-epg-program.util';
+import { persistPlaylistUpdate } from './playlist-update.effect-handler';
 
 @Injectable({ providedIn: 'any' })
 export class PlaylistEffects {
@@ -189,16 +197,13 @@ export class PlaylistEffects {
 
                 firstValueFrom(this.storage.get(STORE_KEY.Settings)).then(
                     (settings: any) => {
-                        const shouldOpenExternalPlayer =
-                            !settings?.openStreamOnDoubleClick ||
-                            action.startPlayback === true;
-
                         if (
-                            settings &&
-                            Object.keys(settings).length > 0 &&
-                            shouldOpenExternalPlayer &&
-                            settings.player === VideoPlayer.MPV &&
-                            channel.radio !== 'true'
+                            shouldAutoLaunchExternalPlayer(
+                                settings,
+                                action.startPlayback,
+                                channel,
+                                VideoPlayer.MPV
+                            )
                         ) {
                             this.dataService.sendIpcEvent(OPEN_MPV_PLAYER, {
                                 url: channel.url,
@@ -208,12 +213,13 @@ export class PlaylistEffects {
                                 origin: channel.http.origin,
                             });
                         } else if (
-                            settings &&
-                            Object.keys(settings).length > 0 &&
-                            shouldOpenExternalPlayer &&
-                            settings.player === VideoPlayer.VLC &&
-                            channel.radio !== 'true'
-                        )
+                            shouldAutoLaunchExternalPlayer(
+                                settings,
+                                action.startPlayback,
+                                channel,
+                                VideoPlayer.VLC
+                            )
+                        ) {
                             this.dataService.sendIpcEvent(OPEN_VLC_PLAYER, {
                                 url: channel.url,
                                 title: channel.name ?? '',
@@ -221,6 +227,7 @@ export class PlaylistEffects {
                                 referer: channel.http.referrer,
                                 origin: channel.http.origin,
                             });
+                        }
                     }
                 );
 
@@ -253,6 +260,10 @@ export class PlaylistEffects {
         playbackUrl: string,
         activeChannel: Channel | undefined | null
     ): Promise<void> {
+        if (isDashStreamUrl(playbackUrl) || isDashChannel(activeChannel)) {
+            return;
+        }
+
         const payload = buildExternalPlayerPayload(activeChannel, playbackUrl);
         if (!payload) {
             return;
@@ -295,10 +306,7 @@ export class PlaylistEffects {
             return this.actions$.pipe(
                 ofType(PlaylistActions.updatePlaylist),
                 switchMap((action) =>
-                    this.playlistsService.updatePlaylist(action.playlistId, {
-                        ...action.playlist,
-                        _id: action.playlistId,
-                    }).pipe(
+                    persistPlaylistUpdate(this.playlistsService, action).pipe(
                         tap(() => {
                             this.fetchPlaylistScopedEpg(action.playlist, {
                                 force: action.refreshEpg === true,
@@ -343,12 +351,14 @@ export class PlaylistEffects {
                     if ('isTemporary' in action && action.isTemporary) {
                         return EMPTY;
                     }
-                    return this.playlistsService.addPlaylist(action.playlist).pipe(
-                        tap(() => {
-                            this.fetchPlaylistScopedEpg(action.playlist);
-                            this.navigateToPlaylist(action.playlist);
-                        })
-                    );
+                    return this.playlistsService
+                        .addPlaylist(action.playlist)
+                        .pipe(
+                            tap(() => {
+                                this.fetchPlaylistScopedEpg(action.playlist);
+                                this.navigateToPlaylist(action.playlist);
+                            })
+                        );
                 })
             );
         },
@@ -360,17 +370,21 @@ export class PlaylistEffects {
             return this.actions$.pipe(
                 ofType(PlaylistActions.updatePlaylistMeta),
                 switchMap((action) =>
-                    this.playlistsService.updatePlaylistMeta(action.playlist).pipe(
-                        tap(() => {
-                            if (
-                                this.hasPlaylistScopedEpgSourceChange(
-                                    action.playlist
-                                )
-                            ) {
-                                this.fetchPlaylistScopedEpg(action.playlist);
-                            }
-                        })
-                    )
+                    this.playlistsService
+                        .updatePlaylistMeta(action.playlist)
+                        .pipe(
+                            tap(() => {
+                                if (
+                                    this.hasPlaylistScopedEpgSourceChange(
+                                        action.playlist
+                                    )
+                                ) {
+                                    this.fetchPlaylistScopedEpg(
+                                        action.playlist
+                                    );
+                                }
+                            })
+                        )
                 )
             );
         },
diff --git a/libs/m3u-state/src/lib/external-player-payload.util.ts b/libs/m3u-state/src/lib/external-player-payload.util.ts
index af82f2ca6..082770e2a 100644
--- a/libs/m3u-state/src/lib/external-player-payload.util.ts
+++ b/libs/m3u-state/src/lib/external-player-payload.util.ts
@@ -1,4 +1,34 @@
-import { Channel } from '@iptvnator/shared/interfaces';
+import { Channel, VideoPlayer } from '@iptvnator/shared/interfaces';
+import { isDashChannel } from '@iptvnator/shared/m3u-utils';
+
+/**
+ * Decides whether activating a channel should auto-launch the configured
+ * external player. Radio channels use the inline audio player; DASH (`.mpd`)
+ * channels use the inline Shaka engine because MPV/VLC cannot receive the
+ * KODIPROP ClearKey configuration.
+ */
+export function shouldAutoLaunchExternalPlayer(
+    settings:
+        | { player?: VideoPlayer; openStreamOnDoubleClick?: boolean }
+        | null
+        | undefined,
+    startPlayback: boolean | undefined,
+    channel: Channel,
+    player: VideoPlayer.MPV | VideoPlayer.VLC
+): boolean {
+    if (!settings || Object.keys(settings).length === 0) {
+        return false;
+    }
+
+    const startRequested =
+        !settings.openStreamOnDoubleClick || startPlayback === true;
+    return (
+        startRequested &&
+        settings.player === player &&
+        channel.radio !== 'true' &&
+        !isDashChannel(channel)
+    );
+}
 
 export function buildExternalPlayerPayload(
     activeChannel: Channel | undefined | null,
diff --git a/libs/m3u-state/src/lib/playlist-update.effect-handler.spec.ts b/libs/m3u-state/src/lib/playlist-update.effect-handler.spec.ts
new file mode 100644
index 000000000..3e80ff0d4
--- /dev/null
+++ b/libs/m3u-state/src/lib/playlist-update.effect-handler.spec.ts
@@ -0,0 +1,30 @@
+import { type Playlist } from '@iptvnator/shared/interfaces';
+import { of } from 'rxjs';
+import { PlaylistActions } from './actions';
+import { persistPlaylistUpdate } from './playlist-update.effect-handler';
+
+describe('persistPlaylistUpdate', () => {
+    it('forwards the refresh operation ID to playlist persistence', () => {
+        const playlistsService = {
+            updatePlaylist: jest.fn(() => of(undefined)),
+        };
+        const playlist = {
+            _id: 'playlist-1',
+            playlist: { items: [] },
+        } as unknown as Playlist;
+        const action = PlaylistActions.updatePlaylist({
+            playlist,
+            playlistId: playlist._id,
+            refreshEpg: true,
+            operationId: 'playlist-refresh-operation',
+        });
+
+        persistPlaylistUpdate(playlistsService, action);
+
+        expect(playlistsService.updatePlaylist).toHaveBeenCalledWith(
+            playlist._id,
+            playlist,
+            'playlist-refresh-operation'
+        );
+    });
+});
diff --git a/libs/m3u-state/src/lib/playlist-update.effect-handler.ts b/libs/m3u-state/src/lib/playlist-update.effect-handler.ts
new file mode 100644
index 000000000..899fb349f
--- /dev/null
+++ b/libs/m3u-state/src/lib/playlist-update.effect-handler.ts
@@ -0,0 +1,29 @@
+import type { Playlist } from '@iptvnator/shared/interfaces';
+
+interface PlaylistUpdateAction {
+    operationId?: string;
+    playlist: Playlist;
+    playlistId: string;
+}
+
+interface PlaylistUpdater<TResult> {
+    updatePlaylist: (
+        playlistId: string,
+        playlist: Playlist,
+        operationId?: string
+    ) => TResult;
+}
+
+export function persistPlaylistUpdate<TResult>(
+    playlistsService: PlaylistUpdater<TResult>,
+    action: PlaylistUpdateAction
+): TResult {
+    return playlistsService.updatePlaylist(
+        action.playlistId,
+        {
+            ...action.playlist,
+            _id: action.playlistId,
+        },
+        action.operationId
+    );
+}
diff --git a/libs/m3u-state/src/lib/reducers/favorites.reducers.spec.ts b/libs/m3u-state/src/lib/reducers/favorites.reducers.spec.ts
new file mode 100644
index 000000000..25d781018
--- /dev/null
+++ b/libs/m3u-state/src/lib/reducers/favorites.reducers.spec.ts
@@ -0,0 +1,36 @@
+import { createReducer } from '@ngrx/store';
+import { PlaylistMeta } from '@iptvnator/shared/interfaces';
+import { FavoritesActions } from '../actions';
+import { playlistsAdapter } from '../playlists.state';
+import { initialState } from '../state';
+import { favoritesReducers } from './favorites.reducers';
+
+const reducer = createReducer(initialState, ...favoritesReducers);
+
+describe('favoritesReducers', () => {
+    it('hydrates persisted favorites into state without using the persistence action', () => {
+        const playlist = {
+            _id: 'playlist-1',
+            title: 'Synthetic playlist',
+            favorites: ['stale-channel'],
+        } as PlaylistMeta;
+        const state = {
+            ...initialState,
+            playlists: playlistsAdapter.addOne(playlist, {
+                ...initialState.playlists,
+                selectedId: playlist._id,
+            }),
+        };
+
+        const nextState = reducer(
+            state,
+            FavoritesActions.hydrateFavorites({
+                channelIds: ['persisted-channel'],
+            })
+        );
+
+        expect(nextState.playlists.entities[playlist._id]?.favorites).toEqual([
+            'persisted-channel',
+        ]);
+    });
+});
diff --git a/libs/m3u-state/src/lib/reducers/favorites.reducers.ts b/libs/m3u-state/src/lib/reducers/favorites.reducers.ts
index 4e83e0947..12bb4a383 100644
--- a/libs/m3u-state/src/lib/reducers/favorites.reducers.ts
+++ b/libs/m3u-state/src/lib/reducers/favorites.reducers.ts
@@ -32,26 +32,30 @@ export const favoritesReducers = [
             },
         };
     }),
-    on(FavoritesActions.setFavorites, (state, action): PlaylistState => {
-        const selectedId = state.playlists.selectedId;
-        const playlist = state.playlists.entities[selectedId];
-        if (!selectedId || !playlist) {
-            return state;
-        }
+    on(
+        FavoritesActions.setFavorites,
+        FavoritesActions.hydrateFavorites,
+        (state, action): PlaylistState => {
+            const selectedId = state.playlists.selectedId;
+            const playlist = state.playlists.entities[selectedId];
+            if (!selectedId || !playlist) {
+                return state;
+            }
 
-        const { channelIds } = action;
-        return {
-            ...state,
-            playlists: {
-                ...state.playlists,
-                entities: {
-                    ...state.playlists.entities,
-                    [selectedId]: {
-                        ...playlist,
-                        favorites: channelIds,
+            const { channelIds } = action;
+            return {
+                ...state,
+                playlists: {
+                    ...state.playlists,
+                    entities: {
+                        ...state.playlists.entities,
+                        [selectedId]: {
+                            ...playlist,
+                            favorites: channelIds,
+                        },
                     },
                 },
-            },
-        };
-    }),
+            };
+        }
+    ),
 ];
diff --git a/libs/m3u-state/tsconfig.spec.json b/libs/m3u-state/tsconfig.spec.json
index cc2617958..19497995e 100644
--- a/libs/m3u-state/tsconfig.spec.json
+++ b/libs/m3u-state/tsconfig.spec.json
@@ -2,12 +2,12 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "preserve",
         "target": "es2016",
         "types": ["jest", "node"],
-        "moduleResolution": "node10"
+        "moduleResolution": "bundler"
     },
-    "files": ["src/test-setup.ts"],
+    "files": ["src/test-setup.ts", "../../global.d.ts"],
     "include": [
         "jest.config.ts",
         "src/**/*.test.ts",
diff --git a/libs/playlist/import/feature/src/lib/stalker-portal-import/stalker-portal-import.component.ts b/libs/playlist/import/feature/src/lib/stalker-portal-import/stalker-portal-import.component.ts
index 266a7b40b..0345965ad 100644
--- a/libs/playlist/import/feature/src/lib/stalker-portal-import/stalker-portal-import.component.ts
+++ b/libs/playlist/import/feature/src/lib/stalker-portal-import/stalker-portal-import.component.ts
@@ -17,8 +17,7 @@ import {
     StalkerSessionService,
     normalizeStalkerPortalIdentity,
 } from '@iptvnator/portal/stalker/data-access';
-import { Playlist } from '@iptvnator/shared/interfaces';
-import { v4 as uuid } from 'uuid';
+import { createRandomId, Playlist } from '@iptvnator/shared/interfaces';
 
 @Component({
     imports: [
@@ -55,7 +54,7 @@ export class StalkerPortalImportComponent {
     readonly URL_REGEX = /^(http|https|file):\/\/[^ "]+$/;
 
     readonly form = new FormGroup({
-        _id: new FormControl(uuid()),
+        _id: new FormControl(createRandomId()),
         title: new FormControl('', [Validators.required]),
         macAddress: new FormControl('', [Validators.required]),
         serialNumber: new FormControl(''),
@@ -82,7 +81,7 @@ export class StalkerPortalImportComponent {
 
     clearForm(): void {
         this.form.reset({
-            _id: uuid(),
+            _id: createRandomId(),
             title: '',
             macAddress: '',
             serialNumber: '',
diff --git a/libs/playlist/import/feature/src/lib/xtream-code-import/xtream-code-import.component.ts b/libs/playlist/import/feature/src/lib/xtream-code-import/xtream-code-import.component.ts
index 77d1a8497..f55115de3 100644
--- a/libs/playlist/import/feature/src/lib/xtream-code-import/xtream-code-import.component.ts
+++ b/libs/playlist/import/feature/src/lib/xtream-code-import/xtream-code-import.component.ts
@@ -16,11 +16,11 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { PlaylistActions } from '@iptvnator/m3u-state';
 import { PortalStatus, PortalStatusService } from '@iptvnator/services';
 import {
+    createRandomId,
     extractXtreamCredentialsFromUrl,
     normalizeXtreamServerUrl,
     Playlist,
 } from '@iptvnator/shared/interfaces';
-import { v4 as uuid } from 'uuid';
 
 function xtreamServerUrlValidator(
     control: AbstractControl
@@ -91,7 +91,7 @@ export class XtreamCodeImportComponent {
     URL_REGEX = /^\s*https?:\/\/[^ "]+\s*$/;
 
     form = new FormGroup({
-        _id: new FormControl(uuid()),
+        _id: new FormControl(createRandomId()),
         title: new FormControl('', [Validators.required]),
         password: new FormControl('', [Validators.required]),
         username: new FormControl('', [Validators.required]),
@@ -149,7 +149,7 @@ export class XtreamCodeImportComponent {
 
     clearForm(): void {
         this.form.reset({
-            _id: uuid(),
+            _id: createRandomId(),
             title: '',
             password: '',
             username: '',
diff --git a/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.performance.spec.ts b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.performance.spec.ts
new file mode 100644
index 000000000..ae41228fa
--- /dev/null
+++ b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.performance.spec.ts
@@ -0,0 +1,123 @@
+import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { PlaylistContextFacade } from '@iptvnator/playlist/shared/util';
+import { PlaylistsService } from '@iptvnator/services';
+import { type Channel, type Playlist } from '@iptvnator/shared/interfaces';
+import {
+    RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+    type RendererPerformancePhaseEvent,
+} from '@iptvnator/shared/logging';
+import { of, Subject } from 'rxjs';
+import { M3uWorkspaceRouteSession } from './m3u-workspace-route-session.service';
+
+const PLAYLIST_ID = 'performance-playlist';
+const PRIMARY_CHANNEL = {
+    id: 'channel-1',
+    name: 'Sensitive channel',
+    url: 'https://stream-secret.example.test/1',
+} as Channel;
+const NEXT_CHANNEL = {
+    id: 'channel-2',
+    name: 'Next sensitive channel',
+    url: 'https://stream-secret.example.test/2',
+} as Channel;
+
+async function flushEffects(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('M3uWorkspaceRouteSession performance phases', () => {
+    const hookSymbol = Symbol.for(RENDERER_PERFORMANCE_PHASE_HOOK_KEY);
+    const store = { dispatch: jest.fn() };
+
+    beforeEach(() => {
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: { setUserAgent: jest.fn().mockResolvedValue(true) },
+        });
+        store.dispatch.mockReset();
+        TestBed.configureTestingModule({
+            providers: [
+                M3uWorkspaceRouteSession,
+                {
+                    provide: PlaylistContextFacade,
+                    useValue: {
+                        syncFromUrl: jest.fn(() => ({
+                            inWorkspace: true,
+                            playlistId: PLAYLIST_ID,
+                            provider: 'playlists',
+                            section: 'all',
+                        })),
+                    },
+                },
+                {
+                    provide: PlaylistsService,
+                    useValue: {
+                        getPlaylist: jest.fn(() =>
+                            of({
+                                playlist: {
+                                    items: [PRIMARY_CHANNEL, NEXT_CHANNEL],
+                                },
+                                title: 'Sensitive title',
+                                url: 'https://user:secret@example.test/list.m3u',
+                            } as Playlist)
+                        ),
+                    },
+                },
+                {
+                    provide: Router,
+                    useValue: {
+                        events: new Subject().asObservable(),
+                        url: `/workspace/playlists/${PLAYLIST_ID}/all`,
+                    },
+                },
+                { provide: Store, useValue: store },
+            ],
+        });
+    });
+
+    afterEach(() => {
+        delete (globalThis as unknown as Record<symbol, unknown>)[hookSymbol];
+        delete (window as unknown as { electron?: unknown }).electron;
+    });
+
+    it('marks channel publication with only the imported item count', async () => {
+        const events: RendererPerformancePhaseEvent[] = [];
+        (
+            globalThis as unknown as Record<
+                symbol,
+                (event: RendererPerformancePhaseEvent) => void
+            >
+        )[hookSymbol] = (event) => events.push(event);
+
+        TestBed.inject(M3uWorkspaceRouteSession);
+        await flushEffects();
+
+        expect(
+            events.map(({ boundary, metadata, outcome, phase }) => ({
+                boundary,
+                metadata,
+                outcome,
+                phase,
+            }))
+        ).toEqual([
+            {
+                boundary: 'start',
+                metadata: { items: 2 },
+                outcome: undefined,
+                phase: 'store.m3u-publish-channels',
+            },
+            {
+                boundary: 'end',
+                metadata: { items: 2 },
+                outcome: 'success',
+                phase: 'store.m3u-publish-channels',
+            },
+        ]);
+        expect(JSON.stringify(events)).not.toContain('Sensitive');
+        expect(JSON.stringify(events)).not.toContain('secret');
+        expect(JSON.stringify(events)).not.toContain(PRIMARY_CHANNEL.url);
+    });
+});
diff --git a/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.spec.ts b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.spec.ts
index cee66647b..4581781d4 100644
--- a/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.spec.ts
+++ b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NavigationEnd, Router } from '@angular/router';
-import { of, Subject } from 'rxjs';
+import { of, Subject, throwError } from 'rxjs';
 import { ChannelActions, FavoritesActions } from '@iptvnator/m3u-state';
 import { PlaylistContextFacade } from '@iptvnator/playlist/shared/util';
 import { PlaylistsService } from '@iptvnator/services';
@@ -180,6 +180,52 @@ describe('M3uWorkspaceRouteSession', () => {
         );
     });
 
+    it('hydrates persisted favorites without dispatching the persistence action', async () => {
+        playlistsService.getPlaylist.mockReturnValue(
+            of({
+                favorites: [PRIMARY_CHANNEL.url],
+                playlist: {
+                    items: [PRIMARY_CHANNEL],
+                },
+            } as Playlist)
+        );
+
+        TestBed.inject(M3uWorkspaceRouteSession);
+        await flushEffects();
+
+        expect(store.dispatch).toHaveBeenCalledWith(
+            FavoritesActions.hydrateFavorites({
+                channelIds: [PRIMARY_CHANNEL.url],
+            })
+        );
+        expect(
+            store.dispatch.mock.calls.some(
+                ([action]) => action.type === FavoritesActions.setFavorites.type
+            )
+        ).toBe(false);
+    });
+
+    it('clears in-memory favorites without dispatching persistence when playlist loading fails', async () => {
+        playlistsService.getPlaylist.mockReturnValue(
+            throwError(() => new Error('Playlist loading failed'))
+        );
+
+        TestBed.inject(M3uWorkspaceRouteSession);
+        await flushEffects();
+
+        expect(store.dispatch).toHaveBeenCalledWith(
+            ChannelActions.setChannels({ channels: [] })
+        );
+        expect(store.dispatch).toHaveBeenCalledWith(
+            FavoritesActions.hydrateFavorites({ channelIds: [] })
+        );
+        expect(
+            store.dispatch.mock.calls.some(
+                ([action]) => action.type === FavoritesActions.setFavorites.type
+            )
+        ).toBe(false);
+    });
+
     it('ignores stale playlist responses after a newer route request wins', async () => {
         const firstResponse = new Subject<Playlist>();
         const secondResponse = new Subject<Playlist>();
@@ -225,7 +271,7 @@ describe('M3uWorkspaceRouteSession', () => {
             [ChannelActions.setChannels({ channels: [NEXT_CHANNEL] })],
         ]);
         expect(store.dispatch).toHaveBeenCalledWith(
-            FavoritesActions.setFavorites({
+            FavoritesActions.hydrateFavorites({
                 channelIds: [NEXT_CHANNEL.url],
             })
         );
diff --git a/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.ts b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.ts
index 09d8ed28b..c0bba152b 100644
--- a/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.ts
+++ b/libs/playlist/m3u/feature-player/src/lib/m3u-workspace-route-session.service.ts
@@ -9,6 +9,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { NavigationEnd, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { ChannelActions, FavoritesActions } from '@iptvnator/m3u-state';
+import {
+    measureRendererPerformancePhase,
+    RENDERER_PERFORMANCE_PHASE,
+} from '@iptvnator/shared/logging';
 import { filter, firstValueFrom } from 'rxjs';
 import { PlaylistContextFacade } from '@iptvnator/playlist/shared/util';
 import { PlaylistsService } from '@iptvnator/services';
@@ -107,17 +111,23 @@ export class M3uWorkspaceRouteSession {
                     );
                 });
 
-            this.store.dispatch(
-                ChannelActions.setChannels({
-                    channels: playlist.playlist?.items ?? [],
-                })
+            const channels = playlist.playlist?.items ?? [];
+            measureRendererPerformancePhase(
+                RENDERER_PERFORMANCE_PHASE.M3U_PUBLISH_CHANNELS,
+                () =>
+                    this.store.dispatch(
+                        ChannelActions.setChannels({
+                            channels,
+                        })
+                    ),
+                () => ({ items: channels.length })
             );
 
             const favorites = (playlist.favorites ?? []).filter(
                 (favorite): favorite is string => typeof favorite === 'string'
             );
             this.store.dispatch(
-                FavoritesActions.setFavorites({
+                FavoritesActions.hydrateFavorites({
                     channelIds: favorites,
                 })
             );
@@ -128,7 +138,7 @@ export class M3uWorkspaceRouteSession {
 
             this.store.dispatch(ChannelActions.setChannels({ channels: [] }));
             this.store.dispatch(
-                FavoritesActions.setFavorites({ channelIds: [] })
+                FavoritesActions.hydrateFavorites({ channelIds: [] })
             );
         }
     }
diff --git a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.html b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.html
index 4d9d98dd8..bd30b8c03 100644
--- a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.html
+++ b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.html
@@ -67,20 +67,21 @@
                     <app-audio-player
                         [url]="activeChannel.url"
                         [icon]="activeChannel?.tvg?.logo!"
-                        [channelName]="
-                            activeChannel.name || activeChannel?.tvg?.name || ''
-                        "
+                        [channelName]="displayChannelName()"
                         [volume]="volume()"
                         (volumeChange)="onInlineVolumeChange($event)"
                     />
                 } @else {
                     <app-web-player-view
                         [streamUrl]="embeddedPlayback()?.streamUrl ?? ''"
-                        [title]="embeddedPlayback()?.title ?? ''"
+                        [title]="inlinePlayerTitle()"
                         [playback]="embeddedPlayback()"
-                        [playerOverride]="playerSettings.player ?? null"
+                        [playerOverride]="
+                            activeChannelIsDash()
+                                ? dashPlayerOverride()
+                                : (playerSettings.player ?? null)
+                        "
                         [volume]="volume()"
-                        [showCaptions]="!!playerSettings.showCaptions"
                         (externalFallbackRequested)="
                             handleExternalFallbackRequest($event)
                         "
diff --git a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.spec.ts b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.spec.ts
index 5ddc02e79..5279ae96a 100644
--- a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.spec.ts
+++ b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.spec.ts
@@ -117,7 +117,6 @@ class StubWebPlayerViewComponent {
     readonly playback = input<unknown>(null);
     readonly playerOverride = input<VideoPlayer | null>(null);
     readonly volume = input(1);
-    readonly showCaptions = input(false);
     readonly externalFallbackRequested = output<PlaybackFallbackRequest>();
 }
 
@@ -191,6 +190,7 @@ describe('VideoPlayerComponent', () => {
 
     const player = signal<VideoPlayer>(VideoPlayer.VideoJs);
     const showCaptions = signal(false);
+    const stripCountryPrefix = signal(false);
     const epgViewMode = signal<'timeline' | 'list'>('timeline');
     const originalElectron = window.electron;
 
@@ -314,6 +314,7 @@ describe('VideoPlayerComponent', () => {
         localStorage.removeItem(LIVE_EPG_PANEL_STATE_STORAGE_KEY);
         player.set(VideoPlayer.VideoJs);
         showCaptions.set(false);
+        stripCountryPrefix.set(false);
         activePlaybackUrl.set(null);
         channelsLoading.set(false);
         currentEpgProgram.set(null);
@@ -389,6 +390,7 @@ describe('VideoPlayerComponent', () => {
                     useValue: {
                         player,
                         showCaptions,
+                        stripCountryPrefix,
                         resolvedEpgViewMode: epgViewMode,
                     },
                 },
@@ -456,6 +458,26 @@ describe('VideoPlayerComponent', () => {
         expect(headerContext.action()).toBeNull();
     });
 
+    it('strips country prefixes from the timeline and player titles when enabled', () => {
+        stripCountryPrefix.set(true);
+        syncStoreState({ ...sampleChannel, name: 'US | CNN' } as Channel);
+
+        fixture.detectChanges();
+
+        expect(component.timelineChannelName()).toBe('CNN');
+        expect(component.displayChannelName()).toBe('CNN');
+        expect(component.inlinePlayerTitle()).toBe('CNN');
+    });
+
+    it('keeps raw channel names while prefix stripping is disabled', () => {
+        syncStoreState({ ...sampleChannel, name: 'US | CNN' } as Channel);
+
+        fixture.detectChanges();
+
+        expect(component.timelineChannelName()).toBe('US | CNN');
+        expect(component.displayChannelName()).toBe('US | CNN');
+    });
+
     it('renders the inline player with the embedded EPG panel', () => {
         syncStoreState(sampleChannel);
         player.set(VideoPlayer.VideoJs);
@@ -604,6 +626,136 @@ describe('VideoPlayerComponent', () => {
         ).toBe(false);
     });
 
+    it('keeps DASH channels inline on the HTML5 player even when MPV is configured', () => {
+        syncStoreState({
+            ...sampleChannel,
+            url: 'http://localhost/live.mpd',
+        } as Channel);
+        player.set(VideoPlayer.MPV);
+
+        fixture.detectChanges();
+
+        const playerView = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        );
+        expect(playerView).not.toBeNull();
+        const stub =
+            playerView.componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playerOverride()).toBe(VideoPlayer.Html5Player);
+        expect(dataServiceMock.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('routes catch-up playback that resolves to a DASH URL inline as well', () => {
+        syncStoreState(sampleChannel);
+        activePlaybackUrl.set('http://localhost/archive/replay.mpd');
+        player.set(VideoPlayer.MPV);
+
+        fixture.detectChanges();
+
+        const playerView = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        );
+        expect(playerView).not.toBeNull();
+        const stub =
+            playerView.componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playerOverride()).toBe(VideoPlayer.Html5Player);
+    });
+
+    it('keeps a DASH channel inline when its catch-up resolves to a non-DASH URL', () => {
+        syncStoreState({
+            ...sampleChannel,
+            url: 'http://localhost/live.mpd',
+        } as Channel);
+        activePlaybackUrl.set('http://localhost/archive/replay.m3u8');
+        player.set(VideoPlayer.MPV);
+
+        fixture.detectChanges();
+
+        // The external-player guard declines DASH channels, so the inline
+        // player must stay — otherwise the session has no player at all.
+        expect(
+            fixture.debugElement.query(
+                By.directive(StubWebPlayerViewComponent)
+            )
+        ).not.toBeNull();
+    });
+
+    it('extracts DRM lazily from raw KODIPROP for pre-upgrade playlists', () => {
+        const kid = '00112233445566778899aabbccddeeff';
+        const key = 'ffeeddccbbaa99887766554433221100';
+        syncStoreState({
+            ...sampleChannel,
+            url: 'http://localhost/enc.mpd',
+            raw: [
+                '#EXTINF:-1,Encrypted',
+                '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                `#KODIPROP:inputstream.adaptive.license_key=${kid}:${key}`,
+                'http://localhost/enc.mpd',
+            ].join('\r\n'),
+        } as Channel);
+        player.set(VideoPlayer.Html5Player);
+
+        fixture.detectChanges();
+
+        const stub = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        ).componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playback()).toEqual(
+            expect.objectContaining({
+                drm: {
+                    licenseType: 'clearkey',
+                    supported: true,
+                    clearKeys: { [kid]: key },
+                },
+            })
+        );
+    });
+
+    it('keeps ArtPlayer for DASH channels and forwards the ClearKey DRM config', () => {
+        const drm = {
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { '11223344556677889900aabbccddeeff': 'f'.repeat(32) },
+        };
+        syncStoreState({
+            ...sampleChannel,
+            url: 'http://localhost/live.mpd',
+            drm,
+        } as Channel);
+        player.set(VideoPlayer.ArtPlayer);
+
+        fixture.detectChanges();
+
+        const stub = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        ).componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playerOverride()).toBe(VideoPlayer.ArtPlayer);
+        expect(stub.playback()).toEqual(expect.objectContaining({ drm }));
+    });
+
+    it('routes Video.js users to the HTML5 player only for DASH channels', () => {
+        syncStoreState({
+            ...sampleChannel,
+            url: 'http://localhost/live.mpd',
+        } as Channel);
+        player.set(VideoPlayer.VideoJs);
+
+        fixture.detectChanges();
+
+        let stub = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        ).componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playerOverride()).toBe(VideoPlayer.Html5Player);
+
+        syncStoreState(sampleChannel);
+        fixture.detectChanges();
+
+        stub = fixture.debugElement.query(
+            By.directive(StubWebPlayerViewComponent)
+        ).componentInstance as StubWebPlayerViewComponent;
+        expect(stub.playerOverride()).toBe(VideoPlayer.VideoJs);
+    });
+
     it('passes remote volume changes to the radio audio player', () => {
         const radioChannel = {
             ...sampleChannel,
diff --git a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.ts b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.ts
index e1dbf329b..dfeb98601 100644
--- a/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.ts
+++ b/libs/playlist/m3u/feature-player/src/lib/video-player/video-player.component.ts
@@ -22,7 +22,11 @@ import { StorageMap } from '@ngx-pwa/local-storage';
 import { TranslatePipe } from '@ngx-translate/core';
 import { ResizableDirective } from '@iptvnator/ui/components';
 import {
+    applyChannelNameStrip,
     getM3uArchiveDays,
+    extractDrmFromRaw,
+    isDashChannel,
+    isDashStreamUrl,
     isM3uCatchupPlaybackSupported,
 } from '@iptvnator/shared/m3u-utils';
 import { PlaylistContextFacade } from '@iptvnator/playlist/shared/util';
@@ -172,6 +176,28 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
     readonly archivePlaybackAvailable = computed(() =>
         isM3uCatchupPlaybackSupported(this.activeChannel())
     );
+    /**
+     * DASH (.mpd) playback always runs inline via the Shaka engine. True when
+     * either the channel itself or the resolved catch-up URL is DASH —
+     * mirroring the external-player guard in the m3u-state effects, so a
+     * DASH-flavored session can never end up with no player at all.
+     */
+    readonly activeChannelIsDash = computed(
+        () =>
+            isDashStreamUrl(this.activePlaybackUrl() ?? undefined) ||
+            isDashChannel(this.activeChannel())
+    );
+    /**
+     * Player forced for DASH channels: ArtPlayer keeps ArtPlayer (it has a
+     * Shaka source engine); every other choice — Video.js (no DASH bridge),
+     * embedded/external MPV and VLC (no KODIPROP ClearKey support) — falls
+     * back to the HTML5 player.
+     */
+    readonly dashPlayerOverride = computed<VideoPlayer>(() =>
+        this.settingsStore.player() === VideoPlayer.ArtPlayer
+            ? VideoPlayer.ArtPlayer
+            : VideoPlayer.Html5Player
+    );
     /** Full multi-day programme window for the active channel (timeline). */
     readonly epgPrograms = toSignal(this.epgService.currentEpgPrograms$, {
         initialValue: [] as EpgProgram[],
@@ -182,8 +208,26 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
     readonly epgArchiveDays = computed(() =>
         getM3uArchiveDays(this.activeChannel())
     );
-    readonly timelineChannelName = computed(
-        () => this.activeChannel()?.name ?? ''
+    readonly timelineChannelName = computed(() =>
+        applyChannelNameStrip(
+            this.activeChannel()?.name,
+            this.settingsStore.stripCountryPrefix?.()
+        )
+    );
+    /** Channel name for the radio player header. */
+    readonly displayChannelName = computed(() => {
+        const channel = this.activeChannel();
+        return applyChannelNameStrip(
+            channel?.name || channel?.tvg?.name,
+            this.settingsStore.stripCountryPrefix?.()
+        );
+    });
+    /** Display title for the inline web player header. */
+    readonly inlinePlayerTitle = computed(() =>
+        applyChannelNameStrip(
+            this.embeddedPlayback()?.title,
+            this.settingsStore.stripCountryPrefix?.()
+        )
     );
     /** Channel logo from the EPG feed (M3U playlists often lack tvg-logo). */
     private readonly epgChannelLogo = toSignal(
@@ -261,6 +305,10 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
             userAgent: http['user-agent'] || undefined,
             referer: http.referrer || undefined,
             origin: http.origin || undefined,
+            // Playlists imported before the DRM feature carry no drm field
+            // yet, but their raw KODIPROP block survived in the stored items
+            // — extract lazily so they work without a re-import.
+            drm: playbackTarget.drm ?? extractDrmFromRaw(playbackTarget.raw),
         };
     });
     readonly sidebarStorageKey = computed(() =>
@@ -319,7 +367,6 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
     /** Selected video player options */
     playerSettings: Partial<Settings> = {
         player: VideoPlayer.VideoJs,
-        showCaptions: false,
     };
 
     readonly isDesktop = this.runtime.isElectron;
@@ -355,7 +402,6 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
         effect(() => {
             this.playerSettings = {
                 player: this.settingsStore.player(),
-                showCaptions: this.settingsStore.showCaptions(),
             };
         });
 
@@ -691,7 +737,6 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
                 this.playerSettings = {
                     player:
                         (settings as Settings).player || VideoPlayer.VideoJs,
-                    showCaptions: (settings as Settings).showCaptions || false,
                 };
             }
         });
@@ -973,6 +1018,13 @@ export class VideoPlayerComponent implements OnInit, OnDestroy {
             return false;
         }
 
+        // DASH playback bypasses the external-player setting (radio
+        // precedent): MPV/VLC cannot receive the KODIPROP ClearKey
+        // configuration. Checked on the effective (possibly catch-up) URL.
+        if (this.activeChannelIsDash()) {
+            return true;
+        }
+
         return !this.isExternalPlayer(this.playerSettings.player);
     }
 
diff --git a/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.spec.ts b/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.spec.ts
index b8e84e9e4..2ba8bb51e 100644
--- a/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.spec.ts
+++ b/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.spec.ts
@@ -418,28 +418,34 @@ describe('PlaylistRefreshActionService', () => {
         );
         expect(setItemSpy).toHaveBeenCalledWith(
             `xtream-restore-${item._id}`,
-            JSON.stringify({
-                hiddenCategories: [{ xtreamId: 404, categoryType: 'live' }],
-                favorites: [
-                    {
-                        xtreamId: 101,
-                        contentType: 'live',
-                    },
-                    {
-                        xtreamId: 202,
-                        contentType: 'movie',
-                    },
-                ],
-                recentlyViewed: [
-                    {
-                        xtreamId: 303,
-                        contentType: 'series',
-                        viewedAt: '2026-04-04T08:00:00.000Z',
-                    },
-                ],
-                playbackPositions: [],
-            })
+            expect.any(String)
         );
+        const persistedRestoreState = JSON.parse(
+            setItemSpy.mock.calls.find(
+                ([key]) => key === `xtream-restore-${item._id}`
+            )?.[1] ?? 'null'
+        );
+        expect(persistedRestoreState).toEqual({
+            hiddenCategories: [{ xtreamId: 404, categoryType: 'live' }],
+            favorites: [
+                {
+                    xtreamId: 101,
+                    contentType: 'live',
+                },
+                {
+                    xtreamId: 202,
+                    contentType: 'movie',
+                },
+            ],
+            recentlyViewed: [
+                {
+                    xtreamId: 303,
+                    contentType: 'series',
+                    viewedAt: '2026-04-04T08:00:00.000Z',
+                },
+            ],
+            playbackPositions: [],
+        });
         expect(store.dispatch).toHaveBeenCalledWith(
             PlaylistActions.updatePlaylistMeta({
                 playlist: { ...item, updateDate: 1712217600000 },
@@ -624,6 +630,7 @@ describe('PlaylistRefreshActionService', () => {
                 playlist: refreshedPlaylist,
                 playlistId: item._id,
                 refreshEpg: true,
+                operationId: 'playlist-refresh-op',
             })
         );
     });
diff --git a/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.ts b/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.ts
index 8ca73a67a..43aed4ab6 100644
--- a/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.ts
+++ b/libs/playlist/shared/ui/src/lib/playlist-refresh-action.service.ts
@@ -205,12 +205,11 @@ export class PlaylistRefreshActionService {
         }
 
         try {
+            const operationId =
+                this.databaseService.createOperationId('playlist-refresh');
             const refreshedPlaylist =
                 await this.playlistRefreshService.refreshPlaylist({
-                    operationId:
-                        this.databaseService.createOperationId(
-                            'playlist-refresh'
-                        ),
+                    operationId,
                     playlistId: item._id,
                     title: item.title,
                     url: item.url,
@@ -228,6 +227,7 @@ export class PlaylistRefreshActionService {
                     },
                     playlistId: item._id,
                     refreshEpg: true,
+                    operationId,
                 })
             );
 
diff --git a/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.spec.ts b/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.spec.ts
index 1bd6a7812..dca8d0fa0 100644
--- a/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.spec.ts
+++ b/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.spec.ts
@@ -449,22 +449,28 @@ describe('RecentPlaylistsComponent busy state', () => {
         );
         expect(setItemSpy).toHaveBeenCalledWith(
             `xtream-restore-${item._id}`,
-            JSON.stringify({
-                hiddenCategories: [{ xtreamId: 404, categoryType: 'live' }],
-                favorites: [
-                    { xtreamId: 101, contentType: 'live' },
-                    { xtreamId: 202, contentType: 'movie' },
-                ],
-                recentlyViewed: [
-                    {
-                        xtreamId: 303,
-                        contentType: 'series',
-                        viewedAt: '2026-04-03T11:15:00.000Z',
-                    },
-                ],
-                playbackPositions: [],
-            })
+            expect.any(String)
         );
+        const persistedRestoreState = JSON.parse(
+            setItemSpy.mock.calls.find(
+                ([key]) => key === `xtream-restore-${item._id}`
+            )?.[1] ?? 'null'
+        );
+        expect(persistedRestoreState).toEqual({
+            hiddenCategories: [{ xtreamId: 404, categoryType: 'live' }],
+            favorites: [
+                { xtreamId: 101, contentType: 'live' },
+                { xtreamId: 202, contentType: 'movie' },
+            ],
+            recentlyViewed: [
+                {
+                    xtreamId: 303,
+                    contentType: 'series',
+                    viewedAt: '2026-04-03T11:15:00.000Z',
+                },
+            ],
+            playbackPositions: [],
+        });
         expect(router.navigate).toHaveBeenCalledWith([
             '/workspace',
             'xtreams',
@@ -543,5 +549,15 @@ describe('RecentPlaylistsComponent busy state', () => {
         expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
 
         await Promise.resolve();
+        expect(store.dispatch).toHaveBeenCalledWith(
+            PlaylistActions.updatePlaylist({
+                playlist: expect.objectContaining({
+                    _id: item._id,
+                }),
+                playlistId: item._id,
+                refreshEpg: true,
+                operationId: 'playlist-refresh-op',
+            })
+        );
     });
 });
diff --git a/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.ts b/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.ts
index a615e96ec..bbada321d 100644
--- a/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.ts
+++ b/libs/playlist/shared/ui/src/lib/recent-playlists/recent-playlists.component.ts
@@ -463,6 +463,7 @@ export class RecentPlaylistsComponent {
                     },
                     playlistId: item._id,
                     refreshEpg: true,
+                    operationId,
                 })
             );
 
diff --git a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.html b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.html
index 96ad8756c..6763eb864 100644
--- a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.html
+++ b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.html
@@ -211,6 +211,7 @@
                 [pageSizeOptions]="pageSizeOptions"
                 [showPaginator]="false"
                 [searchTerm]="searchTerm()"
+                [type]="contentType() ?? ''"
                 (pageChange)="onPageChange($event)"
             />
         </div>
diff --git a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.scss b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.scss
index 36340c715..a55858215 100644
--- a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.scss
+++ b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.scss
@@ -245,7 +245,8 @@ app-grid-list {
     padding: 16px 20px 20px;
     display: block;
     scrollbar-width: thin;
-    scrollbar-color: rgba(255, 255, 255, 0.08) transparent;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
 }
 
 @media (max-width: 768px) {
diff --git a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.spec.ts b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.spec.ts
index a5acd656a..e41e7c60b 100644
--- a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.spec.ts
+++ b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.spec.ts
@@ -31,6 +31,7 @@ class MockGridListComponent {
     readonly pageSizeOptions = input<number[]>();
     readonly showPaginator = input(true);
     readonly searchTerm = input<string>('');
+    readonly type = input<string>('');
     readonly itemClicked = output<unknown>();
     readonly pageChange = output<unknown>();
 }
diff --git a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts
index 173d0db49..afc62d439 100644
--- a/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts
+++ b/libs/portal/catalog/feature/src/lib/category-content-view/category-content-view.component.ts
@@ -259,6 +259,9 @@ export class CategoryContentViewComponent implements OnInit {
         }
 
         this.catalog.selectItem(item as CategoryContentItem);
+        // The item came from a stored snapshot, not the live list — let the
+        // provider refresh stale embedded data (e.g. episode lists).
+        this.catalog.refreshSnapshotSelection?.();
         clearNavigationStateKeys([
             OPEN_STALKER_ITEM_STATE_KEY,
             'openFavoriteItem',
diff --git a/libs/portal/downloads/feature/src/lib/downloads.component.html b/libs/portal/downloads/feature/src/lib/downloads.component.html
index e33245a04..461e43fbf 100644
--- a/libs/portal/downloads/feature/src/lib/downloads.component.html
+++ b/libs/portal/downloads/feature/src/lib/downloads.component.html
@@ -228,6 +228,7 @@
 
                                     @if (
                                         item.status === 'downloading' ||
+                                        item.status === 'paused' ||
                                         item.status === 'completed'
                                     ) {
                                         <span class="downloads__item-size">
@@ -253,6 +254,17 @@
                                 </div>
 
                                 @if (item.status === 'downloading') {
+                                    <mat-progress-bar
+                                        [mode]="
+                                            item.totalBytes
+                                                ? 'determinate'
+                                                : 'indeterminate'
+                                        "
+                                        [value]="getProgress(item)"
+                                    ></mat-progress-bar>
+                                } @else if (
+                                    item.status === 'paused' && item.totalBytes
+                                ) {
                                     <mat-progress-bar
                                         mode="determinate"
                                         [value]="getProgress(item)"
@@ -274,6 +286,18 @@
                                     </button>
                                     @switch (item.status) {
                                         @case ('queued') {
+                                            <button
+                                                mat-icon-button
+                                                (click)="
+                                                    $event.stopPropagation();
+                                                    pause(item)
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.PAUSE' | translate
+                                                "
+                                            >
+                                                <mat-icon>pause</mat-icon>
+                                            </button>
                                             <button
                                                 mat-icon-button
                                                 (click)="
@@ -288,6 +312,18 @@
                                             </button>
                                         }
                                         @case ('downloading') {
+                                            <button
+                                                mat-icon-button
+                                                (click)="
+                                                    $event.stopPropagation();
+                                                    pause(item)
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.PAUSE' | translate
+                                                "
+                                            >
+                                                <mat-icon>pause</mat-icon>
+                                            </button>
                                             <button
                                                 mat-icon-button
                                                 (click)="
@@ -301,6 +337,46 @@
                                                 <mat-icon>close</mat-icon>
                                             </button>
                                         }
+                                        @case ('paused') {
+                                            <button
+                                                mat-icon-button
+                                                color="primary"
+                                                (click)="
+                                                    $event.stopPropagation();
+                                                    resume(item)
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.RESUME' | translate
+                                                "
+                                            >
+                                                <mat-icon>play_arrow</mat-icon>
+                                            </button>
+                                            <button
+                                                mat-icon-button
+                                                (click)="
+                                                    $event.stopPropagation();
+                                                    cancel(item)
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.CANCEL' | translate
+                                                "
+                                            >
+                                                <mat-icon>close</mat-icon>
+                                            </button>
+                                            <button
+                                                mat-icon-button
+                                                color="warn"
+                                                (click)="
+                                                    $event.stopPropagation();
+                                                    remove(item)
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.REMOVE' | translate
+                                                "
+                                            >
+                                                <mat-icon>delete</mat-icon>
+                                            </button>
+                                        }
                                         @case ('completed') {
                                             <button
                                                 mat-icon-button
diff --git a/libs/portal/downloads/feature/src/lib/downloads.component.scss b/libs/portal/downloads/feature/src/lib/downloads.component.scss
index 5ffd989e3..a0b21fd79 100644
--- a/libs/portal/downloads/feature/src/lib/downloads.component.scss
+++ b/libs/portal/downloads/feature/src/lib/downloads.component.scss
@@ -442,6 +442,11 @@
             &.status-queued {
                 color: var(--mat-sys-on-surface-variant);
             }
+
+            &.status-paused {
+                color: #f59e0b;
+                background: color-mix(in srgb, #f59e0b 14%, transparent);
+            }
         }
 
         &-size {
diff --git a/libs/portal/downloads/feature/src/lib/downloads.component.ts b/libs/portal/downloads/feature/src/lib/downloads.component.ts
index 6fd9b69e1..9af28ecca 100644
--- a/libs/portal/downloads/feature/src/lib/downloads.component.ts
+++ b/libs/portal/downloads/feature/src/lib/downloads.component.ts
@@ -212,6 +212,8 @@ export class DownloadsComponent {
                 return 'schedule';
             case 'downloading':
                 return 'downloading';
+            case 'paused':
+                return 'pause_circle';
             case 'completed':
                 return 'check_circle';
             case 'failed':
@@ -229,6 +231,8 @@ export class DownloadsComponent {
                 return 'status-queued';
             case 'downloading':
                 return 'status-downloading';
+            case 'paused':
+                return 'status-paused';
             case 'completed':
                 return 'status-completed';
             case 'failed':
@@ -257,15 +261,38 @@ export class DownloadsComponent {
     }
 
     async cancel(item: DownloadItem) {
-        await this.downloadsService.cancelDownload(item.id);
+        const result = await this.downloadsService.cancelDownload(item.id);
+        if (!result.success) {
+            this.showActionError(result.error);
+        }
+    }
+
+    async pause(item: DownloadItem) {
+        const result = await this.downloadsService.pauseDownload(item.id);
+        if (!result.success) {
+            this.showActionError(result.error);
+        }
+    }
+
+    async resume(item: DownloadItem) {
+        const result = await this.downloadsService.resumeDownload(item.id);
+        if (!result.success) {
+            this.showActionError(result.error);
+        }
     }
 
     async retry(item: DownloadItem) {
-        await this.downloadsService.retryDownload(item.id);
+        const result = await this.downloadsService.retryDownload(item.id);
+        if (!result.success) {
+            this.showActionError(result.error);
+        }
     }
 
     async remove(item: DownloadItem) {
-        await this.downloadsService.removeDownload(item.id);
+        const result = await this.downloadsService.removeDownload(item.id);
+        if (!result.success) {
+            this.showActionError(result.error);
+        }
     }
 
     async play(item: DownloadItem) {
@@ -571,6 +598,17 @@ export class DownloadsComponent {
         return `${item.id}:${item.posterUrl ?? ''}`;
     }
 
+    private showActionError(error?: string): void {
+        const message = error
+            ? `${this.translate.instant('DOWNLOADS.ACTION_FAILED')}: ${error}`
+            : this.translate.instant('DOWNLOADS.ACTION_FAILED');
+
+        this.snackBar.open(message, undefined, {
+            duration: 4000,
+            horizontalPosition: 'start',
+        });
+    }
+
     private handleFileActionError(error?: string): void {
         const message =
             error === 'File not found'
diff --git a/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.spec.ts b/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.spec.ts
index 9578dc38b..e477acb5a 100644
--- a/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.spec.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.spec.ts
@@ -44,6 +44,8 @@ describe('StreamResolverService', () => {
         };
         epgBridge = {
             getChannelPrograms: jest.fn(),
+            getEpgMapping: jest.fn().mockResolvedValue(null),
+            getEpgMappingsBatch: jest.fn().mockResolvedValue(null),
             supportsProgramLookup: true,
         };
 
@@ -267,7 +269,7 @@ describe('StreamResolverService', () => {
                 password: 'pass',
             },
             1,
-            10,
+            50,
             {
                 suppressErrorLog: true,
             }
@@ -342,7 +344,7 @@ describe('StreamResolverService', () => {
                 password: 'pass',
             },
             1,
-            2,
+            5,
             {
                 suppressErrorLog: true,
             }
@@ -416,7 +418,7 @@ describe('StreamResolverService', () => {
                                         stop_timestamp: '1774526400',
                                     },
                                 ]),
-                            10_000
+                            30_000
                         );
                     })
             );
@@ -431,7 +433,7 @@ describe('StreamResolverService', () => {
                 xtreamId: 1,
             } satisfies UnifiedCollectionItem);
 
-            await jest.advanceTimersByTimeAsync(3000);
+            await jest.advanceTimersByTimeAsync(10_000);
 
             await expect(detailPromise).resolves.toMatchObject({
                 epgMode: 'portal',
@@ -445,6 +447,100 @@ describe('StreamResolverService', () => {
         }
     });
 
+    it('resolves manual EPG mappings for Xtream previews with one batched lookup', async () => {
+        playlistsService.getPlaylistById.mockReturnValue(
+            of({
+                _id: 'xtream-1',
+                serverUrl: 'https://xtream.example.com',
+                username: 'user',
+                password: 'pass',
+            } satisfies Partial<Playlist>)
+        );
+
+        const nowMs = Date.now();
+        epgBridge.getEpgMappingsBatch = jest.fn().mockResolvedValue({
+            'xtream:xtream-1:7': 'mapped.channel.id',
+        });
+        epgBridge.getChannelPrograms = jest.fn().mockResolvedValue([
+            {
+                channel: 'mapped.channel.id',
+                title: 'Mapped Program',
+                desc: 'From uploaded XMLTV',
+                start: new Date(nowMs - 60_000).toISOString(),
+                stop: new Date(nowMs + 60_000).toISOString(),
+            },
+        ]);
+
+        const epgMap = await service.loadEpgForItems([
+            {
+                uid: 'xtream::xtream-1::7',
+                name: 'Mapped Channel',
+                contentType: 'live',
+                sourceType: 'xtream',
+                playlistId: 'xtream-1',
+                playlistName: 'Xtream',
+                xtreamId: 7,
+            } satisfies UnifiedCollectionItem,
+        ]);
+
+        expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledTimes(1);
+        expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledWith(
+            expect.arrayContaining(['xtream:xtream-1:7', 'Mapped Channel'])
+        );
+        // The mapping resolved via XMLTV, so no provider EPG call is needed.
+        expect(xtreamApi.getShortEpg).not.toHaveBeenCalled();
+        expect(epgMap.get('Mapped Channel')).toMatchObject({
+            title: 'Mapped Program',
+        });
+    });
+
+    it('resolves manual EPG mappings for Stalker previews without hitting the portal', async () => {
+        playlistsService.getPlaylistById.mockReturnValue(
+            of({
+                _id: 'stalker-1',
+                portalUrl: 'https://stalker.example.com',
+                macAddress: '00:11:22:33:44:55',
+                isFullStalkerPortal: false,
+            } satisfies Partial<Playlist>)
+        );
+
+        const nowMs = Date.now();
+        epgBridge.getEpgMappingsBatch = jest.fn().mockResolvedValue({
+            'stalker:stalker-1:77': 'mapped.channel.id',
+        });
+        epgBridge.getChannelPrograms = jest.fn().mockResolvedValue([
+            {
+                channel: 'mapped.channel.id',
+                title: 'Mapped Stalker Program',
+                desc: 'From uploaded XMLTV',
+                start: new Date(nowMs - 60_000).toISOString(),
+                stop: new Date(nowMs + 60_000).toISOString(),
+            },
+        ]);
+
+        const epgMap = await service.loadEpgForItems([
+            {
+                uid: 'stalker::stalker-1::77',
+                name: 'Stalker Channel',
+                contentType: 'live',
+                sourceType: 'stalker',
+                playlistId: 'stalker-1',
+                playlistName: 'Stalker',
+                stalkerId: '77',
+                tvgId: '77',
+                stalkerCmd: 'ffmpeg http://stalker/77',
+            } satisfies UnifiedCollectionItem,
+        ]);
+
+        expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledTimes(1);
+        expect(epgMap.get('77')).toMatchObject({
+            title: 'Mapped Stalker Program',
+        });
+        // The mapped channel resolves from uploaded XMLTV — the portal
+        // short-EPG request must be skipped entirely.
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
     it('loads current Stalker EPG previews for live collection rows', async () => {
         playlistsService.getPlaylistById.mockReturnValue(
             of({
diff --git a/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.ts b/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.ts
index 9c1de9540..57cf4d129 100644
--- a/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/stream-resolver.service.ts
@@ -3,6 +3,8 @@ import { firstValueFrom } from 'rxjs';
 import { DataService, PlaylistsService } from '@iptvnator/services';
 import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import {
+    buildStalkerEpgMappingKey,
+    buildXtreamEpgMappingKey,
     Channel,
     EpgItem,
     EpgProgram,
@@ -63,11 +65,11 @@ export class StreamResolverService {
     private readonly epgBridge = inject(EpgRuntimeBridgeService);
     private readonly stalkerSession = inject(StalkerSessionService);
     private readonly m3uEpgTimeoutMs = 3000;
-    private readonly portalEpgTimeoutMs = 3000;
+    private readonly portalEpgTimeoutMs = 10000;
     private readonly xtreamEpgCache = new Map<string, XtreamEpgCacheEntry>();
     private readonly xtreamEpgFailureTimestamps = new Map<string, number>();
     private readonly xtreamEpgCacheTtlMs = 60 * 1000;
-    private readonly xtreamEpgFailureCooldownMs = 60 * 1000;
+    private readonly xtreamEpgFailureCooldownMs = 30 * 1000;
 
     private get supportsProgramLookup(): boolean {
         return this.epgBridge.supportsProgramLookup;
@@ -410,11 +412,59 @@ export class StreamResolverService {
                 return [];
             }
 
+            // 1) Check uploaded XMLTV EPG via the provider's epg_channel_id.
+            // The field is populated at runtime from the content table's
+            // epg_channel_id column but is not declared on the TS interface.
+            const epgKey = (item as unknown as Record<string, string | undefined | null>).epgChannelId?.trim();
+            if (this.supportsProgramLookup && epgKey) {
+                const uploaded = await this.epgBridge
+                    .getChannelPrograms(epgKey)
+                    .catch(() => null);
+                if (uploaded && uploaded.length > 0) {
+                    return this.mapProgramsToEpgItems(uploaded);
+                }
+            }
+
+            // 2) Fall back to the manual mapping table (playlist-scoped
+            // Xtream key → epgChannelId).
+            if (this.supportsProgramLookup && item.xtreamId) {
+                const mapping = await this.epgBridge
+                    .getEpgMapping(
+                        buildXtreamEpgMappingKey(item.playlistId, item.xtreamId)
+                    )
+                    .catch(() => null);
+                if (mapping?.epgChannelId) {
+                    const mapped = await this.epgBridge
+                        .getChannelPrograms(mapping.epgChannelId)
+                        .catch(() => null);
+                    if (mapped && mapped.length > 0) {
+                        return this.mapProgramsToEpgItems(mapped);
+                    }
+                }
+            }
+
+            // 3) Try the full EPG endpoint (same as the main live-view
+            // loadEpg() in with-epg.feature.ts) — many providers only
+            // support get_simple_data_table, not get_short_epg.
+            try {
+                const fullEpg = await this.xtreamApi.getFullEpg(
+                    creds,
+                    item.xtreamId,
+                    { suppressErrorLog: true }
+                );
+                if (fullEpg.length > 0) {
+                    return fullEpg;
+                }
+            } catch {
+                // getFullEpg failed — continue to short-EPG fallback below.
+            }
+
+            // Fall back to the short-EPG endpoint with a generous limit.
             return await this.fetchXtreamEpgItems(
                 item.playlistId,
                 creds,
                 item.xtreamId,
-                10
+                50
             );
         } catch {
             return [];
@@ -440,10 +490,35 @@ export class StreamResolverService {
             return [];
         }
 
+        // Manual mapping first — Stalker items carry no provider XMLTV id,
+        // so the mapping table is the only uploaded-EPG entry point.
+        if (this.supportsProgramLookup) {
+            const mapping = await this.epgBridge
+                .getEpgMapping(
+                    buildStalkerEpgMappingKey(item.playlistId, channelId)
+                )
+                .catch(() => null);
+            if (mapping?.epgChannelId) {
+                const mapped = await this.epgBridge
+                    .getChannelPrograms(mapping.epgChannelId)
+                    .catch(() => null);
+                if (mapped && mapped.length > 0) {
+                    return this.mapProgramsToEpgItems(mapped);
+                }
+            }
+        }
+
         return this.fetchStalkerShortEpg(playlist, channelId, size);
     }
 
-    private async getXtreamCredentials(playlistId: string) {
+    private async getXtreamCredentials(
+        playlistId: string
+    ): Promise<{
+        serverUrl: string;
+        username: string;
+        password: string;
+        serverTimezone?: string;
+    } | null> {
         const playlist =
             (await this.getElectronPlaylist(playlistId)) ??
             ((await firstValueFrom(
@@ -458,9 +533,37 @@ export class StreamResolverService {
             serverUrl: playlist.serverUrl,
             username: playlist.username,
             password: playlist.password,
+            serverTimezone: playlist.serverTimezone,
         };
     }
 
+    /**
+     * Resolve an Xtream archive/catch-up URL for a given programme.
+     * Returns the timeshift playback URL, or null when credentials are
+     * missing or the provider doesn't support it.
+     */
+    async resolveXtreamCatchupUrl(
+        item: UnifiedCollectionItem,
+        startTimestamp: number,
+        stopTimestamp: number
+    ): Promise<string | null> {
+        const creds = await this.getXtreamCredentials(item.playlistId);
+        if (!creds || !item.xtreamId) return null;
+
+        try {
+            return await this.xtreamUrl.resolveCatchupUrl(
+                item.playlistId,
+                creds,
+                item.xtreamId,
+                startTimestamp,
+                stopTimestamp,
+                creds.serverTimezone
+            );
+        } catch {
+            return null;
+        }
+    }
+
     private async loadM3uEpg(
         item: UnifiedCollectionItem,
         epgMap: Map<string, EpgProgram | null>,
@@ -560,31 +663,78 @@ export class StreamResolverService {
             return;
         }
 
-        await Promise.all(
-            channels.map(async (channel) => {
-                if (!channel.xtreamId) {
-                    return;
-                }
+        // Prefetch manual EPG mappings for the whole batch in one IPC
+        // round-trip — a per-channel lookup would issue O(N × candidates)
+        // IPC calls on every list load.
+        const mappingByKey = await this.prefetchEpgMappings(
+            playlistId,
+            channels
+        );
+
+        // Limit concurrency to avoid overwhelming the provider with
+        // simultaneous EPG requests when loading a large channel list.
+        const concurrency = 3;
+        const pending: Promise<void>[] = [];
+        const iterator = channels.entries();
+
+        const enqueueNext = async (): Promise<void> => {
+            for (;;) {
+                const entry = iterator.next();
+                if (entry.done) return;
+                const [, channel] = entry.value;
+                if (!channel.xtreamId) continue;
 
                 try {
-                    const items = await this.fetchXtreamEpgItems(
-                        playlistId,
-                        creds,
-                        channel.xtreamId,
-                        2
-                    );
                     const nowSeconds = Math.floor(now / 1000);
-                    const currentItem =
-                        items.find(
-                            (item) =>
-                                Number(item.start_timestamp) <= nowSeconds &&
-                                nowSeconds < Number(item.stop_timestamp)
-                        ) ?? null;
+                    let currentItem: EpgItem | null = null;
+
+                    // 1) Try uploaded XMLTV EPG via the provider's epg_channel_id.
+                    const epgChannelKey = (channel as unknown as Record<string, string | undefined | null>).epgChannelId?.trim();
+                    if (this.supportsProgramLookup && epgChannelKey) {
+                        currentItem = await this.findCurrentInXmltv(
+                            epgChannelKey, nowSeconds
+                        );
+                    }
+
+                    // 2) Fall back to manual mapping (epg_channel_mappings
+                    // table), using the batch-prefetched map. Candidate key
+                    // order matches how mappings can be saved: the
+                    // playlist-scoped Xtream key (portal/favorites dialogs),
+                    // then tvgId and name (M3U dialogs).
+                    if (!currentItem && this.supportsProgramLookup) {
+                        for (const key of this.mappingCandidateKeys(
+                            playlistId,
+                            channel
+                        )) {
+                            const mappedId = mappingByKey.get(key);
+                            if (!mappedId) continue;
+                            currentItem = await this.findCurrentInXmltv(
+                                mappedId,
+                                nowSeconds
+                            );
+                            if (currentItem) break;
+                        }
+                    }
+
+                    if (!currentItem) {
+                        const items = await this.fetchXtreamEpgItems(
+                            playlistId,
+                            creds,
+                            channel.xtreamId,
+                            5
+                        );
+                        currentItem =
+                            items.find(
+                                (item) =>
+                                    Number(item.start_timestamp) <= nowSeconds &&
+                                    nowSeconds < Number(item.stop_timestamp)
+                            ) ?? null;
+                    }
                     const epgKey =
                         channel.tvgId?.trim() || channel.name?.trim();
 
                     if (!epgKey) {
-                        return;
+                        continue;
                     }
 
                     epgMap.set(
@@ -611,8 +761,14 @@ export class StreamResolverService {
                         epgMap.set(epgKey, null);
                     }
                 }
-            })
-        );
+            }
+        };
+
+        // Start limited concurrent workers.
+        for (let i = 0; i < concurrency; i++) {
+            pending.push(enqueueNext());
+        }
+        await Promise.all(pending);
     }
 
     private getXtreamEpgCacheKey(
@@ -711,6 +867,14 @@ export class StreamResolverService {
             return;
         }
 
+        // One batched IPC round-trip for the manual mappings of the whole
+        // playlist batch — mirrors loadXtreamEpgBatch.
+        const mappingByKey = await this.prefetchEpgMappings(
+            playlistId,
+            channels
+        );
+        const nowSeconds = Math.floor(now / 1000);
+
         await Promise.all(
             channels.map(async (channel) => {
                 const channelId = String(channel.stalkerId ?? '').trim();
@@ -722,6 +886,25 @@ export class StreamResolverService {
                 }
 
                 try {
+                    for (const key of this.mappingCandidateKeys(
+                        playlistId,
+                        channel
+                    )) {
+                        const mappedId = mappingByKey.get(key);
+                        if (!mappedId) continue;
+                        const mappedItem = await this.findCurrentInXmltv(
+                            mappedId,
+                            nowSeconds
+                        );
+                        if (mappedItem) {
+                            epgMap.set(
+                                epgKey,
+                                this.toPreviewProgram(mappedItem, channelId, now)
+                            );
+                            return;
+                        }
+                    }
+
                     const items = await this.fetchStalkerShortEpg(
                         playlist,
                         channelId,
@@ -923,4 +1106,91 @@ export class StreamResolverService {
     private isHttpUrl(value: string): boolean {
         return value.startsWith('http://') || value.startsWith('https://');
     }
+
+    /**
+     * All keys a manual mapping for this channel may have been saved under:
+     * the playlist-scoped Xtream key first, then the M3U lookup keys.
+     */
+    private mappingCandidateKeys(
+        playlistId: string,
+        channel: UnifiedCollectionItem
+    ): string[] {
+        // Stalker mappings are only ever saved under the playlist-scoped
+        // key, and a stalker item's tvgId mirrors its raw provider id —
+        // bare tvgId/name candidates could only produce false matches
+        // against unrelated M3U mappings.
+        if (channel.sourceType === 'stalker') {
+            return channel.stalkerId != null
+                ? [buildStalkerEpgMappingKey(playlistId, channel.stalkerId)]
+                : [];
+        }
+
+        return [
+            channel.xtreamId != null
+                ? buildXtreamEpgMappingKey(playlistId, channel.xtreamId)
+                : null,
+            channel.tvgId?.trim() || null,
+            channel.name?.trim() || null,
+        ].filter((key): key is string => Boolean(key));
+    }
+
+    /**
+     * Resolve the manual EPG mappings for every candidate key in the batch
+     * with a single IPC call. Returns an empty map when program lookup or
+     * the mapping bridge is unavailable (PWA).
+     */
+    private async prefetchEpgMappings(
+        playlistId: string,
+        channels: UnifiedCollectionItem[]
+    ): Promise<Map<string, string>> {
+        const result = new Map<string, string>();
+        if (!this.supportsProgramLookup) {
+            return result;
+        }
+
+        const keys = new Set<string>();
+        for (const channel of channels) {
+            if (channel.xtreamId == null && channel.stalkerId == null) {
+                continue;
+            }
+            for (const key of this.mappingCandidateKeys(playlistId, channel)) {
+                keys.add(key);
+            }
+        }
+        if (keys.size === 0) {
+            return result;
+        }
+
+        const mappings = await this.epgBridge
+            .getEpgMappingsBatch([...keys])
+            .catch(() => null);
+        if (!mappings) {
+            return result;
+        }
+        for (const [key, mappedId] of Object.entries(mappings)) {
+            const trimmed = mappedId?.trim();
+            if (trimmed) {
+                result.set(key, trimmed);
+            }
+        }
+        return result;
+    }
+
+    /** Look up the current program for an EPG channel ID from uploaded XMLTV. */
+    private async findCurrentInXmltv(
+        epgChannelId: string,
+        nowSeconds: number
+    ): Promise<EpgItem | null> {
+        if (!this.supportsProgramLookup || !epgChannelId) return null;
+        const programs = await this.epgBridge
+            .getChannelPrograms(epgChannelId)
+            .catch(() => null);
+        if (!programs || programs.length === 0) return null;
+        const items = this.mapProgramsToEpgItems(programs);
+        return items.find(
+            (item) =>
+                Number(item.start_timestamp) <= nowSeconds &&
+                nowSeconds < Number(item.stop_timestamp)
+        ) ?? null;
+    }
 }
diff --git a/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.spec.ts b/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.spec.ts
index 744f9c8e9..ede3bcbd5 100644
--- a/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.spec.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { of } from 'rxjs';
+import { firstValueFrom, from, of } from 'rxjs';
 import { DatabaseService, PlaylistsService } from '@iptvnator/services';
 import {
     Channel,
@@ -49,8 +49,7 @@ describe('UnifiedFavoritesDataService', () => {
     let playlistsService: {
         addPortalFavorite: jest.Mock;
         getPlaylistById: jest.Mock;
-        setFavorites: jest.Mock;
-        setPortalFavorites: jest.Mock;
+        transformPlaylistFavorites: jest.Mock;
     };
 
     const m3uChannels: Channel[] = [
@@ -134,8 +133,31 @@ describe('UnifiedFavoritesDataService', () => {
         playlistsService = {
             addPortalFavorite: jest.fn().mockReturnValue(of({})),
             getPlaylistById: jest.fn(),
-            setFavorites: jest.fn().mockReturnValue(of({})),
-            setPortalFavorites: jest.fn().mockReturnValue(of({})),
+            // Faithful default: read the playlist through the configured
+            // getPlaylistById mock and apply the transform to its favorites,
+            // like the real queued PlaylistsService implementation.
+            transformPlaylistFavorites: jest.fn(
+                (
+                    playlistId: string,
+                    transform: (current: unknown[]) => unknown[]
+                ) =>
+                    from(
+                        (async () => {
+                            const playlist = (await firstValueFrom(
+                                playlistsService.getPlaylistById(playlistId) ??
+                                    of(undefined)
+                            )) as Partial<Playlist> | undefined;
+                            const current = Array.isArray(playlist?.favorites)
+                                ? playlist.favorites
+                                : [];
+                            return {
+                                ...playlist,
+                                _id: playlistId,
+                                favorites: transform(current),
+                            };
+                        })()
+                    )
+            ),
         };
         databaseService = {
             getAllGlobalFavorites: jest.fn().mockResolvedValue([]),
@@ -209,6 +231,8 @@ describe('UnifiedFavoritesDataService', () => {
                 title: 'Live One',
                 type: 'live',
                 poster_url: 'live.png',
+                tv_archive: 1,
+                tv_archive_duration: 7,
                 added_at: '2026-03-26T09:00:00.000Z',
                 position: 0,
             },
@@ -247,6 +271,10 @@ describe('UnifiedFavoritesDataService', () => {
                     contentType: 'live',
                     logo: 'live.png',
                     posterUrl: null,
+                    // Regression for issue #1138: archive metadata must
+                    // survive the global favorites mapping for catch-up.
+                    tvArchive: 1,
+                    tvArchiveDuration: 7,
                 }),
                 expect.objectContaining({
                     name: 'Movie One',
@@ -402,7 +430,7 @@ describe('UnifiedFavoritesDataService', () => {
         ]);
     });
 
-    it('persists M3U playlist reorders through setFavorites', async () => {
+    it('persists M3U playlist reorders through an atomic favorites transform', async () => {
         const reorderedItems = [
             {
                 uid: 'm3u::m3u-1::https://example.com/2.m3u8',
@@ -432,13 +460,27 @@ describe('UnifiedFavoritesDataService', () => {
             portalType: 'm3u',
         });
 
-        expect(playlistsService.setFavorites).toHaveBeenCalledWith('m3u-1', [
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledWith('m3u-1', expect.any(Function));
+        const [, transform] =
+            playlistsService.transformPlaylistFavorites.mock.calls[0];
+        // The reordered ids come first; favorites added concurrently (not part
+        // of the drag list) are preserved at the end instead of being dropped.
+        expect(
+            transform([
+                'https://example.com/1.m3u8',
+                'https://example.com/2.m3u8',
+                'https://example.com/concurrent.m3u8',
+            ])
+        ).toEqual([
             'https://example.com/2.m3u8',
             'https://example.com/1.m3u8',
+            'https://example.com/concurrent.m3u8',
         ]);
     });
 
-    it('adds M3U favorites through setFavorites without duplicating existing entries', async () => {
+    it('adds M3U favorites through an atomic transform without duplicating existing entries', async () => {
         playlistsService.getPlaylistById.mockReturnValue(
             of({
                 _id: 'm3u-1',
@@ -457,10 +499,9 @@ describe('UnifiedFavoritesDataService', () => {
             channelId: 'new-channel',
         } satisfies UnifiedCollectionItem);
 
-        expect(playlistsService.setFavorites).toHaveBeenCalledWith('m3u-1', [
-            'https://example.com/existing.m3u8',
-            'https://example.com/new.m3u8',
-        ]);
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledWith('m3u-1', expect.any(Function));
         expect(store.dispatch).toHaveBeenCalledWith(
             expect.objectContaining({
                 type: '[Playlists] Update Playlist Meta',
@@ -484,7 +525,69 @@ describe('UnifiedFavoritesDataService', () => {
             streamUrl: 'https://example.com/existing.m3u8',
         } satisfies UnifiedCollectionItem);
 
-        expect(playlistsService.setFavorites).toHaveBeenCalledTimes(1);
+        // The duplicate add still runs atomically, but its transform leaves
+        // the favorites unchanged.
+        const [, duplicateTransform] =
+            playlistsService.transformPlaylistFavorites.mock.calls[1];
+        expect(
+            duplicateTransform(['https://example.com/existing.m3u8'])
+        ).toEqual(['https://example.com/existing.m3u8']);
+    });
+
+    it('does not lose a rapid favorite toggle through the public M3U add flow', async () => {
+        const backingStore = {
+            favorites: ['https://example.com/existing.m3u8'],
+        };
+        let queue: Promise<unknown> = Promise.resolve();
+        playlistsService.transformPlaylistFavorites.mockImplementation(
+            (
+                playlistId: string,
+                transform: (current: string[]) => string[]
+            ) => {
+                // Emulate the real queued read-transform-write semantics.
+                const run = queue.then(async () => {
+                    await Promise.resolve();
+                    backingStore.favorites = transform(backingStore.favorites);
+                    return {
+                        _id: playlistId,
+                        favorites: backingStore.favorites,
+                    };
+                });
+                queue = run.then(
+                    () => undefined,
+                    () => undefined
+                );
+                return from(run);
+            }
+        );
+
+        const baseItem = {
+            contentType: 'live',
+            sourceType: 'm3u',
+            playlistId: 'm3u-1',
+            playlistName: 'M3U List',
+        } as const;
+
+        await Promise.all([
+            service.addFavorite({
+                ...baseItem,
+                uid: 'm3u::m3u-1::https://example.com/a.m3u8',
+                name: 'Channel A',
+                streamUrl: 'https://example.com/a.m3u8',
+            } satisfies UnifiedCollectionItem),
+            service.addFavorite({
+                ...baseItem,
+                uid: 'm3u::m3u-1::https://example.com/b.m3u8',
+                name: 'Channel B',
+                streamUrl: 'https://example.com/b.m3u8',
+            } satisfies UnifiedCollectionItem),
+        ]);
+
+        expect(backingStore.favorites).toEqual([
+            'https://example.com/existing.m3u8',
+            'https://example.com/a.m3u8',
+            'https://example.com/b.m3u8',
+        ]);
     });
 
     it('adds Xtream favorites after resolving the content id', async () => {
@@ -599,7 +702,7 @@ describe('UnifiedFavoritesDataService', () => {
         );
     });
 
-    it('persists Stalker playlist reorders through setPortalFavorites', async () => {
+    it('persists Stalker playlist reorders through an atomic favorites transform', async () => {
         playlistsService.getPlaylistById.mockReturnValue(
             of({
                 _id: 'stalker-1',
@@ -636,10 +739,15 @@ describe('UnifiedFavoritesDataService', () => {
             }
         );
 
-        expect(playlistsService.setPortalFavorites).toHaveBeenCalledWith(
-            'stalker-1',
-            [stalkerFavorites[1], stalkerFavorites[0]]
-        );
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledWith('stalker-1', expect.any(Function));
+        const [, transform] =
+            playlistsService.transformPlaylistFavorites.mock.calls[0];
+        expect(transform(stalkerFavorites)).toEqual([
+            stalkerFavorites[1],
+            stalkerFavorites[0],
+        ]);
     });
 
     it('clears M3U favorites once per playlist with the remaining favorites preserved', async () => {
@@ -677,10 +785,21 @@ describe('UnifiedFavoritesDataService', () => {
             },
         ] satisfies UnifiedCollectionItem[]);
 
-        expect(playlistsService.setFavorites).toHaveBeenCalledTimes(1);
-        expect(playlistsService.setFavorites).toHaveBeenCalledWith('m3u-1', [
-            'https://example.com/3.m3u8',
-        ]);
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledTimes(1);
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledWith('m3u-1', expect.any(Function));
+        expect(store.dispatch).toHaveBeenCalledWith(
+            expect.objectContaining({
+                type: '[Playlists] Update Playlist Meta',
+                playlist: expect.objectContaining({
+                    _id: 'm3u-1',
+                    favorites: ['https://example.com/3.m3u8'],
+                }),
+            })
+        );
     });
 
     it('clears Stalker favorites once per playlist with the remaining favorites preserved', async () => {
@@ -721,11 +840,15 @@ describe('UnifiedFavoritesDataService', () => {
             },
         ] satisfies UnifiedCollectionItem[]);
 
-        expect(playlistsService.setPortalFavorites).toHaveBeenCalledTimes(1);
-        expect(playlistsService.setPortalFavorites).toHaveBeenCalledWith(
-            'stalker-1',
-            [remainingFavorite]
-        );
+        expect(
+            playlistsService.transformPlaylistFavorites
+        ).toHaveBeenCalledTimes(1);
+        const [transformedPlaylistId, transform] =
+            playlistsService.transformPlaylistFavorites.mock.calls[0];
+        expect(transformedPlaylistId).toBe('stalker-1');
+        expect(transform([...stalkerFavorites, remainingFavorite])).toEqual([
+            remainingFavorite,
+        ]);
     });
 
     it('clears Xtream favorites through the bulk removal path', async () => {
diff --git a/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.ts b/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.ts
index 096fdc6a8..3a8c7bdf8 100644
--- a/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/unified-favorites-data.service.ts
@@ -82,17 +82,13 @@ export class UnifiedFavoritesDataService {
     async removeFavorite(item: UnifiedCollectionItem): Promise<void> {
         switch (item.sourceType) {
             case 'm3u': {
-                const playlist = await firstValueFrom(
-                    this.playlistsService.getPlaylistById(item.playlistId)
+                await this.transformM3uFavorites(item.playlistId, (current) =>
+                    current.filter(
+                        (favoriteId) =>
+                            favoriteId !== item.streamUrl &&
+                            favoriteId !== item.channelId
+                    )
                 );
-                const filtered = (
-                    (playlist.favorites as string[]) ?? []
-                ).filter(
-                    (favoriteId) =>
-                        favoriteId !== item.streamUrl &&
-                        favoriteId !== item.channelId
-                );
-                await this.setM3uFavorites(item.playlistId, filtered);
                 break;
             }
             case 'xtream': {
@@ -132,23 +128,9 @@ export class UnifiedFavoritesDataService {
             return;
         }
 
-        const playlist = (await firstValueFrom(
-            this.playlistsService.getPlaylistById(item.playlistId)
-        )) as Playlist | undefined;
-        const currentFavorites = Array.isArray(playlist?.favorites)
-            ? playlist.favorites.filter(
-                  (favorite): favorite is string => typeof favorite === 'string'
-              )
-            : [];
-
-        if (currentFavorites.includes(favoriteId)) {
-            return;
-        }
-
-        await this.setM3uFavorites(item.playlistId, [
-            ...currentFavorites,
-            favoriteId,
-        ]);
+        await this.transformM3uFavorites(item.playlistId, (current) =>
+            current.includes(favoriteId) ? current : [...current, favoriteId]
+        );
     }
 
     private async addXtreamFavorite(
@@ -249,12 +231,14 @@ export class UnifiedFavoritesDataService {
             options.playlistId &&
             options.portalType === 'm3u'
         ) {
-            await this.setM3uFavorites(
-                options.playlistId,
-                items
-                    .map((item) => item.streamUrl ?? item.channelId ?? '')
-                    .filter((value) => value.length > 0)
-            );
+            const orderedIds = items
+                .map((item) => item.streamUrl ?? item.channelId ?? '')
+                .filter((value) => value.length > 0);
+            const orderedIdSet = new Set(orderedIds);
+            await this.transformM3uFavorites(options.playlistId, (current) => [
+                ...orderedIds,
+                ...current.filter((favorite) => !orderedIdSet.has(favorite)),
+            ]);
             return;
         }
 
@@ -263,32 +247,43 @@ export class UnifiedFavoritesDataService {
             options.playlistId &&
             options.portalType === 'stalker'
         ) {
-            const playlist = (await firstValueFrom(
-                this.playlistsService.getPlaylistById(options.playlistId)
-            )) as Playlist | undefined;
-            const currentFavorites = Array.isArray(playlist?.favorites)
-                ? playlist.favorites.filter(isStalkerItem)
-                : [];
-            const favoritesById = new Map(
-                currentFavorites.map((favorite) => [
-                    this.getStalkerFavoriteId(favorite),
-                    favorite,
-                ])
-            );
-            const reorderedFavorites = items
-                .map(
-                    (item) =>
-                        favoritesById.get(this.getStalkerFavoriteId(item)) ??
-                        null
-                )
-                .filter(
-                    (favorite): favorite is StalkerPortalItem =>
-                        favorite !== null
-                );
             await firstValueFrom(
-                this.playlistsService.setPortalFavorites(
+                this.playlistsService.transformPlaylistFavorites(
                     options.playlistId,
-                    reorderedFavorites
+                    (current) => {
+                        const currentFavorites = current.filter(isStalkerItem);
+                        const favoritesById = new Map(
+                            currentFavorites.map((favorite) => [
+                                this.getStalkerFavoriteId(favorite),
+                                favorite,
+                            ])
+                        );
+                        const reorderedFavorites = items
+                            .map(
+                                (item) =>
+                                    favoritesById.get(
+                                        this.getStalkerFavoriteId(item)
+                                    ) ?? null
+                            )
+                            .filter(
+                                (favorite): favorite is StalkerPortalItem =>
+                                    favorite !== null
+                            );
+                        const reorderedIds = new Set(
+                            reorderedFavorites.map((favorite) =>
+                                this.getStalkerFavoriteId(favorite)
+                            )
+                        );
+                        return [
+                            ...reorderedFavorites,
+                            ...currentFavorites.filter(
+                                (favorite) =>
+                                    !reorderedIds.has(
+                                        this.getStalkerFavoriteId(favorite)
+                                    )
+                            ),
+                        ];
+                    }
                 )
             );
             return;
@@ -334,9 +329,6 @@ export class UnifiedFavoritesDataService {
         await Promise.all(
             Array.from(groupedItems.entries()).map(
                 async ([playlistId, playlistItems]) => {
-                    const playlist = (await firstValueFrom(
-                        this.playlistsService.getPlaylistById(playlistId)
-                    )) as Playlist | undefined;
                     const targetIds = new Set<string>();
                     playlistItems.forEach((item) => {
                         [item.streamUrl, item.channelId].forEach((value) => {
@@ -346,17 +338,12 @@ export class UnifiedFavoritesDataService {
                             }
                         });
                     });
-                    const currentFavorites = Array.isArray(playlist?.favorites)
-                        ? playlist.favorites.filter(
-                              (favorite): favorite is string =>
-                                  typeof favorite === 'string'
-                          )
-                        : [];
-                    const nextFavorites = currentFavorites.filter(
-                        (favorite) => !targetIds.has(favorite.trim())
-                    );
 
-                    await this.setM3uFavorites(playlistId, nextFavorites);
+                    await this.transformM3uFavorites(playlistId, (current) =>
+                        current.filter(
+                            (favorite) => !targetIds.has(favorite.trim())
+                        )
+                    );
                 }
             )
         );
@@ -409,26 +396,26 @@ export class UnifiedFavoritesDataService {
         await Promise.all(
             Array.from(groupedItems.entries()).map(
                 async ([playlistId, playlistItems]) => {
-                    const playlist = (await firstValueFrom(
-                        this.playlistsService.getPlaylistById(playlistId)
-                    )) as Playlist | undefined;
                     const targetIds = new Set(
                         playlistItems.map((item) =>
                             this.getStalkerFavoriteId(item)
                         )
                     );
-                    const currentFavorites = Array.isArray(playlist?.favorites)
-                        ? playlist.favorites.filter(isStalkerItem)
-                        : [];
-                    const nextFavorites = currentFavorites.filter(
-                        (favorite) =>
-                            !targetIds.has(this.getStalkerFavoriteId(favorite))
-                    );
 
                     await firstValueFrom(
-                        this.playlistsService.setPortalFavorites(
+                        this.playlistsService.transformPlaylistFavorites(
                             playlistId,
-                            nextFavorites
+                            (current) =>
+                                current
+                                    .filter(isStalkerItem)
+                                    .filter(
+                                        (favorite) =>
+                                            !targetIds.has(
+                                                this.getStalkerFavoriteId(
+                                                    favorite
+                                                )
+                                            )
+                                    )
                         )
                     );
                 }
@@ -609,6 +596,8 @@ export class UnifiedFavoritesDataService {
             categoryId: row.category_id,
             tvgId: ct === 'live' ? String(row.xtream_id) : undefined,
             rating: row.rating ?? undefined,
+            tvArchive: row.tv_archive ?? null,
+            tvArchiveDuration: row.tv_archive_duration ?? null,
             addedAt:
                 normalizeStalkerDate(row.added_at) || new Date(0).toISOString(),
             position: row.position ?? 0,
@@ -635,6 +624,8 @@ export class UnifiedFavoritesDataService {
             categoryId: item.category_id,
             tvgId: ct === 'live' ? String(item.xtream_id) : undefined,
             rating: item.rating ?? undefined,
+            tvArchive: item.tv_archive ?? null,
+            tvArchiveDuration: item.tv_archive_duration ?? null,
             addedAt:
                 normalizeStalkerDate(item.added_at ?? item.added) ||
                 new Date(0).toISOString(),
@@ -754,18 +745,27 @@ export class UnifiedFavoritesDataService {
         }
     }
 
-    private async setM3uFavorites(
+    private async transformM3uFavorites(
         playlistId: string,
-        favorites: string[]
+        transform: (currentFavorites: string[]) => string[]
     ): Promise<void> {
-        await firstValueFrom(
-            this.playlistsService.setFavorites(playlistId, favorites)
+        const updatedPlaylist = await firstValueFrom(
+            this.playlistsService.transformPlaylistFavorites(
+                playlistId,
+                (current) =>
+                    transform(
+                        current.filter(
+                            (favorite): favorite is string =>
+                                typeof favorite === 'string'
+                        )
+                    )
+            )
         );
         this.store.dispatch(
             PlaylistActions.updatePlaylistMeta({
                 playlist: {
                     _id: playlistId,
-                    favorites,
+                    favorites: updatedPlaylist.favorites,
                 } as PlaylistMeta,
             })
         );
@@ -807,12 +807,17 @@ export class UnifiedFavoritesDataService {
     }
 
     private buildXtreamPositionUpdates(items: UnifiedCollectionItem[]) {
-        const updates: { content_id: number; position: number }[] = [];
+        const updates: {
+            content_id: number;
+            playlist_id: string;
+            position: number;
+        }[] = [];
 
         for (const item of items) {
             if (item.sourceType === 'xtream' && item.contentId != null) {
                 updates.push({
                     content_id: item.contentId,
+                    playlist_id: item.playlistId,
                     position: updates.length,
                 });
             }
diff --git a/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.spec.ts b/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.spec.ts
index 72037c787..6cf29a142 100644
--- a/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.spec.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.spec.ts
@@ -355,6 +355,8 @@ describe('UnifiedRecentDataService', () => {
                 poster_url: 'https://example.com/live.png',
                 xtream_id: 290,
                 type: 'live',
+                tv_archive: 1,
+                tv_archive_duration: 3,
                 viewed_at: '2026-04-21T20:42:27.000Z',
             },
             {
@@ -380,6 +382,10 @@ describe('UnifiedRecentDataService', () => {
                     uid: 'xtream::xtream-1::live:290',
                     contentType: 'live',
                     contentId: 3867578,
+                    // Regression for issue #1138: archive metadata must
+                    // survive the recent mapping for catch-up.
+                    tvArchive: 1,
+                    tvArchiveDuration: 3,
                 }),
                 expect.objectContaining({
                     uid: 'xtream::xtream-1::series:290',
@@ -697,10 +703,25 @@ describe('UnifiedRecentDataService', () => {
                 playlist_name: 'Xtream One',
                 viewed_at: '2026-04-21 22:49:02',
             },
+            {
+                id: 3867578,
+                category_id: 11,
+                title: 'Live With Archive',
+                poster_url: 'https://example.com/live.png',
+                xtream_id: 290,
+                type: 'live',
+                tv_archive: 1,
+                tv_archive_duration: 3,
+                playlist_id: 'xtream-1',
+                playlist_name: 'Xtream One',
+                viewed_at: '2026-04-21 20:42:27',
+            },
         ]);
 
         const items = await service.getRecentItems('all');
-        const xtreamItem = items.find((item) => item.sourceType === 'xtream');
+        const xtreamItem = items.find(
+            (item) => item.name === 'Unter Nachbarn - 2011'
+        );
 
         expect(xtreamItem).toEqual(
             expect.objectContaining({
@@ -708,5 +729,16 @@ describe('UnifiedRecentDataService', () => {
                 viewedAt: '2026-04-21T22:49:02.000Z',
             })
         );
+        // Regression for issue #1138: archive metadata must survive the
+        // global recent mapping for catch-up.
+        expect(items).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({
+                    name: 'Live With Archive',
+                    tvArchive: 1,
+                    tvArchiveDuration: 3,
+                }),
+            ])
+        );
     });
 });
diff --git a/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.ts b/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.ts
index 3da7dedd2..3f75a3094 100644
--- a/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.ts
+++ b/libs/portal/shared/data-access/src/lib/collection/unified-recent-data.service.ts
@@ -389,6 +389,8 @@ export class UnifiedRecentDataService {
                 xtreamId: row.xtream_id,
                 categoryId: row.category_id,
                 tvgId: row.type === 'live' ? String(row.xtream_id) : undefined,
+                tvArchive: row.tv_archive ?? null,
+                tvArchiveDuration: row.tv_archive_duration ?? null,
                 contentId: row.id,
                 viewedAt: normalizeStalkerDate(row.viewed_at),
             }));
@@ -428,6 +430,8 @@ export class UnifiedRecentDataService {
                 xtreamId: row.xtream_id,
                 categoryId: row.category_id,
                 tvgId: row.type === 'live' ? String(row.xtream_id) : undefined,
+                tvArchive: row.tv_archive ?? null,
+                tvArchiveDuration: row.tv_archive_duration ?? null,
                 contentId: row.id,
                 viewedAt: normalizeStalkerDate(row.viewed_at),
             }));
@@ -485,6 +489,8 @@ export class UnifiedRecentDataService {
             xtreamId: item.xtream_id,
             categoryId: item.category_id,
             tvgId: contentType === 'live' ? String(item.xtream_id) : undefined,
+            tvArchive: item.tv_archive ?? null,
+            tvArchiveDuration: item.tv_archive_duration ?? null,
             contentId: item.id,
             viewedAt: normalizeStalkerDate(item.viewed_at),
         };
diff --git a/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.html b/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.html
index ce4bbe8bf..b686dc97d 100644
--- a/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.html
+++ b/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.html
@@ -61,6 +61,12 @@
 ></div>
 
 <mat-menu #channelContextMenu="matMenu">
+    @if (supportsEpgMapping) {
+        <button mat-menu-item (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+        </button>
+    }
     @if (contextMenuChannel()?.m3uChannel) {
         <button mat-menu-item (click)="openChannelDetails()">
             <mat-icon>info</mat-icon>
diff --git a/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.ts b/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.ts
index 54b8b625d..e3e0c25d9 100644
--- a/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.ts
+++ b/libs/portal/shared/ui/src/lib/components/global-favorites-list/global-favorites-list.component.ts
@@ -21,7 +21,14 @@ import {
     ChannelListItemComponent,
 } from '@iptvnator/ui/components';
 import { SettingsStore } from '@iptvnator/services';
-import { EpgProgram } from '@iptvnator/shared/interfaces';
+import {
+    buildStalkerEpgMappingKey,
+    buildXtreamEpgMappingKey,
+    EpgProgram,
+} from '@iptvnator/shared/interfaces';
+import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
+import { EpgMappingDialogComponent } from '@iptvnator/ui/components';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import {
     DEFAULT_FAVORITES_CHANNEL_SORT_MODE,
     FavoritesChannelSortMode,
@@ -52,6 +59,8 @@ export type GlobalFavoritesListMode = 'favorites' | 'recent';
 })
 export class GlobalFavoritesListComponent {
     private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
     private readonly settingsStore = inject(SettingsStore);
 
     readonly contextMenuTrigger =
@@ -77,6 +86,8 @@ export class GlobalFavoritesListComponent {
     readonly channelsReordered = output<UnifiedFavoriteChannel[]>();
     readonly favoriteToggled = output<UnifiedFavoriteChannel>();
     readonly removeRequested = output<UnifiedFavoriteChannel>();
+    /** Emitted after the mapping dialog closes having changed a mapping. */
+    readonly epgMappingChanged = output<void>();
 
     readonly contextMenuChannel = signal<EnrichedUnifiedFavorite | null>(null);
     readonly contextMenuPosition = signal({
@@ -163,7 +174,75 @@ export class GlobalFavoritesListComponent {
     }
 
     hasChannelContextMenu(channel: UnifiedFavoriteChannel): boolean {
-        return Boolean(channel.m3uChannel) || this.mode() === 'recent';
+        return (
+            Boolean(channel.m3uChannel) ||
+            this.mode() === 'recent' ||
+            (this.supportsEpgMapping &&
+                (channel.xtreamId != null ||
+                    Boolean(this.stalkerItemId(channel))))
+        );
+    }
+
+    openEpgMapping(): void {
+        const item = this.contextMenuChannel();
+        if (!item) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const stalkerId = this.stalkerItemId(item);
+        const channelKey = item.m3uChannel
+            ? resolveChannelEpgLookupKey(item.m3uChannel)
+            : item.xtreamId != null
+              ? buildXtreamEpgMappingKey(item.playlistId, item.xtreamId)
+              : stalkerId
+                ? buildStalkerEpgMappingKey(item.playlistId, stalkerId)
+                : null;
+        if (!channelKey) {
+            return;
+        }
+
+        void this.openEpgMappingDialog(channelKey, item);
+    }
+
+    private async openEpgMappingDialog(
+        channelKey: string,
+        item: UnifiedFavoriteChannel
+    ): Promise<void> {
+        const before = await this.epgBridge
+            .getEpgMapping(channelKey)
+            .catch(() => null);
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: item.name,
+            playlistId: item.m3uChannel ? undefined : item.playlistId,
+        })
+            .afterClosed()
+            .subscribe(async () => {
+                const after = await this.epgBridge
+                    .getEpgMapping(channelKey)
+                    .catch(() => null);
+                if (
+                    (after?.epgChannelId ?? null) !==
+                    (before?.epgChannelId ?? null)
+                ) {
+                    this.epgMappingChanged.emit();
+                }
+            });
+    }
+
+    /**
+     * The stalker item id lives in the uid's third segment
+     * (`stalker::{playlistId}::{stalkerId}`) — same extraction the
+     * unified favorites data service uses.
+     */
+    private stalkerItemId(channel: UnifiedFavoriteChannel): string | null {
+        if (channel.sourceType !== 'stalker') {
+            return null;
+        }
+        const id = channel.uid.split('::')[2]?.trim();
+        return id || null;
     }
 
     openChannelDetails(): void {
diff --git a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss
index 4c5c04304..aead84cdc 100644
--- a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss
+++ b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.scss
@@ -106,35 +106,6 @@ mat-card:hover {
     }
 }
 
-// ─── Type badge ──────────────────────────────────────────────────────────────
-.type-badge {
-    position: absolute;
-    top: 6px;
-    left: 6px;
-    z-index: 1;
-    padding: 3px 6px;
-    border-radius: 5px;
-    font-size: 0.58rem;
-    font-weight: 700;
-    line-height: 1;
-    text-transform: uppercase;
-    letter-spacing: 0.04em;
-    background: rgba(0, 0, 0, 0.85);
-    color: #fff;
-
-    &.live {
-        color: #ef5350;
-    }
-
-    &.movie {
-        color: #42a5f5;
-    }
-
-    &.series {
-        color: #66bb6a;
-    }
-}
-
 // ─── Rating badge ─────────────────────────────────────────────────────────────
 .rating {
     position: absolute;
diff --git a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts
index 975cfb4bf..4bd36a133 100644
--- a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts
+++ b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.spec.ts
@@ -1,7 +1,9 @@
+import { signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MockPipe } from 'ng-mocks';
+import { SettingsStore } from '@iptvnator/services';
 import {
     formatGridRating,
     GridListComponent,
@@ -57,7 +59,7 @@ describe('GridListComponent', () => {
         fixture = TestBed.createComponent(GridListComponent);
     });
 
-    it('renders live logo cards with stream icons and a live badge', () => {
+    it('renders live logo cards with stream icons', () => {
         fixture.componentRef.setInput('items', [
             {
                 name: 'Live Channel',
@@ -71,16 +73,27 @@ describe('GridListComponent', () => {
 
         const card = fixture.debugElement.query(By.css('mat-card'));
         const image = fixture.debugElement.query(By.css('.stream-icon'));
-        const badge = fixture.debugElement.query(By.css('.type-badge'));
 
         expect(card.nativeElement.classList).toContain('grid-card--logo');
         expect(image.nativeElement.getAttribute('src')).toBe(
             'channel-logo.png'
         );
-        expect(badge.nativeElement.classList).toContain('live');
-        expect(badge.nativeElement.textContent.trim()).toBe('live');
     });
 
+    it.each(['live', 'vod', 'series'] as const)(
+        'does not render a redundant %s type badge in homogeneous grids',
+        (type) => {
+            fixture.componentRef.setInput('items', [
+                { name: 'Catalog item', stream_icon: 'catalog-item.png' },
+            ]);
+            fixture.componentRef.setInput('type', type);
+            fixture.detectChanges();
+            expect(
+                fixture.debugElement.query(By.css('.type-badge'))
+            ).toBeNull();
+        }
+    );
+
     it('renders the live placeholder for logo cards without artwork', () => {
         fixture.componentRef.setInput('items', [
             {
@@ -159,4 +172,78 @@ describe('GridListComponent', () => {
             'live_tv'
         );
     });
+
+    it('renders raw titles while prefix stripping is disabled', () => {
+        fixture.componentRef.setInput('items', [{ name: 'US | CNN' }]);
+        fixture.componentRef.setInput('type', 'live');
+
+        fixture.detectChanges();
+
+        const title = fixture.debugElement.query(By.css('.title'));
+        expect(title.nativeElement.textContent.trim()).toBe('US | CNN');
+    });
+
+    it('falls back to a placeholder title for items without a name', () => {
+        fixture.componentRef.setInput('items', [{}]);
+
+        fixture.detectChanges();
+
+        const title = fixture.debugElement.query(By.css('.title'));
+        expect(title.nativeElement.textContent.trim()).toBe('No name');
+    });
+});
+
+describe('GridListComponent with strip country prefix enabled', () => {
+    let fixture: ComponentFixture<GridListComponent>;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [GridListComponent],
+            providers: [
+                {
+                    provide: SettingsStore,
+                    useValue: { stripCountryPrefix: signal(true) },
+                },
+            ],
+        })
+            .overrideComponent(GridListComponent, {
+                remove: { imports: [TranslatePipe] },
+                add: {
+                    imports: [
+                        MockPipe(
+                            TranslatePipe,
+                            (value: string | null | undefined) => value ?? ''
+                        ),
+                    ],
+                },
+            })
+            .compileComponents();
+
+        fixture = TestBed.createComponent(GridListComponent);
+    });
+
+    const renderedTitle = () =>
+        fixture.debugElement
+            .query(By.css('.title'))
+            .nativeElement.textContent.trim();
+
+    it('strips prefixes from live grid titles', () => {
+        fixture.componentRef.setInput('items', [{ name: 'US | CNN' }]);
+        fixture.componentRef.setInput('type', 'live');
+
+        fixture.detectChanges();
+
+        expect(renderedTitle()).toBe('CNN');
+    });
+
+    it('keeps VOD titles untouched', () => {
+        fixture.componentRef.setInput('items', [
+            { title: 'US | Some Movie' },
+        ]);
+        fixture.componentRef.setInput('type', 'vod');
+
+        fixture.detectChanges();
+
+        expect(renderedTitle()).toBe('US | Some Movie');
+    });
 });
diff --git a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts
index bee1c3a1b..d4be4c1a7 100644
--- a/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts
+++ b/libs/portal/shared/ui/src/lib/components/grid-list/grid-list.component.ts
@@ -2,6 +2,7 @@ import {
     ChangeDetectionStrategy,
     Component,
     computed,
+    inject,
     input,
     output,
     signal,
@@ -11,6 +12,8 @@ import { MatIcon } from '@angular/material/icon';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { MatTooltip } from '@angular/material/tooltip';
 import { TranslatePipe } from '@ngx-translate/core';
+import { applyChannelNameStrip } from '@iptvnator/shared/m3u-utils';
+import { SettingsStore } from '@iptvnator/services';
 import {
     ProgressCapsuleComponent,
     WatchedBadgeComponent,
@@ -103,16 +106,6 @@ function normalizeArtworkUrl(value: string | undefined): string | undefined {
                     >
                         @let poster = resolvePoster(i);
                         <div class="card-thumbnail-container">
-                            @if (type()) {
-                                <div
-                                    class="type-badge"
-                                    [class.live]="type() === 'live'"
-                                    [class.movie]="type() === 'vod'"
-                                    [class.series]="type() === 'series'"
-                                >
-                                    {{ type() }}
-                                </div>
-                            }
                             @if (poster && !hasArtworkFailed(poster)) {
                                 <img
                                     class="stream-icon"
@@ -164,10 +157,9 @@ function normalizeArtworkUrl(value: string | undefined): string | undefined {
                                 <mat-icon>star</mat-icon>{{ rating }}
                             </div>
                         }
-                        @let title = i.title ?? i.o_name ?? i.name;
                         <mat-card-actions>
                             <div class="title">
-                                {{ title || 'No name' }}
+                                {{ channelTitle(i) }}
                             </div>
                         </mat-card-actions>
                     </mat-card>
@@ -229,6 +221,7 @@ function normalizeArtworkUrl(value: string | undefined): string | undefined {
 })
 export class GridListComponent {
     private readonly failedArtworkUrls = signal<ReadonlySet<string>>(new Set());
+    private readonly settingsStore = inject(SettingsStore);
 
     readonly items = input<GridListItem[]>([]);
     readonly isLoading = input<boolean>(false);
@@ -253,6 +246,18 @@ export class GridListComponent {
     protected readonly hasActiveSearch = computed(
         () => (this.searchTerm() ?? '').trim().length > 0
     );
+    /** Prefix stripping applies to channel grids only, never VOD/series. */
+    private readonly isLiveGrid = computed(() =>
+        ['live', 'itv', 'radio'].includes(this.type())
+    );
+    protected readonly channelTitle = (item: GridListItem): string => {
+        const raw = item.title ?? item.o_name ?? item.name ?? '';
+        const stripped = applyChannelNameStrip(
+            raw,
+            this.isLiveGrid() && this.settingsStore.stripCountryPrefix?.()
+        );
+        return stripped || 'No name';
+    };
 
     readonly skeletonRows = computed(() => {
         const preferredCount = this.limit() ?? 12;
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-detail.directive.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-detail.directive.ts
index bb9bc0527..268607eb5 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-detail.directive.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-detail.directive.ts
@@ -1,9 +1,13 @@
 import { Directive, inject, TemplateRef } from '@angular/core';
-import { UnifiedCollectionItem } from '@iptvnator/portal/shared/util';
+import {
+    SeriesResumeTarget,
+    UnifiedCollectionItem,
+} from '@iptvnator/portal/shared/util';
 
 export interface UnifiedCollectionDetailContext {
     $implicit: UnifiedCollectionItem;
     item: UnifiedCollectionItem;
+    seriesResume: SeriesResumeTarget | null;
     close: () => void;
 }
 
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.spec.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.spec.ts
index 9e2aa5e2b..13b303ec1 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.spec.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.spec.ts
@@ -76,8 +76,15 @@ class StubUnifiedGridTabComponent {
             [portalType]="portalType"
             [defaultScope]="defaultScope"
         >
-            <ng-template unifiedCollectionDetail let-item>
+            <ng-template
+                unifiedCollectionDetail
+                let-item
+                let-seriesResume="seriesResume"
+            >
                 <div class="detail-probe">{{ item.name }}</div>
+                <div class="resume-probe">
+                    {{ seriesResume?.contentXtreamId }}
+                </div>
             </ng-template>
         </app-unified-collection-page>
     `,
@@ -295,10 +302,10 @@ describe('UnifiedCollectionPageComponent', () => {
             })
             .compileComponents();
 
+        window.history.replaceState({}, document.title);
         fixture = TestBed.createComponent(UnifiedCollectionPageComponent);
         fixture.componentRef.setInput('mode', 'favorites');
         fixture.componentRef.setInput('defaultScope', 'all');
-        window.history.replaceState({}, document.title);
     });
 
     it('reloads favorites after playlist hydration completes', async () => {
@@ -712,9 +719,103 @@ describe('UnifiedCollectionPageComponent', () => {
         ).toBe('movie');
     });
 
+    it('exposes a dashboard series resume target to the inline detail host', async () => {
+        const item: UnifiedCollectionItem = {
+            uid: 'xtream::xtream-1::series:103',
+            name: 'Resume Series',
+            contentType: 'series',
+            sourceType: 'xtream',
+            playlistId: 'xtream-1',
+            playlistName: 'Xtream One',
+            xtreamId: 103,
+            categoryId: 3,
+        };
+        window.history.replaceState(
+            {
+                [OPEN_COLLECTION_DETAIL_STATE_KEY]: {
+                    item,
+                    seriesResume: {
+                        seriesXtreamId: 103,
+                        contentXtreamId: 2001,
+                        seasonNumber: 2,
+                        episodeNumber: 1,
+                    },
+                },
+            },
+            document.title
+        );
+
+        const hostFixture = TestBed.createComponent(
+            HostUnifiedCollectionPageComponent
+        );
+        hostFixture.detectChanges();
+        await hostFixture.whenStable();
+        hostFixture.detectChanges();
+
+        expect(
+            hostFixture.nativeElement.querySelector('.resume-probe')
+                ?.textContent
+        ).toContain('2001');
+        expect(
+            hostFixture.componentInstance.pageComponent?.selectedDetailSeriesResume()
+                ?.episodeNumber
+        ).toBe(1);
+        hostFixture.destroy();
+    });
+
+    it('redirects cross-provider detail selections with the resume target intact', async () => {
+        const originalUrl = router.url;
+        router.url = '/workspace/stalker/stalker-7/favorites';
+        try {
+            fixture.detectChanges();
+            await fixture.whenStable();
+            router.navigate.mockClear();
+
+            const seriesResume = {
+                seriesXtreamId: 103,
+                contentXtreamId: 2001,
+                seasonNumber: 2,
+                episodeNumber: 1,
+            };
+            fixture.componentInstance.selectedDetailSeriesResume.set(
+                seriesResume
+            );
+            fixture.componentInstance.selectedDetailItem.set({
+                uid: 'xtream::xtream-1::series:103',
+                name: 'Resume Series',
+                contentType: 'series',
+                sourceType: 'xtream',
+                playlistId: 'xtream-1',
+                playlistName: 'Xtream One',
+                xtreamId: 103,
+                categoryId: 3,
+            } satisfies UnifiedCollectionItem);
+            fixture.detectChanges();
+            await fixture.whenStable();
+
+            expect(router.navigate).toHaveBeenCalledWith(
+                ['/workspace', 'global-favorites'],
+                {
+                    state: {
+                        [OPEN_COLLECTION_DETAIL_STATE_KEY]: {
+                            item: expect.objectContaining({ xtreamId: 103 }),
+                            seriesResume,
+                        },
+                    },
+                }
+            );
+            expect(
+                fixture.componentInstance.selectedDetailItem()
+            ).toBeNull();
+        } finally {
+            router.url = originalUrl;
+        }
+    });
+
     it('restores collection scope and selected content type from history state', async () => {
         setRouteParams({ id: 'playlist-1' });
         playlistsLoaded.set(true);
+        fixture.destroy();
         window.history.replaceState(
             {
                 [COLLECTION_VIEW_STATE_KEY]: {
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.ts
index f043383f3..81df4588c 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-collection-page.component.ts
@@ -47,6 +47,7 @@ import {
     routeParamSignal,
     ScopeToggleService,
     STALKER_RETURN_TO_STATE_KEY,
+    SeriesResumeTarget,
     UnifiedCollectionItem,
     WorkspaceViewCommandService,
 } from '@iptvnator/portal/shared/util';
@@ -144,6 +145,9 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
         this.historyCollectionViewState()?.selectedContentType ?? 'live'
     );
     readonly selectedDetailItem = signal<UnifiedCollectionItem | null>(null);
+    readonly selectedDetailSeriesResume = signal<SeriesResumeTarget | null>(
+        null
+    );
     readonly pendingAutoOpenLiveItem = signal(
         getOpenLiveCollectionItemState(window.history.state)
     );
@@ -157,6 +161,7 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
             return {
                 $implicit: item,
                 item,
+                seriesResume: this.selectedDetailSeriesResume(),
                 close: this.requestCloseDetail,
             };
         }
@@ -360,7 +365,10 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
             return;
         }
 
-        const navigation = this.getGlobalCollectionDetailNavigation(item);
+        const navigation = this.getGlobalCollectionDetailNavigation(
+            item,
+            this.selectedDetailSeriesResume()
+        );
         if (!navigation) {
             return;
         }
@@ -761,7 +769,10 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
         return !portalType || portalType === item.sourceType;
     }
 
-    private getGlobalCollectionDetailNavigation(item: UnifiedCollectionItem) {
+    private getGlobalCollectionDetailNavigation(
+        item: UnifiedCollectionItem,
+        seriesResume?: SeriesResumeTarget | null
+    ) {
         if (
             item.contentType === 'live' ||
             (item.sourceType !== 'xtream' && item.sourceType !== 'stalker')
@@ -769,16 +780,25 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
             return null;
         }
 
-        return buildGlobalCollectionDetailNavigationTarget(this.mode(), item);
+        return buildGlobalCollectionDetailNavigationTarget(
+            this.mode(),
+            item,
+            seriesResume
+        );
     }
 
-    private openInlineDetail(item: UnifiedCollectionItem): void {
+    private openInlineDetail(
+        item: UnifiedCollectionItem,
+        seriesResume?: SeriesResumeTarget | null
+    ): void {
         this.selectedContentType.set(item.contentType);
         this.selectedDetailItem.set(item);
+        this.selectedDetailSeriesResume.set(seriesResume ?? null);
     }
 
     private clearInlineDetail(): void {
         this.selectedDetailItem.set(null);
+        this.selectedDetailSeriesResume.set(null);
         this.autoSelectContentType();
         clearNavigationStateKeys([OPEN_COLLECTION_DETAIL_STATE_KEY]);
     }
@@ -842,12 +862,13 @@ export class UnifiedCollectionPageComponent implements AfterContentInit {
     }
 
     private syncDetailFromHistoryState(): void {
-        const detailItem = getOpenCollectionDetailItemState(
+        const detailState = getOpenCollectionDetailItemState(
             window.history.state
-        )?.item;
+        );
+        const detailItem = detailState?.item;
 
         if (detailItem && this.canOpenInlineDetail(detailItem)) {
-            this.openInlineDetail(detailItem);
+            this.openInlineDetail(detailItem, detailState.seriesResume);
             return;
         }
 
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-epg-summary.util.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-epg-summary.util.ts
index 0d255a4a1..ff0eef7e2 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-epg-summary.util.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-epg-summary.util.ts
@@ -94,6 +94,22 @@ function findCurrentPortalProgram(
     );
 }
 
+/**
+ * Convert program start/stop to epoch seconds, preferring the
+ * numeric timestamp (which is provider-native) over the ISO string.
+ */
+export function toEpochSeconds(
+    timestamp: number | null | undefined,
+    fallbackIso: string
+): number | null {
+    if (timestamp != null && Number.isFinite(timestamp)) {
+        return timestamp;
+    }
+
+    const ms = Date.parse(fallbackIso);
+    return Number.isFinite(ms) ? Math.floor(ms / 1000) : null;
+}
+
 function getProgramTimeMs(
     rawDate: string | null | undefined,
     rawTimestamp?: number | string | null
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.html b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.html
index 47192240f..08714535e 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.html
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.html
@@ -20,6 +20,7 @@
         (channelSelected)="onChannelSelected($event)"
         (playbackRequested)="onChannelPlaybackRequested($event)"
         (channelsReordered)="onReorder($event)"
+        (epgMappingChanged)="onEpgMappingChanged()"
         (favoriteToggled)="onFavoriteToggled($event)"
         (removeRequested)="onRemoveRequested($event)"
     />
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.spec.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.spec.ts
index 86ccb032e..79bbf9876 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.spec.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.spec.ts
@@ -136,9 +136,11 @@ describe('UnifiedLiveTabComponent', () => {
     let component: UnifiedLiveTabComponent;
     let player: ReturnType<typeof signal<VideoPlayer>>;
     let epgViewMode: ReturnType<typeof signal<'timeline' | 'list'>>;
+    let stripCountryPrefix: ReturnType<typeof signal<boolean>>;
     let streamResolver: {
         resolveLiveDetail: jest.Mock;
         resolveM3uPlaybackDetail: jest.Mock;
+        resolveXtreamCatchupUrl: jest.Mock;
         loadM3uProgramsForItem: jest.Mock;
         loadEpgForItems: jest.Mock;
     };
@@ -163,6 +165,7 @@ describe('UnifiedLiveTabComponent', () => {
         streamResolver = {
             resolveLiveDetail: jest.fn(),
             resolveM3uPlaybackDetail: jest.fn(),
+            resolveXtreamCatchupUrl: jest.fn().mockResolvedValue(null),
             loadM3uProgramsForItem: jest.fn().mockResolvedValue([]),
             loadEpgForItems: jest.fn().mockResolvedValue(new Map()),
         };
@@ -171,6 +174,7 @@ describe('UnifiedLiveTabComponent', () => {
         };
         player = signal(VideoPlayer.VideoJs);
         epgViewMode = signal<'timeline' | 'list'>('timeline');
+        stripCountryPrefix = signal(false);
         portalPlayer = {
             isEmbeddedPlayer: jest.fn().mockReturnValue(false),
             openResolvedPlayback: jest.fn(),
@@ -196,6 +200,7 @@ describe('UnifiedLiveTabComponent', () => {
                     useValue: {
                         openStreamOnDoubleClick: signal(false),
                         player,
+                        stripCountryPrefix,
                         resolvedEpgViewMode: epgViewMode,
                     },
                 },
@@ -1061,6 +1066,137 @@ describe('UnifiedLiveTabComponent', () => {
             );
         });
     });
+
+    describe('Xtream (portal) catch-up (timeshift) playback', () => {
+        const selectXtreamArchiveChannel = async (
+            archive: Partial<UnifiedCollectionItem> = {
+                tvArchive: 1,
+                tvArchiveDuration: 5,
+            }
+        ) => {
+            const item = { ...buildLiveItem('xtream'), ...archive };
+            streamResolver.resolveLiveDetail.mockResolvedValue({
+                epgMode: 'portal',
+                playback: {
+                    streamUrl: 'https://example.com/xtream.m3u8',
+                    title: 'Xtream Live',
+                },
+                epgItems: [buildEpgItem('Xtream Show')],
+            });
+            recentData.recordLivePlayback.mockResolvedValue(item);
+
+            fixture.componentRef.setInput('items', [item]);
+            fixture.detectChanges();
+            await fixture.whenStable();
+
+            await component.onChannelSelected(component.channelsForList()[0]);
+            fixture.detectChanges();
+            await fixture.whenStable();
+
+            return item;
+        };
+
+        const timeshiftEvent = (): EpgProgramActivationEvent => ({
+            program: buildProgram('Xtream Show'),
+            type: 'timeshift',
+        });
+
+        const queryTimeline = () =>
+            fixture.debugElement.query(By.directive(StubEpgTimelineComponent))
+                .componentInstance as StubEpgTimelineComponent;
+
+        it('exposes the provider archive window to the timeline in days', async () => {
+            // Regression: tv_archive_duration is days (matching
+            // live-stream-layout.controlledArchiveDays), not hours — a
+            // 5-day window must not collapse to ceil(5 / 24) = 1 day.
+            await selectXtreamArchiveChannel({
+                tvArchive: 1,
+                tvArchiveDuration: 5,
+            });
+
+            const timeline = queryTimeline();
+            expect(timeline.archivePlaybackAvailable()).toBe(true);
+            expect(timeline.archiveDays()).toBe(5);
+        });
+
+        it('keeps the archive gate closed when the provider has no archive', async () => {
+            await selectXtreamArchiveChannel({
+                tvArchive: 0,
+                tvArchiveDuration: 0,
+            });
+
+            const timeline = queryTimeline();
+            expect(timeline.archivePlaybackAvailable()).toBe(false);
+            expect(timeline.archiveDays()).toBe(0);
+        });
+
+        it('resolves the catch-up stream with epoch seconds and switches inline playback', async () => {
+            portalPlayer.isEmbeddedPlayer.mockReturnValue(true);
+            streamResolver.resolveXtreamCatchupUrl.mockResolvedValue(
+                'https://example.com/timeshift.m3u8'
+            );
+            const item = await selectXtreamArchiveChannel();
+
+            component.onTimelineProgramActivated(timeshiftEvent());
+            await fixture.whenStable();
+            fixture.detectChanges();
+
+            const program = timeshiftEvent().program;
+            expect(streamResolver.resolveXtreamCatchupUrl).toHaveBeenCalledWith(
+                expect.objectContaining({ xtreamId: item.xtreamId }),
+                Math.floor(Date.parse(program.start) / 1000),
+                Math.floor(Date.parse(program.stop) / 1000)
+            );
+            expect(component.inlinePlayback()?.streamUrl).toBe(
+                'https://example.com/timeshift.m3u8'
+            );
+            expect(component.inlinePlayback()?.isLive).toBe(false);
+            expect(component.activeTimeshiftProgram()?.title).toBe(
+                'Xtream Show'
+            );
+            expect(snackBar.open).not.toHaveBeenCalled();
+        });
+
+        it('shows feedback instead of failing silently when the provider rejects catch-up', async () => {
+            streamResolver.resolveXtreamCatchupUrl.mockResolvedValue(null);
+            await selectXtreamArchiveChannel();
+
+            component.onTimelineProgramActivated(timeshiftEvent());
+            await fixture.whenStable();
+
+            expect(component.activeTimeshift()).toBeNull();
+            expect(snackBar.open).toHaveBeenCalledTimes(1);
+        });
+    });
+
+    describe('timeline channel name', () => {
+        it('strips the country prefix when the setting is enabled', () => {
+            stripCountryPrefix.set(true);
+            component.activeDetail.set({
+                epgMode: 'portal',
+                playback: {
+                    streamUrl: 'https://example.com/live.m3u8',
+                    title: 'US | CNN',
+                },
+                epgItems: [],
+            } as never);
+
+            expect(component.timelineChannelName()).toBe('CNN');
+        });
+
+        it('prefers the M3U channel name and keeps it raw while disabled', () => {
+            component.activeDetail.set({
+                epgMode: 'm3u',
+                channel: { name: 'US | CNN' },
+                playback: {
+                    streamUrl: 'https://example.com/live.m3u8',
+                    title: 'Fallback Title',
+                },
+            } as never);
+
+            expect(component.timelineChannelName()).toBe('US | CNN');
+        });
+    });
 });
 
 function buildLiveItem(
diff --git a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.ts b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.ts
index 7ec920c23..ba0d5702f 100644
--- a/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.ts
+++ b/libs/portal/shared/ui/src/lib/components/unified-collection/unified-live-tab.component.ts
@@ -15,6 +15,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import {
+    applyChannelNameStrip,
     getM3uArchiveDays,
     isM3uCatchupPlaybackSupported,
     resolveM3uCatchupUrl,
@@ -47,6 +48,7 @@ import {
 import {
     getLiveEpgPanelSummary,
     toEpgProgram,
+    toEpochSeconds,
     toLiveEpgPanelSummary,
 } from './unified-live-epg-summary.util';
 import { GlobalFavoritesListComponent } from '../global-favorites-list/global-favorites-list.component';
@@ -113,6 +115,10 @@ export class UnifiedLiveTabComponent {
 
     readonly activeDetail = signal<ResolvedLiveCollectionDetail | null>(null);
     readonly activeUid = signal<string | null>(null);
+    /** Full collection item for the active selection — used to read
+     *  portal archive fields (tvArchive/tvArchiveDuration) and to
+     *  supply credentials for Xtream catch-up URL resolution. */
+    readonly activeItem = signal<UnifiedCollectionItem | null>(null);
     readonly isSelecting = signal(false);
     readonly epgMap = signal<Map<string, EpgProgram | null>>(new Map());
     readonly progressTick = signal(0);
@@ -183,11 +189,12 @@ export class UnifiedLiveTabComponent {
             ? this.currentM3uPrograms()
             : this.currentPortalEpgPrograms()
     );
-    readonly timelineChannelName = computed(
-        () =>
+    readonly timelineChannelName = computed(() =>
+        applyChannelNameStrip(
             this.currentM3uChannel()?.name ??
-            this.activeDetail()?.playback?.title ??
-            ''
+                this.activeDetail()?.playback?.title,
+            this.settingsStore.stripCountryPrefix?.()
+        )
     );
     readonly timelineChannelLogo = computed(
         () =>
@@ -195,22 +202,41 @@ export class UnifiedLiveTabComponent {
             this.activeDetail()?.playback?.thumbnail ??
             ''
     );
-    readonly timelineArchiveAvailable = computed(
-        () =>
-            this.isM3uSelection() && this.currentM3uArchivePlaybackAvailable()
-    );
+    readonly timelineArchiveAvailable = computed(() => {
+        if (this.isM3uSelection()) {
+            return this.currentM3uArchivePlaybackAvailable();
+        }
+
+        // Portal archive: tvArchive === 1 means the provider has
+        // timeshift / archive enabled for this channel.
+        const item = this.activeItem();
+        return (
+            Number(item?.tvArchive ?? 0) === 1 &&
+            Number(item?.tvArchiveDuration ?? 0) > 0
+        );
+    });
     /**
-     * Catch-up window (days) for the active M3U channel, so the timeline can
+     * Catch-up window (days) for the active channel, so the timeline can
      * gate "Watch" to programmes inside it. Without this the timeline defaults
      * `archiveDays` to 0 (treated as unlimited) and offers catch-up on
-     * programmes older than the channel's real `catchup-days`/`timeshift`/
-     * `tvg-rec` window. 0 for portal selections (archive is M3U-only here).
+     * programmes older than the real archive window.
+     *
+     * M3U: reads catchup-days / timeshift / tvg-rec from the channel attrs.
+     * Portal: tvArchiveDuration is already in days — pass it through,
+     * matching `live-stream-layout.controlledArchiveDays`.
      */
-    readonly timelineArchiveDays = computed(() =>
-        this.timelineArchiveAvailable()
-            ? getM3uArchiveDays(this.currentM3uChannel())
-            : 0
-    );
+    readonly timelineArchiveDays = computed(() => {
+        if (!this.timelineArchiveAvailable()) return 0;
+
+        if (this.isM3uSelection()) {
+            return getM3uArchiveDays(this.currentM3uChannel());
+        }
+
+        return Math.max(
+            0,
+            Number(this.activeItem()?.tvArchiveDuration ?? 0) || 0
+        );
+    });
     readonly activeRadioChannel = computed(() => {
         const channel = this.activeDetail()?.channel ?? null;
         return channel?.radio === 'true' ? channel : null;
@@ -387,9 +413,20 @@ export class UnifiedLiveTabComponent {
             return;
         }
 
+        if (this.isM3uSelection()) {
+            this.activateM3uCatchup(event.program);
+        } else {
+            void this.activatePortalCatchup(event.program);
+        }
+    }
+
+    /**
+     * M3U catch-up: resolve via the M3U timeshift URL resolver.
+     */
+    private activateM3uCatchup(program: EpgProgram): void {
         const playbackUrl = resolveM3uCatchupUrl(
             this.currentM3uChannel(),
-            event.program
+            program
         );
         if (!playbackUrl) {
             this.snackBar.open(
@@ -400,10 +437,70 @@ export class UnifiedLiveTabComponent {
             return;
         }
 
-        this.activeTimeshift.set({ url: playbackUrl, program: event.program });
+        this.activeTimeshift.set({ url: playbackUrl, program });
+
+        const playback = this.activeDetail()?.playback;
+        if (!this.shouldUseInlinePlayer() && playback) {
+            void this.portalPlayer.openResolvedPlayback({
+                ...playback,
+                streamUrl: playbackUrl,
+                isLive: false,
+            });
+        }
+    }
+
+    /**
+     * Portal (Xtream) catch-up: compute start/stop as epoch seconds and
+     * resolve via the provider's timeshift endpoint.
+     */
+    private async activatePortalCatchup(program: EpgProgram): Promise<void> {
+        const requestId = this.selectionRequestId;
+        const item = this.activeItem();
+        if (!item?.xtreamId) {
+            this.snackBar.open(
+                this.translate.instant('EPG.TIMELINE.CATCHUP_FAILED'),
+                undefined,
+                { duration: 4000 }
+            );
+            return;
+        }
+
+        const startEpoch = toEpochSeconds(
+            program.startTimestamp,
+            program.start
+        );
+        const stopEpoch = toEpochSeconds(
+            program.stopTimestamp,
+            program.stop
+        );
+        if (startEpoch == null || stopEpoch == null) {
+            this.snackBar.open(
+                this.translate.instant('EPG.TIMELINE.CATCHUP_FAILED'),
+                undefined,
+                { duration: 4000 }
+            );
+            return;
+        }
+
+        const playbackUrl = await this.streamResolver.resolveXtreamCatchupUrl(
+            item,
+            startEpoch,
+            stopEpoch
+        );
+        if (requestId !== this.selectionRequestId) {
+            return; // switched channel — discard silently
+        }
+        if (!playbackUrl) {
+            this.snackBar.open(
+                this.translate.instant('EPG.TIMELINE.CATCHUP_FAILED'),
+                undefined,
+                { duration: 4000 }
+            );
+            return;
+        }
+
+        this.activeTimeshift.set({ url: playbackUrl, program });
 
-        // No inline player (external MPV/VLC configured) → hand the archive
-        // stream to the external player, mirroring the live-selection flow.
         const playback = this.activeDetail()?.playback;
         if (!this.shouldUseInlinePlayer() && playback) {
             void this.portalPlayer.openResolvedPlayback({
@@ -439,9 +536,14 @@ export class UnifiedLiveTabComponent {
         this.isSelecting.set(false);
         this.activeDetail.set(null);
         this.activeUid.set(null);
+        this.activeItem.set(null);
         this.activeTimeshift.set(null);
     }
 
+    onEpgMappingChanged(): void {
+        void this.loadEpgMap(this.items());
+    }
+
     private async loadEpgMap(items: UnifiedCollectionItem[]): Promise<void> {
         const epgMap = await this.streamResolver.loadEpgForItems(items);
         this.epgMap.set(epgMap);
@@ -470,6 +572,7 @@ export class UnifiedLiveTabComponent {
 
         const requestId = ++this.selectionRequestId;
         this.activeUid.set(item.uid);
+        this.activeItem.set(item);
         this.activeDetail.set(null);
         this.activeTimeshift.set(null);
         this.isSelecting.set(true);
diff --git a/libs/portal/shared/util/src/lib/collection/collection-helpers.ts b/libs/portal/shared/util/src/lib/collection/collection-helpers.ts
index 222f12ab8..60cf6da0e 100644
--- a/libs/portal/shared/util/src/lib/collection/collection-helpers.ts
+++ b/libs/portal/shared/util/src/lib/collection/collection-helpers.ts
@@ -11,6 +11,8 @@ export interface XtreamFavoriteRow {
     readonly type: string;
     readonly poster_url?: string | null;
     readonly rating?: string | null;
+    readonly tv_archive?: number | null;
+    readonly tv_archive_duration?: number | null;
     readonly added_at?: string | null;
     readonly position?: number | null;
 }
diff --git a/libs/portal/shared/util/src/lib/collection/unified-collection-item.interface.ts b/libs/portal/shared/util/src/lib/collection/unified-collection-item.interface.ts
index 140612abe..a9656c395 100644
--- a/libs/portal/shared/util/src/lib/collection/unified-collection-item.interface.ts
+++ b/libs/portal/shared/util/src/lib/collection/unified-collection-item.interface.ts
@@ -56,6 +56,12 @@ export interface UnifiedCollectionItem {
     /** Xtream DB content id — used for reorder / remove IPC */
     contentId?: number;
 
+    /** Whether the Xtream provider has timeshift / archive enabled for this stream */
+    tvArchive?: number | null;
+    /** Timeshift / archive window in days — passed through as-is, matching
+     *  `live-stream-layout.controlledArchiveDays`. */
+    tvArchiveDuration?: number | null;
+
     /** Stalker cmd for stream resolution */
     stalkerId?: string | number;
     stalkerCmd?: string;
diff --git a/libs/portal/shared/util/src/lib/logger.spec.ts b/libs/portal/shared/util/src/lib/logger.spec.ts
index 1691cae71..393f5f27e 100644
--- a/libs/portal/shared/util/src/lib/logger.spec.ts
+++ b/libs/portal/shared/util/src/lib/logger.spec.ts
@@ -14,7 +14,9 @@ describe('portal debug logger', () => {
 
     beforeEach(() => {
         globalWithNgDevMode.ngDevMode = true;
-        jest.spyOn(console, 'groupCollapsed').mockImplementation(() => undefined);
+        jest.spyOn(console, 'groupCollapsed').mockImplementation(
+            () => undefined
+        );
         jest.spyOn(console, 'groupEnd').mockImplementation(() => undefined);
         jest.spyOn(console, 'log').mockImplementation(() => undefined);
         jest.spyOn(console, 'error').mockImplementation(() => undefined);
@@ -36,7 +38,9 @@ describe('portal debug logger', () => {
         });
 
         logPortalDebugRequest(context);
-        logPortalDebugEvent(createPortalDebugSuccessEvent(context, { ok: true }));
+        logPortalDebugEvent(
+            createPortalDebugSuccessEvent(context, { ok: true })
+        );
 
         expect(console.groupCollapsed).not.toHaveBeenCalled();
         expect(console.log).not.toHaveBeenCalled();
@@ -85,4 +89,43 @@ describe('portal debug logger', () => {
 
         nowSpy.mockRestore();
     });
+
+    it('redacts portal request and response credentials before logging', () => {
+        const secrets = {
+            username: 'portal-user-secret',
+            password: 'portal-password-secret',
+            token: 'portal-token-secret',
+            authorization: 'portal-authorization-secret',
+            mac: 'portal-mac-secret',
+        };
+        const context = createPortalDebugRequestContext({
+            provider: 'stalker',
+            operation: 'get_profile',
+            transport: 'pwa-http',
+            request: {
+                params: secrets,
+                url: `https://example.com/portal?token=${secrets.token}&action=get_profile`,
+                diagnosticId: 'request-42',
+            },
+        });
+
+        logPortalDebugRequest(context);
+        logPortalDebugEvent(
+            createPortalDebugSuccessEvent(context, {
+                user_info: secrets,
+                status: 'ok',
+            })
+        );
+
+        const output = JSON.stringify([
+            ...(console.log as jest.Mock).mock.calls,
+            ...(console.error as jest.Mock).mock.calls,
+        ]);
+        for (const secret of Object.values(secrets)) {
+            expect(output).not.toContain(secret);
+        }
+        expect(output).toContain('request-42');
+        expect(output).toContain('get_profile');
+        expect(output).toContain('status');
+    });
 });
diff --git a/libs/portal/shared/util/src/lib/logger.ts b/libs/portal/shared/util/src/lib/logger.ts
index 439b449e3..16578937a 100644
--- a/libs/portal/shared/util/src/lib/logger.ts
+++ b/libs/portal/shared/util/src/lib/logger.ts
@@ -3,6 +3,7 @@ import {
     PortalDebugProvider,
     PortalDebugTransport,
 } from '@iptvnator/shared/interfaces';
+import { redactSensitiveData } from '@iptvnator/shared/logging';
 
 export interface Logger {
     debug: (...args: unknown[]) => void;
@@ -26,19 +27,31 @@ export function createLogger(scope: string): Logger {
     return {
         debug: (...args: unknown[]) => {
             if (debugEnabled) {
-                console.debug(prefix, ...args);
+                console.debug(
+                    prefix,
+                    ...args.map((arg) => redactSensitiveData(arg))
+                );
             }
         },
         info: (...args: unknown[]) => {
             if (debugEnabled) {
-                console.info(prefix, ...args);
+                console.info(
+                    prefix,
+                    ...args.map((arg) => redactSensitiveData(arg))
+                );
             }
         },
         warn: (...args: unknown[]) => {
-            console.warn(prefix, ...args);
+            console.warn(
+                prefix,
+                ...args.map((arg) => redactSensitiveData(arg))
+            );
         },
         error: (...args: unknown[]) => {
-            console.error(prefix, ...args);
+            console.error(
+                prefix,
+                ...args.map((arg) => redactSensitiveData(arg))
+            );
         },
     };
 }
@@ -78,7 +91,7 @@ function logPortalDebugSection(
     method: 'log' | 'error' = 'log'
 ): void {
     if (typeof console[method] === 'function') {
-        console[method](label, value);
+        console[method](label, redactSensitiveData(value));
     }
 }
 
diff --git a/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.spec.ts b/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.spec.ts
index ab9a748d0..8a0640f4b 100644
--- a/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.spec.ts
+++ b/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.spec.ts
@@ -1,5 +1,7 @@
+import { UnifiedCollectionItem } from '../collection/unified-collection-item.interface';
 import {
     buildCollectionViewState,
+    buildOpenCollectionDetailItemState,
     buildStalkerStateItem,
     buildXtreamItemLink,
     COLLECTION_VIEW_STATE_KEY,
@@ -153,6 +155,138 @@ describe('workspace-portal-navigation', () => {
         });
     });
 
+    it('carries an exact Xtream series resume target into recent collection detail state', () => {
+        const navigation = getRecentItemNavigation(
+            {
+                id: 81,
+                title: 'Series Eighty One',
+                type: 'series',
+                playlist_id: 'xtream-1',
+                category_id: 12,
+                xtream_id: 8000,
+                source: 'xtream',
+                poster_url: 'https://example.com/series.png',
+                viewed_at: '2026-03-01T00:00:00.000Z',
+            },
+            {
+                seriesXtreamId: 8000,
+                contentXtreamId: 8024,
+                seasonNumber: 2,
+                episodeNumber: 4,
+            }
+        );
+
+        expect(navigation).toEqual({
+            link: ['/workspace', 'global-recent'],
+            state: {
+                openCollectionDetailItem: {
+                    item: expect.objectContaining({
+                        contentType: 'series',
+                        sourceType: 'xtream',
+                        xtreamId: 8000,
+                    }),
+                    seriesResume: {
+                        seriesXtreamId: 8000,
+                        contentXtreamId: 8024,
+                        seasonNumber: 2,
+                        episodeNumber: 4,
+                    },
+                },
+            },
+        });
+        expect(getOpenCollectionDetailItemState(navigation.state)).toEqual(
+            navigation.state?.[OPEN_COLLECTION_DETAIL_STATE_KEY]
+        );
+    });
+
+    it('drops malformed or misplaced series resume state on read', () => {
+        const seriesItem = {
+            uid: 'xtream::xtream-1::series:103',
+            name: 'Series One',
+            contentType: 'series',
+            sourceType: 'xtream',
+            playlistId: 'xtream-1',
+            playlistName: 'Xtream One',
+            xtreamId: 103,
+            categoryId: 3,
+        };
+        const validResume = {
+            seriesXtreamId: 103,
+            contentXtreamId: 2001,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        };
+        const readResume = (seriesResume: unknown, item: object = seriesItem) =>
+            getOpenCollectionDetailItemState({
+                [OPEN_COLLECTION_DETAIL_STATE_KEY]: { item, seriesResume },
+            })?.seriesResume;
+
+        expect(readResume(validResume)).toEqual(validResume);
+
+        expect(readResume('resume')).toBeUndefined();
+        expect(
+            readResume({ ...validResume, seriesXtreamId: 'x' })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, seriesXtreamId: 0 })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, contentXtreamId: 1.5 })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, contentXtreamId: -2 })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, seasonNumber: Number.NaN })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, seasonNumber: -1 })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, episodeNumber: 2.5 })
+        ).toBeUndefined();
+        expect(
+            readResume({ ...validResume, episodeNumber: -1 })
+        ).toBeUndefined();
+
+        // A valid target attached to a non-series item is discarded too.
+        expect(
+            readResume(validResume, {
+                ...seriesItem,
+                uid: 'xtream::xtream-1::movie:55',
+                contentType: 'movie',
+                xtreamId: 55,
+            })
+        ).toBeUndefined();
+    });
+
+    it('omits the resume key when building detail state without a valid target', () => {
+        const item: UnifiedCollectionItem = {
+            uid: 'xtream::xtream-1::series:103',
+            name: 'Series One',
+            contentType: 'series',
+            sourceType: 'xtream',
+            playlistId: 'xtream-1',
+            playlistName: 'Xtream One',
+            xtreamId: 103,
+            categoryId: 3,
+        };
+
+        expect(buildOpenCollectionDetailItemState(item)).toEqual({
+            item: expect.objectContaining({ xtreamId: 103 }),
+        });
+        expect(
+            buildOpenCollectionDetailItemState(item, {
+                seriesXtreamId: 0,
+                contentXtreamId: 2001,
+                seasonNumber: 2,
+                episodeNumber: 1,
+            })
+        ).toEqual({
+            item: expect.objectContaining({ xtreamId: 103 }),
+        });
+    });
+
     it('matches collection live state against multiple live item identifiers', () => {
         expect(
             matchesOpenLiveCollectionItem(
diff --git a/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.ts b/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.ts
index f4b68cd9b..4424b8d3c 100644
--- a/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.ts
+++ b/libs/portal/shared/util/src/lib/navigation/workspace-portal-navigation.ts
@@ -36,6 +36,14 @@ export interface OpenLiveCollectionItemState {
 
 export interface OpenCollectionDetailItemState {
     item: UnifiedCollectionItem;
+    seriesResume?: SeriesResumeTarget;
+}
+
+export interface SeriesResumeTarget {
+    seriesXtreamId: number;
+    contentXtreamId: number;
+    seasonNumber: number;
+    episodeNumber: number;
 }
 
 export interface CollectionViewState {
@@ -44,7 +52,8 @@ export interface CollectionViewState {
 }
 
 export function getRecentItemNavigation(
-    item: PortalRecentItem
+    item: PortalRecentItem,
+    seriesResume?: SeriesResumeTarget | null
 ): WorkspaceNavigationTarget {
     if (item.type === 'live') {
         return buildLiveCollectionNavigationTarget({
@@ -59,9 +68,24 @@ export function getRecentItemNavigation(
 
     const collectionItem = buildDashboardCollectionDetailItem(item);
     if (collectionItem) {
+        const detailItem =
+            item.source === 'xtream' &&
+            item.type === 'series' &&
+            seriesResume
+                ? {
+                      ...collectionItem,
+                      uid: buildXtreamCollectionUid(
+                          item.playlist_id,
+                          'series',
+                          seriesResume.seriesXtreamId
+                      ),
+                      xtreamId: seriesResume.seriesXtreamId,
+                  }
+                : collectionItem;
         return buildGlobalCollectionDetailNavigationTarget(
             'recent',
-            collectionItem
+            detailItem,
+            item.type === 'series' ? seriesResume : null
         );
     }
 
@@ -180,7 +204,8 @@ export function buildLiveCollectionNavigationTarget(params: {
 
 export function buildGlobalCollectionDetailNavigationTarget(
     mode: 'favorites' | 'recent',
-    item: UnifiedCollectionItem
+    item: UnifiedCollectionItem,
+    seriesResume?: SeriesResumeTarget | null
 ): WorkspaceNavigationTarget {
     return {
         link: [
@@ -189,7 +214,7 @@ export function buildGlobalCollectionDetailNavigationTarget(
         ],
         state: {
             [OPEN_COLLECTION_DETAIL_STATE_KEY]:
-                buildOpenCollectionDetailItemState(item),
+                buildOpenCollectionDetailItemState(item, seriesResume),
         },
     };
 }
@@ -228,10 +253,13 @@ export function getCollectionViewState(
 }
 
 export function buildOpenCollectionDetailItemState(
-    item: UnifiedCollectionItem
+    item: UnifiedCollectionItem,
+    seriesResume?: SeriesResumeTarget | null
 ): OpenCollectionDetailItemState {
+    const normalizedResume = normalizeSeriesResumeTarget(seriesResume);
     return {
         item: normalizeCollectionDetailItem(item) ?? item,
+        ...(normalizedResume ? { seriesResume: normalizedResume } : {}),
     };
 }
 
@@ -241,8 +269,18 @@ export function getOpenCollectionDetailItemState(
     const record = toStateRecord(state);
     const candidate = toStateRecord(record?.[OPEN_COLLECTION_DETAIL_STATE_KEY]);
     const item = normalizeCollectionDetailItem(candidate?.['item']);
+    const seriesResume = normalizeSeriesResumeTarget(
+        candidate?.['seriesResume']
+    );
 
-    return item ? { item } : null;
+    return item
+        ? {
+              item,
+              ...(item.contentType === 'series' && seriesResume
+                  ? { seriesResume }
+                  : {}),
+          }
+        : null;
 }
 
 export function buildOpenLiveCollectionItemState(params: {
@@ -668,6 +706,40 @@ function toOptionalNumber(value: unknown): number | undefined {
     return Number.isFinite(normalized) ? normalized : undefined;
 }
 
+function normalizeSeriesResumeTarget(
+    candidate: unknown
+): SeriesResumeTarget | null {
+    const record = toStateRecord(candidate);
+    if (!record) {
+        return null;
+    }
+
+    const seriesXtreamId = toOptionalNumber(record['seriesXtreamId']);
+    const contentXtreamId = toOptionalNumber(record['contentXtreamId']);
+    const seasonNumber = toOptionalNumber(record['seasonNumber']);
+    const episodeNumber = toOptionalNumber(record['episodeNumber']);
+
+    if (
+        !Number.isInteger(seriesXtreamId) ||
+        (seriesXtreamId ?? 0) <= 0 ||
+        !Number.isInteger(contentXtreamId) ||
+        (contentXtreamId ?? 0) <= 0 ||
+        !Number.isInteger(seasonNumber) ||
+        (seasonNumber ?? -1) < 0 ||
+        !Number.isInteger(episodeNumber) ||
+        (episodeNumber ?? -1) < 0
+    ) {
+        return null;
+    }
+
+    return {
+        seriesXtreamId: seriesXtreamId as number,
+        contentXtreamId: contentXtreamId as number,
+        seasonNumber: seasonNumber as number,
+        episodeNumber: episodeNumber as number,
+    };
+}
+
 function normalizeCollectionDetailItem(
     candidate: unknown
 ): UnifiedCollectionItem | null {
diff --git a/libs/portal/shared/util/src/lib/portal-catalog-facade.ts b/libs/portal/shared/util/src/lib/portal-catalog-facade.ts
index d379cb597..62101dd08 100644
--- a/libs/portal/shared/util/src/lib/portal-catalog-facade.ts
+++ b/libs/portal/shared/util/src/lib/portal-catalog-facade.ts
@@ -62,6 +62,13 @@ export interface PortalCatalogFacade<
     setContentSortMode(mode: PortalCatalogSortMode): void;
     setMinRating?(value: number | null): void;
     selectItem(item: TItem): string[] | null;
+    /**
+     * Optional: re-fetches a selection that was injected from a stored
+     * snapshot (navigation state, favorites) so stale embedded data —
+     * e.g. a Stalker embedded-series episode list — is refreshed in the
+     * background. No-op for providers whose selections are always fresh.
+     */
+    refreshSnapshotSelection?(): void;
     getItemProgress(item: TItem): PortalCatalogItemProgress;
 }
 
diff --git a/libs/portal/shared/util/src/lib/series-quick-start.spec.ts b/libs/portal/shared/util/src/lib/series-quick-start.spec.ts
index 5be1358f2..04044bf14 100644
--- a/libs/portal/shared/util/src/lib/series-quick-start.spec.ts
+++ b/libs/portal/shared/util/src/lib/series-quick-start.spec.ts
@@ -93,6 +93,42 @@ describe('getSeriesQuickStartAction', () => {
         expect(action?.position?.positionSeconds).toBe(30);
     });
 
+    it('plays the most recently launched episode when it has no progress yet', () => {
+        const latestEpisode = episode(108, 1, 8);
+
+        const action = getSeriesQuickStartAction({
+            seasons: {
+                '1': [episode(101, 1, 1), latestEpisode],
+            },
+            playbackPositions: new Map([
+                [
+                    101,
+                    position(101, {
+                        positionSeconds: 20,
+                        updatedAt: '2026-05-10T10:00:00.000Z',
+                    }),
+                ],
+                [
+                    108,
+                    position(108, {
+                        positionSeconds: 0,
+                        durationSeconds: undefined,
+                        updatedAt: '2026-05-10T11:00:00.000Z',
+                    }),
+                ],
+            ]),
+        });
+
+        expect(action?.kind).toBe(
+            SERIES_QUICK_START_ACTION_KIND.PlayRecent
+        );
+        expect(action?.labelKey).toBe('XTREAM.PLAY_EPISODE');
+        expect(action?.labelParams).toEqual({ episode: 8 });
+        expect(action?.episodeLabel).toBe('S01E08 \u00b7 Episode 8');
+        expect(action?.episode).toBe(latestEpisode);
+        expect(action?.position?.positionSeconds).toBe(0);
+    });
+
     it('plays the next unwatched episode after watched episodes', () => {
         const nextEpisode = episode(102, 1, 2);
 
diff --git a/libs/portal/shared/util/src/lib/series-quick-start.ts b/libs/portal/shared/util/src/lib/series-quick-start.ts
index 4a2d243e0..582f4ef7c 100644
--- a/libs/portal/shared/util/src/lib/series-quick-start.ts
+++ b/libs/portal/shared/util/src/lib/series-quick-start.ts
@@ -6,6 +6,7 @@ import {
 
 export const SERIES_QUICK_START_ACTION_KIND = {
     PlayFirst: 'play-first',
+    PlayRecent: 'play-recent',
     Resume: 'resume',
     PlayNext: 'play-next',
     Completed: 'completed',
@@ -17,6 +18,7 @@ export type SeriesQuickStartActionKind =
 export interface SeriesQuickStartAction {
     kind: SeriesQuickStartActionKind;
     labelKey: string;
+    labelParams?: Record<string, number>;
     episodeLabel: string;
     icon: string;
     episode: XtreamSerieEpisode;
@@ -49,18 +51,37 @@ export function getSeriesQuickStartAction(
         return null;
     }
 
-    const inProgress = orderedEpisodes
-        .filter(({ position }) => isPortalPlaybackInProgress(position))
-        .sort(compareInProgressPositions);
+    const startedEpisodes = orderedEpisodes
+        .filter(
+            ({ position }) =>
+                position !== null && !isPortalPlaybackWatched(position)
+        )
+        .sort(comparePlaybackPositionRecency);
 
-    const resumeEpisode = inProgress[inProgress.length - 1];
-    if (resumeEpisode?.position) {
+    const latestStartedEpisode = startedEpisodes[startedEpisodes.length - 1];
+    if (latestStartedEpisode?.position) {
+        const shouldResume = isPortalPlaybackInProgress(
+            latestStartedEpisode.position
+        );
         return createQuickStartAction({
-            kind: SERIES_QUICK_START_ACTION_KIND.Resume,
-            labelKey: 'XTREAM.RESUME_EPISODE',
+            kind: shouldResume
+                ? SERIES_QUICK_START_ACTION_KIND.Resume
+                : SERIES_QUICK_START_ACTION_KIND.PlayRecent,
+            labelKey: shouldResume
+                ? 'XTREAM.RESUME_EPISODE'
+                : 'XTREAM.PLAY_EPISODE',
+            ...(!shouldResume
+                ? {
+                      labelParams: {
+                          episode: Number(
+                              latestStartedEpisode.episode.episode_num
+                          ),
+                      },
+                  }
+                : {}),
             icon: 'play_arrow',
-            episode: resumeEpisode.episode,
-            position: resumeEpisode.position,
+            episode: latestStartedEpisode.episode,
+            position: latestStartedEpisode.position,
             disabled: false,
         });
     }
@@ -150,7 +171,7 @@ function compareEpisodes(
     return naturalCollator.compare(episodeA.title ?? '', episodeB.title ?? '');
 }
 
-function compareInProgressPositions(
+function comparePlaybackPositionRecency(
     episodeA: OrderedEpisode,
     episodeB: OrderedEpisode
 ): number {
diff --git a/libs/portal/stalker/data-access/src/index.ts b/libs/portal/stalker/data-access/src/index.ts
index b56ac9050..9ea6e474c 100644
--- a/libs/portal/stalker/data-access/src/index.ts
+++ b/libs/portal/stalker/data-access/src/index.ts
@@ -1,6 +1,7 @@
 export * from './lib/models';
 export * from './lib/stores';
 export * from './lib/stalker-content-types';
+export * from './lib/stalker-itv-cache.service';
 export * from './lib/stalker-live-playback.utils';
 export * from './lib/stalker-series.adapters';
 export * from './lib/stalker-session.service';
diff --git a/libs/portal/stalker/data-access/src/lib/models/stalker-category-item.interface.ts b/libs/portal/stalker/data-access/src/lib/models/stalker-category-item.interface.ts
index 5f7678593..98103990f 100644
--- a/libs/portal/stalker/data-access/src/lib/models/stalker-category-item.interface.ts
+++ b/libs/portal/stalker/data-access/src/lib/models/stalker-category-item.interface.ts
@@ -1,5 +1,11 @@
 export interface StalkerCategoryItem {
     category_id: string;
     category_name: string;
+    /**
+     * Ministra "censored" genre flag (adult categories). Portals typically
+     * exclude these channels from `get_all_channels`, so censored categories
+     * are served via the legacy paged flow and get no count badge.
+     */
+    censored?: boolean;
     [key: string]: unknown;
 }
diff --git a/libs/portal/stalker/data-access/src/lib/models/stalker-itv-channel.interface.ts b/libs/portal/stalker/data-access/src/lib/models/stalker-itv-channel.interface.ts
index 9fae5e652..18fc90dd7 100644
--- a/libs/portal/stalker/data-access/src/lib/models/stalker-itv-channel.interface.ts
+++ b/libs/portal/stalker/data-access/src/lib/models/stalker-itv-channel.interface.ts
@@ -10,4 +10,6 @@ export interface StalkerItvChannel extends StalkerVodSource {
     name?: string;
     o_name?: string;
     logo?: string;
+    tv_genre_id?: string | number;
+    number?: string | number;
 }
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.spec.ts b/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.spec.ts
new file mode 100644
index 000000000..ef647483a
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.spec.ts
@@ -0,0 +1,391 @@
+import { TestBed } from '@angular/core/testing';
+import { DataService } from '@iptvnator/services';
+import { PlaylistMeta } from '@iptvnator/shared/interfaces';
+import { StalkerItvCacheService } from './stalker-itv-cache.service';
+import { StalkerSessionService } from './stalker-session.service';
+
+jest.mock('@iptvnator/portal/shared/util', () => ({
+    createLogger: () => ({
+        debug: jest.fn(),
+        info: jest.fn(),
+        warn: jest.fn(),
+        error: jest.fn(),
+    }),
+}));
+
+const PLAYLIST = {
+    _id: 'playlist-1',
+    title: 'Demo Stalker',
+    count: 0,
+    autoRefresh: false,
+    importDate: '2026-04-14T00:00:00.000Z',
+    portalUrl: 'http://demo.example/stalker_portal/server/load.php',
+    macAddress: '00:1A:79:00:00:01',
+    isFullStalkerPortal: false,
+} as PlaylistMeta;
+
+type StalkerParams = Record<string, string | number>;
+
+interface RequestHandlers {
+    allChannels?: () => Promise<unknown> | unknown;
+    page?: (page: number) => Promise<unknown> | unknown;
+}
+
+function channel(id: string, name: string, genreId: string) {
+    return {
+        id,
+        name,
+        cmd: `ffrt http://stream.example/${id}`,
+        tv_genre_id: genreId,
+    };
+}
+
+function pageOf(items: unknown[], totalItems: number, pageSize = 14) {
+    return {
+        js: {
+            data: items,
+            total_items: totalItems,
+            max_page_items: pageSize,
+        },
+    };
+}
+
+const UNSUPPORTED_ACTION = { js: { error: 'Unknown action: get_all_channels' } };
+
+async function flushMicrotasks(times = 5): Promise<void> {
+    for (let index = 0; index < times; index += 1) {
+        await Promise.resolve();
+    }
+}
+
+describe('StalkerItvCacheService', () => {
+    let service: StalkerItvCacheService;
+    let sendIpcEvent: jest.Mock<Promise<unknown>, unknown[]>;
+
+    function mockRequests(handlers: RequestHandlers): void {
+        sendIpcEvent.mockImplementation(
+            async (_event: unknown, payload: unknown) => {
+                const params = (payload as { params: StalkerParams }).params;
+                if (params['action'] === 'get_all_channels') {
+                    if (!handlers.allChannels) {
+                        throw new Error('unexpected get_all_channels');
+                    }
+                    return handlers.allChannels();
+                }
+                if (params['action'] === 'get_ordered_list') {
+                    if (!handlers.page) {
+                        throw new Error('unexpected get_ordered_list');
+                    }
+                    return handlers.page(Number(params['p']));
+                }
+                throw new Error(`unexpected action ${params['action']}`);
+            }
+        );
+    }
+
+    function callsFor(action: string): number {
+        return sendIpcEvent.mock.calls.filter(
+            (call) =>
+                (call[1] as { params: StalkerParams }).params['action'] ===
+                action
+        ).length;
+    }
+
+    beforeEach(() => {
+        sendIpcEvent = jest.fn();
+
+        TestBed.configureTestingModule({
+            providers: [
+                { provide: DataService, useValue: { sendIpcEvent } },
+                {
+                    provide: StalkerSessionService,
+                    useValue: { makeAuthenticatedRequest: jest.fn() },
+                },
+            ],
+        });
+
+        service = TestBed.inject(StalkerItvCacheService);
+    });
+
+    it('loads the full list via get_all_channels in a single request', async () => {
+        mockRequests({
+            allChannels: () =>
+                pageOf(
+                    [
+                        channel('1', 'News One', '5'),
+                        // stream_id fallback used when id is missing
+                        {
+                            stream_id: '2',
+                            name: 'Sports HD',
+                            cmd: 'ffrt http://stream.example/2',
+                            tv_genre_id: '9',
+                        },
+                    ],
+                    2
+                ),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(service.isReady(PLAYLIST)).toBe(true);
+        expect(service.versionFor(PLAYLIST)).toBe(1);
+        expect(sendIpcEvent).toHaveBeenCalledTimes(1);
+
+        const channels = service.getChannels(PLAYLIST);
+        expect(channels?.map((item) => item.id)).toEqual(['1', '2']);
+        expect(channels?.every((item) => typeof item.cmd === 'string')).toBe(
+            true
+        );
+    });
+
+    it('falls back to crawling get_ordered_list pages when get_all_channels is unsupported', async () => {
+        mockRequests({
+            allChannels: () => UNSUPPORTED_ACTION,
+            page: (page) =>
+                pageOf(
+                    Array.from({ length: page === 2 ? 14 : 14 }, (_, index) =>
+                        channel(
+                            `${page}-${index}`,
+                            `Channel ${page}-${index}`,
+                            '5'
+                        )
+                    ),
+                    28
+                ),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(service.isReady(PLAYLIST)).toBe(true);
+        expect(service.getChannels(PLAYLIST)).toHaveLength(28);
+        expect(callsFor('get_all_channels')).toBe(1);
+        expect(callsFor('get_ordered_list')).toBe(2);
+    });
+
+    it('reports crawl progress while loading and clears it afterwards', async () => {
+        let resolveSecondPage!: (value: unknown) => void;
+        mockRequests({
+            allChannels: () => UNSUPPORTED_ACTION,
+            page: (page) => {
+                if (page === 1) {
+                    return pageOf(
+                        Array.from({ length: 14 }, (_, index) =>
+                            channel(`1-${index}`, `Channel ${index}`, '5')
+                        ),
+                        28
+                    );
+                }
+                return new Promise((resolve) => {
+                    resolveSecondPage = resolve;
+                });
+            },
+        });
+
+        const load = service.ensureLoaded(PLAYLIST);
+        await flushMicrotasks();
+
+        expect(service.isLoading(PLAYLIST)).toBe(true);
+        expect(service.progressOf(PLAYLIST)).toEqual({ loaded: 14, total: 28 });
+
+        resolveSecondPage(
+            pageOf(
+                Array.from({ length: 14 }, (_, index) =>
+                    channel(`2-${index}`, `Channel ${index}`, '5')
+                ),
+                28
+            )
+        );
+        await load;
+
+        expect(service.isLoading(PLAYLIST)).toBe(false);
+        expect(service.progressOf(PLAYLIST)).toBeNull();
+        expect(service.getChannels(PLAYLIST)).toHaveLength(28);
+    });
+
+    it('stops the crawl early when the portal serves an empty page', async () => {
+        mockRequests({
+            allChannels: () => UNSUPPORTED_ACTION,
+            page: (page) =>
+                page === 1
+                    ? pageOf(
+                          Array.from({ length: 14 }, (_, index) =>
+                              channel(`1-${index}`, `Channel ${index}`, '5')
+                          ),
+                          // Portal claims more items than it can serve.
+                          280
+                      )
+                    : pageOf([], 280),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(service.isReady(PLAYLIST)).toBe(true);
+        expect(service.getChannels(PLAYLIST)).toHaveLength(14);
+    });
+
+    it('memoizes unsupported portals and keeps the legacy flow in charge', async () => {
+        mockRequests({
+            allChannels: () => UNSUPPORTED_ACTION,
+            page: () => pageOf([], 0),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+        const callsAfterFirstAttempt = sendIpcEvent.mock.calls.length;
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(service.isReady(PLAYLIST)).toBe(false);
+        expect(sendIpcEvent.mock.calls.length).toBe(callsAfterFirstAttempt);
+    });
+
+    it('throttles retries after a transient failure, then retries once the cooldown elapses', async () => {
+        const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(1_000_000);
+        try {
+            mockRequests({
+                allChannels: () => Promise.reject(new Error('network down')),
+                page: () => Promise.reject(new Error('network down')),
+            });
+
+            await service.ensureLoaded(PLAYLIST);
+            expect(service.isReady(PLAYLIST)).toBe(false);
+            const callsAfterError = sendIpcEvent.mock.calls.length;
+
+            // Portal is reachable again, but within the cooldown window the
+            // whole portal must NOT be re-crawled (prevents a hammering loop
+            // when a page fails deterministically).
+            mockRequests({
+                allChannels: () => pageOf([channel('1', 'News One', '5')], 1),
+            });
+            await service.ensureLoaded(PLAYLIST);
+            expect(sendIpcEvent.mock.calls.length).toBe(callsAfterError);
+            expect(service.isReady(PLAYLIST)).toBe(false);
+
+            // After the cooldown elapses the next visit retries.
+            nowSpy.mockReturnValue(1_000_000 + 31_000);
+            await service.ensureLoaded(PLAYLIST);
+            expect(service.isReady(PLAYLIST)).toBe(true);
+            expect(service.getChannels(PLAYLIST)).toHaveLength(1);
+        } finally {
+            nowSpy.mockRestore();
+        }
+    });
+
+    it('a refresh bypasses the error cooldown', async () => {
+        const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(2_000_000);
+        try {
+            mockRequests({
+                allChannels: () => Promise.reject(new Error('network down')),
+                page: () => Promise.reject(new Error('network down')),
+            });
+            await service.ensureLoaded(PLAYLIST);
+            expect(service.isReady(PLAYLIST)).toBe(false);
+
+            mockRequests({
+                allChannels: () => pageOf([channel('1', 'News One', '5')], 1),
+            });
+            // Same instant — cooldown still active — but an explicit refresh
+            // (e.g. the refresh button) must retry immediately.
+            await service.refresh(PLAYLIST);
+            expect(service.isReady(PLAYLIST)).toBe(true);
+        } finally {
+            nowSpy.mockRestore();
+        }
+    });
+
+    it('deduplicates channels returned across crawl pages (portal ignoring the page param)', async () => {
+        const samePage = () =>
+            pageOf(
+                [
+                    channel('1', 'News One', '5'),
+                    channel('2', 'Sports HD', '9'),
+                ],
+                // Portal claims many items but returns the same two regardless
+                // of `p`.
+                280
+            );
+        mockRequests({
+            allChannels: () => UNSUPPORTED_ACTION,
+            page: () => samePage(),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(service.isReady(PLAYLIST)).toBe(true);
+        expect(service.getChannels(PLAYLIST)).toHaveLength(2);
+    });
+
+    it('deduplicates channels returned by get_all_channels', async () => {
+        mockRequests({
+            allChannels: () =>
+                pageOf(
+                    [
+                        channel('1', 'News One', '5'),
+                        channel('1', 'News One dup', '5'),
+                        channel('2', 'Sports HD', '9'),
+                    ],
+                    3
+                ),
+        });
+
+        await service.ensureLoaded(PLAYLIST);
+
+        expect(
+            service.getChannels(PLAYLIST)?.map((c) => c.id)
+        ).toEqual(['1', '2']);
+    });
+
+    it('deduplicates concurrent load requests', async () => {
+        let resolveAllChannels!: (value: unknown) => void;
+        mockRequests({
+            allChannels: () =>
+                new Promise((resolve) => {
+                    resolveAllChannels = resolve;
+                }),
+        });
+
+        const first = service.ensureLoaded(PLAYLIST);
+        const second = service.ensureLoaded(PLAYLIST);
+        await flushMicrotasks();
+
+        resolveAllChannels(pageOf([channel('1', 'News One', '5')], 1));
+        await Promise.all([first, second]);
+
+        expect(callsFor('get_all_channels')).toBe(1);
+        expect(service.isReady(PLAYLIST)).toBe(true);
+    });
+
+    it('keeps serving the previous list while a refresh is in flight', async () => {
+        mockRequests({
+            allChannels: () => pageOf([channel('1', 'News One', '5')], 1),
+        });
+        await service.ensureLoaded(PLAYLIST);
+
+        let resolveRefresh!: (value: unknown) => void;
+        mockRequests({
+            allChannels: () =>
+                new Promise((resolve) => {
+                    resolveRefresh = resolve;
+                }),
+        });
+
+        const refresh = service.refresh(PLAYLIST);
+        await flushMicrotasks();
+
+        expect(service.isReady(PLAYLIST)).toBe(true);
+        expect(service.getChannels(PLAYLIST)?.[0]?.name).toBe('News One');
+
+        resolveRefresh(
+            pageOf(
+                [
+                    channel('1', 'News One', '5'),
+                    channel('2', 'Fresh Channel', '9'),
+                ],
+                2
+            )
+        );
+        await refresh;
+
+        expect(service.getChannels(PLAYLIST)).toHaveLength(2);
+        expect(service.versionFor(PLAYLIST)).toBe(2);
+    });
+});
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.ts b/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.ts
new file mode 100644
index 000000000..f16bcbee5
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stalker-itv-cache.service.ts
@@ -0,0 +1,223 @@
+import { Injectable, WritableSignal, inject, signal } from '@angular/core';
+import { createLogger } from '@iptvnator/portal/shared/util';
+import { DataService } from '@iptvnator/services';
+import { PlaylistMeta } from '@iptvnator/shared/interfaces';
+import { StalkerItvChannel } from './models';
+import {
+    StalkerItvLoadProgress,
+    loadFullItvChannelList,
+} from './stalker-itv-channel-loader';
+import { StalkerSessionService } from './stalker-session.service';
+import { StalkerRequestDeps } from './stores/utils';
+
+export type { StalkerItvLoadProgress };
+
+/**
+ * After a transient crawl failure, don't immediately re-crawl the whole portal
+ * on the next resource fire — a deterministically-failing page would otherwise
+ * trigger an unbounded re-crawl loop that hammers the portal.
+ */
+const ERROR_COOLDOWN_MS = 30_000;
+
+/**
+ * Session cache holding the complete ITV channel list per Stalker portal.
+ *
+ * Stalker portals paginate `get_ordered_list` with a server-side page size
+ * (typically 14), so incremental loading can never power a complete local
+ * search. This service loads the full list once per portal: it first tries the
+ * Ministra `get_all_channels` action (all channels in a single response) and
+ * falls back to crawling `get_ordered_list` pages. Portals where both
+ * strategies fail are marked unsupported and keep the legacy paged behavior.
+ */
+@Injectable({ providedIn: 'root' })
+export class StalkerItvCacheService {
+    private readonly logger = createLogger('StalkerItvCache');
+    private readonly requestDeps: StalkerRequestDeps = {
+        dataService: inject(DataService),
+        stalkerSession: inject(StalkerSessionService),
+    };
+
+    /** Portal keys whose full channel list is loaded. */
+    private readonly readyKeys = signal<ReadonlySet<string>>(new Set());
+    private readonly loadingKeys = signal<ReadonlySet<string>>(new Set());
+    private readonly progressByKey = signal<
+        Readonly<Record<string, StalkerItvLoadProgress>>
+    >({});
+    /**
+     * Per-portal version counters. Kept as independent signals (not one shared
+     * counter) so a resource that reads `versionFor(portal)` only re-fires when
+     * THAT portal's list becomes ready or is refreshed — a different portal's
+     * background load completing must never re-fire an unrelated resource.
+     */
+    private readonly versionSignals = new Map<string, WritableSignal<number>>();
+
+    private readonly channelsByKey = new Map<string, StalkerItvChannel[]>();
+    private readonly unsupportedKeys = new Set<string>();
+    private readonly inflight = new Map<string, Promise<void>>();
+    /** Wall-clock (ms) until which a portal's crawl error suppresses retries. */
+    private readonly errorCooldownUntil = new Map<string, number>();
+
+    /**
+     * Reactive, per-portal readiness token. Changes only when this portal's
+     * full channel list becomes ready or is refreshed. Resources that serve
+     * from the cache read this to re-fire at the right moment without being
+     * disturbed by other portals' loads.
+     */
+    versionFor(playlist: PlaylistMeta | undefined): number {
+        const key = this.keyFor(playlist);
+        return key === null ? 0 : this.versionSignalFor(key)();
+    }
+
+    isReady(playlist: PlaylistMeta | undefined): boolean {
+        const key = this.keyFor(playlist);
+        return key !== null && this.readyKeys().has(key);
+    }
+
+    isLoading(playlist: PlaylistMeta | undefined): boolean {
+        const key = this.keyFor(playlist);
+        return key !== null && this.loadingKeys().has(key);
+    }
+
+    progressOf(
+        playlist: PlaylistMeta | undefined
+    ): StalkerItvLoadProgress | null {
+        const key = this.keyFor(playlist);
+        return key !== null ? (this.progressByKey()[key] ?? null) : null;
+    }
+
+    /**
+     * Full channel list for the portal, or null while not (yet) loaded.
+     * Deliberately NON-reactive: it reads only the plain `channelsByKey` map
+     * (an entry exists iff a load succeeded), so computeds that call it don't
+     * pick up the shared `readyKeys` signal and re-evaluate when an UNRELATED
+     * portal's list becomes ready. Reactive consumers establish their own
+     * per-portal dependency via {@link versionFor}; boolean readiness for UI
+     * stays on the reactive {@link isReady}.
+     */
+    getChannels(playlist: PlaylistMeta | undefined): StalkerItvChannel[] | null {
+        const key = this.keyFor(playlist);
+        return key === null ? null : (this.channelsByKey.get(key) ?? null);
+    }
+
+    /**
+     * Loads the full channel list once per portal. No-op when the list is
+     * already loaded, currently loading, or the portal is unsupported.
+     */
+    async ensureLoaded(playlist: PlaylistMeta | undefined): Promise<void> {
+        const key = this.keyFor(playlist);
+        if (
+            key === null ||
+            !playlist ||
+            this.readyKeys().has(key) ||
+            this.unsupportedKeys.has(key) ||
+            this.isInErrorCooldown(key)
+        ) {
+            return;
+        }
+
+        await (this.inflight.get(key) ?? this.runLoad(key, playlist));
+    }
+
+    /** Reloads the list while keeping the current cache served in the meantime. */
+    async refresh(playlist: PlaylistMeta | undefined): Promise<void> {
+        const key = this.keyFor(playlist);
+        if (key === null || !playlist) {
+            return;
+        }
+
+        const pending = this.inflight.get(key);
+        if (pending) {
+            return pending;
+        }
+
+        this.unsupportedKeys.delete(key);
+        this.errorCooldownUntil.delete(key);
+        await this.runLoad(key, playlist);
+    }
+
+    private keyFor(playlist: PlaylistMeta | undefined): string | null {
+        return playlist?._id ?? playlist?.portalUrl ?? null;
+    }
+
+    private versionSignalFor(key: string): WritableSignal<number> {
+        let versionSignal = this.versionSignals.get(key);
+        if (!versionSignal) {
+            versionSignal = signal(0);
+            this.versionSignals.set(key, versionSignal);
+        }
+        return versionSignal;
+    }
+
+    private isInErrorCooldown(key: string): boolean {
+        const until = this.errorCooldownUntil.get(key);
+        if (until === undefined) {
+            return false;
+        }
+        if (Date.now() >= until) {
+            this.errorCooldownUntil.delete(key);
+            return false;
+        }
+        return true;
+    }
+
+    private runLoad(key: string, playlist: PlaylistMeta): Promise<void> {
+        const task = (async () => {
+            this.patchKeySet(this.loadingKeys, key, true);
+            try {
+                const outcome = await loadFullItvChannelList(
+                    this.requestDeps,
+                    playlist,
+                    (loaded, total) => this.reportProgress(key, loaded, total),
+                    this.logger
+                );
+                if (Array.isArray(outcome)) {
+                    this.channelsByKey.set(key, outcome);
+                    this.errorCooldownUntil.delete(key);
+                    this.patchKeySet(this.readyKeys, key, true);
+                    this.versionSignalFor(key).update((version) => version + 1);
+                } else if (outcome === 'error') {
+                    this.errorCooldownUntil.set(
+                        key,
+                        Date.now() + ERROR_COOLDOWN_MS
+                    );
+                } else if (!this.readyKeys().has(key)) {
+                    this.unsupportedKeys.add(key);
+                }
+            } finally {
+                this.inflight.delete(key);
+                this.patchKeySet(this.loadingKeys, key, false);
+                this.progressByKey.update((progress) => {
+                    const next = { ...progress };
+                    delete next[key];
+                    return next;
+                });
+            }
+        })();
+
+        this.inflight.set(key, task);
+        return task;
+    }
+
+    private reportProgress(key: string, loaded: number, total: number): void {
+        this.progressByKey.update((progress) => ({
+            ...progress,
+            [key]: { loaded, total },
+        }));
+    }
+
+    private patchKeySet(
+        target: ReturnType<typeof signal<ReadonlySet<string>>>,
+        key: string,
+        present: boolean
+    ): void {
+        target.update((current) => {
+            const next = new Set(current);
+            if (present) {
+                next.add(key);
+            } else {
+                next.delete(key);
+            }
+            return next;
+        });
+    }
+}
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-itv-channel-loader.ts b/libs/portal/stalker/data-access/src/lib/stalker-itv-channel-loader.ts
new file mode 100644
index 000000000..b90efc694
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stalker-itv-channel-loader.ts
@@ -0,0 +1,283 @@
+import {
+    PlaylistMeta,
+    StalkerPortalActions,
+} from '@iptvnator/shared/interfaces';
+import { StalkerItvChannel } from './models';
+import {
+    StalkerRequestDeps,
+    executeStalkerRequest,
+    toStalkerContentItem,
+    toStalkerItvChannel,
+} from './stores/utils';
+
+export interface StalkerItvLoadProgress {
+    loaded: number;
+    total: number;
+}
+
+/**
+ * 'unsupported' — the portal answered but cannot serve a full list; the caller
+ * should keep the legacy paged flow. 'error' — a transient failure (network,
+ * timeout, a page that failed both attempts) that is worth retrying later.
+ */
+export type StalkerItvLoadOutcome =
+    | StalkerItvChannel[]
+    | 'unsupported'
+    | 'error';
+
+export interface StalkerItvLoadLogger {
+    info(...args: unknown[]): void;
+    warn(...args: unknown[]): void;
+}
+
+interface StalkerChannelListResponse {
+    js?: {
+        data?: unknown;
+        total_items?: number | string;
+        max_page_items?: number | string;
+    };
+}
+
+const FALLBACK_PAGE_SIZE = 14;
+const CRAWL_CONCURRENCY = 4;
+/** Hard cap so a misbehaving portal cannot make the crawl run forever. */
+const MAX_CHANNELS = 30_000;
+
+function toPositiveInt(value: unknown): number | null {
+    const parsed = Number.parseInt(String(value ?? ''), 10);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}
+
+/**
+ * Loads the complete ITV channel list for a portal. First tries the Ministra
+ * `get_all_channels` action (all channels in one response — the same call STB
+ * clients use); if that isn't usable, crawls `get_ordered_list` pages. Stateless
+ * — the {@link StalkerItvCacheService} owns caching, progress state, and retry
+ * throttling.
+ */
+export async function loadFullItvChannelList(
+    deps: StalkerRequestDeps,
+    playlist: PlaylistMeta,
+    onProgress: (loaded: number, total: number) => void,
+    logger: StalkerItvLoadLogger
+): Promise<StalkerItvLoadOutcome> {
+    const viaAllChannels = await tryGetAllChannels(deps, playlist, logger);
+    if (Array.isArray(viaAllChannels)) {
+        return viaAllChannels;
+    }
+
+    const crawled = await crawlOrderedPages(deps, playlist, onProgress, logger);
+    if (Array.isArray(crawled)) {
+        return crawled;
+    }
+
+    return viaAllChannels === 'error' || crawled === 'error'
+        ? 'error'
+        : 'unsupported';
+}
+
+async function tryGetAllChannels(
+    deps: StalkerRequestDeps,
+    playlist: PlaylistMeta,
+    logger: StalkerItvLoadLogger
+): Promise<StalkerItvLoadOutcome> {
+    try {
+        const response =
+            await executeStalkerRequest<StalkerChannelListResponse>(
+                deps,
+                playlist,
+                {
+                    action: StalkerPortalActions.GetAllChannels,
+                    type: 'itv',
+                }
+            );
+        const data = response?.js?.data;
+        if (!Array.isArray(data) || data.length === 0) {
+            logger.info(
+                'get_all_channels not usable, falling back to page crawl'
+            );
+            return 'unsupported';
+        }
+
+        return mapChannels(data, playlist);
+    } catch (error) {
+        logger.warn('get_all_channels failed', error);
+        return 'error';
+    }
+}
+
+async function crawlOrderedPages(
+    deps: StalkerRequestDeps,
+    playlist: PlaylistMeta,
+    onProgress: (loaded: number, total: number) => void,
+    logger: StalkerItvLoadLogger
+): Promise<StalkerItvLoadOutcome> {
+    const firstResponse = await fetchOrderedPageWithRetry(deps, playlist, 1, logger);
+    if (firstResponse === null) {
+        return 'error';
+    }
+
+    const firstPage = Array.isArray(firstResponse.js?.data)
+        ? firstResponse.js.data
+        : null;
+    if (firstPage === null || firstPage.length === 0) {
+        return 'unsupported';
+    }
+
+    const totalItems = Math.min(
+        toPositiveInt(firstResponse?.js?.total_items) ?? firstPage.length,
+        MAX_CHANNELS
+    );
+    const pageSize =
+        toPositiveInt(firstResponse?.js?.max_page_items) ??
+        (firstPage.length || FALLBACK_PAGE_SIZE);
+    const totalPages = Math.max(1, Math.ceil(totalItems / pageSize));
+
+    const items: unknown[] = [];
+    const seen = new Set<string>();
+    collectUnique(firstPage, items, seen);
+    onProgress(items.length, totalItems);
+
+    for (
+        let page = 2;
+        page <= totalPages && items.length < totalItems;
+        page += CRAWL_CONCURRENCY
+    ) {
+        const batch: number[] = [];
+        for (
+            let next = page;
+            next < page + CRAWL_CONCURRENCY && next <= totalPages;
+            next++
+        ) {
+            batch.push(next);
+        }
+
+        const results = await Promise.all(
+            batch.map((pageNumber) =>
+                fetchOrderedPageWithRetry(deps, playlist, pageNumber, logger)
+            )
+        );
+
+        let reachedEnd = false;
+        for (const pageResponse of results) {
+            const pageItems = Array.isArray(pageResponse?.js?.data)
+                ? pageResponse.js.data
+                : null;
+            if (pageItems === null) {
+                logger.warn('Aborting ITV page crawl after failures');
+                return 'error';
+            }
+            const added = collectUnique(pageItems, items, seen);
+            if (added === 0) {
+                // Empty page, or a portal that ignores `p` and keeps returning
+                // already-seen channels — treat the collected list as complete
+                // instead of duplicating rows forever.
+                reachedEnd = true;
+                break;
+            }
+        }
+
+        onProgress(Math.min(items.length, totalItems), totalItems);
+        if (reachedEnd) {
+            break;
+        }
+    }
+
+    return mapChannels(items, playlist);
+}
+
+/**
+ * Appends only channels whose id hasn't been seen yet. Returns how many new
+ * channels were added so the crawl can stop when a page contributes nothing new.
+ */
+function collectUnique(
+    rawItems: unknown[],
+    target: unknown[],
+    seen: Set<string>
+): number {
+    let added = 0;
+    for (const item of rawItems) {
+        const id = rawChannelId(item);
+        if (id === null || seen.has(id)) {
+            continue;
+        }
+        seen.add(id);
+        target.push(item);
+        added += 1;
+    }
+    return added;
+}
+
+function rawChannelId(item: unknown): string | null {
+    if (!item || typeof item !== 'object') {
+        return null;
+    }
+    const source = item as { id?: unknown; stream_id?: unknown };
+    const raw = source.id ?? source.stream_id;
+    return raw === undefined || raw === null || raw === '' ? null : String(raw);
+}
+
+async function fetchOrderedPageWithRetry(
+    deps: StalkerRequestDeps,
+    playlist: PlaylistMeta,
+    page: number,
+    logger: StalkerItvLoadLogger
+): Promise<StalkerChannelListResponse | null> {
+    const firstAttempt = await fetchOrderedPage(deps, playlist, page, logger);
+    if (firstAttempt !== null) {
+        return firstAttempt;
+    }
+    return fetchOrderedPage(deps, playlist, page, logger);
+}
+
+async function fetchOrderedPage(
+    deps: StalkerRequestDeps,
+    playlist: PlaylistMeta,
+    page: number,
+    logger: StalkerItvLoadLogger
+): Promise<StalkerChannelListResponse | null> {
+    try {
+        return await executeStalkerRequest<StalkerChannelListResponse>(
+            deps,
+            playlist,
+            {
+                action: StalkerPortalActions.GetOrderedList,
+                type: 'itv',
+                category: '*',
+                genre: '*',
+                sortby: 'number',
+                p: page,
+            }
+        );
+    } catch (error) {
+        logger.warn(`Failed to fetch ITV page ${page}`, error);
+        return null;
+    }
+}
+
+function mapChannels(
+    items: unknown[],
+    playlist: PlaylistMeta
+): StalkerItvChannel[] {
+    const mapped: StalkerItvChannel[] = [];
+    const seen = new Set<string>();
+    for (const item of items) {
+        const channel = toStalkerItvChannel(
+            toStalkerContentItem(
+                item as Parameters<typeof toStalkerContentItem>[0],
+                playlist.portalUrl ?? ''
+            )
+        );
+        // Duplicate channel ids collide with the template's `track item.id`
+        // (get_all_channels can repeat, and some crawl paths overlap).
+        const id = String(channel.id ?? '');
+        if (id !== '' && seen.has(id)) {
+            continue;
+        }
+        if (id !== '') {
+            seen.add(id);
+        }
+        mapped.push(channel);
+    }
+    return mapped;
+}
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.spec.ts b/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.spec.ts
index 80c6d85b4..6a65d44c6 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.spec.ts
@@ -78,6 +78,44 @@ describe('stalker-series.adapters', () => {
         expect(firstEpisode.id).not.toBe(mapped['1'][1].id);
     });
 
+    it('derives missing VOD-series season numbers from natural season order', () => {
+        const mapped = mapVodSeriesEpisodes([
+            {
+                id: 'season-2',
+                video_id: 'v1',
+                name: 'Season 2',
+                season_number: '',
+                episodes: [
+                    {
+                        id: 'episode-2',
+                        series_number: 1,
+                        name: 'Second season pilot',
+                    },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+            {
+                id: 'season-1',
+                video_id: 'v1',
+                name: 'Season 1',
+                season_number: '',
+                episodes: [
+                    {
+                        id: 'episode-1',
+                        series_number: 1,
+                        name: 'Pilot',
+                    },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+        ]);
+
+        expect(mapped['Season 1'][0].season).toBe(1);
+        expect(mapped['Season 2'][0].season).toBe(2);
+    });
+
     it('maps embedded series payload into regular season episodes', () => {
         const regularSeasons = mapRegularSeriesSeasons(
             {
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.ts b/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.ts
index 7a94a40bf..23bd5e1fc 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-series.adapters.ts
@@ -7,6 +7,11 @@ import {
 } from './models';
 import { isStalkerSeriesFlag } from './stalker-vod.utils';
 
+const naturalSeasonCollator = new Intl.Collator(undefined, {
+    numeric: true,
+    sensitivity: 'base',
+});
+
 export interface VodSeriesSeasonVm {
     id: string;
     video_id: string;
@@ -154,7 +159,7 @@ export function mapVodSeriesEpisodes(
 
     seasons.forEach((season) => {
         const seasonKey = season.season_number || season.name || season.id;
-        const seasonNum = toEpisodeNumber(seasonKey) || 1;
+        const seasonNum = getVodSeriesSeasonNumber(season, seasons);
 
         mapped[seasonKey] = (season.episodes ?? []).map((episode) => {
             const episodeNum =
@@ -230,3 +235,24 @@ export function mapRegularSeriesEpisodes(
 export function getVodSeriesSeasonKey(season: VodSeriesSeasonVm): string {
     return season.season_number || season.name || season.id;
 }
+
+export function getVodSeriesSeasonNumber(
+    season: VodSeriesSeasonVm,
+    seasons: ReadonlyArray<VodSeriesSeasonVm>
+): number {
+    const parsedSeasonNumber = Number(season.season_number);
+    if (Number.isInteger(parsedSeasonNumber) && parsedSeasonNumber > 0) {
+        return parsedSeasonNumber;
+    }
+
+    const orderedSeasons = [...seasons].sort((seasonA, seasonB) =>
+        naturalSeasonCollator.compare(
+            getVodSeriesSeasonKey(seasonA),
+            getVodSeriesSeasonKey(seasonB)
+        )
+    );
+    const seasonIndex = orderedSeasons.findIndex(
+        (candidate) => candidate.id === season.id
+    );
+    return seasonIndex >= 0 ? seasonIndex + 1 : 1;
+}
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-session.service.spec.ts b/libs/portal/stalker/data-access/src/lib/stalker-session.service.spec.ts
index 51810adb6..8ed39a0de 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-session.service.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-session.service.spec.ts
@@ -24,7 +24,8 @@ type GetProfileWithIdentity = (
 ) => Promise<StalkerProfileResponse>;
 
 describe('StalkerSessionService identity payloads', () => {
-    const portalUrl = 'https://portal.example.com/stalker_portal/server/load.php';
+    const portalUrl =
+        'https://portal.example.com/stalker_portal/server/load.php';
     const macAddress = '00:1A:79:AA:BB:CC';
 
     let service: StalkerSessionService;
@@ -56,6 +57,10 @@ describe('StalkerSessionService identity payloads', () => {
         service = TestBed.inject(StalkerSessionService);
     });
 
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
     it('omits SN, device IDs, and signatures from get_profile when identity is blank', async () => {
         const getProfile =
             service.getProfile as unknown as GetProfileWithIdentity;
@@ -180,6 +185,34 @@ describe('StalkerSessionService identity payloads', () => {
         expect(handshakePayload.serialNumber).toBe('CUSTOMSN123');
     });
 
+    it('does not log credentials from portal request errors', async () => {
+        const token = 'stalker-error-token-secret';
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+        dataService.sendIpcEvent.mockRejectedValue(
+            new Error(
+                `Request failed: https://portal.example/api?token=${token}&action=get_profile`
+            )
+        );
+
+        await expect(
+            service.getProfile(portalUrl, macAddress, token, {}, 'random-1')
+        ).rejects.toThrow('Request failed');
+
+        const output = consoleError.mock.calls
+            .flatMap((call) =>
+                call.map((value) =>
+                    value instanceof Error
+                        ? `${value.message}\n${value.stack ?? ''}`
+                        : JSON.stringify(value)
+                )
+            )
+            .join('\n');
+        expect(output).not.toContain(token);
+        expect(output).toContain('get_profile');
+    });
+
     function lastStalkerPayload(): {
         params: Record<string, unknown>;
         serialNumber?: string;
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-session.service.ts b/libs/portal/stalker/data-access/src/lib/stalker-session.service.ts
index e32498aca..91f1ea741 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-session.service.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-session.service.ts
@@ -1,10 +1,7 @@
 import { Injectable, inject } from '@angular/core';
-import {
-    createDevLogger,
-    Playlist,
-    STALKER_REQUEST,
-} from '@iptvnator/shared/interfaces';
+import { Playlist, STALKER_REQUEST } from '@iptvnator/shared/interfaces';
 import { DataService } from '@iptvnator/services';
+import { createLogger } from '@iptvnator/portal/shared/util';
 import {
     getStalkerPortalIdentityFromPlaylist,
     LEGACY_DEFAULT_STALKER_SERIAL,
@@ -91,7 +88,7 @@ interface StalkerAuthConfirmationResponse {
 })
 export class StalkerSessionService {
     private dataService = inject(DataService);
-    private readonly debugLog = createDevLogger('StalkerSession');
+    private readonly logger = createLogger('StalkerSession');
 
     // In-memory token cache for current session (keyed by playlist ID)
     private tokenCache = new Map<string, string>();
@@ -234,7 +231,7 @@ export class StalkerSessionService {
             );
         } catch (error) {
             // Keep failures non-fatal; next interval can recover after token refresh.
-            console.warn('[StalkerSession] Watchdog ping failed:', error);
+            this.logger.warn('Watchdog ping failed:', error);
         } finally {
             this.watchdogInFlight.delete(playlistId);
         }
@@ -281,10 +278,10 @@ export class StalkerSessionService {
                 };
             }
 
-            console.error('[StalkerSession] No token in response');
+            this.logger.error('No token in response');
             throw new Error('Handshake failed: No token received');
         } catch (error) {
-            console.error('[StalkerSession] Handshake error:', error);
+            this.logger.error('Handshake error:', error);
             throw error;
         }
     }
@@ -364,7 +361,7 @@ export class StalkerSessionService {
 
             return response;
         } catch (error) {
-            console.error('[StalkerSession] Get profile error:', error);
+            this.logger.error('Get profile error:', error);
             throw error;
         }
     }
@@ -404,7 +401,7 @@ export class StalkerSessionService {
 
             return false;
         } catch (error) {
-            console.error('[StalkerSession] do_auth error:', error);
+            this.logger.error('do_auth error:', error);
             throw error;
         }
     }
@@ -447,7 +444,7 @@ export class StalkerSessionService {
                     profileResponse.js.msg ||
                     profileResponse.js.block_msg ||
                     'Unknown profile error';
-                console.error('[StalkerSession] Profile error:', errorMsg);
+                this.logger.error('Profile error:', errorMsg);
                 throw new Error(`Profile error: ${errorMsg}`);
             }
 
@@ -457,7 +454,7 @@ export class StalkerSessionService {
             };
         } catch (error) {
             // Profile fetch failed - this is a real error, propagate it
-            console.error('[StalkerSession] Profile fetch failed:', error);
+            this.logger.error('Profile fetch failed:', error);
             throw error;
         }
     }
@@ -487,14 +484,14 @@ export class StalkerSessionService {
         // This prevents race conditions when multiple resources request a token simultaneously
         const pendingPromise = this.pendingAuth.get(playlist._id);
         if (pendingPromise) {
-            this.debugLog('Waiting for pending authentication...');
+            this.logger.debug('Waiting for pending authentication...');
             return pendingPromise;
         }
 
         // No cached token - need to do full authentication (handshake + get_profile)
         // Don't trust stored tokens as they may be from a different session
         if (!playlist.portalUrl || !playlist.macAddress) {
-            console.error('[StalkerSession] Missing portal URL or MAC address');
+            this.logger.error('Missing portal URL or MAC address');
             throw new Error('Portal URL and MAC address are required');
         }
         const portalUrl = playlist.portalUrl;
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts b/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts
index 9b2cc4c99..c37614014 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.spec.ts
@@ -245,6 +245,13 @@ describe('stalker-vod.utils regressions', () => {
                 rating_imdb: '',
                 rating_kinopoisk: '8.1',
                 tmdb_cast: tmdbCast,
+                tmdb_directors: [
+                    {
+                        name: 'Eric Kripke',
+                        profileUrl: null,
+                        tmdbPersonId: 1216630,
+                    },
+                ],
                 tmdb_backdrop: 'https://image.tmdb.org/t/p/w1280/boys.jpg',
                 tmdb_trailer: 'abc123def',
                 tmdb_recommendations: tmdbRecommendations,
@@ -252,6 +259,7 @@ describe('stalker-vod.utils regressions', () => {
         });
 
         expect(info.tmdb_cast).toEqual(tmdbCast);
+        expect(info.tmdb_directors?.[0]?.name).toBe('Eric Kripke');
         expect(info.tmdb_backdrop).toBe(
             'https://image.tmdb.org/t/p/w1280/boys.jpg'
         );
diff --git a/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts b/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts
index 987cf755c..b70c28e65 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker-vod.utils.ts
@@ -158,6 +158,10 @@ export function createStalkerInfo(item: StalkerVodSource): StalkerVodInfo {
         // views normalize the selected item on every render
         ...(info.tmdb_id ? { tmdb_id: info.tmdb_id } : {}),
         ...(info.tmdb_cast ? { tmdb_cast: info.tmdb_cast } : {}),
+        ...(info.tmdb_directors
+            ? { tmdb_directors: info.tmdb_directors }
+            : {}),
+        ...(info.tmdb_status ? { tmdb_status: info.tmdb_status } : {}),
         ...(info.tmdb_backdrop ? { tmdb_backdrop: info.tmdb_backdrop } : {}),
         ...(info.tmdb_trailer ? { tmdb_trailer: info.tmdb_trailer } : {}),
         ...(info.tmdb_recommendations
diff --git a/libs/portal/stalker/data-access/src/lib/stalker.store.ts b/libs/portal/stalker/data-access/src/lib/stalker.store.ts
index 19bb69a6c..2c30ca67d 100644
--- a/libs/portal/stalker/data-access/src/lib/stalker.store.ts
+++ b/libs/portal/stalker/data-access/src/lib/stalker.store.ts
@@ -8,6 +8,7 @@ import {
     withStalkerRecent,
     withStalkerSelection,
     withStalkerSeries,
+    withStalkerSnapshotRefresh,
 } from './stores/features';
 
 /**
@@ -18,6 +19,7 @@ export const StalkerStore = signalStore(
     { providedIn: 'root' },
     withStalkerPortal(),
     withStalkerSelection(),
+    withStalkerSnapshotRefresh(),
     withStalkerContent(),
     withStalkerSeries(),
     withStalkerPlayer(),
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/index.ts b/libs/portal/stalker/data-access/src/lib/stores/features/index.ts
index 264f02961..81f0ebf8e 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/index.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/index.ts
@@ -6,4 +6,5 @@ export * from './with-stalker-portal.feature';
 export * from './with-stalker-recent.feature';
 export * from './with-stalker-selection.feature';
 export * from './with-stalker-series.feature';
+export * from './with-stalker-snapshot-refresh.feature';
 
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.spec.ts
index 39af80336..00ab9e8da 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.spec.ts
@@ -1,8 +1,11 @@
+import { signal } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { patchState, signalStore, withMethods, withState } from '@ngrx/signals';
 import { TranslateService } from '@ngx-translate/core';
 import { DataService } from '@iptvnator/services';
 import { PlaylistMeta, StalkerPortalActions } from '@iptvnator/shared/interfaces';
+import { StalkerItvChannel } from '../../models';
+import { StalkerItvCacheService } from '../../stalker-itv-cache.service';
 import { StalkerSessionService } from '../../stalker-session.service';
 import { withStalkerContent } from './with-stalker-content.feature';
 
@@ -101,6 +104,29 @@ async function waitForCondition(
     throw new Error('Timed out waiting for resource activity');
 }
 
+/**
+ * Controllable stand-in for StalkerItvCacheService so the legacy paged flow
+ * can be tested in isolation and the cache-served flow deterministically.
+ */
+function createItvCacheMock(initialChannels: StalkerItvChannel[] | null = null) {
+    const version = signal(0);
+    let channels = initialChannels;
+
+    return {
+        versionFor: jest.fn(() => version()),
+        getChannels: jest.fn(() => channels),
+        ensureLoaded: jest.fn().mockResolvedValue(undefined),
+        refresh: jest.fn().mockResolvedValue(undefined),
+        isReady: jest.fn(() => channels !== null),
+        isLoading: jest.fn(() => false),
+        progressOf: jest.fn(() => null),
+        setChannels(next: StalkerItvChannel[] | null) {
+            channels = next;
+            version.update((value) => value + 1);
+        },
+    };
+}
+
 describe('withStalkerContent failure states', () => {
     let store: InstanceType<typeof TestContentStore>;
     let dataService: {
@@ -116,6 +142,10 @@ describe('withStalkerContent failure states', () => {
             providers: [
                 TestContentStore,
                 { provide: DataService, useValue: dataService },
+                {
+                    provide: StalkerItvCacheService,
+                    useValue: createItvCacheMock(),
+                },
                 {
                     provide: StalkerSessionService,
                     useValue: {
@@ -461,3 +491,266 @@ describe('withStalkerContent failure states', () => {
         expect(store.getPaginatedContent()[0]?.name).toBe('Page 1 restored');
     });
 });
+
+describe('withStalkerContent full ITV channel list cache', () => {
+    const CACHED_CHANNELS: StalkerItvChannel[] = [
+        { id: '1', cmd: 'ffrt http://x/1', name: 'News One', tv_genre_id: '5' },
+        { id: '2', cmd: 'ffrt http://x/2', name: 'Sports HD', tv_genre_id: '9' },
+        { id: '3', cmd: 'ffrt http://x/3', name: 'News Two', tv_genre_id: '5' },
+    ];
+
+    let store: InstanceType<typeof TestContentStore>;
+    let dataService: {
+        sendIpcEvent: jest.Mock<Promise<unknown>, unknown[]>;
+    };
+    let itvCache: ReturnType<typeof createItvCacheMock>;
+
+    function setup(initialChannels: StalkerItvChannel[] | null) {
+        dataService = {
+            sendIpcEvent: jest.fn(),
+        };
+        itvCache = createItvCacheMock(initialChannels);
+
+        TestBed.configureTestingModule({
+            providers: [
+                TestContentStore,
+                { provide: DataService, useValue: dataService },
+                { provide: StalkerItvCacheService, useValue: itvCache },
+                {
+                    provide: StalkerSessionService,
+                    useValue: {
+                        makeAuthenticatedRequest: jest.fn(),
+                    },
+                },
+                {
+                    provide: TranslateService,
+                    useValue: {
+                        instant: jest.fn((key: string) => key),
+                    },
+                },
+            ],
+        });
+
+        store = TestBed.inject(TestContentStore);
+    }
+
+    function enterItvCategory(categoryId: string) {
+        store.setSelectedContentType('itv');
+        store.setCategories('itv', [
+            { category_id: '5', category_name: 'News' },
+            { category_id: '9', category_name: 'Sports' },
+        ]);
+        store.setSelectedCategory(categoryId);
+        store.setCurrentPlaylist(PLAYLIST);
+        void store.isPaginatedContentLoading();
+    }
+
+    it('serves the whole category from the cache without portal requests', async () => {
+        setup(CACHED_CHANNELS);
+        enterItvCategory('5');
+
+        await waitForCondition(() => store.itvChannels().length === 2);
+
+        expect(store.itvChannels().map((channel) => channel.name)).toEqual([
+            'News One',
+            'News Two',
+        ]);
+        expect(store.totalCount()).toBe(2);
+        expect(store.hasMoreChannels()).toBe(false);
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('serves all channels for the "*" category so search can cover everything', async () => {
+        setup(CACHED_CHANNELS);
+        enterItvCategory('*');
+
+        await waitForCondition(() => store.itvChannels().length === 3);
+
+        // Regression for the "search only finds the first 14 loaded items"
+        // bug: the full list is available at once, no paging required.
+        expect(store.itvChannels()).toHaveLength(3);
+        expect(store.hasMoreChannels()).toBe(false);
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('falls back to the legacy paged fetch for a genre absent from the cache (censored/adult)', async () => {
+        setup(CACHED_CHANNELS);
+        dataService.sendIpcEvent.mockResolvedValue({
+            js: {
+                data: [
+                    {
+                        id: 'adult-1',
+                        name: 'Adult One',
+                        cmd: 'ffrt http://x/adult-1',
+                    },
+                ],
+                total_items: 40,
+            },
+        });
+
+        // Genre '19' has no channels in the cached full list.
+        store.setSelectedContentType('itv');
+        store.setCategories('itv', [
+            { category_id: '5', category_name: 'News' },
+            { category_id: '19', category_name: 'For adults', censored: true },
+        ]);
+        store.setSelectedCategory('19');
+        store.setCurrentPlaylist(PLAYLIST);
+        void store.isPaginatedContentLoading();
+
+        await waitForCondition(() => store.itvChannels().length === 1);
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                params: expect.objectContaining({
+                    action: StalkerPortalActions.GetOrderedList,
+                    type: 'itv',
+                    genre: '19',
+                    p: 1,
+                }),
+            })
+        );
+        expect(store.itvChannels()[0]?.name).toBe('Adult One');
+        // Portal pagination stays in charge for this genre.
+        expect(store.hasMoreChannels()).toBe(true);
+    });
+
+    it('reports whether the selected category is served from the cache', () => {
+        setup(CACHED_CHANNELS);
+        enterItvCategory('5');
+        expect(store.itvSelectedCategoryFromCache()).toBe(true);
+
+        store.setSelectedCategory('*');
+        expect(store.itvSelectedCategoryFromCache()).toBe(true);
+
+        // Genre with zero cached channels — e.g. a censored/adult category.
+        store.setSelectedCategory('19');
+        expect(store.itvSelectedCategoryFromCache()).toBe(false);
+    });
+
+    it('omits genres without cached channels from the count map (adult genres)', () => {
+        setup(CACHED_CHANNELS);
+        store.setSelectedContentType('itv');
+        store.setCategories('itv', [
+            { category_id: '*', category_name: 'All' },
+            { category_id: '5', category_name: 'News' },
+            { category_id: '19', category_name: 'For adults', censored: true },
+        ]);
+        store.setCurrentPlaylist(PLAYLIST);
+
+        const counts = store.itvCategoryItemCounts();
+        expect(counts.get(5)).toBe(2);
+        // Adult genres are excluded from get_all_channels — regardless of any
+        // `censored` flag — so their count is unknown: no entry, no badge.
+        expect(counts.has(19)).toBe(false);
+    });
+
+    it('preloadItvChannels kicks off the cache load for the current playlist', () => {
+        setup(null);
+        store.setCurrentPlaylist(PLAYLIST);
+
+        store.preloadItvChannels();
+
+        expect(itvCache.ensureLoaded).toHaveBeenCalledWith(PLAYLIST);
+    });
+
+    it('exposes per-genre channel counts for category badges (with the total under the "All" key)', () => {
+        setup(CACHED_CHANNELS);
+        enterItvCategory('*');
+
+        const counts = store.itvCategoryItemCounts();
+        // Two channels in genre 5, one in genre 9.
+        expect(counts.get(5)).toBe(2);
+        expect(counts.get(9)).toBe(1);
+        // "All" category is category_id '*' → Number('*') is NaN; the grand
+        // total lives under the NaN key so the "All" row shows every channel.
+        expect(counts.get(Number.NaN)).toBe(3);
+    });
+
+    it('has an empty count map when no full list is cached', () => {
+        setup(null);
+        enterItvCategory('*');
+
+        const counts = store.itvCategoryItemCounts();
+        // No genre entries at all — counts are unknown without the cache.
+        expect(counts.get(5)).toBeUndefined();
+        expect(counts.get(Number.NaN)).toBe(0);
+    });
+
+    it('drops a stale legacy page response that resolves after the cache took over', async () => {
+        setup(null);
+        const legacyResponse = createDeferred<unknown>();
+        dataService.sendIpcEvent.mockReturnValue(legacyResponse.promise);
+
+        enterItvCategory('5');
+
+        await waitForCondition(
+            () => dataService.sendIpcEvent.mock.calls.length > 0
+        );
+
+        // The background full-list load finishes while the legacy page-1
+        // request is still in flight; the resource re-fires and serves the
+        // complete category from the cache.
+        itvCache.setChannels(CACHED_CHANNELS);
+        await waitForCondition(() => store.itvChannels().length === 2);
+
+        // The late legacy response must not overwrite the full list with the
+        // first 14-item page again.
+        legacyResponse.resolve({
+            js: {
+                data: [
+                    {
+                        id: 'legacy-1',
+                        name: 'Legacy page one',
+                        cmd: 'ffrt http://x/legacy',
+                    },
+                ],
+                total_items: 28,
+            },
+        });
+        await flushResources();
+
+        expect(store.itvChannels().map((channel) => channel.name)).toEqual([
+            'News One',
+            'News Two',
+        ]);
+        expect(store.hasMoreChannels()).toBe(false);
+    });
+
+    it('kicks off a background full-list load and swaps it in once ready', async () => {
+        setup(null);
+        dataService.sendIpcEvent.mockResolvedValue({
+            js: {
+                data: [
+                    {
+                        id: 'legacy-1',
+                        name: 'Legacy page one',
+                        cmd: 'ffrt http://x/legacy',
+                    },
+                ],
+                total_items: 28,
+            },
+        });
+
+        enterItvCategory('5');
+
+        await waitForCondition(() => store.itvChannels().length === 1);
+
+        // Legacy paged flow stays in charge while the cache is cold.
+        expect(store.itvChannels()[0]?.name).toBe('Legacy page one');
+        expect(store.hasMoreChannels()).toBe(true);
+        expect(itvCache.ensureLoaded).toHaveBeenCalledWith(PLAYLIST);
+
+        // Full list finished loading in the background.
+        itvCache.setChannels(CACHED_CHANNELS);
+
+        await waitForCondition(() => store.itvChannels().length === 2);
+
+        expect(store.itvChannels().map((channel) => channel.name)).toEqual([
+            'News One',
+            'News Two',
+        ]);
+        expect(store.hasMoreChannels()).toBe(false);
+    });
+});
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.ts
index d4b3bffe4..567152ec3 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-content.feature.ts
@@ -17,6 +17,7 @@ import {
     StalkerVodSource,
 } from '../../models';
 import { StalkerContentTypes } from '../../stalker-content-types';
+import { StalkerItvCacheService } from '../../stalker-itv-cache.service';
 import { StalkerSessionService } from '../../stalker-session.service';
 import {
     ResourceState,
@@ -26,6 +27,7 @@ import {
 } from '../stalker-store.contracts';
 import {
     executeStalkerRequest,
+    filterItvChannelsByGenre,
     toStalkerContentItem,
     toStalkerItvChannel,
 } from '../utils';
@@ -64,6 +66,7 @@ const initialContentState: StalkerContentState = {
 interface StalkerCategoryResponseItem {
     id?: string | number;
     title?: string;
+    censored?: string | number;
 }
 
 interface StalkerCategoryResponse {
@@ -191,7 +194,8 @@ export function withStalkerContent() {
                 store,
                 dataService = inject(DataService),
                 stalkerSession = inject(StalkerSessionService),
-                translateService = inject(TranslateService)
+                translateService = inject(TranslateService),
+                itvCache = inject(StalkerItvCacheService)
             ) => {
                 const storeContext = store as typeof store &
                     StalkerContentResourceStoreContract;
@@ -269,6 +273,9 @@ export function withStalkerContent() {
                                     (item): StalkerCategoryItem => ({
                                         category_name: item.title ?? '',
                                         category_id: String(item.id),
+                                        censored:
+                                            item.censored === 1 ||
+                                            item.censored === '1',
                                     })
                                 );
                                 const categories = prependAllCategory(
@@ -325,6 +332,17 @@ export function withStalkerContent() {
                             search: storeContext.searchPhrase(),
                             pageIndex: storeContext.page() + 1,
                             currentPlaylist: storeContext.currentPlaylist(),
+                            // Re-fires the loader once THIS portal's full ITV
+                            // channel list finishes loading or is refreshed.
+                            // Read only for ITV and scoped per-portal so a
+                            // different portal's (or a radio/vod) load never
+                            // re-fires and re-appends this resource's page.
+                            itvCacheVersion:
+                                storeContext.selectedContentType() === 'itv'
+                                    ? itvCache.versionFor(
+                                          storeContext.currentPlaylist()
+                                      )
+                                    : 0,
                             availableCategoryCount: getCategoriesByType(
                                 store,
                                 storeContext.selectedContentType()
@@ -376,6 +394,45 @@ export function withStalkerContent() {
                             }
 
                             const categoryParam = params.category || '*';
+
+                            if (params.contentType === 'itv') {
+                                const cachedChannels =
+                                    itvCache.getChannels(playlist);
+                                const channels =
+                                    cachedChannels !== null
+                                        ? filterItvChannelsByGenre(
+                                              cachedChannels,
+                                              categoryParam
+                                          )
+                                        : null;
+                                // Serve from the cache only when it actually
+                                // has channels for this genre. Censored (adult)
+                                // genres are typically EXCLUDED from
+                                // get_all_channels by the portal, so an empty
+                                // filter result falls through to the legacy
+                                // paged fetch, which still returns them.
+                                if (
+                                    channels !== null &&
+                                    (categoryParam === '*' ||
+                                        channels.length > 0)
+                                ) {
+                                    patchState(store, {
+                                        totalCount: channels.length,
+                                        paginatedContent: channels,
+                                        itvChannels: channels,
+                                        hasMoreChannels: false,
+                                        contentError: null,
+                                    });
+                                    return channels;
+                                }
+
+                                // Full-list load runs in the background; the
+                                // resource re-fires via `itvCacheVersion` once
+                                // the cache is ready. Until then the legacy
+                                // paged flow below serves the first pages.
+                                void itvCache.ensureLoaded(playlist);
+                            }
+
                             const paramsPlaylistKey =
                                 params.currentPlaylist?._id ??
                                 params.currentPlaylist?.portalUrl ??
@@ -397,7 +454,18 @@ export function withStalkerContent() {
                                         storeContext.searchPhrase() &&
                                     params.pageIndex ===
                                         storeContext.page() + 1 &&
-                                    paramsPlaylistKey === currentPlaylistKey
+                                    paramsPlaylistKey === currentPlaylistKey &&
+                                    // A legacy paged response must not overwrite
+                                    // the full cached list that a re-fired
+                                    // loader served in the meantime. Scoped
+                                    // per-portal and to ITV so another portal's
+                                    // load never invalidates this response.
+                                    params.itvCacheVersion ===
+                                        (params.contentType === 'itv'
+                                            ? itvCache.versionFor(
+                                                  currentPlaylist
+                                              )
+                                            : 0)
                                 );
                             };
                             const queryParams: Record<string, string | number> =
@@ -535,8 +603,94 @@ export function withStalkerContent() {
         withComputed((store) => {
             const storeContext = store as typeof store &
                 StalkerContentResourceStoreContract;
+            const itvCache = inject(StalkerItvCacheService);
+
+            /**
+             * The whole portal's ITV channel list (all categories) when
+             * cached. `versionFor` establishes the reactive dependency so this
+             * recomputes when the list becomes ready or is refreshed.
+             */
+            const itvFullChannelList = computed(() => {
+                const playlist = storeContext.currentPlaylist();
+                itvCache.versionFor(playlist);
+                return itvCache.getChannels(playlist) ?? [];
+            });
+
+            /**
+             * Per-genre channel counts for ITV category badges, keyed by
+             * numeric `tv_genre_id` (mirrors the Xtream count map). Only
+             * populated when the full list is cached. The "All" pseudo
+             * category has id `'*'` → `Number('*')` is NaN, and a Map keys
+             * NaN by SameValueZero, so the grand total under `NaN` makes the
+             * "All" row show every channel. Genres with NO cached channels
+             * get no entry at all: adult genres are excluded from
+             * `get_all_channels` (with or without a `censored` flag from
+             * `get_genres`), so their real count is unknown and the badge
+             * is omitted rather than showing a misleading "0".
+             */
+            const itvCategoryItemCounts = computed(() => {
+                const counts = new Map<number, number>();
+                const channels = itvFullChannelList();
+                for (const channel of channels) {
+                    const genreId = Number(channel.tv_genre_id);
+                    if (!Number.isNaN(genreId)) {
+                        counts.set(genreId, (counts.get(genreId) ?? 0) + 1);
+                    }
+                }
+                counts.set(Number.NaN, channels.length);
+                return counts;
+            });
 
             return {
+                /** True when the complete ITV channel list is cached, so local search covers all channels. */
+                itvFullListActive: computed(() =>
+                    itvCache.isReady(storeContext.currentPlaylist())
+                ),
+                itvFullListLoading: computed(() =>
+                    itvCache.isLoading(storeContext.currentPlaylist())
+                ),
+                itvFullListProgress: computed(() =>
+                    itvCache.progressOf(storeContext.currentPlaylist())
+                ),
+                /** Exposes the whole portal's ITV channel list so search can span every channel. */
+                itvFullChannelList,
+                /**
+                 * True when the currently selected ITV category can be served
+                 * from the full-list cache. Censored (adult) genres are usually
+                 * excluded from `get_all_channels`, so a genre with zero cached
+                 * channels stays on the legacy paged flow. O(1): reuses the
+                 * memoized per-genre count map instead of re-scanning the list
+                 * on every category click.
+                 */
+                itvSelectedCategoryFromCache: computed(() => {
+                    const playlist = storeContext.currentPlaylist();
+                    if (!itvCache.isReady(playlist)) {
+                        return false;
+                    }
+
+                    const categoryId = storeContext.selectedCategoryId();
+                    if (!categoryId) {
+                        return false;
+                    }
+                    if (categoryId === '*') {
+                        return true;
+                    }
+
+                    const genreId = Number(categoryId);
+                    if (Number.isNaN(genreId)) {
+                        // Non-numeric genre id would collide with the NaN
+                        // "All" total key — fall back to the direct scan.
+                        return (
+                            filterItvChannelsByGenre(
+                                itvFullChannelList(),
+                                categoryId
+                            ).length > 0
+                        );
+                    }
+
+                    return (itvCategoryItemCounts().get(genreId) ?? 0) > 0;
+                }),
+                itvCategoryItemCounts,
                 getTotalPages: computed(() =>
                     Math.ceil(store.totalCount() / storeContext.limit())
                 ),
@@ -600,7 +754,25 @@ export function withStalkerContent() {
                 isCategoryResourceFailed: computed(() => store.categoryError()),
             };
         }),
-        withMethods((store) => ({
+        withMethods((store) => {
+            const storeContext = store as typeof store &
+                StalkerContentResourceStoreContract;
+            const itvCache = inject(StalkerItvCacheService);
+
+            return {
+            /**
+             * Kicks off the full ITV channel list load as soon as the Live TV
+             * section is entered (instead of waiting for the first category
+             * click), so the all-channels view and category count badges are
+             * available immediately. Safe to call repeatedly — the cache
+             * de-duplicates in-flight loads and memoizes unsupported portals.
+             */
+            preloadItvChannels(): void {
+                void itvCache.ensureLoaded(storeContext.currentPlaylist());
+            },
+            async refreshItvChannels(): Promise<void> {
+                await itvCache.refresh(storeContext.currentPlaylist());
+            },
             setCategories(
                 type: StalkerContentType,
                 categories: StalkerCategoryItem[]
@@ -622,6 +794,7 @@ export function withStalkerContent() {
             setRadioChannels(channels: StalkerItvChannel[]) {
                 patchState(store, { radioChannels: channels });
             },
-        }))
+            };
+        })
     );
 }
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.spec.ts
index 499f901d8..355f1aefe 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.spec.ts
@@ -1,6 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { signalStore, withState } from '@ngrx/signals';
 import { DataService, RuntimeCapabilitiesService } from '@iptvnator/services';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { EpgItem, Playlist } from '@iptvnator/shared/interfaces';
 import { StalkerSessionService } from '../../stalker-session.service';
 import { withStalkerEpg } from './with-stalker-epg.feature';
@@ -42,6 +43,11 @@ describe('withStalkerEpg', () => {
     let stalkerSessionService: {
         makeAuthenticatedRequest: jest.Mock<Promise<unknown>, unknown[]>;
     };
+    let epgBridge: {
+        supportsEpgMapping: boolean;
+        getEpgMappingsBatch: jest.Mock<Promise<unknown>, unknown[]>;
+        getChannelPrograms: jest.Mock<Promise<unknown>, unknown[]>;
+    };
 
     beforeEach(() => {
         runtimeSupportsEpg = true;
@@ -51,6 +57,11 @@ describe('withStalkerEpg', () => {
         stalkerSessionService = {
             makeAuthenticatedRequest: jest.fn(),
         };
+        epgBridge = {
+            supportsEpgMapping: true,
+            getEpgMappingsBatch: jest.fn().mockResolvedValue(null),
+            getChannelPrograms: jest.fn().mockResolvedValue(null),
+        };
 
         TestBed.configureTestingModule({
             providers: [
@@ -68,6 +79,10 @@ describe('withStalkerEpg', () => {
                     provide: StalkerSessionService,
                     useValue: stalkerSessionService,
                 },
+                {
+                    provide: EpgRuntimeBridgeService,
+                    useValue: epgBridge,
+                },
             ],
         });
 
@@ -176,6 +191,80 @@ describe('withStalkerEpg', () => {
         expect(store.selectedItvEpgPrograms()).toEqual([]);
         expect(store.isLoadingBulkItvEpg()).toBe(false);
     });
+    describe('applyMappedItvEpg', () => {
+        const MAPPED_PROGRAM = {
+            channel: 'mapped.channel.id',
+            title: 'Mapped Show',
+            desc: 'From uploaded XMLTV',
+            start: '2026-07-11T10:00:00.000Z',
+            stop: '2026-07-11T11:00:00.000Z',
+        };
+
+        it('overlays uploaded XMLTV programs for mapped channels', async () => {
+            epgBridge.getEpgMappingsBatch.mockResolvedValue({
+                'stalker:playlist-1:10001': 'mapped.channel.id',
+            });
+            epgBridge.getChannelPrograms.mockResolvedValue([MAPPED_PROGRAM]);
+
+            await store.applyMappedItvEpg(['10001', '10002']);
+
+            expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledTimes(1);
+            expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledWith([
+                'stalker:playlist-1:10001',
+                'stalker:playlist-1:10002',
+            ]);
+            expect(store.bulkItvEpgByChannel()['10001']).toEqual([
+                { ...MAPPED_PROGRAM, channel: '10001' },
+            ]);
+            expect(store.selectedItvEpgPrograms()).toEqual([
+                { ...MAPPED_PROGRAM, channel: '10001' },
+            ]);
+        });
+
+        it('checks each channel id only once per playlist session', async () => {
+            epgBridge.getEpgMappingsBatch.mockResolvedValue({});
+
+            await store.applyMappedItvEpg(['10001']);
+            await store.applyMappedItvEpg(['10001']);
+
+            expect(epgBridge.getEpgMappingsBatch).toHaveBeenCalledTimes(1);
+        });
+
+        it('keeps overrides when ensureBulkItvEpg replaces the bulk record', async () => {
+            epgBridge.getEpgMappingsBatch.mockResolvedValue({
+                'stalker:playlist-1:10001': 'mapped.channel.id',
+            });
+            epgBridge.getChannelPrograms.mockResolvedValue([MAPPED_PROGRAM]);
+            await store.applyMappedItvEpg(['10001']);
+
+            dataService.sendIpcEvent.mockResolvedValue({
+                js: {
+                    '10002': [
+                        {
+                            name: 'Portal Show',
+                            start_timestamp: 1_752_220_800,
+                            stop_timestamp: 1_752_224_400,
+                        },
+                    ],
+                },
+            });
+            await store.ensureBulkItvEpg(168);
+
+            const record = store.bulkItvEpgByChannel();
+            expect(record['10001']).toEqual([
+                { ...MAPPED_PROGRAM, channel: '10001' },
+            ]);
+            expect(record['10002']?.length).toBeGreaterThan(0);
+        });
+
+        it('does nothing when the mapping bridge is unsupported', async () => {
+            epgBridge.supportsEpgMapping = false;
+
+            await store.applyMappedItvEpg(['10001']);
+
+            expect(epgBridge.getEpgMappingsBatch).not.toHaveBeenCalled();
+        });
+    });
 });
 
 function buildEntry(
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.ts
index ce0748177..02b0110bb 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-epg.feature.ts
@@ -6,9 +6,11 @@ import {
     withMethods,
     withState,
 } from '@ngrx/signals';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { createLogger } from '@iptvnator/portal/shared/util';
 import { DataService, RuntimeCapabilitiesService } from '@iptvnator/services';
 import {
+    buildStalkerEpgMappingKey,
     EpgItem,
     EpgProgram,
     StalkerPortalActions,
@@ -99,7 +101,8 @@ export function withStalkerEpg() {
                 store,
                 dataService = inject(DataService),
                 stalkerSession = inject(StalkerSessionService),
-                runtime = inject(RuntimeCapabilitiesService)
+                runtime = inject(RuntimeCapabilitiesService),
+                epgBridge = inject(EpgRuntimeBridgeService)
             ) => {
                 const storeContext = store as typeof store &
                     StalkerEpgFeatureStoreContract;
@@ -109,6 +112,31 @@ export function withStalkerEpg() {
                 };
                 const supportsEpg = (): boolean => runtime.supportsEpg;
 
+                // Manual EPG mapping overrides (uploaded XMLTV programs keyed
+                // by the normalized Stalker channel id). Kept outside the
+                // signal state so ensureBulkItvEpg can merge them back in
+                // whenever it replaces the bulk record.
+                const mappingOverridesById = new Map<string, EpgProgram[]>();
+                const mappingCheckedIds = new Set<string>();
+                let mappingPlaylistId: string | null = null;
+
+                const resetMappingOverrides = (): void => {
+                    mappingOverridesById.clear();
+                    mappingCheckedIds.clear();
+                    mappingPlaylistId = null;
+                };
+
+                const mappingOverridesRecord = (): Record<
+                    string,
+                    EpgProgram[]
+                > => {
+                    const record: Record<string, EpgProgram[]> = {};
+                    for (const [id, programs] of mappingOverridesById) {
+                        record[id] = programs;
+                    }
+                    return record;
+                };
+
                 const requestEpg = async (
                     playlist: NonNullable<
                         ReturnType<
@@ -229,21 +257,151 @@ export function withStalkerEpg() {
                             );
 
                             patchState(store, {
-                                bulkItvEpgByChannel: bulkPrograms,
+                                bulkItvEpgByChannel: {
+                                    ...bulkPrograms,
+                                    ...mappingOverridesRecord(),
+                                },
                                 bulkItvEpgLoaded: true,
                                 isLoadingBulkItvEpg: false,
                             });
                         } catch (error) {
                             logger.warn('Bulk Stalker EPG unavailable', error);
                             patchState(store, {
-                                bulkItvEpgByChannel: {},
+                                bulkItvEpgByChannel: mappingOverridesRecord(),
                                 bulkItvEpgLoaded: true,
                                 isLoadingBulkItvEpg: false,
                             });
                         }
                     },
 
+                    /**
+                     * Overlay manual EPG mappings for the given Stalker
+                     * channel ids onto the bulk ITV record. Each id is
+                     * checked at most once per playlist session; channels
+                     * with a saved mapping get their programs from the
+                     * uploaded XMLTV guide instead of the portal EPG, which
+                     * feeds both the active EPG panel and the row previews.
+                     */
+                    async applyMappedItvEpg(
+                        channelIds: ReadonlyArray<string | number>
+                    ): Promise<void> {
+                        if (!epgBridge.supportsEpgMapping || !supportsEpg()) {
+                            return;
+                        }
+                        const playlist = storeContext.currentPlaylist();
+                        if (!playlist?._id) {
+                            return;
+                        }
+                        const playlistId = String(playlist._id);
+                        if (mappingPlaylistId !== playlistId) {
+                            resetMappingOverrides();
+                            mappingPlaylistId = playlistId;
+                        }
+
+                        const freshIds = [
+                            ...new Set(
+                                channelIds
+                                    .map((id) => normalizeStalkerEntityId(id))
+                                    .filter(
+                                        (id) =>
+                                            id && !mappingCheckedIds.has(id)
+                                    )
+                            ),
+                        ];
+                        if (freshIds.length === 0) {
+                            return;
+                        }
+
+                        // The store is a root singleton, so an in-flight
+                        // call can outlive a portal switch — bail out after
+                        // every await instead of writing portal A's data
+                        // into portal B's state.
+                        const isStale = (): boolean =>
+                            mappingPlaylistId !== playlistId ||
+                            String(
+                                storeContext.currentPlaylist()?._id ?? ''
+                            ) !== playlistId;
+
+                        const keyById = new Map(
+                            freshIds.map(
+                                (id) =>
+                                    [
+                                        id,
+                                        buildStalkerEpgMappingKey(
+                                            playlistId,
+                                            id
+                                        ),
+                                    ] as const
+                            )
+                        );
+
+                        let mappings: Record<string, string> | null = null;
+                        try {
+                            mappings = await epgBridge.getEpgMappingsBatch([
+                                ...keyById.values(),
+                            ]);
+                        } catch (error) {
+                            // Nothing is marked checked — the next
+                            // invocation retries the lookup.
+                            logger.warn(
+                                'Stalker EPG mapping lookup failed',
+                                error
+                            );
+                            return;
+                        }
+                        if (!mappings || isStale()) {
+                            return;
+                        }
+
+                        let changed = false;
+                        for (const [channelId, key] of keyById) {
+                            const mappedEpgId = mappings[key]?.trim();
+                            if (!mappedEpgId) {
+                                // No mapping for this channel — a stable
+                                // outcome, safe to dedupe.
+                                mappingCheckedIds.add(channelId);
+                                continue;
+                            }
+                            try {
+                                const programs =
+                                    (await epgBridge.getChannelPrograms(
+                                        mappedEpgId
+                                    )) ?? [];
+                                if (isStale()) {
+                                    return;
+                                }
+                                mappingCheckedIds.add(channelId);
+                                if (programs.length === 0) {
+                                    continue;
+                                }
+                                mappingOverridesById.set(
+                                    channelId,
+                                    programs.map((program) => ({
+                                        ...program,
+                                        channel: channelId,
+                                    }))
+                                );
+                                changed = true;
+                            } catch {
+                                // Transient failure — leave the id
+                                // unchecked so a later call retries; the
+                                // portal EPG stays in place meanwhile.
+                            }
+                        }
+                        if (!changed || isStale()) {
+                            return;
+                        }
+
+                        patchState(store, {
+                            bulkItvEpgByChannel: {
+                                ...store.bulkItvEpgByChannel(),
+                                ...mappingOverridesRecord(),
+                            },
+                        });
+                    },
+
                     clearBulkItvEpgCache(): void {
+                        resetMappingOverrides();
                         patchState(store, initialEpgState);
                     },
                 };
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.spec.ts
index 54c3f1856..c609a4ab1 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.spec.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.spec.ts
@@ -49,7 +49,93 @@ describe('withStalkerSelection', () => {
         });
 
         expect(store.selectedVodId()).toBe('55');
-        expect(store.selectedSerialId()).toBe('55');
         expect(store.selectedItvId()).toBe('55');
     });
+
+    it('sets the serial id for a regular series selection', () => {
+        store.setSelectedContentType('series');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'Regular series',
+        });
+
+        expect(store.selectedSerialId()).toBe('55');
+    });
+
+    it('does not set the serial id for a plain VOD selection', () => {
+        store.setSelectedContentType('vod');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'Plain movie',
+        });
+
+        expect(store.selectedSerialId()).toBeUndefined();
+        expect(store.selectedVodId()).toBe('55');
+    });
+
+    it('does not set the serial id for items with embedded series episodes', () => {
+        // vclub items carry their episodes inline and are always opened
+        // under the VOD content type.
+        store.setSelectedContentType('vod');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'Embedded series',
+            series: [1, 2, 3],
+        });
+
+        expect(store.selectedSerialId()).toBeUndefined();
+    });
+
+    it('still sets the serial id for a series selection carrying is_series', () => {
+        // Under the `series` content type the seasons API is the only
+        // episode source, so the fetch must not be gated on item shape.
+        store.setSelectedContentType('series');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'Series flagged is_series',
+            is_series: '1',
+        });
+
+        expect(store.selectedSerialId()).toBe('55');
+    });
+
+    it('still sets the serial id for a series selection carrying series[]', () => {
+        store.setSelectedContentType('series');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'Series carrying series[]',
+            series: [1, 2, 3],
+        });
+
+        expect(store.selectedSerialId()).toBe('55');
+    });
+
+    it('does not set the serial id for Ministra VOD-series items', () => {
+        store.setSelectedContentType('vod');
+
+        store.setSelectedItem({
+            id: '55',
+            name: 'VOD series',
+            is_series: '1',
+        });
+
+        expect(store.selectedSerialId()).toBeUndefined();
+    });
+
+    it('clears a stale serial id when a non-series item is selected', () => {
+        store.setSelectedContentType('series');
+        store.setSelectedItem({ id: '55', name: 'Regular series' });
+        expect(store.selectedSerialId()).toBe('55');
+
+        store.setSelectedContentType('vod');
+        store.setSelectedItem({ id: '77', name: 'Plain movie' });
+
+        expect(store.selectedSerialId()).toBeUndefined();
+        expect(store.selectedVodId()).toBe('77');
+    });
 });
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.ts
index 064aa2d56..618956b63 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-selection.feature.ts
@@ -102,9 +102,18 @@ export function withStalkerSelection() {
                     selectedIdRaw !== undefined
                         ? normalizeStalkerEntityId(selectedIdRaw)
                         : undefined;
+                // serialSeasonsResource fetches regular-series seasons
+                // (get_ordered_list&type=series) on every selectedSerialId
+                // change, and it is the only episode source for a `series`
+                // selection. Every other content type resolves episodes
+                // elsewhere — embedded series[] and Ministra is_series items
+                // are always opened as `vod` — so carrying the id there only
+                // fires a portal request whose result is discarded.
+                const contentType = store.selectedContentType();
                 patchState(store, {
                     selectedVodId: selectedId,
-                    selectedSerialId: selectedId,
+                    selectedSerialId:
+                        contentType === 'series' ? selectedId : undefined,
                     selectedItvId: selectedId,
                     selectedItem,
                 });
@@ -112,7 +121,6 @@ export function withStalkerSelection() {
                 // Async, best-effort TMDB enrichment for VOD/series detail
                 // selections. Applies via patchState (not setSelectedItem)
                 // so the hook cannot recurse; live/radio items are skipped.
-                const contentType = store.selectedContentType();
                 if (
                     selectedItem &&
                     (contentType === 'vod' || contentType === 'series')
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-series.feature.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-series.feature.spec.ts
new file mode 100644
index 000000000..976d7b50d
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-series.feature.spec.ts
@@ -0,0 +1,224 @@
+import { TestBed } from '@angular/core/testing';
+import { patchState, signalStore, withMethods, withState } from '@ngrx/signals';
+import { DataService, TmdbEnrichmentService } from '@iptvnator/services';
+import { PlaylistMeta, StalkerPortalActions } from '@iptvnator/shared/interfaces';
+import { StalkerSessionService } from '../../stalker-session.service';
+import { withStalkerSelection } from './with-stalker-selection.feature';
+import { withStalkerSeries } from './with-stalker-series.feature';
+
+jest.mock('@iptvnator/portal/shared/util', () => ({
+    createLogger: () => ({
+        debug: jest.fn(),
+        info: jest.fn(),
+        warn: jest.fn(),
+        error: jest.fn(),
+    }),
+}));
+
+const PLAYLIST = {
+    _id: 'playlist-1',
+    title: 'Demo Stalker',
+    count: 0,
+    autoRefresh: false,
+    importDate: '2026-04-14T00:00:00.000Z',
+    portalUrl: 'http://demo.example/stalker_portal/server/load.php',
+    macAddress: '00:1A:79:00:00:01',
+    isFullStalkerPortal: false,
+} as PlaylistMeta;
+
+const TestSeriesStore = signalStore(
+    withState({
+        currentPlaylist: undefined as PlaylistMeta | undefined,
+    }),
+    withMethods((store) => ({
+        setCurrentPlaylist(playlist: PlaylistMeta | undefined) {
+            patchState(store, { currentPlaylist: playlist });
+        },
+    })),
+    withStalkerSelection(),
+    withStalkerSeries()
+);
+
+async function flushResources(): Promise<void> {
+    TestBed.flushEffects();
+    await Promise.resolve();
+    await Promise.resolve();
+    TestBed.flushEffects();
+    await Promise.resolve();
+}
+
+async function waitForCondition(
+    predicate: () => boolean,
+    attempts = 20
+): Promise<void> {
+    for (let index = 0; index < attempts; index += 1) {
+        if (predicate()) {
+            return;
+        }
+
+        await flushResources();
+    }
+
+    throw new Error('Timed out waiting for resource activity');
+}
+
+function seriesRequestCalls(
+    sendIpcEvent: jest.Mock<Promise<unknown>, unknown[]>
+) {
+    return sendIpcEvent.mock.calls.filter(
+        ([, payload]) =>
+            (payload as { params?: { type?: string } })?.params?.type ===
+            'series'
+    );
+}
+
+describe('withStalkerSeries serialSeasonsResource gating', () => {
+    let store: InstanceType<typeof TestSeriesStore>;
+    let dataService: {
+        sendIpcEvent: jest.Mock<Promise<unknown>, unknown[]>;
+    };
+
+    beforeEach(() => {
+        dataService = {
+            sendIpcEvent: jest.fn().mockResolvedValue({ js: [] }),
+        };
+
+        TestBed.configureTestingModule({
+            providers: [
+                TestSeriesStore,
+                { provide: DataService, useValue: dataService },
+                {
+                    provide: StalkerSessionService,
+                    useValue: {
+                        makeAuthenticatedRequest: jest.fn(),
+                    },
+                },
+                {
+                    provide: TmdbEnrichmentService,
+                    useValue: {
+                        isEnabled: () => false,
+                    },
+                },
+            ],
+        });
+
+        store = TestBed.inject(TestSeriesStore);
+        store.setCurrentPlaylist(PLAYLIST);
+        void store.isSerialSeasonsLoading();
+        void store.isVodSeriesSeasonsLoading();
+    });
+
+    it('fetches seasons for a regular series selection', async () => {
+        dataService.sendIpcEvent.mockResolvedValue({
+            js: [{ id: '42:1', name: 'Season 1', series: [1, 2] }],
+        });
+
+        store.setSelectedContentType('series');
+        store.setSelectedItem({ id: '42', name: 'Regular series' });
+
+        await waitForCondition(
+            () => seriesRequestCalls(dataService.sendIpcEvent).length > 0
+        );
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                url: PLAYLIST.portalUrl,
+                macAddress: PLAYLIST.macAddress,
+                params: expect.objectContaining({
+                    action: StalkerPortalActions.GetOrderedList,
+                    type: 'series',
+                    movie_id: '42',
+                }),
+            })
+        );
+    });
+
+    it('does not fire a series request for a plain VOD selection', async () => {
+        store.setSelectedContentType('vod');
+        store.setSelectedItem({ id: '7', name: 'Plain movie' });
+
+        await flushResources();
+        await flushResources();
+
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('does not fire a series request for an item with embedded series episodes', async () => {
+        // vclub items carry their episodes inline and are always opened
+        // under the VOD content type, where the seasons API is not the
+        // episode source.
+        store.setSelectedContentType('vod');
+        store.setSelectedItem({
+            id: '9',
+            name: 'Embedded series',
+            series: [1, 2, 3],
+        });
+
+        await flushResources();
+        await flushResources();
+
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('still fetches seasons for a series selection carrying is_series', async () => {
+        // Regression guard: under the `series` content type the detail view
+        // renders <app-stalker-series-view /> without a vodWithSeries input,
+        // so serialSeasonsResource is the only episode source. Gating the
+        // fetch on item shape would render an empty episode list.
+        store.setSelectedContentType('series');
+        store.setSelectedItem({
+            id: '42',
+            name: 'Series flagged is_series',
+            is_series: '1',
+        });
+
+        await waitForCondition(
+            () => seriesRequestCalls(dataService.sendIpcEvent).length > 0
+        );
+
+        expect(
+            seriesRequestCalls(dataService.sendIpcEvent)[0][1]
+        ).toMatchObject({
+            params: expect.objectContaining({
+                type: 'series',
+                movie_id: '42',
+            }),
+        });
+    });
+
+    it('does not fire a series request for a Ministra VOD-series item', async () => {
+        store.setSelectedContentType('vod');
+        store.setSelectedItem({
+            id: '11',
+            name: 'VOD series',
+            is_series: '1',
+        });
+
+        // The legit vod-series season request (type=vod) may fire; the
+        // wasted regular-series request (type=series) must not.
+        await waitForCondition(
+            () => dataService.sendIpcEvent.mock.calls.length > 0
+        );
+        await flushResources();
+
+        expect(seriesRequestCalls(dataService.sendIpcEvent)).toHaveLength(0);
+    });
+
+    it('does not refetch seasons when a VOD item is selected after a series', async () => {
+        store.setSelectedContentType('series');
+        store.setSelectedItem({ id: '42', name: 'Regular series' });
+
+        await waitForCondition(
+            () => seriesRequestCalls(dataService.sendIpcEvent).length === 1
+        );
+
+        store.setSelectedContentType('vod');
+        store.setSelectedItem({ id: '7', name: 'Plain movie' });
+
+        await flushResources();
+        await flushResources();
+
+        expect(seriesRequestCalls(dataService.sendIpcEvent)).toHaveLength(1);
+    });
+});
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.spec.ts
new file mode 100644
index 000000000..6bd6416e0
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.spec.ts
@@ -0,0 +1,283 @@
+import { TestBed } from '@angular/core/testing';
+import { patchState, signalStore, withMethods, withState } from '@ngrx/signals';
+import { DataService } from '@iptvnator/services';
+import { PlaylistMeta } from '@iptvnator/shared/interfaces';
+import { StalkerVodSource } from '../../models';
+import { StalkerSessionService } from '../../stalker-session.service';
+import { withStalkerSnapshotRefresh } from './with-stalker-snapshot-refresh.feature';
+
+const PLAYLIST = {
+    _id: 'portal-1',
+    title: 'Demo Stalker',
+    portalUrl: 'http://demo.example/stalker_portal/server/load.php',
+    macAddress: '00:1A:79:00:00:01',
+} as PlaylistMeta;
+
+const SNAPSHOT: StalkerVodSource = {
+    id: '20001',
+    cmd: '/media/file_20001.mpg',
+    series: [1],
+    category_id: '12',
+    info: { name: 'Embedded Series' },
+};
+
+const TestSnapshotRefreshStore = signalStore(
+    withState<{
+        currentPlaylist: PlaylistMeta | undefined;
+        selectedItem: StalkerVodSource | null | undefined;
+    }>({
+        currentPlaylist: PLAYLIST,
+        selectedItem: SNAPSHOT,
+    }),
+    withMethods((store) => ({
+        setCurrentPlaylist(playlist: PlaylistMeta | undefined) {
+            patchState(store, { currentPlaylist: playlist });
+        },
+        setSelectedItem(selectedItem: StalkerVodSource | null | undefined) {
+            patchState(store, { selectedItem });
+        },
+    })),
+    withStalkerSnapshotRefresh()
+);
+
+describe('withStalkerSnapshotRefresh', () => {
+    let store: InstanceType<typeof TestSnapshotRefreshStore>;
+    let dataService: { sendIpcEvent: jest.Mock };
+
+    const mockPortalRows = (rows: unknown[]) => {
+        dataService.sendIpcEvent.mockResolvedValue({ js: { data: rows } });
+    };
+
+    beforeEach(() => {
+        dataService = { sendIpcEvent: jest.fn() };
+
+        TestBed.configureTestingModule({
+            providers: [
+                TestSnapshotRefreshStore,
+                { provide: DataService, useValue: dataService },
+                { provide: StalkerSessionService, useValue: {} },
+            ],
+        });
+
+        store = TestBed.inject(TestSnapshotRefreshStore);
+    });
+
+    it('patches the selection when new episodes appeared', async () => {
+        mockPortalRows([
+            { id: '20001', cmd: '/media/file_20001.mpg', series: [1, 2] },
+        ]);
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            true
+        );
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                params: expect.objectContaining({
+                    action: 'get_ordered_list',
+                    type: 'vod',
+                    category: '12',
+                    search: 'Embedded Series',
+                }),
+            })
+        );
+        expect(store.selectedItem()?.series).toEqual([1, 2]);
+    });
+
+    it('updates a stale playback cmd even when the episode list is unchanged', async () => {
+        mockPortalRows([
+            { id: '20001', cmd: '/media/file_20001_v2.mpg', series: [1] },
+        ]);
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            true
+        );
+
+        expect(store.selectedItem()?.cmd).toBe('/media/file_20001_v2.mpg');
+    });
+
+    it('does nothing when the portal returns identical data', async () => {
+        mockPortalRows([
+            { id: '20001', cmd: '/media/file_20001.mpg', series: [1] },
+        ]);
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            false
+        );
+
+        expect(store.selectedItem()?.series).toEqual([1]);
+    });
+
+    it('retries with the wildcard category when the snapshot category misses', async () => {
+        dataService.sendIpcEvent
+            .mockResolvedValueOnce({ js: { data: [] } })
+            .mockResolvedValueOnce({
+                js: {
+                    data: [
+                        {
+                            id: '20001',
+                            cmd: '/media/file_20001.mpg',
+                            series: [1, 2, 3],
+                        },
+                    ],
+                },
+            });
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            true
+        );
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledTimes(2);
+        expect(dataService.sendIpcEvent).toHaveBeenLastCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                params: expect.objectContaining({ category: '*' }),
+            })
+        );
+        expect(store.selectedItem()?.series).toEqual([1, 2, 3]);
+    });
+
+    it('searches with the wildcard category when the snapshot category is a routing artifact', async () => {
+        store.setSelectedItem({ ...SNAPSHOT, category_id: 'series' });
+        mockPortalRows([
+            { id: '20001', cmd: '/media/file_20001.mpg', series: [1, 2] },
+        ]);
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            true
+        );
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledTimes(1);
+        expect(dataService.sendIpcEvent).toHaveBeenCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                params: expect.objectContaining({ category: '*' }),
+            })
+        );
+    });
+
+    it('finds the item on a later search page when page 1 is full of other matches', async () => {
+        const filler = Array.from({ length: 14 }, (_, i) => ({
+            id: `9${i}`,
+            series: [1],
+        }));
+        dataService.sendIpcEvent
+            .mockResolvedValueOnce({
+                js: {
+                    data: filler,
+                    total_items: 15,
+                    max_page_items: 14,
+                    total_pages: 2,
+                },
+            })
+            .mockResolvedValueOnce({
+                js: {
+                    data: [
+                        {
+                            id: '20001',
+                            cmd: '/media/file_20001.mpg',
+                            series: [1, 2],
+                        },
+                    ],
+                    total_items: 15,
+                    max_page_items: 14,
+                    total_pages: 2,
+                },
+            });
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            true
+        );
+
+        expect(dataService.sendIpcEvent).toHaveBeenCalledTimes(2);
+        expect(dataService.sendIpcEvent).toHaveBeenLastCalledWith(
+            expect.anything(),
+            expect.objectContaining({
+                params: expect.objectContaining({ p: 2 }),
+            })
+        );
+        expect(store.selectedItem()?.series).toEqual([1, 2]);
+    });
+
+    it('never patches after the active portal changed while the request was in flight', async () => {
+        dataService.sendIpcEvent.mockImplementation(async () => {
+            // Same item id, but the user switched to another portal
+            store.setCurrentPlaylist({
+                ...PLAYLIST,
+                _id: 'portal-2',
+            } as PlaylistMeta);
+            return {
+                js: {
+                    data: [
+                        {
+                            id: '20001',
+                            cmd: '/media/other_portal.mpg',
+                            series: [1, 2, 3, 4],
+                        },
+                    ],
+                },
+            };
+        });
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            false
+        );
+
+        expect(store.selectedItem()?.series).toEqual([1]);
+        expect(store.selectedItem()?.cmd).toBe('/media/file_20001.mpg');
+    });
+
+    it('never patches a selection that changed while the request was in flight', async () => {
+        dataService.sendIpcEvent.mockImplementation(async () => {
+            store.setSelectedItem({
+                id: '99999',
+                series: [1],
+                info: { name: 'Другой сериал' },
+            });
+            return {
+                js: {
+                    data: [
+                        {
+                            id: '20001',
+                            cmd: '/media/file_20001.mpg',
+                            series: [1, 2],
+                        },
+                    ],
+                },
+            };
+        });
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            false
+        );
+
+        expect(store.selectedItem()?.id).toBe('99999');
+        expect(store.selectedItem()?.series).toEqual([1]);
+    });
+
+    it('skips selections without an embedded episode list', async () => {
+        store.setSelectedItem({
+            id: '555',
+            cmd: '/media/file_555.mpg',
+            info: { name: 'Plain Movie' },
+        });
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            false
+        );
+
+        expect(dataService.sendIpcEvent).not.toHaveBeenCalled();
+    });
+
+    it('resolves false when the portal request fails', async () => {
+        dataService.sendIpcEvent.mockRejectedValue(new Error('portal down'));
+
+        await expect(store.refreshEmbeddedSeriesSelection()).resolves.toBe(
+            false
+        );
+
+        expect(store.selectedItem()?.series).toEqual([1]);
+    });
+
+});
diff --git a/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.ts b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.ts
new file mode 100644
index 000000000..7c427590c
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stores/features/with-stalker-snapshot-refresh.feature.ts
@@ -0,0 +1,276 @@
+import { inject } from '@angular/core';
+import {
+    patchState,
+    signalStoreFeature,
+    type,
+    withMethods,
+} from '@ngrx/signals';
+import { createLogger } from '@iptvnator/portal/shared/util';
+import { DataService } from '@iptvnator/services';
+import {
+    PlaylistMeta,
+    StalkerPortalActions,
+} from '@iptvnator/shared/interfaces';
+import { StalkerVodSource } from '../../models';
+import { StalkerSessionService } from '../../stalker-session.service';
+import { normalizeStalkerEntityId } from '../../stalker-vod.utils';
+import { StalkerPortalStoreContract } from '../stalker-store.contracts';
+import { executeStalkerRequest, StalkerRequestDeps } from '../utils';
+
+interface StalkerOrderedListResponse {
+    js?: {
+        data?: StalkerVodSource[];
+        total_items?: number | string;
+        max_page_items?: number | string;
+        total_pages?: number | string;
+    };
+}
+
+/** Upper bound on paginated search pages scanned per category attempt. */
+const MAX_SEARCH_PAGES = 5;
+
+/**
+ * Favorites/recently-viewed rows store embedded-series ("vclub") items as
+ * full JSON snapshots, so their episode list (`series[]`) and playback
+ * `cmd` freeze at the moment the snapshot was written. This feature
+ * re-fetches the item from the portal in the background and patches the
+ * live selection, so newly released episodes appear when a series is
+ * opened from favorites, recents, or the dashboard.
+ */
+export function withStalkerSnapshotRefresh() {
+    const logger = createLogger('withStalkerSnapshotRefresh');
+
+    return signalStoreFeature(
+        {
+            state: type<{
+                selectedItem: StalkerVodSource | null | undefined;
+            }>(),
+        },
+        withMethods(
+            (
+                store,
+                dataService = inject(DataService),
+                stalkerSession = inject(StalkerSessionService)
+            ) => {
+                const storeContext = store as typeof store &
+                    StalkerPortalStoreContract;
+                const requestDeps: StalkerRequestDeps = {
+                    dataService,
+                    stalkerSession,
+                };
+
+                const findFreshRow = async (
+                    playlist: PlaylistMeta,
+                    snapshotId: string,
+                    title: string,
+                    category: string
+                ): Promise<StalkerVodSource | null> => {
+                    // Short/reused titles can push the item past page 1, so
+                    // follow the portal's reported page count (bounded).
+                    let totalPages = 1;
+                    for (let page = 1; page <= totalPages; page += 1) {
+                        const response =
+                            await executeStalkerRequest<StalkerOrderedListResponse>(
+                                requestDeps,
+                                playlist,
+                                {
+                                    action: StalkerPortalActions.GetOrderedList,
+                                    type: 'vod',
+                                    sortby: 'added',
+                                    genre: '0',
+                                    category,
+                                    search: title,
+                                    p: page,
+                                }
+                            );
+
+                        const rows = Array.isArray(response?.js?.data)
+                            ? response.js.data
+                            : [];
+                        const match = rows.find((row) => {
+                            const rowId = normalizeStalkerEntityId(
+                                row?.id ?? row?.stream_id
+                            );
+                            return rowId !== '' && rowId === snapshotId;
+                        });
+                        if (match) {
+                            return match;
+                        }
+                        if (rows.length === 0) {
+                            return null;
+                        }
+
+                        totalPages = Math.min(
+                            resolveTotalPages(response),
+                            MAX_SEARCH_PAGES
+                        );
+                    }
+
+                    return null;
+                };
+
+                return {
+                    /**
+                     * Re-fetches the currently selected embedded-series item
+                     * via a portal title search and patches the selection
+                     * when the episode list or cmd changed. Safe to fire and
+                     * forget; resolves to true when the selection changed.
+                     */
+                    async refreshEmbeddedSeriesSelection(): Promise<boolean> {
+                        const playlist = storeContext.currentPlaylist();
+                        const snapshot = store.selectedItem();
+                        const snapshotId = normalizeStalkerEntityId(
+                            snapshot?.id ?? snapshot?.stream_id
+                        );
+                        const title = resolveSnapshotTitle(snapshot);
+
+                        if (
+                            !playlist?._id ||
+                            !snapshot ||
+                            !snapshotId ||
+                            !hasEmbeddedSeries(snapshot) ||
+                            !title
+                        ) {
+                            return false;
+                        }
+
+                        let fresh: StalkerVodSource | null = null;
+                        try {
+                            const category = toSearchCategory(
+                                snapshot.category_id
+                            );
+                            fresh = await findFreshRow(
+                                playlist,
+                                snapshotId,
+                                title,
+                                category
+                            );
+                            if (!fresh && category !== '*') {
+                                fresh = await findFreshRow(
+                                    playlist,
+                                    snapshotId,
+                                    title,
+                                    '*'
+                                );
+                            }
+                        } catch (error) {
+                            logger.debug(
+                                'Embedded-series snapshot refresh failed',
+                                error
+                            );
+                            return false;
+                        }
+
+                        if (!fresh || !hasEmbeddedSeries(fresh)) {
+                            return false;
+                        }
+
+                        // The user may have navigated on while the portal
+                        // request was in flight — never patch a selection
+                        // that no longer belongs to this snapshot. Stalker
+                        // item IDs are only unique per portal, so the active
+                        // playlist must still be the one that was queried.
+                        const current = store.selectedItem();
+                        if (
+                            storeContext.currentPlaylist()?._id !==
+                                playlist._id ||
+                            !current ||
+                            normalizeStalkerEntityId(
+                                current.id ?? current.stream_id
+                            ) !== snapshotId
+                        ) {
+                            return false;
+                        }
+
+                        const nextCmd =
+                            typeof fresh.cmd === 'string' &&
+                            fresh.cmd.trim() !== ''
+                                ? fresh.cmd
+                                : current.cmd;
+                        if (
+                            nextCmd === current.cmd &&
+                            sameEpisodeList(current.series, fresh.series)
+                        ) {
+                            return false;
+                        }
+
+                        // Only the in-memory selection is patched. The stored
+                        // snapshot is deliberately left untouched: every entry
+                        // path into the detail view runs this refresh, so a
+                        // stale stored episode list is never rendered for
+                        // longer than one background request, and writing it
+                        // back would add an uncontrolled background writer to
+                        // the whole-playlist read-modify-write used by every
+                        // favorite/recent mutation.
+                        patchState(store, {
+                            selectedItem: {
+                                ...current,
+                                series: fresh.series,
+                                cmd: nextCmd,
+                            },
+                        });
+
+                        return true;
+                    },
+                };
+            }
+        )
+    );
+}
+
+function hasEmbeddedSeries(
+    item: StalkerVodSource | null | undefined
+): item is StalkerVodSource & { series: unknown[] } {
+    return Array.isArray(item?.series) && item.series.length > 0;
+}
+
+function resolveSnapshotTitle(
+    item: StalkerVodSource | null | undefined
+): string {
+    const title = String(
+        item?.info?.name ?? item?.name ?? item?.title ?? item?.o_name ?? ''
+    ).trim();
+    return title === 'Unknown' ? '' : title;
+}
+
+function resolveTotalPages(response: StalkerOrderedListResponse): number {
+    const js = response?.js;
+    const declared = Number(js?.total_pages);
+    if (Number.isFinite(declared) && declared > 0) {
+        return Math.floor(declared);
+    }
+
+    const totalItems = Number(js?.total_items);
+    const pageSize = Number(js?.max_page_items);
+    if (
+        Number.isFinite(totalItems) &&
+        Number.isFinite(pageSize) &&
+        pageSize > 0
+    ) {
+        return Math.max(1, Math.ceil(totalItems / pageSize));
+    }
+
+    return 1;
+}
+
+/** Portals expect a real category id; snapshot ids like 'vod'/'series' are routing artifacts. */
+function toSearchCategory(categoryId: unknown): string {
+    const raw = String(categoryId ?? '').trim();
+    return /^\d+$/.test(raw) ? raw : '*';
+}
+
+function sameEpisodeList(
+    a: unknown[] | undefined,
+    b: unknown[] | undefined
+): boolean {
+    const left = Array.isArray(a) ? a : [];
+    const right = Array.isArray(b) ? b : [];
+    if (left.length !== right.length) {
+        return false;
+    }
+    try {
+        return JSON.stringify(left) === JSON.stringify(right);
+    } catch {
+        return false;
+    }
+}
diff --git a/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.spec.ts b/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.spec.ts
new file mode 100644
index 000000000..3533e68ec
--- /dev/null
+++ b/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.spec.ts
@@ -0,0 +1,32 @@
+import { StalkerItvChannel } from '../../models';
+import { filterItvChannelsByGenre } from './stalker-content-mappers';
+
+describe('filterItvChannelsByGenre', () => {
+    const CHANNELS: StalkerItvChannel[] = [
+        { id: '1', cmd: 'ffrt http://x/1', name: 'News One', tv_genre_id: '5' },
+        { id: '2', cmd: 'ffrt http://x/2', name: 'Sports HD', tv_genre_id: 9 },
+        { id: '3', cmd: 'ffrt http://x/3', name: 'No Genre' },
+    ];
+
+    it('returns all channels for the "*" category', () => {
+        expect(filterItvChannelsByGenre(CHANNELS, '*')).toHaveLength(3);
+    });
+
+    it('returns all channels when no category is selected', () => {
+        expect(filterItvChannelsByGenre(CHANNELS, null)).toHaveLength(3);
+        expect(filterItvChannelsByGenre(CHANNELS, undefined)).toHaveLength(3);
+    });
+
+    it('matches numeric and string genre ids', () => {
+        expect(
+            filterItvChannelsByGenre(CHANNELS, '5').map((item) => item.id)
+        ).toEqual(['1']);
+        expect(
+            filterItvChannelsByGenre(CHANNELS, '9').map((item) => item.id)
+        ).toEqual(['2']);
+    });
+
+    it('hides channels without a genre from specific categories', () => {
+        expect(filterItvChannelsByGenre(CHANNELS, '404')).toEqual([]);
+    });
+});
diff --git a/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.ts b/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.ts
index 937ce5920..359dcd5d1 100644
--- a/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.ts
+++ b/libs/portal/stalker/data-access/src/lib/stores/utils/stalker-content-mappers.ts
@@ -61,6 +61,24 @@ export function toStalkerContentItem(
     };
 }
 
+/**
+ * Local category filter for fully cached ITV channel lists.
+ * Mirrors the portal-side `genre=<id>` filter of `get_ordered_list`.
+ */
+export function filterItvChannelsByGenre(
+    channels: StalkerItvChannel[],
+    categoryId: string | null | undefined
+): StalkerItvChannel[] {
+    if (!categoryId || categoryId === '*') {
+        return channels;
+    }
+
+    const target = String(categoryId);
+    return channels.filter(
+        (channel) => String(channel.tv_genre_id ?? '') === target
+    );
+}
+
 export function toStalkerItvChannel(item: StalkerContentItem): StalkerItvChannel {
     return {
         ...item,
diff --git a/libs/portal/stalker/feature/src/lib/stalker-catalog-facade.service.ts b/libs/portal/stalker/feature/src/lib/stalker-catalog-facade.service.ts
index d7e0ec52d..893374232 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-catalog-facade.service.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-catalog-facade.service.ts
@@ -194,6 +194,10 @@ export class StalkerCatalogFacadeService implements StalkerPortalCatalogFacade<
         return null;
     }
 
+    refreshSnapshotSelection(): void {
+        void this.stalkerStore.refreshEmbeddedSeriesSelection();
+    }
+
     getItemProgress(item: StalkerVodSource): PortalCatalogItemProgress {
         const numericId = Number(item.id);
         if (Number.isNaN(numericId)) {
diff --git a/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.spec.ts b/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.spec.ts
index e856120ac..ec7278c47 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.spec.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.spec.ts
@@ -71,6 +71,7 @@ describe('StalkerCollectionDetailComponent', () => {
         setSelectedContentType: jest.Mock;
         setSelectedCategory: jest.Mock;
         setSelectedItem: jest.Mock;
+        refreshEmbeddedSeriesSelection: jest.Mock;
         addToFavorites: jest.Mock;
         removeFromFavorites: jest.Mock;
         createLinkToPlayVod: jest.Mock;
@@ -121,6 +122,7 @@ describe('StalkerCollectionDetailComponent', () => {
             setSelectedItem: jest.fn((value: unknown) => {
                 selectedItem.set(value);
             }),
+            refreshEmbeddedSeriesSelection: jest.fn(async () => false),
             addToFavorites: jest.fn(),
             removeFromFavorites: jest.fn(),
             createLinkToPlayVod: jest.fn(),
@@ -311,6 +313,42 @@ describe('StalkerCollectionDetailComponent', () => {
         expect(
             fixture.componentInstance.inlineDetail().seriesItem?.series
         ).toEqual([1, 2]);
+        // The snapshot renders immediately, but a background portal
+        // re-fetch must be triggered so new episodes can appear.
+        expect(
+            stalkerStore.refreshEmbeddedSeriesSelection
+        ).toHaveBeenCalled();
+    });
+
+    it('shows newly released episodes when the background snapshot refresh patches the selection', async () => {
+        fixture.componentRef.setInput(
+            'item',
+            buildCollectionItem({
+                contentType: 'series',
+                categoryId: 'series',
+                stalkerItem: {
+                    id: '20001',
+                    title: 'Embedded Series',
+                    category_id: 'series',
+                    cmd: '/media/file_20001.mpg',
+                    series: [1],
+                },
+            })
+        );
+
+        await settleDetail(fixture);
+        expect(
+            fixture.componentInstance.inlineDetail().seriesItem?.series
+        ).toEqual([1]);
+
+        // Simulate the store-side refresh completing with a fresh portal row.
+        const current = selectedItem() as Record<string, unknown>;
+        selectedItem.set({ ...current, series: [1, 2] });
+        await settleDetail(fixture);
+
+        expect(
+            fixture.componentInstance.inlineDetail().seriesItem?.series
+        ).toEqual([1, 2]);
     });
 
     it('plays regular VOD collection details inline for embedded players instead of using the legacy play wrapper', async () => {
diff --git a/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.ts b/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.ts
index 8ec50c0c6..370867993 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-collection-detail.component.ts
@@ -326,6 +326,14 @@ export class StalkerCollectionDetailComponent {
         this.stalkerStore.setSelectedItem(itemDetails);
         this.itemDetails.set(itemDetails);
 
+        if (detailMode.hasEmbeddedSeries) {
+            // Embedded-series snapshots freeze the episode list at
+            // favorite/recent time; re-fetch in the background so new
+            // episodes appear. The store patch flows back into
+            // itemDetails via the selected-item sync effect above.
+            void this.stalkerStore.refreshEmbeddedSeriesSelection();
+        }
+
         if (
             detailMode.selectedContentType === 'vod' &&
             !detailMode.hasEmbeddedSeries &&
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.scss b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.scss
new file mode 100644
index 000000000..14fc6ebc1
--- /dev/null
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.scss
@@ -0,0 +1,72 @@
+@use '../../../../../../ui/styles/panel-header' as panel;
+
+:host {
+    align-self: stretch;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+    overflow: hidden;
+    width: 100%;
+}
+
+.category-content-header {
+    @include panel.standard-panel-header($sticky: true);
+}
+
+.category-meta {
+    @include panel.standard-panel-meta(8px);
+}
+
+.category-title {
+    @include panel.standard-panel-title(0.94rem);
+    color: var(--mat-sys-on-surface);
+}
+
+.category-subtitle {
+    @include panel.standard-panel-subtitle(
+        $font-size: 0.72rem,
+        $padding: 2px 8px,
+        $color: var(--mat-sys-on-surface-variant),
+        $background: var(--mat-sys-surface-container)
+    );
+}
+
+.all-items-progress {
+    align-items: center;
+    color: var(--mat-sys-on-surface-variant);
+    display: inline-flex;
+    font-size: 0.72rem;
+    gap: 6px;
+
+    &__count {
+        font-variant-numeric: tabular-nums;
+        opacity: 0.85;
+    }
+}
+
+// Let the paginator inherit the panel header's tinted background instead of
+// painting its own (mismatched) Material surface color.
+mat-paginator {
+    background: transparent !important;
+    flex-shrink: 0;
+    --mat-paginator-container-size: 40px;
+    --mat-paginator-enabled-icon-color: var(
+        --app-body-color,
+        var(--mat-sys-on-surface-variant)
+    );
+    --mat-paginator-disabled-icon-color: rgba(255, 255, 255, 0.18);
+}
+
+app-grid-list.all-items-grid {
+    --cover-grid-min-width: var(--live-channel-grid-min-width, 148px);
+
+    display: block;
+    flex: 1;
+    min-height: 0;
+    overflow-y: auto;
+    padding: 16px 20px 20px;
+    scrollbar-width: thin;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
+}
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.spec.ts b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.spec.ts
new file mode 100644
index 000000000..fa54f9531
--- /dev/null
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.spec.ts
@@ -0,0 +1,123 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { StalkerItvChannel } from '@iptvnator/portal/stalker/data-access';
+import { StalkerItvAllItemsComponent } from './stalker-itv-all-items.component';
+
+function buildChannels(count: number): StalkerItvChannel[] {
+    return Array.from({ length: count }, (_, index) => ({
+        id: `ch-${index}`,
+        cmd: `ffrt4://itv/${index}`,
+        name: index === count - 1 ? 'Needle TV' : `Channel ${index}`,
+        o_name: index === count - 1 ? 'Needle TV' : `Channel ${index}`,
+        logo: `logo-${index}.png`,
+        is_series: null,
+    }));
+}
+
+describe('StalkerItvAllItemsComponent', () => {
+    let fixture: ComponentFixture<StalkerItvAllItemsComponent>;
+    let component: StalkerItvAllItemsComponent;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [
+                StalkerItvAllItemsComponent,
+                TranslateModule.forRoot(),
+            ],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(StalkerItvAllItemsComponent);
+        component = fixture.componentInstance;
+    });
+
+    it('renders the first client-side page of channels with a paginator', () => {
+        fixture.componentRef.setInput('channels', buildChannels(60));
+        fixture.detectChanges();
+
+        expect(component.pagedGridItems()).toHaveLength(25);
+        expect(fixture.nativeElement.querySelectorAll('mat-card')).toHaveLength(
+            25
+        );
+        expect(fixture.nativeElement.querySelector('mat-paginator')).toBeTruthy();
+        expect(
+            fixture.nativeElement
+                .querySelector('.category-subtitle')
+                ?.textContent?.trim()
+        ).toContain('60');
+    });
+
+    it('slices the next page on paginator change without touching the source', () => {
+        fixture.componentRef.setInput('channels', buildChannels(60));
+        fixture.detectChanges();
+
+        component.onPageChange({
+            pageIndex: 2,
+            pageSize: 25,
+            length: 60,
+        } as never);
+        fixture.detectChanges();
+
+        // Third page holds the remaining 10 channels.
+        expect(component.pagedGridItems()).toHaveLength(10);
+        expect(component.pagedGridItems()[0]['id']).toBe('ch-50');
+    });
+
+    it('filters by the search term across ALL channels and resets to page one', () => {
+        fixture.componentRef.setInput('channels', buildChannels(60));
+        fixture.detectChanges();
+        component.onPageChange({
+            pageIndex: 1,
+            pageSize: 25,
+            length: 60,
+        } as never);
+
+        fixture.componentRef.setInput('searchTerm', 'needle');
+        fixture.detectChanges();
+
+        expect(component.pageIndex()).toBe(0);
+        expect(
+            component.pagedGridItems().map((item) => item['name'])
+        ).toEqual(['Needle TV']);
+    });
+
+    it('maps the stalker logo to stream_icon and drops null is_series for the grid', () => {
+        fixture.componentRef.setInput('channels', buildChannels(1));
+        fixture.detectChanges();
+
+        const [item] = component.pagedGridItems();
+        expect(item['stream_icon']).toBe('logo-0.png');
+        expect('is_series' in item).toBe(false);
+    });
+
+    it('emits channelActivated when a card is clicked', () => {
+        const activated = jest.fn();
+        fixture.componentRef.setInput('channels', buildChannels(3));
+        fixture.componentInstance.channelActivated.subscribe(activated);
+        fixture.detectChanges();
+
+        (
+            fixture.nativeElement.querySelector('mat-card') as HTMLElement
+        ).click();
+
+        expect(activated).toHaveBeenCalledWith(
+            expect.objectContaining({ id: 'ch-0' })
+        );
+    });
+
+    it('shows skeletons and load progress while loading', () => {
+        fixture.componentRef.setInput('channels', []);
+        fixture.componentRef.setInput('loading', true);
+        fixture.componentRef.setInput('progress', { loaded: 140, total: 400 });
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement.querySelector('.grid-skeleton-card')
+        ).toBeTruthy();
+        expect(
+            fixture.nativeElement
+                .querySelector('.all-items-progress')
+                ?.textContent?.replace(/\s+/g, '')
+        ).toContain('140/400');
+        expect(fixture.nativeElement.querySelector('mat-paginator')).toBeNull();
+    });
+});
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.ts b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.ts
new file mode 100644
index 000000000..fc596bc1a
--- /dev/null
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-itv-all-items.component.ts
@@ -0,0 +1,146 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    computed,
+    input,
+    linkedSignal,
+    output,
+    signal,
+} from '@angular/core';
+import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { TranslatePipe } from '@ngx-translate/core';
+import { GridListComponent } from '@iptvnator/portal/shared/ui';
+import {
+    StalkerItvChannel,
+    StalkerItvLoadProgress,
+} from '@iptvnator/portal/stalker/data-access';
+
+/**
+ * "All channels" grid shown in the Live TV main area before a category is
+ * selected — mirrors the Xtream live "All Items" view. Fed by the full ITV
+ * channel list cache; pagination is purely client-side so it never touches the
+ * store's legacy page state (which would re-fire portal requests).
+ */
+@Component({
+    selector: 'app-stalker-itv-all-items',
+    imports: [
+        GridListComponent,
+        MatPaginatorModule,
+        MatProgressSpinnerModule,
+        TranslatePipe,
+    ],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    template: `
+        <div class="category-content-header">
+            <div class="category-meta">
+                <h2 class="category-title">
+                    {{ 'PORTALS.ALL_CATEGORIES' | translate }}
+                </h2>
+                @if (loading()) {
+                    <span class="all-items-progress" role="status">
+                        <mat-spinner diameter="14" />
+                        @if (progress(); as loadProgress) {
+                            <span class="all-items-progress__count">
+                                {{ loadProgress.loaded }}/{{
+                                    loadProgress.total
+                                }}
+                            </span>
+                        }
+                    </span>
+                } @else if (filteredChannels().length > 0) {
+                    <span class="category-subtitle"
+                        >{{ filteredChannels().length }}
+                        {{
+                            (filteredChannels().length === 1
+                                ? 'PORTALS.ITEM'
+                                : 'PORTALS.ITEMS'
+                            ) | translate
+                        }}</span
+                    >
+                }
+            </div>
+            @if (!loading() && filteredChannels().length > 0) {
+                <mat-paginator
+                    [pageIndex]="pageIndex()"
+                    [length]="filteredChannels().length"
+                    [pageSize]="pageSize()"
+                    [pageSizeOptions]="pageSizeOptions"
+                    (page)="onPageChange($event)"
+                    aria-label="Select page"
+                />
+            }
+        </div>
+        <app-grid-list
+            class="all-items-grid app-scrollbar"
+            [isLoading]="loading()"
+            [items]="pagedGridItems()"
+            [limit]="pageSize()"
+            [showPaginator]="false"
+            [searchTerm]="searchTerm()"
+            [variant]="'logo'"
+            [type]="'live'"
+            (itemClicked)="onItemClicked($event)"
+        />
+    `,
+    styleUrl: './stalker-itv-all-items.component.scss',
+})
+export class StalkerItvAllItemsComponent {
+    readonly channels = input<StalkerItvChannel[]>([]);
+    readonly loading = input(false);
+    readonly progress = input<StalkerItvLoadProgress | null>(null);
+    readonly searchTerm = input('');
+
+    readonly channelActivated = output<StalkerItvChannel>();
+
+    readonly pageSizeOptions = [10, 25, 50, 100];
+    readonly pageSize = signal(25);
+    /** Resets to the first page whenever the source list or search changes. */
+    readonly pageIndex = linkedSignal({
+        source: () => ({
+            term: this.searchTerm(),
+            channelCount: this.channels().length,
+        }),
+        computation: () => 0,
+    });
+
+    readonly filteredChannels = computed(() => {
+        const term = this.searchTerm().trim().toLowerCase();
+        const channels = this.channels();
+        if (!term) {
+            return channels;
+        }
+
+        return channels.filter((channel) =>
+            `${channel.o_name ?? ''} ${channel.name ?? ''}`
+                .toLowerCase()
+                .includes(term)
+        );
+    });
+
+    /** The current page, mapped so GridListComponent can resolve the logo. */
+    readonly pagedGridItems = computed(() => {
+        const start = this.pageIndex() * this.pageSize();
+        return this.filteredChannels()
+            .slice(start, start + this.pageSize())
+            .map((channel) => {
+                // GridListItem forbids null is_series; Stalker payloads may
+                // carry it — drop the nullish form (same as toPlayableChannel).
+                const { is_series, ...rest } = channel;
+                return {
+                    ...rest,
+                    ...(is_series == null ? {} : { is_series }),
+                    stream_icon: channel.logo,
+                };
+            });
+    });
+
+    onPageChange(event: PageEvent): void {
+        this.pageSize.set(event.pageSize);
+        this.pageIndex.set(event.pageIndex);
+    }
+
+    onItemClicked(item: unknown): void {
+        this.channelActivated.emit(item as StalkerItvChannel);
+    }
+}
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.html b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.html
index 4cc41cec3..f9780a282 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.html
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.html
@@ -15,15 +15,30 @@
                 <h2 class="category-title">
                     {{ selectedCategoryTitle() }}
                 </h2>
-                @if (visibleChannels().length > 0) {
+                @if (totalChannelCount() > 0) {
                     <span class="category-subtitle"
-                        >{{ visibleChannels().length }}
+                        >{{ totalChannelCount() }}
                         {{
-                            visibleChannels().length === 1 ? 'item' : 'items'
+                            (totalChannelCount() === 1
+                                ? 'PORTALS.ITEM'
+                                : 'PORTALS.ITEMS'
+                            ) | translate
                         }}</span
                     >
                 }
             </div>
+            @if (isFullListMode()) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    [disabled]="isFullListLoading()"
+                    [attr.aria-label]="'PORTALS.REFRESH_CHANNEL_LIST' | translate"
+                    [matTooltip]="'PORTALS.REFRESH_CHANNEL_LIST' | translate"
+                    (click)="refreshChannels()"
+                >
+                    <mat-icon>refresh</mat-icon>
+                </button>
+            }
             <button
                 mat-icon-button
                 type="button"
@@ -36,6 +51,20 @@
             </button>
         </div>
 
+        @if (isFullListLoading()) {
+            <div class="full-list-progress" role="status">
+                <mat-spinner diameter="14" />
+                <span class="full-list-progress__label">
+                    {{ 'PORTALS.LOADING_ALL_CHANNELS' | translate }}
+                </span>
+                @if (fullListProgress(); as progress) {
+                    <span class="full-list-progress__count">
+                        {{ progress.loaded }}/{{ progress.total }}
+                    </span>
+                }
+            </div>
+        }
+
         <div #scrollContainer class="channels-list">
             @if (isInitialChannelsLoading()) {
                 <app-channel-list-skeleton
@@ -50,6 +79,13 @@
                         [message]="'CHANNELS.NO_SEARCH_RESULTS' | translate"
                     />
                 </div>
+            } @else if (isCategoryEmpty()) {
+                <div class="empty-search-state">
+                    <app-portal-empty-state
+                        icon="tv_off"
+                        [message]="'PORTALS.NO_CHANNELS_IN_CATEGORY' | translate"
+                    />
+                </div>
             } @else {
                 @for (item of visibleChannels(); track item.id ?? $index) {
                     <app-channel-list-item
@@ -72,6 +108,7 @@
                         "
                         [showFavoriteButton]="true"
                         [showProgramInfoButton]="false"
+                        [showDetailsContextMenu]="supportsEpgMapping"
                         [isFavorite]="
                             favorites.get(normalizeStalkerEntityId(item.id)) ??
                             false
@@ -79,6 +116,7 @@
                         (clicked)="playChannel(item)"
                         (activated)="playChannel(item, true)"
                         (favoriteToggled)="toggleFavorite(item)"
+                        (contextMenuRequested)="onChannelContextMenu(item, $event)"
                     />
                 }
             }
@@ -106,11 +144,23 @@
             <mat-icon>chevron_right</mat-icon>
         </button>
     }
-    @if (!stalkerStore.selectedCategoryId()) {
-        <app-portal-empty-state
-            icon="live_tv"
-            [message]="'PORTALS.SELECT_CATEGORY' | translate"
-        />
+    @if (!stalkerStore.selectedItem() && !stalkerStore.selectedCategoryId()) {
+        @if (showItvAllItems()) {
+            <!-- Xtream parity: all channels of the portal, paginated, before
+                 any category is picked. Clicking a card starts playback. -->
+            <app-stalker-itv-all-items
+                [channels]="itvFullChannelList()"
+                [loading]="isFullListLoading()"
+                [progress]="fullListProgress()"
+                [searchTerm]="searchTerm()"
+                (channelActivated)="playChannel($event)"
+            />
+        } @else {
+            <app-portal-empty-state
+                icon="live_tv"
+                [message]="'PORTALS.SELECT_CATEGORY' | translate"
+            />
+        }
     } @else if (stalkerStore.selectedItem()) {
         @if (streamUrl() && (isEmbeddedPlayer || isRadioMode())) {
             <div class="video-player">
@@ -206,3 +256,19 @@
         }
     </div>
 </ng-template>
+
+<div
+    aria-hidden="true"
+    class="channel-context-menu-anchor"
+    [style.left]="contextMenuPosition().x"
+    [style.top]="contextMenuPosition().y"
+    [matMenuTriggerFor]="channelContextMenu"
+    #contextMenuTrigger="matMenuTrigger"
+></div>
+
+<mat-menu #channelContextMenu="matMenu">
+    <button mat-menu-item (click)="openEpgMapping()">
+        <mat-icon>settings_remote</mat-icon>
+        <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+    </button>
+</mat-menu>
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.scss b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.scss
index 40c6c3558..27fa099ec 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.scss
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.scss
@@ -36,6 +36,36 @@
     );
 }
 
+.full-list-progress {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 6px 12px;
+    font-size: 0.72rem;
+    line-height: 1.2;
+    color: var(--mat-sys-on-surface-variant);
+    background: var(--mat-sys-surface-container);
+    border-bottom: 1px solid var(--app-separator);
+
+    mat-spinner {
+        flex: 0 0 auto;
+    }
+
+    &__label {
+        flex: 1 1 auto;
+        min-width: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    &__count {
+        flex: 0 0 auto;
+        font-variant-numeric: tabular-nums;
+        opacity: 0.85;
+    }
+}
+
 .channels-list {
     flex: 1;
     overflow-y: auto;
@@ -63,3 +93,11 @@
         padding-inline: 6px;
     }
 }
+
+.channel-context-menu-anchor {
+    position: fixed;
+    width: 0;
+    height: 0;
+    opacity: 0;
+    pointer-events: none;
+}
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.spec.ts b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.spec.ts
index 49c1d6c9b..79a12e7a9 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.spec.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.spec.ts
@@ -1,4 +1,11 @@
-import { Component, Directive, input, output, signal } from '@angular/core';
+import {
+    Component,
+    Directive,
+    EventEmitter,
+    input,
+    output,
+    signal,
+} from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MatSnackBar } from '@angular/material/snack-bar';
@@ -25,6 +32,8 @@ import {
     SettingsStore,
 } from '@iptvnator/services';
 import { EpgProgram } from '@iptvnator/shared/interfaces';
+import { MatDialog } from '@angular/material/dialog';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { WebPlayerViewComponent } from '@iptvnator/ui/playback';
 import { StalkerLiveStreamLayoutComponent } from './stalker-live-stream-layout.component';
 
@@ -41,10 +50,12 @@ class StubChannelListItemComponent {
     readonly progressPercentage = input(0);
     readonly showFavoriteButton = input(false);
     readonly showProgramInfoButton = input(false);
+    readonly showDetailsContextMenu = input(false);
     readonly isFavorite = input(false);
     readonly clicked = output<void>();
     readonly activated = output<void>();
     readonly favoriteToggled = output<void>();
+    readonly contextMenuRequested = output<MouseEvent>();
 }
 
 @Component({
@@ -134,7 +145,7 @@ describe('StalkerLiveStreamLayoutComponent', () => {
     });
     const selectedCategoryId = signal<string | null>('1001');
     const searchPhrase = signal('');
-    const itvChannels = signal([
+    const defaultItvChannels = () => [
         {
             id: '10001',
             cmd: 'ffrt4://itv/10001',
@@ -149,7 +160,8 @@ describe('StalkerLiveStreamLayoutComponent', () => {
             o_name: 'Beta TV',
             logo: 'beta.png',
         },
-    ]);
+    ];
+    const itvChannels = signal(defaultItvChannels());
     const radioChannels = signal([
         {
             id: 'radio-1',
@@ -182,6 +194,17 @@ describe('StalkerLiveStreamLayoutComponent', () => {
     const isLoadingBulkItvEpg = signal(false);
     const hasMoreChannels = signal(false);
     const page = signal(0);
+    const itvFullListActive = signal(false);
+    const itvFullListLoading = signal(false);
+    const itvFullListProgress = signal<{
+        loaded: number;
+        total: number;
+    } | null>(null);
+    const itvFullChannelList = signal<
+        ReturnType<typeof defaultItvChannels>
+    >([]);
+    const itvSelectedCategoryFromCache = signal(false);
+    const isPaginatedContentLoading = signal(false);
 
     const stalkerStore = {
         getSelectedCategoryName: signal('News'),
@@ -189,6 +212,14 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         radioChannels,
         searchPhrase,
         hasMoreChannels,
+        itvFullListActive,
+        itvFullListLoading,
+        itvFullListProgress,
+        itvFullChannelList,
+        itvSelectedCategoryFromCache,
+        isPaginatedContentLoading,
+        preloadItvChannels: jest.fn(),
+        refreshItvChannels: jest.fn().mockResolvedValue(undefined),
         selectedItvId,
         currentPlaylist: playlist,
         selectedItvEpgPrograms,
@@ -215,6 +246,7 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         resolveRadioPlayback: jest.fn(),
         fetchChannelEpg: jest.fn(),
         ensureBulkItvEpg: jest.fn(),
+        applyMappedItvEpg: jest.fn().mockResolvedValue(undefined),
         clearBulkItvEpgCache: jest.fn(() => {
             bulkItvEpgByChannel.set({});
             bulkItvEpgLoaded.set(false);
@@ -255,6 +287,7 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         resolveItvPlayback = stalkerStore.resolveItvPlayback;
         resolveRadioPlayback = stalkerStore.resolveRadioPlayback;
 
+        itvChannels.set(defaultItvChannels());
         selectedCategoryId.set('1001');
         searchPhrase.set('');
         stalkerStore.selectedContentType.set('itv');
@@ -268,6 +301,13 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         isLoadingBulkItvEpg.set(false);
         hasMoreChannels.set(false);
         page.set(0);
+        itvFullListActive.set(false);
+        itvFullListLoading.set(false);
+        itvFullListProgress.set(null);
+        itvFullChannelList.set([]);
+        itvSelectedCategoryFromCache.set(false);
+        isPaginatedContentLoading.set(false);
+        stalkerStore.preloadItvChannels.mockClear();
         localStorage.removeItem(LIVE_EPG_PANEL_STATE_STORAGE_KEY);
         settingsStore.openStreamOnDoubleClick.set(false);
 
@@ -326,6 +366,9 @@ describe('StalkerLiveStreamLayoutComponent', () => {
                         get isElectron() {
                             return Boolean(window.electron);
                         },
+                        get supportsEpgMapping() {
+                            return false;
+                        },
                     },
                 },
                 { provide: PlaylistsService, useValue: playlistService },
@@ -335,6 +378,13 @@ describe('StalkerLiveStreamLayoutComponent', () => {
                     provide: TranslateService,
                     useValue: {
                         instant: jest.fn((value: string) => value),
+                        // The real TranslatePipe (used by child components
+                        // that aren't stubbed) needs these members too.
+                        get: jest.fn((value: string) => of(value)),
+                        stream: jest.fn((value: string) => of(value)),
+                        onTranslationChange: new EventEmitter(),
+                        onLangChange: new EventEmitter(),
+                        onDefaultLangChange: new EventEmitter(),
                     },
                 },
                 {
@@ -343,6 +393,22 @@ describe('StalkerLiveStreamLayoutComponent', () => {
                         open: jest.fn(),
                     },
                 },
+                {
+                    provide: MatDialog,
+                    useValue: {
+                        open: jest.fn(),
+                    },
+                },
+                {
+                    provide: EpgRuntimeBridgeService,
+                    useValue: {
+                        supportsEpgMapping: false,
+                        getEpgMapping: jest.fn().mockResolvedValue(null),
+                        getEpgMappingsBatch: jest
+                            .fn()
+                            .mockResolvedValue(null),
+                    },
+                },
             ],
         })
             .overrideComponent(StalkerLiveStreamLayoutComponent, {
@@ -621,6 +687,282 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         expect(stalkerStore.setItvChannels).not.toHaveBeenCalled();
     });
 
+    it('windows the rendered list in full-list mode while search covers everything', () => {
+        const initialChannels = itvChannels();
+        try {
+            const full = Array.from({ length: 250 }, (_, index) => ({
+                id: `ch-${index}`,
+                cmd: `ffrt4://itv/${index}`,
+                name: index === 249 ? 'Needle TV' : `Channel ${index}`,
+                o_name: index === 249 ? 'Needle TV' : `Channel ${index}`,
+                logo: '',
+            }));
+            itvFullListActive.set(true);
+            itvSelectedCategoryFromCache.set(true);
+            itvChannels.set(full);
+            itvFullChannelList.set(full);
+            fixture.detectChanges();
+
+            // Only the first render window hits the DOM…
+            expect(component.visibleChannels()).toHaveLength(100);
+            // …but the header count reflects the whole list.
+            expect(component.totalChannelCount()).toBe(250);
+            expect(component.hasMoreItems()).toBe(true);
+
+            stalkerStore.setPage.mockClear();
+            component.loadMore();
+
+            // Scrolling extends the window from memory without portal paging.
+            expect(component.visibleChannels()).toHaveLength(200);
+            expect(stalkerStore.setPage).not.toHaveBeenCalled();
+
+            // Regression: search matches channels far beyond the first page.
+            searchPhrase.set('needle');
+            fixture.detectChanges();
+            expect(
+                component.visibleChannels().map((channel) => channel.name)
+            ).toEqual(['Needle TV']);
+        } finally {
+            itvChannels.set(initialChannels);
+        }
+    });
+
+    it('searches the whole portal (all categories) in full-list mode, not just the current category', () => {
+        // The current category (itvChannels) has only 'Alpha TV'/'Beta TV', but
+        // the portal's full list contains a News channel in another genre.
+        itvFullListActive.set(true);
+        itvFullChannelList.set([
+            ...defaultItvChannels(),
+            {
+                id: '55',
+                cmd: 'ffrt4://itv/55',
+                name: 'CNN International',
+                o_name: 'CNN International',
+                logo: '',
+            },
+        ]);
+        searchPhrase.set('cnn');
+        fixture.detectChanges();
+
+        expect(
+            component.filteredChannels().map((channel) => channel.name)
+        ).toEqual(['CNN International']);
+    });
+
+    it('includes paged censored-category channels in full-list search results', () => {
+        // The adult category's channels come from the legacy paged flow and
+        // are intentionally absent from the full-list cache — searching for a
+        // currently visible channel must still find it (merged source).
+        itvFullListActive.set(true);
+        itvSelectedCategoryFromCache.set(false);
+        itvChannels.set([
+            {
+                id: 'adult-1',
+                cmd: 'ffrt4://itv/adult-1',
+                name: 'Erox HD',
+                o_name: 'Erox HD',
+                logo: '',
+            },
+        ]);
+        itvFullChannelList.set(defaultItvChannels());
+        searchPhrase.set('erox');
+        fixture.detectChanges();
+
+        expect(
+            component.filteredChannels().map((channel) => channel.name)
+        ).toEqual(['Erox HD']);
+
+        // And the cached portal-wide channels remain searchable too.
+        searchPhrase.set('alpha');
+        fixture.detectChanges();
+        expect(
+            component.filteredChannels().map((channel) => channel.name)
+        ).toEqual(['Alpha TV']);
+    });
+
+    it('grows the render window to include a channel selected beyond it (remote/numeric nav)', async () => {
+        const full = Array.from({ length: 250 }, (_, index) => ({
+            id: `ch-${index}`,
+            cmd: `ffrt4://itv/${index}`,
+            name: `Channel ${index}`,
+            o_name: `Channel ${index}`,
+            logo: '',
+        }));
+        itvFullListActive.set(true);
+        itvSelectedCategoryFromCache.set(true);
+        itvChannels.set(full);
+        itvFullChannelList.set(full);
+        fixture.detectChanges();
+
+        expect(component.visibleChannels()).toHaveLength(100);
+
+        // Selecting channel index 150 (outside the 100-item window) must grow
+        // the window so it is rendered and can be highlighted/scrolled to.
+        await component.playChannel(full[150], false);
+        fixture.detectChanges();
+
+        expect(component.visibleChannels().length).toBeGreaterThan(150);
+        expect(
+            component
+                .visibleChannels()
+                .some((channel) => channel.id === 'ch-150')
+        ).toBe(true);
+    });
+
+    it('does not clear cached channels when switching category in full-list mode', async () => {
+        // Regression: the category-change reset effect used to setItvChannels([])
+        // unconditionally, clobbering the list the content loader had just
+        // served synchronously from the full-list cache — leaving the sidebar
+        // stuck on an infinite skeleton for every category after the first.
+        itvFullListActive.set(true);
+        itvSelectedCategoryFromCache.set(true);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        stalkerStore.setItvChannels.mockClear();
+        selectedCategoryId.set('42');
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        expect(stalkerStore.setItvChannels).not.toHaveBeenCalled();
+    });
+
+    it('still clears channels on category change when the full list is not active', async () => {
+        itvFullListActive.set(false);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        stalkerStore.setItvChannels.mockClear();
+        selectedCategoryId.set('99');
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        expect(stalkerStore.setItvChannels).toHaveBeenCalledWith([]);
+    });
+
+    it('shows an empty state (not a skeleton) for a loaded but empty category', () => {
+        // Full list is loaded, nothing is loading, and the selected category
+        // filters down to zero channels — this must read as "empty", not "stuck".
+        itvFullListActive.set(true);
+        itvFullListLoading.set(false);
+        isPaginatedContentLoading.set(false);
+        itvChannels.set([]);
+        searchPhrase.set('');
+        fixture.detectChanges();
+
+        expect(component.isInitialChannelsLoading()).toBe(false);
+        expect(component.isCategoryEmpty()).toBe(true);
+        expect(
+            fixture.nativeElement.querySelector('app-channel-list-skeleton')
+        ).toBeNull();
+        expect(
+            fixture.nativeElement.querySelector(
+                '.empty-search-state app-portal-empty-state'
+            )
+        ).toBeTruthy();
+    });
+
+    it('shows the skeleton only while a full-list load is genuinely in flight', () => {
+        itvChannels.set([]);
+        searchPhrase.set('');
+        itvFullListActive.set(false);
+        isPaginatedContentLoading.set(false);
+
+        itvFullListLoading.set(true);
+        fixture.detectChanges();
+        expect(component.isInitialChannelsLoading()).toBe(true);
+
+        itvFullListLoading.set(false);
+        fixture.detectChanges();
+        expect(component.isInitialChannelsLoading()).toBe(false);
+    });
+
+    it('shows the skeleton while the legacy paged fetch is loading', () => {
+        itvChannels.set([]);
+        searchPhrase.set('');
+        itvFullListActive.set(false);
+        itvFullListLoading.set(false);
+
+        isPaginatedContentLoading.set(true);
+        fixture.detectChanges();
+        expect(component.isInitialChannelsLoading()).toBe(true);
+    });
+
+    it('keeps portal pagination for a censored category absent from the cache', async () => {
+        // Full list IS active, but the selected (adult) genre has no cached
+        // channels — infinite scroll must request the next portal page instead
+        // of only growing the client-side render window.
+        itvFullListActive.set(true);
+        itvSelectedCategoryFromCache.set(false);
+        hasMoreChannels.set(true);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        page.set(0);
+        stalkerStore.setPage.mockClear();
+        component.loadMore();
+
+        expect(stalkerStore.setPage).toHaveBeenCalledWith(1);
+    });
+
+    it('preloads the full channel list as soon as the Live TV section is entered', () => {
+        // No category selected — the preload must not wait for a category click.
+        selectedCategoryId.set(null);
+        fixture.detectChanges();
+
+        expect(stalkerStore.preloadItvChannels).toHaveBeenCalled();
+    });
+
+    it('shows the all-channels grid instead of the placeholder when the full list is available', () => {
+        selectedCategoryId.set(null);
+        selectedItem.set(null);
+        itvFullListActive.set(true);
+        itvFullChannelList.set(defaultItvChannels());
+        fixture.detectChanges();
+
+        const grid = fixture.nativeElement.querySelector(
+            'app-stalker-itv-all-items'
+        );
+        expect(grid).toBeTruthy();
+        expect(grid.querySelectorAll('mat-card')).toHaveLength(2);
+        expect(
+            fixture.nativeElement.querySelector('app-portal-empty-state')
+        ).toBeNull();
+    });
+
+    it('keeps the select-a-category placeholder on portals without a usable full list', () => {
+        selectedCategoryId.set(null);
+        selectedItem.set(null);
+        itvFullListActive.set(false);
+        itvFullListLoading.set(false);
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement.querySelector('app-stalker-itv-all-items')
+        ).toBeNull();
+        expect(
+            fixture.nativeElement.querySelector('app-portal-empty-state')
+        ).toBeTruthy();
+    });
+
+    it('shows the refresh button in full-list mode and delegates to the store', () => {
+        itvFullListActive.set(true);
+        fixture.detectChanges();
+
+        const buttons = Array.from(
+            fixture.nativeElement.querySelectorAll(
+                '.category-content-header button'
+            )
+        ) as HTMLButtonElement[];
+        const refreshButton = buttons.find((button) =>
+            button.textContent?.includes('refresh')
+        );
+
+        expect(refreshButton).toBeTruthy();
+        refreshButton?.click();
+        expect(stalkerStore.refreshItvChannels).toHaveBeenCalled();
+    });
+
     it('persists the channels sidebar width under a dedicated storage key', () => {
         // The shell context panel (category sidebar) is visible at the same
         // time as this sidebar and persists its width under the shared
@@ -635,12 +977,38 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         );
     });
 
-    it('keeps row previews empty before bulk epg is loaded', async () => {
+    async function settleEagerEpg(): Promise<void> {
+        for (let i = 0; i < 5; i += 1) {
+            fixture.detectChanges();
+            await fixture.whenStable();
+            await new Promise<void>((resolve) => setTimeout(resolve));
+        }
+        fixture.detectChanges();
+    }
+
+    it('loads bulk EPG and shows row previews on category entry, before any playback', async () => {
+        await settleEagerEpg();
+
+        // The list EPG previews appear as soon as the category's channels are
+        // shown — the user no longer has to play a channel first.
+        expect(ensureBulkItvEpg).toHaveBeenCalledWith(168);
+        expect(component.epgPreviewPrograms.get('10001')?.title).toBe(
+            'Current Show'
+        );
+        expect(component.epgPreviewPrograms.get('10002')?.title).toBe(
+            'Next Channel Show'
+        );
+        // The per-channel fallback is reserved for the playing channel.
+        expect(fetchChannelEpg).not.toHaveBeenCalled();
+    });
+
+    it('does not load bulk EPG for radio (no EPG data)', async () => {
+        stalkerStore.selectedContentType.set('radio');
+        selectedCategoryId.set('radio-all');
+        selectedItem.set(null);
         fixture.detectChanges();
         await fixture.whenStable();
 
-        expect(component.epgPreviewPrograms.size).toBe(0);
-        expect(fetchChannelEpg).not.toHaveBeenCalled();
         expect(ensureBulkItvEpg).not.toHaveBeenCalled();
     });
 
@@ -660,16 +1028,18 @@ describe('StalkerLiveStreamLayoutComponent', () => {
         expect(fetchChannelEpg).not.toHaveBeenCalled();
     });
 
-    it('ensures bulk EPG only once across channel switches for the same playlist', async () => {
-        fixture.detectChanges();
+    it('does not re-fetch bulk EPG when switching channels once it is loaded', async () => {
+        await settleEagerEpg();
+        // Bulk EPG has loaded (eagerly, on entry).
+        ensureBulkItvEpg.mockClear();
 
         await component.playChannel(itvChannels()[0]);
         await fixture.whenStable();
         await component.playChannel(itvChannels()[1]);
         await fixture.whenStable();
 
-        expect(ensureBulkItvEpg).toHaveBeenCalledTimes(1);
-        expect(ensureBulkItvEpg).toHaveBeenCalledWith(168);
+        // Playing/switching channels reuses the cached bulk EPG.
+        expect(ensureBulkItvEpg).not.toHaveBeenCalled();
     });
 
     it('renders inline audio playback and no EPG for radio stations', async () => {
diff --git a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts
index e50766d38..3ccbe97a2 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-live-stream-layout/stalker-live-stream-layout.component.ts
@@ -8,6 +8,7 @@ import {
     effect,
     ElementRef,
     inject,
+    linkedSignal,
     OnDestroy,
     signal,
     untracked,
@@ -15,7 +16,9 @@ import {
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
+import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
+import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -23,6 +26,7 @@ import { TranslatePipe, TranslateService } from '@ngx-translate/core';
 import {
     ChannelListItemComponent,
     ChannelListSkeletonComponent,
+    EpgMappingDialogComponent,
     ResizableDirective,
 } from '@iptvnator/ui/components';
 import {
@@ -31,6 +35,7 @@ import {
     SettingsStore,
 } from '@iptvnator/services';
 import {
+    buildStalkerEpgMappingKey,
     Channel,
     EpgItem,
     EpgProgram,
@@ -50,6 +55,7 @@ import {
     WebPlayerViewComponent,
 } from '@iptvnator/ui/playback';
 import { LiveEpgPanelSummary } from '@iptvnator/ui/shared-portals';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import {
     LiveLayoutSidebarStateService,
     PORTAL_PLAYER,
@@ -68,12 +74,16 @@ import {
     StalkerStore,
     normalizeStalkerEntityId,
 } from '@iptvnator/portal/stalker/data-access';
+import { StalkerItvAllItemsComponent } from './stalker-itv-all-items.component';
 
 type StalkerPlayableChannel = StalkerPortalItem & {
     cmd?: string;
     has_files?: unknown;
 };
 
+/** Channels rendered per "page" when the full list is served from the cache. */
+const FULL_LIST_RENDER_CHUNK = 100;
+
 @Component({
     selector: 'app-stalker-live-stream-layout',
     templateUrl: './stalker-live-stream-layout.component.html',
@@ -86,11 +96,13 @@ type StalkerPlayableChannel = StalkerPortalItem & {
         EpgTimelineComponent,
         MatButtonModule,
         MatIconModule,
+        MatMenuModule,
         MatProgressSpinnerModule,
         MatTooltipModule,
         NgTemplateOutlet,
         PortalEmptyStateComponent,
         ResizableDirective,
+        StalkerItvAllItemsComponent,
         TranslatePipe,
         WebPlayerViewComponent,
     ],
@@ -99,6 +111,8 @@ type StalkerPlayableChannel = StalkerPortalItem & {
 export class StalkerLiveStreamLayoutComponent implements OnDestroy {
     readonly stalkerStore = inject(StalkerStore);
     private readonly playlistService = inject(PlaylistsService);
+    private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
     private readonly runtime = inject(RuntimeCapabilitiesService);
     private readonly settingsStore = inject(SettingsStore);
     private readonly portalPlayer = inject(PORTAL_PLAYER);
@@ -122,33 +136,128 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
     readonly searchTerm = computed(() =>
         this.stalkerStore.searchPhrase().trim().toLowerCase()
     );
-    readonly visibleChannels = computed(() => {
-        const channels = this.channels();
+    /** Full-list mode: the complete channel list is cached, so search covers everything. */
+    readonly isFullListMode = computed(
+        () => !this.isRadioMode() && this.stalkerStore.itvFullListActive()
+    );
+    /**
+     * True when the CURRENT category is actually served from the cache.
+     * Censored (adult) genres are excluded from `get_all_channels` on most
+     * portals, so they stay on the legacy paged flow (portal pagination,
+     * infinite scroll) even while the full-list cache is active.
+     */
+    readonly isCategoryFromCache = computed(
+        () =>
+            !this.isRadioMode() &&
+            this.stalkerStore.itvSelectedCategoryFromCache()
+    );
+    /**
+     * Channels matching the search phrase. Without a term, the current
+     * category. With a term in full-list mode, the WHOLE portal's channel list
+     * (every category) so search behaves like "search all channels" — merged
+     * with the currently loaded channels, because a censored (adult) category
+     * is paged from the portal and its channels are intentionally absent from
+     * the full-list cache. Otherwise the loaded channels of the current
+     * category.
+     */
+    readonly filteredChannels = computed(() => {
         const term = this.searchTerm();
-
         if (!term) {
-            return channels;
+            return this.channels();
         }
 
-        return channels.filter((item) =>
+        let source = this.channels();
+        if (this.isFullListMode()) {
+            const merged = new Map<string, StalkerItvChannel>();
+            for (const channel of source) {
+                merged.set(normalizeStalkerEntityId(channel.id), channel);
+            }
+            for (const channel of this.stalkerStore.itvFullChannelList()) {
+                const id = normalizeStalkerEntityId(channel.id);
+                if (!merged.has(id)) {
+                    merged.set(id, channel);
+                }
+            }
+            source = [...merged.values()];
+        }
+
+        return source.filter((item) =>
             `${item.o_name ?? ''} ${item.name ?? ''}`
                 .toLowerCase()
                 .includes(term)
         );
     });
-    readonly hasMoreItems = this.stalkerStore.hasMoreChannels;
+    readonly isFullListLoading = computed(
+        () => !this.isRadioMode() && this.stalkerStore.itvFullListLoading()
+    );
+    readonly fullListProgress = this.stalkerStore.itvFullListProgress;
+    readonly itvFullChannelList = this.stalkerStore.itvFullChannelList;
+    /**
+     * All-channels grid in the main area when no category is selected yet
+     * (Xtream "All Items" parity). Falls back to the "select a category"
+     * placeholder on portals without a usable full list.
+     */
+    readonly showItvAllItems = computed(
+        () =>
+            !this.isRadioMode() &&
+            !this.stalkerStore.selectedCategoryId() &&
+            (this.stalkerStore.itvFullListActive() ||
+                this.stalkerStore.itvFullListLoading())
+    );
+    /** Windowed render limit keeps the DOM bounded for multi-thousand channel lists. */
+    private readonly renderLimit = linkedSignal({
+        source: () => ({
+            term: this.searchTerm(),
+            category: this.stalkerStore.selectedCategoryId(),
+            contentType: this.stalkerStore.selectedContentType(),
+        }),
+        computation: () => FULL_LIST_RENDER_CHUNK,
+    });
+    readonly visibleChannels = computed(() =>
+        this.isCategoryFromCache()
+            ? this.filteredChannels().slice(0, this.renderLimit())
+            : this.filteredChannels()
+    );
+    readonly totalChannelCount = computed(() => this.filteredChannels().length);
+    readonly hasMoreItems = computed(() =>
+        this.isCategoryFromCache()
+            ? this.visibleChannels().length < this.filteredChannels().length
+            : this.stalkerStore.hasMoreChannels()
+    );
     readonly isLoadingMore = signal(false);
+    /**
+     * Skeleton shows only while a load is genuinely in flight. An empty result
+     * once loading has settled is an empty category, not a stuck spinner — the
+     * full-list cache can legitimately filter a genre down to zero channels.
+     */
     readonly isInitialChannelsLoading = computed(
         () =>
             !!this.stalkerStore.selectedCategoryId() &&
             this.channels().length === 0 &&
-            !this.searchTerm()
+            !this.searchTerm() &&
+            (this.isFullListLoading() ||
+                this.stalkerStore.isPaginatedContentLoading())
+    );
+    /** Category is loaded but has no channels (and the user isn't searching). */
+    readonly isCategoryEmpty = computed(
+        () =>
+            !!this.stalkerStore.selectedCategoryId() &&
+            !this.searchTerm() &&
+            this.channels().length === 0 &&
+            !this.isInitialChannelsLoading()
     );
 
     readonly selectedChannelId = this.stalkerStore.selectedItvId;
     protected readonly normalizeStalkerEntityId = normalizeStalkerEntityId;
+
+    /** Context menu (Map EPG) */
+    readonly contextMenuTrigger =
+        viewChild.required<MatMenuTrigger>('contextMenuTrigger');
+    readonly contextMenuChannel = signal<StalkerItvChannel | null>(null);
+    readonly contextMenuPosition = signal({ x: '0px', y: '0px' });
     readonly isElectron = this.runtime.isElectron;
     readonly supportsEpg = this.runtime.supportsEpg;
+    readonly supportsEpgMapping = this.runtime.supportsEpgMapping;
     readonly openStreamOnDoubleClick = computed(() =>
         this.settingsStore.openStreamOnDoubleClick()
     );
@@ -276,14 +385,33 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
                 });
         }
 
-        // Reset channels/page on category change
+        // Start the full ITV channel list load as soon as the Live TV section
+        // is entered (not on the first category click), so the all-channels
+        // grid and the category count badges are available immediately.
+        effect(() => {
+            const contentType = this.stalkerStore.selectedContentType();
+            const playlist = this.stalkerStore.currentPlaylist();
+            if (contentType === 'itv' && playlist) {
+                untracked(() => this.stalkerStore.preloadItvChannels());
+            }
+        });
+
+        // Reset channels/page on category change. When the new category is
+        // served from the cache, the content loader re-serves the filtered
+        // list synchronously, so clearing here would just clobber it (the
+        // reset effect runs after the store resource) and leave the list stuck
+        // empty. Categories on the legacy paged flow — cold cache AND censored
+        // genres missing from the cache — still clear to avoid flashing the
+        // previous category's channels during the async fetch.
         effect(() => {
             const contentType = this.stalkerStore.selectedContentType();
             this.stalkerStore.selectedCategoryId();
             untracked(() => {
                 if (contentType === 'radio') {
                     this.stalkerStore.setRadioChannels([]);
-                } else {
+                } else if (
+                    !this.stalkerStore.itvSelectedCategoryFromCache()
+                ) {
                     this.stalkerStore.setItvChannels([]);
                 }
                 this.stalkerStore.setPage(0);
@@ -311,6 +439,15 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
             }
 
             this.syncBulkEpgPreviews(channels);
+
+            // Overlay manual EPG mappings for the rendered channels; the
+            // store dedupes per channel id, so this is cheap on rerenders.
+            if (this.supportsEpgMapping && channels.length > 0) {
+                const channelIds = channels.map((channel) => channel.id);
+                untracked(() =>
+                    void this.stalkerStore.applyMappedItvEpg(channelIds)
+                );
+            }
         });
 
         effect(() => {
@@ -326,6 +463,28 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
             this.stalkerStore.clearBulkItvEpgCache();
         });
 
+        // Load the bulk ITV EPG as soon as a category's channels are available
+        // — not only after the first channel is played — so the per-channel
+        // "now playing" previews in the list and the EPG panel populate
+        // immediately. Registered AFTER the playlist-change effect above so a
+        // portal switch clears the stale cache first and this then refills it;
+        // ensureBulkItvEpg de-duplicates and reuses the cache, so this is safe
+        // to fire on every channel-list change.
+        effect(() => {
+            const hasChannels = this.itvChannels().length > 0;
+            const playlistId = this.stalkerStore.currentPlaylist()?._id;
+            if (
+                this.isRadioMode() ||
+                !this.supportsEpg ||
+                !hasChannels ||
+                !playlistId
+            ) {
+                return;
+            }
+
+            untracked(() => void this.stalkerStore.ensureBulkItvEpg(168));
+        });
+
         // Setup scroll listener when container becomes available
         effect(() => {
             const container = this.scrollContainer();
@@ -342,7 +501,7 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
 
             const selectedItem = this.stalkerStore.selectedItem();
             const selectedType = this.stalkerStore.selectedContentType();
-            const channels = this.visibleChannels();
+            const channels = this.filteredChannels();
 
             if (selectedType !== 'itv' || !selectedItem?.id) {
                 remoteControl.updateRemoteControlStatus({
@@ -412,6 +571,7 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
         const requestId = ++this.playbackRequestId;
         const channelId = normalizeStalkerEntityId(item.id);
         this.stalkerStore.setSelectedItem(item);
+        this.ensureChannelWithinRenderWindow(channelId);
 
         try {
             const isRadioMode = this.isRadioMode();
@@ -501,13 +661,53 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
         }
     }
 
+    /**
+     * In full-list mode the rendered list is windowed to `renderLimit`. When a
+     * channel beyond that window is selected (remote channel-up/down, numeric
+     * select), grow the window so the selection is actually in the DOM and can
+     * be highlighted/scrolled to instead of drifting off-window.
+     */
+    private ensureChannelWithinRenderWindow(channelId: string): void {
+        if (!this.isCategoryFromCache()) {
+            return;
+        }
+
+        const index = this.filteredChannels().findIndex(
+            (item) => normalizeStalkerEntityId(item.id) === channelId
+        );
+        if (index < 0 || index < this.renderLimit()) {
+            return;
+        }
+
+        const needed =
+            Math.ceil((index + 1) / FULL_LIST_RENDER_CHUNK) *
+            FULL_LIST_RENDER_CHUNK;
+        this.renderLimit.set(Math.max(this.renderLimit(), needed));
+    }
+
     loadMore() {
+        if (this.isCategoryFromCache()) {
+            // Extends the render window over the in-memory list — no request.
+            if (this.hasMoreItems()) {
+                this.renderLimit.update(
+                    (limit) => limit + FULL_LIST_RENDER_CHUNK
+                );
+            }
+            return;
+        }
+
+        // Legacy portal pagination — also used for censored (adult) genres
+        // that are absent from the full-list cache.
         if (this.isLoadingMore() || !this.hasMoreItems()) return;
         this.isLoadingMore.set(true);
         const nextPage = this.stalkerStore.page() + 1;
         this.stalkerStore.setPage(nextPage);
     }
 
+    refreshChannels(): void {
+        void this.stalkerStore.refreshItvChannels();
+    }
+
     onLiveEpgPanelCollapsedChange(collapsed: boolean): void {
         const state: LiveEpgPanelState = collapsed ? 'collapsed' : 'expanded';
         this.liveEpgPanelState.set(state);
@@ -544,6 +744,94 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
         this.selectedLiveEpgDate.set(selectedDate);
     }
 
+    // ── Context menu (Map EPG) ─────────────────────────────────────
+
+    onChannelContextMenu(channel: StalkerItvChannel, event: MouseEvent): void {
+        this.contextMenuChannel.set(channel);
+        this.contextMenuPosition.set({
+            x: `${event.clientX}px`,
+            y: `${event.clientY}px`,
+        });
+
+        const trigger = this.contextMenuTrigger();
+        if (trigger.menuOpen) {
+            trigger.closeMenu();
+        }
+
+        queueMicrotask(() => {
+            this.contextMenuTrigger().openMenu();
+        });
+    }
+
+    async openEpgMapping(): Promise<void> {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const playlistId = this.stalkerStore.currentPlaylist()?._id;
+        const channelId = normalizeStalkerEntityId(channel.id);
+        if (!playlistId || !channelId) {
+            return;
+        }
+
+        const channelKey = buildStalkerEpgMappingKey(
+            String(playlistId),
+            channelId
+        );
+        const mappingBefore = await this.epgBridge
+            .getEpgMapping(channelKey)
+            .catch(() => null);
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.o_name || channel.name || channelId,
+            playlistId: String(playlistId),
+        })
+            .afterClosed()
+            .subscribe(() => {
+                void this.refreshEpgAfterMappingChange(
+                    channel,
+                    channelKey,
+                    mappingBefore?.epgChannelId ?? null
+                );
+            });
+    }
+
+    /**
+     * Reload EPG state when the dialog actually changed the mapping —
+     * covers both save and removal; a plain cancel skips the reload.
+     */
+    private async refreshEpgAfterMappingChange(
+        channel: StalkerItvChannel,
+        channelKey: string,
+        epgChannelIdBefore: string | null
+    ): Promise<void> {
+        const mappingAfter = await this.epgBridge
+            .getEpgMapping(channelKey)
+            .catch(() => null);
+        if ((mappingAfter?.epgChannelId ?? null) === epgChannelIdBefore) {
+            return;
+        }
+
+        this.stalkerStore.clearBulkItvEpgCache();
+        const selectedId = this.selectedChannelId();
+        const selected = selectedId
+            ? this.channels().find(
+                  (item) =>
+                      normalizeStalkerEntityId(item.id) ===
+                      normalizeStalkerEntityId(selectedId)
+              )
+            : null;
+        await this.loadEpgForChannel(selected ?? channel);
+        // Use the unfiltered list so an active search filter cannot drop
+        // the playing channel's mapping override.
+        await this.stalkerStore.applyMappedItvEpg(
+            this.channels().map((item) => item.id)
+        );
+    }
+
     private async loadEpgForChannel(item: StalkerItvChannel) {
         if (!this.supportsEpg) {
             this.fallbackEpgPrograms.set([]);
@@ -815,7 +1103,7 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
             return;
         }
 
-        const channels = this.visibleChannels();
+        const channels = this.filteredChannels();
         const nextItem = getAdjacentChannelItem(
             channels,
             activeItem.id,
@@ -843,7 +1131,7 @@ export class StalkerLiveStreamLayoutComponent implements OnDestroy {
         }
 
         const channel = getChannelItemByNumber(
-            this.visibleChannels(),
+            this.filteredChannels(),
             command.number
         );
         if (!channel) {
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts
index a94388d7c..b9f9f2913 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-quick-start.ts
@@ -6,6 +6,7 @@ import {
 } from '@iptvnator/portal/shared/util';
 import {
     getVodSeriesSeasonKey,
+    getVodSeriesSeasonNumber,
     type VodSeriesSeasonVm,
 } from '@iptvnator/portal/stalker/data-access';
 import type {
@@ -15,6 +16,7 @@ import type {
 
 export interface StalkerQuickStartButton {
     labelKey: string;
+    labelParams?: Record<string, number>;
     episodeLabel: string | null;
     icon: string;
     disabled: boolean;
@@ -72,6 +74,7 @@ export function getStalkerSeriesQuickStartButton(
 
     return {
         labelKey: action.labelKey,
+        labelParams: action.labelParams,
         episodeLabel: action.episodeLabel,
         icon: action.icon,
         disabled: action.disabled,
@@ -158,16 +161,8 @@ function getLazyVodSeriesEpisodeLabel(
     season: VodSeriesSeasonVm,
     seasons: ReadonlyArray<VodSeriesSeasonVm>
 ): string {
-    const seasonIndex = seasons.findIndex((item) => item.id === season.id);
-    const parsedSeasonNumber = Number(season.season_number);
-    const seasonNumber =
-        Number.isInteger(parsedSeasonNumber) && parsedSeasonNumber > 0
-            ? parsedSeasonNumber
-            : getFallbackSeasonNumber(seasonIndex);
-
-    return formatSeriesEpisodeCode(seasonNumber, 1);
-}
-
-function getFallbackSeasonNumber(seasonIndex: number): number {
-    return seasonIndex >= 0 ? seasonIndex + 1 : 1;
+    return formatSeriesEpisodeCode(
+        getVodSeriesSeasonNumber(season, seasons),
+        1
+    );
 }
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.spec.ts b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.spec.ts
new file mode 100644
index 000000000..046beade4
--- /dev/null
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.spec.ts
@@ -0,0 +1,158 @@
+import { TestBed } from '@angular/core/testing';
+import { TmdbEnrichmentService } from '@iptvnator/services';
+import { XtreamSerieEpisode } from '@iptvnator/shared/interfaces';
+import { StalkerSeriesTmdbSeasonsService } from './stalker-series-tmdb-seasons.service';
+
+describe('StalkerSeriesTmdbSeasonsService', () => {
+    let service: StalkerSeriesTmdbSeasonsService;
+    let getSeason: jest.Mock;
+
+    const episodesOfSeason = (season: number): XtreamSerieEpisode[] => [
+        {
+            id: `${season}-1`,
+            episode_num: 1,
+            season,
+            title: 'Episode 1',
+        } as unknown as XtreamSerieEpisode,
+    ];
+
+    beforeEach(() => {
+        getSeason = jest.fn().mockResolvedValue({
+            overview: 'Season overview',
+            episodes: [{ episode_number: 1, name: 'The Marshal' }],
+        });
+        TestBed.configureTestingModule({
+            providers: [
+                StalkerSeriesTmdbSeasonsService,
+                {
+                    provide: TmdbEnrichmentService,
+                    useValue: { getSeason },
+                },
+            ],
+        });
+        service = TestBed.inject(StalkerSeriesTmdbSeasonsService);
+    });
+
+    it('fetches the title-marked season for a renumbered single-season slice', async () => {
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+
+        expect(getSeason).toHaveBeenCalledWith(82856, 2);
+
+        // Overlay still keys by the provider's season key
+        const overlaid = service.overlay(
+            { '1': episodesOfSeason(1) },
+            82856
+        );
+        expect(overlaid['1'][0].title).toBe('The Marshal');
+    });
+
+    it('keeps provider numbering for multi-season items despite a marker', async () => {
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 3,
+        });
+
+        expect(getSeason).toHaveBeenCalledWith(82856, 1);
+    });
+
+    it('keeps provider numbering without fetch context', async () => {
+        await service.fetchSeason(82856, '1', episodesOfSeason(1));
+
+        expect(getSeason).toHaveBeenCalledWith(82856, 1);
+    });
+
+    it('skips a repeat fetch for the same resolved season', async () => {
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+
+        expect(getSeason).toHaveBeenCalledTimes(1);
+    });
+
+    it('refetches when the same provider key resolves to another season', async () => {
+        getSeason.mockResolvedValueOnce({
+            overview: 'Season 2 overview',
+            episodes: [{ episode_number: 1, name: 'Season 2 Episode' }],
+        });
+        // Per-season slices of ONE show share (tmdbId, provider key "1")
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+        expect(getSeason).toHaveBeenCalledWith(82856, 2);
+
+        getSeason.mockResolvedValueOnce({
+            overview: 'Season 3 overview',
+            episodes: [{ episode_number: 1, name: 'Season 3 Episode' }],
+        });
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (3 сезон)',
+            seasonCount: 1,
+        });
+        expect(getSeason).toHaveBeenCalledWith(82856, 3);
+
+        // The newer resolution overwrote the entry under the shared key
+        const overlaid = service.overlay({ '1': episodesOfSeason(1) }, 82856);
+        expect(overlaid['1'][0].title).toBe('Season 3 Episode');
+        expect(service.descriptions(82856)['1']).toBe('Season 3 overview');
+    });
+
+    it('drops the stale entry when a replacement fetch fails', async () => {
+        getSeason.mockResolvedValueOnce({
+            overview: 'Season 2 overview',
+            episodes: [{ episode_number: 1, name: 'Season 2 Episode' }],
+        });
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+
+        // Replacement resolution (another slice of the show) fails —
+        // the season-2 entry must not stay on screen for the new slice
+        getSeason.mockResolvedValueOnce(null);
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (3 сезон)',
+            seasonCount: 1,
+        });
+
+        const overlaid = service.overlay({ '1': episodesOfSeason(1) }, 82856);
+        expect(overlaid['1'][0].title).toBe('Episode 1');
+        expect(service.descriptions(82856)).toEqual({});
+
+        // A later trigger retries and fills the correct season
+        getSeason.mockResolvedValueOnce({
+            overview: 'Season 3 overview',
+            episodes: [{ episode_number: 1, name: 'Season 3 Episode' }],
+        });
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (3 сезон)',
+            seasonCount: 1,
+        });
+        const healed = service.overlay({ '1': episodesOfSeason(1) }, 82856);
+        expect(healed['1'][0].title).toBe('Season 3 Episode');
+    });
+
+    it('does not cache a failed fetch, so a later trigger retries', async () => {
+        getSeason.mockResolvedValueOnce(null);
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+        await service.fetchSeason(82856, '1', episodesOfSeason(1), {
+            rawTitle: 'Мандалорец (2 сезон)',
+            seasonCount: 1,
+        });
+
+        expect(getSeason).toHaveBeenCalledTimes(2);
+        const overlaid = service.overlay({ '1': episodesOfSeason(1) }, 82856);
+        expect(overlaid['1'][0].title).toBe('The Marshal');
+    });
+});
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.ts b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.ts
index 0f53e518d..0d5539bf8 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-tmdb-seasons.service.ts
@@ -4,7 +4,16 @@ import {
     mergeEpisodesWithTmdb,
     type TmdbEpisode,
 } from '@iptvnator/services';
-import { XtreamSerieEpisode } from '@iptvnator/shared/interfaces';
+import {
+    XtreamSerieEpisode,
+    resolveEnrichmentSeasonNumber,
+} from '@iptvnator/shared/interfaces';
+
+interface FetchedTmdbSeason {
+    /** Resolved TMDB season number this entry was fetched for */
+    seasonNumber: number;
+    episodes: TmdbEpisode[];
+}
 
 /**
  * Component-scoped holder for lazily fetched TMDB season data (episode
@@ -12,18 +21,24 @@ import { XtreamSerieEpisode } from '@iptvnator/shared/interfaces';
  * the component's `providers`).
  *
  * Entries are keyed by `${tmdbId}|${seasonKey}` so data from a previously
- * shown series can never leak into the current one.
+ * shown series can never leak into the current one, and each entry records
+ * the RESOLVED TMDB season it holds: per-season slices of one show share
+ * (tmdbId, provider key "1") but resolve to different seasons, and a fetch
+ * made with stale navigation context must be overwritten once the real
+ * context re-resolves — plain key idempotency would block both.
  */
 @Injectable()
 export class StalkerSeriesTmdbSeasonsService {
     private readonly tmdbEnrichment = inject(TmdbEnrichmentService);
 
-    private readonly episodesByKey = signal<
-        ReadonlyMap<string, TmdbEpisode[]>
+    private readonly seasonsByKey = signal<
+        ReadonlyMap<string, FetchedTmdbSeason>
     >(new Map());
     private readonly overviewsByKey = signal<ReadonlyMap<string, string>>(
         new Map()
     );
+    /** mapKey → season number currently being fetched (in-flight dedup) */
+    private readonly pending = new Map<string, number>();
 
     /**
      * Overlays fetched TMDB episode data (real names, overviews, stills)
@@ -34,14 +49,14 @@ export class StalkerSeriesTmdbSeasonsService {
         seasons: Record<string, XtreamSerieEpisode[]>,
         tmdbId: number | null | undefined
     ): Record<string, XtreamSerieEpisode[]> {
-        const fetched = this.episodesByKey();
+        const fetched = this.seasonsByKey();
         if (!tmdbId || fetched.size === 0) {
             return seasons;
         }
 
         const merged: Record<string, XtreamSerieEpisode[]> = {};
         for (const [seasonKey, episodes] of Object.entries(seasons)) {
-            const forSeason = fetched.get(`${tmdbId}|${seasonKey}`);
+            const forSeason = fetched.get(`${tmdbId}|${seasonKey}`)?.episodes;
             merged[seasonKey] = forSeason?.length
                 ? mergeEpisodesWithTmdb(episodes, forSeason)
                 : episodes;
@@ -72,47 +87,98 @@ export class StalkerSeriesTmdbSeasonsService {
     /**
      * Lazily pulls the TMDB season (episode list + overview) for an opened
      * season; a no-op without a show-level TMDB match, with enrichment
-     * disabled, or when the season was already fetched.
+     * disabled, or when the entry already holds the resolved season.
+     * `context` carries the raw provider title and total season count so a
+     * per-season slice ("The Mandalorian (2 season)" with its single season
+     * renumbered to 1) fetches the season the title names instead of the
+     * provider's number. A later call resolving a DIFFERENT season for the
+     * same key (another slice of the show, or corrected navigation context)
+     * refetches and overwrites the entry.
      */
     async fetchSeason(
         tmdbId: number | null | undefined,
         seasonKey: string,
-        episodes: XtreamSerieEpisode[] | undefined
+        episodes: XtreamSerieEpisode[] | undefined,
+        context?: { rawTitle?: string | null; seasonCount?: number }
     ): Promise<void> {
         if (!tmdbId) {
             return;
         }
 
+        const providerSeasonNumber = Number(episodes?.[0]?.season ?? seasonKey);
+        if (!Number.isFinite(providerSeasonNumber)) {
+            return;
+        }
+
+        const seasonNumber = resolveEnrichmentSeasonNumber({
+            rawTitle: context?.rawTitle,
+            providerSeasonNumber,
+            providerSeasonCount: context?.seasonCount ?? 0,
+        });
+
         const mapKey = `${tmdbId}|${seasonKey}`;
-        if (this.episodesByKey().has(mapKey)) {
+        const cached = this.seasonsByKey().get(mapKey);
+        if (
+            cached?.seasonNumber === seasonNumber ||
+            this.pending.get(mapKey) === seasonNumber
+        ) {
             return;
         }
 
-        const seasonNumber = Number(episodes?.[0]?.season ?? seasonKey);
-        if (!Number.isFinite(seasonNumber)) {
-            return;
-        }
+        this.pending.set(mapKey, seasonNumber);
 
-        const season = await this.tmdbEnrichment.getSeason(
-            tmdbId,
-            seasonNumber
-        );
-        if (!season) {
-            return;
+        // A mismatched entry belongs to another slice/context of this
+        // show — drop it BEFORE fetching so a failed replacement fetch
+        // can never leave the wrong season's metadata on screen (the
+        // overlay then falls back to provider data until a retry).
+        if (cached) {
+            this.deleteEntry(mapKey);
         }
+        try {
+            const season = await this.tmdbEnrichment.getSeason(
+                tmdbId,
+                seasonNumber
+            );
+
+            // A newer resolution for this key superseded us mid-flight —
+            // only the latest requested fetch may store its result.
+            if (this.pending.get(mapKey) !== seasonNumber) {
+                return;
+            }
+            if (!season) {
+                // Transient failure — stays uncached so a later trigger
+                // can retry.
+                return;
+            }
 
-        if (season.overview) {
             const overviews = new Map(this.overviewsByKey());
-            overviews.set(mapKey, season.overview);
+            if (season.overview) {
+                overviews.set(mapKey, season.overview);
+            } else {
+                overviews.delete(mapKey);
+            }
             this.overviewsByKey.set(overviews);
-        }
 
-        if (!season.episodes?.length) {
-            return;
+            const next = new Map(this.seasonsByKey());
+            next.set(mapKey, {
+                seasonNumber,
+                episodes: season.episodes ?? [],
+            });
+            this.seasonsByKey.set(next);
+        } finally {
+            if (this.pending.get(mapKey) === seasonNumber) {
+                this.pending.delete(mapKey);
+            }
         }
+    }
 
-        const next = new Map(this.episodesByKey());
-        next.set(mapKey, season.episodes);
-        this.episodesByKey.set(next);
+    private deleteEntry(mapKey: string): void {
+        const next = new Map(this.seasonsByKey());
+        next.delete(mapKey);
+        this.seasonsByKey.set(next);
+
+        const overviews = new Map(this.overviewsByKey());
+        overviews.delete(mapKey);
+        this.overviewsByKey.set(overviews);
     }
 }
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html
index 3b90c38b0..5f7615f50 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.html
@@ -10,6 +10,11 @@
     >
         <!-- Tags: Year, Genre, Rating -->
         <ng-template appDetailTags>
+            @if (serial.info.tmdb_status; as status) {
+                <span class="details__tag details__tag--status">{{
+                    seriesStatusLabelKey(status) | translate
+                }}</span>
+            }
             @if (serial.info.releasedate) {
                 <span class="details__tag">{{ serial.info.releasedate }}</span>
             }
@@ -37,7 +42,7 @@
                         <div class="details__cast-strip">
                             @for (
                                 member of serial.info.tmdb_cast;
-                                track member.name
+                                track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index
                             ) {
                                 <span
                                     class="details__cast-chip"
@@ -78,12 +83,43 @@
                     }
                 </div>
             }
-            @if (serial.info.director) {
+            @if (serial.info.director || serial.info.tmdb_directors?.length) {
                 <div class="details__meta-item">
-                    <span class="label">{{
-                        'XTREAM.DIRECTOR' | translate
-                    }}</span>
-                    <span class="value">{{ serial.info.director }}</span>
+                    <span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
+                    @if (serial.info.tmdb_directors?.length) {
+                        <div class="details__cast-strip">
+                            @for (member of serial.info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
+                                <span
+                                    class="details__cast-chip"
+                                    [class.details__cast-chip--clickable]="
+                                        !!member.tmdbPersonId
+                                    "
+                                    (click)="openActor(member)"
+                                    [title]="member.name"
+                                >
+                                    @if (member.profileUrl) {
+                                        <img
+                                            class="details__cast-avatar"
+                                            [src]="member.profileUrl"
+                                            [alt]="member.name"
+                                            loading="lazy"
+                                        />
+                                    } @else {
+                                        <span
+                                            class="details__cast-avatar details__cast-avatar--fallback"
+                                        >
+                                            {{ member.name.charAt(0) }}
+                                        </span>
+                                    }
+                                    <span class="details__cast-name">{{
+                                        member.name
+                                    }}</span>
+                                </span>
+                            }
+                        </div>
+                    } @else {
+                        <span class="value">{{ serial.info.director }}</span>
+                    }
                 </div>
             }
         </ng-template>
@@ -104,7 +140,10 @@
                     </span>
                     <span class="play-btn__copy">
                         <span class="play-btn__label">
-                            {{ action.labelKey | translate }}
+                            {{
+                                action.labelKey
+                                    | translate: action.labelParams
+                            }}
                         </span>
                         @if (action.episodeLabel) {
                             <span class="play-btn__meta">
@@ -122,7 +161,9 @@
                 detail-player
                 [playback]="playback"
                 [episodeMetadata]="inlineEpisodeMetadata()"
+                [seriesTitle]="serial.info.name"
                 [seriesNavigation]="inlineSeriesNavigation()"
+                [upNextEpisodes]="upNextEpisodes()"
                 (timeUpdate)="handleInlineTimeUpdate($event)"
                 (closed)="closeInlinePlayer()"
                 (backClicked)="goBack()"
@@ -130,6 +171,7 @@
                 (playbackEnded)="handleInlinePlaybackEnded()"
                 (previousEpisodeRequested)="playPreviousEpisode()"
                 (nextEpisodeRequested)="playNextEpisode()"
+                (upNextEpisodeSelected)="playUpNextEpisode($event)"
                 (externalFallbackRequested)="
                     handleExternalFallbackRequest($event)
                 "
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts
index 77e9599b5..dbccdd37a 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.spec.ts
@@ -53,7 +53,9 @@ class StubSeasonContainerComponent {
 class StubPortalInlinePlayerComponent {
     readonly playback = input<unknown>(null);
     readonly episodeMetadata = input<unknown>(null);
+    readonly seriesTitle = input<string | null>(null);
     readonly seriesNavigation = input<unknown>(null);
+    readonly upNextEpisodes = input<unknown>(null);
     readonly timeUpdate = output<unknown>();
     readonly closed = output<void>();
     readonly streamUrlCopied = output<void>();
@@ -61,6 +63,7 @@ class StubPortalInlinePlayerComponent {
     readonly playbackEnded = output<void>();
     readonly previousEpisodeRequested = output<void>();
     readonly nextEpisodeRequested = output<void>();
+    readonly upNextEpisodeSelected = output<unknown>();
 }
 
 @Component({
@@ -79,6 +82,7 @@ describe('StalkerSeriesViewComponent', () => {
     const selectedItem = signal<StalkerVodSource | null>(null);
     const serialSeasonsResource = signal<unknown[]>([]);
     const vodSeriesSeasonsResource = signal<unknown[]>([]);
+    const isSerialSeasonsLoading = signal(false);
     const fetchVodSeriesEpisodes = jest.fn();
     const resolveVodPlayback = jest.fn();
     const getSeriesPlaybackPositions = jest.fn().mockResolvedValue([]);
@@ -106,6 +110,7 @@ describe('StalkerSeriesViewComponent', () => {
             },
         ]);
         vodSeriesSeasonsResource.set([]);
+        isSerialSeasonsLoading.set(false);
         fetchVodSeriesEpisodes.mockReset();
         resolveVodPlayback.mockReset();
         resolveVodPlayback.mockImplementation(
@@ -156,7 +161,7 @@ describe('StalkerSeriesViewComponent', () => {
                         getVodSeriesSeasonsResource: () =>
                             vodSeriesSeasonsResource(),
                         isVodSeriesSeasonsLoading: signal(false),
-                        isSerialSeasonsLoading: signal(false),
+                        isSerialSeasonsLoading,
                         fetchVodSeriesEpisodes,
                         resolveVodPlayback,
                         fetchLinkToPlay: jest.fn(),
@@ -241,7 +246,17 @@ describe('StalkerSeriesViewComponent', () => {
                         StubSeasonContainerComponent,
                         MockPipe(
                             TranslatePipe,
-                            (value: string | null | undefined) => value ?? ''
+                            (
+                                value: string | null | undefined,
+                                params?: Record<string, number>
+                            ) => {
+                                if (value === 'XTREAM.PLAY_EPISODE') {
+                                    return `Play episode ${
+                                        params?.['episode'] ?? '{{episode}}'
+                                    }`;
+                                }
+                                return value ?? '';
+                            }
                         ),
                     ],
                 },
@@ -290,6 +305,68 @@ describe('StalkerSeriesViewComponent', () => {
         );
     });
 
+    it('interpolates the episode number for a recently started VOD is_series episode', async () => {
+        selectedContentType.set('vod');
+        selectedItem.set({
+            id: '50001',
+            is_series: '1',
+            info: {
+                name: 'VOD Flagged Series',
+                description: 'Lazy seasons',
+                movie_image: 'vod-series.jpg',
+            },
+        });
+        serialSeasonsResource.set([]);
+        vodSeriesSeasonsResource.set([]);
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.componentInstance.vodSeriesSeasons.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+                episodes: [
+                    {
+                        id: 'episode-1',
+                        series_number: 1,
+                        name: 'Pilot',
+                    },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+        ]);
+        const episode = fixture.componentInstance.mappedSeasons()['1'][0];
+        fixture.componentInstance.episodePlaybackPositions.set(
+            new Map([
+                [
+                    Number(episode.id),
+                    {
+                        contentXtreamId: Number(episode.id),
+                        contentType: 'episode',
+                        seriesXtreamId: 50001,
+                        positionSeconds: 5,
+                        durationSeconds: 100,
+                    },
+                ],
+            ])
+        );
+        fixture.detectChanges();
+
+        const button: HTMLButtonElement | null =
+            fixture.nativeElement.querySelector(
+                '[data-testid="series-quick-start"]'
+            );
+
+        expect(
+            fixture.componentInstance.quickStartAction()?.labelParams
+        ).toEqual({ episode: 1 });
+        expect(button?.textContent).toContain('Play episode 1');
+        expect(button?.textContent).not.toContain('{{episode}}');
+    });
+
     it('loads the first VOD-series season and starts its first episode from quick start', async () => {
         selectedContentType.set('vod');
         selectedItem.set({
@@ -350,6 +427,15 @@ describe('StalkerSeriesViewComponent', () => {
             expect.any(Number),
             undefined
         );
+        expect(openResolvedPlayback).toHaveBeenCalledWith(
+            expect.objectContaining({
+                contentInfo: expect.objectContaining({
+                    seasonNumber: 1,
+                    episodeNumber: 1,
+                }),
+            }),
+            true
+        );
     });
 
     it('loads an earlier unloaded VOD-series season before showing completed', async () => {
@@ -541,6 +627,14 @@ describe('StalkerSeriesViewComponent', () => {
             By.directive(StubPortalInlinePlayerComponent)
         ).componentInstance as StubPortalInlinePlayerComponent;
 
+        expect(inlinePlayer.playback()).toEqual(
+            expect.objectContaining({
+                contentInfo: expect.objectContaining({
+                    seasonNumber: 1,
+                    episodeNumber: 1,
+                }),
+            })
+        );
         expect(inlinePlayer.episodeMetadata()).toEqual({
             label: 'S01E01',
             title: 'Pilot',
@@ -591,6 +685,259 @@ describe('StalkerSeriesViewComponent', () => {
         );
     });
 
+    it('prefetches the next unopened season so the Up Next rail can spill over', async () => {
+        selectedContentType.set('vod');
+        selectedItem.set({
+            id: '50001',
+            is_series: true,
+            info: {
+                name: 'VOD Flagged Series',
+                description: 'Lazy seasons',
+                movie_image: 'vod-series.jpg',
+            },
+        });
+        serialSeasonsResource.set([]);
+        vodSeriesSeasonsResource.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+            },
+        ]);
+        isEmbeddedPlayer.mockReturnValue(true);
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        // Season 1 loaded, season 2 still empty — the state a user is in
+        // right after opening the series and starting the first episode.
+        fixture.componentInstance.vodSeriesSeasons.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+                episodes: [
+                    { id: 'episode-1', series_number: 1, name: 'Pilot' },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+                episodes: [],
+                isLoading: false,
+                isExpanded: false,
+            },
+        ]);
+        fetchVodSeriesEpisodes.mockClear();
+        fetchVodSeriesEpisodes.mockResolvedValue([
+            { id: 'episode-3', series_number: 1, name: 'Next Season' },
+        ]);
+
+        const firstEpisode = fixture.componentInstance.mappedSeasons()['1'][0];
+        fixture.componentInstance.onEpisodeClicked(firstEpisode);
+        await fixture.whenStable();
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(fetchVodSeriesEpisodes).toHaveBeenCalledWith(
+            '50001',
+            'season-2'
+        );
+
+        const inlinePlayer = fixture.debugElement.query(
+            By.directive(StubPortalInlinePlayerComponent)
+        ).componentInstance as StubPortalInlinePlayerComponent;
+        const railItems = inlinePlayer.upNextEpisodes() as Array<{
+            label: string;
+        }>;
+        expect(railItems.map((item) => item.label)).toEqual([
+            'S01E01',
+            'S02E01',
+        ]);
+    });
+
+    it('does not re-request a spillover season that came back empty', async () => {
+        selectedContentType.set('vod');
+        selectedItem.set({
+            id: '50001',
+            is_series: true,
+            info: {
+                name: 'VOD Flagged Series',
+                description: 'Lazy seasons',
+                movie_image: 'vod-series.jpg',
+            },
+        });
+        serialSeasonsResource.set([]);
+        vodSeriesSeasonsResource.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+            },
+        ]);
+        isEmbeddedPlayer.mockReturnValue(true);
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.vodSeriesSeasons.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+                episodes: [
+                    { id: 'episode-1', series_number: 1, name: 'Pilot' },
+                    { id: 'episode-2', series_number: 2, name: 'Second' },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+                episodes: [],
+                isLoading: false,
+                isExpanded: false,
+            },
+        ]);
+        fetchVodSeriesEpisodes.mockClear();
+        // Failed or genuinely empty season: isLoading returns to false while
+        // episodes stays empty — the retry trap.
+        fetchVodSeriesEpisodes.mockResolvedValue([]);
+
+        const seasonOne = fixture.componentInstance.mappedSeasons()['1'];
+        fixture.componentInstance.onEpisodeClicked(seasonOne[0]);
+        await fixture.whenStable();
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(fetchVodSeriesEpisodes).toHaveBeenCalledTimes(1);
+
+        // Further playback activity in the same season must not retrigger it.
+        fixture.componentInstance.onEpisodeClicked(seasonOne[1]);
+        await fixture.whenStable();
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(fetchVodSeriesEpisodes).toHaveBeenCalledTimes(1);
+    });
+
+    it('retries a failed spillover prefetch on the next episode', async () => {
+        selectedContentType.set('vod');
+        selectedItem.set({
+            id: '50001',
+            is_series: true,
+            info: {
+                name: 'VOD Flagged Series',
+                description: 'Lazy seasons',
+                movie_image: 'vod-series.jpg',
+            },
+        });
+        serialSeasonsResource.set([]);
+        vodSeriesSeasonsResource.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+            },
+        ]);
+        isEmbeddedPlayer.mockReturnValue(true);
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.vodSeriesSeasons.set([
+            {
+                id: 'season-1',
+                video_id: '50001',
+                season_number: '1',
+                name: 'Season 1',
+                episodes: [
+                    { id: 'episode-1', series_number: 1, name: 'Pilot' },
+                    { id: 'episode-2', series_number: 2, name: 'Second' },
+                ],
+                isLoading: false,
+                isExpanded: false,
+            },
+            {
+                id: 'season-2',
+                video_id: '50001',
+                season_number: '2',
+                name: 'Season 2',
+                episodes: [],
+                isLoading: false,
+                isExpanded: false,
+            },
+        ]);
+        fetchVodSeriesEpisodes.mockClear();
+        fetchVodSeriesEpisodes.mockRejectedValueOnce(new Error('network'));
+
+        const seasonOne = fixture.componentInstance.mappedSeasons()['1'];
+        fixture.componentInstance.onEpisodeClicked(seasonOne[0]);
+        await fixture.whenStable();
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        // The failure must not loop while the same episode keeps playing.
+        expect(fetchVodSeriesEpisodes).toHaveBeenCalledTimes(1);
+
+        // Moving to the next episode gives the transient failure a new chance.
+        fetchVodSeriesEpisodes.mockResolvedValue([
+            { id: 'episode-3', series_number: 1, name: 'Next Season' },
+        ]);
+        fixture.componentInstance.onEpisodeClicked(seasonOne[1]);
+        await fixture.whenStable();
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(fetchVodSeriesEpisodes).toHaveBeenCalledTimes(2);
+
+        const inlinePlayer = fixture.debugElement.query(
+            By.directive(StubPortalInlinePlayerComponent)
+        ).componentInstance as StubPortalInlinePlayerComponent;
+        const railItems = inlinePlayer.upNextEpisodes() as Array<{
+            label: string;
+        }>;
+        expect(railItems.map((item) => item.label)).toEqual([
+            'S01E02',
+            'S02E01',
+        ]);
+    });
+
     it('loads the next unloaded VOD-series season after the loaded season is watched', async () => {
         selectedContentType.set('vod');
         selectedItem.set({
@@ -727,4 +1074,145 @@ describe('StalkerSeriesViewComponent', () => {
 
         expect(tmdbGetSeason).toHaveBeenCalledWith(777, 1);
     });
+
+    it('waits for the season map before fetching so a per-season slice gets the title-marked season', async () => {
+        serialSeasonsResource.set([]);
+        selectedItem.set({
+            id: '30001',
+            cmd: '/media/file_30001.mpg',
+            info: {
+                name: 'Regular Series (2 season)',
+                description: 'Series description',
+                movie_image: 'poster.jpg',
+                tmdb_id: 777,
+            },
+        } as never);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.onSeasonSelected('1');
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        // Season resource still loading — fetching now would pass a zero
+        // season count, suppress the title-marker override and cache the
+        // wrong season forever (fetchSeason is idempotent).
+        expect(tmdbGetSeason).not.toHaveBeenCalled();
+
+        serialSeasonsResource.set([
+            {
+                id: 'season-1',
+                name: 'Season 1',
+                cmd: '/media/file_30001.mpg',
+                series: [1, 2],
+            },
+        ]);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        // Single-season slice whose provider season is renumbered to 1:
+        // the title marker names the real TMDB season.
+        expect(tmdbGetSeason).toHaveBeenCalledWith(777, 2);
+    });
+
+    it('gates the fetch on the reloading season resource during detail-to-detail navigation', async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.onSeasonSelected('1');
+        fixture.detectChanges();
+        await fixture.whenStable();
+        // No show-level TMDB match yet — nothing fetched for the first item
+        expect(tmdbGetSeason).not.toHaveBeenCalled();
+
+        // Detail-to-detail navigation reuses the component; the new item's
+        // TMDB match can arrive while the season resource reloads and the
+        // map still shows the previous series' seasons.
+        isSerialSeasonsLoading.set(true);
+        selectedItem.set({
+            id: '30002',
+            cmd: '/media/file_30002.mpg',
+            info: {
+                name: 'Other Series (2 season)',
+                description: 'Other description',
+                movie_image: 'poster2.jpg',
+                tmdb_id: 888,
+            },
+        } as never);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        // The new tmdb_id must NOT pair with the previous series' season
+        // context while the resource reloads.
+        expect(tmdbGetSeason).not.toHaveBeenCalled();
+
+        // Once the new item's own seasons land, the fetch runs WITHOUT a
+        // new seasonSelected emission — the season container deduplicates
+        // emissions when both items share the same season-key set, so the
+        // retained key must stay usable.
+        serialSeasonsResource.set([
+            {
+                id: 'season-1',
+                name: 'Season 1',
+                cmd: '/media/file_30002.mpg',
+                series: [1, 2],
+            },
+        ]);
+        isSerialSeasonsLoading.set(false);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        expect(tmdbGetSeason).toHaveBeenCalledWith(888, 2);
+    });
+
+    it('enriches after equal-id navigation once the season resource settles', async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.componentInstance.onSeasonSelected('1');
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        // Distinct items can reuse a provider id; the loading gate (not an
+        // id comparison) keeps the stale map from being used.
+        isSerialSeasonsLoading.set(true);
+        selectedItem.set({
+            id: '30001',
+            cmd: '/media/file_30001.mpg',
+            info: {
+                name: 'Different Series (3 season)',
+                description: 'Different description',
+                movie_image: 'poster3.jpg',
+                tmdb_id: 999,
+            },
+        } as never);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        expect(tmdbGetSeason).not.toHaveBeenCalled();
+
+        isSerialSeasonsLoading.set(false);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        expect(tmdbGetSeason).toHaveBeenCalledWith(999, 3);
+    });
+
+    it('reads the season marker from o_name when name is generic', async () => {
+        selectedItem.set({
+            id: '30001',
+            cmd: '/media/file_30001.mpg',
+            info: {
+                name: 'Regular Series',
+                o_name: 'Regular Series (2 season)',
+                description: 'Series description',
+                movie_image: 'poster.jpg',
+                tmdb_id: 777,
+            },
+        } as never);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.onSeasonSelected('1');
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        expect(tmdbGetSeason).toHaveBeenCalledWith(777, 2);
+    });
 });
diff --git a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts
index 5e7cb5da8..88d6d48a1 100644
--- a/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts
+++ b/libs/portal/stalker/feature/src/lib/stalker-series-view/stalker-series-view.component.ts
@@ -23,8 +23,10 @@ import {
     SeasonContainerPlaybackToggleRequest,
 } from '@iptvnator/ui/components';
 import {
+    pickSeasonMarkedTitle,
     PlaybackPositionData,
     ResolvedPortalPlayback,
+    seriesStatusLabelKey,
     TmdbEnrichedCastMember,
     XtreamSerieEpisode,
     youtubeEmbedUrl,
@@ -54,12 +56,14 @@ import {
     StalkerVodSource,
 } from '@iptvnator/portal/stalker/data-access';
 import {
+    buildUpNextRailItems,
     getSeriesEpisodeMetadata,
     getSeriesPlaybackNavigation,
     type PlaybackFallbackRequest,
     PortalInlinePlayerComponent,
     resolveSeriesPlaybackEpisodeState,
     type SeriesPlaybackEpisodeState,
+    type UpNextRailItem,
 } from '@iptvnator/ui/playback';
 import {
     CrossPortalSimilarItem,
@@ -132,6 +136,9 @@ export class StalkerSeriesViewComponent implements OnDestroy {
     private readonly tmdbSeasons = inject(StalkerSeriesTmdbSeasonsService);
     private readonly crossPortalSimilar = inject(CrossPortalSimilarService);
 
+    /** Maps the status token to its translated label key */
+    readonly seriesStatusLabelKey = seriesStatusLabelKey;
+
     /**
      * TMDB recommendations found in the user's Xtream portals (batched DB
      * match, Electron only) — Stalker catalogs are server-paginated, so
@@ -162,7 +169,15 @@ export class StalkerSeriesViewComponent implements OnDestroy {
         });
     });
 
-    /** Season currently selected in the season container. */
+    /**
+     * Season currently selected in the season container. Deliberately NOT
+     * reset on detail-to-detail navigation: the season container keeps its
+     * own selection and deduplicates `seasonSelected` emissions, so when
+     * two items share the same season-key set (commonly just "1") it never
+     * re-emits — a parent-side reset would leave the new item permanently
+     * unenriched. Stale-context safety lives in the fetch effect's
+     * coherence gates instead (see the constructor).
+     */
     private readonly selectedSeasonKey = signal<string | null>(null);
 
     /** Season descriptions for the season tabs (TMDB overview per season). */
@@ -204,14 +219,43 @@ export class StalkerSeriesViewComponent implements OnDestroy {
         // tmdb_id — so the fetch must re-run when the match arrives, not only
         // on selection. fetchSeason is idempotent per (tmdbId, season).
         effect(() => {
-            const tmdbId = this.displayItem()?.info?.tmdb_id;
+            const item = this.displayItem();
+            const tmdbId = item?.info?.tmdb_id;
             const seasonKey = this.selectedSeasonKey();
-            if (tmdbId && seasonKey) {
+            // Coherence gates instead of timing assumptions. All inputs are
+            // read TRACKED so the effect re-runs as each one settles:
+            // - the season resource must not be mid-reload — during
+            //   detail-to-detail navigation a reused component briefly
+            //   pairs the NEW item's tmdb_id with the PREVIOUS item's map
+            // - the selected key must exist in the map with episodes — an
+            //   empty map would pass seasonCount 0 (suppressing the
+            //   title-marker override), and a key retained from the
+            //   previous item is only usable when the new item has that
+            //   season too (otherwise the container's auto-select re-emits)
+            // Re-running on overlay updates cannot loop (fetchSeason skips
+            // when its entry already holds the resolved season), and a
+            // fetch made with a stale snapshot is overwritten once the
+            // real context re-resolves to a different season.
+            const seasonsLoading = this.isVodSeries()
+                ? this.isVodSeriesSeasonsLoading()
+                : this.isSerialSeasonsLoading();
+            const seasons = this.mappedSeasons();
+            const episodes = seasonKey ? seasons[seasonKey] : undefined;
+            if (tmdbId && seasonKey && !seasonsLoading && episodes?.length) {
                 untracked(() =>
                     void this.tmdbSeasons.fetchSeason(
                         tmdbId,
                         seasonKey,
-                        this.mappedSeasons()[seasonKey]
+                        episodes,
+                        {
+                            // The season marker can live in either title
+                            // field (generic name + descriptive o_name)
+                            rawTitle: pickSeasonMarkedTitle(
+                                item?.info?.name,
+                                item?.info?.o_name
+                            ),
+                            seasonCount: Object.keys(seasons).length,
+                        }
                     )
                 );
             }
@@ -381,6 +425,87 @@ export class StalkerSeriesViewComponent implements OnDestroy {
     readonly inlineSeriesNavigation = computed(() =>
         getSeriesPlaybackNavigation(this.inlineEpisodeState())
     );
+    /** "Up Next" rail entries for the inline player (series only). */
+    readonly upNextEpisodes = computed<UpNextRailItem[]>(() =>
+        buildUpNextRailItems({
+            episodesBySeason: this.mappedSeasons(),
+            currentEpisodeId: this.inlineEpisodeState()?.episode.id,
+            playbackPositions: this.episodePlaybackPositions(),
+        })
+    );
+
+    /**
+     * Seasons the portal has already answered for on the rail's behalf. An
+     * answered-but-empty season is a real answer, so it is recorded here and
+     * never asked for again — otherwise the effect below would re-request it
+     * on every emission for as long as playback continues.
+     */
+    private readonly prefetchedSpilloverSeasonIds = new Set<string>();
+    /**
+     * The last spillover request that *failed*, tagged with the episode that
+     * triggered it. A failure is not permanent (it may be a transient network
+     * or authorization error), but retrying immediately would loop: the
+     * failure itself flips `isLoading` and re-runs the effect. Pinning it to
+     * the episode defers the retry to the next playback change instead.
+     */
+    private spilloverPrefetchFailure: {
+        key: string;
+        episodeId: string | number;
+    } | null = null;
+
+    /**
+     * Ministra VOD-series seasons hold no episodes until their tab is opened,
+     * so the rail's next-season spillover would silently stop at the end of
+     * the playing season. While an episode plays inline, fetch the following
+     * season's episodes so the spillover is actually there.
+     */
+    private readonly prefetchRailSpilloverSeason = effect(() => {
+        const episodeState = this.inlineEpisodeState();
+        const seasonKey = episodeState?.seasonKey;
+        const seasons = this.vodSeriesSeasons();
+        if (!this.isVodSeries() || !seasonKey) {
+            return;
+        }
+
+        const currentIndex = seasons.findIndex(
+            (season) => getVodSeriesSeasonKey(season) === seasonKey
+        );
+        const nextSeason =
+            currentIndex >= 0 ? seasons[currentIndex + 1] : undefined;
+        if (!nextSeason || nextSeason.isLoading || nextSeason.episodes.length) {
+            return;
+        }
+
+        const prefetchKey = `${nextSeason.video_id}:${nextSeason.id}`;
+        const episodeId = episodeState.episode.id;
+        if (
+            this.prefetchedSpilloverSeasonIds.has(prefetchKey) ||
+            (this.spilloverPrefetchFailure?.key === prefetchKey &&
+                this.spilloverPrefetchFailure.episodeId === episodeId)
+        ) {
+            return;
+        }
+
+        // Claim the season synchronously: awaiting first would let the
+        // `isLoading` flip re-run this effect and fire a duplicate request
+        // before the answer arrives. A failure releases the claim below.
+        this.prefetchedSpilloverSeasonIds.add(prefetchKey);
+
+        untracked(() =>
+            void this.loadEpisodesForSeason(nextSeason).then((answered) => {
+                if (answered) {
+                    this.spilloverPrefetchFailure = null;
+                    return;
+                }
+
+                this.spilloverPrefetchFailure = {
+                    key: prefetchKey,
+                    episodeId,
+                };
+                this.prefetchedSpilloverSeasonIds.delete(prefetchKey);
+            })
+        );
+    });
 
     /**
      * Handles season selection from the container.
@@ -406,11 +531,12 @@ export class StalkerSeriesViewComponent implements OnDestroy {
     /**
      * Loads episodes for a specific VOD season
      */
-    async loadEpisodesForSeason(season: VodSeriesSeasonVm) {
+    /** Resolves true when the portal answered, false when the request failed. */
+    async loadEpisodesForSeason(season: VodSeriesSeasonVm): Promise<boolean> {
         // Set loading state in local signal
         const seasons = this.vodSeriesSeasons();
         const index = seasons.findIndex((s) => s.id === season.id);
-        if (index === -1) return;
+        if (index === -1) return false;
 
         const updatedSeasons = [...seasons];
         updatedSeasons[index] = { ...updatedSeasons[index], isLoading: true };
@@ -433,6 +559,7 @@ export class StalkerSeriesViewComponent implements OnDestroy {
                 };
                 this.vodSeriesSeasons.set(newSeasons);
             }
+            return true;
         } catch (error) {
             this.logger.error('Failed to load episodes', error);
             const newSeasons = [...this.vodSeriesSeasons()];
@@ -444,6 +571,7 @@ export class StalkerSeriesViewComponent implements OnDestroy {
                 };
                 this.vodSeriesSeasons.set(newSeasons);
             }
+            return false;
         }
     }
 
@@ -662,6 +790,10 @@ export class StalkerSeriesViewComponent implements OnDestroy {
         this.onEpisodeClicked(next);
     }
 
+    playUpNextEpisode(item: UpNextRailItem): void {
+        this.onEpisodeClicked(item.episode as XtreamSerieEpisode);
+    }
+
     handleInlinePlaybackEnded(): void {
         const navigation = this.inlineSeriesNavigation();
         if (!navigation?.autoplayEnabled || !navigation.canNext) {
@@ -687,15 +819,37 @@ export class StalkerSeriesViewComponent implements OnDestroy {
                 episodeId,
                 startTime
             );
+            const episodeState =
+                episodeId === undefined
+                    ? null
+                    : resolveSeriesPlaybackEpisodeState({
+                          episodesBySeason: this.mappedSeasons(),
+                          currentEpisodeId: episodeId,
+                          fallbackEpisodeNumber: episodeNum,
+                      });
+            const resolvedPlayback =
+                episodeState && playback.contentInfo?.contentType === 'episode'
+                    ? {
+                          ...playback,
+                          contentInfo: {
+                              ...playback.contentInfo,
+                              seasonNumber: episodeState.seasonNumber,
+                              episodeNumber: episodeState.episodeNumber,
+                          },
+                      }
+                    : playback;
 
             this.lastSaveTime = 0;
             if (this.portalPlayer.isEmbeddedPlayer()) {
-                this.inlinePlayback.set(playback);
+                this.inlinePlayback.set(resolvedPlayback);
                 return;
             }
 
             this.closeInlinePlayer();
-            void this.portalPlayer.openResolvedPlayback(playback, true);
+            void this.portalPlayer.openResolvedPlayback(
+                resolvedPlayback,
+                true
+            );
         } catch (error) {
             this.logger.error('Failed to start inline series playback', error);
             const errorMessage =
diff --git a/libs/portal/xtream/data-access/src/lib/services/epg-queue-invalidation.spec.ts b/libs/portal/xtream/data-access/src/lib/services/epg-queue-invalidation.spec.ts
new file mode 100644
index 000000000..1318b7729
--- /dev/null
+++ b/libs/portal/xtream/data-access/src/lib/services/epg-queue-invalidation.spec.ts
@@ -0,0 +1,141 @@
+import { TestBed } from '@angular/core/testing';
+import { SettingsStore } from '@iptvnator/services';
+import { EpgQueueService } from './epg-queue.service';
+import { XtreamApiService } from './xtream-api.service';
+import { XtreamXmltvFallbackService } from './xtream-xmltv-fallback.service';
+import type { EpgItem } from '@iptvnator/shared/interfaces';
+
+/**
+ * Covers EpgQueueService.invalidate(), used when a manual EPG mapping for a
+ * stream changes. Split from epg-queue.service.spec.ts to keep both files
+ * under the max-lines limit.
+ */
+describe('EpgQueueService invalidation', () => {
+    let service: EpgQueueService;
+    let xtreamApi: { getShortEpg: jest.Mock };
+
+    const credentials = {
+        serverUrl: 'https://xtream.example.com',
+        username: 'user',
+        password: 'pass',
+    };
+
+    type ServicePrivates = {
+        fetchEpg: (
+            credentials: typeof credentials,
+            streamId: number
+        ) => Promise<void>;
+        shouldFetch: (streamId: number) => boolean;
+        xmltvPreviewByStreamId: Map<number, EpgItem>;
+        epgChannelByStreamId: Map<number, string>;
+        inFlight: Set<number>;
+    };
+
+    beforeEach(() => {
+        xtreamApi = { getShortEpg: jest.fn().mockResolvedValue([]) };
+
+        TestBed.configureTestingModule({
+            providers: [
+                EpgQueueService,
+                { provide: XtreamApiService, useValue: xtreamApi },
+                {
+                    provide: XtreamXmltvFallbackService,
+                    useValue: {
+                        getProgramsForChannel: jest.fn().mockResolvedValue([]),
+                        getCurrentProgramsBatch: jest.fn().mockResolvedValue({}),
+                    },
+                },
+                {
+                    provide: SettingsStore,
+                    useValue: {
+                        preferUploadedEpgOverXtream: jest.fn(() => false),
+                    },
+                },
+            ],
+        });
+
+        service = TestBed.inject(EpgQueueService);
+    });
+
+    function priv(): ServicePrivates {
+        return service as unknown as ServicePrivates;
+    }
+
+    function makeItem(channelId: string, title: string): EpgItem {
+        return {
+            id: `${channelId}|x`,
+            epg_id: '',
+            title,
+            lang: '',
+            start: '2026-05-07T08:00:00Z',
+            end: '2026-05-07T09:00:00Z',
+            stop: '2026-05-07T09:00:00Z',
+            description: '',
+            channel_id: channelId,
+            start_timestamp: '0',
+            stop_timestamp: '0',
+        };
+    }
+
+    it('drops every cached artifact so the stream refetches', async () => {
+        xtreamApi.getShortEpg.mockResolvedValue([makeItem('rtl.de', 'Now')]);
+        await priv().fetchEpg(credentials, 555);
+        priv().epgChannelByStreamId.set(555, 'rtl.de');
+        priv().xmltvPreviewByStreamId.set(555, makeItem('rtl.de', 'now'));
+
+        expect(service.getCached(555)).not.toBeNull();
+        expect(priv().shouldFetch(555)).toBe(false);
+
+        service.invalidate(555);
+
+        expect(service.getCached(555)).toBeNull();
+        expect(priv().shouldFetch(555)).toBe(true);
+        expect(priv().epgChannelByStreamId.has(555)).toBe(false);
+        expect(priv().xmltvPreviewByStreamId.has(555)).toBe(false);
+    });
+
+    it('discards an in-flight result when invalidated mid-request', async () => {
+        let resolveEpg!: (items: EpgItem[]) => void;
+        xtreamApi.getShortEpg.mockReturnValue(
+            new Promise<EpgItem[]>((resolve) => {
+                resolveEpg = resolve;
+            })
+        );
+        const emitted: number[] = [];
+        const sub = service.epgResult$.subscribe(({ streamId }) =>
+            emitted.push(streamId)
+        );
+
+        const fetchPromise = priv().fetchEpg(credentials, 707);
+        // The user changes the mapping while the request is still running.
+        service.invalidate(707);
+        // The provider now returns the pre-change (stale) result.
+        resolveEpg([makeItem('rtl.de', 'Stale')]);
+        await fetchPromise;
+
+        expect(service.getCached(707)).toBeNull();
+        expect(emitted).not.toContain(707);
+        sub.unsubscribe();
+    });
+
+    it('leaves a fresh in-flight marker intact when a stale request completes', async () => {
+        let resolveA!: (items: EpgItem[]) => void;
+        xtreamApi.getShortEpg.mockReturnValue(
+            new Promise<EpgItem[]>((resolve) => {
+                resolveA = resolve;
+            })
+        );
+
+        const aPromise = priv().fetchEpg(credentials, 909);
+        // Mapping changes mid-flight; a re-enqueue (request B) then starts and
+        // takes ownership of the in-flight marker.
+        service.invalidate(909);
+        priv().inFlight.add(909);
+
+        resolveA([makeItem('rtl.de', 'Stale')]);
+        await aPromise;
+
+        // Request A was stale, so its finally must not clear B's marker.
+        expect(priv().inFlight.has(909)).toBe(true);
+    });
+});
diff --git a/libs/portal/xtream/data-access/src/lib/services/epg-queue.service.ts b/libs/portal/xtream/data-access/src/lib/services/epg-queue.service.ts
index 0b067b705..3e3b71e92 100644
--- a/libs/portal/xtream/data-access/src/lib/services/epg-queue.service.ts
+++ b/libs/portal/xtream/data-access/src/lib/services/epg-queue.service.ts
@@ -1,6 +1,9 @@
 import { inject, Injectable, OnDestroy } from '@angular/core';
 import { Subject } from 'rxjs';
-import { EpgItem } from '@iptvnator/shared/interfaces';
+import {
+    buildXtreamEpgMappingKey,
+    EpgItem,
+} from '@iptvnator/shared/interfaces';
 import { SettingsStore } from '@iptvnator/services';
 import { XtreamApiService, XtreamCredentials } from './xtream-api.service';
 import { XtreamXmltvFallbackService } from './xtream-xmltv-fallback.service';
@@ -19,6 +22,8 @@ interface CacheEntry {
 export interface EpgQueueEntry {
     streamId: number;
     epgChannelId?: string | null;
+    /** Owning playlist — required to resolve manual EPG mappings. */
+    playlistId?: string | null;
 }
 
 /**
@@ -50,6 +55,8 @@ export class EpgQueueService implements OnDestroy {
     private readonly cache = new Map<number, CacheEntry>();
     private queue: number[] = [];
     private readonly inFlight = new Set<number>();
+    /** Bumped by invalidate() so a stale in-flight result is discarded. */
+    private readonly invalidationEpoch = new Map<number, number>();
     private readonly epgChannelByStreamId = new Map<number, string>();
     private readonly xmltvPreviewByStreamId = new Map<number, EpgItem>();
     private visibleSet = new Set<number>();
@@ -75,6 +82,29 @@ export class EpgQueueService implements OnDestroy {
         return entry.data;
     }
 
+    /**
+     * Drop every cached artifact for a stream so the next enqueue refetches
+     * it. Used when a manual EPG mapping for the stream changes, since the
+     * cached preview/resolution was computed for the previous mapping.
+     *
+     * Also bumps an invalidation epoch and clears `inFlight`: a request that
+     * was already running when the mapping changed carries the pre-change
+     * resolution, so its result is discarded (epoch mismatch in `fetchEpg`)
+     * and clearing `inFlight` lets the immediate re-enqueue schedule a fresh
+     * fetch through the mapping-aware `enqueue()` path.
+     */
+    invalidate(streamId: number): void {
+        this.cache.delete(streamId);
+        this.failureTimestamps.delete(streamId);
+        this.epgChannelByStreamId.delete(streamId);
+        this.xmltvPreviewByStreamId.delete(streamId);
+        this.inFlight.delete(streamId);
+        this.invalidationEpoch.set(
+            streamId,
+            (this.invalidationEpoch.get(streamId) ?? 0) + 1
+        );
+    }
+
     private isFailureCoolingDown(streamId: number): boolean {
         const timestamp = this.failureTimestamps.get(streamId);
         if (timestamp == null) {
@@ -114,6 +144,17 @@ export class EpgQueueService implements OnDestroy {
             typeof entry === 'number' ? { streamId: entry } : { ...entry }
         );
 
+        // Resolve manual EPG mappings before building the per-EPG-id index.
+        // When the user has right-clicked a channel and created a mapping,
+        // the stored key is the playlist-scoped Xtream key, not the
+        // provider's epg_channel_id.  By resolving upfront we get the
+        // correct EPG channel ID for the XMLTV batch call that follows.
+        // Guarded so environments without the bridge (PWA) skip the await
+        // entirely and the enqueue keeps its original microtask timing.
+        if (typeof window.electron?.getEpgMappingsBatch === 'function') {
+            await this.resolveManualMappings(normalized);
+        }
+
         const streamsByEpgId = new Map<string, number[]>();
         for (const entry of normalized) {
             const id = entry.epgChannelId?.trim();
@@ -192,6 +233,62 @@ export class EpgQueueService implements OnDestroy {
         return this.fallbackService.getCurrentProgramsBatch(epgChannelIds);
     }
 
+    /**
+     * Resolve manual EPG mappings for the queued entries.
+     *
+     * The user may have opened the mapping dialog (right-click → "Map EPG")
+     * from any channel list; the stored key is the playlist-scoped Xtream
+     * key, which does not match the provider's epg_channel_id, so the batch
+     * IPC handler's resolveChannelIds() would miss it.  We resolve here,
+     * upfront, so the XMLTV batch call later uses the *mapped* epgChannelId
+     * — the actual EPG channel that carries the XMLTV data. A mapping also
+     * supplies an epgChannelId to entries whose provider did not send one.
+     */
+    private async resolveManualMappings(
+        entries: EpgQueueEntry[]
+    ): Promise<void> {
+        const getEpgMappingsBatch =
+            typeof window.electron?.getEpgMappingsBatch === 'function'
+                ? window.electron.getEpgMappingsBatch
+                : null;
+        if (!getEpgMappingsBatch) {
+            return;
+        }
+
+        const keyByStreamId = new Map<number, string>();
+        for (const entry of entries) {
+            if (!entry.playlistId) continue;
+            keyByStreamId.set(
+                entry.streamId,
+                buildXtreamEpgMappingKey(entry.playlistId, entry.streamId)
+            );
+        }
+        if (keyByStreamId.size === 0) {
+            return;
+        }
+
+        try {
+            // One IPC round-trip for the whole viewport — a per-entry
+            // lookup would put O(N) IPC calls on every scroll event.
+            const mappings = await getEpgMappingsBatch([
+                ...keyByStreamId.values(),
+            ]);
+            for (const entry of entries) {
+                const key = keyByStreamId.get(entry.streamId);
+                const mapped = key ? mappings[key]?.trim() : undefined;
+                if (mapped) {
+                    this.logger.info(
+                        `Mapped stream ${entry.streamId}: ${entry.epgChannelId ?? '(none)'} → ${mapped}`
+                    );
+                    entry.epgChannelId = mapped;
+                }
+            }
+        } catch {
+            // Mapping lookup failure is non-fatal; keep the original
+            // epgChannelId values and proceed.
+        }
+    }
+
     private pruneEphemeralMaps(visibleIds: Set<number>): void {
         for (const id of [...this.epgChannelByStreamId.keys()]) {
             // getCached() honors TTL and lazily evicts expired entries;
@@ -233,6 +330,9 @@ export class EpgQueueService implements OnDestroy {
         credentials: XtreamCredentials,
         streamId: number
     ): Promise<void> {
+        const startEpoch = this.invalidationEpoch.get(streamId) ?? 0;
+        const isStale = (): boolean =>
+            (this.invalidationEpoch.get(streamId) ?? 0) !== startEpoch;
         try {
             const apiItems = await this.apiService.getShortEpg(
                 credentials,
@@ -241,6 +341,11 @@ export class EpgQueueService implements OnDestroy {
                 { suppressErrorLog: true }
             );
 
+            // A mapping change during the request invalidated this result.
+            if (isStale()) {
+                return;
+            }
+
             if (apiItems.length > 0) {
                 this.recordSuccess(streamId, apiItems);
                 return;
@@ -249,13 +354,23 @@ export class EpgQueueService implements OnDestroy {
             const xmltv = this.xmltvPreviewByStreamId.get(streamId);
             this.recordSuccess(streamId, xmltv ? [xmltv] : []);
         } catch (error) {
+            if (isStale()) {
+                return;
+            }
             this.failureTimestamps.set(streamId, Date.now());
             this.logger.error(
                 `Failed to load EPG for stream ${streamId}`,
                 error
             );
         } finally {
-            this.inFlight.delete(streamId);
+            // Only release the in-flight marker if this request still owns it.
+            // When invalidate() cleared it mid-flight, a later re-enqueue may
+            // already have started a new request for the same stream; an
+            // unconditional delete here would drop that request's marker and
+            // let a third concurrent fetch start.
+            if (!isStale()) {
+                this.inFlight.delete(streamId);
+            }
         }
     }
 
diff --git a/libs/portal/xtream/data-access/src/lib/services/xtream-api.service.ts b/libs/portal/xtream/data-access/src/lib/services/xtream-api.service.ts
index ec5a7db01..d85aa843b 100644
--- a/libs/portal/xtream/data-access/src/lib/services/xtream-api.service.ts
+++ b/libs/portal/xtream/data-access/src/lib/services/xtream-api.service.ts
@@ -1,5 +1,6 @@
 import { inject, Injectable } from '@angular/core';
 import { DataService } from '@iptvnator/services';
+import { createLogger } from '@iptvnator/portal/shared/util';
 import {
     EpgItem,
     XtreamCategory,
@@ -78,6 +79,7 @@ interface EpgResponse {
 @Injectable({ providedIn: 'root' })
 export class XtreamApiService {
     private readonly dataService = inject(DataService);
+    private readonly logger = createLogger('XtreamApiService');
 
     async cancelSession(sessionId: string): Promise<boolean> {
         if (
@@ -91,7 +93,7 @@ export class XtreamApiService {
             const result = await window.electron.xtreamCancelSession(sessionId);
             return result.success;
         } catch (error) {
-            console.error('Failed to cancel Xtream session:', error);
+            this.logger.error('Failed to cancel Xtream session:', error);
             return false;
         }
     }
diff --git a/libs/portal/xtream/data-access/src/lib/stores/features/with-epg.feature.ts b/libs/portal/xtream/data-access/src/lib/stores/features/with-epg.feature.ts
index a2aee2ff1..529b327e1 100644
--- a/libs/portal/xtream/data-access/src/lib/stores/features/with-epg.feature.ts
+++ b/libs/portal/xtream/data-access/src/lib/stores/features/with-epg.feature.ts
@@ -6,7 +6,7 @@ import {
     withMethods,
     withState,
 } from '@ngrx/signals';
-import { EpgItem } from '@iptvnator/shared/interfaces';
+import { buildXtreamEpgMappingKey, EpgItem } from '@iptvnator/shared/interfaces';
 import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
 import {
     XtreamApiService,
@@ -40,7 +40,7 @@ const initialEpgState: EpgState = {
 export function withEpg() {
     const logger = createLogger('withEpg');
     type ParentSelectionStoreLike = {
-        currentPlaylist?: () => XtreamCredentials | null;
+        currentPlaylist?: () => (XtreamCredentials & { id?: string }) | null;
         selectedItem?: () => {
             xtream_id?: number | null;
             epg_channel_id?: string | null;
@@ -146,10 +146,33 @@ export function withEpg() {
 
                     patchState(store, { epgItems: [], isLoadingEpg: true });
 
+                    // Resolve manual EPG mapping before the provider waterfall.
+                    // The mapping dialog saves under the playlist-scoped
+                    // Xtream key, so look it up and use the mapped EPG
+                    // channel ID for the XMLTV / provider lookup.
+                    let epgChannelId = selectedItem?.epg_channel_id ?? null;
+                    const playlistId = storeAny.currentPlaylist?.()?.id;
+                    if (runtime.supportsEpgMapping && playlistId) {
+                        try {
+                            const mapping =
+                                await window.electron?.getEpgMapping?.(
+                                    buildXtreamEpgMappingKey(
+                                        playlistId,
+                                        xtreamId
+                                    )
+                                );
+                            if (mapping?.epgChannelId?.trim()) {
+                                epgChannelId = mapping.epgChannelId.trim();
+                            }
+                        } catch {
+                            // Non-fatal; keep original epgChannelId.
+                        }
+                    }
+
                     try {
                         const epgItems =
                             await fallbackService.resolveCurrentEpg({
-                                epgChannelId: selectedItem.epg_channel_id,
+                                epgChannelId,
                                 preferUploaded: preferUploaded(),
                                 fetchProvider: () =>
                                     fetchFullProvider(credentials, xtreamId),
diff --git a/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.spec.ts b/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.spec.ts
index 9c4690bbb..5df070cc8 100644
--- a/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.spec.ts
+++ b/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.spec.ts
@@ -1,5 +1,6 @@
 import type { TmdbEnrichmentService } from '@iptvnator/services';
 import {
+    enrichSerialSeasonWithTmdb,
     enrichSerialSelectionWithTmdb,
     enrichVodSelectionWithTmdb,
 } from './xtream-tmdb-enrichment';
@@ -25,6 +26,7 @@ function createEnrichment(overrides: Partial<TmdbEnrichmentService> = {}) {
         isEnabled: jest.fn(() => true),
         enrichMovie: jest.fn().mockResolvedValue(null),
         enrichTv: jest.fn().mockResolvedValue(null),
+        getSeasonEpisodes: jest.fn().mockResolvedValue(null),
         ...overrides,
     } as unknown as TmdbEnrichmentService;
 }
@@ -173,3 +175,79 @@ describe('enrichSerialSelectionWithTmdb', () => {
         expect(enrichment.enrichTv).not.toHaveBeenCalled();
     });
 });
+
+describe('enrichSerialSeasonWithTmdb', () => {
+    function seasonSliceItem(
+        name: string,
+        episodes: Record<string, { episode_num: number; season: number }[]>
+    ) {
+        return {
+            series_id: '7',
+            info: { ...serialItem.info, name, tmdb_id: 82856 },
+            episodes: Object.fromEntries(
+                Object.entries(episodes).map(([key, list]) => [
+                    key,
+                    list.map((episode) => ({
+                        id: `${key}-${episode.episode_num}`,
+                        title: `Episode ${episode.episode_num}`,
+                        ...episode,
+                    })),
+                ])
+            ),
+        };
+    }
+
+    it('fetches the title-marked season for a renumbered single-season slice', async () => {
+        const store = createStore(
+            seasonSliceItem('The Mandalorian (2 season)', {
+                '1': [{ episode_num: 1, season: 1 }],
+            })
+        );
+        const enrichment = createEnrichment({
+            getSeasonEpisodes: jest
+                .fn()
+                .mockResolvedValue([
+                    { episode_number: 1, name: 'The Marshal' },
+                ]),
+        } as Partial<TmdbEnrichmentService>);
+
+        await enrichSerialSeasonWithTmdb(store, enrichment, '1');
+
+        expect(enrichment.getSeasonEpisodes).toHaveBeenCalledWith(82856, 2);
+        const updated = store.setSelectedItem.mock.calls[0][0] as {
+            episodes: Record<string, { title: string }[]>;
+        };
+        expect(updated.episodes['1'][0].title).toBe('The Marshal');
+    });
+
+    it('keeps provider numbering for multi-season items despite a marker', async () => {
+        const store = createStore(
+            seasonSliceItem('The Mandalorian (2 season)', {
+                '1': [{ episode_num: 1, season: 1 }],
+                '2': [{ episode_num: 1, season: 2 }],
+            })
+        );
+        const enrichment = createEnrichment({
+            getSeasonEpisodes: jest.fn().mockResolvedValue([]),
+        } as Partial<TmdbEnrichmentService>);
+
+        await enrichSerialSeasonWithTmdb(store, enrichment, '1');
+
+        expect(enrichment.getSeasonEpisodes).toHaveBeenCalledWith(82856, 1);
+    });
+
+    it('keeps provider numbering when the title has no marker', async () => {
+        const store = createStore(
+            seasonSliceItem('The Mandalorian', {
+                '1': [{ episode_num: 1, season: 1 }],
+            })
+        );
+        const enrichment = createEnrichment({
+            getSeasonEpisodes: jest.fn().mockResolvedValue([]),
+        } as Partial<TmdbEnrichmentService>);
+
+        await enrichSerialSeasonWithTmdb(store, enrichment, '1');
+
+        expect(enrichment.getSeasonEpisodes).toHaveBeenCalledWith(82856, 1);
+    });
+});
diff --git a/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.ts b/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.ts
index 79bc4de43..8d32d389d 100644
--- a/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.ts
+++ b/libs/portal/xtream/data-access/src/lib/stores/xtream-tmdb-enrichment.ts
@@ -9,6 +9,7 @@ import {
     XtreamSerieDetails,
     XtreamVodDetails,
     getXtreamVodInfo,
+    resolveEnrichmentSeasonNumber,
 } from '@iptvnator/shared/interfaces';
 
 /**
@@ -162,11 +163,19 @@ export async function enrichSerialSeasonWithTmdb<
         return;
     }
 
-    const seasonNumber = Number(episodes[0]?.season ?? seasonKey);
-    if (!Number.isFinite(seasonNumber)) {
+    const providerSeasonNumber = Number(episodes[0]?.season ?? seasonKey);
+    if (!Number.isFinite(providerSeasonNumber)) {
         return;
     }
 
+    // Per-season provider slices ("The Mandalorian (2 season)") renumber
+    // their single season to 1 — the title marker names the real TMDB season
+    const seasonNumber = resolveEnrichmentSeasonNumber({
+        rawTitle: info.name,
+        providerSeasonNumber,
+        providerSeasonCount: Object.keys(selected?.episodes ?? {}).length,
+    });
+
     const tmdbEpisodes = await enrichment.getSeasonEpisodes(
         info.tmdb_id,
         seasonNumber
diff --git a/libs/portal/xtream/feature/src/lib/live-stream-layout/live-stream-layout.component.scss b/libs/portal/xtream/feature/src/lib/live-stream-layout/live-stream-layout.component.scss
index ee772f77f..6bbc80b9f 100644
--- a/libs/portal/xtream/feature/src/lib/live-stream-layout/live-stream-layout.component.scss
+++ b/libs/portal/xtream/feature/src/lib/live-stream-layout/live-stream-layout.component.scss
@@ -77,7 +77,8 @@ app-grid-list.live-all-items-grid {
     overflow-y: auto;
     padding: 16px 20px 20px;
     scrollbar-width: thin;
-    scrollbar-color: rgba(255, 255, 255, 0.08) transparent;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
 }
 
 .loading-indicator {
diff --git a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.html b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.html
index 901ac8d28..6271ec3e0 100644
--- a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.html
+++ b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.html
@@ -43,12 +43,30 @@
                 "
                 [showFavoriteButton]="true"
                 [showProgramInfoButton]="false"
+                [showDetailsContextMenu]="supportsEpgMapping"
                 [isFavorite]="favorites.get(favoriteKeyFor(item)) ?? false"
                 (clicked)="playClicked.emit(item)"
                 (activated)="playbackRequested.emit(item)"
                 (favoriteToggled)="toggleFavorite($event, item)"
+                (contextMenuRequested)="onChannelContextMenu(item, $event)"
             />
         </cdk-virtual-scroll-viewport>
+
+        <div
+            aria-hidden="true"
+            class="channel-context-menu-anchor"
+            [style.left]="contextMenuPosition().x"
+            [style.top]="contextMenuPosition().y"
+            [matMenuTriggerFor]="channelContextMenu"
+            #contextMenuTrigger="matMenuTrigger"
+        ></div>
+
+        <mat-menu #channelContextMenu="matMenu">
+            <button mat-menu-item (click)="openEpgMapping()">
+                <mat-icon>settings_remote</mat-icon>
+                <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+            </button>
+        </mat-menu>
     } @else {
         <div class="empty-search-state">
             <mat-icon class="empty-state-icon">search_off</mat-icon>
diff --git a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.scss b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.scss
index 0df50214b..341cb6b6a 100644
--- a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.scss
+++ b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.scss
@@ -171,3 +171,11 @@
         transform: translateY(0);
     }
 }
+
+.channel-context-menu-anchor {
+    position: fixed;
+    width: 0;
+    height: 0;
+    opacity: 0;
+    pointer-events: none;
+}
diff --git a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
index 991a2100a..8a2076a32 100644
--- a/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
+++ b/libs/portal/xtream/feature/src/lib/portal-channels-list/portal-channels-list.component.ts
@@ -13,15 +13,20 @@ import {
     input,
     OnDestroy,
     output,
+    signal,
     untracked,
     viewChild,
 } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialog } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
+import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { ActivatedRoute } from '@angular/router';
 import { TranslatePipe } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import {
+    buildXtreamEpgMappingKey,
     EpgItem,
     EpgProgram,
     XtreamCategory,
@@ -30,6 +35,7 @@ import {
 import {
     ChannelListItemComponent,
     ChannelListSkeletonComponent,
+    EpgMappingDialogComponent,
 } from '@iptvnator/ui/components';
 import {
     PortalChannelSortMode,
@@ -66,7 +72,9 @@ interface XtreamCategoryLike {
     imports: [
         ChannelListItemComponent,
         ChannelListSkeletonComponent,
+        MatButtonModule,
         MatIcon,
+        MatMenuModule,
         ScrollingModule,
         TranslatePipe,
     ],
@@ -83,7 +91,14 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
     private readonly epgQueueService = inject(EpgQueueService);
     private readonly route = inject(ActivatedRoute);
     private readonly runtime = inject(RuntimeCapabilitiesService);
+    private readonly dialog = inject(MatDialog);
+
+    readonly contextMenuTrigger =
+        viewChild.required<MatMenuTrigger>('contextMenuTrigger');
+    readonly contextMenuChannel = signal<XtreamChannelListItem | null>(null);
+    readonly contextMenuPosition = signal({ x: '0px', y: '0px' });
     readonly supportsEpg = this.runtime.supportsEpg;
+    readonly supportsEpgMapping = this.runtime.supportsEpgMapping;
     readonly isSelectedTypeContentLoading =
         this.xtreamStore.selectedTypeContentLoading;
     readonly channels = computed(() => {
@@ -122,6 +137,9 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
     epgPrograms = new Map<number, EpgProgram>();
     currentProgramsProgress = new Map<number, number>();
 
+    /** Last viewport slice, reused to refresh previews after a mapping change. */
+    private lastVisibleChannels: XtreamChannelListItem[] = [];
+
     readonly viewport = viewChild(CdkVirtualScrollViewport);
 
     private subscriptions = new Subscription();
@@ -222,6 +240,7 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
                             range.start,
                             range.end
                         );
+                        this.lastVisibleChannels = visibleChannels;
                         this.loadEpgForVisibleChannels(visibleChannels);
                     })
             );
@@ -246,6 +265,7 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
         const uncachedEntries: {
             streamId: number;
             epgChannelId?: string | null;
+            playlistId?: string | null;
         }[] = [];
 
         // Apply cached results immediately
@@ -266,6 +286,7 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
                 uncachedEntries.push({
                     streamId: channel.xtream_id,
                     epgChannelId: channel.epg_channel_id ?? null,
+                    playlistId: playlist.id ?? null,
                 });
             }
         }
@@ -459,4 +480,99 @@ export class PortalChannelsListComponent implements AfterViewInit, OnDestroy {
             ? Math.floor(parsedDate / 1000)
             : null;
     }
+
+    // ── Context menu ────────────────────────────────────────────
+
+    onChannelContextMenu(channel: XtreamChannelListItem, event: MouseEvent): void {
+        this.contextMenuChannel.set(channel);
+        this.contextMenuPosition.set({
+            x: `${event.clientX}px`,
+            y: `${event.clientY}px`,
+        });
+
+        const trigger = this.contextMenuTrigger();
+        if (trigger.menuOpen) {
+            trigger.closeMenu();
+        }
+
+        queueMicrotask(() => {
+            this.contextMenuTrigger().openMenu();
+        });
+    }
+
+    openEpgMapping(): void {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const playlistId = this.xtreamStore.currentPlaylist()?.id;
+        const xtreamId = channel.xtream_id ?? channel.id;
+        if (!playlistId || xtreamId == null) {
+            return;
+        }
+
+        const channelKey = buildXtreamEpgMappingKey(playlistId, xtreamId);
+        void this.openEpgMappingDialog(
+            channelKey,
+            channel,
+            xtreamId,
+            playlistId
+        );
+    }
+
+    private async openEpgMappingDialog(
+        channelKey: string,
+        channel: XtreamChannelListItem,
+        streamId: number,
+        playlistId: string
+    ): Promise<void> {
+        const mappingBefore = await this.readEpgMapping(channelKey);
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.title ?? channel.name ?? String(streamId),
+            playlistId,
+        })
+            .afterClosed()
+            .subscribe(async () => {
+                const mappingAfter = await this.readEpgMapping(channelKey);
+                if (mappingAfter === mappingBefore) {
+                    return;
+                }
+                // The mapping changed (saved or removed) — drop the cached
+                // preview/resolution and refetch so the row updates now
+                // instead of after the 5-minute TTL or the next scroll.
+                this.epgQueueService.invalidate(streamId);
+                this.epgPrograms.delete(streamId);
+                this.currentProgramsProgress.delete(streamId);
+                const visible = this.lastVisibleChannels.length
+                    ? this.lastVisibleChannels
+                    : this.filteredChannels().slice(0, 50);
+                this.loadEpgForVisibleChannels(visible);
+            });
+    }
+
+    /** Read the current mapped EPG channel id, or null (PWA / no mapping). */
+    private async readEpgMapping(channelKey: string): Promise<string | null> {
+        if (!this.supportsEpgMapping) {
+            return null;
+        }
+        const bridge = (
+            window as unknown as {
+                electron?: {
+                    getEpgMapping?: (
+                        key: string
+                    ) => Promise<{ epgChannelId?: string } | null>;
+                };
+            }
+        ).electron;
+        try {
+            const mapping = await bridge?.getEpgMapping?.(channelKey);
+            return mapping?.epgChannelId?.trim() || null;
+        } catch {
+            return null;
+        }
+    }
 }
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.spec.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.spec.ts
new file mode 100644
index 000000000..d0dd1afee
--- /dev/null
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.spec.ts
@@ -0,0 +1,303 @@
+import type {
+    ExternalPlayerSession,
+    PlaybackPositionData,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { SerialDetailsPlaybackPositionState } from './serial-details-playback-position-state';
+import type { XtreamSerieDetailsView } from './serial-details-playback.service';
+
+function episode(id: string, season: number, episodeNum: number) {
+    return {
+        id,
+        season,
+        episode_num: episodeNum,
+        title: `Episode ${episodeNum}`,
+    };
+}
+
+function seriesView(): XtreamSerieDetailsView {
+    return {
+        series_id: 103,
+        info: {},
+        episodes: {
+            '1': [episode('1001', 1, 1), episode('1002', 1, 2)],
+            '2': [episode('2001', 2, 1)],
+        },
+    } as unknown as XtreamSerieDetailsView;
+}
+
+function position(
+    contentXtreamId: number,
+    overrides: Partial<PlaybackPositionData> = {}
+): PlaybackPositionData {
+    return {
+        contentXtreamId,
+        contentType: 'episode',
+        seriesXtreamId: 103,
+        seasonNumber: 1,
+        episodeNumber: 1,
+        positionSeconds: 60,
+        durationSeconds: 1200,
+        playlistId: 'xtream-1',
+        updatedAt: '2026-05-10T12:00:00.000Z',
+        ...overrides,
+    } as PlaybackPositionData;
+}
+
+function playback(
+    contentXtreamId: number,
+    overrides: Partial<ResolvedPortalPlayback> = {}
+): ResolvedPortalPlayback {
+    return {
+        streamUrl: `http://xtream.example/series/${contentXtreamId}.mp4`,
+        title: 'Episode',
+        contentInfo: {
+            playlistId: 'xtream-1',
+            contentXtreamId,
+            contentType: 'episode',
+            seriesXtreamId: 103,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        },
+        ...overrides,
+    } as ResolvedPortalPlayback;
+}
+
+const session = {
+    id: 'vlc-1',
+    player: 'vlc',
+    status: 'opened',
+} as ExternalPlayerSession;
+
+const target = {
+    seriesXtreamId: 103,
+    contentXtreamId: 2001,
+    seasonNumber: 2,
+    episodeNumber: 1,
+};
+
+describe('SerialDetailsPlaybackPositionState', () => {
+    let state: SerialDetailsPlaybackPositionState;
+
+    beforeEach(() => {
+        state = new SerialDetailsPlaybackPositionState();
+    });
+
+    async function loadPositions(
+        positions: PlaybackPositionData[] = [position(2001)]
+    ): Promise<void> {
+        await state.load('xtream-1', 103, () => Promise.resolve(positions));
+    }
+
+    describe('load', () => {
+        it('keeps only the latest concurrent load result', async () => {
+            let resolveFirst!: (value: PlaybackPositionData[]) => void;
+            const first = state.load(
+                'xtream-1',
+                103,
+                () =>
+                    new Promise<PlaybackPositionData[]>((resolve) => {
+                        resolveFirst = resolve;
+                    })
+            );
+            await loadPositions([position(2001, { positionSeconds: 84 })]);
+
+            resolveFirst([position(1001, { positionSeconds: 5 })]);
+            await first;
+
+            expect(state.positions().get(2001)?.positionSeconds).toBe(84);
+            expect(state.positions().has(1001)).toBe(false);
+        });
+    });
+
+    describe('takeResumeEpisode', () => {
+        it('rejects targets before positions finish loading', () => {
+            expect(
+                state.takeResumeEpisode({
+                    playlistId: 'xtream-1',
+                    selectedItem: seriesView(),
+                    target,
+                })
+            ).toBeNull();
+        });
+
+        it('rejects targets that belong to another series', async () => {
+            await loadPositions();
+
+            expect(
+                state.takeResumeEpisode({
+                    playlistId: 'xtream-1',
+                    selectedItem: seriesView(),
+                    target: { ...target, seriesXtreamId: 999 },
+                })
+            ).toBeNull();
+        });
+
+        it('consumes a matching target only once', async () => {
+            await loadPositions();
+            const request = {
+                playlistId: 'xtream-1',
+                selectedItem: seriesView(),
+                target,
+            };
+
+            expect(state.takeResumeEpisode(request)?.id).toBe('2001');
+            expect(state.takeResumeEpisode(request)).toBeNull();
+        });
+
+        it('falls back to season/episode matching for unknown episode ids', async () => {
+            await loadPositions();
+
+            expect(
+                state.takeResumeEpisode({
+                    playlistId: 'xtream-1',
+                    selectedItem: seriesView(),
+                    target: { ...target, contentXtreamId: 5555 },
+                })?.id
+            ).toBe('2001');
+        });
+
+        it('leaves unmatched targets unconsumed until episodes arrive', async () => {
+            await loadPositions();
+            const request = {
+                playlistId: 'xtream-1',
+                selectedItem: {
+                    ...seriesView(),
+                    episodes: {},
+                } as unknown as XtreamSerieDetailsView,
+                target,
+            };
+
+            expect(state.takeResumeEpisode(request)).toBeNull();
+            expect(
+                state.takeResumeEpisode({
+                    ...request,
+                    selectedItem: seriesView(),
+                })?.id
+            ).toBe('2001');
+        });
+
+        it('stops resolving targets after a reset', async () => {
+            await loadPositions();
+            state.reset();
+
+            expect(
+                state.takeResumeEpisode({
+                    playlistId: 'xtream-1',
+                    selectedItem: seriesView(),
+                    target,
+                })
+            ).toBeNull();
+        });
+    });
+
+    describe('update and remove', () => {
+        it('updates and removes entries by content id', () => {
+            state.update(position(1001));
+            expect(state.positions().get(1001)?.positionSeconds).toBe(60);
+
+            state.remove(1001);
+            expect(state.positions().has(1001)).toBe(false);
+        });
+    });
+
+    describe('recordExternalLaunch', () => {
+        let save: jest.Mock;
+
+        beforeEach(() => {
+            save = jest.fn().mockResolvedValue(undefined);
+        });
+
+        it('ignores launches that do not produce a session', async () => {
+            await state.recordExternalLaunch(
+                playback(2001),
+                Promise.resolve(undefined),
+                save
+            );
+
+            expect(save).not.toHaveBeenCalled();
+        });
+
+        it('ignores launches without episode content info', async () => {
+            await state.recordExternalLaunch(
+                playback(2001, { contentInfo: undefined }),
+                Promise.resolve(session),
+                save
+            );
+            await state.recordExternalLaunch(
+                playback(2001, {
+                    contentInfo: {
+                        playlistId: 'xtream-1',
+                        contentXtreamId: 2001,
+                        contentType: 'vod',
+                    } as ResolvedPortalPlayback['contentInfo'],
+                }),
+                Promise.resolve(session),
+                save
+            );
+
+            expect(save).not.toHaveBeenCalled();
+        });
+
+        it('persists the floored requested start time', async () => {
+            await state.recordExternalLaunch(
+                playback(2001, { startTime: 42.9 }),
+                Promise.resolve(session),
+                save
+            );
+
+            expect(save).toHaveBeenCalledWith(
+                'xtream-1',
+                expect.objectContaining({
+                    contentXtreamId: 2001,
+                    positionSeconds: 42,
+                })
+            );
+            expect(state.positions().get(2001)?.positionSeconds).toBe(42);
+        });
+
+        it('keeps the existing saved offset when the launch has none', async () => {
+            state.update(
+                position(2001, { positionSeconds: 84, durationSeconds: 1200 })
+            );
+
+            await state.recordExternalLaunch(
+                playback(2001),
+                Promise.resolve(session),
+                save
+            );
+
+            expect(save).toHaveBeenCalledWith(
+                'xtream-1',
+                expect.objectContaining({
+                    positionSeconds: 84,
+                    durationSeconds: 1200,
+                })
+            );
+        });
+
+        it('clamps invalid start times to zero', async () => {
+            await state.recordExternalLaunch(
+                playback(2001, { startTime: Number.NaN }),
+                Promise.resolve(session),
+                save
+            );
+            await state.recordExternalLaunch(
+                playback(2001, { startTime: -30 }),
+                Promise.resolve(session),
+                save
+            );
+
+            expect(save).toHaveBeenNthCalledWith(
+                1,
+                'xtream-1',
+                expect.objectContaining({ positionSeconds: 0 })
+            );
+            expect(save).toHaveBeenNthCalledWith(
+                2,
+                'xtream-1',
+                expect.objectContaining({ positionSeconds: 0 })
+            );
+        });
+    });
+});
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.ts
new file mode 100644
index 000000000..4f0f8283a
--- /dev/null
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback-position-state.ts
@@ -0,0 +1,165 @@
+import { signal } from '@angular/core';
+import type { SeriesResumeTarget } from '@iptvnator/portal/shared/util';
+import type {
+    ExternalPlayerSession,
+    PlaybackPositionData,
+    ResolvedPortalPlayback,
+    XtreamSerieEpisode,
+} from '@iptvnator/shared/interfaces';
+import type { XtreamSerieDetailsView } from './serial-details-playback.service';
+
+interface ResumeEpisodeRequest {
+    playlistId: string;
+    selectedItem: XtreamSerieDetailsView;
+    target: SeriesResumeTarget;
+}
+
+export class SerialDetailsPlaybackPositionState {
+    readonly positions = signal<Map<number, PlaybackPositionData>>(new Map());
+
+    private loadRequestId = 0;
+    private readonly loadedKey = signal<string | null>(null);
+    private readonly consumedResumeKey = signal<string | null>(null);
+
+    reset(): void {
+        this.loadRequestId++;
+        this.positions.set(new Map());
+        this.loadedKey.set(null);
+    }
+
+    async load(
+        playlistId: string,
+        seriesXtreamId: number,
+        loader: () => Promise<PlaybackPositionData[]>
+    ): Promise<void> {
+        const requestId = ++this.loadRequestId;
+        this.loadedKey.set(null);
+        let positions: PlaybackPositionData[] = [];
+        let loadSucceeded = true;
+
+        try {
+            positions = await loader();
+        } catch (error) {
+            loadSucceeded = false;
+            console.warn(
+                '[SerialDetailsPlayback] Failed to load series playback positions',
+                error
+            );
+        }
+
+        if (requestId !== this.loadRequestId) {
+            return;
+        }
+
+        this.positions.set(
+            new Map(
+                positions.map((position) => [
+                    position.contentXtreamId,
+                    position,
+                ])
+            )
+        );
+        // A failed load must not mark the series resume-ready: without the
+        // persisted offsets a dashboard handoff would start the target
+        // episode from the beginning instead of its saved position.
+        if (loadSucceeded) {
+            this.loadedKey.set(this.createKey(playlistId, seriesXtreamId));
+        }
+    }
+
+    takeResumeEpisode(
+        request: ResumeEpisodeRequest
+    ): XtreamSerieEpisode | null {
+        const seriesXtreamId = Number(request.selectedItem.series_id);
+        if (
+            request.target.seriesXtreamId !== seriesXtreamId ||
+            this.loadedKey() !==
+                this.createKey(request.playlistId, seriesXtreamId)
+        ) {
+            return null;
+        }
+
+        const resumeKey = [
+            request.playlistId,
+            request.target.seriesXtreamId,
+            request.target.contentXtreamId,
+            request.target.seasonNumber,
+            request.target.episodeNumber,
+        ].join(':');
+        if (this.consumedResumeKey() === resumeKey) {
+            return null;
+        }
+
+        const episodes: XtreamSerieEpisode[] = [];
+        Object.values(request.selectedItem.episodes ?? {}).forEach(
+            (seasonEpisodes) => episodes.push(...seasonEpisodes)
+        );
+        const episode =
+            episodes.find(
+                (item) => Number(item.id) === request.target.contentXtreamId
+            ) ??
+            episodes.find(
+                (item) =>
+                    Number(item.season) === request.target.seasonNumber &&
+                    Number(item.episode_num) === request.target.episodeNumber
+            ) ??
+            null;
+
+        if (episode) {
+            this.consumedResumeKey.set(resumeKey);
+        }
+        return episode;
+    }
+
+    update(position: PlaybackPositionData): void {
+        const updated = new Map(this.positions());
+        updated.set(position.contentXtreamId, position);
+        this.positions.set(updated);
+    }
+
+    remove(contentXtreamId: number): void {
+        const updated = new Map(this.positions());
+        updated.delete(contentXtreamId);
+        this.positions.set(updated);
+    }
+
+    async recordExternalLaunch(
+        playback: ResolvedPortalPlayback,
+        launch: Promise<ExternalPlayerSession | void>,
+        save: (
+            playlistId: string,
+            position: PlaybackPositionData
+        ) => Promise<void>
+    ): Promise<void> {
+        const session = await launch;
+        if (!session) {
+            return;
+        }
+
+        const contentInfo = playback.contentInfo;
+        if (!contentInfo || contentInfo.contentType !== 'episode') {
+            return;
+        }
+
+        const existing = this.positions().get(contentInfo.contentXtreamId);
+        const requestedPosition =
+            playback.startTime ?? existing?.positionSeconds ?? 0;
+        const positionSeconds = Number.isFinite(requestedPosition)
+            ? Math.max(0, Math.floor(requestedPosition))
+            : 0;
+        const position: PlaybackPositionData = {
+            ...contentInfo,
+            playlistId: contentInfo.playlistId,
+            positionSeconds,
+            durationSeconds: existing?.durationSeconds,
+            updatedAt: new Date().toISOString(),
+        };
+
+        await save(contentInfo.playlistId, position);
+        this.update(position);
+    }
+
+    private createKey(playlistId: string, seriesXtreamId: number): string {
+        return `${playlistId}:${seriesXtreamId}`;
+    }
+}
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback.service.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback.service.ts
index 47a9bf579..8669ed032 100644
--- a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback.service.ts
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-playback.service.ts
@@ -6,6 +6,7 @@ import {
     Injectable,
     Signal,
     signal,
+    untracked,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import {
@@ -31,6 +32,8 @@ import {
     resolveSeriesPlaybackEpisodeState,
     type SeriesPlaybackEpisodeState,
 } from '@iptvnator/ui/playback';
+import { XTREAM_SERIES_RESUME_TARGET } from './serial-details-resume-target.token';
+import { SerialDetailsPlaybackPositionState } from './serial-details-playback-position-state';
 
 export type XtreamSerieDetailsView = XtreamSerieDetails & {
     readonly series_id: number;
@@ -55,6 +58,7 @@ export class SerialDetailsPlaybackService {
     );
     private readonly portalPlayer = inject(PORTAL_PLAYER);
     private readonly externalPlayback = inject(PORTAL_EXTERNAL_PLAYBACK);
+    private readonly resumeTarget = inject(XTREAM_SERIES_RESUME_TARGET);
 
     private readonly bindings = signal<SerialDetailsPlaybackBindings | null>(
         null
@@ -62,12 +66,12 @@ export class SerialDetailsPlaybackService {
     private readonly currentPlaylistId = computed(
         () => this.xtreamStore.currentPlaylist()?.id ?? ''
     );
+    private readonly playbackPositionState =
+        new SerialDetailsPlaybackPositionState();
     private lastSaveTime = 0;
 
     readonly inlinePlayback = signal<ResolvedPortalPlayback | null>(null);
-    readonly episodePlaybackPositions = signal<
-        Map<number, PlaybackPositionData>
-    >(new Map());
+    readonly episodePlaybackPositions = this.playbackPositionState.positions;
     readonly openingEpisodeId = signal<number | null>(null);
     readonly activeEpisodeId = signal<number | null>(null);
 
@@ -129,6 +133,27 @@ export class SerialDetailsPlaybackService {
             this.activeEpisodeId.set(null);
         });
 
+        effect(() => {
+            const target = this.resumeTarget();
+            const selectedItem = this.selectedItem();
+            const playlistId = this.currentPlaylistId();
+
+            if (!target || !selectedItem || !playlistId) {
+                return;
+            }
+
+            const episode = this.playbackPositionState.takeResumeEpisode({
+                playlistId,
+                selectedItem,
+                target,
+            });
+            if (!episode) {
+                return;
+            }
+
+            untracked(() => this.playEpisode(episode));
+        });
+
         const unsubscribePositionUpdates =
             this.playbackPositionBridge.onPlaybackPositionUpdate(
                 (data: PlaybackPositionData) => {
@@ -143,7 +168,7 @@ export class SerialDetailsPlaybackService {
                         return;
                     }
 
-                    this.updateEpisodePlaybackPosition(data);
+                    this.playbackPositionState.update(data);
                 }
             ) ?? null;
 
@@ -160,7 +185,7 @@ export class SerialDetailsPlaybackService {
     /** Clears all playback state when switching to another series. */
     resetForNewSeries(): void {
         this.closeInlinePlayer();
-        this.episodePlaybackPositions.set(new Map());
+        this.playbackPositionState.reset();
         this.openingEpisodeId.set(null);
         this.activeEpisodeId.set(null);
     }
@@ -257,13 +282,21 @@ export class SerialDetailsPlaybackService {
             playback.contentInfo.playlistId,
             position
         );
-        this.updateEpisodePlaybackPosition(position);
+        this.playbackPositionState.update(position);
     }
 
     handleExternalFallbackRequest(request: PlaybackFallbackRequest): void {
-        void this.portalPlayer.openExternalPlayback(
+        void this.playbackPositionState.recordExternalLaunch(
             request.playback,
-            request.player
+            this.portalPlayer.openExternalPlayback(
+                request.playback,
+                request.player
+            ),
+            (playlistId, position) =>
+                this.playbackPositions.savePlaybackPosition(
+                    playlistId,
+                    position
+                )
         );
     }
 
@@ -280,7 +313,7 @@ export class SerialDetailsPlaybackService {
                 playlistId,
                 request.nextPosition
             );
-            this.updateEpisodePlaybackPosition(request.nextPosition);
+            this.playbackPositionState.update(request.nextPosition);
             return;
         }
 
@@ -289,23 +322,19 @@ export class SerialDetailsPlaybackService {
             request.contentXtreamId,
             'episode'
         );
-        this.removeEpisodePlaybackPosition(request.contentXtreamId);
+        this.playbackPositionState.remove(request.contentXtreamId);
     }
 
     async loadSeriesPlaybackPositions(
         playlistId: string,
         seriesXtreamId: number
     ): Promise<void> {
-        const positions =
-            await this.playbackPositions.getSeriesPlaybackPositions(
+        return this.playbackPositionState.load(playlistId, seriesXtreamId, () =>
+            this.playbackPositions.getSeriesPlaybackPositions(
                 playlistId,
                 seriesXtreamId
-            );
-        const positionsMap = new Map<number, PlaybackPositionData>();
-        positions.forEach((position) => {
-            positionsMap.set(position.contentXtreamId, position);
-        });
-        this.episodePlaybackPositions.set(positionsMap);
+            )
+        );
     }
 
     private selectedItem(): XtreamSerieDetailsView | null {
@@ -329,7 +358,15 @@ export class SerialDetailsPlaybackService {
         }
 
         this.closeInlinePlayer();
-        void this.portalPlayer.openResolvedPlayback(playback, true);
+        void this.playbackPositionState.recordExternalLaunch(
+            playback,
+            this.portalPlayer.openResolvedPlayback(playback, true),
+            (playlistId, position) =>
+                this.playbackPositions.savePlaybackPosition(
+                    playlistId,
+                    position
+                )
+        );
     }
 
     private getInlineEpisodeState(): SeriesPlaybackEpisodeState<XtreamSerieEpisode> | null {
@@ -352,18 +389,4 @@ export class SerialDetailsPlaybackService {
             fallbackEpisodeNumber: playback.contentInfo.episodeNumber,
         });
     }
-
-    private updateEpisodePlaybackPosition(
-        position: PlaybackPositionData
-    ): void {
-        const updated = new Map(this.episodePlaybackPositions());
-        updated.set(position.contentXtreamId, position);
-        this.episodePlaybackPositions.set(updated);
-    }
-
-    private removeEpisodePlaybackPosition(contentXtreamId: number): void {
-        const updated = new Map(this.episodePlaybackPositions());
-        updated.delete(contentXtreamId);
-        this.episodePlaybackPositions.set(updated);
-    }
 }
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.spec.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.spec.ts
new file mode 100644
index 000000000..98d4aab92
--- /dev/null
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.spec.ts
@@ -0,0 +1,10 @@
+import { TestBed } from '@angular/core/testing';
+import { XTREAM_SERIES_RESUME_TARGET } from './serial-details-resume-target.token';
+
+describe('XTREAM_SERIES_RESUME_TARGET', () => {
+    it('defaults to a null resume target outside collection detail hosts', () => {
+        const target = TestBed.inject(XTREAM_SERIES_RESUME_TARGET);
+
+        expect(target()).toBeNull();
+    });
+});
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.ts
new file mode 100644
index 000000000..b9bebb053
--- /dev/null
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details-resume-target.token.ts
@@ -0,0 +1,8 @@
+import { InjectionToken, Signal, signal } from '@angular/core';
+import type { SeriesResumeTarget } from '@iptvnator/portal/shared/util';
+
+export const XTREAM_SERIES_RESUME_TARGET = new InjectionToken<
+    Signal<SeriesResumeTarget | null>
+>('XTREAM_SERIES_RESUME_TARGET', {
+    factory: () => signal(null),
+});
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.html b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.html
index a46abaf26..3069de5d8 100644
--- a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.html
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.html
@@ -11,6 +11,11 @@
         (closePlayerRequested)="closeInlinePlayer()"
     >
         <ng-template appDetailTags>
+            @if (info.tmdb_status; as status) {
+                <span class="details__tag details__tag--status">{{
+                    seriesStatusLabelKey(status) | translate
+                }}</span>
+            }
             @if (info.releaseDate) {
                 <span class="details__tag">{{
                     info.releaseDate | slice: 0 : 4
@@ -37,7 +42,7 @@
                     <span class="label">{{ 'XTREAM.CAST' | translate }}</span>
                     @if (info.tmdb_cast?.length) {
                         <div class="details__cast-strip">
-                            @for (member of info.tmdb_cast; track member.name) {
+                            @for (member of info.tmdb_cast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
                                 <span
                                     class="details__cast-chip"
                                     [class.details__cast-chip--clickable]="
@@ -77,12 +82,43 @@
                     }
                 </div>
             }
-            @if (info.director) {
+            @if (info.director || info.tmdb_directors?.length) {
                 <div class="details__meta-item">
-                    <span class="label">{{
-                        'XTREAM.DIRECTOR' | translate
-                    }}</span>
-                    <span class="value">{{ info.director }}</span>
+                    <span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
+                    @if (info.tmdb_directors?.length) {
+                        <div class="details__cast-strip">
+                            @for (member of info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
+                                <span
+                                    class="details__cast-chip"
+                                    [class.details__cast-chip--clickable]="
+                                        !!member.tmdbPersonId
+                                    "
+                                    (click)="openActor(member)"
+                                    [title]="member.name"
+                                >
+                                    @if (member.profileUrl) {
+                                        <img
+                                            class="details__cast-avatar"
+                                            [src]="member.profileUrl"
+                                            [alt]="member.name"
+                                            loading="lazy"
+                                        />
+                                    } @else {
+                                        <span
+                                            class="details__cast-avatar details__cast-avatar--fallback"
+                                        >
+                                            {{ member.name.charAt(0) }}
+                                        </span>
+                                    }
+                                    <span class="details__cast-name">{{
+                                        member.name
+                                    }}</span>
+                                </span>
+                            }
+                        </div>
+                    } @else {
+                        <span class="value">{{ info.director }}</span>
+                    }
                 </div>
             }
         </ng-template>
@@ -102,7 +138,10 @@
                     </span>
                     <span class="play-btn__copy">
                         <span class="play-btn__label">
-                            {{ action.labelKey | translate }}
+                            {{
+                                action.labelKey
+                                    | translate: action.labelParams
+                            }}
                         </span>
                         <span class="play-btn__meta">
                             {{ action.episodeLabel }}
@@ -131,7 +170,9 @@
                 detail-player
                 [playback]="playback"
                 [episodeMetadata]="inlineEpisodeMetadata()"
+                [seriesTitle]="item.info.name"
                 [seriesNavigation]="inlineSeriesNavigation()"
+                [upNextEpisodes]="upNextEpisodes()"
                 (timeUpdate)="handleInlineTimeUpdate($event)"
                 (closed)="closeInlinePlayer()"
                 (backClicked)="goBack()"
@@ -139,6 +180,7 @@
                 (playbackEnded)="handleInlinePlaybackEnded()"
                 (previousEpisodeRequested)="playPreviousEpisode()"
                 (nextEpisodeRequested)="playNextEpisode()"
+                (upNextEpisodeSelected)="playUpNextEpisode($event)"
                 (externalFallbackRequested)="
                     handleExternalFallbackRequest($event)
                 "
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.spec.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.spec.ts
index 1ade24b8b..78c2a02b6 100644
--- a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.spec.ts
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.spec.ts
@@ -15,11 +15,16 @@ import {
     PORTAL_EXTERNAL_PLAYBACK,
     PORTAL_PLAYBACK_POSITIONS,
     PORTAL_PLAYER,
+    SeriesResumeTarget,
 } from '@iptvnator/portal/shared/util';
 import { XtreamStore } from '@iptvnator/portal/xtream/data-access';
+import { PlaybackPositionRuntimeBridgeService } from '@iptvnator/services';
+import { PlaybackPositionData } from '@iptvnator/shared/interfaces';
 import { PortalInlinePlayerComponent } from '@iptvnator/ui/playback';
 import { of } from 'rxjs';
 import { SerialDetailsComponent } from './serial-details.component';
+import { SerialDetailsPlaybackService } from './serial-details-playback.service';
+import { XTREAM_SERIES_RESUME_TARGET } from './serial-details-resume-target.token';
 
 @Component({
     selector: 'app-season-container',
@@ -49,7 +54,9 @@ class StubSeasonContainerComponent {
 class StubPortalInlinePlayerComponent {
     readonly playback = input<unknown>(null);
     readonly episodeMetadata = input<unknown>(null);
+    readonly seriesTitle = input<string | null>(null);
     readonly seriesNavigation = input<unknown>(null);
+    readonly upNextEpisodes = input<unknown>(null);
     readonly timeUpdate = output<unknown>();
     readonly closed = output<void>();
     readonly streamUrlCopied = output<void>();
@@ -57,6 +64,7 @@ class StubPortalInlinePlayerComponent {
     readonly playbackEnded = output<void>();
     readonly previousEpisodeRequested = output<void>();
     readonly nextEpisodeRequested = output<void>();
+    readonly upNextEpisodeSelected = output<unknown>();
 }
 
 @Component({
@@ -84,8 +92,16 @@ describe('SerialDetailsComponent', () => {
     const constructEpisodeStreamUrl = jest.fn();
     const addRecentItem = jest.fn();
     const openResolvedPlayback = jest.fn();
+    const openExternalPlayback = jest.fn();
+    const savePlaybackPosition = jest.fn();
+    const clearPlaybackPosition = jest.fn();
     const isEmbeddedPlayer = jest.fn();
     const getSeriesPlaybackPositions = jest.fn().mockResolvedValue([]);
+    let positionUpdateCallback: ((data: PlaybackPositionData) => void) | null =
+        null;
+    let seriesResumeTarget: ReturnType<
+        typeof signal<SeriesResumeTarget | null>
+    >;
 
     beforeEach(async () => {
         selectedItem.set({
@@ -133,11 +149,20 @@ describe('SerialDetailsComponent', () => {
                 `http://xtream.example/series/${episode.id}.mp4`
         );
         addRecentItem.mockClear();
-        openResolvedPlayback.mockClear();
+        openResolvedPlayback.mockReset();
+        openResolvedPlayback.mockResolvedValue(undefined);
+        openExternalPlayback.mockReset();
+        openExternalPlayback.mockResolvedValue(undefined);
+        savePlaybackPosition.mockReset();
+        savePlaybackPosition.mockResolvedValue(undefined);
+        clearPlaybackPosition.mockReset();
+        clearPlaybackPosition.mockResolvedValue(undefined);
+        positionUpdateCallback = null;
         isEmbeddedPlayer.mockReset();
         isEmbeddedPlayer.mockReturnValue(false);
         getSeriesPlaybackPositions.mockClear();
         getSeriesPlaybackPositions.mockResolvedValue([]);
+        seriesResumeTarget = signal<SeriesResumeTarget | null>(null);
 
         await TestBed.configureTestingModule({
             imports: [SerialDetailsComponent],
@@ -187,8 +212,8 @@ describe('SerialDetailsComponent', () => {
                     provide: PORTAL_PLAYBACK_POSITIONS,
                     useValue: {
                         getSeriesPlaybackPositions,
-                        savePlaybackPosition: jest.fn(),
-                        clearPlaybackPosition: jest.fn(),
+                        savePlaybackPosition,
+                        clearPlaybackPosition,
                     },
                 },
                 {
@@ -196,8 +221,26 @@ describe('SerialDetailsComponent', () => {
                     useValue: {
                         isEmbeddedPlayer,
                         openResolvedPlayback,
+                        openExternalPlayback,
                     },
                 },
+                {
+                    provide: PlaybackPositionRuntimeBridgeService,
+                    useValue: {
+                        onPlaybackPositionUpdate: (
+                            callback: (data: PlaybackPositionData) => void
+                        ) => {
+                            positionUpdateCallback = callback;
+                            return () => {
+                                positionUpdateCallback = null;
+                            };
+                        },
+                    },
+                },
+                {
+                    provide: XTREAM_SERIES_RESUME_TARGET,
+                    useValue: seriesResumeTarget,
+                },
                 {
                     provide: MatSnackBar,
                     useValue: {
@@ -408,6 +451,293 @@ describe('SerialDetailsComponent', () => {
         );
     });
 
+    it('records the selected episode after a successful external-player launch', async () => {
+        openResolvedPlayback.mockResolvedValue({
+            id: 'vlc-session-1',
+            player: 'vlc',
+            status: 'opened',
+            title: 'Season 2 Episode 1',
+            streamUrl: 'http://xtream.example/series/2001.mp4',
+            startedAt: '2026-07-14T10:00:00.000Z',
+            updatedAt: '2026-07-14T10:00:00.000Z',
+            canClose: true,
+        });
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        fixture.componentInstance.playEpisode({
+            id: '2001',
+            episode_num: 1,
+            title: 'Season 2 Episode 1',
+            season: 2,
+        } as never);
+        await fixture.whenStable();
+
+        expect(savePlaybackPosition).toHaveBeenCalledWith(
+            'xtream-1',
+            expect.objectContaining({
+                playlistId: 'xtream-1',
+                contentXtreamId: 2001,
+                contentType: 'episode',
+                seriesXtreamId: 103,
+                seasonNumber: 2,
+                episodeNumber: 1,
+                positionSeconds: 0,
+                updatedAt: expect.any(String),
+            })
+        );
+        fixture.detectChanges();
+        const quickStartButton: HTMLButtonElement | null =
+            fixture.nativeElement.querySelector(
+                '[data-testid="series-quick-start"]'
+            );
+        expect(quickStartButton?.textContent).toContain(
+            'XTREAM.PLAY_EPISODE'
+        );
+        expect(quickStartButton?.textContent).toContain(
+            'S02E01 \u00b7 Season 2 Episode 1'
+        );
+    });
+
+    it('automatically resumes the exact dashboard episode after positions load', async () => {
+        getSeriesPlaybackPositions.mockResolvedValue([
+            {
+                contentXtreamId: 2001,
+                contentType: 'episode',
+                seriesXtreamId: 103,
+                seasonNumber: 2,
+                episodeNumber: 1,
+                positionSeconds: 84,
+                durationSeconds: 1200,
+                playlistId: 'xtream-1',
+                updatedAt: '2026-05-10T12:00:00.000Z',
+            },
+        ]);
+        seriesResumeTarget.set({
+            seriesXtreamId: 103,
+            contentXtreamId: 2001,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        });
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(constructEpisodeStreamUrl).toHaveBeenCalledTimes(1);
+        expect(constructEpisodeStreamUrl).toHaveBeenCalledWith(
+            expect.objectContaining({
+                id: '2001',
+                season: 2,
+                episode_num: 1,
+            })
+        );
+        expect(openResolvedPlayback).toHaveBeenCalledWith(
+            expect.objectContaining({
+                streamUrl: 'http://xtream.example/series/2001.mp4',
+                startTime: 84,
+                contentInfo: expect.objectContaining({
+                    contentXtreamId: 2001,
+                    seriesXtreamId: 103,
+                    seasonNumber: 2,
+                    episodeNumber: 1,
+                }),
+            }),
+            true
+        );
+    });
+
+    it('does not auto-resume the dashboard episode when positions fail to load', async () => {
+        const warnSpy = jest
+            .spyOn(console, 'warn')
+            .mockImplementation(() => undefined);
+        getSeriesPlaybackPositions.mockRejectedValue(
+            new Error('storage unavailable')
+        );
+        seriesResumeTarget.set({
+            seriesXtreamId: 103,
+            contentXtreamId: 2001,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        });
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(constructEpisodeStreamUrl).not.toHaveBeenCalled();
+        expect(openResolvedPlayback).not.toHaveBeenCalled();
+        warnSpy.mockRestore();
+    });
+
+    it('applies streamed playback-position updates for the selected series only', async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+        if (!positionUpdateCallback) {
+            throw new Error('expected a playback-position subscription');
+        }
+
+        positionUpdateCallback({
+            playlistId: 'other-playlist',
+            contentXtreamId: 1001,
+            contentType: 'episode',
+            seriesXtreamId: 103,
+            seasonNumber: 1,
+            episodeNumber: 1,
+            positionSeconds: 300,
+            durationSeconds: 1200,
+        } as PlaybackPositionData);
+        fixture.detectChanges();
+
+        const quickStartButton = (): HTMLButtonElement | null =>
+            fixture.nativeElement.querySelector(
+                '[data-testid="series-quick-start"]'
+            );
+        expect(quickStartButton()?.textContent).not.toContain(
+            'XTREAM.RESUME_EPISODE'
+        );
+
+        positionUpdateCallback({
+            playlistId: 'xtream-1',
+            contentXtreamId: 1001,
+            contentType: 'episode',
+            seriesXtreamId: 103,
+            seasonNumber: 1,
+            episodeNumber: 1,
+            positionSeconds: 300,
+            durationSeconds: 1200,
+        } as PlaybackPositionData);
+        fixture.detectChanges();
+
+        expect(quickStartButton()?.textContent).toContain(
+            'XTREAM.RESUME_EPISODE'
+        );
+        expect(quickStartButton()?.textContent).toContain(
+            'S01E01 · Episode 1'
+        );
+    });
+
+    it('persists the launched episode after an external fallback succeeds', async () => {
+        openExternalPlayback.mockResolvedValue({
+            id: 'mpv-session-1',
+            player: 'mpv',
+            status: 'opened',
+        });
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        const playbackService = fixture.debugElement.injector.get(
+            SerialDetailsPlaybackService
+        );
+        playbackService.handleExternalFallbackRequest({
+            player: 'mpv',
+            playback: {
+                streamUrl: 'http://xtream.example/series/2001.mp4',
+                title: 'Season 2 Episode 1',
+                contentInfo: {
+                    playlistId: 'xtream-1',
+                    contentXtreamId: 2001,
+                    contentType: 'episode',
+                    seriesXtreamId: 103,
+                    seasonNumber: 2,
+                    episodeNumber: 1,
+                },
+            },
+            diagnostic: {},
+        } as never);
+        await fixture.whenStable();
+
+        expect(openExternalPlayback).toHaveBeenCalledTimes(1);
+        expect(savePlaybackPosition).toHaveBeenCalledWith(
+            'xtream-1',
+            expect.objectContaining({
+                contentXtreamId: 2001,
+                contentType: 'episode',
+                positionSeconds: 0,
+            })
+        );
+    });
+
+    it('persists throttled inline time updates for the playing episode', async () => {
+        isEmbeddedPlayer.mockReturnValue(true);
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        const playbackService = fixture.debugElement.injector.get(
+            SerialDetailsPlaybackService
+        );
+
+        // Without an inline playback there is nothing to persist.
+        playbackService.handleInlineTimeUpdate({
+            currentTime: 10,
+            duration: 100,
+        });
+        expect(savePlaybackPosition).not.toHaveBeenCalled();
+
+        fixture.componentInstance.playEpisode({
+            id: '1001',
+            episode_num: 1,
+            title: 'Episode 1',
+            season: 1,
+        } as never);
+        playbackService.handleInlineTimeUpdate({
+            currentTime: 123.9,
+            duration: 1200.4,
+        });
+        expect(savePlaybackPosition).toHaveBeenCalledWith(
+            'xtream-1',
+            expect.objectContaining({
+                contentXtreamId: 1001,
+                positionSeconds: 123,
+                durationSeconds: 1200,
+            })
+        );
+
+        // A second update inside the 15s throttle window is skipped.
+        savePlaybackPosition.mockClear();
+        playbackService.handleInlineTimeUpdate({
+            currentTime: 130,
+            duration: 1200,
+        });
+        expect(savePlaybackPosition).not.toHaveBeenCalled();
+    });
+
+    it('saves and clears positions for season-container toggle requests', async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        const playbackService = fixture.debugElement.injector.get(
+            SerialDetailsPlaybackService
+        );
+        await playbackService.handlePlaybackToggleRequested({
+            contentXtreamId: 1001,
+            nextPosition: {
+                playlistId: 'xtream-1',
+                contentXtreamId: 1001,
+                contentType: 'episode',
+                seriesXtreamId: 103,
+                seasonNumber: 1,
+                episodeNumber: 1,
+                positionSeconds: 950,
+                durationSeconds: 1000,
+            },
+        } as never);
+        expect(savePlaybackPosition).toHaveBeenCalledWith(
+            'xtream-1',
+            expect.objectContaining({ contentXtreamId: 1001 })
+        );
+
+        await playbackService.handlePlaybackToggleRequested({
+            contentXtreamId: 1001,
+            nextPosition: null,
+        } as never);
+        expect(clearPlaybackPosition).toHaveBeenCalledWith(
+            'xtream-1',
+            1001,
+            'episode'
+        );
+    });
+
     it('passes inline episode metadata and autoplays only inside the current season', async () => {
         isEmbeddedPlayer.mockReturnValue(true);
         fixture.detectChanges();
diff --git a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.ts b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.ts
index d84a83be2..edb4362bf 100644
--- a/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.ts
+++ b/libs/portal/xtream/feature/src/lib/serial-details/serial-details.component.ts
@@ -25,15 +25,18 @@ import {
 } from '@iptvnator/ui/components';
 import { XtreamStore } from '@iptvnator/portal/xtream/data-access';
 import {
+    buildUpNextRailItems,
     type PlaybackFallbackRequest,
     PortalInlinePlayerComponent,
+    type UpNextRailItem,
 } from '@iptvnator/ui/playback';
 import {
-    TmdbEnrichedCastMember,
-    XtreamSerieInfo,
-    XtreamSerieEpisode,
-    XtreamSerieDetails,
     normalizeTitleKeys,
+    seriesStatusLabelKey,
+    TmdbEnrichedCastMember,
+    XtreamSerieDetails,
+    XtreamSerieEpisode,
+    XtreamSerieInfo,
 } from '@iptvnator/shared/interfaces';
 import {
     CrossPortalSimilarItem,
@@ -82,6 +85,9 @@ export class SerialDetailsComponent implements OnInit, OnDestroy {
     private readonly route = inject(ActivatedRoute);
     private readonly router = inject(Router);
     private readonly crossPortalSimilar = inject(CrossPortalSimilarService);
+
+    /** Maps the status token to its translated label key */
+    readonly seriesStatusLabelKey = seriesStatusLabelKey;
     private readonly xtreamStore = inject(XtreamStore);
     private readonly playback = inject(SerialDetailsPlaybackService);
     private readonly snackBar = inject(MatSnackBar);
@@ -115,6 +121,14 @@ export class SerialDetailsComponent implements OnInit, OnDestroy {
     readonly quickStartAction = this.playback.quickStartAction;
     readonly inlineEpisodeMetadata = this.playback.inlineEpisodeMetadata;
     readonly inlineSeriesNavigation = this.playback.inlineSeriesNavigation;
+    /** "Up Next" rail entries for the inline player (series only). */
+    readonly upNextEpisodes = computed<UpNextRailItem[]>(() =>
+        buildUpNextRailItems({
+            episodesBySeason: this.selectedItem()?.episodes,
+            currentEpisodeId: this.playback.inlineEpisodeState()?.episode.id,
+            playbackPositions: this.episodePlaybackPositions(),
+        })
+    );
 
     /** Season currently selected in the season container. */
     private readonly selectedSeasonKey = signal<string | null>(null);
@@ -337,6 +351,10 @@ export class SerialDetailsComponent implements OnInit, OnDestroy {
         this.playback.playNextEpisode();
     }
 
+    playUpNextEpisode(item: UpNextRailItem): void {
+        this.playback.playEpisode(item.episode as XtreamSerieEpisode);
+    }
+
     handleInlinePlaybackEnded(): void {
         this.playback.handleInlinePlaybackEnded();
     }
diff --git a/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.html b/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.html
index 1a5494699..dba1e722c 100644
--- a/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.html
+++ b/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.html
@@ -37,7 +37,7 @@
                     <span class="label">{{ 'XTREAM.ACTORS' | translate }}</span>
                     @if (info.tmdb_cast?.length) {
                         <div class="details__cast-strip">
-                            @for (member of info.tmdb_cast; track member.name) {
+                            @for (member of info.tmdb_cast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
                                 <span
                                     class="details__cast-chip"
                                     [class.details__cast-chip--clickable]="
@@ -79,12 +79,43 @@
                     }
                 </div>
             }
-            @if (info.director) {
+            @if (info.director || info.tmdb_directors?.length) {
                 <div class="details__meta-item">
-                    <span class="label">{{
-                        'XTREAM.DIRECTOR' | translate
-                    }}</span>
-                    <span class="value">{{ info.director }}</span>
+                    <span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
+                    @if (info.tmdb_directors?.length) {
+                        <div class="details__cast-strip">
+                            @for (member of info.tmdb_directors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
+                                <span
+                                    class="details__cast-chip"
+                                    [class.details__cast-chip--clickable]="
+                                        !!member.tmdbPersonId
+                                    "
+                                    (click)="openActor(member)"
+                                    [title]="member.name"
+                                >
+                                    @if (member.profileUrl) {
+                                        <img
+                                            class="details__cast-avatar"
+                                            [src]="member.profileUrl"
+                                            [alt]="member.name"
+                                            loading="lazy"
+                                        />
+                                    } @else {
+                                        <span
+                                            class="details__cast-avatar details__cast-avatar--fallback"
+                                        >
+                                            {{ member.name.charAt(0) }}
+                                        </span>
+                                    }
+                                    <span class="details__cast-name">{{
+                                        member.name
+                                    }}</span>
+                                </span>
+                            }
+                        </div>
+                    } @else {
+                        <span class="value">{{ info.director }}</span>
+                    }
                 </div>
             }
             @if (info.rating_kinopoisk) {
@@ -182,6 +213,14 @@
                         <mat-icon>play_circle</mat-icon>
                         {{ 'DOWNLOADS.PLAY_LOCAL' | translate }}
                     </button>
+                } @else if (isPausedDownload()) {
+                    <button
+                        class="download-btn download-btn--paused"
+                        (click)="resumePausedDownload()"
+                    >
+                        <mat-icon>play_arrow</mat-icon>
+                        {{ 'DOWNLOADS.RESUME' | translate }}
+                    </button>
                 } @else if (isDownloading()) {
                     <button
                         class="download-btn download-btn--downloading"
diff --git a/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.ts b/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.ts
index ac33511eb..e0e5e1638 100644
--- a/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.ts
+++ b/libs/portal/xtream/feature/src/lib/vod-details/vod-details-route.component.ts
@@ -219,6 +219,14 @@ export class VodDetailsRouteComponent implements OnInit, OnDestroy {
         return this.downloadsService.isDownloading(vodId, playlistId, 'vod');
     });
 
+    readonly isPausedDownload = computed(() => {
+        const vodId = this.selectedVodId();
+        const playlistId = this.xtreamStore.currentPlaylist()?.id;
+        if (!playlistId) return false;
+        this.downloadsService.downloads();
+        return this.downloadsService.isPaused(vodId, playlistId, 'vod');
+    });
+
     readonly trailerEmbedUrl = computed(() =>
         youtubeEmbedUrl(this.selectedVodInfo()?.youtube_trailer)
     );
@@ -431,6 +439,18 @@ export class VodDetailsRouteComponent implements OnInit, OnDestroy {
         this.playback.handleExternalFallbackRequest(request);
     }
 
+    async resumePausedDownload(): Promise<void> {
+        const playlistId = this.xtreamStore.currentPlaylist()?.id;
+        if (!playlistId) {
+            return;
+        }
+        await this.downloadsService.resumeDownloadByContent(
+            this.selectedVodId(),
+            playlistId,
+            'vod'
+        );
+    }
+
     async downloadVod(vodItem: XtreamVodDetails | null): Promise<void> {
         if (!vodItem) {
             return;
diff --git a/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.spec.ts b/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.spec.ts
index 2869f20d9..98b91e9e2 100644
--- a/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.spec.ts
+++ b/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.spec.ts
@@ -10,6 +10,7 @@ import { PlaylistsService } from '@iptvnator/services';
 import { Playlist } from '@iptvnator/shared/interfaces';
 import { firstValueFrom, of } from 'rxjs';
 import { SerialDetailsComponent } from './serial-details/serial-details.component';
+import { XTREAM_SERIES_RESUME_TARGET } from './serial-details/serial-details-resume-target.token';
 import { XtreamCollectionDetailComponent } from './xtream-collection-detail.component';
 
 describe('XtreamCollectionDetailComponent', () => {
@@ -105,19 +106,23 @@ describe('XtreamCollectionDetailComponent', () => {
     });
 
     it('opens Xtream series favorites with the serial detail route context', async () => {
-        fixture.componentRef.setInput(
-            'item',
-            {
-                uid: 'xtream::xtream-1::series:103',
-                name: 'Series One',
-                contentType: 'series',
-                sourceType: 'xtream',
-                playlistId: 'xtream-1',
-                playlistName: 'Xtream Portal',
-                xtreamId: 103,
-                categoryId: 3,
-            } satisfies UnifiedCollectionItem
-        );
+        const seriesResume = {
+            seriesXtreamId: 103,
+            contentXtreamId: 2001,
+            seasonNumber: 2,
+            episodeNumber: 1,
+        };
+        fixture.componentRef.setInput('item', {
+            uid: 'xtream::xtream-1::series:103',
+            name: 'Series One',
+            contentType: 'series',
+            sourceType: 'xtream',
+            playlistId: 'xtream-1',
+            playlistName: 'Xtream Portal',
+            xtreamId: 103,
+            categoryId: 3,
+        } satisfies UnifiedCollectionItem);
+        fixture.componentRef.setInput('seriesResume', seriesResume);
 
         fixture.detectChanges();
         await fixture.whenStable();
@@ -140,9 +145,17 @@ describe('XtreamCollectionDetailComponent', () => {
         // toSignal(), so the fake route must expose the observable too —
         // otherwise the inline detail crashes on construction.
         expect(route?.params).toBeDefined();
-        await expect(firstValueFrom(route!.params)).resolves.toEqual({
+        if (!route) {
+            throw new Error('expected an inline ActivatedRoute');
+        }
+        await expect(firstValueFrom(route.params)).resolves.toEqual({
             categoryId: '3',
             serialId: '103',
         });
+        expect(
+            fixture.componentInstance
+                .detailInjector()
+                ?.get(XTREAM_SERIES_RESUME_TARGET)()
+        ).toEqual(seriesResume);
     });
 });
diff --git a/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.ts b/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.ts
index e4020ffba..e8d098126 100644
--- a/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.ts
+++ b/libs/portal/xtream/feature/src/lib/xtream-collection-detail.component.ts
@@ -12,7 +12,10 @@ import {
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { PortalDetailShellComponent } from '@iptvnator/ui/components';
-import { UnifiedCollectionItem } from '@iptvnator/portal/shared/util';
+import {
+    SeriesResumeTarget,
+    UnifiedCollectionItem,
+} from '@iptvnator/portal/shared/util';
 import {
     XtreamPlaylistData,
     XtreamStore,
@@ -21,6 +24,7 @@ import { PlaylistsService } from '@iptvnator/services';
 import { Playlist } from '@iptvnator/shared/interfaces';
 import { firstValueFrom, of } from 'rxjs';
 import { SerialDetailsComponent } from './serial-details/serial-details.component';
+import { XTREAM_SERIES_RESUME_TARGET } from './serial-details/serial-details-resume-target.token';
 import { VodDetailsRouteComponent } from './vod-details/vod-details-route.component';
 
 interface XtreamCollectionStateSnapshot {
@@ -62,6 +66,7 @@ interface XtreamCollectionStateSnapshot {
 })
 export class XtreamCollectionDetailComponent {
     readonly item = input<UnifiedCollectionItem | null>(null);
+    readonly seriesResume = input<SeriesResumeTarget | null>(null);
 
     private readonly parentInjector = inject(Injector);
     private readonly playlistsService = inject(PlaylistsService);
@@ -154,6 +159,10 @@ export class XtreamCollectionDetailComponent {
                             params: of(routeParams),
                         },
                     },
+                    {
+                        provide: XTREAM_SERIES_RESUME_TARGET,
+                        useValue: this.seriesResume,
+                    },
                 ],
                 parent: this.parentInjector,
             })
diff --git a/libs/services/src/lib/downloads.service.spec.ts b/libs/services/src/lib/downloads.service.spec.ts
index d970093cf..7455302e3 100644
--- a/libs/services/src/lib/downloads.service.spec.ts
+++ b/libs/services/src/lib/downloads.service.spec.ts
@@ -21,6 +21,8 @@ type TestDownloadsService = {
     hasLoadedDownloads: Signal<boolean>;
     loadDownloads: DownloadsService['loadDownloads'];
     loadDownloadFolder: DownloadsService['loadDownloadFolder'];
+    pauseDownload: DownloadsService['pauseDownload'];
+    resumeDownload: DownloadsService['resumeDownload'];
     selectFolder: DownloadsService['selectFolder'];
     _isLoadingDownloads: WritableSignal<boolean>;
     _hasLoadedDownloads: WritableSignal<boolean>;
@@ -29,6 +31,11 @@ type TestDownloadsService = {
 
 type DownloadsElectronStub = {
     downloadsGetDefaultFolder?: jest.Mock<Promise<string>, []>;
+    downloadsPause?: jest.Mock<Promise<{ success: boolean }>, [number]>;
+    downloadsResume?: jest.Mock<
+        Promise<{ success: boolean }>,
+        [number, string]
+    >;
     downloadsSelectFolder?: jest.Mock<Promise<string | null>, []>;
     downloadsGetList: jest.Mock<Promise<DownloadItem[]>, [string?]>;
 };
@@ -163,6 +170,45 @@ describe('DownloadsService', () => {
         expect(electron.downloadsSelectFolder).toHaveBeenCalledTimes(1);
     });
 
+    it('forwards pause requests to the main process', async () => {
+        const electron = {
+            downloadsGetList: jest.fn(async () => []),
+            downloadsPause: jest.fn(async (downloadId: number) => ({
+                success: downloadId === 42,
+            })),
+        };
+        testWindow.electron = electron;
+        const service = createService();
+
+        await expect(service.pauseDownload(42)).resolves.toEqual({
+            success: true,
+        });
+        expect(electron.downloadsPause).toHaveBeenCalledWith(42);
+    });
+
+    it('resolves the authorized folder before resuming a paused download', async () => {
+        const electron = {
+            downloadsGetDefaultFolder: jest.fn(async () => '/downloads'),
+            downloadsGetList: jest.fn(async () => []),
+            downloadsResume: jest.fn(
+                async (downloadId: number, downloadFolder: string) => ({
+                    success:
+                        downloadId === 42 && downloadFolder === '/downloads',
+                })
+            ),
+        };
+        testWindow.electron = electron;
+        const service = createService();
+
+        await expect(service.resumeDownload(42)).resolves.toEqual({
+            success: true,
+        });
+        expect(electron.downloadsResume).toHaveBeenCalledWith(
+            42,
+            '/downloads'
+        );
+    });
+
     it('marks downloads as loaded after a failed request while preserving existing data', async () => {
         const existing = createDownload(1);
         const error = new Error('download query failed');
@@ -225,4 +271,45 @@ describe('DownloadsService', () => {
             'playlist-new'
         );
     });
+
+    it('reports paused content and resumes it by content identity', async () => {
+        const pausedItem = {
+            ...createDownload(7),
+            status: 'paused' as DownloadItem['status'],
+        };
+        const service = createService([
+            pausedItem,
+            createDownload(8),
+        ]) as unknown as DownloadsService;
+        const resumeDownload = jest
+            .fn()
+            .mockResolvedValue({ success: true });
+        (service as unknown as { resumeDownload: jest.Mock }).resumeDownload =
+            resumeDownload;
+
+        expect(service.isPaused(7, 'playlist-1', 'vod')).toBe(true);
+        expect(service.isPaused(8, 'playlist-1', 'vod')).toBe(false);
+
+        await expect(
+            service.resumeDownloadByContent(7, 'playlist-1', 'vod')
+        ).resolves.toEqual({ success: true });
+        expect(resumeDownload).toHaveBeenCalledWith(7);
+    });
+
+    it('rejects resume-by-content when the download is not paused', async () => {
+        const service = createService([
+            createDownload(8),
+        ]) as unknown as DownloadsService;
+        const resumeDownload = jest.fn();
+        (service as unknown as { resumeDownload: jest.Mock }).resumeDownload =
+            resumeDownload;
+
+        await expect(
+            service.resumeDownloadByContent(8, 'playlist-1', 'vod')
+        ).resolves.toEqual({
+            error: 'No paused download found',
+            success: false,
+        });
+        expect(resumeDownload).not.toHaveBeenCalled();
+    });
 });
diff --git a/libs/services/src/lib/downloads.service.ts b/libs/services/src/lib/downloads.service.ts
index 4564e189c..92c7e4fe3 100644
--- a/libs/services/src/lib/downloads.service.ts
+++ b/libs/services/src/lib/downloads.service.ts
@@ -4,6 +4,7 @@ import { RuntimeCapabilitiesService } from './runtime-capabilities.service';
 export type DownloadStatus =
     | 'queued'
     | 'downloading'
+    | 'paused'
     | 'completed'
     | 'failed'
     | 'canceled';
@@ -221,6 +222,53 @@ export class DownloadsService implements OnDestroy {
         }
     }
 
+    /**
+     * Pause a queued or active download
+     */
+    async pauseDownload(
+        downloadId: number
+    ): Promise<{ success: boolean; error?: string }> {
+        if (!this.isAvailable()) {
+            return { success: false, error: 'Downloads not available' };
+        }
+
+        try {
+            return await window.electron.downloadsPause(downloadId);
+        } catch (error) {
+            console.error('[DownloadsService] Error pausing download:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
+    }
+
+    /**
+     * Resume a paused download
+     */
+    async resumeDownload(
+        downloadId: number
+    ): Promise<{ success: boolean; error?: string }> {
+        if (!this.isAvailable()) {
+            return { success: false, error: 'Downloads not available' };
+        }
+
+        const folder = await this.loadDownloadFolder();
+        if (!folder) {
+            return { success: false, error: 'No download folder configured' };
+        }
+
+        try {
+            return await window.electron.downloadsResume(downloadId, folder);
+        } catch (error) {
+            console.error('[DownloadsService] Error resuming download:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
+    }
+
     /**
      * Retry a failed download
      */
@@ -401,7 +449,7 @@ export class DownloadsService implements OnDestroy {
     }
 
     /**
-     * Check if content is currently downloading or queued
+     * Check if content is currently downloading, queued, or paused
      */
     isDownloading(
         xtreamId: number,
@@ -409,7 +457,38 @@ export class DownloadsService implements OnDestroy {
         contentType: 'vod' | 'episode'
     ): boolean {
         const download = this.getDownloadByContent(xtreamId, playlistId, contentType);
-        return download?.status === 'downloading' || download?.status === 'queued';
+        return (
+            download?.status === 'downloading' ||
+            download?.status === 'queued' ||
+            download?.status === 'paused'
+        );
+    }
+
+    /**
+     * Check if content has a paused download
+     */
+    isPaused(
+        xtreamId: number,
+        playlistId: string,
+        contentType: 'vod' | 'episode'
+    ): boolean {
+        const download = this.getDownloadByContent(xtreamId, playlistId, contentType);
+        return download?.status === 'paused';
+    }
+
+    /**
+     * Resume the paused download that belongs to a content item
+     */
+    async resumeDownloadByContent(
+        xtreamId: number,
+        playlistId: string,
+        contentType: 'vod' | 'episode'
+    ): Promise<{ success: boolean; error?: string }> {
+        const download = this.getDownloadByContent(xtreamId, playlistId, contentType);
+        if (!download || download.status !== 'paused') {
+            return { success: false, error: 'No paused download found' };
+        }
+        return this.resumeDownload(download.id);
     }
 
     /**
diff --git a/libs/services/src/lib/playlist-backup.service.roundtrip.spec.ts b/libs/services/src/lib/playlist-backup.service.roundtrip.spec.ts
new file mode 100644
index 000000000..ab5fd7962
--- /dev/null
+++ b/libs/services/src/lib/playlist-backup.service.roundtrip.spec.ts
@@ -0,0 +1,237 @@
+import {
+    Playlist,
+    PlaylistBackupManifestV1,
+} from '@iptvnator/shared/interfaces';
+import {
+    createPlaylistBackupService,
+    createStatefulBackupCollaborators,
+    FakeBackupBackendState,
+} from './playlist-backup.service.test-helpers';
+
+/**
+ * Full export → import → export round-trip over a stateful in-memory
+ * backend. Guards the property the separate export/import specs cannot:
+ * that a backup produced by the app restores the complete user state when
+ * fed back into the app, and that nothing is silently dropped along the
+ * way (issue #1017 shipped exactly because export and import were only
+ * ever tested in isolation against hand-built fixtures).
+ */
+describe('PlaylistBackupService export → import round-trip', () => {
+    const electronWindow = window as unknown as { electron?: unknown };
+
+    beforeEach(() => {
+        electronWindow.electron = {};
+    });
+
+    afterEach(() => {
+        delete electronWindow.electron;
+        jest.restoreAllMocks();
+        localStorage.clear();
+    });
+
+    function seedState(): FakeBackupBackendState {
+        return {
+            playlists: [
+                {
+                    _id: 'm3u-1',
+                    title: 'Local M3U',
+                    count: 1,
+                    importDate: '2026-07-01T00:00:00.000Z',
+                    lastUsage: '2026-07-01T00:00:00.000Z',
+                    autoRefresh: false,
+                    position: 1,
+                    favorites: ['https://streams.example.com/one.m3u8'],
+                    recentlyViewed: [
+                        {
+                            source: 'm3u',
+                            id: 'https://streams.example.com/one.m3u8',
+                            url: 'https://streams.example.com/one.m3u8',
+                            title: 'Channel One',
+                            category_id: 'live',
+                            added_at: '2026-07-02T10:00:00.000Z',
+                        },
+                    ],
+                    hiddenGroupTitles: ['Shopping'],
+                } as unknown as Playlist,
+                {
+                    _id: 'xtream-1',
+                    title: 'Xtream Portal',
+                    count: 4,
+                    importDate: '2026-07-01T00:00:00.000Z',
+                    lastUsage: '2026-07-01T00:00:00.000Z',
+                    autoRefresh: true,
+                    position: 2,
+                    serverUrl: 'http://portal.example.com',
+                    username: 'user',
+                    password: 'pass',
+                } as Playlist,
+                {
+                    _id: 'stalker-1',
+                    title: 'Stalker Portal',
+                    count: 0,
+                    importDate: '2026-07-01T00:00:00.000Z',
+                    lastUsage: '2026-07-01T00:00:00.000Z',
+                    autoRefresh: false,
+                    position: 3,
+                    portalUrl:
+                        'http://stalker.example.com/stalker_portal/server/load.php',
+                    macAddress: '00:1A:79:AA:BB:CC',
+                    isFullStalkerPortal: true,
+                    favorites: [
+                        { id: '42', name: 'Stalker Channel', type: 'itv' },
+                    ],
+                    recentlyViewed: [
+                        { id: '43', name: 'Stalker Movie', type: 'vod' },
+                    ],
+                    stalkerToken: 'session-token',
+                } as unknown as Playlist,
+            ],
+            rawM3uByPlaylistId: new Map([
+                [
+                    'm3u-1',
+                    '#EXTM3U\n#EXTINF:-1,Channel One\nhttps://streams.example.com/one.m3u8',
+                ],
+            ]),
+            xtreamCategories: [
+                {
+                    id: 1,
+                    playlist_id: 'xtream-1',
+                    name: 'News',
+                    type: 'live',
+                    xtream_id: 101,
+                    hidden: true,
+                },
+                {
+                    id: 2,
+                    playlist_id: 'xtream-1',
+                    name: 'Sports',
+                    type: 'live',
+                    xtream_id: 102,
+                    hidden: false,
+                },
+                {
+                    id: 3,
+                    playlist_id: 'xtream-1',
+                    name: 'Drama',
+                    type: 'movies',
+                    xtream_id: 201,
+                    hidden: true,
+                },
+                {
+                    id: 4,
+                    playlist_id: 'xtream-1',
+                    name: 'Docs',
+                    type: 'series',
+                    xtream_id: 301,
+                    hidden: false,
+                },
+            ],
+            xtreamFavorites: [
+                {
+                    xtream_id: 501,
+                    type: 'movie',
+                    added_at: '2026-07-03T12:00:00.000Z',
+                    position: 0,
+                },
+            ],
+            xtreamRecent: [
+                {
+                    xtream_id: 601,
+                    type: 'live',
+                    viewed_at: '2026-07-04T18:30:00.000Z',
+                },
+            ],
+            playbackPositions: [
+                {
+                    contentXtreamId: 501,
+                    contentType: 'vod',
+                    positionSeconds: 120,
+                    durationSeconds: 3600,
+                    updatedAt: '2026-07-05T20:00:00.000Z',
+                },
+            ],
+            epgUrls: ['https://epg.example.com/guide.xml'],
+        };
+    }
+
+    function normalizeManifest(
+        manifest: PlaylistBackupManifestV1
+    ): PlaylistBackupManifestV1 {
+        return { ...manifest, exportedAt: 'normalized' };
+    }
+
+    it('re-importing its own export restores the full state and exports an identical manifest', async () => {
+        const state = seedState();
+        const collaborators = createStatefulBackupCollaborators(state);
+        const exportService = createPlaylistBackupService(collaborators);
+
+        const firstExport = await exportService.exportBackup();
+
+        // Simulate a fresh install that has already cached the same portal
+        // content (offline cache reports completed) but carries no user
+        // state: no playlists, no favorites, every category visible.
+        state.playlists = [];
+        state.rawM3uByPlaylistId.clear();
+        state.xtreamFavorites = [];
+        state.xtreamRecent = [];
+        state.playbackPositions = [];
+        state.epgUrls = [];
+        for (const row of state.xtreamCategories) {
+            row.hidden = false;
+        }
+
+        const importService = createPlaylistBackupService(collaborators);
+        const summary = await importService.importBackup(firstExport.json);
+
+        expect(summary).toEqual({
+            imported: 3,
+            merged: 0,
+            skipped: 0,
+            failed: 0,
+            errors: [],
+        });
+
+        // Category visibility restored by exact xtream ID (issue #1017).
+        expect(
+            state.xtreamCategories
+                .filter((row) => row.hidden)
+                .map((row) => row.xtream_id)
+                .sort((left, right) => left - right)
+        ).toEqual([101, 201]);
+        expect(state.xtreamFavorites).toEqual([
+            {
+                xtream_id: 501,
+                type: 'movie',
+                added_at: '2026-07-03T12:00:00.000Z',
+                position: 0,
+            },
+        ]);
+        expect(state.xtreamRecent).toEqual([
+            {
+                xtream_id: 601,
+                type: 'live',
+                viewed_at: '2026-07-04T18:30:00.000Z',
+            },
+        ]);
+        expect(state.playbackPositions).toEqual([
+            expect.objectContaining({
+                contentXtreamId: 501,
+                positionSeconds: 120,
+            }),
+        ]);
+        expect(state.epgUrls).toEqual(['https://epg.example.com/guide.xml']);
+        expect(
+            state.playlists.map((playlist) => playlist._id)
+        ).toEqual(['m3u-1', 'xtream-1', 'stalker-1']);
+
+        // Exporting the restored state must reproduce the original
+        // manifest byte for byte (modulo the export timestamp): any field
+        // silently dropped by export, import, or the restore mapping shows
+        // up as a diff here.
+        const secondExport = await importService.exportBackup();
+
+        expect(normalizeManifest(secondExport.manifest)).toEqual(
+            normalizeManifest(firstExport.manifest)
+        );
+    });
+});
diff --git a/libs/services/src/lib/playlist-backup.service.spec.ts b/libs/services/src/lib/playlist-backup.service.spec.ts
index 7f6ccbf08..15e6f8dc7 100644
--- a/libs/services/src/lib/playlist-backup.service.spec.ts
+++ b/libs/services/src/lib/playlist-backup.service.spec.ts
@@ -5,70 +5,10 @@ import {
     PLAYLIST_BACKUP_KIND,
     PLAYLIST_BACKUP_VERSION,
 } from '@iptvnator/shared/interfaces';
-import {
-    PlaylistBackupError,
-    PlaylistBackupService,
-} from './playlist-backup.service';
+import { PlaylistBackupError } from './playlist-backup.service';
+import { createPlaylistBackupService } from './playlist-backup.service.test-helpers';
 
 describe('PlaylistBackupService', () => {
-    function createService(overrides: Record<string, unknown> = {}) {
-        const service = Object.create(
-            PlaylistBackupService.prototype
-        ) as PlaylistBackupService;
-
-        Object.assign(service as object, {
-            playlistsService: {
-                addPlaylist: jest.fn((playlist: Playlist) => of(playlist)),
-                getAllData: jest.fn(() => of([])),
-                getRawPlaylistById: jest.fn(() => of('#EXTM3U')),
-                handlePlaylistParsing: jest.fn(
-                    (_uploadType: string, rawM3u: string, title: string) => ({
-                        _id: 'generated-id',
-                        title,
-                        filename: title,
-                        count: rawM3u.split('\n').filter(Boolean).length,
-                        playlist: {
-                            header: { raw: '#EXTM3U' },
-                            items: [],
-                        },
-                        importDate: '2026-04-21T00:00:00.000Z',
-                        lastUsage: '2026-04-21T00:00:00.000Z',
-                        favorites: [],
-                        autoRefresh: false,
-                    })
-                ),
-            },
-            settingsStore: {
-                getSettings: jest.fn(() => ({ epgUrl: [] })),
-                updateSettings: jest.fn().mockResolvedValue(undefined),
-            },
-            databaseService: {
-                getAllXtreamCategories: jest.fn().mockResolvedValue([]),
-                getFavorites: jest.fn().mockResolvedValue([]),
-                getRecentItems: jest.fn().mockResolvedValue([]),
-                getXtreamImportStatus: jest.fn().mockResolvedValue('idle'),
-                hasXtreamCategories: jest.fn().mockResolvedValue(false),
-                hasXtreamContent: jest.fn().mockResolvedValue(false),
-                restoreXtreamUserData: jest.fn().mockResolvedValue(undefined),
-                updateCategoryVisibility: jest.fn().mockResolvedValue(true),
-            },
-            playbackPositionService: {
-                getAllPlaybackPositions: jest.fn().mockResolvedValue([]),
-                clearAllPlaybackPositions: jest
-                    .fn()
-                    .mockResolvedValue(undefined),
-                savePlaybackPosition: jest.fn().mockResolvedValue(undefined),
-            },
-            pendingRestoreService: {
-                set: jest.fn(),
-                clear: jest.fn(),
-            },
-            ...overrides,
-        });
-
-        return service;
-    }
-
     afterEach(() => {
         jest.restoreAllMocks();
         localStorage.clear();
@@ -122,7 +62,7 @@ describe('PlaylistBackupService', () => {
             })),
             updateSettings: jest.fn().mockResolvedValue(undefined),
         };
-        const service = createService({
+        const service = createPlaylistBackupService({
             playlistsService,
             settingsStore,
         });
@@ -162,7 +102,7 @@ describe('PlaylistBackupService', () => {
     });
 
     it('rejects legacy raw playlist arrays on import', async () => {
-        const service = createService();
+        const service = createPlaylistBackupService();
 
         await expect(service.importBackup('[]')).rejects.toBeInstanceOf(
             PlaylistBackupError
@@ -209,7 +149,7 @@ describe('PlaylistBackupService', () => {
             })),
             updateSettings: jest.fn().mockResolvedValue(undefined),
         };
-        const service = createService({
+        const service = createPlaylistBackupService({
             playlistsService,
             settingsStore,
         });
diff --git a/libs/services/src/lib/playlist-backup.service.test-helpers.ts b/libs/services/src/lib/playlist-backup.service.test-helpers.ts
new file mode 100644
index 000000000..f3e5a57a4
--- /dev/null
+++ b/libs/services/src/lib/playlist-backup.service.test-helpers.ts
@@ -0,0 +1,236 @@
+import { of } from 'rxjs';
+import {
+    PlaybackPositionData,
+    Playlist,
+    XtreamBackupFavoriteItem,
+    XtreamBackupRecentlyViewedItem,
+} from '@iptvnator/shared/interfaces';
+import { PlaylistBackupService } from './playlist-backup.service';
+import { XtreamPendingRestoreService } from './xtream-pending-restore.service';
+
+/**
+ * Shared factory for PlaylistBackupService specs. Instantiates the service
+ * without Angular DI and replaces every collaborator with jest mocks;
+ * individual specs override only the collaborators they exercise.
+ */
+export function createPlaylistBackupService(
+    overrides: Record<string, unknown> = {}
+) {
+    const service = Object.create(
+        PlaylistBackupService.prototype
+    ) as PlaylistBackupService;
+
+    Object.assign(service as object, {
+        playlistsService: {
+            addPlaylist: jest.fn((playlist: Playlist) => of(playlist)),
+            getAllData: jest.fn(() => of([])),
+            getRawPlaylistById: jest.fn(() => of('#EXTM3U')),
+            handlePlaylistParsing: jest.fn(
+                (_uploadType: string, rawM3u: string, title: string) => ({
+                    _id: 'generated-id',
+                    title,
+                    filename: title,
+                    count: rawM3u.split('\n').filter(Boolean).length,
+                    playlist: {
+                        header: { raw: '#EXTM3U' },
+                        items: [],
+                    },
+                    importDate: '2026-04-21T00:00:00.000Z',
+                    lastUsage: '2026-04-21T00:00:00.000Z',
+                    favorites: [],
+                    autoRefresh: false,
+                })
+            ),
+        },
+        settingsStore: {
+            getSettings: jest.fn(() => ({ epgUrl: [] })),
+            updateSettings: jest.fn().mockResolvedValue(undefined),
+        },
+        databaseService: {
+            getAllXtreamCategories: jest.fn().mockResolvedValue([]),
+            getFavorites: jest.fn().mockResolvedValue([]),
+            getRecentItems: jest.fn().mockResolvedValue([]),
+            getXtreamImportStatus: jest.fn().mockResolvedValue('idle'),
+            hasXtreamCategories: jest.fn().mockResolvedValue(false),
+            hasXtreamContent: jest.fn().mockResolvedValue(false),
+            restoreXtreamUserData: jest.fn().mockResolvedValue(undefined),
+            updateCategoryVisibility: jest.fn().mockResolvedValue(true),
+        },
+        playbackPositionService: {
+            getAllPlaybackPositions: jest.fn().mockResolvedValue([]),
+            clearAllPlaybackPositions: jest.fn().mockResolvedValue(undefined),
+            savePlaybackPosition: jest.fn().mockResolvedValue(undefined),
+        },
+        pendingRestoreService: {
+            set: jest.fn(),
+            clear: jest.fn(),
+        },
+        ...overrides,
+    });
+
+    return service;
+}
+
+export interface FakeXtreamCategoryRow {
+    id: number;
+    playlist_id: string;
+    name: string;
+    type: 'live' | 'movies' | 'series';
+    xtream_id: number;
+    hidden: boolean;
+}
+
+export interface FakeXtreamContentRow {
+    xtream_id: number;
+    type: string;
+    added_at?: string;
+    position?: number | null;
+    viewed_at?: string;
+}
+
+/**
+ * Mutable in-memory stand-in for everything the backup service reads from
+ * and writes to. Round-trip specs seed it, export from it, wipe the user
+ * state, import the export back and compare.
+ */
+export interface FakeBackupBackendState {
+    playlists: Playlist[];
+    rawM3uByPlaylistId: Map<string, string>;
+    xtreamCategories: FakeXtreamCategoryRow[];
+    xtreamFavorites: FakeXtreamContentRow[];
+    xtreamRecent: FakeXtreamContentRow[];
+    playbackPositions: PlaybackPositionData[];
+    epgUrls: string[];
+}
+
+/**
+ * Stateful collaborator set backing PlaylistBackupService with
+ * FakeBackupBackendState: exports read the state, imports mutate it. The
+ * Xtream offline cache always reports "completed" so the import applies the
+ * restore immediately instead of parking it as pending state.
+ */
+export function createStatefulBackupCollaborators(
+    state: FakeBackupBackendState
+) {
+    let lastParsedRawM3u: string | null = null;
+
+    return {
+        playlistsService: {
+            getAllData: () => of(state.playlists.map((item) => ({ ...item }))),
+            addPlaylist: (playlist: Playlist) => {
+                const index = state.playlists.findIndex(
+                    (item) => item._id === playlist._id
+                );
+
+                if (index >= 0) {
+                    state.playlists[index] = playlist;
+                } else {
+                    state.playlists.push(playlist);
+                }
+
+                if (lastParsedRawM3u !== null) {
+                    state.rawM3uByPlaylistId.set(
+                        playlist._id,
+                        lastParsedRawM3u
+                    );
+                    lastParsedRawM3u = null;
+                }
+
+                return of(playlist);
+            },
+            getRawPlaylistById: (playlistId: string) =>
+                of(state.rawM3uByPlaylistId.get(playlistId) ?? '#EXTM3U'),
+            handlePlaylistParsing: (
+                _uploadType: string,
+                rawM3u: string,
+                title: string
+            ) => {
+                lastParsedRawM3u = rawM3u;
+
+                return {
+                    _id: 'parsed-transient-id',
+                    title,
+                    filename: title,
+                    count: 1,
+                    playlist: { header: { raw: '#EXTM3U' }, items: [] },
+                    importDate: '2026-07-23T00:00:00.000Z',
+                    lastUsage: '2026-07-23T00:00:00.000Z',
+                    favorites: [],
+                    autoRefresh: false,
+                };
+            },
+        },
+        settingsStore: {
+            getSettings: () => ({ epgUrl: [...state.epgUrls] }),
+            updateSettings: async ({ epgUrl }: { epgUrl: string[] }) => {
+                state.epgUrls = [...epgUrl];
+            },
+        },
+        databaseService: {
+            getAllXtreamCategories: async (
+                playlistId: string,
+                type: 'live' | 'movies' | 'series'
+            ) =>
+                state.xtreamCategories
+                    .filter(
+                        (row) =>
+                            row.playlist_id === playlistId && row.type === type
+                    )
+                    .map((row) => ({ ...row })),
+            getFavorites: async () =>
+                state.xtreamFavorites.map((row) => ({ ...row })),
+            getRecentItems: async () =>
+                state.xtreamRecent.map((row) => ({ ...row })),
+            getXtreamImportStatus: async () => 'completed',
+            hasXtreamCategories: async () => true,
+            hasXtreamContent: async () => true,
+            updateCategoryVisibility: async (
+                categoryIds: number[],
+                hidden: boolean
+            ) => {
+                for (const row of state.xtreamCategories) {
+                    if (categoryIds.includes(row.id)) {
+                        row.hidden = hidden;
+                    }
+                }
+
+                return true;
+            },
+            restoreXtreamUserData: async (
+                _playlistId: string,
+                favorites: XtreamBackupFavoriteItem[],
+                recentlyViewed: XtreamBackupRecentlyViewedItem[]
+            ) => {
+                state.xtreamFavorites = favorites.map((item) => ({
+                    xtream_id: item.xtreamId,
+                    type: item.contentType,
+                    ...(item.addedAt !== undefined
+                        ? { added_at: item.addedAt }
+                        : {}),
+                    ...(item.position !== undefined
+                        ? { position: item.position }
+                        : {}),
+                }));
+                state.xtreamRecent = recentlyViewed.map((item) => ({
+                    xtream_id: item.xtreamId,
+                    type: item.contentType,
+                    viewed_at: item.viewedAt,
+                }));
+            },
+        },
+        playbackPositionService: {
+            getAllPlaybackPositions: async () =>
+                state.playbackPositions.map((item) => ({ ...item })),
+            clearAllPlaybackPositions: async () => {
+                state.playbackPositions = [];
+            },
+            savePlaybackPosition: async (
+                _playlistId: string,
+                position: PlaybackPositionData
+            ) => {
+                state.playbackPositions.push({ ...position });
+            },
+        },
+        pendingRestoreService: new XtreamPendingRestoreService(),
+    };
+}
diff --git a/libs/services/src/lib/playlist-backup.service.ts b/libs/services/src/lib/playlist-backup.service.ts
index bbb29c28d..26cd646bf 100644
--- a/libs/services/src/lib/playlist-backup.service.ts
+++ b/libs/services/src/lib/playlist-backup.service.ts
@@ -1,6 +1,5 @@
 import { inject, Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
-import { v4 as uuidv4 } from 'uuid';
 import { PlaylistsService } from './playlists.service';
 import { SettingsStore } from './settings-store.service';
 import { DatabaseService } from './database-electron.service';
@@ -8,6 +7,7 @@ import { PlaybackPositionService } from './playback-position.service';
 import { XtreamPendingRestoreService } from './xtream-pending-restore.service';
 import {
     isM3uRecentlyViewedItem,
+    normalizeXtreamPendingRestoreState,
     M3uPlaylistBackupEntry,
     M3uRecentlyViewedItem,
     Playlist,
@@ -22,6 +22,7 @@ import {
     XtreamBackupContentType,
     XtreamPlaylistBackupEntry,
     XtreamPendingRestoreState,
+    createRandomId,
 } from '@iptvnator/shared/interfaces';
 
 export interface PlaylistBackupExportPayload {
@@ -443,6 +444,22 @@ export class PlaylistBackupService {
                         `Xtream backup "${entry.title}" is missing connection metadata.`
                     );
                 }
+
+                // Restore treats the backup's user state as authoritative and
+                // replaces the existing state with it. Every v1 export writes
+                // all four collections, so a missing one signals a damaged or
+                // hand-edited file — reject it instead of wiping user data
+                // with normalized empty arrays.
+                if (
+                    !Array.isArray(entry.userState?.hiddenCategories) ||
+                    !Array.isArray(entry.userState?.favorites) ||
+                    !Array.isArray(entry.userState?.recentlyViewed) ||
+                    !Array.isArray(entry.userState?.playbackPositions)
+                ) {
+                    throw new PlaylistBackupError(
+                        `Xtream backup "${entry.title}" has incomplete user state.`
+                    );
+                }
                 break;
             case 'stalker':
                 if (
@@ -568,10 +585,10 @@ export class PlaylistBackupService {
             return entry.exportedId;
         }
 
-        let nextId = uuidv4();
+        let nextId = createRandomId();
 
         while (existingIds.has(nextId)) {
-            nextId = uuidv4();
+            nextId = createRandomId();
         }
 
         return nextId;
@@ -737,20 +754,12 @@ export class PlaylistBackupService {
         playlistId: string,
         entry: XtreamPlaylistBackupEntry
     ): Promise<void> {
-        const restoreState: XtreamPendingRestoreState = {
-            hiddenCategories: entry.userState.hiddenCategories.map((item) => ({
-                ...item,
-            })),
-            favorites: entry.userState.favorites.map((item) => ({ ...item })),
-            recentlyViewed: entry.userState.recentlyViewed.map((item) => ({
-                ...item,
-            })),
-            playbackPositions: entry.userState.playbackPositions.map(
-                (item) => ({
-                    ...item,
-                })
-            ),
-        };
+        // Backup files are user-supplied JSON; normalization drops user-state
+        // entries without a usable numeric xtreamId (e.g. hiddenCategories
+        // exported by builds affected by issue #1017) so they cannot match
+        // arbitrary categories during restore.
+        const restoreState: XtreamPendingRestoreState =
+            normalizeXtreamPendingRestoreState(entry.userState);
 
         this.pendingRestoreService.set(playlistId, restoreState);
 
diff --git a/libs/services/src/lib/playlist-backup.service.xtream-restore.spec.ts b/libs/services/src/lib/playlist-backup.service.xtream-restore.spec.ts
new file mode 100644
index 000000000..dcfa79507
--- /dev/null
+++ b/libs/services/src/lib/playlist-backup.service.xtream-restore.spec.ts
@@ -0,0 +1,243 @@
+import { of } from 'rxjs';
+import {
+    Playlist,
+    PlaylistBackupManifestV1,
+    PLAYLIST_BACKUP_KIND,
+    PLAYLIST_BACKUP_VERSION,
+    XtreamPlaylistBackupEntry,
+} from '@iptvnator/shared/interfaces';
+import { createPlaylistBackupService } from './playlist-backup.service.test-helpers';
+
+/**
+ * Regression coverage for issue #1017: hidden Xtream categories must be
+ * exported with their xtream IDs and restored by exact ID match. The
+ * original bug exported `xtreamId: undefined` (dropped by JSON.stringify)
+ * and the restore comparison degraded to `undefined === undefined`, hiding
+ * every category of the affected type.
+ */
+describe('PlaylistBackupService Xtream hidden categories (issue #1017)', () => {
+    const electronWindow = window as unknown as { electron?: unknown };
+
+    // Wire-shape rows as returned by the DB worker's category ops.
+    const categoryRowsByType: Record<string, unknown[]> = {
+        live: [
+            {
+                id: 11,
+                playlist_id: 'xtream-1',
+                name: 'News',
+                type: 'live',
+                xtream_id: 101,
+                hidden: true,
+            },
+            {
+                id: 12,
+                playlist_id: 'xtream-1',
+                name: 'Sports',
+                type: 'live',
+                xtream_id: 102,
+                hidden: false,
+            },
+        ],
+        movies: [
+            {
+                id: 21,
+                playlist_id: 'xtream-1',
+                name: 'Drama',
+                type: 'movies',
+                xtream_id: 201,
+                hidden: true,
+            },
+        ],
+        series: [],
+    };
+
+    const existingXtreamPlaylist = {
+        _id: 'xtream-1',
+        title: 'Xtream Portal',
+        count: 3,
+        importDate: '2026-04-20T00:00:00.000Z',
+        lastUsage: '2026-04-20T00:00:00.000Z',
+        autoRefresh: false,
+        serverUrl: 'http://portal.example.com',
+        username: 'user',
+        password: 'pass',
+    } as Playlist;
+
+    function createXtreamManifest(
+        hiddenCategories: unknown[]
+    ): PlaylistBackupManifestV1 {
+        return {
+            kind: PLAYLIST_BACKUP_KIND,
+            version: PLAYLIST_BACKUP_VERSION,
+            exportedAt: '2026-04-21T00:00:00.000Z',
+            includeSecrets: true,
+            playlists: [
+                {
+                    portalType: 'xtream',
+                    exportedId: 'xtream-1',
+                    title: 'Xtream Portal',
+                    autoRefresh: false,
+                    connection: {
+                        serverUrl: 'http://portal.example.com',
+                        username: 'user',
+                        password: 'pass',
+                    },
+                    userState: {
+                        hiddenCategories,
+                        favorites: [],
+                        recentlyViewed: [],
+                        playbackPositions: [],
+                    },
+                } as unknown as XtreamPlaylistBackupEntry,
+            ],
+        };
+    }
+
+    function createRestoreCollaborators() {
+        return {
+            playlistsService: {
+                addPlaylist: jest.fn((playlist: Playlist) => of(playlist)),
+                getAllData: jest.fn(() => of([existingXtreamPlaylist])),
+                getRawPlaylistById: jest.fn(() => of('#EXTM3U')),
+                handlePlaylistParsing: jest.fn(),
+            },
+            databaseService: {
+                getAllXtreamCategories: jest.fn(
+                    (_playlistId: string, type: string) =>
+                        Promise.resolve(categoryRowsByType[type] ?? [])
+                ),
+                getFavorites: jest.fn().mockResolvedValue([]),
+                getRecentItems: jest.fn().mockResolvedValue([]),
+                getXtreamImportStatus: jest.fn().mockResolvedValue('completed'),
+                hasXtreamCategories: jest.fn().mockResolvedValue(true),
+                hasXtreamContent: jest.fn().mockResolvedValue(true),
+                restoreXtreamUserData: jest.fn().mockResolvedValue(undefined),
+                updateCategoryVisibility: jest.fn().mockResolvedValue(true),
+            },
+            pendingRestoreService: {
+                set: jest.fn(),
+                clear: jest.fn(),
+            },
+        };
+    }
+
+    beforeEach(() => {
+        electronWindow.electron = {};
+    });
+
+    afterEach(() => {
+        delete electronWindow.electron;
+        jest.restoreAllMocks();
+        localStorage.clear();
+    });
+
+    it('exports hidden categories with their xtream IDs', async () => {
+        const collaborators = createRestoreCollaborators();
+        const service = createPlaylistBackupService({
+            playlistsService: collaborators.playlistsService,
+            databaseService: collaborators.databaseService,
+        });
+
+        const backup = await service.exportBackup();
+
+        const entry = backup.manifest
+            .playlists[0] as XtreamPlaylistBackupEntry;
+        const expectedHiddenCategories = [
+            { categoryType: 'live', xtreamId: 101 },
+            { categoryType: 'movies', xtreamId: 201 },
+        ];
+        expect(entry.userState.hiddenCategories).toEqual(
+            expectedHiddenCategories
+        );
+
+        // The IDs must survive JSON serialization; the original bug
+        // exported `xtreamId: undefined`, which JSON.stringify drops.
+        const serialized = JSON.parse(backup.json)
+            .playlists[0] as XtreamPlaylistBackupEntry;
+        expect(serialized.userState.hiddenCategories).toEqual(
+            expectedHiddenCategories
+        );
+    });
+
+    it('restores exactly the hidden categories referenced by the backup', async () => {
+        const collaborators = createRestoreCollaborators();
+        const service = createPlaylistBackupService(collaborators);
+
+        const manifest = createXtreamManifest([
+            { categoryType: 'live', xtreamId: 101 },
+        ]);
+
+        const summary = await service.importBackup(JSON.stringify(manifest));
+
+        expect(summary).toEqual(
+            expect.objectContaining({ merged: 1, failed: 0 })
+        );
+        // Per type: reset visibility, then hide only the matched rows.
+        expect(
+            collaborators.databaseService.updateCategoryVisibility
+        ).toHaveBeenNthCalledWith(1, [11, 12], false);
+        expect(
+            collaborators.databaseService.updateCategoryVisibility
+        ).toHaveBeenNthCalledWith(2, [11], true);
+        expect(
+            collaborators.databaseService.updateCategoryVisibility
+        ).toHaveBeenNthCalledWith(3, [21], false);
+        expect(
+            collaborators.databaseService.updateCategoryVisibility
+        ).toHaveBeenCalledTimes(3);
+        expect(collaborators.pendingRestoreService.clear).toHaveBeenCalledWith(
+            'xtream-1'
+        );
+    });
+
+    it('rejects entries with missing user-state collections instead of wiping user data', async () => {
+        const collaborators = createRestoreCollaborators();
+        const service = createPlaylistBackupService(collaborators);
+
+        // A damaged or hand-edited manifest without userState must not be
+        // treated as an authoritative "empty" state: the merge path would
+        // unhide every category and delete favorites/recent/positions.
+        const manifest = createXtreamManifest([]);
+        delete (
+            manifest.playlists[0] as unknown as { userState?: unknown }
+        ).userState;
+
+        await expect(
+            service.importBackup(JSON.stringify(manifest))
+        ).rejects.toThrow(/incomplete user state/);
+        expect(
+            collaborators.databaseService.updateCategoryVisibility
+        ).not.toHaveBeenCalled();
+        expect(
+            collaborators.databaseService.restoreXtreamUserData
+        ).not.toHaveBeenCalled();
+    });
+
+    it('ignores legacy hidden-category entries without an xtream ID instead of hiding everything', async () => {
+        const collaborators = createRestoreCollaborators();
+        const service = createPlaylistBackupService(collaborators);
+
+        // Backups exported by builds affected by issue #1017 contain
+        // hidden categories without any ID. Matching them must not
+        // degrade to a type-only comparison that hides every category.
+        const manifest = createXtreamManifest([
+            { categoryType: 'live' },
+            { categoryType: 'movies' },
+        ]);
+
+        const summary = await service.importBackup(JSON.stringify(manifest));
+
+        expect(summary).toEqual(
+            expect.objectContaining({ merged: 1, failed: 0 })
+        );
+        const hideCalls = (
+            collaborators.databaseService.updateCategoryVisibility.mock
+                .calls as unknown[][]
+        ).filter(([, hidden]) => hidden === true);
+        expect(hideCalls).toHaveLength(0);
+        expect(collaborators.pendingRestoreService.set).toHaveBeenCalledWith(
+            'xtream-1',
+            expect.objectContaining({ hiddenCategories: [] })
+        );
+    });
+});
diff --git a/libs/services/src/lib/playlist-refresh.service.spec.ts b/libs/services/src/lib/playlist-refresh.service.spec.ts
new file mode 100644
index 000000000..920db2940
--- /dev/null
+++ b/libs/services/src/lib/playlist-refresh.service.spec.ts
@@ -0,0 +1,49 @@
+import type {
+    ElectronBridgeApi,
+    PlaylistRefreshPayload,
+} from '@iptvnator/shared/interfaces';
+
+import { PlaylistRefreshService } from './playlist-refresh.service';
+
+describe('PlaylistRefreshService', () => {
+    const originalElectron = window.electron;
+    const payload: PlaylistRefreshPayload = {
+        operationId: 'playlist-refresh-cancelled',
+        playlistId: 'playlist-1',
+        title: 'Large playlist',
+        url: 'http://127.0.0.1/large.m3u',
+    };
+
+    afterEach(() => {
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: originalElectron,
+            writable: true,
+        });
+    });
+
+    it('creates a renderer-local AbortError from a cancellation result', async () => {
+        const unsubscribe = jest.fn();
+        const electron = {
+            onPlaylistRefreshEvent: jest.fn(() => unsubscribe),
+            refreshPlaylist: jest.fn().mockResolvedValue({
+                operationId: payload.operationId,
+                type: 'playlist-refresh-cancelled',
+            }),
+        } as unknown as ElectronBridgeApi;
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: electron,
+            writable: true,
+        });
+
+        await expect(
+            new PlaylistRefreshService().refreshPlaylist(payload)
+        ).rejects.toMatchObject({
+            message:
+                'Playlist refresh "playlist-refresh-cancelled" was cancelled',
+            name: 'AbortError',
+        });
+        expect(unsubscribe).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/libs/services/src/lib/playlist-refresh.service.ts b/libs/services/src/lib/playlist-refresh.service.ts
index d4ab49d79..f73f36ab7 100644
--- a/libs/services/src/lib/playlist-refresh.service.ts
+++ b/libs/services/src/lib/playlist-refresh.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
+    isPlaylistRefreshCancelledResult,
     Playlist,
     PlaylistRefreshEvent,
     PlaylistRefreshPayload,
@@ -30,7 +31,15 @@ export class PlaylistRefreshService {
         });
 
         try {
-            return await window.electron.refreshPlaylist(payload);
+            const result = await window.electron.refreshPlaylist(payload);
+            if (isPlaylistRefreshCancelledResult(result)) {
+                const error = new Error(
+                    `Playlist refresh "${result.operationId}" was cancelled`
+                );
+                error.name = 'AbortError';
+                throw error;
+            }
+            return result;
         } finally {
             unsubscribe?.();
         }
diff --git a/libs/services/src/lib/playlists.service.spec.ts b/libs/services/src/lib/playlists.service.spec.ts
index f1701fdca..f240dd9fd 100644
--- a/libs/services/src/lib/playlists.service.spec.ts
+++ b/libs/services/src/lib/playlists.service.spec.ts
@@ -55,6 +55,7 @@ describe('PlaylistsService', () => {
             },
             electronMigrationPromise: null,
             indexedDbMigrationPromise: null,
+            playlistWriteQueues: new Map(),
             playlistDeleteCleanups: [],
         });
 
@@ -274,7 +275,9 @@ describe('PlaylistsService', () => {
         await expect(
             firstValueFrom(service.getM3uFavoriteChannels('playlist-1'))
         ).resolves.toBeNull();
-        expect(electron.dbGetAppPlaylistFavoriteChannels).not.toHaveBeenCalled();
+        expect(
+            electron.dbGetAppPlaylistFavoriteChannels
+        ).not.toHaveBeenCalled();
         expect(electron.dbGetAppPlaylist).not.toHaveBeenCalled();
         expect(electron.dbGetAppPlaylists).not.toHaveBeenCalled();
     });
@@ -477,6 +480,10 @@ describe('PlaylistsService', () => {
 
     it('updates many browser playlists with refresh metadata', async () => {
         jest.spyOn(Date, 'now').mockReturnValue(1770000000000);
+        // Auto-refresh snapshots always come from playlists that had
+        // autoRefresh enabled; the batch write preserves that flag from the
+        // current row (or the snapshot when the row is missing) instead of
+        // force-enabling it.
         const playlists = [
             {
                 _id: 'playlist-a',
@@ -484,7 +491,7 @@ describe('PlaylistsService', () => {
                 count: 1,
                 importDate: '2026-04-01T00:00:00.000Z',
                 lastUsage: '2026-04-01T00:00:00.000Z',
-                autoRefresh: false,
+                autoRefresh: true,
             },
             {
                 _id: 'playlist-b',
@@ -492,7 +499,7 @@ describe('PlaylistsService', () => {
                 count: 2,
                 importDate: '2026-04-01T00:00:00.000Z',
                 lastUsage: '2026-04-01T00:00:00.000Z',
-                autoRefresh: false,
+                autoRefresh: true,
             },
         ] as Playlist[];
         const dbService = {
@@ -1240,4 +1247,459 @@ describe('PlaylistsService', () => {
             })
         );
     });
+
+    describe('per-playlist write serialization', () => {
+        function createBasePlaylist(id: string): Playlist {
+            return {
+                _id: id,
+                title: 'Race Playlist',
+                count: 0,
+                importDate: '2026-07-01T00:00:00.000Z',
+                lastUsage: '2026-07-01T00:00:00.000Z',
+                autoRefresh: false,
+                favorites: [{ stream_id: 1, title: 'Existing Favorite' }],
+                recentlyViewed: [],
+            } as Playlist;
+        }
+
+        function createStatefulElectronStore(initialPlaylist: Playlist) {
+            const store = { current: initialPlaylist };
+            const electron = {
+                dbGetAppPlaylist: jest.fn(async () => {
+                    // Yield a microtask so overlapping reads interleave the
+                    // same way real async IPC reads do.
+                    await Promise.resolve();
+                    return store.current;
+                }),
+                dbGetAppPlaylists: jest.fn(async () => []),
+                dbGetAppState: jest.fn(async (key: string) =>
+                    key === SQLITE_PLAYLIST_MIGRATION_FLAG ||
+                    key === STALKER_PLAYLIST_METADATA_MIGRATION_FLAG
+                        ? '1'
+                        : null
+                ),
+                dbSetAppState: jest.fn(),
+                dbUpsertAppPlaylist: jest.fn(async (playlist: Playlist) => {
+                    store.current = playlist;
+                }),
+                dbUpsertAppPlaylists: jest.fn(async (playlists: Playlist[]) => {
+                    const target = playlists.find(
+                        (playlist) => playlist._id === store.current._id
+                    );
+                    if (target) {
+                        store.current = target;
+                    }
+                }),
+            };
+            return { store, electron };
+        }
+
+        it('keeps both changes when a favorite add overlaps a recently-viewed add (SQLite)', async () => {
+            const { store, electron } = createStatefulElectronStore(
+                createBasePlaylist('portal-race-cross-field')
+            );
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            await Promise.all([
+                firstValueFrom(
+                    service.addPortalFavorite('portal-race-cross-field', {
+                        stream_id: 2,
+                        title: 'New Favorite',
+                    } as never)
+                ),
+                firstValueFrom(
+                    service.addPlaylistRecentlyViewed(
+                        'portal-race-cross-field',
+                        {
+                            source: 'm3u',
+                            id: 'https://example.com/recent.m3u8',
+                            url: 'https://example.com/recent.m3u8',
+                            title: 'Recent Channel',
+                            category_id: 'live',
+                            added_at: '2026-07-25T10:00:00.000Z',
+                        } as never
+                    )
+                ),
+            ]);
+
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+            ]);
+            expect(store.current.recentlyViewed).toEqual([
+                expect.objectContaining({
+                    url: 'https://example.com/recent.m3u8',
+                }),
+            ]);
+            expect(electron.dbUpsertAppPlaylist).toHaveBeenCalledTimes(2);
+        });
+
+        it('forwards refresh instrumentation only to its SQLite read and write', async () => {
+            const { electron } = createStatefulElectronStore(
+                createBasePlaylist('playlist-instrumented-refresh')
+            );
+            testWindow.electron = electron;
+            const service = createService();
+            const operationId = 'playlist-refresh-operation';
+
+            await firstValueFrom(
+                service.updatePlaylist(
+                    'playlist-instrumented-refresh',
+                    {
+                        _id: 'playlist-instrumented-refresh',
+                        playlist: { items: [] },
+                    } as Playlist,
+                    operationId
+                )
+            );
+
+            expect(electron.dbGetAppPlaylist).toHaveBeenCalledWith(
+                'playlist-instrumented-refresh',
+                operationId
+            );
+            expect(electron.dbUpsertAppPlaylist).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    _id: 'playlist-instrumented-refresh',
+                }),
+                operationId
+            );
+        });
+
+        it('keeps both favorites when two rapid favorite adds overlap (SQLite)', async () => {
+            const { store, electron } = createStatefulElectronStore(
+                createBasePlaylist('portal-race-two-favorites')
+            );
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            await Promise.all([
+                firstValueFrom(
+                    service.addPortalFavorite('portal-race-two-favorites', {
+                        stream_id: 2,
+                        title: 'Second Favorite',
+                    } as never)
+                ),
+                firstValueFrom(
+                    service.addPortalFavorite('portal-race-two-favorites', {
+                        stream_id: 3,
+                        title: 'Third Favorite',
+                    } as never)
+                ),
+            ]);
+
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+                expect.objectContaining({ stream_id: 3 }),
+            ]);
+            expect(electron.dbUpsertAppPlaylist).toHaveBeenCalledTimes(2);
+        });
+
+        it('keeps both changes when mutations overlap in the IndexedDB path', async () => {
+            const store = {
+                current: createBasePlaylist('portal-race-indexeddb'),
+            };
+            const dbService = {
+                getAll: jest.fn(() => of([])),
+                getByID: jest.fn(() => of(store.current)),
+                update: jest.fn((_storeName: string, playlist: Playlist) => {
+                    store.current = playlist;
+                    return of(playlist);
+                }),
+            };
+            testWindow.electron = undefined;
+
+            const service = createService(dbService);
+
+            await Promise.all([
+                firstValueFrom(
+                    service.addPortalFavorite('portal-race-indexeddb', {
+                        stream_id: 2,
+                        title: 'New Favorite',
+                    } as never)
+                ),
+                firstValueFrom(
+                    service.addPlaylistRecentlyViewed('portal-race-indexeddb', {
+                        source: 'm3u',
+                        id: 'https://example.com/recent.m3u8',
+                        url: 'https://example.com/recent.m3u8',
+                        title: 'Recent Channel',
+                        category_id: 'live',
+                        added_at: '2026-07-25T10:00:00.000Z',
+                    } as never)
+                ),
+            ]);
+
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+            ]);
+            expect(store.current.recentlyViewed).toEqual([
+                expect.objectContaining({
+                    url: 'https://example.com/recent.m3u8',
+                }),
+            ]);
+            expect(dbService.update).toHaveBeenCalledTimes(2);
+        });
+
+        it('continues the per-playlist queue after a failed mutation', async () => {
+            const { store, electron } = createStatefulElectronStore(
+                createBasePlaylist('portal-race-error')
+            );
+            electron.dbGetAppPlaylist.mockRejectedValueOnce(
+                new Error('read failed')
+            );
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            const failing = firstValueFrom(
+                service.addPortalFavorite('portal-race-error', {
+                    stream_id: 2,
+                    title: 'Dropped Favorite',
+                } as never)
+            );
+            const following = firstValueFrom(
+                service.addPortalFavorite('portal-race-error', {
+                    stream_id: 3,
+                    title: 'Surviving Favorite',
+                } as never)
+            );
+
+            await expect(failing).rejects.toThrow('read failed');
+            await following;
+
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 3 }),
+            ]);
+            expect(electron.dbUpsertAppPlaylist).toHaveBeenCalledTimes(1);
+        });
+
+        it('applies overlapping favorites transforms atomically', async () => {
+            const { store, electron } = createStatefulElectronStore(
+                createBasePlaylist('portal-transform-race')
+            );
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            await Promise.all([
+                firstValueFrom(
+                    service.transformPlaylistFavorites(
+                        'portal-transform-race',
+                        (current) => [
+                            ...current,
+                            { stream_id: 2, title: 'Second' } as never,
+                        ]
+                    )
+                ),
+                firstValueFrom(
+                    service.transformPlaylistFavorites(
+                        'portal-transform-race',
+                        (current) => [
+                            ...current,
+                            { stream_id: 3, title: 'Third' } as never,
+                        ]
+                    )
+                ),
+            ]);
+
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+                expect.objectContaining({ stream_id: 3 }),
+            ]);
+        });
+
+        it('keeps a queued favorite add when an auto-refresh batch write overlaps', async () => {
+            const { store, electron } = createStatefulElectronStore({
+                ...createBasePlaylist('portal-refresh-race'),
+                autoRefresh: true,
+            } as Playlist);
+            testWindow.electron = electron;
+
+            const service = createService();
+            const staleRefreshSnapshot = {
+                ...createBasePlaylist('portal-refresh-race'),
+                autoRefresh: true,
+                title: 'Refreshed Title',
+                count: 42,
+                recentlyViewed: [],
+            } as Playlist;
+
+            await Promise.all([
+                firstValueFrom(
+                    service.addPortalFavorite('portal-refresh-race', {
+                        stream_id: 2,
+                        title: 'New Favorite',
+                    } as never)
+                ),
+                firstValueFrom(
+                    service.updateManyPlaylists([staleRefreshSnapshot])
+                ),
+            ]);
+
+            expect(store.current.title).toBe('Refreshed Title');
+            expect(store.current.autoRefresh).toBe(true);
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+            ]);
+        });
+
+        it('does not re-enable auto-refresh disabled while a batch refresh is in flight', async () => {
+            const { store, electron } = createStatefulElectronStore({
+                ...createBasePlaylist('portal-autorefresh-race'),
+                autoRefresh: true,
+            } as Playlist);
+            testWindow.electron = electron;
+
+            const service = createService();
+            const staleRefreshSnapshot = {
+                ...createBasePlaylist('portal-autorefresh-race'),
+                autoRefresh: true,
+                title: 'Refreshed Title',
+            } as Playlist;
+
+            await Promise.all([
+                firstValueFrom(
+                    service.updatePlaylistMeta({
+                        _id: 'portal-autorefresh-race',
+                        autoRefresh: false,
+                    } as PlaylistMeta)
+                ),
+                firstValueFrom(
+                    service.updateManyPlaylists([staleRefreshSnapshot])
+                ),
+            ]);
+
+            expect(store.current.autoRefresh).toBe(false);
+            expect(store.current.title).toBe('Refreshed Title');
+        });
+
+        it('keeps queued metadata changes when an auto-refresh batch write overlaps', async () => {
+            const { store, electron } = createStatefulElectronStore({
+                ...createBasePlaylist('portal-meta-race'),
+                hiddenGroupTitles: ['News'],
+                manualEpgUrls: ['https://example.com/manual.xml'],
+            } as Playlist);
+            testWindow.electron = electron;
+
+            const service = createService();
+            const staleRefreshSnapshot = {
+                ...createBasePlaylist('portal-meta-race'),
+                title: 'Refreshed Title',
+                playlist: { items: [{ id: 'channel-1' }] },
+            } as Playlist;
+
+            await Promise.all([
+                firstValueFrom(
+                    service.updatePlaylistMeta({
+                        _id: 'portal-meta-race',
+                        hiddenGroupTitles: ['News', 'Movies'],
+                    } as PlaylistMeta)
+                ),
+                firstValueFrom(
+                    service.updateManyPlaylists([staleRefreshSnapshot])
+                ),
+            ]);
+
+            expect(store.current.hiddenGroupTitles).toEqual(['News', 'Movies']);
+            expect(store.current.manualEpgUrls).toEqual([
+                'https://example.com/manual.xml',
+            ]);
+            expect(store.current.title).toBe('Refreshed Title');
+            expect(store.current.count).toBe(1);
+        });
+
+        it('keeps a queued favorite add when a position update overlaps', async () => {
+            const { store, electron } = createStatefulElectronStore(
+                createBasePlaylist('portal-position-race')
+            );
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            await Promise.all([
+                firstValueFrom(
+                    service.addPortalFavorite('portal-position-race', {
+                        stream_id: 2,
+                        title: 'New Favorite',
+                    } as never)
+                ),
+                firstValueFrom(
+                    service.updatePlaylistPositions([
+                        {
+                            id: 'portal-position-race',
+                            changes: { position: 7 },
+                        },
+                    ])
+                ),
+            ]);
+
+            expect(store.current.position).toBe(7);
+            expect(store.current.favorites).toEqual([
+                expect.objectContaining({ stream_id: 1 }),
+                expect.objectContaining({ stream_id: 2 }),
+            ]);
+        });
+
+        it('does not serialize mutations across different playlists', async () => {
+            const playlists = new Map<string, Playlist>([
+                ['portal-a', createBasePlaylist('portal-a')],
+                ['portal-b', createBasePlaylist('portal-b')],
+            ]);
+            let resolvePortalARead: (() => void) | undefined;
+            const portalARead = new Promise<void>((resolve) => {
+                resolvePortalARead = resolve;
+            });
+            const electron = {
+                dbGetAppPlaylist: jest.fn(async (playlistId: string) => {
+                    if (playlistId === 'portal-a') {
+                        await portalARead;
+                    }
+                    return playlists.get(playlistId);
+                }),
+                dbGetAppPlaylists: jest.fn(async () => []),
+                dbGetAppState: jest.fn(async (key: string) =>
+                    key === SQLITE_PLAYLIST_MIGRATION_FLAG ||
+                    key === STALKER_PLAYLIST_METADATA_MIGRATION_FLAG
+                        ? '1'
+                        : null
+                ),
+                dbSetAppState: jest.fn(),
+                dbUpsertAppPlaylist: jest.fn(async (playlist: Playlist) => {
+                    playlists.set(playlist._id, playlist);
+                }),
+                dbUpsertAppPlaylists: jest.fn(),
+            };
+            testWindow.electron = electron;
+
+            const service = createService();
+
+            const blockedPortalA = firstValueFrom(
+                service.addPortalFavorite('portal-a', {
+                    stream_id: 2,
+                    title: 'Portal A Favorite',
+                } as never)
+            );
+
+            // Portal B completes although portal A's read is still blocked.
+            await firstValueFrom(
+                service.addPortalFavorite('portal-b', {
+                    stream_id: 5,
+                    title: 'Portal B Favorite',
+                } as never)
+            );
+            expect(playlists.get('portal-b')?.favorites).toHaveLength(2);
+
+            resolvePortalARead?.();
+            await blockedPortalA;
+            expect(playlists.get('portal-a')?.favorites).toHaveLength(2);
+        });
+    });
 });
diff --git a/libs/services/src/lib/playlists.service.ts b/libs/services/src/lib/playlists.service.ts
index f9fefc171..85b332a10 100644
--- a/libs/services/src/lib/playlists.service.ts
+++ b/libs/services/src/lib/playlists.service.ts
@@ -10,6 +10,7 @@ import {
 import { NgxIndexedDBService } from 'ngx-indexed-db';
 import {
     combineLatest,
+    defer,
     firstValueFrom,
     from,
     map,
@@ -51,7 +52,10 @@ type PlaylistRawItem = {
 type PlaylistStorageElectronApi = {
     dbDeleteAllPlaylists: () => Promise<unknown>;
     dbDeletePlaylist: (playlistId: string) => Promise<unknown>;
-    dbGetAppPlaylist: (playlistId: string) => Promise<Playlist | null>;
+    dbGetAppPlaylist: (
+        playlistId: string,
+        operationId?: string
+    ) => Promise<Playlist | null>;
     dbGetAppPlaylistFavoriteChannels?: (
         playlistId: string
     ) => Promise<M3uFavoriteChannel[]>;
@@ -59,7 +63,10 @@ type PlaylistStorageElectronApi = {
     dbGetAppPlaylists: () => Promise<Playlist[]>;
     dbGetAppState: (key: string) => Promise<string | null>;
     dbSetAppState: (key: string, value: string) => Promise<unknown>;
-    dbUpsertAppPlaylist: (playlist: Playlist) => Promise<unknown>;
+    dbUpsertAppPlaylist: (
+        playlist: Playlist,
+        operationId?: string
+    ) => Promise<unknown>;
     dbUpsertAppPlaylists: (playlists: Playlist[]) => Promise<unknown>;
 };
 
@@ -95,6 +102,7 @@ export class PlaylistsService {
         inject(PLAYLIST_DELETE_CLEANUP, { optional: true }) ?? [];
     private electronMigrationPromise: Promise<void> | null = null;
     private indexedDbMigrationPromise: Promise<void> | null = null;
+    private readonly playlistWriteQueues = new Map<string, Promise<unknown>>();
 
     private get electronApi(): PlaylistStorageElectronApi | null {
         if (typeof window === 'undefined') {
@@ -360,14 +368,18 @@ export class PlaylistsService {
         }
     }
 
-    private upsertSqlitePlaylist(playlist: Playlist) {
+    private upsertSqlitePlaylist(playlist: Playlist, operationId?: string) {
         return this.runOnSqlite(async () => {
             const electron = this.electronApi;
             if (!electron) {
                 return playlist;
             }
 
-            await electron.dbUpsertAppPlaylist(playlist);
+            if (operationId === undefined) {
+                await electron.dbUpsertAppPlaylist(playlist);
+            } else {
+                await electron.dbUpsertAppPlaylist(playlist, operationId);
+            }
             return playlist;
         });
     }
@@ -384,6 +396,46 @@ export class PlaylistsService {
         });
     }
 
+    // Every playlist mutation reads the row, patches it in memory, and writes
+    // the whole row back. Overlapping mutations on the same playlist would be
+    // last-write-wins, so all of them are chained per playlist id here.
+    private serializePlaylistWrite<T>(
+        playlistId: string,
+        operation: () => Promise<T>
+    ): Observable<T> {
+        return defer(() => {
+            const previous =
+                this.playlistWriteQueues.get(playlistId) ?? Promise.resolve();
+            const next = previous.then(() => operation());
+            const tail = next.then(
+                () => undefined,
+                () => undefined
+            );
+            this.playlistWriteQueues.set(playlistId, tail);
+            void tail.then(() => {
+                if (this.playlistWriteQueues.get(playlistId) === tail) {
+                    this.playlistWriteQueues.delete(playlistId);
+                }
+            });
+            return next;
+        });
+    }
+
+    private persistPlaylistMutation(
+        nextPlaylist: Playlist,
+        operationId?: string
+    ) {
+        if (this.isElectronStorageAvailable) {
+            return firstValueFrom(
+                this.upsertSqlitePlaylist(nextPlaylist, operationId)
+            );
+        }
+
+        return firstValueFrom(
+            this.dbService.update(DbStores.Playlists, nextPlaylist)
+        );
+    }
+
     getAllPlaylists() {
         if (this.isElectronStorageAvailable) {
             return this.runOnSqlite(async () => {
@@ -467,60 +519,86 @@ export class PlaylistsService {
         }
     }
 
-    updatePlaylist(playlistId: string, updatedPlaylist: Playlist) {
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((currentPlaylist: Playlist) => {
-                const epgSourceState = resolvePlaylistEpgSourceState({
-                    detectedEpgUrls:
-                        updatedPlaylist.detectedEpgUrls ??
-                        currentPlaylist.detectedEpgUrls,
-                    enabledEpgUrls:
-                        updatedPlaylist.epgUrls ?? currentPlaylist.epgUrls,
-                    manualEpgUrls:
-                        updatedPlaylist.manualEpgUrls ??
-                        currentPlaylist.manualEpgUrls,
-                    disabledEpgUrls:
-                        updatedPlaylist.disabledEpgUrls ??
-                        currentPlaylist.disabledEpgUrls,
-                });
-                const mergedPlaylist: Playlist = {
-                    ...currentPlaylist,
-                    ...updatedPlaylist,
-                    _id: playlistId,
-                    count:
-                        updatedPlaylist.playlist?.items?.length ??
-                        currentPlaylist.count,
-                    updateDate: Date.now(),
-                    updateState: PlaylistUpdateState.UPDATED,
-                    favorites: currentPlaylist.favorites,
-                    epgUrls: epgSourceState.epgUrls,
-                    detectedEpgUrls: epgSourceState.detectedEpgUrls,
-                    manualEpgUrls: epgSourceState.manualEpgUrls,
-                    disabledEpgUrls: epgSourceState.disabledEpgUrls,
-                    autoRefresh:
-                        currentPlaylist.autoRefresh ??
-                        updatedPlaylist.autoRefresh,
-                };
+    /**
+     * Canonical refresh merge shared by the single-playlist update flow and
+     * the auto-refresh batch. The refreshed payload only contributes
+     * refresh-owned data (parsed content, count, EPG detection); user-owned
+     * state on the freshly read row — favorites, recently viewed, ordering,
+     * hidden groups, curated EPG sources — must survive the refresh write.
+     */
+    private mergeRefreshedPlaylist(
+        currentPlaylist: Playlist | undefined,
+        updatedPlaylist: Playlist,
+        playlistId: string
+    ): Playlist {
+        const epgSourceState = resolvePlaylistEpgSourceState({
+            detectedEpgUrls:
+                updatedPlaylist.detectedEpgUrls ??
+                currentPlaylist?.detectedEpgUrls,
+            enabledEpgUrls: updatedPlaylist.epgUrls ?? currentPlaylist?.epgUrls,
+            manualEpgUrls:
+                updatedPlaylist.manualEpgUrls ?? currentPlaylist?.manualEpgUrls,
+            disabledEpgUrls:
+                updatedPlaylist.disabledEpgUrls ??
+                currentPlaylist?.disabledEpgUrls,
+        });
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(mergedPlaylist);
-                }
-
-                return this.dbService.update(
-                    DbStores.Playlists,
-                    mergedPlaylist
-                );
-            })
-        );
+        return {
+            ...currentPlaylist,
+            ...updatedPlaylist,
+            _id: playlistId,
+            count:
+                updatedPlaylist.playlist?.items?.length ??
+                currentPlaylist?.count ??
+                updatedPlaylist.count,
+            updateDate: Date.now(),
+            updateState: PlaylistUpdateState.UPDATED,
+            ...(currentPlaylist
+                ? {
+                      favorites: currentPlaylist.favorites,
+                      recentlyViewed: currentPlaylist.recentlyViewed,
+                      position: currentPlaylist.position,
+                  }
+                : {}),
+            epgUrls: epgSourceState.epgUrls,
+            detectedEpgUrls: epgSourceState.detectedEpgUrls,
+            manualEpgUrls: epgSourceState.manualEpgUrls,
+            disabledEpgUrls: epgSourceState.disabledEpgUrls,
+            autoRefresh:
+                currentPlaylist?.autoRefresh ?? updatedPlaylist.autoRefresh,
+        };
     }
 
-    getPlaylistById(id: string) {
+    updatePlaylist(
+        playlistId: string,
+        updatedPlaylist: Playlist,
+        operationId?: string
+    ) {
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const currentPlaylist = await firstValueFrom(
+                this.getPlaylistById(playlistId, operationId)
+            );
+            const mergedPlaylist = this.mergeRefreshedPlaylist(
+                currentPlaylist,
+                updatedPlaylist,
+                playlistId
+            );
+
+            return this.persistPlaylistMutation(mergedPlaylist, operationId);
+        });
+    }
+
+    getPlaylistById(id: string, operationId?: string) {
         if (this.isElectronStorageAvailable) {
             return this.runOnSqlite(async () => {
                 const electron = this.electronApi;
-                const playlist = electron
-                    ? await electron.dbGetAppPlaylist(id)
-                    : null;
+                let playlist: Playlist | null = null;
+                if (electron) {
+                    playlist =
+                        operationId === undefined
+                            ? await electron.dbGetAppPlaylist(id)
+                            : await electron.dbGetAppPlaylist(id, operationId);
+                }
                 return playlist
                     ? this.createSqliteFallbackPlaylist(playlist as Playlist)
                     : (undefined as unknown as Playlist);
@@ -535,138 +613,160 @@ export class PlaylistsService {
     }
 
     updatePlaylistMeta(updatedPlaylist: PlaylistMeta) {
-        return this.getPlaylistById(updatedPlaylist._id).pipe(
-            switchMap((playlist) => {
-                const epgSourceState = resolvePlaylistEpgSourceState({
-                    detectedEpgUrls:
-                        updatedPlaylist.detectedEpgUrls ??
-                        playlist.detectedEpgUrls,
-                    enabledEpgUrls: updatedPlaylist.epgUrls ?? playlist.epgUrls,
-                    manualEpgUrls:
-                        updatedPlaylist.manualEpgUrls ??
-                        playlist.manualEpgUrls,
-                    disabledEpgUrls:
-                        updatedPlaylist.disabledEpgUrls ??
-                        playlist.disabledEpgUrls,
-                });
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    ...(updatedPlaylist.title != null
-                        ? { title: updatedPlaylist.title }
-                        : {}),
-                    ...(updatedPlaylist.autoRefresh != null
-                        ? { autoRefresh: updatedPlaylist.autoRefresh }
-                        : {}),
-                    ...(updatedPlaylist.userAgent != null
-                        ? { userAgent: updatedPlaylist.userAgent }
-                        : {}),
-                    ...(updatedPlaylist.referrer !== undefined
-                        ? { referrer: updatedPlaylist.referrer }
-                        : {}),
-                    ...(updatedPlaylist.origin !== undefined
-                        ? { origin: updatedPlaylist.origin }
-                        : {}),
-                    ...(updatedPlaylist.serverUrl != null
-                        ? { serverUrl: updatedPlaylist.serverUrl }
-                        : {}),
-                    ...(updatedPlaylist.portalUrl != null
-                        ? { portalUrl: updatedPlaylist.portalUrl }
-                        : {}),
-                    ...(updatedPlaylist.isFullStalkerPortal !== undefined
-                        ? {
-                              isFullStalkerPortal:
-                                  updatedPlaylist.isFullStalkerPortal,
-                          }
-                        : {}),
-                    ...(updatedPlaylist.macAddress != null
-                        ? { macAddress: updatedPlaylist.macAddress }
-                        : {}),
-                    ...(updatedPlaylist.username != null
-                        ? { username: updatedPlaylist.username }
-                        : {}),
-                    ...(updatedPlaylist.password != null
-                        ? { password: updatedPlaylist.password }
-                        : {}),
-                    ...(updatedPlaylist.favorites != null
-                        ? { favorites: updatedPlaylist.favorites }
-                        : {}),
-                    ...(updatedPlaylist.recentlyViewed != null
-                        ? { recentlyViewed: updatedPlaylist.recentlyViewed }
-                        : {}),
-                    ...(updatedPlaylist.hiddenGroupTitles != null
-                        ? {
-                              hiddenGroupTitles:
-                                  updatedPlaylist.hiddenGroupTitles,
-                          }
-                        : {}),
-                    ...(updatedPlaylist.detectedEpgUrls !== undefined
-                        ? { detectedEpgUrls: epgSourceState.detectedEpgUrls }
-                        : {}),
-                    ...(updatedPlaylist.manualEpgUrls !== undefined
-                        ? { manualEpgUrls: epgSourceState.manualEpgUrls }
-                        : {}),
-                    ...(updatedPlaylist.disabledEpgUrls !== undefined
-                        ? { disabledEpgUrls: epgSourceState.disabledEpgUrls }
-                        : {}),
-                    ...(updatedPlaylist.epgUrls !== undefined ||
-                    updatedPlaylist.detectedEpgUrls !== undefined ||
-                    updatedPlaylist.manualEpgUrls !== undefined ||
-                    updatedPlaylist.disabledEpgUrls !== undefined
-                        ? { epgUrls: epgSourceState.epgUrls }
-                        : {}),
-                    ...(updatedPlaylist.updateDate !== undefined
-                        ? { updateDate: updatedPlaylist.updateDate }
-                        : {}),
-                    ...(updatedPlaylist.stalkerSerialNumber !== undefined
-                        ? {
-                              stalkerSerialNumber:
-                                  updatedPlaylist.stalkerSerialNumber,
-                          }
-                        : {}),
-                    ...(updatedPlaylist.stalkerDeviceId1 !== undefined
-                        ? { stalkerDeviceId1: updatedPlaylist.stalkerDeviceId1 }
-                        : {}),
-                    ...(updatedPlaylist.stalkerDeviceId2 !== undefined
-                        ? { stalkerDeviceId2: updatedPlaylist.stalkerDeviceId2 }
-                        : {}),
-                    ...(updatedPlaylist.stalkerSignature1 !== undefined
-                        ? {
-                              stalkerSignature1:
-                                  updatedPlaylist.stalkerSignature1,
-                          }
-                        : {}),
-                    ...(updatedPlaylist.stalkerSignature2 !== undefined
-                        ? {
-                              stalkerSignature2:
-                                  updatedPlaylist.stalkerSignature2,
-                          }
-                        : {}),
-                };
+        return this.serializePlaylistWrite(updatedPlaylist._id, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(updatedPlaylist._id)
+            );
+            const epgSourceState = resolvePlaylistEpgSourceState({
+                detectedEpgUrls:
+                    updatedPlaylist.detectedEpgUrls ?? playlist.detectedEpgUrls,
+                enabledEpgUrls: updatedPlaylist.epgUrls ?? playlist.epgUrls,
+                manualEpgUrls:
+                    updatedPlaylist.manualEpgUrls ?? playlist.manualEpgUrls,
+                disabledEpgUrls:
+                    updatedPlaylist.disabledEpgUrls ?? playlist.disabledEpgUrls,
+            });
+            const nextPlaylist: Playlist = {
+                ...playlist,
+                ...(updatedPlaylist.title != null
+                    ? { title: updatedPlaylist.title }
+                    : {}),
+                ...(updatedPlaylist.autoRefresh != null
+                    ? { autoRefresh: updatedPlaylist.autoRefresh }
+                    : {}),
+                ...(updatedPlaylist.userAgent != null
+                    ? { userAgent: updatedPlaylist.userAgent }
+                    : {}),
+                ...(updatedPlaylist.referrer !== undefined
+                    ? { referrer: updatedPlaylist.referrer }
+                    : {}),
+                ...(updatedPlaylist.origin !== undefined
+                    ? { origin: updatedPlaylist.origin }
+                    : {}),
+                ...(updatedPlaylist.serverUrl != null
+                    ? { serverUrl: updatedPlaylist.serverUrl }
+                    : {}),
+                ...(updatedPlaylist.portalUrl != null
+                    ? { portalUrl: updatedPlaylist.portalUrl }
+                    : {}),
+                ...(updatedPlaylist.isFullStalkerPortal !== undefined
+                    ? {
+                          isFullStalkerPortal:
+                              updatedPlaylist.isFullStalkerPortal,
+                      }
+                    : {}),
+                ...(updatedPlaylist.macAddress != null
+                    ? { macAddress: updatedPlaylist.macAddress }
+                    : {}),
+                ...(updatedPlaylist.username != null
+                    ? { username: updatedPlaylist.username }
+                    : {}),
+                ...(updatedPlaylist.password != null
+                    ? { password: updatedPlaylist.password }
+                    : {}),
+                ...(updatedPlaylist.favorites != null
+                    ? { favorites: updatedPlaylist.favorites }
+                    : {}),
+                ...(updatedPlaylist.recentlyViewed != null
+                    ? { recentlyViewed: updatedPlaylist.recentlyViewed }
+                    : {}),
+                ...(updatedPlaylist.hiddenGroupTitles != null
+                    ? {
+                          hiddenGroupTitles: updatedPlaylist.hiddenGroupTitles,
+                      }
+                    : {}),
+                ...(updatedPlaylist.detectedEpgUrls !== undefined
+                    ? { detectedEpgUrls: epgSourceState.detectedEpgUrls }
+                    : {}),
+                ...(updatedPlaylist.manualEpgUrls !== undefined
+                    ? { manualEpgUrls: epgSourceState.manualEpgUrls }
+                    : {}),
+                ...(updatedPlaylist.disabledEpgUrls !== undefined
+                    ? { disabledEpgUrls: epgSourceState.disabledEpgUrls }
+                    : {}),
+                ...(updatedPlaylist.epgUrls !== undefined ||
+                updatedPlaylist.detectedEpgUrls !== undefined ||
+                updatedPlaylist.manualEpgUrls !== undefined ||
+                updatedPlaylist.disabledEpgUrls !== undefined
+                    ? { epgUrls: epgSourceState.epgUrls }
+                    : {}),
+                ...(updatedPlaylist.updateDate !== undefined
+                    ? { updateDate: updatedPlaylist.updateDate }
+                    : {}),
+                ...(updatedPlaylist.stalkerSerialNumber !== undefined
+                    ? {
+                          stalkerSerialNumber:
+                              updatedPlaylist.stalkerSerialNumber,
+                      }
+                    : {}),
+                ...(updatedPlaylist.stalkerDeviceId1 !== undefined
+                    ? { stalkerDeviceId1: updatedPlaylist.stalkerDeviceId1 }
+                    : {}),
+                ...(updatedPlaylist.stalkerDeviceId2 !== undefined
+                    ? { stalkerDeviceId2: updatedPlaylist.stalkerDeviceId2 }
+                    : {}),
+                ...(updatedPlaylist.stalkerSignature1 !== undefined
+                    ? {
+                          stalkerSignature1: updatedPlaylist.stalkerSignature1,
+                      }
+                    : {}),
+                ...(updatedPlaylist.stalkerSignature2 !== undefined
+                    ? {
+                          stalkerSignature2: updatedPlaylist.stalkerSignature2,
+                      }
+                    : {}),
+            };
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation(nextPlaylist);
+        });
     }
 
     updateFavorites(id: string, favorites: string[]) {
-        return this.getPlaylistById(id).pipe(
-            switchMap((playlist) => {
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    favorites,
-                };
+        return this.serializePlaylistWrite(id, async () => {
+            const playlist = await firstValueFrom(this.getPlaylistById(id));
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
+            return this.persistPlaylistMutation({
+                ...playlist,
+                favorites,
+            });
+        });
+    }
 
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+    /**
+     * Applies an atomic favorites update: the current favorites are read
+     * inside the per-playlist write queue, so overlapping calls cannot work
+     * from stale snapshots. Callers should pass a pure transform instead of
+     * precomputing the next favorites array from an earlier read.
+     */
+    transformPlaylistFavorites(
+        playlistId: string,
+        transform: (
+            currentFavorites: NonNullable<Playlist['favorites']>
+        ) => NonNullable<Playlist['favorites']>
+    ): Observable<Playlist> {
+        if (!playlistId) {
+            throw new Error('Playlist ID is required');
+        }
+
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
+            if (!playlist) {
+                throw new Error(`Playlist not found: ${playlistId}`);
+            }
+
+            const currentFavorites = Array.isArray(playlist.favorites)
+                ? playlist.favorites
+                : [];
+            const nextPlaylist: Playlist = {
+                ...playlist,
+                favorites: transform(currentFavorites),
+            };
+
+            await this.persistPlaylistMutation(nextPlaylist);
+            return nextPlaylist;
+        });
     }
 
     updateManyPlaylists(playlists: Playlist[]) {
@@ -674,23 +774,29 @@ export class PlaylistsService {
             return of([]);
         }
 
-        if (this.isElectronStorageAvailable) {
-            const updatedPlaylists = playlists.map((playlist) => ({
-                ...playlist,
-                updateDate: Date.now(),
-                autoRefresh: true,
-            }));
-            return this.upsertManySqlitePlaylists(updatedPlaylists);
-        }
-
+        // Auto-refresh payloads are snapshots taken before the refresh ran,
+        // so each row goes through the same per-playlist queue and canonical
+        // refresh merge as the single-playlist update flow: a batch write
+        // cannot clobber a concurrent collection or metadata mutation.
         return combineLatest(
-            playlists.map((playlist) => {
-                return this.dbService.update(DbStores.Playlists, {
-                    ...playlist,
-                    updateDate: Date.now(),
-                    autoRefresh: true,
-                });
-            })
+            playlists.map((playlist) =>
+                this.serializePlaylistWrite(playlist._id, async () => {
+                    const current = await firstValueFrom(
+                        this.getPlaylistById(playlist._id)
+                    );
+                    // The merge takes autoRefresh from the current row first,
+                    // so disabling auto-refresh while a refresh is in flight
+                    // is not reverted by the completing batch write.
+                    const nextPlaylist = this.mergeRefreshedPlaylist(
+                        current,
+                        playlist,
+                        playlist._id
+                    );
+
+                    await this.persistPlaylistMutation(nextPlaylist);
+                    return nextPlaylist;
+                })
+            )
         );
     }
 
@@ -767,20 +873,14 @@ export class PlaylistsService {
         if (!portalId) {
             throw new Error('Portal ID is required');
         }
-        return this.getPlaylistById(portalId).pipe(
-            switchMap((portal) => {
-                const nextPlaylist: Playlist = {
-                    ...portal,
-                    favorites: [...(portal.favorites ?? []), item],
-                };
+        return this.serializePlaylistWrite(portalId, async () => {
+            const portal = await firstValueFrom(this.getPlaylistById(portalId));
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...portal,
+                favorites: [...(portal.favorites ?? []), item],
+            });
+        });
     }
 
     setPortalFavorites(portalId: string, favorites: StalkerPortalItem[]) {
@@ -788,54 +888,42 @@ export class PlaylistsService {
             throw new Error('Portal ID is required');
         }
 
-        return this.getPlaylistById(portalId).pipe(
-            switchMap((portal) => {
-                const nextPlaylist: Playlist = {
-                    ...portal,
-                    favorites,
-                };
+        return this.serializePlaylistWrite(portalId, async () => {
+            const portal = await firstValueFrom(this.getPlaylistById(portalId));
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...portal,
+                favorites,
+            });
+        });
     }
 
     removeFromPortalFavorites(portalId: string, favoriteId: number | string) {
         if (!portalId) {
             throw new Error('Portal ID is required');
         }
-        return this.getPlaylistById(portalId).pipe(
-            switchMap((portal) => {
-                const nextPlaylist: Playlist = {
-                    ...portal,
-                    favorites: portal.favorites?.filter((i) => {
-                        const expectedId = String(favoriteId);
-                        const favorite = i as PortalFavoriteItem;
-                        const streamId = String(favorite.stream_id ?? '');
-                        const seriesId = String(favorite.series_id ?? '');
-                        const movieId = String(favorite.movie_id ?? '');
-                        const itemId = String(favorite.id ?? '');
+        return this.serializePlaylistWrite(portalId, async () => {
+            const portal = await firstValueFrom(this.getPlaylistById(portalId));
 
-                        return (
-                            streamId !== expectedId &&
-                            seriesId !== expectedId &&
-                            movieId !== expectedId &&
-                            itemId !== expectedId
-                        );
-                    }),
-                };
+            return this.persistPlaylistMutation({
+                ...portal,
+                favorites: portal.favorites?.filter((i) => {
+                    const expectedId = String(favoriteId);
+                    const favorite = i as PortalFavoriteItem;
+                    const streamId = String(favorite.stream_id ?? '');
+                    const seriesId = String(favorite.series_id ?? '');
+                    const movieId = String(favorite.movie_id ?? '');
+                    const itemId = String(favorite.id ?? '');
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+                    return (
+                        streamId !== expectedId &&
+                        seriesId !== expectedId &&
+                        movieId !== expectedId &&
+                        itemId !== expectedId
+                    );
+                }),
+            });
+        });
     }
 
     updatePlaylistPositions(
@@ -848,46 +936,25 @@ export class PlaylistsService {
             return of([]);
         }
 
-        if (this.isElectronStorageAvailable) {
-            return this.runOnSqlite(async () => {
-                const electron = this.electronApi;
-                const playlists = electron
-                    ? ((await electron.dbGetAppPlaylists()) as Playlist[])
-                    : [];
-                const positionsById = new Map(
-                    positionUpdates.map((item) => [
-                        item.id,
-                        item.changes.position,
-                    ])
-                );
-
-                const updatedPlaylists = playlists
-                    .filter((playlist) => positionsById.has(playlist._id))
-                    .map((playlist) => ({
-                        ...playlist,
-                        position: positionsById.get(playlist._id),
-                    }));
-
-                if (electron) {
-                    await electron.dbUpsertAppPlaylists(updatedPlaylists);
-                }
-                return updatedPlaylists;
-            });
-        }
-
         return combineLatest(
-            positionUpdates.map((item) => {
-                return this.dbService
-                    .getByID<Playlist>(DbStores.Playlists, item.id)
-                    .pipe(
-                        switchMap((playlist: Playlist) =>
-                            this.dbService.update(DbStores.Playlists, {
-                                ...playlist,
-                                position: item.changes.position,
-                            })
-                        )
+            positionUpdates.map((item) =>
+                this.serializePlaylistWrite(item.id, async () => {
+                    const playlist = await firstValueFrom(
+                        this.getPlaylistById(item.id)
                     );
-            })
+                    if (!playlist) {
+                        return null;
+                    }
+
+                    const nextPlaylist: Playlist = {
+                        ...playlist,
+                        position: item.changes.position,
+                    };
+
+                    await this.persistPlaylistMutation(nextPlaylist);
+                    return nextPlaylist;
+                })
+            )
         );
     }
 
@@ -898,9 +965,8 @@ export class PlaylistsService {
         path?: string
     ) {
         try {
-            // Dynamic import keeps the ~130KB validator dep (transitively pulled
-            // by iptv-playlist-parser) out of the eager bundle. parse() only runs
-            // on user-triggered imports.
+            // Dynamic import keeps the parser out of the eager bundle;
+            // parse() only runs on user-triggered imports.
             const parserModule = await import('iptv-playlist-parser');
             const parse = resolvePlaylistParser(parserModule);
             const parsedPlaylist = parse(playlist);
@@ -954,20 +1020,16 @@ export class PlaylistsService {
     }
 
     setFavorites(playlistId: string, favorites: string[]) {
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((playlist) => {
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    favorites,
-                };
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...playlist,
+                favorites,
+            });
+        });
     }
 
     getRawPlaylistById(id: string) {
@@ -1088,40 +1150,36 @@ export class PlaylistsService {
             throw new Error('Playlist ID is required');
         }
 
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((playlist) => {
-                const nowIso = new Date().toISOString();
-                const recentItems = Array.isArray(playlist.recentlyViewed)
-                    ? (playlist.recentlyViewed as PlaylistRecentlyViewedItem[])
-                    : [];
-                const existingIndex = recentItems.findIndex((recentItem) =>
-                    this.matchesPlaylistRecentIdentity(
-                        recentItem,
-                        this.getPlaylistRecentIdentity(item)
-                    )
-                );
-                const existingItem =
-                    existingIndex >= 0 ? recentItems[existingIndex] : null;
-                const nextItem: PlaylistRecentlyViewedItem = {
-                    ...(existingItem ?? {}),
-                    ...item,
-                    added_at: nowIso,
-                };
-                const remainingItems = recentItems.filter(
-                    (_, index) => index !== existingIndex
-                );
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    recentlyViewed: [nextItem, ...remainingItems],
-                };
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
+            const nowIso = new Date().toISOString();
+            const recentItems = Array.isArray(playlist.recentlyViewed)
+                ? (playlist.recentlyViewed as PlaylistRecentlyViewedItem[])
+                : [];
+            const existingIndex = recentItems.findIndex((recentItem) =>
+                this.matchesPlaylistRecentIdentity(
+                    recentItem,
+                    this.getPlaylistRecentIdentity(item)
+                )
+            );
+            const existingItem =
+                existingIndex >= 0 ? recentItems[existingIndex] : null;
+            const nextItem: PlaylistRecentlyViewedItem = {
+                ...(existingItem ?? {}),
+                ...item,
+                added_at: nowIso,
+            };
+            const remainingItems = recentItems.filter(
+                (_, index) => index !== existingIndex
+            );
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...playlist,
+                recentlyViewed: [nextItem, ...remainingItems],
+            });
+        });
     }
 
     removeFromPlaylistRecentlyViewed(
@@ -1132,25 +1190,21 @@ export class PlaylistsService {
             throw new Error('Playlist ID is required');
         }
 
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((playlist) => {
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    recentlyViewed: (
-                        playlist.recentlyViewed as PlaylistRecentlyViewedItem[]
-                    )?.filter(
-                        (item) =>
-                            !this.matchesPlaylistRecentIdentity(item, identity)
-                    ),
-                };
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...playlist,
+                recentlyViewed: (
+                    playlist.recentlyViewed as PlaylistRecentlyViewedItem[]
+                )?.filter(
+                    (item) =>
+                        !this.matchesPlaylistRecentIdentity(item, identity)
+                ),
+            });
+        });
     }
 
     removeFromPlaylistRecentlyViewedBatch(
@@ -1165,30 +1219,23 @@ export class PlaylistsService {
             return this.getPlaylistById(playlistId);
         }
 
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((playlist) => {
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    recentlyViewed: (
-                        playlist.recentlyViewed as PlaylistRecentlyViewedItem[]
-                    )?.filter(
-                        (item) =>
-                            !identities.some((identity) =>
-                                this.matchesPlaylistRecentIdentity(
-                                    item,
-                                    identity
-                                )
-                            )
-                    ),
-                };
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...playlist,
+                recentlyViewed: (
+                    playlist.recentlyViewed as PlaylistRecentlyViewedItem[]
+                )?.filter(
+                    (item) =>
+                        !identities.some((identity) =>
+                            this.matchesPlaylistRecentIdentity(item, identity)
+                        )
+                ),
+            });
+        });
     }
 
     clearPlaylistRecentlyViewed(playlistId: string) {
@@ -1196,20 +1243,16 @@ export class PlaylistsService {
             throw new Error('Playlist ID is required');
         }
 
-        return this.getPlaylistById(playlistId).pipe(
-            switchMap((playlist) => {
-                const nextPlaylist: Playlist = {
-                    ...playlist,
-                    recentlyViewed: [],
-                };
+        return this.serializePlaylistWrite(playlistId, async () => {
+            const playlist = await firstValueFrom(
+                this.getPlaylistById(playlistId)
+            );
 
-                if (this.isElectronStorageAvailable) {
-                    return this.upsertSqlitePlaylist(nextPlaylist);
-                }
-
-                return this.dbService.update(DbStores.Playlists, nextPlaylist);
-            })
-        );
+            return this.persistPlaylistMutation({
+                ...playlist,
+                recentlyViewed: [],
+            });
+        });
     }
 
     getPortalRecentlyViewed(portalId: string) {
diff --git a/libs/services/src/lib/runtime-capabilities.service.spec.ts b/libs/services/src/lib/runtime-capabilities.service.spec.ts
index 7cb3e3afd..02b73edd2 100644
--- a/libs/services/src/lib/runtime-capabilities.service.spec.ts
+++ b/libs/services/src/lib/runtime-capabilities.service.spec.ts
@@ -97,6 +97,8 @@ describe('RuntimeCapabilitiesService', () => {
             dbRestoreXtreamUserData: jest.fn(),
             downloadsStart: jest.fn(),
             downloadsCancel: jest.fn(),
+            downloadsPause: jest.fn(),
+            downloadsResume: jest.fn(),
             downloadsRetry: jest.fn(),
             downloadsRemove: jest.fn(),
             downloadsGetList: jest.fn(),
@@ -366,6 +368,8 @@ describe('RuntimeCapabilitiesService', () => {
         testWindow.electron = {
             downloadsStart: jest.fn(),
             downloadsCancel: jest.fn(),
+            downloadsPause: jest.fn(),
+            downloadsResume: jest.fn(),
             downloadsRetry: jest.fn(),
             downloadsRemove: jest.fn(),
             downloadsGetList: jest.fn(),
diff --git a/libs/services/src/lib/runtime-capabilities.service.ts b/libs/services/src/lib/runtime-capabilities.service.ts
index e2d3ed248..caae0e069 100644
--- a/libs/services/src/lib/runtime-capabilities.service.ts
+++ b/libs/services/src/lib/runtime-capabilities.service.ts
@@ -115,6 +115,15 @@ export class RuntimeCapabilitiesService {
         return this.hasElectronMethod('searchEpgPrograms');
     }
 
+    get supportsEpgMapping(): boolean {
+        return (
+            this.hasElectronMethod('getEpgMapping') &&
+            this.hasElectronMethod('setEpgMapping') &&
+            this.hasElectronMethod('deleteEpgMapping') &&
+            this.hasElectronMethod('searchEpgChannels')
+        );
+    }
+
     get supportsSqlite(): boolean {
         return [
             'dbDeleteAllPlaylists',
@@ -174,6 +183,8 @@ export class RuntimeCapabilitiesService {
         return [
             'downloadsStart',
             'downloadsCancel',
+            'downloadsPause',
+            'downloadsResume',
             'downloadsRetry',
             'downloadsRemove',
             'downloadsGetList',
diff --git a/libs/services/src/lib/settings-store.service.spec.ts b/libs/services/src/lib/settings-store.service.spec.ts
index 9f9ae531a..b3362edb7 100644
--- a/libs/services/src/lib/settings-store.service.spec.ts
+++ b/libs/services/src/lib/settings-store.service.spec.ts
@@ -1,6 +1,6 @@
 import { Injector } from '@angular/core';
 import { StorageMap } from '@ngx-pwa/local-storage';
-import { of } from 'rxjs';
+import { of, Subject } from 'rxjs';
 import {
     DashboardRailsSettings,
     Language,
@@ -53,6 +53,58 @@ describe('SettingsStore dashboard rail settings', () => {
         });
     });
 
+    it('shares the pending initial settings load across startup waiters', async () => {
+        const pendingSettings = new Subject<Partial<Settings> | null>();
+        storage.get.mockReturnValue(pendingSettings.asObservable());
+        const store = injector.get(SettingsStore);
+
+        const firstWaiter = store.loadSettings();
+        const secondWaiter = store.loadSettings();
+        const allWaiters = Promise.all([firstWaiter, secondWaiter]);
+        let waitersResolved = false;
+        void allWaiters.then(() => {
+            waitersResolved = true;
+        });
+
+        await Promise.resolve();
+
+        expect(waitersResolved).toBe(false);
+        expect(store.getSettings().webPlayerSharedControls).toBe(false);
+
+        pendingSettings.next({ webPlayerSharedControls: true });
+        pendingSettings.complete();
+        await allWaiters;
+
+        expect(storage.get).toHaveBeenCalledTimes(1);
+        expect(firstWaiter).toBe(secondWaiter);
+        expect(waitersResolved).toBe(true);
+        expect(store.getSettings().webPlayerSharedControls).toBe(true);
+    });
+
+    it('retries the initial settings load after a storage error', async () => {
+        const failingSettings = new Subject<Partial<Settings> | null>();
+        storage.get
+            .mockReturnValueOnce(failingSettings.asObservable())
+            .mockReturnValueOnce(of({ webPlayerSharedControls: true }));
+        const consoleError = jest
+            .spyOn(console, 'error')
+            .mockImplementation(() => undefined);
+
+        try {
+            const store = injector.get(SettingsStore);
+            const initialLoad = store.loadSettings();
+
+            failingSettings.error(new Error('storage unavailable'));
+            await initialLoad;
+            await store.loadSettings();
+
+            expect(storage.get).toHaveBeenCalledTimes(2);
+            expect(store.getSettings().webPlayerSharedControls).toBe(true);
+        } finally {
+            consoleError.mockRestore();
+        }
+    });
+
     it('uses enabled dashboard rail defaults when no settings are stored', async () => {
         const store = injector.get(SettingsStore);
 
@@ -64,6 +116,125 @@ describe('SettingsStore dashboard rail settings', () => {
         );
     });
 
+    it('defaults shared web controls to false when the stored field is missing', async () => {
+        storedSettings = {};
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().webPlayerSharedControls).toBe(false);
+    });
+
+    it('restores a persisted true shared web controls preference', async () => {
+        storedSettings = {
+            webPlayerSharedControls: true,
+        };
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().webPlayerSharedControls).toBe(true);
+    });
+
+    it('defaults strip country prefix to false when the stored field is missing', async () => {
+        storedSettings = {};
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().stripCountryPrefix).toBe(false);
+    });
+
+    it('defaults ambient player mode to false when the stored field is missing', async () => {
+        storedSettings = {};
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().playerAmbientMode).toBe(false);
+    });
+
+    it('restores a persisted true ambient player mode preference', async () => {
+        storedSettings = { playerAmbientMode: true };
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().playerAmbientMode).toBe(true);
+    });
+
+    it('defaults the up next rail to true when the stored field is missing', async () => {
+        storedSettings = {};
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().playerUpNextRail).toBe(true);
+    });
+
+    it('restores a persisted false up next rail preference', async () => {
+        storedSettings = { playerUpNextRail: false };
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().playerUpNextRail).toBe(false);
+    });
+
+    it('restores a persisted true strip country prefix preference', async () => {
+        storedSettings = {
+            stripCountryPrefix: true,
+        };
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.getSettings().stripCountryPrefix).toBe(true);
+    });
+
+    it('normalizes a persisted string "true" shared web controls preference to false', async () => {
+        storedSettings = {
+            webPlayerSharedControls: 'true' as unknown as boolean,
+        };
+        const store = injector.get(SettingsStore);
+
+        await store.loadSettings();
+
+        expect(store.webPlayerSharedControls?.()).toBe(false);
+        expect(store.getSettings().webPlayerSharedControls).toBe(false);
+    });
+
+    it('persists an updated true shared web controls preference', async () => {
+        const store = injector.get(SettingsStore);
+
+        await store.updateSettings({
+            webPlayerSharedControls: true,
+        });
+
+        expect(storage.set).toHaveBeenCalledWith(
+            STORE_KEY.Settings,
+            expect.objectContaining({
+                webPlayerSharedControls: true,
+            })
+        );
+    });
+
+    it('serializes a malformed string "true" shared web controls update as false', async () => {
+        const store = injector.get(SettingsStore);
+
+        await store.updateSettings({
+            webPlayerSharedControls: 'true' as unknown as boolean,
+        });
+
+        expect(store.webPlayerSharedControls?.()).toBe(false);
+        expect(storage.set).toHaveBeenCalledWith(
+            STORE_KEY.Settings,
+            expect.objectContaining({
+                webPlayerSharedControls: false,
+            })
+        );
+    });
+
     it('deep-merges partial stored dashboard rail settings with enabled defaults', async () => {
         storedSettings = {
             player: VideoPlayer.VideoJs,
diff --git a/libs/services/src/lib/settings-store.service.ts b/libs/services/src/lib/settings-store.service.ts
index 883a5e8f8..447db58a2 100644
--- a/libs/services/src/lib/settings-store.service.ts
+++ b/libs/services/src/lib/settings-store.service.ts
@@ -26,6 +26,9 @@ import {
 
 const DEFAULT_SETTINGS: Settings = {
     player: VideoPlayer.VideoJs,
+    webPlayerSharedControls: false,
+    playerAmbientMode: false,
+    playerUpNextRail: true,
     streamFormat: StreamFormat.AutoStreamFormat,
     openStreamOnDoubleClick: false,
     language: Language.ENGLISH,
@@ -33,6 +36,7 @@ const DEFAULT_SETTINGS: Settings = {
     showDashboard: true,
     startupBehavior: StartupBehavior.FirstView,
     showExternalPlaybackBar: true,
+    stripCountryPrefix: false,
     theme: Theme.SystemTheme,
     mpvPlayerPath: '',
     mpvPlayerArguments: '',
@@ -45,6 +49,7 @@ const DEFAULT_SETTINGS: Settings = {
     epgUrl: [],
     downloadFolder: '',
     recordingFolder: '',
+    embeddedMpvFrameCopy: false,
     coverSize: 'medium',
     epgViewMode: 'timeline',
     dashboardRails: DEFAULT_DASHBOARD_RAILS_SETTINGS,
@@ -106,174 +111,215 @@ export const SettingsStore = signalStore(
             () => store.epgViewMode?.() ?? 'timeline'
         ),
     })),
-    withMethods((store, storage = inject(StorageMap)) => ({
-        async loadSettings() {
-            try {
-                const stored = await firstValueFrom(
-                    storage.get(STORE_KEY.Settings)
-                );
-                if (stored) {
-                    const storedSettings = stored as Partial<Settings>;
-                    patchState(store, {
-                        ...DEFAULT_SETTINGS,
-                        ...storedSettings,
-                        dashboardRails: normalizeDashboardRailsSettings(
-                            storedSettings.dashboardRails
-                        ),
-                    });
-                    void this.sanitizeEmbeddedMpvSelection().catch((error) => {
-                        console.warn(
-                            'Failed to verify embedded MPV support while loading settings.',
-                            error
+    withMethods((store, storage = inject(StorageMap)) => {
+        let settingsLoadPromise: Promise<void> | undefined;
+
+        return {
+            loadSettings() {
+                if (settingsLoadPromise) {
+                    return settingsLoadPromise;
+                }
+
+                settingsLoadPromise = (async () => {
+                    const stored = await firstValueFrom(
+                        storage.get(STORE_KEY.Settings)
+                    );
+                    if (stored) {
+                        const storedSettings = stored as Partial<Settings>;
+                        patchState(store, {
+                            ...DEFAULT_SETTINGS,
+                            ...storedSettings,
+                            webPlayerSharedControls:
+                                storedSettings.webPlayerSharedControls === true,
+                            dashboardRails: normalizeDashboardRailsSettings(
+                                storedSettings.dashboardRails
+                            ),
+                        });
+                        void this.sanitizeEmbeddedMpvSelection().catch(
+                            (error) => {
+                                console.warn(
+                                    'Failed to verify embedded MPV support while loading settings.',
+                                    error
+                                );
+                            }
                         );
-                    });
-                }
-            } catch (error) {
-                console.error('Failed to load settings:', error);
-                // Keep default settings if loading fails
-            }
-        },
-
-        async updateSettings(settings: Partial<Settings>) {
-            patchState(store, {
-                ...settings,
-                ...(settings.dashboardRails !== undefined
-                    ? {
-                          dashboardRails: normalizeDashboardRailsSettings(
-                              settings.dashboardRails
-                          ),
-                      }
-                    : {}),
-            });
-            // Save the complete settings object, not just the partial update
-            const completeSettings = this.getSettings();
-            try {
-                await firstValueFrom(
-                    storage.set(STORE_KEY.Settings, completeSettings)
-                );
-                if (completeSettings.player === VideoPlayer.EmbeddedMpv) {
-                    scheduleEmbeddedMpvPrepare();
-                }
-            } catch (error) {
-                console.error('Failed to save settings:', error);
-                throw error;
-            }
-        },
-
-        getSettings() {
-            return {
-                player: store.player(),
-                streamFormat: store.streamFormat(),
-                openStreamOnDoubleClick: store.openStreamOnDoubleClick(),
-                language: store.language(),
-                showCaptions: store.showCaptions(),
-                showDashboard: store.showDashboard(),
-                startupBehavior: store.startupBehavior(),
-                showExternalPlaybackBar:
-                    store.showExternalPlaybackBar?.() ??
-                    DEFAULT_SETTINGS.showExternalPlaybackBar,
-                theme: store.theme(),
-                mpvPlayerPath: store.mpvPlayerPath(),
-                mpvPlayerArguments: store.mpvPlayerArguments(),
-                mpvReuseInstance: store.mpvReuseInstance(),
-                vlcPlayerPath: store.vlcPlayerPath(),
-                vlcPlayerArguments: store.vlcPlayerArguments(),
-                vlcReuseInstance: store.vlcReuseInstance(),
-                remoteControl: store.remoteControl(),
-                remoteControlPort: store.remoteControlPort(),
-                epgUrl: store.epgUrl(),
-                downloadFolder:
-                    store.downloadFolder?.() ?? DEFAULT_SETTINGS.downloadFolder,
-                recordingFolder:
-                    store.recordingFolder?.() ??
-                    DEFAULT_SETTINGS.recordingFolder,
-                coverSize: store.coverSize?.() ?? DEFAULT_SETTINGS.coverSize,
-                epgViewMode:
-                    store.epgViewMode?.() ?? DEFAULT_SETTINGS.epgViewMode,
-                dashboardRails: normalizeDashboardRailsSettings(
-                    store.dashboardRails?.()
-                ),
-                preferUploadedEpgOverXtream:
-                    store.preferUploadedEpgOverXtream?.() ??
-                    DEFAULT_SETTINGS.preferUploadedEpgOverXtream,
-                trustedPrivateNetworkEpgUrls:
-                    store.trustedPrivateNetworkEpgUrls?.() ??
-                    DEFAULT_SETTINGS.trustedPrivateNetworkEpgUrls,
-                trustedInsecureTlsHosts:
-                    store.trustedInsecureTlsHosts?.() ??
-                    DEFAULT_SETTINGS.trustedInsecureTlsHosts,
-                tmdb: store.tmdb?.() ?? DEFAULT_SETTINGS.tmdb,
-            };
-        },
-
-        getDownloadFolder() {
-            return store.downloadFolder?.() ?? DEFAULT_SETTINGS.downloadFolder;
-        },
-
-        getRecordingFolder() {
-            return (
-                store.recordingFolder?.() ?? DEFAULT_SETTINGS.recordingFolder
-            );
-        },
-
-        getTrustOptions(): ElectronBridgeTrustOptions {
-            const settings = this.getSettings();
-            return {
-                trustedPrivateNetworkEpgUrls:
-                    settings.trustedPrivateNetworkEpgUrls ?? [],
-                trustedInsecureTlsHosts: settings.trustedInsecureTlsHosts ?? [],
-            };
-        },
-
-        getPlayer() {
-            return store.player();
-        },
-
-        isEmbeddedPlayer() {
-            return (
-                store.player() === VideoPlayer.VideoJs ||
-                store.player() === VideoPlayer.Html5Player ||
-                store.player() === VideoPlayer.ArtPlayer ||
-                store.player() === VideoPlayer.EmbeddedMpv
-            );
-        },
-
-        async sanitizeEmbeddedMpvSelection() {
-            if (store.player() !== VideoPlayer.EmbeddedMpv) {
-                return;
-            }
-
-            if (
-                typeof window === 'undefined' ||
-                !window.electron?.getEmbeddedMpvSupport
-            ) {
-                await this.updateSettings({
-                    player: DEFAULT_SETTINGS.player,
+                    }
+                })().catch((error) => {
+                    settingsLoadPromise = undefined;
+                    console.error('Failed to load settings:', error);
+                    // Keep default settings if loading fails
                 });
-                return;
-            }
 
-            try {
-                const support = await window.electron.getEmbeddedMpvSupport();
-                if (!support.supported) {
+                return settingsLoadPromise;
+            },
+
+            async updateSettings(settings: Partial<Settings>) {
+                patchState(store, {
+                    ...settings,
+                    ...(settings.webPlayerSharedControls !== undefined
+                        ? {
+                              webPlayerSharedControls:
+                                  settings.webPlayerSharedControls === true,
+                          }
+                        : {}),
+                    ...(settings.dashboardRails !== undefined
+                        ? {
+                              dashboardRails: normalizeDashboardRailsSettings(
+                                  settings.dashboardRails
+                              ),
+                          }
+                        : {}),
+                });
+                // Save the complete settings object, not just the partial update
+                const completeSettings = this.getSettings();
+                try {
+                    await firstValueFrom(
+                        storage.set(STORE_KEY.Settings, completeSettings)
+                    );
+                    if (completeSettings.player === VideoPlayer.EmbeddedMpv) {
+                        scheduleEmbeddedMpvPrepare();
+                    }
+                } catch (error) {
+                    console.error('Failed to save settings:', error);
+                    throw error;
+                }
+            },
+
+            getSettings() {
+                return {
+                    player: store.player(),
+                    webPlayerSharedControls:
+                        store.webPlayerSharedControls?.() === true,
+                    playerAmbientMode:
+                        store.playerAmbientMode?.() ??
+                        DEFAULT_SETTINGS.playerAmbientMode,
+                    playerUpNextRail:
+                        store.playerUpNextRail?.() ??
+                        DEFAULT_SETTINGS.playerUpNextRail,
+                    streamFormat: store.streamFormat(),
+                    openStreamOnDoubleClick: store.openStreamOnDoubleClick(),
+                    language: store.language(),
+                    showCaptions: store.showCaptions(),
+                    showDashboard: store.showDashboard(),
+                    startupBehavior: store.startupBehavior(),
+                    showExternalPlaybackBar:
+                        store.showExternalPlaybackBar?.() ??
+                        DEFAULT_SETTINGS.showExternalPlaybackBar,
+                    stripCountryPrefix:
+                        store.stripCountryPrefix?.() ??
+                        DEFAULT_SETTINGS.stripCountryPrefix,
+                    theme: store.theme(),
+                    mpvPlayerPath: store.mpvPlayerPath(),
+                    mpvPlayerArguments: store.mpvPlayerArguments(),
+                    mpvReuseInstance: store.mpvReuseInstance(),
+                    vlcPlayerPath: store.vlcPlayerPath(),
+                    vlcPlayerArguments: store.vlcPlayerArguments(),
+                    vlcReuseInstance: store.vlcReuseInstance(),
+                    remoteControl: store.remoteControl(),
+                    remoteControlPort: store.remoteControlPort(),
+                    epgUrl: store.epgUrl(),
+                    downloadFolder:
+                        store.downloadFolder?.() ??
+                        DEFAULT_SETTINGS.downloadFolder,
+                    recordingFolder:
+                        store.recordingFolder?.() ??
+                        DEFAULT_SETTINGS.recordingFolder,
+                    embeddedMpvFrameCopy:
+                        store.embeddedMpvFrameCopy?.() ?? false,
+                    coverSize:
+                        store.coverSize?.() ?? DEFAULT_SETTINGS.coverSize,
+                    epgViewMode:
+                        store.epgViewMode?.() ?? DEFAULT_SETTINGS.epgViewMode,
+                    dashboardRails: normalizeDashboardRailsSettings(
+                        store.dashboardRails?.()
+                    ),
+                    preferUploadedEpgOverXtream:
+                        store.preferUploadedEpgOverXtream?.() ??
+                        DEFAULT_SETTINGS.preferUploadedEpgOverXtream,
+                    trustedPrivateNetworkEpgUrls:
+                        store.trustedPrivateNetworkEpgUrls?.() ??
+                        DEFAULT_SETTINGS.trustedPrivateNetworkEpgUrls,
+                    trustedInsecureTlsHosts:
+                        store.trustedInsecureTlsHosts?.() ??
+                        DEFAULT_SETTINGS.trustedInsecureTlsHosts,
+                    tmdb: store.tmdb?.() ?? DEFAULT_SETTINGS.tmdb,
+                };
+            },
+
+            getDownloadFolder() {
+                return (
+                    store.downloadFolder?.() ?? DEFAULT_SETTINGS.downloadFolder
+                );
+            },
+
+            getRecordingFolder() {
+                return (
+                    store.recordingFolder?.() ??
+                    DEFAULT_SETTINGS.recordingFolder
+                );
+            },
+
+            getTrustOptions(): ElectronBridgeTrustOptions {
+                const settings = this.getSettings();
+                return {
+                    trustedPrivateNetworkEpgUrls:
+                        settings.trustedPrivateNetworkEpgUrls ?? [],
+                    trustedInsecureTlsHosts:
+                        settings.trustedInsecureTlsHosts ?? [],
+                };
+            },
+
+            getPlayer() {
+                return store.player();
+            },
+
+            isEmbeddedPlayer() {
+                return (
+                    store.player() === VideoPlayer.VideoJs ||
+                    store.player() === VideoPlayer.Html5Player ||
+                    store.player() === VideoPlayer.ArtPlayer ||
+                    store.player() === VideoPlayer.EmbeddedMpv
+                );
+            },
+
+            async sanitizeEmbeddedMpvSelection() {
+                if (store.player() !== VideoPlayer.EmbeddedMpv) {
+                    return;
+                }
+
+                if (
+                    typeof window === 'undefined' ||
+                    !window.electron?.getEmbeddedMpvSupport
+                ) {
                     await this.updateSettings({
                         player: DEFAULT_SETTINGS.player,
                     });
                     return;
                 }
 
-                scheduleEmbeddedMpvPrepare();
-            } catch (error) {
-                console.warn(
-                    'Failed to verify embedded MPV support; reverting to the default inline player.',
-                    error
-                );
-                await this.updateSettings({
-                    player: DEFAULT_SETTINGS.player,
-                });
-            }
-        },
-    })),
+                try {
+                    const support =
+                        await window.electron.getEmbeddedMpvSupport();
+                    if (!support.supported) {
+                        await this.updateSettings({
+                            player: DEFAULT_SETTINGS.player,
+                        });
+                        return;
+                    }
+
+                    scheduleEmbeddedMpvPrepare();
+                } catch (error) {
+                    console.warn(
+                        'Failed to verify embedded MPV support; reverting to the default inline player.',
+                        error
+                    );
+                    await this.updateSettings({
+                        player: DEFAULT_SETTINGS.player,
+                    });
+                }
+            },
+        };
+    }),
     withHooks({
         onInit(store) {
             store.loadSettings();
diff --git a/libs/services/src/lib/tmdb/index.ts b/libs/services/src/lib/tmdb/index.ts
index cd28e0596..0b94b3c1f 100644
--- a/libs/services/src/lib/tmdb/index.ts
+++ b/libs/services/src/lib/tmdb/index.ts
@@ -2,6 +2,7 @@ export * from './tmdb-api.service';
 export * from './tmdb-cache.service';
 export * from './tmdb-config';
 export * from './tmdb-enrichment.service';
+export * from './tmdb-id-resolver.service';
 export * from './tmdb-episode-merge';
 export * from './tmdb-matcher';
 export * from './tmdb-merge';
diff --git a/libs/services/src/lib/tmdb/tmdb-api.service.ts b/libs/services/src/lib/tmdb/tmdb-api.service.ts
index 4d7144591..b2b6555b0 100644
--- a/libs/services/src/lib/tmdb/tmdb-api.service.ts
+++ b/libs/services/src/lib/tmdb/tmdb-api.service.ts
@@ -14,6 +14,25 @@ import {
  * both the Electron renderer and the PWA can call it without a proxy.
  * Supports classic v3 keys (query param) and v4 read tokens (Bearer).
  */
+/**
+ * A non-2xx TMDB response. Carries the status so callers can tell a
+ * definitive verdict (404 — this id does not exist) apart from a
+ * transient one (401/429/5xx, offline), which must stay retryable.
+ */
+export class TmdbApiError extends Error {
+    constructor(
+        readonly status: number,
+        statusText = ''
+    ) {
+        super(`TMDB request failed: ${status} ${statusText}`.trim());
+        this.name = 'TmdbApiError';
+    }
+}
+
+export function isTmdbNotFound(error: unknown): boolean {
+    return error instanceof TmdbApiError && error.status === 404;
+}
+
 @Injectable({ providedIn: 'root' })
 export class TmdbApiService {
     async searchMovie(
@@ -71,7 +90,14 @@ export class TmdbApiService {
     ): Promise<TmdbTvDetails> {
         return this.request<TmdbTvDetails>(
             `/tv/${tmdbId}`,
-            { language, append_to_response: 'credits,videos,recommendations' },
+            {
+                language,
+                // aggregate_credits spans the whole run; plain `credits` on
+                // a TV id is documented as the LATEST SEASON only, so both
+                // are needed to reconstruct the real cast (see tmdb-merge)
+                append_to_response:
+                    'credits,aggregate_credits,videos,recommendations',
+            },
             apiKey
         );
     }
@@ -155,9 +181,7 @@ export class TmdbApiService {
         });
 
         if (!response.ok) {
-            throw new Error(
-                `TMDB request failed: ${response.status} ${response.statusText}`
-            );
+            throw new TmdbApiError(response.status, response.statusText);
         }
 
         return (await response.json()) as T;
diff --git a/libs/services/src/lib/tmdb/tmdb-cache-payload.spec.ts b/libs/services/src/lib/tmdb/tmdb-cache-payload.spec.ts
new file mode 100644
index 000000000..d96cfdd63
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-cache-payload.spec.ts
@@ -0,0 +1,175 @@
+import { mergeSerieInfoWithTmdb } from './tmdb-merge';
+import { trimDetailsForCache } from './tmdb-cache-payload';
+import { XtreamSerieInfo } from '@iptvnator/shared/interfaces';
+import { TmdbMovieDetails, TmdbTvDetails } from './tmdb.types';
+
+describe('trimDetailsForCache', () => {
+    it('passes a movie payload through untouched', () => {
+        const movie: TmdbMovieDetails = {
+            id: 603,
+            title: 'The Matrix',
+            credits: { cast: [{ name: 'Keanu Reeves' }] },
+        };
+
+        expect(trimDetailsForCache(movie)).toBe(movie);
+    });
+
+    it('keeps every aggregate cast member', () => {
+        const details: TmdbTvDetails = {
+            id: 76479,
+            aggregate_credits: {
+                cast: Array.from({ length: 120 }, (_, i) => ({
+                    id: i,
+                    name: `Actor ${i}`,
+                    order: i,
+                })),
+            },
+        };
+
+        const trimmed = trimDetailsForCache(details) as TmdbTvDetails;
+
+        // The tail is what tells a returning actor from a new arrival
+        expect(trimmed.aggregate_credits?.cast).toHaveLength(120);
+    });
+
+    it('reduces roles to the character with the most episodes', () => {
+        const details: TmdbTvDetails = {
+            id: 76479,
+            aggregate_credits: {
+                cast: [
+                    {
+                        id: 1,
+                        name: 'Karl Urban',
+                        order: 0,
+                        roles: [
+                            { character: 'Cameo Guy', episode_count: 1 },
+                            { character: 'Billy Butcher', episode_count: 32 },
+                        ],
+                    },
+                ],
+            },
+        };
+
+        const trimmed = trimDetailsForCache(details) as TmdbTvDetails;
+
+        expect(trimmed.aggregate_credits?.cast?.[0].roles).toEqual([
+            { character: 'Billy Butcher', episode_count: 32 },
+        ]);
+    });
+
+    it('keeps the named role even when a blank one has more episodes', () => {
+        // TMDB uses unnamed roles for uncredited appearances; the merge
+        // skips them, so the trim must not cache one in their place
+        const details: TmdbTvDetails = {
+            id: 76479,
+            aggregate_credits: {
+                cast: [
+                    {
+                        id: 1,
+                        name: 'Karl Urban',
+                        order: 0,
+                        roles: [
+                            { character: '', episode_count: 40 },
+                            { character: 'Billy Butcher', episode_count: 32 },
+                        ],
+                    },
+                ],
+            },
+        };
+
+        const trimmed = trimDetailsForCache(details) as TmdbTvDetails;
+
+        expect(trimmed.aggregate_credits?.cast?.[0].roles).toEqual([
+            { character: 'Billy Butcher', episode_count: 32 },
+        ]);
+    });
+
+    it('drops the aggregate crew nothing reads', () => {
+        const details = {
+            id: 76479,
+            aggregate_credits: {
+                cast: [{ id: 1, name: 'Karl Urban', order: 0 }],
+                crew: Array.from({ length: 500 }, (_, i) => ({
+                    id: i,
+                    name: `Crew ${i}`,
+                })),
+            },
+        } as TmdbTvDetails;
+
+        const trimmed = trimDetailsForCache(details) as TmdbTvDetails & {
+            aggregate_credits?: { crew?: unknown[] };
+        };
+
+        expect(trimmed.aggregate_credits?.crew).toBeUndefined();
+        expect(trimmed.aggregate_credits?.cast).toHaveLength(1);
+    });
+
+    it('does not mutate the payload the caller still uses', () => {
+        const details: TmdbTvDetails = {
+            id: 76479,
+            aggregate_credits: {
+                cast: [
+                    {
+                        id: 1,
+                        name: 'Karl Urban',
+                        roles: [
+                            { character: 'A', episode_count: 1 },
+                            { character: 'B', episode_count: 2 },
+                        ],
+                    },
+                ],
+            },
+        };
+
+        trimDetailsForCache(details);
+
+        expect(details.aggregate_credits?.cast?.[0].roles).toHaveLength(2);
+    });
+
+    it('merges a trimmed payload to the same cast as the full one', () => {
+        // The property that matters: the first render (network payload) and
+        // every later one (cached payload) must show the same people
+        const info = {
+            name: 'The Boys',
+            cover: '',
+            plot: '',
+            cast: '',
+            director: '',
+            genre: '',
+            releaseDate: '',
+            last_modified: '',
+            rating: '',
+            rating_5based: 0,
+            backdrop_path: [],
+            youtube_trailer: '',
+            episode_run_time: '',
+            category_id: '1',
+        } as XtreamSerieInfo;
+        const details: TmdbTvDetails = {
+            id: 76479,
+            aggregate_credits: {
+                cast: Array.from({ length: 60 }, (_, i) => ({
+                    id: i,
+                    name: `Regular ${i}`,
+                    order: i,
+                    roles: [{ character: `Role ${i}`, episode_count: 10 }],
+                })),
+            },
+            credits: {
+                // A long-serving actor billed 50th who is still in the
+                // newest season — dropping the aggregate tail would have
+                // promoted them into a reserved arrival slot
+                cast: [{ id: 50, name: 'Regular 50', order: 0 }],
+            },
+        };
+
+        const fromFull = mergeSerieInfoWithTmdb(info, details);
+        const fromCache = mergeSerieInfoWithTmdb(
+            info,
+            trimDetailsForCache(details) as TmdbTvDetails
+        );
+
+        expect(fromCache.cast).toBe(fromFull.cast);
+        expect(fromCache.cast).not.toContain('Regular 50');
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb-cache-payload.ts b/libs/services/src/lib/tmdb/tmdb-cache-payload.ts
new file mode 100644
index 000000000..7289855a8
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-cache-payload.ts
@@ -0,0 +1,47 @@
+import { pickAggregateRole } from './tmdb-credits';
+import { TmdbDetails, TmdbTvDetails } from './tmdb.types';
+
+/**
+ * Trims a details payload before it is cached.
+ *
+ * `aggregate_credits` spans a show's whole run: a crew list that can reach
+ * into the thousands, plus every cast member carrying one `roles[]` entry
+ * per character they ever played. Caching that verbatim grows
+ * `tmdb_metadata` (and the PWA's in-memory map) by orders of magnitude for
+ * data nothing reads.
+ *
+ * What goes is chosen so that a merge over the trimmed payload produces
+ * exactly what a merge over the full one would:
+ *
+ * - the whole cast stays, ids included. It is the only record of who was
+ *   in the show before the newest season, so dropping the tail would make
+ *   a returning actor read as a new arrival on the cached path — the
+ *   displayed cast would then differ between the first render and every
+ *   later one.
+ * - `roles[]` keeps only the entry the merge itself would pick — the
+ *   named character with the most episodes, chosen by the very same
+ *   function, so the two can never drift apart.
+ * - `crew` goes entirely: series credits come from `created_by`, so
+ *   nothing reads it.
+ *
+ * Everything else is passed through untouched — payloads still hold
+ * whatever a later phase might want without a refetch.
+ */
+export function trimDetailsForCache(details: TmdbDetails): TmdbDetails {
+    const aggregate = (details as TmdbTvDetails).aggregate_credits;
+    if (!aggregate) {
+        return details;
+    }
+
+    const cast = (aggregate.cast ?? []).map((member) => {
+        const roles = member.roles ?? [];
+        if (roles.length <= 1) {
+            return member;
+        }
+        // The merge's own choice, not a second one that could differ
+        const main = pickAggregateRole(member);
+        return { ...member, roles: main ? [main] : [] };
+    });
+
+    return { ...details, aggregate_credits: { cast } } as TmdbDetails;
+}
diff --git a/libs/services/src/lib/tmdb/tmdb-cache.service.spec.ts b/libs/services/src/lib/tmdb/tmdb-cache.service.spec.ts
index d7a4e40bd..d9e2da417 100644
--- a/libs/services/src/lib/tmdb/tmdb-cache.service.spec.ts
+++ b/libs/services/src/lib/tmdb/tmdb-cache.service.spec.ts
@@ -50,4 +50,145 @@ describe('TmdbCacheService (in-memory LRU)', () => {
         const cached = await service.get('movie', 'id:same', 'en-US');
         expect(cached?.lookupKey).toBe('id:same');
     });
+
+    describe('stats and clearing (PWA path)', () => {
+        it('counts entries and ENCODED payload bytes', async () => {
+            // String.length would report 3 for a 6-byte Cyrillic payload
+            await service.set({ ...entry('id:1'), payload: '"да"' });
+
+            const stats = await service.getStats();
+            expect(stats?.entries).toBe(1);
+            expect(stats?.bytes).toBe(
+                new TextEncoder().encode('"да"').length
+            );
+        });
+
+        it('clears the map and reports how many entries went', async () => {
+            await service.set(entry('id:1'));
+            await service.set(entry('id:2'));
+
+            await expect(service.clear()).resolves.toBe(2);
+            await expect(service.getStats()).resolves.toEqual({
+                entries: 0,
+                bytes: 0,
+            });
+        });
+
+        it('drops a write that was in flight when the cache was cleared', async () => {
+            // Otherwise the late write silently restores exactly the data
+            // the user just asked to remove
+            const pending = service.set(entry('id:late'));
+            await service.clear();
+            await pending;
+
+            await expect(
+                service.get('movie', 'id:late', 'en-US')
+            ).resolves.toBeNull();
+        });
+    });
+});
+
+describe('TmdbCacheService (Electron bridge)', () => {
+    const entry = (lookupKey: string): TmdbCacheEntry => ({
+        mediaType: 'movie',
+        lookupKey,
+        language: 'en-US',
+        tmdbId: 1,
+        payload: '{}',
+    });
+
+    interface ElectronStub {
+        dbGetTmdbMetadata: jest.Mock;
+        dbSetTmdbMetadata: jest.Mock;
+        dbGetTmdbCacheStats?: jest.Mock;
+        dbClearTmdbMetadata?: jest.Mock;
+    }
+
+    let electron: ElectronStub;
+
+    /** Resolves the next dbSetTmdbMetadata call on demand */
+    let releaseWrite: () => void;
+
+    beforeEach(() => {
+        releaseWrite = () => undefined;
+        electron = {
+            dbGetTmdbMetadata: jest.fn().mockResolvedValue(null),
+            dbSetTmdbMetadata: jest.fn(
+                () =>
+                    new Promise<void>((resolve) => {
+                        releaseWrite = resolve;
+                    })
+            ),
+            dbGetTmdbCacheStats: jest
+                .fn()
+                .mockResolvedValue({ entries: 3, bytes: 90 }),
+            dbClearTmdbMetadata: jest.fn().mockResolvedValue({ deleted: 3 }),
+        };
+        (window as unknown as { electron: unknown }).electron = electron;
+    });
+
+    afterEach(() => {
+        delete (window as unknown as { electron?: unknown }).electron;
+    });
+
+    it('waits for an in-flight write instead of re-clearing after it', async () => {
+        const service = new TmdbCacheService();
+        const pending = service.set(entry('id:late'));
+
+        const cleared = service.clear();
+        // The clear must not reach SQLite before the write it has to remove
+        await Promise.resolve();
+        expect(electron.dbClearTmdbMetadata).not.toHaveBeenCalled();
+
+        releaseWrite();
+        await pending;
+        await expect(cleared).resolves.toBe(3);
+        expect(electron.dbClearTmdbMetadata).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps rows written after the clear', async () => {
+        const service = new TmdbCacheService();
+        await service.clear();
+
+        const pending = service.set(entry('id:fresh'));
+        releaseWrite();
+        await pending;
+
+        // A second clear here would delete data the user never asked to lose
+        expect(electron.dbClearTmdbMetadata).toHaveBeenCalledTimes(1);
+    });
+
+    it('lands a write that starts during the clear after the delete', async () => {
+        const service = new TmdbCacheService();
+        const order: string[] = [];
+        electron.dbClearTmdbMetadata = jest.fn(async () => {
+            order.push('clear');
+            return { deleted: 3 };
+        });
+
+        const first = service.set(entry('id:before'));
+        const cleared = service.clear();
+
+        // Starts while the clear is waiting on the first write — without
+        // serialization its row would reach SQLite before the delete
+        const second = service.set(entry('id:during'));
+        electron.dbSetTmdbMetadata.mockImplementation(async () => {
+            order.push('write');
+        });
+
+        releaseWrite();
+        await Promise.all([first, cleared, second]);
+
+        expect(order).toEqual(['clear', 'write']);
+    });
+
+    it('reports an unsupported shell instead of the empty renderer map', async () => {
+        // Newer renderer, older preload: rows are in SQLite but out of reach
+        delete electron.dbGetTmdbCacheStats;
+        delete electron.dbClearTmdbMetadata;
+        const service = new TmdbCacheService();
+
+        await expect(service.getStats()).resolves.toBeNull();
+        await expect(service.clear()).resolves.toBeNull();
+    });
 });
diff --git a/libs/services/src/lib/tmdb/tmdb-cache.service.ts b/libs/services/src/lib/tmdb/tmdb-cache.service.ts
index b2bb18d33..60dd2f975 100644
--- a/libs/services/src/lib/tmdb/tmdb-cache.service.ts
+++ b/libs/services/src/lib/tmdb/tmdb-cache.service.ts
@@ -1,5 +1,9 @@
 import { Injectable } from '@angular/core';
-import { TmdbCacheEntry, TmdbCacheMediaType } from '@iptvnator/shared/interfaces';
+import {
+    TmdbCacheEntry,
+    TmdbCacheMediaType,
+    TmdbCacheStats,
+} from '@iptvnator/shared/interfaces';
 
 /** PWA in-memory cache ceiling — details payloads are a few KB each */
 const MEMORY_CACHE_MAX_ENTRIES = 300;
@@ -18,6 +22,17 @@ const MEMORY_CACHE_MAX_ENTRIES = 300;
 export class TmdbCacheService {
     private readonly memoryCache = new Map<string, TmdbCacheEntry>();
 
+    /**
+     * Electron writes that have not landed yet. {@link clear} waits for
+     * them, so a write already in flight cannot outlive the clear that
+     * followed it — and, unlike re-clearing after the late write lands,
+     * waiting cannot take rows written *after* the user cleared with it.
+     */
+    private readonly pendingWrites = new Set<Promise<unknown>>();
+
+    /** Set for the duration of {@link clear}; writes queue behind it */
+    private clearInFlight: Promise<unknown> | null = null;
+
     private get bridge() {
         // typeof checks guard against version skew: an older Electron shell
         // may not expose the TMDB cache methods yet
@@ -59,17 +74,29 @@ export class TmdbCacheService {
     }
 
     async set(entry: TmdbCacheEntry): Promise<void> {
-        const stamped: TmdbCacheEntry = {
-            ...entry,
-            fetchedAt: new Date().toISOString(),
-        };
-
         const bridge = this.bridge;
         if (bridge) {
+            // A clear owns the table until it finishes. Dispatching now
+            // would race the delete and lose a row the user never asked to
+            // lose, so this write waits it out and lands after it.
+            while (this.clearInFlight) {
+                await this.clearInFlight;
+            }
+
+            // The IIFE also converts a synchronous throw from the bridge
+            // into a rejection, so `set` never throws at its caller
+            const write = (async () => {
+                try {
+                    await bridge.dbSetTmdbMetadata(this.stamp(entry));
+                } catch (error) {
+                    console.warn('TMDB cache write failed:', error);
+                }
+            })();
+            this.pendingWrites.add(write);
             try {
-                await bridge.dbSetTmdbMetadata(stamped);
-            } catch (error) {
-                console.warn('TMDB cache write failed:', error);
+                await write;
+            } finally {
+                this.pendingWrites.delete(write);
             }
             return;
         }
@@ -80,7 +107,7 @@ export class TmdbCacheService {
             entry.language
         );
         this.memoryCache.delete(key);
-        this.memoryCache.set(key, stamped);
+        this.memoryCache.set(key, this.stamp(entry));
         // delete-then-reinsert above means at most one entry over the cap
         if (this.memoryCache.size > MEMORY_CACHE_MAX_ENTRIES) {
             const oldest = this.memoryCache.keys().next().value;
@@ -90,6 +117,11 @@ export class TmdbCacheService {
         }
     }
 
+    /** Stamped at write time, not at call time — a write may have waited */
+    private stamp(entry: TmdbCacheEntry): TmdbCacheEntry {
+        return { ...entry, fetchedAt: new Date().toISOString() };
+    }
+
     isFresh(entry: TmdbCacheEntry | null, ttlMs: number): boolean {
         if (!entry?.fetchedAt) {
             return false;
@@ -106,4 +138,102 @@ export class TmdbCacheService {
     ): string {
         return `${mediaType}:${language}:${lookupKey}`;
     }
+
+    /**
+     * Cache size for the settings panel. In the PWA the cache is the
+     * session-scoped map, so the numbers describe that instead.
+     */
+    async getStats(): Promise<TmdbCacheStats | null> {
+        const bridge = this.bridge;
+        if (bridge) {
+            if (!bridge.dbGetTmdbCacheStats) {
+                // Version skew: this shell persists to SQLite but predates
+                // the maintenance ops. The renderer map is empty in
+                // Electron, so falling back to it would report a cache that
+                // is anything but empty as having nothing in it.
+                return null;
+            }
+            try {
+                return await bridge.dbGetTmdbCacheStats();
+            } catch (error) {
+                // `null`, not zeros: reporting a failed read as an empty
+                // cache would hide real rows and disable the Clear button
+                console.warn('TMDB cache stats failed:', error);
+                return null;
+            }
+        }
+
+        // TextEncoder measures encoded bytes; String.length counts UTF-16
+        // code units, which understates non-ASCII payloads and would
+        // disagree with the SQLite BLOB byte count.
+        const encoder = new TextEncoder();
+        let bytes = 0;
+        for (const entry of this.memoryCache.values()) {
+            bytes += entry.payload ? encoder.encode(entry.payload).length : 0;
+        }
+        return { entries: this.memoryCache.size, bytes };
+    }
+
+    /**
+     * Drops everything. Enrichment refetches on demand, so this only
+     * costs the next few requests.
+     */
+    async clear(): Promise<number | null> {
+        const bridge = this.bridge;
+        const clearedFromMemory = this.memoryCache.size;
+        this.memoryCache.clear();
+
+        if (!bridge) {
+            return clearedFromMemory;
+        }
+
+        const clearMetadata = bridge.dbClearTmdbMetadata;
+        if (!clearMetadata) {
+            // Same version skew as getStats(): the rows are in SQLite and
+            // stay there, so reporting a successful clear would be a lie
+            return null;
+        }
+
+        // Called through the bridge so the preload keeps its receiver
+        const run = this.runClear(() => clearMetadata.call(bridge));
+        this.clearInFlight = run;
+        try {
+            return await run;
+        } finally {
+            this.clearInFlight = null;
+        }
+    }
+
+    /**
+     * Everything between the writes already in flight and the delete. Held
+     * in `clearInFlight` for its duration, which is what puts writes that
+     * start meanwhile on the far side of the delete rather than under it.
+     */
+    private async runClear(
+        clearMetadata: () => Promise<{ deleted: number } | undefined>
+    ): Promise<number | null> {
+        // Writes issued before the clear land first, so the delete takes
+        // them too.
+        if (this.pendingWrites.size > 0) {
+            // Not Promise.allSettled: the web target compiles against
+            // lib es2018. The writes swallow their own errors anyway.
+            await Promise.all(
+                [...this.pendingWrites].map((write) =>
+                    write.then(
+                        () => undefined,
+                        () => undefined
+                    )
+                )
+            );
+        }
+
+        try {
+            const result = await clearMetadata();
+            return result?.deleted ?? 0;
+        } catch (error) {
+            // `null` so the panel can say it failed and stay actionable
+            console.warn('TMDB cache clear failed:', error);
+            return null;
+        }
+    }
 }
diff --git a/libs/services/src/lib/tmdb/tmdb-config.ts b/libs/services/src/lib/tmdb/tmdb-config.ts
index 020a5a6ab..9b208a637 100644
--- a/libs/services/src/lib/tmdb/tmdb-config.ts
+++ b/libs/services/src/lib/tmdb/tmdb-config.ts
@@ -49,6 +49,7 @@ const TMDB_LANGUAGE_MAP: Record<Language, string> = {
     [Language.POLISH]: 'pl-PL',
     [Language.PORTUGUESE]: 'pt-PT',
     [Language.GREEK]: 'el-GR',
+    [Language.HUNGARIAN]: 'hu-HU',
 };
 
 export function toTmdbLanguage(
diff --git a/libs/services/src/lib/tmdb/tmdb-credits.ts b/libs/services/src/lib/tmdb/tmdb-credits.ts
new file mode 100644
index 000000000..66e48d672
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-credits.ts
@@ -0,0 +1,197 @@
+import { TmdbEnrichedCastMember } from '@iptvnator/shared/interfaces';
+import { tmdbProfileUrl } from './tmdb-config';
+import { TmdbCastMember, TmdbCredits, TmdbTvDetails } from './tmdb.types';
+
+/**
+ * Extraction of people from TMDB credit payloads: the display cast, the
+ * clickable person chips, and the two-shape union a series cast needs.
+ * Pure functions — the field-level merge itself lives in `tmdb-merge.ts`.
+ */
+
+const MAX_CAST_NAMES = 10;
+
+/**
+ * Slots held back for people who appear only in the newest season. On a
+ * long-running show the whole-run cast alone fills the display limit, so
+ * without a reservation the arrivals this union exists to preserve would
+ * be sliced straight back off.
+ */
+const RESERVED_NEW_SEASON_SLOTS = 3;
+
+const byBillingOrder = (a: { order?: number }, b: { order?: number }) =>
+    (a.order ?? 0) - (b.order ?? 0);
+
+export function limitCast(cast: TmdbCastMember[]): TmdbCastMember[] {
+    return cast
+        .slice(0, MAX_CAST_NAMES)
+        .filter((member) => Boolean(member.name));
+}
+
+export function topCast(credits: TmdbCredits | undefined): TmdbCastMember[] {
+    return limitCast([...(credits?.cast ?? [])].sort(byBillingOrder));
+}
+
+/**
+ * The role an aggregate member is actually known for. A returning actor
+ * accumulates one entry per character, so a single-episode cameo sits in
+ * `roles[]` next to the lead they played for ten seasons — pick by episode
+ * count rather than by array position. Unnamed roles are skipped: TMDB
+ * uses them for uncredited appearances, and they would otherwise beat a
+ * real character on episode count alone.
+ *
+ * Exported because the cache trim keeps exactly this role and discards
+ * the rest — sharing the choice is what stops a cached payload from
+ * displaying a different character than the payload it was written from.
+ */
+export function pickAggregateRole<
+    T extends { character?: string; episode_count?: number },
+>(member: { roles?: T[] }): T | undefined {
+    const named = (member.roles ?? []).filter((role) => role.character?.trim());
+    if (named.length === 0) {
+        return undefined;
+    }
+    return named.reduce((best, role) =>
+        (role.episode_count ?? 0) > (best.episode_count ?? 0) ? role : best
+    );
+}
+
+function aggregateCharacter(member: {
+    roles?: { character?: string; episode_count?: number }[];
+}): string | undefined {
+    return pickAggregateRole(member)?.character;
+}
+
+/**
+ * The cast of a SERIES, reconstructed from the two shapes TMDB offers.
+ *
+ * `/tv/{id}` `credits` is documented as the credits of the LATEST SEASON.
+ * TMDB describes `aggregate_credits` in one self-contradicting sentence —
+ * "it does not return the newest season. Instead, it is a view of all the
+ * entire cast & crew for all episodes belonging to a TV show" — so it is
+ * either the whole run minus the newest season, or the whole run. This
+ * union does not care which: whoever `credits` has and `aggregate_credits`
+ * does not is missing from the whole-run view and is appended, and under
+ * the second reading that set is simply empty. Either way, long-running
+ * shows neither lose departed regulars nor miss new arrivals.
+ */
+export function unifiedTvCast(details: TmdbTvDetails): TmdbCastMember[] {
+    const aggregate: TmdbCastMember[] = (details.aggregate_credits?.cast ?? [])
+        .filter((member) => Boolean(member.name))
+        .sort(byBillingOrder)
+        .map((member) => ({
+            id: member.id,
+            name: member.name,
+            character: aggregateCharacter(member),
+            order: member.order,
+            profile_path: member.profile_path,
+        }));
+
+    // Cache rows written before aggregate_credits was requested, and shows
+    // TMDB has no aggregate for, still work — they just keep the old cast.
+    if (aggregate.length === 0) {
+        return [...(details.credits?.cast ?? [])].sort(byBillingOrder);
+    }
+
+    const known = new Set(
+        aggregate
+            .map((member) => member.id)
+            .filter((id): id is number => id !== undefined)
+    );
+
+    // Newest-season arrivals go last on purpose: their `order` is scoped to
+    // that season and would otherwise outrank show-level billing.
+    const arrivals = [...(details.credits?.cast ?? [])]
+        .filter(
+            (member) =>
+                Boolean(member.name) &&
+                (member.id === undefined || !known.has(member.id))
+        )
+        .sort(byBillingOrder);
+
+    if (arrivals.length === 0) {
+        return aggregate;
+    }
+
+    // Reserve room for the top-billed arrivals rather than appending them
+    // where the cap will discard them. The reservation is a floor, not a
+    // quota: whatever the aggregate leaves unused still goes to arrivals,
+    // so a short whole-run cast never shrinks the list below the cap.
+    const reserved = Math.min(arrivals.length, RESERVED_NEW_SEASON_SLOTS);
+    const fromAggregate = aggregate.slice(
+        0,
+        Math.max(0, MAX_CAST_NAMES - reserved)
+    );
+    return [
+        ...fromAggregate,
+        ...arrivals.slice(0, MAX_CAST_NAMES - fromAggregate.length),
+    ];
+}
+
+export function castNames(cast: TmdbCastMember[]): string {
+    return cast.map((member) => member.name).join(', ');
+}
+
+/** Cast with profile photos for the avatar chips in detail views */
+export function enrichedCast(cast: TmdbCastMember[]): TmdbEnrichedCastMember[] {
+    return cast.map((member) => ({
+        name: member.name,
+        ...(member.character ? { character: member.character } : {}),
+        profileUrl: tmdbProfileUrl(member.profile_path),
+        ...(member.id ? { tmdbPersonId: member.id } : {}),
+    }));
+}
+
+export function directorNames(credits: TmdbCredits | undefined): string {
+    return (credits?.crew ?? [])
+        .filter((member) => member.job === 'Director')
+        .map((member) => member.name)
+        .filter(Boolean)
+        .join(', ');
+}
+
+export function creatorNames(details: TmdbTvDetails): string {
+    return (details.created_by ?? [])
+        .map((creator) => creator.name)
+        .filter(Boolean)
+        .join(', ');
+}
+
+/**
+ * Directors (movies) as clickable person chips — same shape as the cast
+ * chips, so a director opens the same person page as an actor. Deduped by
+ * TMDB id to collapse the duplicate crew rows TMDB sometimes returns.
+ */
+export function enrichedDirectors(
+    credits: TmdbCredits | undefined
+): TmdbEnrichedCastMember[] {
+    const seen = new Set<number>();
+    const directors: TmdbEnrichedCastMember[] = [];
+    for (const member of credits?.crew ?? []) {
+        if (member.job !== 'Director' || !member.name) {
+            continue;
+        }
+        if (member.id !== undefined) {
+            if (seen.has(member.id)) {
+                continue;
+            }
+            seen.add(member.id);
+        }
+        directors.push({
+            name: member.name,
+            profileUrl: tmdbProfileUrl(member.profile_path),
+            ...(member.id ? { tmdbPersonId: member.id } : {}),
+        });
+    }
+    return directors;
+}
+
+/** Series creators as clickable person chips (TV shows have no director) */
+export function enrichedCreators(details: TmdbTvDetails): TmdbEnrichedCastMember[] {
+    return (details.created_by ?? [])
+        .filter((creator) => Boolean(creator.name))
+        .map((creator) => ({
+            name: creator.name,
+            profileUrl: tmdbProfileUrl(creator.profile_path),
+            ...(creator.id ? { tmdbPersonId: creator.id } : {}),
+        }));
+}
diff --git a/libs/services/src/lib/tmdb/tmdb-enrichment.service.spec.ts b/libs/services/src/lib/tmdb/tmdb-enrichment.service.spec.ts
new file mode 100644
index 000000000..6d5ecae41
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-enrichment.service.spec.ts
@@ -0,0 +1,294 @@
+import { Injector, runInInjectionContext } from '@angular/core';
+import { TmdbApiError, TmdbApiService } from './tmdb-api.service';
+import { TmdbCacheService } from './tmdb-cache.service';
+import { TmdbEnrichmentService } from './tmdb-enrichment.service';
+import { TmdbIdResolverService } from './tmdb-id-resolver.service';
+import { TmdbPersonService } from './tmdb-person.service';
+import { TmdbRuntimeService } from './tmdb-runtime.service';
+import { TmdbSeasonService } from './tmdb-season.service';
+import { TmdbTrendingService } from './tmdb-trending.service';
+import { TmdbMovieDetails } from './tmdb.types';
+
+/**
+ * Regression coverage for provider-supplied `tmdb_id` handling. Panels
+ * ship dead and stale ids; before this, a dead one short-circuited the
+ * title search (leaving the item permanently unenriched) and a stale one
+ * silently rendered another film's metadata.
+ */
+describe('TmdbEnrichmentService — provider tmdb_id handling', () => {
+    const matrix: TmdbMovieDetails = {
+        id: 603,
+        title: 'The Matrix',
+        original_title: 'The Matrix',
+        overview: 'Plot',
+        videos: { results: [{ key: 'k', site: 'YouTube', type: 'Trailer' }] },
+    };
+    const unrelated: TmdbMovieDetails = {
+        id: 999,
+        title: 'Completely Different Film',
+        original_title: 'Completely Different Film',
+        release_date: '1979-12-14',
+        overview: 'Other plot',
+        videos: { results: [{ key: 'x', site: 'YouTube', type: 'Trailer' }] },
+    };
+
+    let getMovieDetails: jest.Mock;
+    let resolveBySearch: jest.Mock;
+    let isKnownBadProviderId: jest.Mock;
+    let rememberBadProviderId: jest.Mock;
+
+    // The services Jest target has no @angular/core/testing — build the
+    // service in a plain injection context instead of TestBed.
+    function createService(): TmdbEnrichmentService {
+        const injector = Injector.create({
+            providers: [
+                {
+                    provide: TmdbRuntimeService,
+                    useValue: {
+                        isEnabled: () => true,
+                        apiKey: () => 'key',
+                        language: () => 'en-US',
+                        appLanguage: () => 'en',
+                    },
+                },
+                {
+                    provide: TmdbApiService,
+                    useValue: { getMovieDetails, getTvDetails: jest.fn() },
+                },
+                {
+                    provide: TmdbCacheService,
+                    useValue: {
+                        get: jest.fn().mockResolvedValue(null),
+                        set: jest.fn().mockResolvedValue(undefined),
+                        isFresh: () => false,
+                    },
+                },
+                {
+                    provide: TmdbIdResolverService,
+                    useValue: {
+                        resolveBySearch,
+                        isKnownBadProviderId,
+                        rememberBadProviderId,
+                    },
+                },
+                { provide: TmdbPersonService, useValue: {} },
+                { provide: TmdbSeasonService, useValue: {} },
+                { provide: TmdbTrendingService, useValue: {} },
+            ],
+        });
+        return runInInjectionContext(
+            injector,
+            () => new TmdbEnrichmentService()
+        );
+    }
+
+    beforeEach(() => {
+        getMovieDetails = jest.fn().mockResolvedValue(matrix);
+        resolveBySearch = jest.fn().mockResolvedValue(null);
+        isKnownBadProviderId = jest.fn().mockResolvedValue(false);
+        rememberBadProviderId = jest.fn().mockResolvedValue(undefined);
+    });
+
+    it('uses a valid provider id without searching at all', async () => {
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 603,
+            title: 'The Matrix',
+        });
+
+        expect(details?.id).toBe(603);
+        expect(getMovieDetails).toHaveBeenCalledTimes(1);
+        expect(resolveBySearch).not.toHaveBeenCalled();
+        expect(rememberBadProviderId).not.toHaveBeenCalled();
+    });
+
+    it('falls back to the title search when the provider id 404s', async () => {
+        getMovieDetails
+            .mockRejectedValueOnce(new TmdbApiError(404, 'Not Found'))
+            .mockResolvedValueOnce(matrix);
+        resolveBySearch.mockResolvedValue(603);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 123456789,
+            title: 'The Matrix',
+        });
+
+        // Previously this returned null: the dead id skipped the search
+        expect(details?.id).toBe(603);
+        expect(resolveBySearch).toHaveBeenCalledTimes(1);
+        expect(rememberBadProviderId).toHaveBeenCalledWith(
+            'movie',
+            123456789
+        );
+    });
+
+    it('prefers a confident search match over a stale provider id', async () => {
+        // The id resolves, but to a 1979 film while our item is from 1999
+        getMovieDetails
+            .mockResolvedValueOnce(unrelated)
+            .mockResolvedValueOnce(matrix);
+        resolveBySearch.mockResolvedValue(603);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 999,
+            title: 'The Matrix',
+            year: 1999,
+        });
+
+        expect(details?.id).toBe(603);
+        // The id EXISTS — it is just wrong for this item. The bad-id row is
+        // keyed by id alone and shared across playlists, so recording a
+        // per-item mismatch would deny the direct lookup to every other
+        // item that legitimately uses the same id.
+        expect(rememberBadProviderId).not.toHaveBeenCalled();
+    });
+
+    it('does not blame the id for a transient failure', async () => {
+        // Rate limit, bad key, 5xx or offline: the id may be perfectly
+        // fine, so it must stay retryable rather than be disabled for days
+        getMovieDetails.mockRejectedValue(new TmdbApiError(429, 'Too Many'));
+        resolveBySearch.mockResolvedValue(null);
+        const service = createService();
+
+        await service.enrichMovie({ tmdbId: 603, title: 'The Matrix' });
+
+        expect(rememberBadProviderId).not.toHaveBeenCalled();
+    });
+
+    it('does not search after a transient provider-id failure', async () => {
+        // The search would hit the same outage, and a title match that
+        // does come back is weaker evidence than the id we already have
+        getMovieDetails.mockRejectedValue(new TmdbApiError(503, 'Down'));
+        resolveBySearch.mockResolvedValue(603);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 603,
+            title: 'The Matrix',
+        });
+
+        expect(details).toBeNull();
+        expect(resolveBySearch).not.toHaveBeenCalled();
+    });
+
+    it('does not blame the id for a network error', async () => {
+        getMovieDetails.mockRejectedValue(new Error('offline'));
+        resolveBySearch.mockResolvedValue(null);
+        const service = createService();
+
+        await service.enrichMovie({ tmdbId: 603, title: 'The Matrix' });
+
+        expect(rememberBadProviderId).not.toHaveBeenCalled();
+    });
+
+    it('keeps the provider payload when the title differs but the search finds nothing', async () => {
+        // A localized provider title legitimately fails the name check —
+        // TMDB returns titles in the REQUEST language. Never trade real
+        // metadata for none on suspicion alone.
+        getMovieDetails.mockResolvedValue(unrelated);
+        resolveBySearch.mockResolvedValue(null);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 999,
+            title: 'Ирония судьбы',
+            year: 1979,
+        });
+
+        expect(details?.id).toBe(999);
+        expect(rememberBadProviderId).not.toHaveBeenCalled();
+    });
+
+    it('never lets a name mismatch alone unseat a working provider id', async () => {
+        // "IT - Chapter Two" normalizes to "chapter two" (the ALL-CAPS "IT"
+        // reads as a language tag), so the correct payload fails the name
+        // check. With no year to arbitrate, a search for "chapter two"
+        // would confidently return the 1979 film of that name.
+        getMovieDetails.mockResolvedValue({
+            id: 474350,
+            title: 'It Chapter Two',
+            original_title: 'It Chapter Two',
+            overview: 'Plot',
+        });
+        resolveBySearch.mockResolvedValue(30619);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 474350,
+            title: 'IT - Chapter Two',
+        });
+
+        expect(details?.id).toBe(474350);
+        expect(resolveBySearch).not.toHaveBeenCalled();
+    });
+
+    it('catches a stale id that shares the title but not the year', async () => {
+        // The scraper case: "Blade Runner 2049" carrying the 1982 film's id.
+        // Both titles normalize to "blade runner", so only the year sees it.
+        getMovieDetails
+            .mockResolvedValueOnce({
+                id: 78,
+                title: 'Blade Runner',
+                release_date: '1982-06-25',
+            })
+            .mockResolvedValueOnce({
+                id: 335984,
+                title: 'Blade Runner 2049',
+                release_date: '2017-10-04',
+            });
+        resolveBySearch.mockResolvedValue(335984);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 78,
+            title: 'Blade Runner 2049',
+            year: 2017,
+        });
+
+        expect(details?.id).toBe(335984);
+    });
+
+    it('keeps the provider payload when the competing search throws', async () => {
+        // Same reasoning as above, but the search never returns a verdict:
+        // TMDB is offline or rate-limiting. Details in hand beat nothing.
+        getMovieDetails.mockResolvedValue(unrelated);
+        resolveBySearch.mockRejectedValue(new TmdbApiError(503, 'Down'));
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 999,
+            title: 'Ирония судьбы',
+            year: 1999,
+        });
+
+        expect(details?.id).toBe(999);
+    });
+
+    it('skips a provider id already known to be bad', async () => {
+        isKnownBadProviderId.mockResolvedValue(true);
+        resolveBySearch.mockResolvedValue(603);
+        const service = createService();
+
+        const details = await service.enrichMovie({
+            tmdbId: 123456789,
+            title: 'The Matrix',
+        });
+
+        expect(details?.id).toBe(603);
+        // One details call for the searched id — none for the dead one
+        expect(getMovieDetails).toHaveBeenCalledTimes(1);
+        expect(getMovieDetails).toHaveBeenCalledWith(603, 'en-US', 'key');
+    });
+
+    it('returns null when there is no provider id and no search match', async () => {
+        const service = createService();
+
+        await expect(
+            service.enrichMovie({ title: 'Unknown Thing' })
+        ).resolves.toBeNull();
+        expect(getMovieDetails).not.toHaveBeenCalled();
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb-enrichment.service.ts b/libs/services/src/lib/tmdb/tmdb-enrichment.service.ts
index bfed5f41b..600448be5 100644
--- a/libs/services/src/lib/tmdb/tmdb-enrichment.service.ts
+++ b/libs/services/src/lib/tmdb/tmdb-enrichment.service.ts
@@ -1,21 +1,15 @@
 import { Injectable, inject } from '@angular/core';
 import { TmdbMediaType } from '@iptvnator/shared/interfaces';
-import { TmdbApiService } from './tmdb-api.service';
+import { TmdbApiService, isTmdbNotFound } from './tmdb-api.service';
+import { trimDetailsForCache } from './tmdb-cache-payload';
 import { TmdbCacheService } from './tmdb-cache.service';
+import { TMDB_DETAILS_CACHE_TTL_MS } from './tmdb-config';
 import {
-    TMDB_DETAILS_CACHE_TTL_MS,
-    TMDB_MATCH_CACHE_TTL_MS,
-    TMDB_NEGATIVE_MATCH_CACHE_TTL_MS,
-    tmdbSearchLanguageForTitle,
-} from './tmdb-config';
-import {
+    assessProviderId,
     buildDetailsLookupKey,
-    buildSearchLookupKey,
-    buildSearchTitleVariants,
-    extractYear,
     parseProviderTmdbId,
-    pickConfidentMatch,
 } from './tmdb-matcher';
+import { TmdbIdResolverService } from './tmdb-id-resolver.service';
 import {
     detailsFallbackLanguage,
     fillDetailsFromFallback,
@@ -53,6 +47,7 @@ export class TmdbEnrichmentService {
     private readonly person = inject(TmdbPersonService);
     private readonly season = inject(TmdbSeasonService);
     private readonly trending = inject(TmdbTrendingService);
+    private readonly idResolver = inject(TmdbIdResolverService);
 
     isEnabled(): boolean {
         return this.runtime.isEnabled();
@@ -107,15 +102,31 @@ export class TmdbEnrichmentService {
         }
 
         try {
-            const tmdbId =
-                parseProviderTmdbId(query.tmdbId) ??
-                (await this.resolveIdBySearch(mediaType, query));
-
-            if (tmdbId === null) {
-                return null;
+            const providerId = parseProviderTmdbId(query.tmdbId);
+            if (
+                providerId !== null &&
+                !(await this.idResolver.isKnownBadProviderId(
+                    mediaType,
+                    providerId
+                ))
+            ) {
+                const details = await this.detailsForProviderId(
+                    mediaType,
+                    providerId,
+                    query
+                );
+                if (details) {
+                    return details;
+                }
             }
 
-            return await this.getDetails(mediaType, tmdbId);
+            const searchedId = await this.idResolver.resolveBySearch(
+                mediaType,
+                query
+            );
+            return searchedId === null
+                ? null
+                : await this.getDetails(mediaType, searchedId);
         } catch (error) {
             console.warn(`TMDB ${mediaType} enrichment failed:`, error);
             return null;
@@ -123,88 +134,79 @@ export class TmdbEnrichmentService {
     }
 
     /**
-     * Resolve a title/year to a TMDB id via /search with the confidence
-     * gate. Both hits and misses are cached; misses use a shorter TTL.
+     * Details for a provider-supplied `tmdb_id`, or `null` when the id is
+     * unusable and the caller should fall back to the title search.
+     *
+     * Providers ship broken ids. A dead one used to short-circuit the
+     * search and leave the item permanently unenriched; a stale-but-valid
+     * one silently rendered another title's plot and cast. Both cases now
+     * defer to the (confidence-gated) search — but only on evidence the id
+     * is wrong, and only when the search actually produces something, so a
+     * localized or stylized title never costs the user their metadata.
      */
-    private async resolveIdBySearch(
+    private async detailsForProviderId(
         mediaType: TmdbMediaType,
+        providerId: number,
         query: TmdbEnrichmentQuery
-    ): Promise<number | null> {
-        // Try the original title, the display title, then language-prefix-
-        // stripped fallbacks; the first confident match wins.
-        const variants = buildSearchTitleVariants(
-            query.title,
-            query.originalTitle
-        );
-        if (variants.length === 0) {
-            return null;
-        }
-
-        const year = query.year ?? extractYear(null, query.title);
-        const cacheLanguage = tmdbSearchLanguageForTitle(
-            variants[0],
-            this.runtime.appLanguage()
-        );
-        const lookupKey = buildSearchLookupKey(variants[0], year);
-
-        const cached = await this.cache.get(
-            mediaType,
-            lookupKey,
-            cacheLanguage
-        );
-        const ttl =
-            cached?.tmdbId !== null && cached?.tmdbId !== undefined
-                ? TMDB_MATCH_CACHE_TTL_MS
-                : TMDB_NEGATIVE_MATCH_CACHE_TTL_MS;
-        if (this.cache.isFresh(cached, ttl)) {
-            return cached?.tmdbId ?? null;
-        }
-
-        let match = null;
-        for (const variant of variants) {
-            // Cyrillic (and other non-app-script) titles search in their
-            // own language so TMDB returns comparable titles — see
-            // tmdbSearchLanguageForTitle. Search by title only: TMDB's
-            // year params filter strictly; the ±1/season tolerance lives
-            // in pickConfidentMatch instead.
-            const language = tmdbSearchLanguageForTitle(
-                variant,
-                this.runtime.appLanguage()
-            );
-            const results =
-                mediaType === 'movie'
-                    ? await this.api.searchMovie(
-                          variant,
-                          null,
-                          language,
-                          this.runtime.apiKey()
-                      )
-                    : await this.api.searchTv(
-                          variant,
-                          null,
-                          language,
-                          this.runtime.apiKey()
-                      );
-
-            match = pickConfidentMatch(
-                results,
-                { title: variant, year },
-                mediaType
-            );
-            if (match) {
-                break;
+    ): Promise<TmdbDetails | null> {
+        let details: TmdbDetails | null;
+        try {
+            details = await this.getDetails(mediaType, providerId);
+        } catch (error) {
+            // Only a 404 proves the id is dead. Auth, rate-limit, 5xx and
+            // offline failures are transient — remembering those would
+            // disable a perfectly good id until the marker expires.
+            if (isTmdbNotFound(error)) {
+                console.warn(
+                    `TMDB ${mediaType} provider id ${providerId} does not exist, falling back to search:`,
+                    error
+                );
+                await this.idResolver.rememberBadProviderId(
+                    mediaType,
+                    providerId
+                );
+                return null;
             }
+
+            // Rethrow instead: `enrich` reads a null here as "try the
+            // search", and searching during an outage or a rate limit just
+            // adds a request that will fail too — or, worse, succeeds and
+            // swaps a strong id for a title match. The id stays good for
+            // the next attempt.
+            throw error;
         }
 
-        await this.cache.set({
-            mediaType,
-            lookupKey,
-            language: cacheLanguage,
-            tmdbId: match?.id ?? null,
-            payload: null,
-        });
+        if (!details || assessProviderId(details, query, mediaType) !== 'contradicted') {
+            return details;
+        }
 
-        return match?.id ?? null;
+        // The id resolves to a title whose release year contradicts the
+        // provider's — the stale-id signature. Let the search try to beat
+        // it; keep these details if it cannot.
+        //
+        // Deliberately NOT remembered: the id exists and may be correct for
+        // a DIFFERENT item. The bad-id cache is keyed by id alone and shared
+        // across playlists, so recording a per-item mismatch there would
+        // deny the direct lookup to every other item that legitimately uses
+        // the same id. The search verdict is cached anyway, so the repeat
+        // cost is one details fetch.
+        //
+        // The search is best-effort here: offline, rate-limited or 5xx must
+        // fall back to the details we already have, not discard them. Its
+        // own gate needs a year, which this branch guarantees we have, so a
+        // result that comes back is corroborated rather than merely named
+        // alike.
+        const searchedId = await this.idResolver
+            .resolveBySearch(mediaType, query)
+            .catch(() => null);
+        if (searchedId === null || searchedId === providerId) {
+            return details;
+        }
+
+        const searched = await this.getDetails(mediaType, searchedId).catch(
+            () => null
+        );
+        return searched ?? details;
     }
 
     private async getDetails(
@@ -282,7 +284,9 @@ export class TmdbEnrichmentService {
             lookupKey,
             language,
             tmdbId,
-            payload: JSON.stringify(details),
+            payload: JSON.stringify(
+                details === null ? null : trimDetailsForCache(details)
+            ),
         });
 
         return details;
diff --git a/libs/services/src/lib/tmdb/tmdb-id-resolver.service.ts b/libs/services/src/lib/tmdb/tmdb-id-resolver.service.ts
new file mode 100644
index 000000000..d8e90051a
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-id-resolver.service.ts
@@ -0,0 +1,158 @@
+import { Injectable, inject } from '@angular/core';
+import { TmdbMediaType } from '@iptvnator/shared/interfaces';
+import { TmdbApiService } from './tmdb-api.service';
+import { TmdbCacheService } from './tmdb-cache.service';
+import {
+    TMDB_MATCH_CACHE_TTL_MS,
+    TMDB_NEGATIVE_MATCH_CACHE_TTL_MS,
+    tmdbSearchLanguageForTitle,
+} from './tmdb-config';
+import {
+    buildBadProviderIdLookupKey,
+    buildSearchLookupKey,
+    buildSearchTitleVariants,
+    extractYear,
+    pickConfidentMatch,
+} from './tmdb-matcher';
+import { TmdbRuntimeService } from './tmdb-runtime.service';
+import { TmdbEnrichmentQuery } from './tmdb.types';
+
+/**
+ * "This id is wrong" verdicts are about the provider's data, not about a
+ * translation, so they are cached under one language-independent row.
+ */
+const BAD_ID_CACHE_LANGUAGE = 'any';
+
+/**
+ * Resolves a provider item to a TMDB id: the confidence-gated title search
+ * plus the negative cache for provider-supplied ids we have proven wrong.
+ * Extracted from the enrichment orchestrator so both concerns stay
+ * testable and the facade keeps its size in check.
+ */
+@Injectable({ providedIn: 'root' })
+export class TmdbIdResolverService {
+    private readonly runtime = inject(TmdbRuntimeService);
+    private readonly api = inject(TmdbApiService);
+    private readonly cache = inject(TmdbCacheService);
+
+    /**
+     * Resolve a title/year to a TMDB id via /search with the confidence
+     * gate. Both hits and misses are cached; misses use a shorter TTL.
+     */
+    async resolveBySearch(
+        mediaType: TmdbMediaType,
+        query: TmdbEnrichmentQuery
+    ): Promise<number | null> {
+        // Try the original title, the display title, then language-prefix-
+        // stripped fallbacks; the first confident match wins.
+        const variants = buildSearchTitleVariants(
+            query.title,
+            query.originalTitle
+        );
+        if (variants.length === 0) {
+            return null;
+        }
+
+        const year = query.year ?? extractYear(null, query.title);
+        const cacheLanguage = tmdbSearchLanguageForTitle(
+            variants[0],
+            this.runtime.appLanguage()
+        );
+        const lookupKey = buildSearchLookupKey(variants[0], year);
+
+        const cached = await this.cache.get(
+            mediaType,
+            lookupKey,
+            cacheLanguage
+        );
+        const ttl =
+            cached?.tmdbId !== null && cached?.tmdbId !== undefined
+                ? TMDB_MATCH_CACHE_TTL_MS
+                : TMDB_NEGATIVE_MATCH_CACHE_TTL_MS;
+        if (this.cache.isFresh(cached, ttl)) {
+            return cached?.tmdbId ?? null;
+        }
+
+        let match = null;
+        for (const variant of variants) {
+            // Cyrillic (and other non-app-script) titles search in their
+            // own language so TMDB returns comparable titles — see
+            // tmdbSearchLanguageForTitle. Search by title only: TMDB's
+            // year params filter strictly; the ±1/season tolerance lives
+            // in pickConfidentMatch instead.
+            const language = tmdbSearchLanguageForTitle(
+                variant,
+                this.runtime.appLanguage()
+            );
+            const results =
+                mediaType === 'movie'
+                    ? await this.api.searchMovie(
+                          variant,
+                          null,
+                          language,
+                          this.runtime.apiKey()
+                      )
+                    : await this.api.searchTv(
+                          variant,
+                          null,
+                          language,
+                          this.runtime.apiKey()
+                      );
+
+            match = pickConfidentMatch(
+                results,
+                { title: variant, year },
+                mediaType
+            );
+            if (match) {
+                break;
+            }
+        }
+
+        await this.cache.set({
+            mediaType,
+            lookupKey,
+            language: cacheLanguage,
+            tmdbId: match?.id ?? null,
+            payload: null,
+        });
+
+        return match?.id ?? null;
+    }
+
+    /**
+     * True when this id is known NOT TO EXIST on TMDB. Without this a dead
+     * id costs one wasted 404 on every single detail open, forever —
+     * failed detail fetches cache nothing.
+     *
+     * The verdict is deliberately about the ID, not about the item that
+     * supplied it: the row is keyed by id alone and shared across
+     * playlists, so only "TMDB returned 404 for this id" may be recorded
+     * here. A per-item mismatch is never cached — see
+     * `TmdbEnrichmentService.detailsForProviderId`.
+     */
+    async isKnownBadProviderId(
+        mediaType: TmdbMediaType,
+        tmdbId: number
+    ): Promise<boolean> {
+        const cached = await this.cache.get(
+            mediaType,
+            buildBadProviderIdLookupKey(tmdbId),
+            BAD_ID_CACHE_LANGUAGE
+        );
+        return this.cache.isFresh(cached, TMDB_NEGATIVE_MATCH_CACHE_TTL_MS);
+    }
+
+    async rememberBadProviderId(
+        mediaType: TmdbMediaType,
+        tmdbId: number
+    ): Promise<void> {
+        await this.cache.set({
+            mediaType,
+            lookupKey: buildBadProviderIdLookupKey(tmdbId),
+            language: BAD_ID_CACHE_LANGUAGE,
+            tmdbId: null,
+            payload: null,
+        });
+    }
+}
diff --git a/libs/services/src/lib/tmdb/tmdb-matcher.spec.ts b/libs/services/src/lib/tmdb/tmdb-matcher.spec.ts
index 394bc89f4..7a3b737a1 100644
--- a/libs/services/src/lib/tmdb/tmdb-matcher.spec.ts
+++ b/libs/services/src/lib/tmdb/tmdb-matcher.spec.ts
@@ -1,6 +1,8 @@
 import {
+    buildBadProviderIdLookupKey,
     buildDetailsLookupKey,
     buildSearchLookupKey,
+    detailsMatchProviderTitle,
     buildSearchTitleVariants,
     extractYear,
     normalizeTitle,
@@ -78,10 +80,10 @@ describe('extractYear', () => {
 describe('lookup keys', () => {
     it('builds stable search and details keys', () => {
         expect(buildSearchLookupKey('the matrix', 1999)).toBe(
-            'title:the matrix|year:1999'
+            'title:the matrix|year:1999|v2'
         );
         expect(buildSearchLookupKey('the matrix', null)).toBe(
-            'title:the matrix|year:'
+            'title:the matrix|year:|v2'
         );
         expect(buildDetailsLookupKey(603)).toBe('id:603|v2');
     });
@@ -295,3 +297,58 @@ describe('pickConfidentMatch', () => {
         ).toBeNull();
     });
 });
+
+describe('buildBadProviderIdLookupKey', () => {
+    it('namespaces the id so it cannot collide with a details row', () => {
+        expect(buildBadProviderIdLookupKey(603)).toBe('badProviderId:603');
+        expect(buildBadProviderIdLookupKey(603)).not.toBe(
+            buildDetailsLookupKey(603)
+        );
+    });
+});
+
+describe('detailsMatchProviderTitle', () => {
+    const details = {
+        title: 'The Matrix',
+        original_title: 'The Matrix',
+    };
+
+    it('accepts a match on a noisy provider title', () => {
+        expect(
+            detailsMatchProviderTitle(details, {
+                title: 'EN - The Matrix (1999) 1080p',
+            })
+        ).toBe(true);
+    });
+
+    it('accepts a match against the original title only', () => {
+        expect(
+            detailsMatchProviderTitle(
+                { title: 'Die Hard', original_title: 'Stirb langsam' },
+                { title: 'Stirb langsam' }
+            )
+        ).toBe(true);
+    });
+
+    it('matches series payloads through name/original_name', () => {
+        expect(
+            detailsMatchProviderTitle(
+                { name: 'The Boys', original_name: 'The Boys' },
+                { title: 'The Boys s05' }
+            )
+        ).toBe(true);
+    });
+
+    it('reports a mismatch for an unrelated title', () => {
+        expect(
+            detailsMatchProviderTitle(details, { title: 'Blade Runner' })
+        ).toBe(false);
+    });
+
+    it('never reports a mismatch when there is nothing to compare', () => {
+        expect(detailsMatchProviderTitle(details, { title: '' })).toBe(true);
+        expect(detailsMatchProviderTitle({}, { title: 'The Matrix' })).toBe(
+            false
+        );
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb-matcher.ts b/libs/services/src/lib/tmdb/tmdb-matcher.ts
index a07d2e16f..390e373a9 100644
--- a/libs/services/src/lib/tmdb/tmdb-matcher.ts
+++ b/libs/services/src/lib/tmdb/tmdb-matcher.ts
@@ -70,7 +70,10 @@ export function buildSearchLookupKey(
     normalizedTitle: string,
     year: number | null
 ): string {
-    return `title:${normalizedTitle}|year:${year ?? ''}`;
+    // v2: normalizeTitleKeys learned to strip appended language/quality
+    // tags; the version suffix invalidates cached (incl. negative) match
+    // resolutions keyed on the old polluted titles
+    return `title:${normalizedTitle}|year:${year ?? ''}|v2`;
 }
 
 export function buildDetailsLookupKey(tmdbId: number): string {
@@ -79,6 +82,11 @@ export function buildDetailsLookupKey(tmdbId: number): string {
     return `id:${tmdbId}|v2`;
 }
 
+/** Negative-cache key for a provider tmdb_id we have proven wrong */
+export function buildBadProviderIdLookupKey(tmdbId: number): string {
+    return `badProviderId:${tmdbId}`;
+}
+
 /** Provider tmdb_id fields arrive as number, numeric string, or garbage */
 export function parseProviderTmdbId(
     tmdbId: number | string | null | undefined
@@ -87,6 +95,100 @@ export function parseProviderTmdbId(
     return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
 }
 
+/**
+ * What the payload behind a provider `tmdb_id` says about that id.
+ *
+ * - `corroborated`: title or release year agrees; use the details.
+ * - `contradicted`: both years are known and they disagree — the classic
+ *   stale id ("Blade Runner 2049" carrying the 1982 film's id). Only this
+ *   verdict is strong enough to let the title search take over.
+ * - `inconclusive`: the title differs and there is no year to arbitrate
+ *   with. Keep the details: TMDB returns titles in the REQUEST language,
+ *   and normalization strips stylized prefixes ("IT - Chapter Two"), so a
+ *   name mismatch alone says more about our own inputs than about the id.
+ */
+export type ProviderIdVerdict =
+    | 'corroborated'
+    | 'contradicted'
+    | 'inconclusive';
+
+/** The same tolerance the search gate uses, applied in reverse */
+function yearsAgree(
+    providerYear: number,
+    detailsYear: number,
+    mediaType: TmdbMediaType
+): boolean {
+    if (Math.abs(detailsYear - providerYear) <= 1) {
+        return true;
+    }
+    // Series: portals report the current season's year while TMDB reports
+    // the premiere, so a show that started earlier still agrees.
+    return mediaType === 'tv' && detailsYear < providerYear;
+}
+
+export function assessProviderId(
+    details: {
+        title?: string;
+        original_title?: string;
+        release_date?: string;
+        name?: string;
+        original_name?: string;
+        first_air_date?: string;
+    },
+    query: { title?: string | null; originalTitle?: string | null; year?: number | null },
+    mediaType: TmdbMediaType
+): ProviderIdVerdict {
+    // Same effective year the search would use, so the two agree on what
+    // "the provider's year" means
+    const providerYear = query.year ?? extractYear(null, query.title);
+    const detailsYear = extractYear(
+        mediaType === 'movie' ? details.release_date : details.first_air_date
+    );
+
+    if (providerYear !== null && detailsYear !== null) {
+        return yearsAgree(providerYear, detailsYear, mediaType)
+            ? 'corroborated'
+            : 'contradicted';
+    }
+
+    return detailsMatchProviderTitle(details, query)
+        ? 'corroborated'
+        : 'inconclusive';
+}
+
+/**
+ * Does a details payload plausibly describe the item we asked about?
+ * Title-only signal — see {@link assessProviderId} for the verdict callers
+ * should act on.
+ */
+export function detailsMatchProviderTitle(
+    details: {
+        title?: string;
+        original_title?: string;
+        name?: string;
+        original_name?: string;
+    },
+    query: { title?: string | null; originalTitle?: string | null }
+): boolean {
+    const variants = new Set(
+        buildSearchTitleVariants(query.title, query.originalTitle)
+    );
+    if (variants.size === 0) {
+        // Nothing to compare against — never call that a mismatch
+        return true;
+    }
+
+    return [
+        details.title,
+        details.original_title,
+        details.name,
+        details.original_name,
+    ].some((title) => {
+        const normalized = normalizeTitle(title);
+        return normalized !== '' && variants.has(normalized);
+    });
+}
+
 function resultTitles(result: TmdbSearchResult, mediaType: TmdbMediaType) {
     return mediaType === 'movie'
         ? [result.title, result.original_title]
diff --git a/libs/services/src/lib/tmdb/tmdb-merge-series-cast.spec.ts b/libs/services/src/lib/tmdb/tmdb-merge-series-cast.spec.ts
new file mode 100644
index 000000000..5afa94629
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-merge-series-cast.spec.ts
@@ -0,0 +1,236 @@
+import { XtreamSerieInfo } from '@iptvnator/shared/interfaces';
+import { mergeSerieInfoWithTmdb } from './tmdb-merge';
+import { TmdbTvDetails } from './tmdb.types';
+
+describe('series cast (aggregate + latest season)', () => {
+    const info: XtreamSerieInfo = {
+        name: 'The Boys',
+        cover: '',
+        plot: '',
+        cast: '',
+        director: '',
+        genre: '',
+        releaseDate: '',
+        last_modified: '',
+        rating: '',
+        rating_5based: 0,
+        backdrop_path: [],
+        youtube_trailer: '',
+        episode_run_time: '',
+        category_id: '1',
+    };
+
+    // TMDB documents /tv/{id} `credits` as the LATEST SEASON only, and
+    // aggregate_credits as everything EXCEPT the newest season.
+    const details: TmdbTvDetails = {
+        id: 76479,
+        name: 'The Boys',
+        aggregate_credits: {
+            cast: [
+                {
+                    id: 1,
+                    name: 'Karl Urban',
+                    order: 0,
+                    profile_path: '/urban.jpg',
+                    roles: [{ character: 'Billy Butcher' }],
+                },
+                {
+                    id: 2,
+                    name: 'Jack Quaid',
+                    order: 1,
+                    roles: [{ character: 'Hughie' }],
+                },
+            ],
+        },
+        credits: {
+            cast: [
+                // Still around in the newest season
+                { id: 1, name: 'Karl Urban', order: 0, character: 'Butcher' },
+                // Joined only in the newest season
+                {
+                    id: 3,
+                    name: 'Newcomer Person',
+                    order: 1,
+                    character: 'Rookie',
+                },
+            ],
+        },
+    };
+
+    it('keeps whole-run cast that the latest season dropped', () => {
+        const merged = mergeSerieInfoWithTmdb(info, details);
+        // Jack Quaid is absent from `credits` — the old code lost him
+        expect(merged.cast).toContain('Jack Quaid');
+    });
+
+    it('adds newest-season arrivals after the show billing order', () => {
+        const merged = mergeSerieInfoWithTmdb(info, details);
+        expect(merged.cast).toBe('Karl Urban, Jack Quaid, Newcomer Person');
+    });
+
+    it('takes the character from the aggregate roles array', () => {
+        const merged = mergeSerieInfoWithTmdb(info, details);
+        expect(merged.tmdb_cast?.[0]).toEqual({
+            name: 'Karl Urban',
+            character: 'Billy Butcher',
+            profileUrl: 'https://image.tmdb.org/t/p/w185/urban.jpg',
+            tmdbPersonId: 1,
+        });
+    });
+
+    it('does not duplicate people present in both payloads', () => {
+        const merged = mergeSerieInfoWithTmdb(info, details);
+        expect(
+            merged.tmdb_cast?.filter((m) => m.name === 'Karl Urban')
+        ).toHaveLength(1);
+    });
+
+    it('keeps newest-season arrivals when the aggregate already fills the cap', () => {
+        // The case the union exists for: a long-running show whose
+        // whole-run cast alone exceeds the display limit
+        const bigAggregate = Array.from({ length: 12 }, (_, i) => ({
+            id: 100 + i,
+            name: `Regular ${i}`,
+            order: i,
+            roles: [{ character: `Role ${i}` }],
+        }));
+        const merged = mergeSerieInfoWithTmdb(info, {
+            id: 76479,
+            name: 'The Boys',
+            aggregate_credits: { cast: bigAggregate },
+            credits: {
+                cast: [
+                    { id: 900, name: 'Brand New Lead', order: 0 },
+                    { id: 901, name: 'Brand New Sidekick', order: 1 },
+                ],
+            },
+        });
+
+        const names = merged.tmdb_cast?.map((member) => member.name) ?? [];
+        expect(names).toHaveLength(10);
+        expect(names).toContain('Brand New Lead');
+        expect(names).toContain('Brand New Sidekick');
+        // Top billing survives; the reservation eats into the tail only
+        expect(names[0]).toBe('Regular 0');
+    });
+
+    it('gives every slot to the aggregate when nobody is new', () => {
+        const bigAggregate = Array.from({ length: 12 }, (_, i) => ({
+            id: 100 + i,
+            name: `Regular ${i}`,
+            order: i,
+        }));
+        const merged = mergeSerieInfoWithTmdb(info, {
+            id: 76479,
+            name: 'The Boys',
+            aggregate_credits: { cast: bigAggregate },
+            credits: { cast: [{ id: 100, name: 'Regular 0', order: 0 }] },
+        });
+
+        expect(merged.tmdb_cast).toHaveLength(10);
+        expect(merged.tmdb_cast?.[9].name).toBe('Regular 9');
+    });
+
+    it('does not shrink the list when the whole-run cast is short', () => {
+        // The reservation is a floor for arrivals, not a ceiling: with four
+        // regulars and five newcomers all nine fit under the cap
+        const merged = mergeSerieInfoWithTmdb(info, {
+            id: 76479,
+            name: 'The Boys',
+            aggregate_credits: {
+                cast: Array.from({ length: 4 }, (_, i) => ({
+                    id: 100 + i,
+                    name: `Regular ${i}`,
+                    order: i,
+                })),
+            },
+            credits: {
+                cast: Array.from({ length: 5 }, (_, i) => ({
+                    id: 200 + i,
+                    name: `Newcomer ${i}`,
+                    order: i,
+                })),
+            },
+        });
+
+        expect(merged.tmdb_cast).toHaveLength(9);
+        expect(merged.cast).toContain('Newcomer 4');
+    });
+
+    it('takes the role the actor played the most episodes of', () => {
+        // A one-episode cameo sits in roles[] next to the lead part
+        const merged = mergeSerieInfoWithTmdb(info, {
+            id: 76479,
+            name: 'The Boys',
+            aggregate_credits: {
+                cast: [
+                    {
+                        id: 1,
+                        name: 'Karl Urban',
+                        order: 0,
+                        roles: [
+                            { character: 'Cameo Guy', episode_count: 1 },
+                            { character: 'Billy Butcher', episode_count: 32 },
+                        ],
+                    },
+                ],
+            },
+        });
+
+        expect(merged.tmdb_cast?.[0].character).toBe('Billy Butcher');
+    });
+
+    it('always fills the cap when there are enough people to fill it', () => {
+        // The reservation decides WHO makes the cut, never how many: the
+        // list is the display limit or everyone available, whichever is
+        // smaller. The earlier defect broke exactly this.
+        const cast = (n: number, offset: number, label: string) =>
+            Array.from({ length: n }, (_, i) => ({
+                id: offset + i,
+                name: `${label} ${i}`,
+                order: i,
+            }));
+
+        for (const [regulars, newcomers] of [
+            [0, 4],
+            [2, 1],
+            [4, 5],
+            [7, 5],
+            [9, 4],
+            [12, 2],
+            [12, 0],
+        ]) {
+            const merged = mergeSerieInfoWithTmdb(info, {
+                id: 76479,
+                name: 'The Boys',
+                aggregate_credits: { cast: cast(regulars, 100, 'Regular') },
+                credits: { cast: cast(newcomers, 900, 'Newcomer') },
+            });
+
+            expect({
+                regulars,
+                newcomers,
+                shown: merged.tmdb_cast?.length ?? 0,
+            }).toEqual({
+                regulars,
+                newcomers,
+                shown: Math.min(10, regulars + newcomers),
+            });
+        }
+    });
+
+    it('falls back to plain credits when no aggregate is present', () => {
+        // Cache rows written before aggregate_credits was requested
+        const merged = mergeSerieInfoWithTmdb(info, {
+            id: 76479,
+            name: 'The Boys',
+            credits: {
+                cast: [
+                    { id: 3, name: 'Second Billed', order: 1 },
+                    { id: 1, name: 'Top Billed', order: 0 },
+                ],
+            },
+        });
+        expect(merged.cast).toBe('Top Billed, Second Billed');
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb-merge-stalker.spec.ts b/libs/services/src/lib/tmdb/tmdb-merge-stalker.spec.ts
new file mode 100644
index 000000000..61b6b3846
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-merge-stalker.spec.ts
@@ -0,0 +1,113 @@
+import { StalkerVodInfo } from '@iptvnator/shared/interfaces';
+import { mergeStalkerInfoWithTmdb } from './tmdb-merge';
+import { TmdbMovieDetails, TmdbTvDetails } from './tmdb.types';
+
+describe('mergeStalkerInfoWithTmdb', () => {
+    const providerStalkerInfo: StalkerVodInfo = {
+        movie_image: '',
+        description: '',
+        name: 'Ирония судьбы, или С лёгким паром!',
+        o_name: undefined,
+        actors: 'Провайдерский актёр',
+        director: '',
+        releasedate: '1976',
+        genre: '',
+        rating_imdb: '',
+        rating_kinopoisk: '8.1',
+    };
+
+    const tmdbMovieRu: TmdbMovieDetails = {
+        id: 20992,
+        title: 'Ирония судьбы, или С лёгким паром!',
+        overview: 'Описание из TMDB',
+        genres: [{ id: 35, name: 'комедия' }],
+        release_date: '1976-01-01',
+        vote_average: 7.9,
+        vote_count: 250,
+        poster_path: '/irony-poster.jpg',
+        backdrop_path: '/irony-backdrop.jpg',
+        credits: {
+            cast: [
+                {
+                    name: 'Андрей Мягков',
+                    order: 0,
+                    profile_path: '/myagkov.jpg',
+                },
+            ],
+            crew: [{ id: 77, name: 'Эльдар Рязанов', job: 'Director' }],
+        },
+    };
+
+    it('prefers TMDB editorial fields and attaches cast/backdrop', () => {
+        const merged = mergeStalkerInfoWithTmdb(
+            providerStalkerInfo,
+            tmdbMovieRu,
+            'movie'
+        );
+
+        expect(merged.description).toBe('Описание из TMDB');
+        expect(merged.actors).toBe('Андрей Мягков');
+        expect(merged.director).toBe('Эльдар Рязанов');
+        expect(merged.tmdb_directors?.[0]).toEqual({
+            name: 'Эльдар Рязанов',
+            profileUrl: null,
+            tmdbPersonId: 77,
+        });
+        expect(merged.genre).toBe('комедия');
+        expect(merged.movie_image).toBe(
+            'https://image.tmdb.org/t/p/w500/irony-poster.jpg'
+        );
+        expect(merged.tmdb_backdrop).toBe(
+            'https://image.tmdb.org/t/p/w1280/irony-backdrop.jpg'
+        );
+        expect(merged.tmdb_cast).toEqual([
+            {
+                name: 'Андрей Мягков',
+                profileUrl: 'https://image.tmdb.org/t/p/w185/myagkov.jpg',
+            },
+        ]);
+        // Provider keeps its own fields where TMDB should not win
+        expect(merged.name).toBe('Ирония судьбы, или С лёгким паром!');
+        expect(merged.rating_kinopoisk).toBe('8.1');
+        expect(merged.releasedate).toBe('1976');
+    });
+
+    it('only fills rating_imdb when the provider left it empty', () => {
+        const merged = mergeStalkerInfoWithTmdb(
+            providerStalkerInfo,
+            tmdbMovieRu,
+            'movie'
+        );
+        expect(merged.rating_imdb).toBe('7.9');
+
+        const withProviderRating = mergeStalkerInfoWithTmdb(
+            { ...providerStalkerInfo, rating_imdb: '8.4' },
+            tmdbMovieRu,
+            'movie'
+        );
+        expect(withProviderRating.rating_imdb).toBe('8.4');
+    });
+
+    it('uses series creators as director for tv items', () => {
+        const tv: TmdbTvDetails = {
+            id: 1,
+            overview: 'tv overview',
+            created_by: [{ name: 'Создатель Сериала' }],
+        };
+        const merged = mergeStalkerInfoWithTmdb(providerStalkerInfo, tv, 'tv');
+        expect(merged.director).toBe('Создатель Сериала');
+    });
+
+    it('keeps provider values for missing TMDB fields', () => {
+        const merged = mergeStalkerInfoWithTmdb(
+            { ...providerStalkerInfo, description: 'Провайдерский сюжет' },
+            { id: 20992 },
+            'movie'
+        );
+
+        expect(merged.description).toBe('Провайдерский сюжет');
+        expect(merged.actors).toBe('Провайдерский актёр');
+        expect(merged.tmdb_cast).toBeUndefined();
+        expect(merged.tmdb_backdrop).toBeUndefined();
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb-merge.spec.ts b/libs/services/src/lib/tmdb/tmdb-merge.spec.ts
index 1c8efd1c4..c64af3f98 100644
--- a/libs/services/src/lib/tmdb/tmdb-merge.spec.ts
+++ b/libs/services/src/lib/tmdb/tmdb-merge.spec.ts
@@ -1,16 +1,10 @@
-import {
-    StalkerVodInfo,
-    XtreamSerieInfo,
-    XtreamVodInfo,
-} from '@iptvnator/shared/interfaces';
-import {
-    mergeSerieInfoWithTmdb,
-    mergeStalkerInfoWithTmdb,
-    mergeVodInfoWithTmdb,
-} from './tmdb-merge';
+import { XtreamSerieInfo, XtreamVodInfo } from '@iptvnator/shared/interfaces';
+import { mergeSerieInfoWithTmdb, mergeVodInfoWithTmdb } from './tmdb-merge';
 import { TmdbMovieDetails, TmdbTvDetails } from './tmdb.types';
 
-function providerVodInfo(overrides: Partial<XtreamVodInfo> = {}): XtreamVodInfo {
+function providerVodInfo(
+    overrides: Partial<XtreamVodInfo> = {}
+): XtreamVodInfo {
     return {
         kinopoisk_url: '',
         tmdb_id: '',
@@ -68,8 +62,15 @@ const tmdbMovie: TmdbMovieDetails = {
             { name: 'Laurence Fishburne', order: 1, profile_path: null },
         ],
         crew: [
-            { name: 'Lana Wachowski', job: 'Director' },
-            { name: 'Lilly Wachowski', job: 'Director' },
+            {
+                id: 9339,
+                name: 'Lana Wachowski',
+                job: 'Director',
+                profile_path: '/lana.jpg',
+            },
+            { id: 9340, name: 'Lilly Wachowski', job: 'Director' },
+            // Duplicate crew row TMDB sometimes returns — must be deduped
+            { id: 9339, name: 'Lana Wachowski', job: 'Director' },
             { name: 'Someone Else', job: 'Producer' },
         ],
     },
@@ -106,7 +107,21 @@ describe('mergeVodInfoWithTmdb', () => {
         expect(merged.description).toBe('TMDB overview');
         expect(merged.cast).toBe('Keanu Reeves, Laurence Fishburne');
         expect(merged.actors).toBe('Keanu Reeves, Laurence Fishburne');
-        expect(merged.director).toBe('Lana Wachowski, Lilly Wachowski');
+        expect(merged.director).toBe(
+            'Lana Wachowski, Lilly Wachowski, Lana Wachowski'
+        );
+        expect(merged.tmdb_directors).toEqual([
+            {
+                name: 'Lana Wachowski',
+                profileUrl: 'https://image.tmdb.org/t/p/w185/lana.jpg',
+                tmdbPersonId: 9339,
+            },
+            {
+                name: 'Lilly Wachowski',
+                profileUrl: null,
+                tmdbPersonId: 9340,
+            },
+        ]);
         expect(merged.genre).toBe('Action, Science Fiction');
         expect(merged.rating).toBe(8.2);
         expect(merged.tmdb_id).toBe(603);
@@ -170,9 +185,7 @@ describe('mergeVodInfoWithTmdb', () => {
         expect(merged.rating).toBe(7);
         expect(merged.movie_image).toBe('http://provider/poster.jpg');
         expect(merged.tmdb_cast).toBeUndefined();
-        expect(merged.backdrop_path).toEqual([
-            'http://provider/backdrop.jpg',
-        ]);
+        expect(merged.backdrop_path).toEqual(['http://provider/backdrop.jpg']);
     });
 
     it('ignores TMDB rating without votes', () => {
@@ -242,7 +255,10 @@ describe('mergeSerieInfoWithTmdb', () => {
         vote_count: 3200,
         poster_path: '/dark-poster.jpg',
         backdrop_path: '/dark-backdrop.jpg',
-        created_by: [{ name: 'Baran bo Odar' }, { name: 'Jantje Friese' }],
+        created_by: [
+            { id: 91, name: 'Baran bo Odar', profile_path: '/odar.jpg' },
+            { name: 'Jantje Friese' },
+        ],
         credits: {
             cast: [{ name: 'Louis Hofmann', order: 0 }],
         },
@@ -254,6 +270,14 @@ describe('mergeSerieInfoWithTmdb', () => {
         expect(merged.plot).toBe('TMDB tv overview');
         expect(merged.cast).toBe('Louis Hofmann');
         expect(merged.director).toBe('Baran bo Odar, Jantje Friese');
+        expect(merged.tmdb_directors).toEqual([
+            {
+                name: 'Baran bo Odar',
+                profileUrl: 'https://image.tmdb.org/t/p/w185/odar.jpg',
+                tmdbPersonId: 91,
+            },
+            { name: 'Jantje Friese', profileUrl: null },
+        ]);
         expect(merged.genre).toBe('Mystery');
         expect(merged.rating).toBe('8.4');
         expect(merged.rating_5based).toBe(4.2);
@@ -280,107 +304,51 @@ describe('mergeSerieInfoWithTmdb', () => {
     });
 });
 
-describe('mergeStalkerInfoWithTmdb', () => {
-    const providerStalkerInfo: StalkerVodInfo = {
-        movie_image: '',
-        description: '',
-        name: 'Ирония судьбы, или С лёгким паром!',
-        o_name: undefined,
-        actors: 'Провайдерский актёр',
+describe('series status', () => {
+    const info: XtreamSerieInfo = {
+        name: 'The Boys',
+        cover: '',
+        plot: '',
+        cast: '',
         director: '',
-        releasedate: '1976',
         genre: '',
-        rating_imdb: '',
-        rating_kinopoisk: '8.1',
+        releaseDate: '',
+        last_modified: '',
+        rating: '',
+        rating_5based: 0,
+        backdrop_path: [],
+        youtube_trailer: '',
+        episode_run_time: '',
+        category_id: '1',
     };
+    const base: TmdbTvDetails = { id: 76479, name: 'The Boys' };
 
-    const tmdbMovieRu: TmdbMovieDetails = {
-        id: 20992,
-        title: 'Ирония судьбы, или С лёгким паром!',
-        overview: 'Описание из TMDB',
-        genres: [{ id: 35, name: 'комедия' }],
-        release_date: '1976-01-01',
-        vote_average: 7.9,
-        vote_count: 250,
-        poster_path: '/irony-poster.jpg',
-        backdrop_path: '/irony-backdrop.jpg',
-        credits: {
-            cast: [
-                {
-                    name: 'Андрей Мягков',
-                    order: 0,
-                    profile_path: '/myagkov.jpg',
-                },
-            ],
-            crew: [{ name: 'Эльдар Рязанов', job: 'Director' }],
-        },
-    };
-
-    it('prefers TMDB editorial fields and attaches cast/backdrop', () => {
-        const merged = mergeStalkerInfoWithTmdb(
-            providerStalkerInfo,
-            tmdbMovieRu,
-            'movie'
-        );
-
-        expect(merged.description).toBe('Описание из TMDB');
-        expect(merged.actors).toBe('Андрей Мягков');
-        expect(merged.director).toBe('Эльдар Рязанов');
-        expect(merged.genre).toBe('комедия');
-        expect(merged.movie_image).toBe(
-            'https://image.tmdb.org/t/p/w500/irony-poster.jpg'
-        );
-        expect(merged.tmdb_backdrop).toBe(
-            'https://image.tmdb.org/t/p/w1280/irony-backdrop.jpg'
-        );
-        expect(merged.tmdb_cast).toEqual([
-            {
-                name: 'Андрей Мягков',
-                profileUrl: 'https://image.tmdb.org/t/p/w185/myagkov.jpg',
-            },
-        ]);
-        // Provider keeps its own fields where TMDB should not win
-        expect(merged.name).toBe('Ирония судьбы, или С лёгким паром!');
-        expect(merged.rating_kinopoisk).toBe('8.1');
-        expect(merged.releasedate).toBe('1976');
+    it('maps TMDB status strings to stable tokens', () => {
+        expect(
+            mergeSerieInfoWithTmdb(info, {
+                ...base,
+                status: 'Returning Series',
+            }).tmdb_status
+        ).toBe('returning');
+        expect(
+            mergeSerieInfoWithTmdb(info, { ...base, status: 'Ended' })
+                .tmdb_status
+        ).toBe('ended');
     });
 
-    it('only fills rating_imdb when the provider left it empty', () => {
-        const merged = mergeStalkerInfoWithTmdb(
-            providerStalkerInfo,
-            tmdbMovieRu,
-            'movie'
-        );
-        expect(merged.rating_imdb).toBe('7.9');
-
-        const withProviderRating = mergeStalkerInfoWithTmdb(
-            { ...providerStalkerInfo, rating_imdb: '8.4' },
-            tmdbMovieRu,
-            'movie'
-        );
-        expect(withProviderRating.rating_imdb).toBe('8.4');
+    it('is case-insensitive and accepts the British spelling', () => {
+        expect(
+            mergeSerieInfoWithTmdb(info, { ...base, status: 'cancelled' })
+                .tmdb_status
+        ).toBe('canceled');
     });
 
-    it('uses series creators as director for tv items', () => {
-        const tv: TmdbTvDetails = {
-            id: 1,
-            overview: 'tv overview',
-            created_by: [{ name: 'Создатель Сериала' }],
-        };
-        const merged = mergeStalkerInfoWithTmdb(providerStalkerInfo, tv, 'tv');
-        expect(merged.director).toBe('Создатель Сериала');
-    });
-
-    it('keeps provider values for missing TMDB fields', () => {
-        const merged = mergeStalkerInfoWithTmdb(
-            { ...providerStalkerInfo, description: 'Провайдерский сюжет' },
-            { id: 20992 },
-            'movie'
-        );
-
-        expect(merged.description).toBe('Провайдерский сюжет');
-        expect(merged.actors).toBe('Провайдерский актёр');
-        expect(merged.tmdb_cast).toBeUndefined();
-        expect(merged.tmdb_backdrop).toBeUndefined();
+    it('omits the field for unknown or missing statuses', () => {
+        // Never surface a raw English string TMDB might add later
+        expect(
+            mergeSerieInfoWithTmdb(info, { ...base, status: 'Something New' })
+                .tmdb_status
+        ).toBeUndefined();
+        expect(mergeSerieInfoWithTmdb(info, base).tmdb_status).toBeUndefined();
     });
 });
diff --git a/libs/services/src/lib/tmdb/tmdb-merge.ts b/libs/services/src/lib/tmdb/tmdb-merge.ts
index f583d6482..13d8669c8 100644
--- a/libs/services/src/lib/tmdb/tmdb-merge.ts
+++ b/libs/services/src/lib/tmdb/tmdb-merge.ts
@@ -1,15 +1,25 @@
 import {
+    normalizeSeriesStatus,
     StalkerVodInfo,
-    TmdbEnrichedCastMember,
     TmdbMediaType,
     TmdbRecommendation,
     XtreamSerieInfo,
     XtreamVodInfo,
 } from '@iptvnator/shared/interfaces';
-import { tmdbBackdropUrl, tmdbPosterUrl, tmdbProfileUrl } from './tmdb-config';
+import { tmdbBackdropUrl, tmdbPosterUrl } from './tmdb-config';
+import {
+    castNames,
+    creatorNames,
+    directorNames,
+    enrichedCast,
+    enrichedCreators,
+    enrichedDirectors,
+    limitCast,
+    topCast,
+    unifiedTvCast,
+} from './tmdb-credits';
 import { extractYear } from './tmdb-matcher';
 import {
-    TmdbCredits,
     TmdbDetails,
     TmdbMovieDetails,
     TmdbTvDetails,
@@ -20,50 +30,9 @@ import {
  * The provider stays authoritative for stream-related data; TMDB wins for
  * editorial fields (plot, cast, director, genres, rating, artwork) when it
  * has a value, otherwise the provider value is kept. Nothing is mutated.
+ * People (cast, directors, creators) are extracted in `tmdb-credits.ts`.
  */
 
-const MAX_CAST_NAMES = 10;
-
-function topCast(credits: TmdbCredits | undefined) {
-    return [...(credits?.cast ?? [])]
-        .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
-        .slice(0, MAX_CAST_NAMES)
-        .filter((member) => Boolean(member.name));
-}
-
-function castNames(credits: TmdbCredits | undefined): string {
-    return topCast(credits)
-        .map((member) => member.name)
-        .join(', ');
-}
-
-/** Cast with profile photos for the avatar chips in detail views */
-function enrichedCast(
-    credits: TmdbCredits | undefined
-): TmdbEnrichedCastMember[] {
-    return topCast(credits).map((member) => ({
-        name: member.name,
-        ...(member.character ? { character: member.character } : {}),
-        profileUrl: tmdbProfileUrl(member.profile_path),
-        ...(member.id ? { tmdbPersonId: member.id } : {}),
-    }));
-}
-
-function directorNames(credits: TmdbCredits | undefined): string {
-    return (credits?.crew ?? [])
-        .filter((member) => member.job === 'Director')
-        .map((member) => member.name)
-        .filter(Boolean)
-        .join(', ');
-}
-
-function creatorNames(details: TmdbTvDetails): string {
-    return (details.created_by ?? [])
-        .map((creator) => creator.name)
-        .filter(Boolean)
-        .join(', ');
-}
-
 const MAX_RECOMMENDATIONS = 12;
 
 /** Best YouTube trailer key: official trailer > any trailer > teaser */
@@ -129,10 +98,12 @@ export function mergeVodInfoWithTmdb(
     info: XtreamVodInfo,
     details: TmdbMovieDetails
 ): XtreamVodInfo {
-    const tmdbCast = enrichedCast(details.credits);
+    const movieCast = topCast(details.credits);
+    const tmdbCast = enrichedCast(movieCast);
+    const tmdbDirectors = enrichedDirectors(details.credits);
     const trailer = pickTrailerKey(details);
     const recommendations = recommendationList(details);
-    const cast = castNames(details.credits);
+    const cast = castNames(movieCast);
     const director = directorNames(details.credits);
     const genre = genreNames(details);
     const rating = tmdbRating(details);
@@ -163,6 +134,7 @@ export function mergeVodInfoWithTmdb(
         backdrop_path: mergedBackdrops(details, info.backdrop_path),
         episode_run_time: info.episode_run_time || (details.runtime ?? 0),
         youtube_trailer: prefer(trailer, info.youtube_trailer),
+        ...(tmdbDirectors.length > 0 ? { tmdb_directors: tmdbDirectors } : {}),
         ...(tmdbCast.length > 0 ? { tmdb_cast: tmdbCast } : {}),
         ...(recommendations.length > 0
             ? { tmdb_recommendations: recommendations }
@@ -174,10 +146,13 @@ export function mergeSerieInfoWithTmdb(
     info: XtreamSerieInfo,
     details: TmdbTvDetails
 ): XtreamSerieInfo {
-    const tmdbCast = enrichedCast(details.credits);
+    const seriesCast = limitCast(unifiedTvCast(details));
+    const tmdbCast = enrichedCast(seriesCast);
+    const tmdbDirectors = enrichedCreators(details);
+    const status = normalizeSeriesStatus(details.status);
     const trailer = pickTrailerKey(details);
     const recommendations = recommendationList(details);
-    const cast = castNames(details.credits);
+    const cast = castNames(seriesCast);
     const creators = creatorNames(details);
     const genre = genreNames(details);
     const rating = tmdbRating(details);
@@ -197,6 +172,8 @@ export function mergeSerieInfoWithTmdb(
         backdrop_path: mergedBackdrops(details, info.backdrop_path),
         youtube_trailer: prefer(trailer, info.youtube_trailer),
         tmdb_id: details.id,
+        ...(status ? { tmdb_status: status } : {}),
+        ...(tmdbDirectors.length > 0 ? { tmdb_directors: tmdbDirectors } : {}),
         ...(tmdbCast.length > 0 ? { tmdb_cast: tmdbCast } : {}),
         ...(recommendations.length > 0
             ? { tmdb_recommendations: recommendations }
@@ -215,10 +192,22 @@ export function mergeStalkerInfoWithTmdb(
     details: TmdbMovieDetails | TmdbTvDetails,
     mediaType: TmdbMediaType
 ): StalkerVodInfo {
-    const tmdbCast = enrichedCast(details.credits);
+    const selectedCast =
+        mediaType === 'movie'
+            ? topCast(details.credits)
+            : limitCast(unifiedTvCast(details as TmdbTvDetails));
+    const tmdbCast = enrichedCast(selectedCast);
+    const tmdbDirectors =
+        mediaType === 'movie'
+            ? enrichedDirectors(details.credits)
+            : enrichedCreators(details as TmdbTvDetails);
+    const status =
+        mediaType === 'tv'
+            ? normalizeSeriesStatus((details as TmdbTvDetails).status)
+            : null;
     const trailer = pickTrailerKey(details);
     const recommendations = recommendationList(details);
-    const cast = castNames(details.credits);
+    const cast = castNames(selectedCast);
     const director =
         mediaType === 'movie'
             ? directorNames(details.credits)
@@ -243,8 +232,10 @@ export function mergeStalkerInfoWithTmdb(
         rating_imdb:
             info.rating_imdb || (rating !== null ? String(rating) : ''),
         tmdb_id: details.id,
+        ...(status ? { tmdb_status: status } : {}),
         ...(backdrop ? { tmdb_backdrop: backdrop } : {}),
         ...(trailer ? { tmdb_trailer: trailer } : {}),
+        ...(tmdbDirectors.length > 0 ? { tmdb_directors: tmdbDirectors } : {}),
         ...(tmdbCast.length > 0 ? { tmdb_cast: tmdbCast } : {}),
         ...(recommendations.length > 0
             ? { tmdb_recommendations: recommendations }
diff --git a/libs/services/src/lib/tmdb/tmdb-person.spec.ts b/libs/services/src/lib/tmdb/tmdb-person.spec.ts
index 117b19d52..94e9c0404 100644
--- a/libs/services/src/lib/tmdb/tmdb-person.spec.ts
+++ b/libs/services/src/lib/tmdb/tmdb-person.spec.ts
@@ -35,6 +35,30 @@ const person: TmdbPersonDetails = {
             { id: 42, title: 'No media type' },
             { id: 43, media_type: 'movie', title: '   ' },
         ],
+        crew: [
+            {
+                id: 16869,
+                media_type: 'movie',
+                title: 'Legends of the Fall',
+                release_date: '1994-12-16',
+                job: 'Producer',
+            },
+            {
+                id: 1422,
+                media_type: 'movie',
+                title: 'The Departed',
+                release_date: '2006-10-05',
+                job: 'Director',
+            },
+            {
+                // Directed a title he also starred in — acting credit wins
+                id: 550,
+                media_type: 'movie',
+                title: 'Fight Club',
+                release_date: '1999-10-15',
+                job: 'Director',
+            },
+        ],
     },
 };
 
@@ -57,19 +81,47 @@ describe('mapPersonFilmography', () => {
         const credits = mapPersonFilmography(person);
 
         expect(credits.map((credit) => credit.tmdbId)).toEqual([
-            550, 1104, 999,
+            1422, 550, 1104, 999,
         ]);
-        expect(credits[0]).toEqual({
+        expect(credits[1]).toEqual({
             tmdbId: 550,
             mediaType: 'movie',
             title: 'Fight Club',
             year: 1999,
             posterUrl: 'https://image.tmdb.org/t/p/w500/fc.jpg',
             character: 'Tyler Durden',
+            crewJob: null,
         });
-        expect(credits[1].mediaType).toBe('tv');
+        expect(credits[2].mediaType).toBe('tv');
         // Undated entries sort last
-        expect(credits[2].year).toBeNull();
+        expect(credits[3].year).toBeNull();
+    });
+
+    it('includes directing credits from the crew, acting wins the dedup', () => {
+        const credits = mapPersonFilmography(person);
+
+        // Directed-only title carries the role separately from character,
+        // so the UI can render it through a translated label
+        const departed = credits.find((credit) => credit.tmdbId === 1422);
+        expect(departed).toEqual({
+            tmdbId: 1422,
+            mediaType: 'movie',
+            title: 'The Departed',
+            year: 2006,
+            posterUrl: null,
+            character: null,
+            crewJob: 'Director',
+        });
+
+        // Non-director crew jobs (Producer) are not part of the filmography
+        expect(
+            credits.find((credit) => credit.tmdbId === 16869)
+        ).toBeUndefined();
+
+        // Fight Club was acted AND directed — the acting credit wins
+        const fightClub = credits.find((credit) => credit.tmdbId === 550);
+        expect(fightClub?.character).toBe('Tyler Durden');
+        expect(fightClub?.crewJob).toBeNull();
     });
 
     it('handles a person without credits', () => {
diff --git a/libs/services/src/lib/tmdb/tmdb-person.ts b/libs/services/src/lib/tmdb/tmdb-person.ts
index e3b64855b..13da913ce 100644
--- a/libs/services/src/lib/tmdb/tmdb-person.ts
+++ b/libs/services/src/lib/tmdb/tmdb-person.ts
@@ -17,16 +17,30 @@ export interface ActorProfile {
     photoUrl: string | null;
 }
 
+export type ActorCrewJob = 'Director' | 'Creator';
+
 export interface ActorFilmographyCredit {
     tmdbId: number;
     mediaType: 'movie' | 'tv';
     title: string;
     year: number | null;
     posterUrl: string | null;
+    /** Character name for acting credits, null for crew-only credits */
     character: string | null;
+    /**
+     * Crew role for directing-only credits — kept separate from
+     * `character` so the UI can render it through translated labels
+     * instead of TMDB's raw English job string.
+     */
+    crewJob: ActorCrewJob | null;
 }
 
 const MAX_FILMOGRAPHY_CREDITS = 80;
+/** Crew jobs worth showing on the person page (directors, TV creators) */
+const FILMOGRAPHY_CREW_JOBS = new Set<string>([
+    'Director',
+    'Creator',
+] satisfies ActorCrewJob[]);
 
 export function mapPersonProfile(person: TmdbPersonDetails): ActorProfile {
     return {
@@ -41,8 +55,11 @@ export function mapPersonProfile(person: TmdbPersonDetails): ActorProfile {
 }
 
 /**
- * Deduplicated acting credits, newest first (undated entries last),
- * capped at {@link MAX_FILMOGRAPHY_CREDITS}.
+ * Deduplicated acting + directing credits in one merged list, newest
+ * first (undated entries last), capped at {@link MAX_FILMOGRAPHY_CREDITS}.
+ * Acting credits win the dedup so "Actor — Character" survives when a
+ * person both starred in and directed the same title; directing-only
+ * titles carry the crew role in `crewJob` for translated rendering.
  */
 export function mapPersonFilmography(
     person: TmdbPersonDetails
@@ -50,7 +67,14 @@ export function mapPersonFilmography(
     const seen = new Set<string>();
     const credits: ActorFilmographyCredit[] = [];
 
-    for (const credit of person.combined_credits?.cast ?? []) {
+    const castCredits = (person.combined_credits?.cast ?? []).map(
+        (credit) => ({ credit, crewJob: null as ActorCrewJob | null })
+    );
+    const crewCredits = (person.combined_credits?.crew ?? [])
+        .filter((credit) => credit.job && FILMOGRAPHY_CREW_JOBS.has(credit.job))
+        .map((credit) => ({ credit, crewJob: credit.job as ActorCrewJob }));
+
+    for (const { credit, crewJob } of [...castCredits, ...crewCredits]) {
         const mediaType =
             credit.media_type === 'movie' || credit.media_type === 'tv'
                 ? credit.media_type
@@ -69,6 +93,7 @@ export function mapPersonFilmography(
             year: extractYear(credit.release_date ?? credit.first_air_date),
             posterUrl: tmdbPosterUrl(credit.poster_path),
             character: credit.character?.trim() || null,
+            crewJob,
         });
     }
 
diff --git a/libs/services/src/lib/tmdb/tmdb-provider-id.spec.ts b/libs/services/src/lib/tmdb/tmdb-provider-id.spec.ts
new file mode 100644
index 000000000..99c199191
--- /dev/null
+++ b/libs/services/src/lib/tmdb/tmdb-provider-id.spec.ts
@@ -0,0 +1,92 @@
+import { assessProviderId } from './tmdb-matcher';
+
+describe('assessProviderId', () => {
+    it('corroborates on a matching year even when the title reads wrong', () => {
+        // "IT - Chapter Two" normalizes to "chapter two" because the
+        // ALL-CAPS "IT" looks like a language tag
+        expect(
+            assessProviderId(
+                {
+                    title: 'It Chapter Two',
+                    release_date: '2019-09-04',
+                },
+                { title: 'IT - Chapter Two', year: 2019 },
+                'movie'
+            )
+        ).toBe('corroborated');
+    });
+
+    it('is inconclusive when the title differs and no year can arbitrate', () => {
+        // Never 'contradicted': normalization artifacts and localized
+        // titles both land here, and the id is usually fine
+        expect(
+            assessProviderId(
+                { title: 'It Chapter Two' },
+                { title: 'IT - Chapter Two' },
+                'movie'
+            )
+        ).toBe('inconclusive');
+    });
+
+    it('contradicts a same-title id from another year', () => {
+        // Both normalize to "blade runner" — only the year sees the swap
+        expect(
+            assessProviderId(
+                { title: 'Blade Runner', release_date: '1982-06-25' },
+                { title: 'Blade Runner 2049', year: 2017 },
+                'movie'
+            )
+        ).toBe('contradicted');
+    });
+
+    it('reads the year out of the provider title when there is no field', () => {
+        expect(
+            assessProviderId(
+                { title: 'The Lion King', release_date: '1994-06-24' },
+                { title: 'The Lion King 2019' },
+                'movie'
+            )
+        ).toBe('contradicted');
+    });
+
+    it('allows a one-year drift between provider and TMDB dates', () => {
+        expect(
+            assessProviderId(
+                { title: 'Some Film', release_date: '2018-12-28' },
+                { title: 'Totally Other Name', year: 2019 },
+                'movie'
+            )
+        ).toBe('corroborated');
+    });
+
+    it('accepts a series that premiered before the reported season year', () => {
+        // Portals report the current season's year, TMDB the premiere
+        expect(
+            assessProviderId(
+                { name: 'The Boys', first_air_date: '2019-07-25' },
+                { title: 'The Boys', year: 2026 },
+                'tv'
+            )
+        ).toBe('corroborated');
+    });
+
+    it('contradicts a series that started after the reported year', () => {
+        expect(
+            assessProviderId(
+                { name: 'Something Else', first_air_date: '2024-01-01' },
+                { title: 'The Boys', year: 2019 },
+                'tv'
+            )
+        ).toBe('contradicted');
+    });
+
+    it('corroborates on the title when neither side has a year', () => {
+        expect(
+            assessProviderId(
+                { title: 'The Matrix' },
+                { title: 'The Matrix' },
+                'movie'
+            )
+        ).toBe('corroborated');
+    });
+});
diff --git a/libs/services/src/lib/tmdb/tmdb.types.ts b/libs/services/src/lib/tmdb/tmdb.types.ts
index 87565fa44..ccb5087af 100644
--- a/libs/services/src/lib/tmdb/tmdb.types.ts
+++ b/libs/services/src/lib/tmdb/tmdb.types.ts
@@ -45,9 +45,11 @@ export interface TmdbCastMember {
 }
 
 export interface TmdbCrewMember {
+    id?: number;
     name: string;
     job?: string;
     department?: string;
+    profile_path?: string | null;
 }
 
 export interface TmdbCredits {
@@ -55,6 +57,23 @@ export interface TmdbCredits {
     crew?: TmdbCrewMember[];
 }
 
+/**
+ * `/tv/{id}/aggregate_credits` groups a person's work across the whole
+ * run, so a character lives in `roles[]` rather than on the member.
+ */
+export interface TmdbAggregateCastMember {
+    id?: number;
+    name: string;
+    order?: number;
+    profile_path?: string | null;
+    total_episode_count?: number;
+    roles?: { character?: string; episode_count?: number }[];
+}
+
+export interface TmdbAggregateCredits {
+    cast?: TmdbAggregateCastMember[];
+}
+
 export interface TmdbGenre {
     id: number;
     name: string;
@@ -96,8 +115,16 @@ export interface TmdbTvDetails extends TmdbDetailsBase {
     name?: string;
     original_name?: string;
     first_air_date?: string;
+    /** English production status ("Ended", "Returning Series", ...) */
+    status?: string;
+    /** Series-wide cast; `credits` alone covers only the latest season */
+    aggregate_credits?: TmdbAggregateCredits;
     episode_run_time?: number[];
-    created_by?: { name: string }[];
+    created_by?: {
+        id?: number;
+        name: string;
+        profile_path?: string | null;
+    }[];
 }
 
 export interface TmdbEpisode {
@@ -118,7 +145,7 @@ export interface TmdbSeasonDetails {
     episodes?: TmdbEpisode[];
 }
 
-/** One acting credit from /person/{id} combined_credits */
+/** One credit from /person/{id} combined_credits (cast or crew) */
 export interface TmdbPersonCredit {
     id: number;
     media_type?: string;
@@ -128,7 +155,11 @@ export interface TmdbPersonCredit {
     /** TV credits */
     name?: string;
     first_air_date?: string;
+    /** Acting credits (cast array) */
     character?: string;
+    /** Crew credits (crew array) — e.g. "Director" / "Directing" */
+    job?: string;
+    department?: string;
     poster_path?: string | null;
     vote_count?: number;
     popularity?: number;
@@ -142,7 +173,10 @@ export interface TmdbPersonDetails {
     deathday?: string | null;
     place_of_birth?: string | null;
     profile_path?: string | null;
-    combined_credits?: { cast?: TmdbPersonCredit[] };
+    combined_credits?: {
+        cast?: TmdbPersonCredit[];
+        crew?: TmdbPersonCredit[];
+    };
 }
 
 export type TmdbDetails = TmdbMovieDetails | TmdbTvDetails;
diff --git a/libs/services/src/lib/xtream-pending-restore.service.spec.ts b/libs/services/src/lib/xtream-pending-restore.service.spec.ts
new file mode 100644
index 000000000..772125fab
--- /dev/null
+++ b/libs/services/src/lib/xtream-pending-restore.service.spec.ts
@@ -0,0 +1,65 @@
+import { getXtreamPendingRestoreStorageKey } from '@iptvnator/shared/interfaces';
+import { XtreamPendingRestoreService } from './xtream-pending-restore.service';
+
+describe('XtreamPendingRestoreService', () => {
+    const playlistId = 'playlist-1';
+    const storageKey = getXtreamPendingRestoreStorageKey(playlistId);
+    let service: XtreamPendingRestoreService;
+
+    beforeEach(() => {
+        service = new XtreamPendingRestoreService();
+        localStorage.clear();
+    });
+
+    afterEach(() => {
+        localStorage.clear();
+    });
+
+    it('sanitizes stale persisted state written by broken builds on read', () => {
+        // State persisted by versions affected by issue #1017: hidden
+        // categories without any xtream ID.
+        localStorage.setItem(
+            storageKey,
+            JSON.stringify({
+                hiddenCategories: [
+                    { categoryType: 'live' },
+                    { categoryType: 'movies' },
+                    { categoryType: 'series', xtreamId: 301 },
+                ],
+                favorites: [],
+                recentlyViewed: [],
+                playbackPositions: [],
+            })
+        );
+
+        expect(service.get(playlistId)?.hiddenCategories).toEqual([
+            { categoryType: 'series', xtreamId: 301 },
+        ]);
+    });
+
+    it('normalizes state on write', () => {
+        service.set(playlistId, {
+            hiddenCategories: [
+                { categoryType: 'live', xtreamId: 101 },
+                { categoryType: 'live' } as never,
+            ],
+            favorites: [],
+            recentlyViewed: [],
+            playbackPositions: [],
+        });
+
+        const persisted = JSON.parse(
+            localStorage.getItem(storageKey) ?? 'null'
+        );
+        expect(persisted?.hiddenCategories).toEqual([
+            { categoryType: 'live', xtreamId: 101 },
+        ]);
+    });
+
+    it('returns null for missing or unreadable state', () => {
+        expect(service.get(playlistId)).toBeNull();
+
+        localStorage.setItem(storageKey, '{not json');
+        expect(service.get(playlistId)).toBeNull();
+    });
+});
diff --git a/libs/services/src/lib/xtream-pending-restore.service.ts b/libs/services/src/lib/xtream-pending-restore.service.ts
index 1f1431124..59b6178f6 100644
--- a/libs/services/src/lib/xtream-pending-restore.service.ts
+++ b/libs/services/src/lib/xtream-pending-restore.service.ts
@@ -1,16 +1,10 @@
 import { Injectable } from '@angular/core';
 import {
     getXtreamPendingRestoreStorageKey,
+    normalizeXtreamPendingRestoreState,
     XtreamPendingRestoreState,
 } from '@iptvnator/shared/interfaces';
 
-const EMPTY_RESTORE_STATE: XtreamPendingRestoreState = {
-    hiddenCategories: [],
-    favorites: [],
-    recentlyViewed: [],
-    playbackPositions: [],
-};
-
 @Injectable({
     providedIn: 'root',
 })
@@ -29,7 +23,10 @@ export class XtreamPendingRestoreService {
                 return null;
             }
 
-            return this.normalize(JSON.parse(rawState));
+            // Persisted state may predate the current build (e.g. entries
+            // written by versions affected by issue #1017), so it is
+            // re-normalized on every read, not only on write.
+            return normalizeXtreamPendingRestoreState(JSON.parse(rawState));
         } catch {
             return null;
         }
@@ -43,7 +40,7 @@ export class XtreamPendingRestoreService {
         try {
             localStorage.setItem(
                 getXtreamPendingRestoreStorageKey(playlistId),
-                JSON.stringify(this.normalize(state))
+                JSON.stringify(normalizeXtreamPendingRestoreState(state))
             );
         } catch {
             // Ignore local storage write failures.
@@ -63,27 +60,4 @@ export class XtreamPendingRestoreService {
             // Ignore local storage remove failures.
         }
     }
-
-    private normalize(value: unknown): XtreamPendingRestoreState {
-        if (!value || typeof value !== 'object') {
-            return { ...EMPTY_RESTORE_STATE };
-        }
-
-        const candidate = value as Partial<XtreamPendingRestoreState>;
-
-        return {
-            hiddenCategories: Array.isArray(candidate.hiddenCategories)
-                ? candidate.hiddenCategories
-                : [],
-            favorites: Array.isArray(candidate.favorites)
-                ? candidate.favorites
-                : [],
-            recentlyViewed: Array.isArray(candidate.recentlyViewed)
-                ? candidate.recentlyViewed
-                : [],
-            playbackPositions: Array.isArray(candidate.playbackPositions)
-                ? candidate.playbackPositions
-                : [],
-        };
-    }
 }
diff --git a/libs/services/tsconfig.lib.json b/libs/services/tsconfig.lib.json
index 61d8f1f15..1767b1326 100644
--- a/libs/services/tsconfig.lib.json
+++ b/libs/services/tsconfig.lib.json
@@ -12,7 +12,8 @@
         "src/**/*.spec.ts",
         "src/test-setup.ts",
         "jest.config.ts",
-        "src/**/*.test.ts"
+        "src/**/*.test.ts",
+        "src/**/*.test-helpers.ts"
     ],
     "include": ["src/**/*.ts", "../../../global.d.ts"]
 }
diff --git a/libs/shared/database/project.json b/libs/shared/database/project.json
index 4898aea9e..5c1c44099 100644
--- a/libs/shared/database/project.json
+++ b/libs/shared/database/project.json
@@ -25,7 +25,7 @@
             }
         },
         "lint": {
-            "command": "eslint libs/shared/database/**/*.ts"
+            "command": "eslint \"libs/shared/database/**/*.ts\""
         }
     }
 }
diff --git a/libs/shared/database/src/lib/connection-migrations.spec.ts b/libs/shared/database/src/lib/connection-migrations.spec.ts
index 07a0485fc..ed067e7a9 100644
--- a/libs/shared/database/src/lib/connection-migrations.spec.ts
+++ b/libs/shared/database/src/lib/connection-migrations.spec.ts
@@ -6,6 +6,7 @@ const {
     createTableStatements,
     indexMigrationStatements,
     runMigrations,
+    cleanupLegacyTmdbSearchCache,
 } = __databaseConnectionTestHooks;
 
 type SqliteHandle = Parameters<typeof runMigrations>[0];
@@ -22,10 +23,7 @@ type StatementHandler = {
 
 type HandlerRule = [pattern: string, handler: StatementHandler];
 
-function createSqliteMock(
-    rules: HandlerRule[],
-    exec: jest.Mock = jest.fn()
-) {
+function createSqliteMock(rules: HandlerRule[], exec: jest.Mock = jest.fn()) {
     const prepare = jest.fn((statement: string) => {
         const compact = compactSql(statement);
         const rule = rules.find(([pattern]) => compact.includes(pattern));
@@ -129,6 +127,45 @@ describe('runMigrations error tolerance', () => {
     });
 });
 
+describe('TMDB search lookup v2 cache cleanup', () => {
+    it('deletes legacy search rows and records the migration atomically', () => {
+        const deleteRun = jest.fn();
+        const markerRun = jest.fn();
+        const { sqlite, transaction } = createSqliteMock([
+            ['SELECT value FROM app_state', { get: () => undefined }],
+            ['DELETE FROM tmdb_metadata', { run: deleteRun }],
+            ['INSERT INTO app_state', { run: markerRun }],
+        ]);
+
+        cleanupLegacyTmdbSearchCache(sqlite);
+
+        expect(transaction).toHaveBeenCalledTimes(1);
+        expect(deleteRun).toHaveBeenCalledTimes(1);
+        expect(markerRun).toHaveBeenCalledWith(
+            'migration:tmdb-search-lookup-v2-cache-cleanup:v1'
+        );
+        const deleteSql = compactSql(
+            (sqlite.prepare as jest.Mock).mock.calls.find(([statement]) =>
+                statement.includes('DELETE FROM tmdb_metadata')
+            )?.[0]
+        );
+        expect(deleteSql).toContain(
+            "lookup_key LIKE 'title:%|year:%' AND lookup_key NOT LIKE 'title:%|year:%|v%'"
+        );
+    });
+
+    it('does nothing after the migration has completed', () => {
+        const { sqlite, prepare, transaction } = createSqliteMock([
+            completedMigrationStateRule,
+        ]);
+
+        cleanupLegacyTmdbSearchCache(sqlite);
+
+        expect(transaction).not.toHaveBeenCalled();
+        expect(prepare).toHaveBeenCalledTimes(1);
+    });
+});
+
 describe('runMigrations Xtream cache deduplication', () => {
     it('re-points content to the canonical duplicate category before deleting the rest', () => {
         const candidatesAll = jest.fn(() => [
@@ -141,7 +178,11 @@ describe('runMigrations Xtream cache deduplication', () => {
             completedMigrationStateRule,
             [
                 'FROM categories GROUP BY playlist_id, type, xtream_id',
-                { all: () => [{ playlistId: 'p1', type: 'live', xtreamId: 5 }] },
+                {
+                    all: () => [
+                        { playlistId: 'p1', type: 'live', xtreamId: 5 },
+                    ],
+                },
             ],
             ['LEFT JOIN content', { all: candidatesAll }],
             [
@@ -149,7 +190,10 @@ describe('runMigrations Xtream cache deduplication', () => {
                 { run: updateContentRun },
             ],
             ['DELETE FROM categories WHERE id = ?', { run: deleteCategoryRun }],
-            ['FROM content GROUP BY category_id, type, xtream_id', { all: () => [] }],
+            [
+                'FROM content GROUP BY category_id, type, xtream_id',
+                { all: () => [] },
+            ],
         ]);
 
         runMigrations(sqlite);
diff --git a/libs/shared/database/src/lib/connection.spec.ts b/libs/shared/database/src/lib/connection.spec.ts
index a7cca91b1..09d00ee75 100644
--- a/libs/shared/database/src/lib/connection.spec.ts
+++ b/libs/shared/database/src/lib/connection.spec.ts
@@ -25,6 +25,39 @@ describe('database schema statements', () => {
         normalizeXtreamContentAddedEpochs,
         ensureContentTitleFts,
     } = __databaseConnectionTestHooks;
+    const ensureDownloadsPauseResumeSchema = (
+        __databaseConnectionTestHooks as unknown as {
+            ensureDownloadsPauseResumeSchema: (sqlite: {
+                prepare: (statement: string) => {
+                    get?: () => unknown;
+                    run?: (...args: unknown[]) => unknown;
+                };
+                transaction: (callback: () => void) => () => void;
+            }) => void;
+        }
+    ).ensureDownloadsPauseResumeSchema;
+
+    function createRebuildSqlite(legacyTableSql: string | undefined) {
+        const statements: string[] = [];
+        const transaction = jest.fn((callback: () => void) => callback);
+        const prepare = jest.fn((statement: string) => {
+            if (statement.includes('FROM sqlite_master')) {
+                return {
+                    get: () =>
+                        legacyTableSql === undefined
+                            ? undefined
+                            : { sql: legacyTableSql },
+                };
+            }
+            return {
+                run: () => {
+                    statements.push(compactSql(statement));
+                },
+            };
+        });
+
+        return { prepare, statements, transaction };
+    }
 
     it('defines the core fresh-install tables, indexes, and FTS triggers', () => {
         const schemaSql = createTableStatements.map(compactSql).join('\n');
@@ -45,6 +78,9 @@ describe('database schema statements', () => {
             'CREATE TABLE IF NOT EXISTS playback_positions'
         );
         expect(schemaSql).toContain('CREATE TABLE IF NOT EXISTS downloads');
+        expect(schemaSql).toContain('request_headers TEXT');
+        expect(schemaSql).toContain('resume_validator TEXT');
+        expect(schemaSql).toContain("'paused'");
         expect(schemaSql).toContain(
             'CREATE UNIQUE INDEX IF NOT EXISTS favorites_content_playlist_unique'
         );
@@ -383,6 +419,80 @@ describe('database schema statements', () => {
         );
     });
 
+    it('rebuilds a legacy downloads table without paused status or stored headers', () => {
+        const sqlite = createRebuildSqlite(
+            `CREATE TABLE downloads (id INTEGER PRIMARY KEY AUTOINCREMENT, status TEXT NOT NULL DEFAULT 'queued' CHECK (status IN ('queued', 'downloading', 'completed', 'failed', 'canceled')))`
+        );
+
+        ensureDownloadsPauseResumeSchema(sqlite);
+
+        expect(sqlite.transaction).toHaveBeenCalledTimes(1);
+        const { statements } = sqlite;
+        const renameIndex = statements.findIndex((statement) =>
+            statement.startsWith('ALTER TABLE downloads RENAME TO')
+        );
+        const createIndex = statements.findIndex((statement) =>
+            statement.startsWith('CREATE TABLE IF NOT EXISTS downloads')
+        );
+        const copyIndex = statements.findIndex((statement) =>
+            statement.startsWith('INSERT INTO downloads')
+        );
+        const dropLegacyIndex = statements.findIndex((statement) =>
+            statement.startsWith('DROP TABLE downloads_pause_resume_legacy')
+        );
+
+        expect(renameIndex).toBeGreaterThanOrEqual(0);
+        expect(createIndex).toBeGreaterThan(renameIndex);
+        expect(copyIndex).toBeGreaterThan(createIndex);
+        expect(dropLegacyIndex).toBeGreaterThan(copyIndex);
+        // Indexes on the old table are dropped before the rename and
+        // recreated after the copy.
+        expect(
+            statements.filter((statement) =>
+                statement.startsWith('DROP INDEX IF EXISTS')
+            ).length
+        ).toBe(3);
+        expect(
+            statements
+                .slice(dropLegacyIndex + 1)
+                .filter((statement) => statement.includes('CREATE')).length
+        ).toBe(3);
+        // The rebuilt table carries the new contract; legacy rows get NULL
+        // stored headers, and the copy never references resume_validator so
+        // it defaults to NULL.
+        expect(statements[createIndex]).toContain(`'paused'`);
+        expect(statements[createIndex]).toContain('request_headers TEXT');
+        expect(statements[createIndex]).toContain('resume_validator TEXT');
+        expect(statements[copyIndex]).toContain('NULL AS request_headers');
+        expect(statements[copyIndex]).not.toContain('resume_validator');
+    });
+
+    it('copies stored headers when only the paused status is missing', () => {
+        const sqlite = createRebuildSqlite(
+            `CREATE TABLE downloads (id INTEGER PRIMARY KEY AUTOINCREMENT, request_headers TEXT, status TEXT NOT NULL DEFAULT 'queued' CHECK (status IN ('queued', 'downloading', 'completed', 'failed', 'canceled')))`
+        );
+
+        ensureDownloadsPauseResumeSchema(sqlite);
+
+        const copy = sqlite.statements.find((statement) =>
+            statement.startsWith('INSERT INTO downloads')
+        );
+        expect(copy).toBeDefined();
+        expect(copy).not.toContain('NULL AS request_headers');
+        expect(copy).toContain('request_headers');
+    });
+
+    it('skips the downloads rebuild when the table already has the paused contract', () => {
+        const sqlite = createRebuildSqlite(
+            `CREATE TABLE downloads (id INTEGER PRIMARY KEY AUTOINCREMENT, request_headers TEXT, resume_validator TEXT, status TEXT CHECK (status IN ('queued', 'downloading', 'paused', 'completed', 'failed', 'canceled')))`
+        );
+
+        ensureDownloadsPauseResumeSchema(sqlite);
+
+        expect(sqlite.transaction).not.toHaveBeenCalled();
+        expect(sqlite.statements).toHaveLength(0);
+    });
+
     it('backfills migrated EPG program source URLs in bounded batches', () => {
         const { backfillEpgProgramSourceUrls } =
             __databaseConnectionTestHooks;
diff --git a/libs/shared/database/src/lib/connection.ts b/libs/shared/database/src/lib/connection.ts
index aed2531c2..244a3319a 100644
--- a/libs/shared/database/src/lib/connection.ts
+++ b/libs/shared/database/src/lib/connection.ts
@@ -30,6 +30,8 @@ const CONTENT_TITLE_FTS_MIGRATION_KEY =
     'migration:content-title-fts-trigram:v1';
 const EPG_PROGRAM_SOURCE_URL_BACKFILL_MIGRATION_KEY =
     'migration:epg-program-source-url-backfill:v1';
+const TMDB_SEARCH_LOOKUP_V2_CACHE_CLEANUP_MIGRATION_KEY =
+    'migration:tmdb-search-lookup-v2-cache-cleanup:v1';
 const EPG_PROGRAM_SOURCE_URL_BACKFILL_BATCH_SIZE = 50_000;
 
 function readTraceFlag(name: string): boolean {
@@ -83,6 +85,34 @@ const TMDB_METADATA_TABLE_SQL = `CREATE TABLE IF NOT EXISTS tmdb_metadata (
       fetched_at TEXT DEFAULT (datetime('now'))
   )`;
 const TMDB_METADATA_INDEX_SQL = `CREATE UNIQUE INDEX IF NOT EXISTS tmdb_metadata_lookup_unique ON tmdb_metadata(media_type, lookup_key, language)`;
+const DOWNLOADS_TABLE_SQL = `CREATE TABLE IF NOT EXISTS downloads (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      playlist_id TEXT NOT NULL,
+      xtream_id INTEGER NOT NULL,
+      content_type TEXT NOT NULL CHECK (content_type IN ('vod', 'episode')),
+      series_xtream_id INTEGER,
+      season_number INTEGER,
+      episode_number INTEGER,
+      title TEXT NOT NULL,
+      url TEXT NOT NULL,
+      file_name TEXT,
+      file_path TEXT,
+      poster_url TEXT,
+      request_headers TEXT,
+      resume_validator TEXT,
+      status TEXT NOT NULL DEFAULT 'queued' CHECK (status IN ('queued', 'downloading', 'paused', 'completed', 'failed', 'canceled')),
+      bytes_downloaded INTEGER DEFAULT 0,
+      total_bytes INTEGER,
+      error_message TEXT,
+      created_at TEXT DEFAULT (datetime('now')),
+      updated_at TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (playlist_id) REFERENCES playlists (id) ON DELETE CASCADE
+  )`;
+const DOWNLOADS_INDEX_STATEMENTS = [
+    `CREATE UNIQUE INDEX IF NOT EXISTS downloads_xtream_playlist_unique ON downloads(xtream_id, playlist_id, content_type)`,
+    `CREATE INDEX IF NOT EXISTS downloads_playlist_idx ON downloads(playlist_id)`,
+    `CREATE INDEX IF NOT EXISTS downloads_status_idx ON downloads(status)`,
+];
 
 const CREATE_TABLE_STATEMENTS = [
     `CREATE TABLE IF NOT EXISTS playlists (
@@ -169,6 +199,7 @@ const CREATE_TABLE_STATEMENTS = [
     `CREATE INDEX IF NOT EXISTS idx_categories_playlist ON categories(playlist_id)`,
     `CREATE INDEX IF NOT EXISTS idx_content_title ON content(title)`,
     `CREATE INDEX IF NOT EXISTS idx_content_xtream ON content(xtream_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_content_epg_channel ON content(epg_channel_id)`,
     `CREATE INDEX IF NOT EXISTS idx_content_type_added ON content(type, added)`,
     `CREATE INDEX IF NOT EXISTS idx_categories_type ON categories(type)`,
     // Partial covering index for visible categories — supports the dashboard's
@@ -261,6 +292,15 @@ const CREATE_TABLE_STATEMENTS = [
       INSERT INTO epg_programs_fts(rowid, title, description, category)
       VALUES (new.id, new.title, new.description, new.category);
   END`,
+    // EPG channel mappings (manual user overrides)
+    `CREATE TABLE IF NOT EXISTS epg_channel_mappings (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      channel_key TEXT NOT NULL UNIQUE,
+      epg_channel_id TEXT NOT NULL,
+      playlist_id TEXT,
+      updated_at TEXT DEFAULT (datetime('now'))
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_epg_channel_mappings_playlist ON epg_channel_mappings(playlist_id)`,
     // Playback Positions table
     `CREATE TABLE IF NOT EXISTS playback_positions (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -281,30 +321,8 @@ const CREATE_TABLE_STATEMENTS = [
     `CREATE INDEX IF NOT EXISTS playback_positions_updated_idx ON playback_positions(updated_at)`,
     `CREATE INDEX IF NOT EXISTS playback_positions_playlist_updated_idx ON playback_positions(playlist_id, updated_at DESC)`,
     // Downloads table
-    `CREATE TABLE IF NOT EXISTS downloads (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      playlist_id TEXT NOT NULL,
-      xtream_id INTEGER NOT NULL,
-      content_type TEXT NOT NULL CHECK (content_type IN ('vod', 'episode')),
-      series_xtream_id INTEGER,
-      season_number INTEGER,
-      episode_number INTEGER,
-      title TEXT NOT NULL,
-      url TEXT NOT NULL,
-      file_name TEXT,
-      file_path TEXT,
-      poster_url TEXT,
-      status TEXT NOT NULL DEFAULT 'queued' CHECK (status IN ('queued', 'downloading', 'completed', 'failed', 'canceled')),
-      bytes_downloaded INTEGER DEFAULT 0,
-      total_bytes INTEGER,
-      error_message TEXT,
-      created_at TEXT DEFAULT (datetime('now')),
-      updated_at TEXT DEFAULT (datetime('now')),
-      FOREIGN KEY (playlist_id) REFERENCES playlists (id) ON DELETE CASCADE
-  )`,
-    `CREATE UNIQUE INDEX IF NOT EXISTS downloads_xtream_playlist_unique ON downloads(xtream_id, playlist_id, content_type)`,
-    `CREATE INDEX IF NOT EXISTS downloads_playlist_idx ON downloads(playlist_id)`,
-    `CREATE INDEX IF NOT EXISTS downloads_status_idx ON downloads(status)`,
+    DOWNLOADS_TABLE_SQL,
+    ...DOWNLOADS_INDEX_STATEMENTS,
     // TMDB metadata cache (details payloads + search match resolutions)
     TMDB_METADATA_TABLE_SQL,
     TMDB_METADATA_INDEX_SQL,
@@ -342,6 +360,8 @@ const COLUMN_MIGRATION_STATEMENTS = [
     `ALTER TABLE content ADD COLUMN backdrop_url TEXT`,
     // v1.7.1: Scope XMLTV programs to their source URL for playlist-local EPG lookup
     `ALTER TABLE epg_programs ADD COLUMN source_url TEXT`,
+    // Pause/resume: entity validator (ETag/Last-Modified) sent as If-Range on resume
+    `ALTER TABLE downloads ADD COLUMN resume_validator TEXT`,
 ];
 
 const INDEX_MIGRATION_STATEMENTS = [
@@ -360,9 +380,11 @@ export const __databaseConnectionTestHooks = {
     createTableStatements: CREATE_TABLE_STATEMENTS,
     columnMigrationStatements: COLUMN_MIGRATION_STATEMENTS,
     indexMigrationStatements: INDEX_MIGRATION_STATEMENTS,
+    ensureDownloadsPauseResumeSchema,
     normalizeXtreamContentAddedEpochs,
     ensureContentTitleFts,
     backfillEpgProgramSourceUrls,
+    cleanupLegacyTmdbSearchCache,
     runMigrations,
 } as const;
 
@@ -758,11 +780,164 @@ function widenTmdbMetadataMediaTypeCheck(sqliteDb: Database.Database): void {
     }
 }
 
+/**
+ * Search-match cache keys gained a v2 suffix when title normalization changed.
+ * Remove the now-unreachable unversioned rows once rather than leaving negative
+ * resolutions and other legacy search matches in long-lived installations.
+ */
+function cleanupLegacyTmdbSearchCache(sqliteDb: Database.Database): void {
+    try {
+        const migrationState = sqliteDb
+            .prepare(`SELECT value FROM app_state WHERE key = ?`)
+            .get(TMDB_SEARCH_LOOKUP_V2_CACHE_CLEANUP_MIGRATION_KEY) as
+            | { value?: unknown }
+            | undefined;
+
+        if (migrationState?.value === 'done') {
+            return;
+        }
+
+        const executeCleanup = sqliteDb.transaction(() => {
+            sqliteDb
+                .prepare(
+                    `DELETE FROM tmdb_metadata
+                     WHERE lookup_key LIKE 'title:%|year:%'
+                       AND lookup_key NOT LIKE 'title:%|year:%|v%'`
+                )
+                .run();
+            sqliteDb
+                .prepare(
+                    `INSERT INTO app_state (key, value, updated_at)
+                     VALUES (?, 'done', datetime('now'))
+                     ON CONFLICT(key) DO UPDATE SET
+                        value = excluded.value,
+                        updated_at = excluded.updated_at`
+                )
+                .run(TMDB_SEARCH_LOOKUP_V2_CACHE_CLEANUP_MIGRATION_KEY);
+        });
+
+        executeCleanup();
+    } catch (error) {
+        const message =
+            typeof error === 'object' && error !== null && 'message' in error
+                ? String((error as { message?: unknown }).message ?? error)
+                : String(error);
+
+        console.warn(
+            `Legacy TMDB search cache cleanup failed (continuing): ${message}`
+        );
+    }
+}
+
+/**
+ * Existing downloads tables had a status CHECK without 'paused'. SQLite cannot
+ * alter CHECK constraints in place, so rebuild only when the table SQL still
+ * reflects the old contract or lacks request_headers.
+ */
+function ensureDownloadsPauseResumeSchema(sqliteDb: Database.Database): void {
+    try {
+        const row = sqliteDb
+            .prepare(
+                `SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'downloads'`
+            )
+            .get() as { sql?: string } | undefined;
+        if (!row?.sql) {
+            return;
+        }
+
+        const hasPausedStatus = row.sql.includes(`'paused'`);
+        const hasRequestHeaders = row.sql.includes('request_headers');
+        if (hasPausedStatus && hasRequestHeaders) {
+            return;
+        }
+
+        const legacyHeadersSelect = hasRequestHeaders
+            ? 'request_headers'
+            : 'NULL AS request_headers';
+        const rebuild = sqliteDb.transaction(() => {
+            for (const statement of DOWNLOADS_INDEX_STATEMENTS) {
+                const match = statement.match(
+                    /^CREATE\s+(?:UNIQUE\s+)?INDEX\s+IF\s+NOT\s+EXISTS\s+([^\s]+)\s+/i
+                );
+                if (match?.[1]) {
+                    sqliteDb.prepare(`DROP INDEX IF EXISTS ${match[1]}`).run();
+                }
+            }
+
+            sqliteDb
+                .prepare(
+                    `ALTER TABLE downloads RENAME TO downloads_pause_resume_legacy`
+                )
+                .run();
+            sqliteDb.prepare(DOWNLOADS_TABLE_SQL).run();
+            sqliteDb
+                .prepare(
+                    `INSERT INTO downloads (
+                        id,
+                        playlist_id,
+                        xtream_id,
+                        content_type,
+                        series_xtream_id,
+                        season_number,
+                        episode_number,
+                        title,
+                        url,
+                        file_name,
+                        file_path,
+                        poster_url,
+                        request_headers,
+                        status,
+                        bytes_downloaded,
+                        total_bytes,
+                        error_message,
+                        created_at,
+                        updated_at
+                    )
+                    SELECT
+                        id,
+                        playlist_id,
+                        xtream_id,
+                        content_type,
+                        series_xtream_id,
+                        season_number,
+                        episode_number,
+                        title,
+                        url,
+                        file_name,
+                        file_path,
+                        poster_url,
+                        ${legacyHeadersSelect},
+                        status,
+                        bytes_downloaded,
+                        total_bytes,
+                        error_message,
+                        created_at,
+                        updated_at
+                    FROM downloads_pause_resume_legacy`
+                )
+                .run();
+            sqliteDb
+                .prepare(`DROP TABLE downloads_pause_resume_legacy`)
+                .run();
+            for (const statement of DOWNLOADS_INDEX_STATEMENTS) {
+                sqliteDb.prepare(statement).run();
+            }
+        });
+
+        rebuild();
+        console.log('[DB] Rebuilt downloads table with pause/resume schema');
+    } catch (error) {
+        console.warn('[DB] downloads pause/resume migration failed:', error);
+    }
+}
+
 /**
  * Run migrations that may fail if already applied
  */
 function runMigrations(sqliteDb: Database.Database): void {
     widenTmdbMetadataMediaTypeCheck(sqliteDb);
+    cleanupLegacyTmdbSearchCache(sqliteDb);
+    ensureDownloadsPauseResumeSchema(sqliteDb);
     runMigrationStatements(sqliteDb, COLUMN_MIGRATION_STATEMENTS);
     ensureContentTitleFts(sqliteDb);
     deduplicateXtreamCache(sqliteDb);
diff --git a/libs/shared/database/src/lib/epg-mapping.schema.ts b/libs/shared/database/src/lib/epg-mapping.schema.ts
new file mode 100644
index 000000000..edb0c9538
--- /dev/null
+++ b/libs/shared/database/src/lib/epg-mapping.schema.ts
@@ -0,0 +1,30 @@
+/**
+ * Drizzle ORM schema for manual EPG-to-channel mappings.
+ *
+ * Split out of schema.ts to keep that file within the repository's
+ * max-lines budget; re-exported from there so `import * as schema`
+ * consumers keep seeing a single schema namespace.
+ */
+
+import { sql } from 'drizzle-orm';
+import { index, integer, sqliteTable, text } from 'drizzle-orm/sqlite-core';
+
+// EPG channel mappings (manual user overrides)
+export const epgChannelMappings = sqliteTable(
+    'epg_channel_mappings',
+    {
+        id: integer('id').primaryKey({ autoIncrement: true }),
+        channelKey: text('channel_key').notNull().unique(),
+        epgChannelId: text('epg_channel_id').notNull(),
+        playlistId: text('playlist_id'),
+        updatedAt: text('updated_at').default(sql`CURRENT_TIMESTAMP`),
+    },
+    (table) => ({
+        playlistIdx: index('idx_epg_channel_mappings_playlist').on(
+            table.playlistId
+        ),
+    })
+);
+
+export type EpgChannelMapping = typeof epgChannelMappings.$inferSelect;
+export type NewEpgChannelMapping = typeof epgChannelMappings.$inferInsert;
diff --git a/libs/shared/database/src/lib/schema.ts b/libs/shared/database/src/lib/schema.ts
index 0093dab99..4386f8b26 100644
--- a/libs/shared/database/src/lib/schema.ts
+++ b/libs/shared/database/src/lib/schema.ts
@@ -16,6 +16,10 @@ import {
     uniqueIndex,
 } from 'drizzle-orm/sqlite-core';
 
+// Manual EPG-to-channel mappings live in their own schema module; re-export
+// them so `import * as schema from './schema'` keeps a complete namespace.
+export * from './epg-mapping.schema';
+
 // Playlists table
 export const playlists = sqliteTable('playlists', {
     id: text('id').primaryKey(),
@@ -110,6 +114,9 @@ export const content = sqliteTable(
         categoryIdx: index('idx_content_category').on(table.categoryId),
         titleIdx: index('idx_content_title').on(table.title),
         xtreamIdx: index('idx_content_xtream').on(table.xtreamId),
+        epgChannelIdx: index('idx_content_epg_channel').on(
+            table.epgChannelId
+        ),
         categoryTypeXtreamUnique: uniqueIndex(
             'content_category_type_xtream_unique'
         ).on(table.categoryId, table.type, table.xtreamId),
@@ -325,9 +332,18 @@ export const downloads = sqliteTable(
         fileName: text('file_name'),
         filePath: text('file_path'),
         posterUrl: text('poster_url'),
+        requestHeaders: text('request_headers'),
+        resumeValidator: text('resume_validator'),
         // Download progress
         status: text('status', {
-            enum: ['queued', 'downloading', 'completed', 'failed', 'canceled'],
+            enum: [
+                'queued',
+                'downloading',
+                'paused',
+                'completed',
+                'failed',
+                'canceled',
+            ],
         })
             .notNull()
             .default('queued'),
diff --git a/libs/shared/interfaces/src/index.ts b/libs/shared/interfaces/src/index.ts
index b65a7381a..e8bf168f0 100644
--- a/libs/shared/interfaces/src/index.ts
+++ b/libs/shared/interfaces/src/index.ts
@@ -1,3 +1,4 @@
+export * from './lib/channel-drm.interface';
 export * from './lib/channel.interface';
 export * from './lib/channel.model';
 export * from './lib/dev-logger.util';
@@ -7,6 +8,7 @@ export * from './lib/epg-channel-metadata.model';
 export * from './lib/epg-channel-with-programs.interface';
 export * from './lib/epg-channel.model';
 export * from './lib/epg-item.interface';
+export * from './lib/epg-mapping-key.util';
 export * from './lib/epg-program.model';
 export * from './lib/external-player-arguments.utils';
 export * from './lib/external-player-session.interface';
@@ -17,9 +19,12 @@ export * from './lib/ipc-commands';
 export * from './lib/language.enum';
 export * from './lib/m3u-favorite-channel.interface';
 export * from './lib/parsed-playlist.interface';
+export * from './lib/performance-phase.interface';
 export * from './lib/playback-position.interface';
+export * from './lib/playlist-auto-update.interface';
 export * from './lib/playlist-backup.interface';
 export * from './lib/playlist-meta.type';
+export * from './lib/preload-performance-marker.interface';
 export * from './lib/playlist-recently-viewed.interface';
 export * from './lib/playlist-recently-viewed.utils';
 export * from './lib/playlist-refresh.interface';
@@ -27,6 +32,7 @@ export * from './lib/playlist.interface';
 export * from './lib/portal-activity-item.interface';
 export * from './lib/portal-debug.interface';
 export * from './lib/portal-playback.interface';
+export * from './lib/random-id.util';
 export * from './lib/security-policy-error.utils';
 export * from './lib/settings.interface';
 export * from './lib/stalker-portal-actions.enum';
@@ -34,6 +40,7 @@ export * from './lib/store-keys.enum';
 export * from './lib/stream-format.enum';
 export * from './lib/catalog-title-match.interface';
 export * from './lib/theme.enum';
+export * from './lib/season-marker.util';
 export * from './lib/title-normalization.util';
 export * from './lib/tmdb.interface';
 export * from './lib/xtream-account-info-dialog-data.interface';
diff --git a/libs/shared/interfaces/src/lib/channel-drm.interface.ts b/libs/shared/interfaces/src/lib/channel-drm.interface.ts
new file mode 100644
index 000000000..3c9eac43c
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/channel-drm.interface.ts
@@ -0,0 +1,18 @@
+/**
+ * DRM configuration extracted from `#KODIPROP:inputstream.adaptive.*` lines of
+ * an M3U playlist entry. Only ClearKey is playable in-app; other license types
+ * are preserved so playback can surface a meaningful DRM diagnostic instead of
+ * failing silently.
+ */
+export interface ChannelDrmClearKeys {
+    /** Key id (32 lowercase hex chars) mapped to its key (32 lowercase hex chars). */
+    [kidHex: string]: string;
+}
+
+export interface ChannelDrm {
+    /** Normalized license type, e.g. `clearkey` or `com.widevine.alpha`. */
+    licenseType: string;
+    /** True only for ClearKey entries with at least one successfully parsed key. */
+    supported: boolean;
+    clearKeys?: ChannelDrmClearKeys;
+}
diff --git a/libs/shared/interfaces/src/lib/channel.interface.ts b/libs/shared/interfaces/src/lib/channel.interface.ts
index 03bef9ee7..2eb403ad7 100644
--- a/libs/shared/interfaces/src/lib/channel.interface.ts
+++ b/libs/shared/interfaces/src/lib/channel.interface.ts
@@ -1,3 +1,5 @@
+import { ChannelDrm } from './channel-drm.interface';
+
 /**
  * Represents channel object
  * TODO: define channel interface in iptv-parser library
@@ -29,4 +31,7 @@ export interface Channel {
         origin: string;
     };
     radio: string;
+    drm?: ChannelDrm;
+    /** Raw M3U block of the entry as preserved by the playlist parser. */
+    raw?: string;
 }
diff --git a/libs/shared/interfaces/src/lib/electron-api.interface.ts b/libs/shared/interfaces/src/lib/electron-api.interface.ts
index 73d222fcb..de3695b46 100644
--- a/libs/shared/interfaces/src/lib/electron-api.interface.ts
+++ b/libs/shared/interfaces/src/lib/electron-api.interface.ts
@@ -14,12 +14,14 @@ import {
 } from './global-search-result.interface';
 import { M3uFavoriteChannel } from './m3u-favorite-channel.interface';
 import { PlaybackPositionData } from './playback-position.interface';
+import { AutoUpdatePlaylistsResult } from './playlist-auto-update.interface';
 import {
     XtreamBackupFavoriteItem,
     XtreamBackupHiddenCategory,
     XtreamBackupRecentlyViewedItem,
 } from './playlist-backup.interface';
 import {
+    PlaylistRefreshCancelledResult,
     PlaylistRefreshEvent,
     PlaylistRefreshPayload,
 } from './playlist-refresh.interface';
@@ -31,7 +33,11 @@ import {
 import { PortalDebugEvent } from './portal-debug.interface';
 import { CatalogTitleMatch } from './catalog-title-match.interface';
 import { Settings } from './settings.interface';
-import { TmdbCacheEntry, TmdbCacheMediaType } from './tmdb.interface';
+import {
+    TmdbCacheEntry,
+    TmdbCacheMediaType,
+    TmdbCacheStats,
+} from './tmdb.interface';
 import { XtreamCategory } from './xtream-category.interface';
 
 export const ELECTRON_BRIDGE_CONTENT_TYPES = {
@@ -119,6 +125,7 @@ export const ELECTRON_BRIDGE_DOWNLOAD_STATUSES = {
     Completed: 'completed',
     Downloading: 'downloading',
     Failed: 'failed',
+    Paused: 'paused',
     Queued: 'queued',
 } as const;
 
@@ -266,6 +273,19 @@ export interface ElectronBridgeEpgFreshnessResult {
     freshUrls: string[];
 }
 
+export interface ElectronBridgeEpgMapping {
+    id: number;
+    channelKey: string;
+    epgChannelId: string;
+    playlistId: string | null;
+}
+
+export interface ElectronBridgeEpgSearchResult {
+    id: string;
+    displayName: string;
+    iconUrl: string | null;
+}
+
 export interface ElectronBridgeEpgLookupOptions {
     sourceUrls?: string[];
 }
@@ -414,6 +434,8 @@ export interface ElectronBridgeGlobalRecentlyAddedItem extends ElectronBridgeXtr
 
 export interface ElectronBridgeFavoriteReorderUpdate {
     content_id: number;
+    /** Favorites are playlist-scoped — scope the position write per playlist */
+    playlist_id: string;
     position: number;
 }
 
@@ -578,7 +600,7 @@ export interface ElectronBridgeApi {
     autoUpdatePlaylists: (
         playlists: Playlist[],
         options?: ElectronBridgeTrustOptions
-    ) => Promise<Playlist[]>;
+    ) => Promise<AutoUpdatePlaylistsResult>;
     fetchEpg: (
         urls: string[],
         options?: ElectronBridgeTrustOptions
@@ -614,6 +636,25 @@ export interface ElectronBridgeApi {
         searchTerm: string,
         limit?: number
     ) => Promise<EpgProgram[]>;
+
+    // EPG channel mapping (manual user overrides)
+    getEpgMapping: (
+        channelKey: string
+    ) => Promise<ElectronBridgeEpgMapping | null>;
+    getEpgMappingsBatch: (
+        channelKeys: string[]
+    ) => Promise<Record<string, string>>;
+    setEpgMapping: (
+        channelKey: string,
+        epgChannelId: string,
+        playlistId?: string
+    ) => Promise<ElectronBridgeResult>;
+    deleteEpgMapping: (channelKey: string) => Promise<ElectronBridgeResult>;
+    searchEpgChannels: (
+        searchTerm: string,
+        limit?: number
+    ) => Promise<ElectronBridgeEpgSearchResult[]>;
+
     updateSettings: (settings: Partial<Settings>) => Promise<void>;
     getAiSettings: () => Promise<ElectronBridgeAiSettings>;
     setMpvPlayerPath: (mpvPlayerPath: string) => Promise<void>;
@@ -631,7 +672,9 @@ export interface ElectronBridgeApi {
         url: string,
         method?: 'GET' | 'HEAD'
     ) => Promise<ElectronBridgeXtreamProbeResult>;
-    refreshPlaylist: (payload: PlaylistRefreshPayload) => Promise<Playlist>;
+    refreshPlaylist: (
+        payload: PlaylistRefreshPayload
+    ) => Promise<Playlist | PlaylistRefreshCancelledResult>;
     cancelPlaylistRefresh: (
         operationId: string
     ) => Promise<ElectronBridgeResult>;
@@ -641,13 +684,27 @@ export interface ElectronBridgeApi {
     dbGetPlaylist: (
         playlistId: string
     ) => Promise<ElectronBridgePlaylistRow | null>;
-    dbUpsertAppPlaylist: (playlist: Playlist) => Promise<ElectronBridgeResult>;
+    dbUpsertAppPlaylist: (
+        playlist: Playlist,
+        /**
+         * Instrumentation-only; stripped before the DB invoke.
+         * Never enters the DB worker payload or persisted playlist data.
+         */
+        operationId?: string
+    ) => Promise<ElectronBridgeResult>;
     dbUpsertAppPlaylists: (
         playlists: Playlist[]
     ) => Promise<ElectronBridgeCountResult>;
     dbGetAppPlaylists: () => Promise<Playlist[]>;
     dbGetAppPlaylistMetas: () => Promise<Playlist[]>;
-    dbGetAppPlaylist: (playlistId: string) => Promise<Playlist | null>;
+    dbGetAppPlaylist: (
+        playlistId: string,
+        /**
+         * Instrumentation-only; stripped before the DB invoke.
+         * Never enters the DB worker payload or persisted playlist data.
+         */
+        operationId?: string
+    ) => Promise<Playlist | null>;
     dbGetAppPlaylistFavoriteChannels: (
         playlistId: string
     ) => Promise<M3uFavoriteChannel[]>;
@@ -785,6 +842,11 @@ export interface ElectronBridgeApi {
         language: string
     ) => Promise<TmdbCacheEntry | null>;
     dbSetTmdbMetadata: (entry: TmdbCacheEntry) => Promise<ElectronBridgeResult>;
+    /** Row count + payload bytes for the settings cache panel */
+    dbGetTmdbCacheStats: () => Promise<TmdbCacheStats>;
+    dbClearTmdbMetadata: () => Promise<
+        ElectronBridgeResult & { deleted: number }
+    >;
     /** Cross-playlist title matching (actor page "All portals" scope) */
     dbMatchTitles: (titles: string[]) => Promise<CatalogTitleMatch[]>;
     onChannelChange?: (
@@ -907,10 +969,23 @@ export interface ElectronBridgeApi {
     disposeEmbeddedMpvSession: (
         sessionId: string
     ) => Promise<EmbeddedMpvSession | null>;
+    /**
+     * Frame-copy engine only: start/stop the preload frame pump that
+     * uploads helper frames onto the renderer's
+     * `<canvas data-embedded-mpv-frame>` element. Optional because older
+     * preload builds do not ship the pump.
+     */
+    attachEmbeddedMpvFrameView?: (sessionId: string) => Promise<boolean>;
+    detachEmbeddedMpvFrameView?: () => void;
     downloadsStart: (
         data: ElectronBridgeDownloadStartPayload
     ) => Promise<ElectronBridgeDownloadStartResult>;
     downloadsCancel: (downloadId: number) => Promise<ElectronBridgeErrorResult>;
+    downloadsPause: (downloadId: number) => Promise<ElectronBridgeErrorResult>;
+    downloadsResume: (
+        downloadId: number,
+        downloadFolder: string
+    ) => Promise<ElectronBridgeErrorResult>;
     downloadsRetry: (
         downloadId: number,
         downloadFolder: string
diff --git a/libs/shared/interfaces/src/lib/embedded-mpv-session.interface.ts b/libs/shared/interfaces/src/lib/embedded-mpv-session.interface.ts
index 474189c28..74fd73112 100644
--- a/libs/shared/interfaces/src/lib/embedded-mpv-session.interface.ts
+++ b/libs/shared/interfaces/src/lib/embedded-mpv-session.interface.ts
@@ -22,11 +22,44 @@ export interface EmbeddedMpvCapabilities {
     recording: boolean;
 }
 
+export type EmbeddedMpvEngine = 'native' | 'frame-copy';
+
 export interface EmbeddedMpvSupport {
     supported: boolean;
     platform: string;
     reason?: string;
     capabilities?: EmbeddedMpvCapabilities;
+    /**
+     * Rendering engine the main process will use for new sessions.
+     * `native` = platform video surface (NSOpenGLView/HWND/X11 wid),
+     * `frame-copy` = helper process + shm ring + renderer canvas.
+     */
+    engine?: EmbeddedMpvEngine;
+    /**
+     * True when this machine could run the frame-copy engine (macOS arm64
+     * or Linux x64, after its helper/runtime capability gate), regardless of
+     * whether it is active.
+     * Drives the Settings toggle; switching engines requires an app restart.
+     */
+    frameCopyAvailable?: boolean;
+    /**
+     * Stable fail-closed capability reason when frameCopyAvailable is false.
+     * Intended for startup tracing and support diagnostics, not user copy.
+     */
+    frameCopyUnavailableReason?: string;
+}
+
+/**
+ * Where the renderer's frame pump finds the current shm frame ring of a
+ * frame-copy session. A new generation is announced after every viewport
+ * resize; the pump re-attaches to the new segment.
+ */
+export interface EmbeddedMpvFrameSource {
+    shmName: string;
+    width: number;
+    height: number;
+    generation: number;
+    readerPath: string;
 }
 
 export interface EmbeddedMpvAudioTrack {
@@ -66,6 +99,9 @@ export interface EmbeddedMpvSession {
     selectedSubtitleTrackId: number | null;
     playbackSpeed: number;
     aspectOverride: string;
+    /** Source video size (mpv dwidth/dheight); frame-copy engine only. */
+    videoWidth?: number;
+    videoHeight?: number;
     recording?: EmbeddedMpvRecordingState;
     startedAt: string;
     updatedAt: string;
diff --git a/libs/shared/interfaces/src/lib/epg-mapping-key.util.spec.ts b/libs/shared/interfaces/src/lib/epg-mapping-key.util.spec.ts
new file mode 100644
index 000000000..62c0d54e6
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/epg-mapping-key.util.spec.ts
@@ -0,0 +1,38 @@
+import {
+    buildStalkerEpgMappingKey,
+    buildXtreamEpgMappingKey,
+} from './epg-mapping-key.util';
+
+describe('buildXtreamEpgMappingKey', () => {
+    it('scopes the key to the playlist', () => {
+        expect(buildXtreamEpgMappingKey('playlist-a', 12345)).toBe(
+            'xtream:playlist-a:12345'
+        );
+    });
+
+    it('produces distinct keys for the same stream id in different playlists', () => {
+        expect(buildXtreamEpgMappingKey('playlist-a', 12345)).not.toBe(
+            buildXtreamEpgMappingKey('playlist-b', 12345)
+        );
+    });
+
+    it('accepts string stream ids', () => {
+        expect(buildXtreamEpgMappingKey('playlist-a', '42')).toBe(
+            'xtream:playlist-a:42'
+        );
+    });
+});
+
+describe('buildStalkerEpgMappingKey', () => {
+    it('scopes the key to the playlist', () => {
+        expect(buildStalkerEpgMappingKey('portal-a', '205')).toBe(
+            'stalker:portal-a:205'
+        );
+    });
+
+    it('never collides with the Xtream key space', () => {
+        expect(buildStalkerEpgMappingKey('p', 1)).not.toBe(
+            buildXtreamEpgMappingKey('p', 1)
+        );
+    });
+});
diff --git a/libs/shared/interfaces/src/lib/epg-mapping-key.util.ts b/libs/shared/interfaces/src/lib/epg-mapping-key.util.ts
new file mode 100644
index 000000000..8f0b024e2
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/epg-mapping-key.util.ts
@@ -0,0 +1,28 @@
+/**
+ * Key helpers for the manual EPG channel mapping table
+ * (`epg_channel_mappings`).
+ *
+ * M3U channels use their EPG lookup key (tvg-id, falling back to the
+ * channel name) directly — those identifiers are meaningful across
+ * playlists, so a mapping saved once applies everywhere.
+ *
+ * Xtream stream IDs and Stalker channel IDs, on the other hand, are
+ * provider-local: stream 12345 in portal A has nothing to do with
+ * stream 12345 in portal B. Mapping keys for portal channels therefore
+ * embed the playlist ID so mappings never leak across portals. Shared
+ * between the renderer and the Electron main process/worker, like
+ * `title-normalization.util.ts`.
+ */
+export function buildXtreamEpgMappingKey(
+    playlistId: string,
+    xtreamId: number | string
+): string {
+    return `xtream:${playlistId}:${xtreamId}`;
+}
+
+export function buildStalkerEpgMappingKey(
+    playlistId: string,
+    stalkerId: number | string
+): string {
+    return `stalker:${playlistId}:${stalkerId}`;
+}
diff --git a/libs/shared/interfaces/src/lib/ipc-commands.ts b/libs/shared/interfaces/src/lib/ipc-commands.ts
index 40353ce94..7bd02a66b 100644
--- a/libs/shared/interfaces/src/lib/ipc-commands.ts
+++ b/libs/shared/interfaces/src/lib/ipc-commands.ts
@@ -66,6 +66,9 @@ export const EMBEDDED_MPV_SELECT_RECORDING_FOLDER =
 export const EMBEDDED_MPV_DISPOSE_SESSION = 'EMBEDDED_MPV_DISPOSE_SESSION';
 export const EMBEDDED_MPV_SESSION_UPDATE = 'EMBEDDED_MPV_SESSION_UPDATE';
 export const EMBEDDED_MPV_PREPARE = 'EMBEDDED_MPV_PREPARE';
+export const EMBEDDED_MPV_GET_FRAME_SOURCE = 'EMBEDDED_MPV_GET_FRAME_SOURCE';
+export const EMBEDDED_MPV_FRAME_SOURCE_CHANGED =
+    'EMBEDDED_MPV_FRAME_SOURCE_CHANGED';
 
 // Xtream
 export const XTREAM_REQUEST = 'XTREAM_REQUEST';
diff --git a/libs/shared/interfaces/src/lib/language.enum.ts b/libs/shared/interfaces/src/lib/language.enum.ts
index 2373f3145..0f5732761 100644
--- a/libs/shared/interfaces/src/lib/language.enum.ts
+++ b/libs/shared/interfaces/src/lib/language.enum.ts
@@ -20,4 +20,5 @@ export enum Language {
     POLISH = 'pl',
     PORTUGUESE = 'pt',
     GREEK = 'el',
+    HUNGARIAN = 'hu',
 }
diff --git a/libs/shared/interfaces/src/lib/parsed-playlist.interface.ts b/libs/shared/interfaces/src/lib/parsed-playlist.interface.ts
index 32f7a3473..cd9ffff12 100644
--- a/libs/shared/interfaces/src/lib/parsed-playlist.interface.ts
+++ b/libs/shared/interfaces/src/lib/parsed-playlist.interface.ts
@@ -1,3 +1,5 @@
+import { ChannelDrm } from './channel-drm.interface';
+
 export interface ParsedPlaylist {
     header: {
         attrs: Record<string, string | undefined>;
@@ -22,7 +24,8 @@ export interface ParsedPlaylistItem {
         referrer: string;
         'user-agent': string;
     };
-    url: string;
+    /** absent when an #EXTINF entry has no stream URL (e.g. truncated file) */
+    url?: string;
     raw: string;
     catchup?: {
         type?: string;
@@ -31,4 +34,5 @@ export interface ParsedPlaylistItem {
     };
     timeshift?: string;
     radio?: string;
+    drm?: ChannelDrm;
 }
diff --git a/libs/shared/interfaces/src/lib/performance-phase.interface.ts b/libs/shared/interfaces/src/lib/performance-phase.interface.ts
new file mode 100644
index 000000000..bbca5daf3
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/performance-phase.interface.ts
@@ -0,0 +1,53 @@
+export const PERFORMANCE_PHASE_BOUNDARY = {
+    END: 'end',
+    START: 'start',
+} as const;
+
+export type PerformancePhaseBoundary =
+    (typeof PERFORMANCE_PHASE_BOUNDARY)[keyof typeof PERFORMANCE_PHASE_BOUNDARY];
+
+export const M3U_IMPORT_PERFORMANCE_PHASE_EVENT_CHANNEL =
+    'IPTVNATOR_M3U_IMPORT_PERFORMANCE_PHASE_EVENT';
+
+export const M3U_IMPORT_PERFORMANCE_PHASE = {
+    DATA_ACQUIRE: 'data.acquire',
+    NORMALIZE: 'normalize',
+    PARSE_M3U: 'parse.m3u',
+} as const;
+
+export type M3uImportPerformancePhase =
+    (typeof M3U_IMPORT_PERFORMANCE_PHASE)[keyof typeof M3U_IMPORT_PERFORMANCE_PHASE];
+
+export const APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE = {
+    SERIALIZE_PLAYLIST: 'serialize.playlist',
+    SQLITE_WRITE: 'sqlite.write',
+} as const;
+
+export type AppPlaylistUpsertPerformancePhase =
+    (typeof APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE)[keyof typeof APP_PLAYLIST_UPSERT_PERFORMANCE_PHASE];
+
+export const APP_PLAYLIST_GET_PERFORMANCE_PHASE = {
+    DESERIALIZE_PLAYLIST: 'deserialize.playlist',
+    SQLITE_READ: 'sqlite.read',
+} as const;
+
+export type AppPlaylistGetPerformancePhase =
+    (typeof APP_PLAYLIST_GET_PERFORMANCE_PHASE)[keyof typeof APP_PLAYLIST_GET_PERFORMANCE_PHASE];
+
+export type AppPlaylistPerformancePhase =
+    | AppPlaylistGetPerformancePhase
+    | AppPlaylistUpsertPerformancePhase;
+
+export interface PerformancePhaseMetadata {
+    readonly byteCount?: number;
+    readonly itemCount?: number;
+}
+
+export interface PerformancePhaseEvent<TPhase extends string = string> {
+    readonly boundary: PerformancePhaseBoundary;
+    readonly durationMs: number | null;
+    readonly epochMs: number;
+    readonly metadata?: PerformancePhaseMetadata;
+    readonly phase: TPhase;
+    readonly requestId: string;
+}
diff --git a/libs/shared/interfaces/src/lib/playlist-auto-update.interface.ts b/libs/shared/interfaces/src/lib/playlist-auto-update.interface.ts
new file mode 100644
index 000000000..12219ddc0
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/playlist-auto-update.interface.ts
@@ -0,0 +1,45 @@
+import { Playlist } from './playlist.interface';
+
+/**
+ * Result of a single playlist inside a startup auto-refresh run.
+ *
+ * - `updated`: the playlist source was fetched/read and parsed successfully
+ * - `failed`: the source could not be reached, read or parsed
+ * - `skipped`: the playlist has neither a URL nor a file path, so there is
+ *   nothing to refresh from (a configuration problem, not a failure)
+ */
+export type AutoUpdatePlaylistStatus = 'updated' | 'failed' | 'skipped';
+
+export interface AutoUpdatePlaylistOutcome {
+    playlistId: string;
+    title: string;
+    status: AutoUpdatePlaylistStatus;
+}
+
+export interface AutoUpdatePlaylistsResult {
+    /** Only the playlists that were refreshed successfully. */
+    playlists: Playlist[];
+    /** One entry per requested playlist, in request order. */
+    outcomes: AutoUpdatePlaylistOutcome[];
+}
+
+export interface AutoUpdatePlaylistsSummary {
+    total: number;
+    updated: number;
+    failed: number;
+    skipped: number;
+}
+
+export function summarizeAutoUpdateOutcomes(
+    outcomes: readonly AutoUpdatePlaylistOutcome[]
+): AutoUpdatePlaylistsSummary {
+    return {
+        total: outcomes.length,
+        updated: outcomes.filter((outcome) => outcome.status === 'updated')
+            .length,
+        failed: outcomes.filter((outcome) => outcome.status === 'failed')
+            .length,
+        skipped: outcomes.filter((outcome) => outcome.status === 'skipped')
+            .length,
+    };
+}
diff --git a/libs/shared/interfaces/src/lib/playlist-refresh.interface.ts b/libs/shared/interfaces/src/lib/playlist-refresh.interface.ts
index b02ee028f..6a153f952 100644
--- a/libs/shared/interfaces/src/lib/playlist-refresh.interface.ts
+++ b/libs/shared/interfaces/src/lib/playlist-refresh.interface.ts
@@ -27,3 +27,25 @@ export interface PlaylistRefreshPayload {
     url?: string;
     trustedInsecureTlsHosts?: string[];
 }
+
+export const PLAYLIST_REFRESH_CANCELLED_RESULT_TYPE =
+    'playlist-refresh-cancelled' as const;
+
+export interface PlaylistRefreshCancelledResult {
+    operationId: string;
+    type: typeof PLAYLIST_REFRESH_CANCELLED_RESULT_TYPE;
+}
+
+export function isPlaylistRefreshCancelledResult(
+    value: unknown
+): value is PlaylistRefreshCancelledResult {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+
+    const candidate = value as Record<string, unknown>;
+    return (
+        candidate['type'] === PLAYLIST_REFRESH_CANCELLED_RESULT_TYPE &&
+        typeof candidate['operationId'] === 'string'
+    );
+}
diff --git a/libs/shared/interfaces/src/lib/playlist.interface.ts b/libs/shared/interfaces/src/lib/playlist.interface.ts
index 5453567e3..2721ce84e 100644
--- a/libs/shared/interfaces/src/lib/playlist.interface.ts
+++ b/libs/shared/interfaces/src/lib/playlist.interface.ts
@@ -54,6 +54,8 @@ export interface Playlist {
     recentlyViewed?: PlaylistRecentlyViewedItem[];
     /** Indicates if this is a full stalker portal URL (e.g., /stalker_portal/c) requiring handshake authentication */
     isFullStalkerPortal?: boolean;
+    /** Xtream server timezone string for catch-up URL construction */
+    serverTimezone?: string;
     /** Session token for full stalker portal authentication - persisted for session */
     stalkerToken?: string;
     /** Serial number for stalker portal - generated once and stored for consistency */
diff --git a/libs/shared/interfaces/src/lib/portal-playback.interface.ts b/libs/shared/interfaces/src/lib/portal-playback.interface.ts
index 1ab48fa88..c06ebb8bc 100644
--- a/libs/shared/interfaces/src/lib/portal-playback.interface.ts
+++ b/libs/shared/interfaces/src/lib/portal-playback.interface.ts
@@ -1,3 +1,4 @@
+import { ChannelDrm } from './channel-drm.interface';
 import { PlaybackPositionData } from './playback-position.interface';
 
 export interface PlayerContentInfo extends Omit<
@@ -18,4 +19,5 @@ export interface ResolvedPortalPlayback {
     userAgent?: string;
     referer?: string;
     origin?: string;
+    drm?: ChannelDrm;
 }
diff --git a/libs/shared/interfaces/src/lib/preload-performance-marker.interface.ts b/libs/shared/interfaces/src/lib/preload-performance-marker.interface.ts
new file mode 100644
index 000000000..268f848ae
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/preload-performance-marker.interface.ts
@@ -0,0 +1,52 @@
+export const PRELOAD_PERFORMANCE_MARKER_CHANNEL =
+    'IPTVNATOR_PERF_CAPTURE_MARKER';
+
+export const PRELOAD_PERFORMANCE_METHOD = {
+    DB_GET_APP_PLAYLIST: 'dbGetAppPlaylist',
+    DB_UPSERT_APP_PLAYLIST: 'dbUpsertAppPlaylist',
+    REFRESH_PLAYLIST: 'refreshPlaylist',
+} as const;
+
+export type PreloadPerformanceMethod =
+    (typeof PRELOAD_PERFORMANCE_METHOD)[keyof typeof PRELOAD_PERFORMANCE_METHOD];
+
+export const PRELOAD_PERFORMANCE_PHASE = {
+    ERROR: 'error',
+    START: 'start',
+    SUCCESS: 'success',
+} as const;
+
+export type PreloadPerformancePhase =
+    (typeof PRELOAD_PERFORMANCE_PHASE)[keyof typeof PRELOAD_PERFORMANCE_PHASE];
+
+export const PRELOAD_PERFORMANCE_CORRELATION_STATE = {
+    COMPLETE: 'complete',
+    CORRELATED: 'correlated',
+    INVALID: 'invalid',
+    UNCORRELATED: 'uncorrelated',
+} as const;
+
+export type PreloadPerformanceCorrelationStateName =
+    (typeof PRELOAD_PERFORMANCE_CORRELATION_STATE)[keyof typeof PRELOAD_PERFORMANCE_CORRELATION_STATE];
+
+export const PRELOAD_PERFORMANCE_INVALID_REASON = {
+    CONCURRENT_REFRESH: 'concurrent-refresh',
+    IPC_ERROR: 'ipc-error',
+    MALFORMED_IDENTIFIER: 'malformed-identifier',
+    OUT_OF_ORDER: 'out-of-order',
+    REFRESH_CANCELLED: 'refresh-cancelled',
+} as const;
+
+export type PreloadPerformanceInvalidReason =
+    (typeof PRELOAD_PERFORMANCE_INVALID_REASON)[keyof typeof PRELOAD_PERFORMANCE_INVALID_REASON];
+
+export interface PreloadPerformanceMarker {
+    method: PreloadPerformanceMethod;
+    phase: PreloadPerformancePhase;
+    sourceEpochMs: number;
+    ipcCallId: number;
+    playlistId: string | null;
+    operationId: string | null;
+    correlationState: PreloadPerformanceCorrelationStateName;
+    invalidReason: PreloadPerformanceInvalidReason | null;
+}
diff --git a/libs/shared/interfaces/src/lib/random-id.util.spec.ts b/libs/shared/interfaces/src/lib/random-id.util.spec.ts
new file mode 100644
index 000000000..776dfdcd4
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/random-id.util.spec.ts
@@ -0,0 +1,84 @@
+import { createRandomId } from './random-id.util';
+
+const UUID_V4 =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+
+describe('createRandomId', () => {
+    const nativeRandomUUID = crypto.randomUUID;
+
+    afterEach(() => {
+        Object.defineProperty(crypto, 'randomUUID', {
+            configurable: true,
+            value: nativeRandomUUID,
+        });
+    });
+
+    it('returns a v4 uuid', () => {
+        expect(createRandomId()).toMatch(UUID_V4);
+    });
+
+    it('returns unique ids', () => {
+        const ids = new Set(
+            Array.from({ length: 500 }, () => createRandomId())
+        );
+
+        expect(ids.size).toBe(500);
+    });
+
+    it('uses the native randomUUID when the context exposes it', () => {
+        const randomUUID = jest
+            .fn()
+            .mockReturnValue('11111111-1111-4111-8111-111111111111');
+        Object.defineProperty(crypto, 'randomUUID', {
+            configurable: true,
+            value: randomUUID,
+        });
+
+        expect(createRandomId()).toBe('11111111-1111-4111-8111-111111111111');
+        expect(randomUUID).toHaveBeenCalledTimes(1);
+    });
+
+    describe('without randomUUID (insecure context)', () => {
+        beforeEach(() => {
+            Object.defineProperty(crypto, 'randomUUID', {
+                configurable: true,
+                value: undefined,
+            });
+        });
+
+        it('still returns a v4 uuid from getRandomValues', () => {
+            expect(createRandomId()).toMatch(UUID_V4);
+        });
+
+        it('returns unique ids', () => {
+            const ids = new Set(
+                Array.from({ length: 500 }, () => createRandomId())
+            );
+
+            expect(ids.size).toBe(500);
+        });
+
+        it('sets the version and variant bits on all-zero randomness', () => {
+            jest.spyOn(crypto, 'getRandomValues').mockImplementation(
+                (buffer) => buffer
+            );
+
+            expect(createRandomId()).toBe(
+                '00000000-0000-4000-8000-000000000000'
+            );
+        });
+
+        it('keeps the remaining bits from getRandomValues', () => {
+            jest.spyOn(crypto, 'getRandomValues').mockImplementation(
+                (buffer) => {
+                    (buffer as Uint8Array).fill(0xff);
+                    return buffer;
+                }
+            );
+
+            expect(createRandomId()).toBe(
+                'ffffffff-ffff-4fff-bfff-ffffffffffff'
+            );
+        });
+    });
+});
diff --git a/libs/shared/interfaces/src/lib/random-id.util.ts b/libs/shared/interfaces/src/lib/random-id.util.ts
new file mode 100644
index 000000000..fa0e78b2a
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/random-id.util.ts
@@ -0,0 +1,43 @@
+/**
+ * Random RFC 4122 v4 identifier used for playlist `_id` values, shared by the
+ * renderer, the Electron backend and the web backend. Pure function — no
+ * Angular/Node dependencies.
+ *
+ * `crypto.randomUUID()` is only exposed in secure contexts, and the
+ * self-hosted PWA is regularly served over plain http on a LAN address. So the
+ * fallback builds the same v4 shape from `crypto.getRandomValues()`, which
+ * insecure contexts do expose. This mirrors what `uuid`'s `v4()` did before it
+ * was dropped as a dependency.
+ */
+
+const HEX_BY_BYTE = Array.from({ length: 256 }, (_unused, byte) =>
+    byte.toString(16).padStart(2, '0')
+);
+
+function randomUuidFromBytes(): string {
+    const bytes = new Uint8Array(16);
+    crypto.getRandomValues(bytes);
+
+    // Version 4 and the RFC 4122 variant bits.
+    bytes[6] = (bytes[6] & 0x0f) | 0x40;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+
+    const hex = Array.from(bytes, (byte) => HEX_BY_BYTE[byte]);
+
+    return [
+        hex.slice(0, 4).join(''),
+        hex.slice(4, 6).join(''),
+        hex.slice(6, 8).join(''),
+        hex.slice(8, 10).join(''),
+        hex.slice(10, 16).join(''),
+    ].join('-');
+}
+
+/** Returns a lowercase RFC 4122 v4 UUID. */
+export function createRandomId(): string {
+    if (typeof crypto.randomUUID === 'function') {
+        return crypto.randomUUID();
+    }
+
+    return randomUuidFromBytes();
+}
diff --git a/libs/shared/interfaces/src/lib/season-marker.util.spec.ts b/libs/shared/interfaces/src/lib/season-marker.util.spec.ts
new file mode 100644
index 000000000..f03132810
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/season-marker.util.spec.ts
@@ -0,0 +1,116 @@
+import {
+    extractSeasonFromTitle,
+    pickSeasonMarkedTitle,
+    resolveEnrichmentSeasonNumber,
+} from './season-marker.util';
+
+describe('extractSeasonFromTitle', () => {
+    it('reads bracketed number-first markers', () => {
+        expect(extractSeasonFromTitle('The Mandalorian (2 season)')).toBe(2);
+        expect(extractSeasonFromTitle('Кухня (6 сезон)')).toBe(6);
+    });
+
+    it('reads word-first markers with any joiner', () => {
+        expect(extractSeasonFromTitle('Breaking Bad Season 2')).toBe(2);
+        expect(extractSeasonFromTitle('Breaking Bad season_02')).toBe(2);
+        expect(extractSeasonFromTitle('Breaking Bad season2')).toBe(2);
+        expect(extractSeasonFromTitle('Мандалорец сезон 2')).toBe(2);
+        expect(extractSeasonFromTitle('Dark Staffel 3')).toBe(3);
+        expect(extractSeasonFromTitle('La Casa Temporada 4')).toBe(4);
+    });
+
+    it('reads number-first markers including ordinals', () => {
+        expect(extractSeasonFromTitle('The Boys 2 Season')).toBe(2);
+        expect(extractSeasonFromTitle('The Boys 2nd Season')).toBe(2);
+        expect(extractSeasonFromTitle('Пацаны 2 сезон')).toBe(2);
+        expect(extractSeasonFromTitle('Пацаны 2-й сезон')).toBe(2);
+    });
+
+    it('reads S-form markers, including S..E.. episode tags', () => {
+        expect(extractSeasonFromTitle('The Boys S05')).toBe(5);
+        expect(extractSeasonFromTitle('Gintama s2')).toBe(2);
+        expect(extractSeasonFromTitle('[S03] Dark')).toBe(3);
+        expect(extractSeasonFromTitle('Dark S02E05')).toBe(2);
+    });
+
+    it('never fires on titles without an explicit marker', () => {
+        expect(extractSeasonFromTitle('The Mandalorian')).toBeNull();
+        expect(extractSeasonFromTitle("Ocean's 11")).toBeNull();
+        expect(extractSeasonFromTitle('Cars 2')).toBeNull();
+        expect(extractSeasonFromTitle('The 4400')).toBeNull();
+        expect(extractSeasonFromTitle('The Four Seasons')).toBeNull();
+        expect(extractSeasonFromTitle('2 Fast 2 Furious')).toBeNull();
+        expect(extractSeasonFromTitle('2001: A Space Odyssey')).toBeNull();
+        expect(extractSeasonFromTitle('')).toBeNull();
+        expect(extractSeasonFromTitle(null)).toBeNull();
+    });
+
+    it('rejects plurals, word-internal hits and season zero', () => {
+        expect(extractSeasonFromTitle('Best of 2 Seasons')).toBeNull();
+        expect(extractSeasonFromTitle('Postseason 3')).toBeNull();
+        expect(extractSeasonFromTitle('Dark S00')).toBeNull();
+    });
+});
+
+describe('pickSeasonMarkedTitle', () => {
+    it('prefers the title that carries a season marker', () => {
+        expect(
+            pickSeasonMarkedTitle(
+                'Regular Series',
+                'The Mandalorian (2 season)'
+            )
+        ).toBe('The Mandalorian (2 season)');
+        expect(
+            pickSeasonMarkedTitle('The Boys S05', 'The Boys')
+        ).toBe('The Boys S05');
+    });
+
+    it('falls back to the first non-empty title without markers', () => {
+        expect(pickSeasonMarkedTitle(undefined, 'The Mandalorian')).toBe(
+            'The Mandalorian'
+        );
+        expect(pickSeasonMarkedTitle('', null)).toBeNull();
+    });
+});
+
+describe('resolveEnrichmentSeasonNumber', () => {
+    it('overrides a renumbered single-season slice with the title season', () => {
+        expect(
+            resolveEnrichmentSeasonNumber({
+                rawTitle: 'The Mandalorian (2 season)',
+                providerSeasonNumber: 1,
+                providerSeasonCount: 1,
+            })
+        ).toBe(2);
+    });
+
+    it('keeps provider numbering for multi-season items', () => {
+        expect(
+            resolveEnrichmentSeasonNumber({
+                rawTitle: 'The Mandalorian (2 season)',
+                providerSeasonNumber: 1,
+                providerSeasonCount: 3,
+            })
+        ).toBe(1);
+    });
+
+    it('keeps provider numbering when the marker agrees with it', () => {
+        expect(
+            resolveEnrichmentSeasonNumber({
+                rawTitle: 'The Mandalorian (2 season)',
+                providerSeasonNumber: 2,
+                providerSeasonCount: 1,
+            })
+        ).toBe(2);
+    });
+
+    it('keeps provider numbering without a title marker', () => {
+        expect(
+            resolveEnrichmentSeasonNumber({
+                rawTitle: 'The Mandalorian',
+                providerSeasonNumber: 1,
+                providerSeasonCount: 1,
+            })
+        ).toBe(1);
+    });
+});
diff --git a/libs/shared/interfaces/src/lib/season-marker.util.ts b/libs/shared/interfaces/src/lib/season-marker.util.ts
new file mode 100644
index 000000000..996044630
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/season-marker.util.ts
@@ -0,0 +1,122 @@
+/**
+ * Season markers in provider titles. Providers often slice a show into
+ * per-season catalog items ("The Mandalorian (2 season)", "Пацаны 2 сезон",
+ * "The Boys S05") and renumber the single contained season to 1 — the
+ * marker in the title is then the only source of the real season number.
+ * Pure functions shared by the renderer and tests — no Angular/Node deps.
+ */
+
+/**
+ * Season vocabulary shared with the trailing-suffix stripper in
+ * `title-normalization.util.ts`. Words only — digit placement (before or
+ * after the word) is handled by the patterns built from it.
+ */
+export const SEASON_WORD_ALTERNATIVES = 'season|сезон|staffel|temporada|saison';
+
+const SEASON_WORD = `(?:${SEASON_WORD_ALTERNATIVES})`;
+
+/**
+ * "Season 2", "season_02", "season2", "сезон 2". The leading guard blocks
+ * word-internal matches ("postseason 3"); the digit lookahead rejects
+ * 3+-digit numbers, which are never season markers.
+ */
+const WORD_FIRST_MARKER = new RegExp(
+    `(?:^|[^\\p{L}])${SEASON_WORD}[\\s_.-]*(\\d{1,2})(?!\\d)`,
+    'iu'
+);
+
+/**
+ * "2 season", "2nd Season", "2 сезон", "2-й сезон". The digit guard keeps
+ * long numbers out ("2001 season" never yields season 20/01), the trailing
+ * lookahead rejects plurals ("The Four Seasons", "2 Seasons").
+ */
+const NUMBER_FIRST_MARKER = new RegExp(
+    `(?:^|[^\\d])(\\d{1,2})\\s*(?:st|nd|rd|th|-?й|-?я|-?ой)?[\\s_.-]+${SEASON_WORD}(?!\\p{L})`,
+    'iu'
+);
+
+/**
+ * "S02", "s2" — and the season half of "S02E05". Tightly bounded on both
+ * sides so words ending in "s" followed by a number ("Ocean's 11",
+ * "Cars 2") can never match.
+ */
+const S_FORM_MARKER = /(?:^|[\s([{_.-])s(\d{1,2})(?=$|[\s)\]}_.-]|e\d)/i;
+
+/**
+ * Extract an explicit season number from a RAW provider title (before any
+ * normalization — bracket groups like "(2 season)" are removed by
+ * `normalizeTitleKeys`, so this must see the original string). Returns
+ * `null` when there is no unambiguous marker; season 0 ("specials") is
+ * deliberately rejected.
+ */
+export function extractSeasonFromTitle(
+    raw: string | null | undefined
+): number | null {
+    if (!raw) {
+        return null;
+    }
+
+    for (const pattern of [
+        WORD_FIRST_MARKER,
+        NUMBER_FIRST_MARKER,
+        S_FORM_MARKER,
+    ]) {
+        const match = raw.match(pattern);
+        if (match) {
+            const season = Number(match[1]);
+            if (season >= 1) {
+                return season;
+            }
+        }
+    }
+
+    return null;
+}
+
+/**
+ * The first candidate title carrying an explicit season marker, else the
+ * first non-empty one. Providers spread the descriptive title across
+ * fields (a generic `name` with the marker only in `o_name`), and the
+ * marker must be read from whichever field carries it.
+ */
+export function pickSeasonMarkedTitle(
+    ...titles: readonly (string | null | undefined)[]
+): string | null {
+    for (const title of titles) {
+        if (extractSeasonFromTitle(title) !== null) {
+            return title ?? null;
+        }
+    }
+    return titles.find((title) => !!title) ?? null;
+}
+
+export interface SeasonNumberResolution {
+    /** RAW provider title of the series item (not normalized) */
+    rawTitle: string | null | undefined;
+    /** Season number reported by the provider's episode data */
+    providerSeasonNumber: number;
+    /** How many seasons the provider item contains in total */
+    providerSeasonCount: number;
+}
+
+/**
+ * The TMDB season number to fetch for a provider season. Provider data
+ * stays authoritative except for the one case it is known to lie about:
+ * a SINGLE-season item whose title carries a different explicit season
+ * marker is a per-season slice with renumbered seasons — the marker names
+ * the real TMDB season. Multi-season items always keep provider numbering
+ * (overriding all their seasons from one title marker would be wrong).
+ */
+export function resolveEnrichmentSeasonNumber(
+    resolution: SeasonNumberResolution
+): number {
+    const fromTitle = extractSeasonFromTitle(resolution.rawTitle);
+    if (
+        fromTitle !== null &&
+        resolution.providerSeasonCount === 1 &&
+        fromTitle !== resolution.providerSeasonNumber
+    ) {
+        return fromTitle;
+    }
+    return resolution.providerSeasonNumber;
+}
diff --git a/libs/shared/interfaces/src/lib/settings.interface.ts b/libs/shared/interfaces/src/lib/settings.interface.ts
index 0242ca73a..83daa7116 100644
--- a/libs/shared/interfaces/src/lib/settings.interface.ts
+++ b/libs/shared/interfaces/src/lib/settings.interface.ts
@@ -78,6 +78,24 @@ export function normalizeDashboardRailsSettings(
  */
 export interface Settings {
     player: VideoPlayer;
+    /**
+     * Use IPTVnator's shared controls in HTML5, Video.js, and ArtPlayer.
+     * Missing values remain off for compatibility with older saved settings.
+     */
+    webPlayerSharedControls?: boolean;
+    /**
+     * Fill the empty space around the inline VOD/series player with a blurred,
+     * dimmed copy of the poster (YouTube "Ambient mode" style) instead of plain
+     * black bars. Off by default; only affects the built-in web players.
+     */
+    playerAmbientMode?: boolean;
+    /**
+     * Dock the inline series player to the left and show an "Up Next"
+     * episode rail in the leftover stage column on wide windows. On by
+     * default (the rail only appears when there is genuinely unused space);
+     * missing values mean enabled. Only affects the built-in web players.
+     */
+    playerUpNextRail?: boolean;
     epgUrl: string[];
     streamFormat: StreamFormat;
     openStreamOnDoubleClick: boolean;
@@ -87,6 +105,8 @@ export interface Settings {
     startupBehavior: StartupBehavior;
     /** Show the desktop footer bar for external playback status */
     showExternalPlaybackBar?: boolean;
+    /** Strip country/group prefixes like "US | " or "UK - " from channel names */
+    stripCountryPrefix?: boolean;
     theme: Theme;
     mpvPlayerPath: string;
     /**
@@ -108,6 +128,12 @@ export interface Settings {
     downloadFolder?: string;
     /** Custom live recording folder path (uses system Downloads folder if not set) */
     recordingFolder?: string;
+    /**
+     * Embedded MPV frame-copy engine (experimental, macOS Apple Silicon and Linux).
+     * Applied on the next app start — the engine relaxes the window sandbox
+     * for its preload frame pump, which is fixed at window creation.
+     */
+    embeddedMpvFrameCopy?: boolean;
     /** Cover/poster sizing preset applied across grids and rails */
     coverSize?: CoverSize;
     /** Live EPG panel layout: horizontal timeline (default) or vertical list */
diff --git a/libs/shared/interfaces/src/lib/stalker-portal-actions.enum.ts b/libs/shared/interfaces/src/lib/stalker-portal-actions.enum.ts
index 73d5a2f60..ef582acf4 100644
--- a/libs/shared/interfaces/src/lib/stalker-portal-actions.enum.ts
+++ b/libs/shared/interfaces/src/lib/stalker-portal-actions.enum.ts
@@ -3,6 +3,7 @@ export enum StalkerPortalActions {
     GetGenres = 'get_genres',
     CreateLink = 'create_link',
     GetOrderedList = 'get_ordered_list',
+    GetAllChannels = 'get_all_channels',
     Favorites = 'favorites',
     Handshake = 'handshake',
     DoAuth = 'do_auth',
diff --git a/libs/shared/interfaces/src/lib/stalker-vod-details.interface.ts b/libs/shared/interfaces/src/lib/stalker-vod-details.interface.ts
index 35f65278a..247911423 100644
--- a/libs/shared/interfaces/src/lib/stalker-vod-details.interface.ts
+++ b/libs/shared/interfaces/src/lib/stalker-vod-details.interface.ts
@@ -1,6 +1,7 @@
 import {
     TmdbEnrichedCastMember,
     TmdbRecommendation,
+    TmdbSeriesStatus,
 } from './tmdb.interface';
 
 /**
@@ -39,6 +40,10 @@ export interface StalkerVodInfo {
     rating_kinopoisk: string;
     /** Populated by TMDB enrichment; absent in raw portal responses */
     tmdb_cast?: TmdbEnrichedCastMember[];
+    /** Directors (movies) / creators (series) as clickable person chips */
+    tmdb_directors?: TmdbEnrichedCastMember[];
+    /** Series production status (token, never a raw TMDB string) */
+    tmdb_status?: TmdbSeriesStatus;
     /** TMDB backdrop URL — Stalker portals never provide one themselves */
     tmdb_backdrop?: string;
     /** YouTube trailer key from TMDB — Stalker portals provide no trailers */
diff --git a/libs/shared/interfaces/src/lib/title-normalization.util.spec.ts b/libs/shared/interfaces/src/lib/title-normalization.util.spec.ts
index 3c60b3d8a..8f8df8318 100644
--- a/libs/shared/interfaces/src/lib/title-normalization.util.spec.ts
+++ b/libs/shared/interfaces/src/lib/title-normalization.util.spec.ts
@@ -54,6 +54,158 @@ describe('normalizeTitleKeys', () => {
         expect(normalizeTitleKeys('The Boys s05').exact).toBe('the boys');
         expect(normalizeTitleKeys('Пацаны сезон 2').base).toBe('пацаны');
     });
+
+    it('strips number-first season suffixes ("2 season", "2 сезон")', () => {
+        expect(normalizeTitle('The Mandalorian 2 Season')).toBe(
+            'the mandalorian'
+        );
+        expect(normalizeTitle('The Mandalorian 2nd Season')).toBe(
+            'the mandalorian'
+        );
+        expect(normalizeTitle('Мандалорец 2 сезон')).toBe('мандалорец');
+        expect(normalizeTitle('Пацаны 2-й сезон')).toBe('пацаны');
+    });
+
+    it('keeps plural "seasons" endings — only singular markers are tags', () => {
+        expect(normalizeTitle('Best of 2 Seasons')).toBe('best of 2 seasons');
+    });
+});
+
+describe('provider tag stripping', () => {
+    it('strips wrapped pipe tags', () => {
+        expect(normalizeTitle('|DE| ARD')).toBe('ard');
+        expect(normalizeTitle('|MULTI| Fallout - 4K')).toBe('fallout');
+        expect(normalizeTitle('|EXYU| The Pitt')).toBe('the pitt');
+    });
+
+    it('strips long and compound leading tags', () => {
+        expect(normalizeTitle('EXYU| Fallout')).toBe('fallout');
+        expect(normalizeTitle('MULTI| Breaking Bad')).toBe('breaking bad');
+        expect(normalizeTitle('4K-DE - The Pitt (2025) (US)')).toBe(
+            'the pitt'
+        );
+        expect(normalizeTitle('AR-SUBS - Fallout (2024) (US)')).toBe(
+            'fallout'
+        );
+        expect(normalizeTitle('4K-OSN+ - The Last of Us (2023)')).toBe(
+            'the last of us'
+        );
+    });
+
+    it('never treats numeric fragments as leading tags', () => {
+        expect(normalizeTitle('1917 - Behind the Lines')).toBe(
+            '1917 behind the lines'
+        );
+    });
+
+    it('keeps bare 4-5 char words before a spaced dash (real titles)', () => {
+        expect(normalizeTitle('DUNE - Part Two')).toBe('dune part two');
+        expect(normalizeTitle('ALIEN - Covenant')).toBe('alien covenant');
+    });
+
+    it('strips underscore and double-dash suffix tags', () => {
+        expect(normalizeTitle('Fallout_eng')).toBe('fallout');
+        expect(normalizeTitle('Breaking Bad (US)_msub')).toBe('breaking bad');
+        expect(normalizeTitle('The Pitt (2025)_sub')).toBe('the pitt');
+        expect(normalizeTitle('The Last of Us--esp')).toBe('the last of us');
+    });
+
+    it('keeps underscore-as-space titles intact', () => {
+        expect(normalizeTitle('The_Last_of_Us')).toBe('the last of us');
+    });
+
+    it('keeps sole-underscore titles whose tail is not a known tag', () => {
+        expect(normalizeTitle('Mr_Robot')).toBe('mr robot');
+        expect(normalizeTitle('Cowboy_Bebop')).toBe('cowboy bebop');
+        expect(normalizeTitle('Mrs_Davis')).toBe('mrs davis');
+    });
+
+    it('strips joined dash tags only for case-uniform vocabulary tokens', () => {
+        expect(normalizeTitle('Breaking Bad-eng')).toBe('breaking bad');
+        expect(normalizeTitle('The Last of Us-DE')).toBe('the last of us');
+        expect(normalizeTitle('The Pitt (2025)-it')).toBe('the pitt');
+        expect(normalizeTitle('Spider-Man')).toBe('spider man');
+        expect(normalizeTitle('Kick-It')).toBe('kick it');
+    });
+
+    it('keeps English hyphenated word endings that collide with codes', () => {
+        expect(normalizeTitle('drive-in')).toBe('drive in');
+        expect(normalizeTitle('Plug-in')).toBe('plug in');
+    });
+
+    it('strips bare trailing UPPERCASE vocabulary tags', () => {
+        expect(normalizeTitle('The Pitt (2025) DE')).toBe('the pitt');
+        expect(normalizeTitle('Breaking Bad ES')).toBe('breaking bad');
+        expect(normalizeTitle('EN| Breaking Bad SUB')).toBe('breaking bad');
+        expect(normalizeTitle('The Last of Us (2023) AF')).toBe(
+            'the last of us'
+        );
+    });
+
+    it('never strips trailing tags that could be real endings', () => {
+        expect(normalizeTitle('Rocky II')).toBe('rocky ii');
+        expect(normalizeTitle('Made in USA')).toBe('made in usa');
+        expect(normalizeTitle('NCIS: LA')).toBe('ncis la');
+        expect(normalizeTitle('Making It')).toBe('making it');
+        expect(normalizeTitle('THE LAST OF US')).toBe('the last of us');
+    });
+
+    const pittCorpus = [
+        'The Pitt (2025)_sub', 'The Pitt (2025)-it', 'The Pitt (2025)',
+        'The Pitt (Hindi)', 'The Pitt (2025) 4K', 'The Pitt (2025) DE',
+        'The Pitt (2025) ES', 'The Pitt (2025) FR', 'The Pitt (2025)_eng',
+        'The Pitt [MULTI-SUB]', 'The Pitt (2025) (4K DV)', 'GR - The Pitt',
+        '4K-DE - The Pitt (2025) (US)', '4K-TR - The Pitt (2025) (US)',
+        'AR-SUBS - The Pitt (2025) (US)', 'DE - The Pitt (2025) (US)',
+        'ALB| The Pitt', 'EXYU| The Pitt', '|ALB| The Pitt', '|DE| The Pitt',
+    ];
+
+    const falloutCorpus = [
+        'Fallout', 'DE - Fallout (2024)', 'Fallout (2024) - 4K',
+        'Fallout (2024) FR-EN', 'Fallout (2024) Multi', 'Fallout (2024)_fr',
+        'Fallout_esp', 'Fallout (4K)', '4K-AMZ - Fallout (2024) (US)',
+        'AL - Fallout (2024)', 'AMZ - Fallout (2024) (US)',
+        'AR-DE - Fallout (US)', 'LA - Fallout', 'EN| Fallout - 4K',
+        'MULTI| Fallout - 4K', 'Fallout ( مدبلج )', 'Fallout (Telugu)',
+        '|EN| Fallout - 4K', '|MULTI| Fallout', '|TR| Fallout',
+    ];
+
+    const lastOfUsCorpus = [
+        'The Last of Us', 'The Last Of Us', 'The Last of Us (2023) 4K',
+        'The Last of Us (2023) AF', 'The Last of Us_tr',
+        'The Last of Us--esp', 'The Last of Us-DE', 'The Last of Us-esp',
+        'The Last of Us [L]', 'The Last of Us ( HD )',
+        '4K-OSN+ - The Last of Us (2023)', 'IS - The Last of Us (2023) (US)',
+        'RU - The Last of Us', 'ALB| The Last of Us',
+    ];
+
+    const breakingBadCorpus = [
+        'Breaking Bad', 'Breaking Bad (2008)_fr', 'Breaking Bad (US)_msub',
+        'Breaking Bad_it', 'Breaking Bad-DE', 'Breaking Bad-eng',
+        'Breaking Bad ( عائلي )', 'Breaking Bad (Pure)',
+        'Breaking Bad - Multi', 'Breaking Bad ES', 'AR-DE - Breaking Bad',
+        'EN| Breaking Bad SUB', 'MULTI| Breaking Bad', 'AR| Breaking Bad',
+    ];
+
+    it.each([
+        ['the pitt', pittCorpus],
+        ['fallout', falloutCorpus],
+        ['the last of us', lastOfUsCorpus],
+        ['breaking bad', breakingBadCorpus],
+    ])(
+        'normalizes every observed provider variant of "%s" to one key',
+        (expected, corpus) => {
+            for (const name of corpus) {
+                expect(normalizeTitleKeys(name).base).toBe(expected);
+            }
+        }
+    );
+
+    it('keeps localized subtitles (indistinguishable from real ones)', () => {
+        expect(normalizeTitle('Breaking Bad: A Química do Mal')).toBe(
+            'breaking bad a quimica do mal'
+        );
+    });
 });
 
 describe('titleYearsCompatible', () => {
diff --git a/libs/shared/interfaces/src/lib/title-normalization.util.ts b/libs/shared/interfaces/src/lib/title-normalization.util.ts
index 3b746683b..e2963c83b 100644
--- a/libs/shared/interfaces/src/lib/title-normalization.util.ts
+++ b/libs/shared/interfaces/src/lib/title-normalization.util.ts
@@ -4,6 +4,8 @@
  * matching). Pure functions — no Angular/Node dependencies.
  */
 
+import { SEASON_WORD_ALTERNATIVES } from './season-marker.util';
+
 const QUALITY_TAGS = new Set([
     '4k',
     'uhd',
@@ -28,11 +30,142 @@ const QUALITY_TAGS = new Set([
 ]);
 
 /**
- * Leading channel/language prefix like "EN - ", "DE| ", "FR: ".
- * UPPERCASE-only on purpose: a case-insensitive match would amputate real
- * title words ("It: Chapter Two" → "Chapter Two").
+ * Wrapped tag at the very start of a provider title: "|DE| ARD",
+ * "|MULTI| Fallout". The lookahead requires a letter in the tag so a
+ * numeric fragment can never be treated as one.
  */
-const LANGUAGE_PREFIX = /^[A-Z]{2,3}\s*[-|:]\s+/;
+const WRAPPED_TAG_PREFIX = /^\s*\|(?=[0-9+]*[A-Z])[A-Z0-9+]{2,5}\|\s*/;
+
+/**
+ * Leading channel/language prefix like "EN - ", "DE| ", "FR: ", including
+ * compound provider/quality forms ("4K-DE - ", "AR-SUBS - ", "4K-OSN+ - ")
+ * and longer pipe-tagged forms ("EXYU| ", "MULTI| ").
+ * UPPERCASE-only on purpose: a case-insensitive match would amputate real
+ * title words ("It: Chapter Two" → "Chapter Two"). Every segment must
+ * contain a letter so numeric titles ("1917 - ...") are never tags.
+ *
+ * Separator strength gates how wide a single segment may be:
+ *   - dash ("EN - "): compound OR 2–3 chars — a bare 4–5 char word before
+ *     a spaced dash is a real title ("DUNE - Part Two", "ALIEN - Covenant")
+ *   - pipe ("EXYU| "): compound OR 2–5 chars — a pipe is a strong tag signal
+ *   - colon ("EN: "): 2–3 chars — longer acronyms are franchise titles
+ *     ("NCIS: LA")
+ */
+const SEG = '(?=[0-9+]*[A-Z])[A-Z0-9+]';
+const COMPOUND_TAG = `${SEG}{2,5}(?:-${SEG}{2,6}){1,2}`;
+const LANGUAGE_PREFIX = new RegExp(
+    '^(?:' +
+        `(?:${COMPOUND_TAG}|${SEG}{2,3})\\s*-\\s+` +
+        `|(?:${COMPOUND_TAG}|${SEG}{2,5})\\s*\\|\\s+` +
+        `|${SEG}{2,3}\\s*:\\s+` +
+        ')'
+);
+
+/**
+ * Curated whitelist for TRAILING language/subtitle tags ("Fallout_eng",
+ * "Breaking Bad-DE", "The Pitt (2025) ES"). Trailing stripping must be
+ * vocabulary-gated: a pattern-only rule would amputate real endings —
+ * roman numerals ("Rocky II"), acronyms ("Made in USA"), franchise
+ * suffixes ("NCIS: LA"). US/USA/UK/LA are deliberately absent.
+ */
+const TRAILING_TAG_VOCABULARY = new Set([
+    'AF', 'AL', 'ALB', 'AR', 'BY', 'DE', 'DUB', 'EN', 'ENG', 'ES', 'ESP',
+    'EXYU', 'FR', 'FRA', 'GE', 'GR', 'HU', 'IN', 'IR', 'IS', 'IT', 'ITA',
+    'KA', 'KU', 'LAT', 'ML', 'MSUB', 'MULTI', 'NL', 'PL', 'PT', 'RO', 'RU',
+    'SC', 'SE', 'SUB', 'SUBS', 'SW', 'TA', 'TL', 'TR', 'TUR',
+]);
+
+/**
+ * Vocabulary tags that are also common English hyphenated-word endings
+ * ("drive-in", "plug-in"). Accepted only after a STRONG separator (bare
+ * spaced/uppercase form), never in the weak joined-dash/underscore forms
+ * where "X-in"/"X_in" reads as a title, not a tag.
+ */
+const WEAK_JOIN_EXCLUSIONS = new Set(['IN']);
+
+const DOUBLE_DASH_SUFFIX = /[-–]{2}[A-Za-z]{2,5}\s*$/;
+const UNDERSCORE_SUFFIX = /_([A-Za-z]{2,5})\s*$/;
+const JOINED_DASH_SUFFIX = /-([A-Za-z]{2,5})\s*$/;
+const TRAILING_TAG_SUFFIX = /\s([A-Z]{2,5})\s*$/;
+
+/** Tag tokens are case-uniform; real title words are Capitalized. */
+function isCaseUniform(token: string): boolean {
+    return token === token.toLowerCase() || token === token.toUpperCase();
+}
+
+/**
+ * A captured joined-dash/underscore token is provider metadata only when
+ * it is a known vocabulary tag, case-uniform, and not one of the English
+ * word-forming exclusions. This keeps "Mr_Robot", "Cowboy_Bebop",
+ * "drive-in", and "Plug-in" intact while stripping "_eng", "-DE", "-it".
+ */
+function isJoinedTag(token: string): boolean {
+    const upper = token.toUpperCase();
+    return (
+        TRAILING_TAG_VOCABULARY.has(upper) &&
+        !WEAK_JOIN_EXCLUSIONS.has(upper) &&
+        isCaseUniform(token)
+    );
+}
+
+/** ES2015-safe trailing-whitespace trim (the lib target predates trimEnd). */
+function trimRight(value: string): string {
+    return value.replace(/\s+$/, '');
+}
+
+/**
+ * Strip appended language/subtitle tags. Runs BEFORE lowercasing —
+ * casing is the main false-positive guard: ALL-CAPS titles carry no
+ * casing signal ("THE LAST OF US" must keep its "US"), so caps-gated
+ * rules are skipped for them, and Capitalized endings ("Making It",
+ * "Kick-It") never look like tags. Compound tags ("FR-EN") shed one
+ * token per pass, so stripping repeats to a fixpoint.
+ */
+function stripTrailingTags(value: string): string {
+    let result = value;
+    for (let pass = 0; pass < 3; pass++) {
+        const next = stripTrailingTagOnce(result);
+        if (next === result) break;
+        result = next;
+    }
+    return result;
+}
+
+function stripTrailingTagOnce(value: string): string {
+    const result = trimRight(value);
+    const hasLowercase = /\p{Ll}/u.test(result);
+
+    // "The Last of Us--esp": no real title contains a double dash.
+    if (DOUBLE_DASH_SUFFIX.test(result)) {
+        return trimRight(result.replace(DOUBLE_DASH_SUFFIX, ''));
+    }
+
+    // "Fallout_eng" — but not "The_Last_of_Us" (underscores as spaces, only
+    // strip a sole underscore) and not "Mr_Robot"/"Cowboy_Bebop" (the tail
+    // must be a known tag, so the segment is real-title evidence otherwise).
+    const underscore = result.match(UNDERSCORE_SUFFIX);
+    if (
+        underscore &&
+        result.indexOf('_') === result.lastIndexOf('_') &&
+        isJoinedTag(underscore[1])
+    ) {
+        return trimRight(result.replace(UNDERSCORE_SUFFIX, ''));
+    }
+
+    // "Breaking Bad-eng", "The Last of Us-DE" — but not "drive-in"/"Plug-in".
+    // hasLowercase gates ALL-CAPS titles out (no casing signal to trust).
+    const joined = result.match(JOINED_DASH_SUFFIX);
+    if (joined && hasLowercase && isJoinedTag(joined[1])) {
+        return trimRight(result.replace(JOINED_DASH_SUFFIX, ''));
+    }
+
+    const trailing = result.match(TRAILING_TAG_SUFFIX);
+    if (trailing && hasLowercase && TRAILING_TAG_VOCABULARY.has(trailing[1])) {
+        return trimRight(result.replace(TRAILING_TAG_SUFFIX, ''));
+    }
+
+    return result;
+}
 
 const YEAR_PATTERN = /\b(19\d{2}|20\d{2})\b/;
 
@@ -44,12 +177,22 @@ const YEAR_PATTERN = /\b(19\d{2}|20\d{2})\b/;
 const TRAILING_YEAR_PATTERN = /(?:^|\s)(19\d{2}|20\d{2})$/;
 
 /**
- * Trailing season markers on series titles: "The Boys s05", "сезон 2".
- * Uses (?:^|\s) instead of \b — JS word boundaries are ASCII-only and
- * never fire next to Cyrillic letters.
+ * Trailing season markers on series titles: "The Boys s05", "сезон 2",
+ * plus number-first forms ("2 season", "Пацаны 2 сезон", "2nd Season" —
+ * "2-й" normalizes to "2 й", hence the optional ordinal token). The
+ * ordinal list carries NFD-decomposed forms too: this pattern runs after
+ * diacritics stripping, which turns "й" into "и" ("2-й сезон" → "2 и
+ * сезон"). Uses (?:^|\s) instead of \b — JS word boundaries are
+ * ASCII-only and never fire next to Cyrillic letters.
  */
-const SEASON_SUFFIX_PATTERN =
-    /(?:^|\s)(?:s\d{1,2}|season\s*\d{1,2}|сезон\s*\d{1,2}|staffel\s*\d{1,2}|temporada\s*\d{1,2})$/i;
+const SEASON_SUFFIX_PATTERN = new RegExp(
+    '(?:^|\\s)(?:' +
+        's\\d{1,2}' +
+        `|(?:${SEASON_WORD_ALTERNATIVES})\\s*\\d{1,2}` +
+        `|\\d{1,2}\\s*(?:st|nd|rd|th|й|и|я|ой|ои)?\\s+(?:${SEASON_WORD_ALTERNATIVES})` +
+        ')$',
+    'iu'
+);
 
 /**
  * A provider title normalized on two tiers. Trailing years on provider
@@ -74,11 +217,14 @@ export function normalizeTitleKeys(
         return { exact: '', base: '', trailingYear: null };
     }
 
-    const cleaned = raw
-        // Inner classes exclude the opening delimiter too, so runaway
-        // inputs like "[[[[[..." backtrack linearly (CodeQL js/polynomial-redos)
-        .replace(/\[[^\][]*\]|\([^()]*\)|\{[^{}]*\}/g, ' ')
-        .replace(LANGUAGE_PREFIX, '')
+    const cleaned = stripTrailingTags(
+        raw
+            .replace(WRAPPED_TAG_PREFIX, '')
+            // Inner classes exclude the opening delimiter too, so runaway
+            // inputs like "[[[[[..." backtrack linearly (CodeQL js/polynomial-redos)
+            .replace(/\[[^\][]*\]|\([^()]*\)|\{[^{}]*\}/g, ' ')
+            .replace(LANGUAGE_PREFIX, '')
+    )
         .normalize('NFD')
         .replace(/[\u0300-\u036F]/g, '')
         .toLowerCase()
diff --git a/libs/shared/interfaces/src/lib/tmdb.interface.ts b/libs/shared/interfaces/src/lib/tmdb.interface.ts
index ce0e4bd9d..a00db1381 100644
--- a/libs/shared/interfaces/src/lib/tmdb.interface.ts
+++ b/libs/shared/interfaces/src/lib/tmdb.interface.ts
@@ -33,6 +33,51 @@ export const DEFAULT_TMDB_SETTINGS: TmdbSettings = {
  * Cast member attached to provider detail objects after TMDB enrichment.
  * Rendered as avatar chips in the VOD/series detail views.
  */
+/**
+ * Production status of a series, as a stable token. TMDB returns this
+ * field as an ENGLISH string regardless of the request language, so the
+ * raw value must never reach the UI — it is normalized here and rendered
+ * through translated labels.
+ */
+export type TmdbSeriesStatus =
+    | 'returning'
+    | 'planned'
+    | 'in-production'
+    | 'ended'
+    | 'canceled'
+    | 'pilot';
+
+const SERIES_STATUS_TOKENS: Record<string, TmdbSeriesStatus> = {
+    'returning series': 'returning',
+    planned: 'planned',
+    'in production': 'in-production',
+    ended: 'ended',
+    canceled: 'canceled',
+    cancelled: 'canceled',
+    pilot: 'pilot',
+};
+
+/** `null` for unknown values — an unmapped status is simply not shown */
+export function normalizeSeriesStatus(
+    status: string | null | undefined
+): TmdbSeriesStatus | null {
+    const key = status?.trim().toLowerCase();
+    return (key && SERIES_STATUS_TOKENS[key]) || null;
+}
+
+const SERIES_STATUS_LABEL_KEYS: Record<TmdbSeriesStatus, string> = {
+    returning: 'XTREAM.SERIES_STATUS_RETURNING',
+    planned: 'XTREAM.SERIES_STATUS_PLANNED',
+    'in-production': 'XTREAM.SERIES_STATUS_IN_PRODUCTION',
+    ended: 'XTREAM.SERIES_STATUS_ENDED',
+    canceled: 'XTREAM.SERIES_STATUS_CANCELED',
+    pilot: 'XTREAM.SERIES_STATUS_PILOT',
+};
+
+export function seriesStatusLabelKey(status: TmdbSeriesStatus): string {
+    return SERIES_STATUS_LABEL_KEYS[status];
+}
+
 export interface TmdbEnrichedCastMember {
     name: string;
     character?: string;
@@ -61,6 +106,13 @@ export interface TmdbRecommendation {
  * - `title:<normalized>|year:<year>` — search resolution result; a `null`
  *   `tmdbId` is a cached "no confident match" verdict (negative cache)
  */
+/** Size of the persisted TMDB cache, shown in the settings panel */
+export interface TmdbCacheStats {
+    entries: number;
+    /** Total payload size in bytes */
+    bytes: number;
+}
+
 export interface TmdbCacheEntry {
     mediaType: TmdbCacheMediaType;
     lookupKey: string;
diff --git a/libs/shared/interfaces/src/lib/vod-details-adapters.ts b/libs/shared/interfaces/src/lib/vod-details-adapters.ts
index ff1520a72..608b3b772 100644
--- a/libs/shared/interfaces/src/lib/vod-details-adapters.ts
+++ b/libs/shared/interfaces/src/lib/vod-details-adapters.ts
@@ -30,6 +30,7 @@ export function normalizeXtreamVod(item: XtreamVodDetails): NormalizedVodMeta {
         ratingKinopoisk: info?.rating_kinopoisk,
         youtubeTrailer: info?.youtube_trailer,
         tmdbCast: info?.tmdb_cast,
+        tmdbDirectors: info?.tmdb_directors,
         tmdbRecommendations: info?.tmdb_recommendations,
     };
 }
@@ -59,6 +60,7 @@ export function normalizeStalkerVod(item: StalkerVodDetails): NormalizedVodMeta
         // Stalker portals provide no trailers; TMDB enrichment can
         youtubeTrailer: info?.tmdb_trailer,
         tmdbCast: info?.tmdb_cast,
+        tmdbDirectors: info?.tmdb_directors,
         tmdbRecommendations: info?.tmdb_recommendations,
     };
 }
diff --git a/libs/shared/interfaces/src/lib/vod-details-item.interface.ts b/libs/shared/interfaces/src/lib/vod-details-item.interface.ts
index d66bfab8f..1bb8b607a 100644
--- a/libs/shared/interfaces/src/lib/vod-details-item.interface.ts
+++ b/libs/shared/interfaces/src/lib/vod-details-item.interface.ts
@@ -84,6 +84,8 @@ export interface NormalizedVodMeta {
     youtubeTrailer?: string;
     /** Cast with profile photos, populated by TMDB enrichment */
     tmdbCast?: TmdbEnrichedCastMember[];
+    /** Directors (movies) / creators (series) as clickable person chips */
+    tmdbDirectors?: TmdbEnrichedCastMember[];
     /** TMDB recommendations (drives the cross-portal "Similar" rail) */
     tmdbRecommendations?: TmdbRecommendation[];
 }
diff --git a/libs/shared/interfaces/src/lib/xtream-restore-state.util.spec.ts b/libs/shared/interfaces/src/lib/xtream-restore-state.util.spec.ts
new file mode 100644
index 000000000..45a4226c0
--- /dev/null
+++ b/libs/shared/interfaces/src/lib/xtream-restore-state.util.spec.ts
@@ -0,0 +1,98 @@
+import { normalizeXtreamPendingRestoreState } from './xtream-restore-state.util';
+
+describe('normalizeXtreamPendingRestoreState', () => {
+    const emptyState = {
+        hiddenCategories: [],
+        favorites: [],
+        recentlyViewed: [],
+        playbackPositions: [],
+    };
+
+    it.each([null, undefined, 'text', 42, []])(
+        'returns an empty state for non-object input %p',
+        (value) => {
+            expect(normalizeXtreamPendingRestoreState(value)).toEqual(
+                emptyState
+            );
+        }
+    );
+
+    it('falls back to empty arrays for missing or non-array fields', () => {
+        expect(
+            normalizeXtreamPendingRestoreState({
+                hiddenCategories: 'broken',
+                favorites: null,
+            })
+        ).toEqual(emptyState);
+    });
+
+    it('keeps hidden categories with a numeric xtream ID and drops the rest', () => {
+        const state = normalizeXtreamPendingRestoreState({
+            hiddenCategories: [
+                { categoryType: 'live', xtreamId: 101 },
+                // Entries exported by builds affected by issue #1017 carry
+                // no ID at all and must not survive normalization.
+                { categoryType: 'live' },
+                { categoryType: 'movies', xtreamId: 'not-a-number' },
+                { categoryType: 'unknown', xtreamId: 5 },
+                { categoryType: 'series', xtreamId: '301' },
+                null,
+            ],
+        });
+
+        expect(state.hiddenCategories).toEqual([
+            { categoryType: 'live', xtreamId: 101 },
+            { categoryType: 'series', xtreamId: 301 },
+        ]);
+    });
+
+    it('drops favorites and recently viewed entries without a numeric xtream ID', () => {
+        const state = normalizeXtreamPendingRestoreState({
+            favorites: [
+                {
+                    contentType: 'movie',
+                    xtreamId: 7,
+                    addedAt: '2026-07-01T00:00:00.000Z',
+                },
+                { contentType: 'movie' },
+            ],
+            recentlyViewed: [
+                {
+                    contentType: 'live',
+                    xtreamId: '9',
+                    viewedAt: '2026-07-01T00:00:00.000Z',
+                },
+                { contentType: 'live', xtreamId: Number.NaN },
+            ],
+        });
+
+        expect(state.favorites).toEqual([
+            {
+                contentType: 'movie',
+                xtreamId: 7,
+                addedAt: '2026-07-01T00:00:00.000Z',
+            },
+        ]);
+        expect(state.recentlyViewed).toEqual([
+            {
+                contentType: 'live',
+                xtreamId: 9,
+                viewedAt: '2026-07-01T00:00:00.000Z',
+            },
+        ]);
+    });
+
+    it('keeps playback position objects and drops primitives', () => {
+        const position = {
+            contentXtreamId: 12,
+            contentType: 'vod',
+            positionSeconds: 30,
+        };
+
+        const state = normalizeXtreamPendingRestoreState({
+            playbackPositions: [position, 'broken', null],
+        });
+
+        expect(state.playbackPositions).toEqual([position]);
+    });
+});
diff --git a/libs/shared/interfaces/src/lib/xtream-restore-state.util.ts b/libs/shared/interfaces/src/lib/xtream-restore-state.util.ts
index 965f84ee6..00a9a8093 100644
--- a/libs/shared/interfaces/src/lib/xtream-restore-state.util.ts
+++ b/libs/shared/interfaces/src/lib/xtream-restore-state.util.ts
@@ -1,4 +1,5 @@
 import {
+    XtreamBackupCategoryType,
     XtreamBackupFavoriteItem,
     XtreamBackupHiddenCategory,
     XtreamBackupRecentlyViewedItem,
@@ -15,3 +16,125 @@ export interface XtreamPendingRestoreState {
 export function getXtreamPendingRestoreStorageKey(playlistId: string): string {
     return `xtream-restore-${playlistId}`;
 }
+
+const XTREAM_BACKUP_CATEGORY_TYPES: readonly XtreamBackupCategoryType[] = [
+    'live',
+    'movies',
+    'series',
+];
+
+interface RestoreStateCandidate {
+    hiddenCategories?: unknown;
+    favorites?: unknown;
+    recentlyViewed?: unknown;
+    playbackPositions?: unknown;
+}
+
+interface RestoreEntryCandidate {
+    categoryType?: unknown;
+    xtreamId?: unknown;
+}
+
+function normalizeXtreamBackupId(value: unknown): number | null {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+
+    if (typeof value === 'string' && value.trim() !== '') {
+        const parsed = Number(value);
+        return Number.isFinite(parsed) ? parsed : null;
+    }
+
+    return null;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function toArray(value: unknown): unknown[] {
+    return Array.isArray(value) ? value : [];
+}
+
+// The web build compiles this lib with lib=es2018, so Array#flatMap is not
+// available here; stick to filter/map/push.
+function withNumericXtreamId<T extends { xtreamId: number }>(
+    items: unknown[]
+): T[] {
+    const result: T[] = [];
+
+    for (const item of items) {
+        if (!isRecord(item)) {
+            continue;
+        }
+
+        const xtreamId = normalizeXtreamBackupId(
+            (item as RestoreEntryCandidate).xtreamId
+        );
+
+        if (xtreamId === null) {
+            continue;
+        }
+
+        result.push({ ...item, xtreamId } as T);
+    }
+
+    return result;
+}
+
+/**
+ * Normalizes restore state coming from untrusted sources: user-supplied
+ * backup files and persisted localStorage entries. Backups exported by
+ * broken builds (issue #1017) contain hiddenCategories entries without an
+ * xtreamId; matching such entries against real category rows would compare
+ * `undefined === undefined` and hide every category of that type, so any
+ * entry without a usable numeric xtreamId is dropped instead of restored.
+ */
+export function normalizeXtreamPendingRestoreState(
+    value: unknown
+): XtreamPendingRestoreState {
+    if (!isRecord(value)) {
+        return {
+            hiddenCategories: [],
+            favorites: [],
+            recentlyViewed: [],
+            playbackPositions: [],
+        };
+    }
+
+    const candidate = value as RestoreStateCandidate;
+
+    const hiddenCategories: XtreamBackupHiddenCategory[] = [];
+
+    for (const item of toArray(candidate.hiddenCategories)) {
+        if (!isRecord(item)) {
+            continue;
+        }
+
+        const entry = item as RestoreEntryCandidate;
+        const xtreamId = normalizeXtreamBackupId(entry.xtreamId);
+        const categoryType = entry.categoryType as XtreamBackupCategoryType;
+
+        if (
+            xtreamId === null ||
+            !XTREAM_BACKUP_CATEGORY_TYPES.includes(categoryType)
+        ) {
+            continue;
+        }
+
+        hiddenCategories.push({ categoryType, xtreamId });
+    }
+
+    return {
+        hiddenCategories,
+        favorites: withNumericXtreamId<XtreamBackupFavoriteItem>(
+            toArray(candidate.favorites)
+        ),
+        recentlyViewed: withNumericXtreamId<XtreamBackupRecentlyViewedItem>(
+            toArray(candidate.recentlyViewed)
+        ),
+        playbackPositions: toArray(candidate.playbackPositions).filter(
+            (item): item is PlaybackPositionData => isRecord(item)
+        ),
+    };
+}
diff --git a/libs/shared/interfaces/src/lib/xtream-serie-details.interface.ts b/libs/shared/interfaces/src/lib/xtream-serie-details.interface.ts
index c82a7f138..681137182 100644
--- a/libs/shared/interfaces/src/lib/xtream-serie-details.interface.ts
+++ b/libs/shared/interfaces/src/lib/xtream-serie-details.interface.ts
@@ -1,6 +1,7 @@
 import {
     TmdbEnrichedCastMember,
     TmdbRecommendation,
+    TmdbSeriesStatus,
 } from './tmdb.interface';
 
 export interface XtreamSerieDetails {
@@ -26,6 +27,10 @@ export interface XtreamSerieInfo {
     category_id: string;
     /** Populated by TMDB enrichment; absent in raw provider responses */
     tmdb_cast?: TmdbEnrichedCastMember[];
+    /** Directors (movies) / creators (series) as clickable person chips */
+    tmdb_directors?: TmdbEnrichedCastMember[];
+    /** Series production status (token, never a raw TMDB string) */
+    tmdb_status?: TmdbSeriesStatus;
     /** Populated by TMDB enrichment; matched against the catalog in views */
     tmdb_recommendations?: TmdbRecommendation[];
     /** Matched TMDB show id — enables lazy season/episode enrichment */
diff --git a/libs/shared/interfaces/src/lib/xtream-vod-details.interface.ts b/libs/shared/interfaces/src/lib/xtream-vod-details.interface.ts
index d9b47f51f..10fbf2e1f 100644
--- a/libs/shared/interfaces/src/lib/xtream-vod-details.interface.ts
+++ b/libs/shared/interfaces/src/lib/xtream-vod-details.interface.ts
@@ -36,6 +36,8 @@ export interface XtreamVodInfo {
     rating_imdb?: string;
     /** Populated by TMDB enrichment; absent in raw provider responses */
     tmdb_cast?: TmdbEnrichedCastMember[];
+    /** Directors (movies) / creators (series) as clickable person chips */
+    tmdb_directors?: TmdbEnrichedCastMember[];
     /** Populated by TMDB enrichment; matched against the catalog in views */
     tmdb_recommendations?: TmdbRecommendation[];
 }
diff --git a/libs/shared/logging/jest.config.ts b/libs/shared/logging/jest.config.ts
new file mode 100644
index 000000000..c2ec796ae
--- /dev/null
+++ b/libs/shared/logging/jest.config.ts
@@ -0,0 +1,13 @@
+export default {
+    displayName: 'shared-logging',
+    preset: '../../../jest.preset.js',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.[tj]s$': [
+            'ts-jest',
+            { tsconfig: '<rootDir>/tsconfig.spec.json' },
+        ],
+    },
+    moduleFileExtensions: ['ts', 'js'],
+    coverageDirectory: '../../../coverage/libs/shared/logging',
+};
diff --git a/libs/shared/logging/project.json b/libs/shared/logging/project.json
new file mode 100644
index 000000000..031ec83b4
--- /dev/null
+++ b/libs/shared/logging/project.json
@@ -0,0 +1,20 @@
+{
+    "name": "shared-logging",
+    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+    "sourceRoot": "libs/shared/logging/src",
+    "projectType": "library",
+    "tags": ["scope:shared", "domain:shared-runtime", "type:util"],
+    "targets": {
+        "test": {
+            "executor": "@nx/jest:jest",
+            "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+            "options": {
+                "jestConfig": "libs/shared/logging/jest.config.ts",
+                "tsConfig": "libs/shared/logging/tsconfig.spec.json"
+            }
+        },
+        "lint": {
+            "executor": "@nx/eslint:lint"
+        }
+    }
+}
diff --git a/libs/shared/logging/src/index.ts b/libs/shared/logging/src/index.ts
new file mode 100644
index 000000000..99feec49b
--- /dev/null
+++ b/libs/shared/logging/src/index.ts
@@ -0,0 +1,18 @@
+export {
+    REDACTED_VALUE,
+    redactSensitiveData,
+} from './lib/redact-sensitive-data';
+export type { RedactionOptions } from './lib/redact-sensitive-data';
+export {
+    measureRendererPerformancePhase,
+    RENDERER_PERFORMANCE_PHASE,
+    RENDERER_PERFORMANCE_PHASE_HOOK_KEY,
+} from './lib/renderer-performance-phase';
+export type {
+    RendererPerformancePhase,
+    RendererPerformancePhaseBoundary,
+    RendererPerformancePhaseEvent,
+    RendererPerformancePhaseHook,
+    RendererPerformancePhaseMetadata,
+    RendererPerformancePhaseOutcome,
+} from './lib/renderer-performance-phase';
diff --git a/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts b/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts
new file mode 100644
index 000000000..75d6efcb6
--- /dev/null
+++ b/libs/shared/logging/src/lib/redact-sensitive-data.spec.ts
@@ -0,0 +1,357 @@
+import { REDACTED_VALUE, redactSensitiveData } from './redact-sensitive-data';
+
+const TEST_SECRETS = [
+    'settings-api-key-secret',
+    'nested-user-secret',
+    'nested-password-secret',
+    'nested-token-secret',
+    'nested-auth-secret',
+    'nested-mac-secret',
+    'query-password-secret',
+    'query-token-secret',
+];
+
+function serialized(value: unknown): string {
+    return JSON.stringify(value);
+}
+
+describe('redactSensitiveData', () => {
+    it('recursively redacts credentials while retaining diagnostic fields', () => {
+        const input = {
+            operation: 'get_profile',
+            settings: { tmdb: { apiKey: TEST_SECRETS[0] } },
+            params: {
+                username: TEST_SECRETS[1],
+                PASSWORD: TEST_SECRETS[2],
+                access_token: TEST_SECRETS[3],
+                headers: { Authorization: `Bearer ${TEST_SECRETS[4]}` },
+                macAddress: TEST_SECRETS[5],
+            },
+        };
+
+        const result = redactSensitiveData(input);
+        const output = serialized(result);
+
+        for (const secret of TEST_SECRETS) {
+            expect(output).not.toContain(secret);
+        }
+        expect(result).toEqual({
+            operation: 'get_profile',
+            settings: { tmdb: { apiKey: REDACTED_VALUE } },
+            params: {
+                username: REDACTED_VALUE,
+                PASSWORD: REDACTED_VALUE,
+                access_token: REDACTED_VALUE,
+                headers: { Authorization: REDACTED_VALUE },
+                macAddress: REDACTED_VALUE,
+            },
+        });
+    });
+
+    it('redacts Stalker identity credentials while retaining request diagnostics', () => {
+        const identitySecrets = {
+            sn: 'stalker-sn-secret',
+            serialNumber: 'stalker-serial-number-secret',
+            device_id: 'stalker-device-id-secret',
+            deviceId1: 'stalker-device-id1-secret',
+            device_id2: 'stalker-device-id2-secret',
+            signature: 'stalker-signature-secret',
+            signature1: 'stalker-signature1-secret',
+            signature2: 'stalker-signature2-secret',
+            stalkerSerialNumber: 'playlist-stalker-serial-number-secret',
+            stalkerDeviceId1: 'playlist-stalker-device-id1-secret',
+            stalkerDeviceId2: 'playlist-stalker-device-id2-secret',
+            stalkerSignature1: 'playlist-stalker-signature1-secret',
+            stalkerSignature2: 'playlist-stalker-signature2-secret',
+            prehash: 'stalker-prehash-secret',
+        };
+
+        const result = redactSensitiveData({
+            action: 'get_profile',
+            requestId: 'stalker-request-id',
+            params: identitySecrets,
+        });
+        const output = serialized(result);
+
+        for (const secret of Object.values(identitySecrets)) {
+            expect(output).not.toContain(secret);
+        }
+        expect(output).toContain('get_profile');
+        expect(output).toContain('stalker-request-id');
+    });
+
+    it('redacts credentials embedded in URL, URLSearchParams, errors, and serialized strings', () => {
+        const url = new URL(
+            `https://user:pass@example.com/live?password=${TEST_SECRETS[6]}&token=${TEST_SECRETS[7]}&action=get_live_streams`
+        );
+        const params = new URLSearchParams({
+            authorization: TEST_SECRETS[4],
+            category: 'news',
+        });
+        const error = new Error(
+            `Request failed: https://example.com/api?token=${TEST_SECRETS[3]}&action=profile`
+        );
+        const json = JSON.stringify({
+            refreshToken: TEST_SECRETS[3],
+            status: 401,
+        });
+
+        const output = serialized(
+            redactSensitiveData({ url, params, error, json })
+        );
+
+        for (const secret of TEST_SECRETS) {
+            expect(output).not.toContain(secret);
+        }
+        expect(output).toContain('action=get_live_streams');
+        expect(output).toContain('category=news');
+        expect(output).toContain('status');
+        expect(output).toContain('401');
+    });
+
+    it('redacts credentials in non-HTTP stream URL strings', () => {
+        const username = 'rtsp-user-secret';
+        const password = 'rtsp-password-secret';
+        const token = 'rtmp-token-secret';
+
+        const output = serialized(
+            redactSensitiveData([
+                `rtsp://${username}:${password}@stream.example/live?token=${token}&channel=news`,
+                `Playback failed: rtmp://stream.example/live?password=${password}&channel=sports`,
+            ])
+        );
+
+        expect(output).not.toContain(username);
+        expect(output).not.toContain(password);
+        expect(output).not.toContain(token);
+        expect(output).toContain('channel=news');
+        expect(output).toContain('channel=sports');
+    });
+
+    it('redacts a credential from a single-parameter string', () => {
+        const password = 'single-param-password-secret';
+        const token = 'single-param-token-secret';
+
+        const output = serialized(
+            redactSensitiveData([
+                `password=${password}`,
+                `token=${token}`,
+                'operation=get_profile',
+            ])
+        );
+
+        expect(output).not.toContain(password);
+        expect(output).not.toContain(token);
+        expect(output).toContain('get_profile');
+    });
+
+    it('redacts credentials embedded in diagnostic text', () => {
+        const token = 'diagnostic-token-secret';
+        const authorization = 'diagnostic-authorization-secret';
+        const authorizationAssignment =
+            'diagnostic-authorization-assignment-secret';
+        const stalkerDeviceId = 'diagnostic-stalker-device-id-secret';
+        const diagnostic = [
+            `Request failed: token=${token}&action=get_profile`,
+            `Upstream response Authorization: Bearer ${authorization}; status=401`,
+            `Retrying with authorization=Bearer ${authorizationAssignment}, attempt=2`,
+            `Identity rejected: stalkerDeviceId1: ${stalkerDeviceId}; action=handshake`,
+        ];
+
+        const output = serialized(redactSensitiveData(diagnostic));
+
+        expect(output).not.toContain(token);
+        expect(output).not.toContain(authorization);
+        expect(output).not.toContain(authorizationAssignment);
+        expect(output).not.toContain(stalkerDeviceId);
+        expect(output).toContain('get_profile');
+        expect(output).toContain('status=401');
+        expect(output).toContain('attempt=2');
+        expect(output).toContain('action=handshake');
+    });
+
+    it('does not repeat a redacted Error message secret in its stack', () => {
+        const secret = 'error-stack-password-secret';
+        const error = new Error(`password=${secret}&operation=get_profile`);
+
+        const output = serialized(redactSensitiveData(error));
+
+        expect(output).not.toContain(secret);
+        expect(output).toContain(encodeURIComponent(REDACTED_VALUE));
+        expect(output).toContain('get_profile');
+    });
+
+    it('redacts credentials nested inside non-sensitive query values', () => {
+        const nestedUrl = `https://identity.example/callback?token=${TEST_SECRETS[3]}&step=authorize`;
+        const url = new URL('https://example.com/portal');
+        url.searchParams.set('redirect', nestedUrl);
+        url.searchParams.set(
+            'payload',
+            JSON.stringify({ password: TEST_SECRETS[2], action: 'profile' })
+        );
+
+        const output = serialized(redactSensitiveData(url));
+
+        expect(output).not.toContain(TEST_SECRETS[2]);
+        expect(output).not.toContain(TEST_SECRETS[3]);
+        expect(output).toContain('authorize');
+        expect(output).toContain('profile');
+    });
+
+    it('redacts credentials from URL fragments while retaining diagnostics', () => {
+        const token = 'fragment-token-secret';
+        const url = new URL(
+            `https://example.com/callback#access_token=${token}&state=diagnostic`
+        );
+
+        const output = serialized(redactSensitiveData(url));
+
+        expect(output).not.toContain(token);
+        expect(output).toContain('state=diagnostic');
+    });
+
+    it('redacts credentials from Map keys while retaining values', () => {
+        const username = 'map-key-user-secret';
+        const password = 'map-key-password-secret';
+        const token = 'map-key-token-secret';
+        const requests = new Map([
+            [
+                `https://example.com/live/${username}/${password}/101.ts?token=${token}`,
+                { status: 200 },
+            ],
+        ]);
+
+        const output = serialized(redactSensitiveData(requests));
+
+        expect(output).not.toContain(username);
+        expect(output).not.toContain(password);
+        expect(output).not.toContain(token);
+        expect(output).toContain('101.ts');
+        expect(output).toContain('"status":200');
+    });
+
+    it('redacts Map values selected by sensitive keys', () => {
+        const authorization = 'map-authorization-secret';
+        const password = 'map-password-secret';
+        const headers = new Map([
+            ['Authorization', `Bearer ${authorization}`],
+            ['password', password],
+            ['requestId', 'diagnostic-request-id'],
+        ]);
+
+        const result = redactSensitiveData(headers);
+        const output = serialized(result);
+
+        expect(output).not.toContain(authorization);
+        expect(output).not.toContain(password);
+        expect(output).toContain('diagnostic-request-id');
+        expect(result).toEqual({
+            Authorization: REDACTED_VALUE,
+            password: REDACTED_VALUE,
+            requestId: 'diagnostic-request-id',
+        });
+    });
+
+    it('redacts Xtream credentials in playback URL paths', () => {
+        const username = 'xtream-path-user-secret';
+        const password = 'xtream-path-password-secret';
+        const urls = [
+            new URL(
+                `https://example.com/base/live/${username}/${password}/101.ts`
+            ),
+            new URL(
+                `https://example.com/movie/${username}/${password}/202.mkv`
+            ),
+            new URL(
+                `https://example.com/series/${username}/${password}/303.mp4`
+            ),
+            new URL(
+                `https://example.com/timeshift/${username}/${password}/60/2026-07-18:12-00/404.ts`
+            ),
+        ];
+        const embedded = `Playback failed for https://example.com/live/${username}/${password}/505.m3u8`;
+        const ordinaryLiveUrl = 'https://example.com/live/channel.m3u8';
+
+        const output = serialized(
+            redactSensitiveData({ urls, embedded, ordinaryLiveUrl })
+        );
+
+        expect(output).not.toContain(username);
+        expect(output).not.toContain(password);
+        expect(output).toContain('101.ts');
+        expect(output).toContain('202.mkv');
+        expect(output).toContain('303.mp4');
+        expect(output).toContain('404.ts');
+        expect(output).toContain('505.m3u8');
+        expect(output).toContain(ordinaryLiveUrl);
+    });
+
+    it('redacts Xtream path credentials when no resource segment follows', () => {
+        const username = 'terminal-xtream-user-secret';
+        const password = 'terminal-xtream-password-secret';
+
+        const output = serialized(
+            redactSensitiveData(
+                new URL(`https://example.com/live/${username}/${password}`)
+            )
+        );
+
+        expect(output).not.toContain(username);
+        expect(output).not.toContain(password);
+    });
+
+    it('does not mutate input and safely bounds cycles, depth, arrays, objects, and strings', () => {
+        const input: Record<string, unknown> = {
+            status: 'ok',
+            password: TEST_SECRETS[2],
+            items: [1, 2, 3, 4],
+            long: 'abcdefghij',
+            nested: { level: { value: 'too deep' } },
+            extraA: 'a',
+            extraB: 'b',
+        };
+        input['self'] = input;
+        const originalItems = input['items'];
+
+        const result = redactSensitiveData(input, {
+            maxArrayItems: 2,
+            maxDepth: 2,
+            maxObjectKeys: 6,
+            maxStringLength: 8,
+        });
+
+        expect(input['password']).toBe(TEST_SECRETS[2]);
+        expect(input['items']).toBe(originalItems);
+        expect(result).not.toBe(input);
+        expect(() => serialized(result)).not.toThrow();
+        expect(serialized(result)).not.toContain(TEST_SECRETS[2]);
+        expect(serialized(result)).toContain('[Truncated');
+    });
+
+    it('serializes invalid dates without throwing', () => {
+        const invalidDate = new Date(Number.NaN);
+
+        expect(() => redactSensitiveData(invalidDate)).not.toThrow();
+        expect(redactSensitiveData([invalidDate])).toEqual(['[Invalid Date]']);
+    });
+
+    it('preserves repeated non-circular references while still redacting them', () => {
+        const shared = {
+            operation: 'get_profile',
+            password: TEST_SECRETS[2],
+        };
+
+        const result = redactSensitiveData({ first: shared, second: shared });
+
+        expect(result).toEqual({
+            first: {
+                operation: 'get_profile',
+                password: REDACTED_VALUE,
+            },
+            second: {
+                operation: 'get_profile',
+                password: REDACTED_VALUE,
+            },
+        });
+    });
+});
diff --git a/libs/shared/logging/src/lib/redact-sensitive-data.ts b/libs/shared/logging/src/lib/redact-sensitive-data.ts
new file mode 100644
index 000000000..cc42a4db2
--- /dev/null
+++ b/libs/shared/logging/src/lib/redact-sensitive-data.ts
@@ -0,0 +1,395 @@
+export const REDACTED_VALUE = '[Redacted]';
+
+const CIRCULAR_VALUE = '[Circular]';
+const MAX_DEPTH_VALUE = '[MaxDepth]';
+const DEFAULT_MAX_DEPTH = 6;
+const DEFAULT_MAX_ARRAY_ITEMS = 50;
+const DEFAULT_MAX_OBJECT_KEYS = 50;
+const DEFAULT_MAX_STRING_LENGTH = 2_000;
+
+const SENSITIVE_KEY_NAMES = new Set([
+    'apikey',
+    'auth',
+    'authorization',
+    'cookie',
+    'credentials',
+    'deviceid',
+    'deviceid2',
+    'login',
+    'mac',
+    'macaddress',
+    'mpvplayerarguments',
+    'passwd',
+    'password',
+    'pwd',
+    'secret',
+    'setcookie',
+    'signature',
+    'signature2',
+    'sn',
+    'token',
+    'username',
+    'vlcplayerarguments',
+]);
+
+const SENSITIVE_KEY_SUFFIXES = [
+    'apikey', 'authorization', 'cookie',
+    'deviceid', 'deviceid1', 'deviceid2',
+    'macaddress', 'passwd', 'password', 'prehash',
+    'serialnumber', 'signature', 'signature1', 'signature2',
+    'secret', 'token', 'username',
+];
+
+const XTREAM_CREDENTIAL_PATH_SEGMENTS = new Set([
+    'live',
+    'movie',
+    'series',
+    'timeshift',
+]);
+
+export interface RedactionOptions {
+    maxDepth?: number;
+    maxArrayItems?: number;
+    maxObjectKeys?: number;
+    maxStringLength?: number;
+}
+
+interface ResolvedRedactionOptions {
+    maxDepth: number;
+    maxArrayItems: number;
+    maxObjectKeys: number;
+    maxStringLength: number;
+}
+
+function normalizeKey(key: string): string {
+    return key.toLowerCase().replace(/[^a-z0-9]/g, '');
+}
+
+function isSensitiveKey(key: string): boolean {
+    const normalized = normalizeKey(key);
+    return (
+        SENSITIVE_KEY_NAMES.has(normalized) ||
+        SENSITIVE_KEY_SUFFIXES.some((suffix) => normalized.endsWith(suffix))
+    );
+}
+
+function resolveOptions(options: RedactionOptions): ResolvedRedactionOptions {
+    return {
+        maxDepth: Math.max(0, options.maxDepth ?? DEFAULT_MAX_DEPTH),
+        maxArrayItems: Math.max(
+            0,
+            options.maxArrayItems ?? DEFAULT_MAX_ARRAY_ITEMS
+        ),
+        maxObjectKeys: Math.max(
+            0,
+            options.maxObjectKeys ?? DEFAULT_MAX_OBJECT_KEYS
+        ),
+        maxStringLength: Math.max(
+            0,
+            options.maxStringLength ?? DEFAULT_MAX_STRING_LENGTH
+        ),
+    };
+}
+
+function truncateString(value: string, maxLength: number): string {
+    if (value.length <= maxLength) {
+        return value;
+    }
+
+    const omitted = value.length - maxLength;
+    return `${value.slice(0, maxLength)}[Truncated ${omitted} chars]`;
+}
+
+function redactSearchParams(
+    params: URLSearchParams,
+    sanitizeValue: (value: string) => string
+): URLSearchParams {
+    const redacted = new URLSearchParams();
+
+    params.forEach((value, key) => {
+        redacted.append(
+            key,
+            isSensitiveKey(key) ? REDACTED_VALUE : sanitizeValue(value)
+        );
+    });
+
+    return redacted;
+}
+
+function redactUrl(
+    value: URL,
+    sanitizeValue: (value: string) => string
+): string {
+    const redacted = new URL(value.toString());
+
+    if (redacted.username) {
+        redacted.username = REDACTED_VALUE;
+    }
+    if (redacted.password) {
+        redacted.password = REDACTED_VALUE;
+    }
+
+    const pathSegments = redacted.pathname.split('/');
+    for (let index = 0; index < pathSegments.length - 2; index += 1) {
+        if (XTREAM_CREDENTIAL_PATH_SEGMENTS.has(pathSegments[index])) {
+            pathSegments[index + 1] = REDACTED_VALUE;
+            pathSegments[index + 2] = REDACTED_VALUE;
+        }
+    }
+    redacted.pathname = pathSegments.join('/');
+
+    const search = redactSearchParams(
+        redacted.searchParams,
+        sanitizeValue
+    ).toString();
+    redacted.search = search ? `?${search}` : '';
+
+    const fragment = redacted.hash.slice(1);
+    if (looksLikeSearchParams(fragment)) {
+        const hash = redactSearchParams(
+            new URLSearchParams(fragment),
+            sanitizeValue
+        ).toString();
+        redacted.hash = hash ? `#${hash}` : '';
+    }
+
+    return redacted.toString();
+}
+
+function redactUrlStrings(
+    value: string,
+    sanitizeValue: (value: string) => string
+): string {
+    return value.replace(
+        /[a-z][a-z0-9+.-]*:\/\/[^\s"'<>]+/giu,
+        (candidate) => {
+            try {
+                return redactUrl(new URL(candidate), sanitizeValue);
+            } catch {
+                return candidate;
+            }
+        }
+    );
+}
+
+function redactEmbeddedSensitivePairs(value: string): string {
+    const redactedAssignments = value.replace(
+        /\b([a-z][a-z0-9_.-]*)(\s*=\s*)((?:Bearer\s+)?[^&\s,;]+)/giu,
+        (match, key: string, separator: string) =>
+            isSensitiveKey(key)
+                ? `${key}${separator}${REDACTED_VALUE}`
+                : match
+    );
+    return redactedAssignments.replace(
+        /\b([a-z0-9_.-]*(?:api[-_.]?key|auth(?:orization)?|cookie|credentials|device[-_.]?id[12]?|login|mac(?:[-_.]?address)?|passwd|password|prehash|pwd|secret|serial[-_.]?number|set[-_.]?cookie|signature[12]?|sn|token|username))(\s*:\s*)(?:Bearer\s+)?[^;,\r\n]+/giu,
+        (_match, key: string, separator: string) =>
+            `${key}${separator}${REDACTED_VALUE}`
+    );
+}
+
+function looksLikeSearchParams(value: string): boolean {
+    return /^[^=&\s]+=[^&]*(?:&[^=&\s]+=[^&]*)*$/u.test(value);
+}
+
+export function redactSensitiveData(
+    value: unknown,
+    options: RedactionOptions = {}
+): unknown {
+    const resolved = resolveOptions(options);
+    const seen = new WeakSet<object>();
+    const visitString = (input: string, depth: number): string => {
+        const trimmed = input.trim();
+        if (depth >= resolved.maxDepth) {
+            return MAX_DEPTH_VALUE;
+        }
+        if (
+            (trimmed.startsWith('{') && trimmed.endsWith('}')) ||
+            (trimmed.startsWith('[') && trimmed.endsWith(']'))
+        ) {
+            try {
+                return truncateString(
+                    JSON.stringify(visit(JSON.parse(trimmed), depth + 1)),
+                    resolved.maxStringLength
+                );
+            } catch {
+                // Keep processing malformed or non-JSON diagnostic strings.
+            }
+        }
+        if (/^[a-z][a-z0-9+.-]*:\/\//iu.test(trimmed)) {
+            try {
+                return truncateString(
+                    redactUrl(new URL(trimmed), (entry) =>
+                        visitString(entry, depth + 1)
+                    ),
+                    resolved.maxStringLength
+                );
+            } catch {
+                // Continue with embedded URL handling for malformed URLs.
+            }
+        }
+
+        if (looksLikeSearchParams(trimmed)) {
+            return truncateString(
+                redactSearchParams(new URLSearchParams(trimmed), (entry) =>
+                    visitString(entry, depth + 1)
+                ).toString(),
+                resolved.maxStringLength
+            );
+        }
+
+        const redactedText = redactEmbeddedSensitivePairs(input);
+        return truncateString(
+            redactUrlStrings(redactedText, (entry) =>
+                visitString(entry, depth + 1)
+            ),
+            resolved.maxStringLength
+        );
+    };
+
+    const visitObject = (
+        input: Record<string, unknown>,
+        depth: number
+    ): Record<string, unknown> => {
+        const output: Record<string, unknown> = {};
+        const keys = Object.keys(input);
+
+        for (const key of keys.slice(0, resolved.maxObjectKeys)) {
+            if (isSensitiveKey(key)) {
+                output[key] = REDACTED_VALUE;
+                continue;
+            }
+
+            try {
+                output[key] = visit(input[key], depth + 1);
+            } catch {
+                output[key] = '[Unserializable]';
+            }
+        }
+
+        if (keys.length > resolved.maxObjectKeys) {
+            output['__truncatedKeys'] = keys.length - resolved.maxObjectKeys;
+        }
+
+        return output;
+    };
+
+    const visitError = (
+        error: Error,
+        depth: number
+    ): Record<string, unknown> => {
+        const output = visitObject(
+            error as Error & Record<string, unknown>,
+            depth
+        );
+        output['name'] = visitString(error.name, depth + 1);
+        output['message'] = visitString(error.message, depth + 1);
+        if (error.stack) {
+            const [, ...stackFrames] = error.stack.split('\n');
+            output['stack'] = visitString(
+                [`${output['name']}: ${output['message']}`, ...stackFrames].join(
+                    '\n'
+                ),
+                depth + 1
+            );
+        }
+        if ('cause' in error) {
+            output['cause'] = visit(error.cause, depth + 1);
+        }
+        return output;
+    };
+
+    const visit = (input: unknown, depth: number): unknown => {
+        if (
+            input == null ||
+            typeof input === 'boolean' ||
+            typeof input === 'number'
+        ) {
+            return input;
+        }
+        if (typeof input === 'string') {
+            return visitString(input, depth);
+        }
+        if (typeof input === 'bigint') {
+            return input.toString();
+        }
+        if (typeof input === 'symbol') {
+            return input.toString();
+        }
+        if (typeof input === 'function') {
+            return undefined;
+        }
+        if (depth >= resolved.maxDepth) {
+            return MAX_DEPTH_VALUE;
+        }
+
+        const object = input as object;
+        if (seen.has(object)) {
+            return CIRCULAR_VALUE;
+        }
+        seen.add(object);
+
+        try {
+            if (input instanceof URL) {
+                return redactUrl(input, (entry) =>
+                    visitString(entry, depth + 1)
+                );
+            }
+            if (input instanceof URLSearchParams) {
+                return redactSearchParams(input, (entry) =>
+                    visitString(entry, depth + 1)
+                ).toString();
+            }
+            if (input instanceof Error) {
+                return visitError(input, depth);
+            }
+            if (input instanceof Date) {
+                return Number.isNaN(input.getTime())
+                    ? '[Invalid Date]'
+                    : input.toISOString();
+            }
+            if (Array.isArray(input)) {
+                const output = input
+                    .slice(0, resolved.maxArrayItems)
+                    .map((entry) => visit(entry, depth + 1));
+                if (input.length > resolved.maxArrayItems) {
+                    output.push(
+                        `[Truncated ${
+                            input.length - resolved.maxArrayItems
+                        } items]`
+                    );
+                }
+                return output;
+            }
+            if (input instanceof Map) {
+                const entries: Record<string, unknown> = {};
+                const mapEntries = Array.from(input).slice(
+                    0,
+                    resolved.maxObjectKeys
+                );
+                for (const [key, entry] of mapEntries) {
+                    const stringKey = String(key);
+                    const redactedKey = visitString(stringKey, depth + 1);
+                    entries[redactedKey] =
+                        isSensitiveKey(stringKey) &&
+                        !/[/:?=&]/u.test(stringKey)
+                            ? REDACTED_VALUE
+                            : visit(entry, depth + 1);
+                }
+                if (input.size > resolved.maxObjectKeys) {
+                    entries['__truncatedKeys'] =
+                        input.size - resolved.maxObjectKeys;
+                }
+                return entries;
+            }
+            if (input instanceof Set) {
+                return visit(Array.from(input), depth);
+            }
+
+            return visitObject(input as Record<string, unknown>, depth);
+        } finally {
+            seen.delete(object);
+        }
+    };
+
+    return visit(value, 0);
+}
diff --git a/libs/shared/logging/src/lib/renderer-performance-phase.spec.ts b/libs/shared/logging/src/lib/renderer-performance-phase.spec.ts
new file mode 100644
index 000000000..ded5179e4
--- /dev/null
+++ b/libs/shared/logging/src/lib/renderer-performance-phase.spec.ts
@@ -0,0 +1,199 @@
+import * as sharedLogging from '../index';
+
+type RendererPerformancePhase =
+    'store.m3u-import-dispatch' | 'store.m3u-publish-channels';
+type RendererPerformancePhaseOutcome = 'error' | 'success';
+
+interface RendererPerformancePhaseEvent {
+    readonly boundary: 'end' | 'start';
+    readonly epochMs: number;
+    readonly metadata?: Readonly<{ items: number }>;
+    readonly monotonicMs: number;
+    readonly outcome?: RendererPerformancePhaseOutcome;
+    readonly phase: RendererPerformancePhase;
+    readonly phaseId: string;
+    readonly schemaVersion: 1;
+}
+
+type RendererPerformancePhaseHook = (
+    event: RendererPerformancePhaseEvent
+) => void;
+
+interface RendererPerformancePhaseModule {
+    readonly measureRendererPerformancePhase?: <T>(
+        phase: RendererPerformancePhase,
+        execute: () => T,
+        metadata?: () => Readonly<{ items: number }>
+    ) => T;
+    readonly RENDERER_PERFORMANCE_PHASE?: Readonly<{
+        M3U_IMPORT_DISPATCH: 'store.m3u-import-dispatch';
+        M3U_PUBLISH_CHANNELS: 'store.m3u-publish-channels';
+    }>;
+    readonly RENDERER_PERFORMANCE_PHASE_HOOK_KEY?: string;
+}
+
+const rendererPerformance = sharedLogging as RendererPerformancePhaseModule;
+const EXPECTED_HOOK_KEY = 'iptvnator.renderer.performance-phase-hook.v1';
+const hookSymbol = Symbol.for(EXPECTED_HOOK_KEY);
+
+function measure<T>(
+    phase: RendererPerformancePhase,
+    execute: () => T,
+    metadata?: () => Readonly<{ items: number }>
+): T {
+    const measurePhase = rendererPerformance.measureRendererPerformancePhase;
+    expect(typeof measurePhase).toBe('function');
+    if (measurePhase === undefined) {
+        throw new Error('renderer performance phase helper is unavailable');
+    }
+    return measurePhase(phase, execute, metadata);
+}
+
+function setHook(hook: RendererPerformancePhaseHook | null): void {
+    const target = globalThis as unknown as Record<symbol, unknown>;
+    if (hook === null) {
+        delete target[hookSymbol];
+        return;
+    }
+    target[hookSymbol] = hook;
+}
+
+describe('renderer performance phases', () => {
+    afterEach(() => {
+        setHook(null);
+        jest.restoreAllMocks();
+    });
+
+    it('does not evaluate metadata while the global opt-in hook is absent', () => {
+        const metadata = jest.fn(() => ({ items: 3 }));
+        const resultIdentity = { imported: true };
+
+        const result = measure(
+            'store.m3u-publish-channels',
+            () => resultIdentity,
+            metadata
+        );
+
+        expect(result).toBe(resultIdentity);
+        expect(metadata).not.toHaveBeenCalled();
+    });
+
+    it('emits an immutable successful pair with epoch and monotonic timestamps', () => {
+        const events: RendererPerformancePhaseEvent[] = [];
+        setHook((event) => events.push(event));
+        const resultIdentity = { imported: true };
+
+        const result = measure(
+            'store.m3u-publish-channels',
+            () => resultIdentity,
+            () => ({ items: 3 })
+        );
+
+        expect(result).toBe(resultIdentity);
+        expect(events).toHaveLength(2);
+        expect(events[0]).toMatchObject({
+            boundary: 'start',
+            metadata: { items: 3 },
+            phase: 'store.m3u-publish-channels',
+            schemaVersion: 1,
+        });
+        expect(events[1]).toMatchObject({
+            boundary: 'end',
+            metadata: { items: 3 },
+            outcome: 'success',
+            phase: 'store.m3u-publish-channels',
+            schemaVersion: 1,
+        });
+        expect(events[1].phaseId).toBe(events[0].phaseId);
+        expect(events[0].epochMs).toEqual(expect.any(Number));
+        expect(events[0].monotonicMs).toEqual(expect.any(Number));
+        expect(events[1].epochMs).toBeGreaterThanOrEqual(events[0].epochMs);
+        expect(events[1].monotonicMs).toBeGreaterThanOrEqual(
+            events[0].monotonicMs
+        );
+        expect(Object.isFrozen(events[0])).toBe(true);
+        expect(Object.isFrozen(events[0].metadata)).toBe(true);
+        expect(events[1].metadata).toBe(events[0].metadata);
+    });
+
+    it('emits an error boundary and rethrows the exact product error', () => {
+        const events: RendererPerformancePhaseEvent[] = [];
+        setHook((event) => events.push(event));
+        const productError = new Error('dispatch failed');
+
+        let thrown: unknown;
+        try {
+            measure('store.m3u-import-dispatch', () => {
+                throw productError;
+            });
+        } catch (error: unknown) {
+            thrown = error;
+        }
+
+        expect(thrown).toBe(productError);
+        expect(events).toHaveLength(2);
+        expect(events[1]).toMatchObject({
+            boundary: 'end',
+            outcome: 'error',
+            phase: 'store.m3u-import-dispatch',
+        });
+        expect(events[1].phaseId).toBe(events[0].phaseId);
+    });
+
+    it('keeps product results and errors unchanged when metadata or hooks fail', () => {
+        setHook(() => {
+            throw new Error('benchmark hook failed');
+        });
+        const resultIdentity = { imported: true };
+
+        expect(
+            measure(
+                'store.m3u-publish-channels',
+                () => resultIdentity,
+                () => {
+                    throw new Error('metadata failed');
+                }
+            )
+        ).toBe(resultIdentity);
+
+        const productError = new Error('product failed');
+        let thrown: unknown;
+        try {
+            measure('store.m3u-import-dispatch', () => {
+                throw productError;
+            });
+        } catch (error: unknown) {
+            thrown = error;
+        }
+        expect(thrown).toBe(productError);
+    });
+
+    it('exposes only the fixed phase vocabulary and item-count metadata', () => {
+        expect(rendererPerformance.RENDERER_PERFORMANCE_PHASE_HOOK_KEY).toBe(
+            EXPECTED_HOOK_KEY
+        );
+        expect(rendererPerformance.RENDERER_PERFORMANCE_PHASE).toEqual({
+            M3U_IMPORT_DISPATCH: 'store.m3u-import-dispatch',
+            M3U_PUBLISH_CHANNELS: 'store.m3u-publish-channels',
+        });
+
+        const events: RendererPerformancePhaseEvent[] = [];
+        setHook((event) => events.push(event));
+        measure(
+            'store.m3u-publish-channels',
+            () => undefined,
+            () =>
+                ({
+                    items: 2,
+                    playlistUrl: 'https://user:secret@example.test/list.m3u',
+                }) as { items: number }
+        );
+
+        expect(events.map((event) => event.metadata)).toEqual([
+            { items: 2 },
+            { items: 2 },
+        ]);
+        expect(JSON.stringify(events)).not.toContain('secret');
+        expect(JSON.stringify(events)).not.toContain('playlistUrl');
+    });
+});
diff --git a/libs/shared/logging/src/lib/renderer-performance-phase.ts b/libs/shared/logging/src/lib/renderer-performance-phase.ts
new file mode 100644
index 000000000..d9a8b64ae
--- /dev/null
+++ b/libs/shared/logging/src/lib/renderer-performance-phase.ts
@@ -0,0 +1,181 @@
+export const RENDERER_PERFORMANCE_PHASE_HOOK_KEY =
+    'iptvnator.renderer.performance-phase-hook.v1';
+
+export const RENDERER_PERFORMANCE_PHASE = {
+    M3U_IMPORT_DISPATCH: 'store.m3u-import-dispatch',
+    M3U_PUBLISH_CHANNELS: 'store.m3u-publish-channels',
+} as const;
+
+export type RendererPerformancePhase =
+    (typeof RENDERER_PERFORMANCE_PHASE)[keyof typeof RENDERER_PERFORMANCE_PHASE];
+
+export type RendererPerformancePhaseBoundary = 'end' | 'start';
+export type RendererPerformancePhaseOutcome = 'error' | 'success';
+
+export interface RendererPerformancePhaseMetadata {
+    readonly items: number;
+}
+
+export interface RendererPerformancePhaseEvent {
+    readonly boundary: RendererPerformancePhaseBoundary;
+    readonly epochMs: number;
+    readonly metadata?: Readonly<RendererPerformancePhaseMetadata>;
+    readonly monotonicMs: number;
+    readonly outcome?: RendererPerformancePhaseOutcome;
+    readonly phase: RendererPerformancePhase;
+    readonly phaseId: string;
+    readonly schemaVersion: 1;
+}
+
+export type RendererPerformancePhaseHook = (
+    event: RendererPerformancePhaseEvent
+) => void;
+
+interface PhaseStart {
+    readonly epochMs: number;
+    readonly metadata?: Readonly<RendererPerformancePhaseMetadata>;
+    readonly monotonicMs: number;
+    readonly phase: RendererPerformancePhase;
+    readonly phaseId: string;
+}
+
+interface PhaseTimestamp {
+    readonly epochMs: number;
+    readonly monotonicMs: number;
+}
+
+const hookSymbol = Symbol.for(RENDERER_PERFORMANCE_PHASE_HOOK_KEY);
+let nextPhaseId = 0;
+
+export function measureRendererPerformancePhase<T>(
+    phase: RendererPerformancePhase,
+    execute: () => T,
+    createMetadata?: () => RendererPerformancePhaseMetadata
+): T {
+    const hook = readHook();
+    if (hook === null) {
+        return execute();
+    }
+
+    const start = beginPhase(phase, createMetadata);
+    emit(hook, {
+        boundary: 'start',
+        epochMs: start.epochMs,
+        metadata: start.metadata,
+        monotonicMs: start.monotonicMs,
+        phase: start.phase,
+        phaseId: start.phaseId,
+        schemaVersion: 1,
+    });
+
+    try {
+        const result = execute();
+        endPhase(hook, start, 'success');
+        return result;
+    } catch (error) {
+        endPhase(hook, start, 'error');
+        throw error;
+    }
+}
+
+function beginPhase(
+    phase: RendererPerformancePhase,
+    createMetadata: (() => RendererPerformancePhaseMetadata) | undefined
+): PhaseStart {
+    const timestamp = sampleTimestamp();
+    return {
+        ...timestamp,
+        metadata: readMetadata(createMetadata),
+        phase,
+        phaseId: `renderer-performance-${++nextPhaseId}`,
+    };
+}
+
+function endPhase(
+    hook: RendererPerformancePhaseHook,
+    start: PhaseStart,
+    outcome: RendererPerformancePhaseOutcome
+): void {
+    const sampled = sampleTimestamp();
+    emit(hook, {
+        boundary: 'end',
+        epochMs: Math.max(start.epochMs, sampled.epochMs),
+        metadata: start.metadata,
+        monotonicMs: Math.max(start.monotonicMs, sampled.monotonicMs),
+        outcome,
+        phase: start.phase,
+        phaseId: start.phaseId,
+        schemaVersion: 1,
+    });
+}
+
+function readHook(): RendererPerformancePhaseHook | null {
+    try {
+        const hook = (globalThis as unknown as Record<symbol, unknown>)[
+            hookSymbol
+        ];
+        return typeof hook === 'function'
+            ? (hook as RendererPerformancePhaseHook)
+            : null;
+    } catch {
+        return null;
+    }
+}
+
+function readMetadata(
+    createMetadata: (() => RendererPerformancePhaseMetadata) | undefined
+): Readonly<RendererPerformancePhaseMetadata> | undefined {
+    if (createMetadata === undefined) {
+        return undefined;
+    }
+
+    try {
+        const items = createMetadata().items;
+        return Number.isSafeInteger(items) && items >= 0
+            ? Object.freeze({ items })
+            : undefined;
+    } catch {
+        return undefined;
+    }
+}
+
+function emit(
+    hook: RendererPerformancePhaseHook,
+    event: RendererPerformancePhaseEvent
+): void {
+    try {
+        hook(Object.freeze(event));
+    } catch {
+        // Development-only benchmark instrumentation must stay fail-neutral.
+    }
+}
+
+function sampleTimestamp(): PhaseTimestamp {
+    const fallbackMs = readDateNow();
+    try {
+        const monotonicMs = globalThis.performance?.now();
+        const timeOrigin = globalThis.performance?.timeOrigin;
+        if (!Number.isFinite(monotonicMs)) {
+            return { epochMs: fallbackMs, monotonicMs: fallbackMs };
+        }
+        const epochMs =
+            Number.isFinite(timeOrigin) && timeOrigin !== undefined
+                ? timeOrigin + monotonicMs
+                : fallbackMs;
+        return {
+            epochMs: Number.isFinite(epochMs) ? epochMs : fallbackMs,
+            monotonicMs,
+        };
+    } catch {
+        return { epochMs: fallbackMs, monotonicMs: fallbackMs };
+    }
+}
+
+function readDateNow(): number {
+    try {
+        const value = Date.now();
+        return Number.isFinite(value) ? value : 0;
+    } catch {
+        return 0;
+    }
+}
diff --git a/libs/shared/logging/tsconfig.json b/libs/shared/logging/tsconfig.json
new file mode 100644
index 000000000..ab8e5af25
--- /dev/null
+++ b/libs/shared/logging/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "forceConsistentCasingInFileNames": true,
+        "strict": true,
+        "importHelpers": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "noPropertyAccessFromIndexSignature": true
+    },
+    "files": [],
+    "include": [],
+    "references": [
+        { "path": "./tsconfig.lib.json" },
+        { "path": "./tsconfig.spec.json" }
+    ]
+}
diff --git a/libs/shared/logging/tsconfig.lib.json b/libs/shared/logging/tsconfig.lib.json
new file mode 100644
index 000000000..163d90724
--- /dev/null
+++ b/libs/shared/logging/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../../dist/out-tsc",
+        "declaration": true,
+        "types": ["node"]
+    },
+    "include": ["src/**/*.ts"],
+    "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/shared/logging/tsconfig.spec.json b/libs/shared/logging/tsconfig.spec.json
new file mode 100644
index 000000000..4b0383fc4
--- /dev/null
+++ b/libs/shared/logging/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../../dist/out-tsc",
+        "module": "commonjs",
+        "moduleResolution": "node10",
+        "types": ["jest", "node"]
+    },
+    "include": [
+        "jest.config.ts",
+        "src/**/*.test.ts",
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
+    ]
+}
diff --git a/libs/shared/m3u-utils/package.json b/libs/shared/m3u-utils/package.json
index 221ae65e9..2771f45b4 100644
--- a/libs/shared/m3u-utils/package.json
+++ b/libs/shared/m3u-utils/package.json
@@ -7,7 +7,6 @@
     "types": "./src/index.d.ts",
     "dependencies": {
         "@iptvnator/shared/interfaces": "0.0.1",
-        "tslib": "^2.3.0",
-        "uuid": "^9.0.0"
+        "tslib": "^2.3.0"
     }
 }
diff --git a/libs/shared/m3u-utils/src/index.ts b/libs/shared/m3u-utils/src/index.ts
index 27a97c636..e9c180317 100644
--- a/libs/shared/m3u-utils/src/index.ts
+++ b/libs/shared/m3u-utils/src/index.ts
@@ -1,2 +1,6 @@
+export * from './lib/dash.utils';
+export * from './lib/kodiprop.utils';
+export * from './lib/playback-media-extension.util';
 export * from './lib/playlist.utils';
 export * from './lib/catchup.utils';
+export * from './lib/strip-country-prefix.util';
diff --git a/libs/shared/m3u-utils/src/lib/catchup.utils.spec.ts b/libs/shared/m3u-utils/src/lib/catchup.utils.spec.ts
index 676c415d0..cd9fc21c8 100644
--- a/libs/shared/m3u-utils/src/lib/catchup.utils.spec.ts
+++ b/libs/shared/m3u-utils/src/lib/catchup.utils.spec.ts
@@ -217,6 +217,74 @@ describe('catchup.utils', () => {
         );
     });
 
+    it('applies negative sub-hour XMLTV offsets such as -0030', () => {
+        // Regression: Number('-00') === -0, so a Math.sign()-based conversion
+        // dropped the minutes' sign and treated -0030 as UTC.
+        expect(
+            resolveM3uCatchupUrl(
+                baseChannel,
+                {
+                    ...archivedProgram,
+                    start: '202604100800 -0030',
+                    startTimestamp: null,
+                },
+                1_775_820_000
+            )
+        ).toBe(
+            'https://streams.example.com/live/channel-1.m3u8?utc=1775809800&lutc=1775820000'
+        );
+    });
+
+    it('applies positive offsets with minutes such as +0530', () => {
+        expect(
+            resolveM3uCatchupUrl(
+                baseChannel,
+                {
+                    ...archivedProgram,
+                    start: '202604100800 +0530',
+                    startTimestamp: null,
+                },
+                1_775_820_000
+            )
+        ).toBe(
+            'https://streams.example.com/live/channel-1.m3u8?utc=1775788200&lutc=1775820000'
+        );
+    });
+
+    it('applies positive sub-hour XMLTV offsets such as +0030', () => {
+        // Regression: Number('+00') === 0, so a Math.sign()-based conversion
+        // dropped the minutes and treated +0030 as UTC.
+        expect(
+            resolveM3uCatchupUrl(
+                baseChannel,
+                {
+                    ...archivedProgram,
+                    start: '202604100800 +0030',
+                    startTimestamp: null,
+                },
+                1_775_820_000
+            )
+        ).toBe(
+            'https://streams.example.com/live/channel-1.m3u8?utc=1775806200&lutc=1775820000'
+        );
+    });
+
+    it('treats a -0000 offset as UTC', () => {
+        expect(
+            resolveM3uCatchupUrl(
+                baseChannel,
+                {
+                    ...archivedProgram,
+                    start: '202604100800 -0000',
+                    startTimestamp: null,
+                },
+                1_775_820_000
+            )
+        ).toBe(
+            'https://streams.example.com/live/channel-1.m3u8?utc=1775808000&lutc=1775820000'
+        );
+    });
+
     it('preserves catchup metadata when storing parsed playlist items', () => {
         const playlist = createPlaylistObject('Catchup playlist', {
             header: {
diff --git a/libs/shared/m3u-utils/src/lib/catchup.utils.ts b/libs/shared/m3u-utils/src/lib/catchup.utils.ts
index e65782a7e..612d14113 100644
--- a/libs/shared/m3u-utils/src/lib/catchup.utils.ts
+++ b/libs/shared/m3u-utils/src/lib/catchup.utils.ts
@@ -112,9 +112,13 @@ function getEpgProgramTimestampSeconds(
         Number(hour),
         Number(minute)
     );
+    // Derive the sign from the string: for offsets like "-0030" the hour part
+    // is "-00", and Number("-00") === -0, so Math.sign() would drop the
+    // minutes' sign and yield a zero offset instead of -30 minutes.
+    const offsetSign = offsetHours.startsWith('-') ? -1 : 1;
     const offsetTotalMinutes =
-        Number(offsetHours) * 60 +
-        Math.sign(Number(offsetHours)) * Number(offsetMinutes);
+        offsetSign *
+        (Math.abs(Number(offsetHours)) * 60 + Number(offsetMinutes));
 
     return Math.floor((utcMillis - offsetTotalMinutes * 60_000) / 1000);
 }
diff --git a/libs/shared/m3u-utils/src/lib/dash.utils.spec.ts b/libs/shared/m3u-utils/src/lib/dash.utils.spec.ts
new file mode 100644
index 000000000..32cc17523
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/dash.utils.spec.ts
@@ -0,0 +1,36 @@
+import { isDashChannel, isDashStreamUrl } from './dash.utils';
+
+describe('dash.utils', () => {
+    it.each([
+        'https://example.com/live/stream.mpd',
+        'https://example.com/live/stream.MPD',
+        'https://example.com/live/stream.mpd?token=abc#frag',
+        'https://example.com/play?extension=mpd',
+        'https://example.com/play?ext=mpd',
+        'https://example.com/play?format=mpd',
+    ])('detects %s as DASH', (url) => {
+        expect(isDashStreamUrl(url)).toBe(true);
+    });
+
+    it.each([
+        'https://example.com/live/playlist.m3u8',
+        'https://example.com/live/stream.ts',
+        'https://example.com/live.php?id=7',
+        'https://example.com/movie.mp4',
+        '',
+        undefined,
+    ])('does not flag %s as DASH', (url) => {
+        expect(isDashStreamUrl(url as string | undefined)).toBe(false);
+    });
+
+    it('detects DASH channels by their stream URL', () => {
+        expect(
+            isDashChannel({ url: 'https://example.com/enc.mpd' })
+        ).toBe(true);
+        expect(
+            isDashChannel({ url: 'https://example.com/live.m3u8' })
+        ).toBe(false);
+        expect(isDashChannel(null)).toBe(false);
+        expect(isDashChannel(undefined)).toBe(false);
+    });
+});
diff --git a/libs/shared/m3u-utils/src/lib/dash.utils.ts b/libs/shared/m3u-utils/src/lib/dash.utils.ts
new file mode 100644
index 000000000..b8860c164
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/dash.utils.ts
@@ -0,0 +1,18 @@
+import { Channel } from '@iptvnator/shared/interfaces';
+import { getPlaybackMediaExtensionFromUrl } from './playback-media-extension.util';
+
+/**
+ * DASH (`.mpd`) detection for M3U channels. DASH streams must always play in
+ * a Shaka-capable built-in web engine: external MPV/VLC cannot receive the
+ * KODIPROP ClearKey configuration, and Video.js has no DASH bridge yet.
+ *
+ * Uses the same normalized extension detection as the player engines, so
+ * routing and engine selection always agree (`stream.MPD`, `?format=mpd`,
+ * `?ext=mpd` and friends included).
+ */
+export const isDashStreamUrl = (url: string | undefined): boolean =>
+    !!url && getPlaybackMediaExtensionFromUrl(url) === 'mpd';
+
+export const isDashChannel = (
+    channel: Pick<Channel, 'url'> | null | undefined
+): boolean => isDashStreamUrl(channel?.url);
diff --git a/libs/shared/m3u-utils/src/lib/kodiprop.utils.spec.ts b/libs/shared/m3u-utils/src/lib/kodiprop.utils.spec.ts
new file mode 100644
index 000000000..2864ca1e0
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/kodiprop.utils.spec.ts
@@ -0,0 +1,194 @@
+import { extractDrmFromRaw, isClearKeyLicenseType } from './kodiprop.utils';
+
+const KID_HEX = '9eb4050de44b4802932e27d75083e266';
+const KEY_HEX = '166634c675823c235a4a9446fad52e4d';
+// base64url encodings of the same 16-byte values as above.
+const KID_B64 = 'nrQFDeRLSAKTLifXUIPiZg';
+const KEY_B64 = 'FmY0xnWCPCNaSpRG-tUuTQ';
+
+const rawWith = (...kodipropLines: string[]): string =>
+    [
+        '#EXTINF:-1 tvg-id="enc" group-title="DASH",Encrypted channel',
+        ...kodipropLines,
+        'http://example.com/stream.mpd',
+    ].join('\r\n');
+
+describe('kodiprop.utils', () => {
+    describe('extractDrmFromRaw', () => {
+        it('parses a single hex kid:key ClearKey pair', () => {
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                    `#KODIPROP:inputstream.adaptive.license_key=${KID_HEX}:${KEY_HEX}`
+                )
+            );
+
+            expect(drm).toEqual({
+                licenseType: 'clearkey',
+                supported: true,
+                clearKeys: { [KID_HEX]: KEY_HEX },
+            });
+        });
+
+        it('accepts the org.w3.clearkey license type and dashed UUID kids', () => {
+            const dashedKid =
+                '9eb4050d-e44b-4802-932e-27d75083e266'.toUpperCase();
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=org.w3.clearkey',
+                    `#KODIPROP:inputstream.adaptive.license_key=${dashedKid}:${KEY_HEX}`
+                )
+            );
+
+            expect(drm?.supported).toBe(true);
+            expect(drm?.clearKeys).toEqual({ [KID_HEX]: KEY_HEX });
+        });
+
+        it('parses comma-separated multi-key pairs', () => {
+            const secondKid = 'a'.repeat(32);
+            const secondKey = 'b'.repeat(32);
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                    `#KODIPROP:inputstream.adaptive.license_key=${KID_HEX}:${KEY_HEX},${secondKid}:${secondKey}`
+                )
+            );
+
+            expect(drm?.clearKeys).toEqual({
+                [KID_HEX]: KEY_HEX,
+                [secondKid]: secondKey,
+            });
+        });
+
+        it('parses the W3C ClearKey license JSON with base64url values', () => {
+            const license = JSON.stringify({
+                keys: [{ kty: 'oct', k: KEY_B64, kid: KID_B64 }],
+                type: 'temporary',
+            });
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                    `#KODIPROP:inputstream.adaptive.license_key=${license}`
+                )
+            );
+
+            expect(drm).toEqual({
+                licenseType: 'clearkey',
+                supported: true,
+                clearKeys: { [KID_HEX]: KEY_HEX },
+            });
+        });
+
+        it('parses the plain JSON kid→key map form', () => {
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                    `#KODIPROP:inputstream.adaptive.license_key={"${KID_HEX}":"${KEY_HEX}"}`
+                )
+            );
+
+            expect(drm?.clearKeys).toEqual({ [KID_HEX]: KEY_HEX });
+        });
+
+        it('parses the drm_legacy combined property', () => {
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    `#KODIPROP:inputstream.adaptive.drm_legacy=org.w3.clearkey|${KID_HEX}:${KEY_HEX}`
+                )
+            );
+
+            expect(drm).toEqual({
+                licenseType: 'org.w3.clearkey',
+                supported: true,
+                clearKeys: { [KID_HEX]: KEY_HEX },
+            });
+        });
+
+        it('treats a parseable key without license type as ClearKey', () => {
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    `#KODIPROP:inputstream.adaptive.license_key=${KID_HEX}:${KEY_HEX}`
+                )
+            );
+
+            expect(drm?.supported).toBe(true);
+            expect(drm?.licenseType).toBe('clearkey');
+        });
+
+        it('marks widevine as unsupported without throwing', () => {
+            const drm = extractDrmFromRaw(
+                rawWith(
+                    '#KODIPROP:inputstream.adaptive.license_type=com.widevine.alpha',
+                    '#KODIPROP:inputstream.adaptive.license_key=https://license.example.com/wv'
+                )
+            );
+
+            expect(drm).toEqual({
+                licenseType: 'com.widevine.alpha',
+                supported: false,
+            });
+        });
+
+        it.each([
+            ['truncated hex pair', `${KID_HEX.slice(0, 10)}:${KEY_HEX}`],
+            ['missing key part', KID_HEX],
+            ['license server URL', 'https://license.example.com/ck'],
+            ['broken JSON', '{"keys":[{'],
+            ['JSON with non-string values', `{"${KID_HEX}": 42}`],
+        ])(
+            'marks ClearKey with a malformed key value as unsupported (%s)',
+            (_label, licenseKey) => {
+                const drm = extractDrmFromRaw(
+                    rawWith(
+                        '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                        `#KODIPROP:inputstream.adaptive.license_key=${licenseKey}`
+                    )
+                );
+
+                expect(drm).toEqual({
+                    licenseType: 'clearkey',
+                    supported: false,
+                });
+            }
+        );
+
+        it('returns undefined for channels without KODIPROP lines', () => {
+            expect(
+                extractDrmFromRaw(
+                    '#EXTINF:-1 tvg-id="plain",Plain channel\r\nhttp://example.com/live.m3u8'
+                )
+            ).toBeUndefined();
+        });
+
+        it('ignores unrelated KODIPROP properties', () => {
+            expect(
+                extractDrmFromRaw(
+                    rawWith(
+                        '#KODIPROP:inputstream.adaptive.manifest_type=mpd'
+                    )
+                )
+            ).toBeUndefined();
+        });
+
+        it('returns undefined for empty or missing raw', () => {
+            expect(extractDrmFromRaw(undefined)).toBeUndefined();
+            expect(extractDrmFromRaw('')).toBeUndefined();
+        });
+    });
+
+    describe('isClearKeyLicenseType', () => {
+        it.each(['clearkey', 'org.w3.clearkey', ' ClearKey '])(
+            'accepts %s',
+            (value) => {
+                expect(isClearKeyLicenseType(value)).toBe(true);
+            }
+        );
+
+        it.each(['com.widevine.alpha', 'com.microsoft.playready', ''])(
+            'rejects %s',
+            (value) => {
+                expect(isClearKeyLicenseType(value)).toBe(false);
+            }
+        );
+    });
+});
diff --git a/libs/shared/m3u-utils/src/lib/kodiprop.utils.ts b/libs/shared/m3u-utils/src/lib/kodiprop.utils.ts
new file mode 100644
index 000000000..d2bdae1ae
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/kodiprop.utils.ts
@@ -0,0 +1,279 @@
+import { ChannelDrm, ChannelDrmClearKeys } from '@iptvnator/shared/interfaces';
+
+/**
+ * `#KODIPROP:` DRM extraction.
+ *
+ * The playlist parser does not understand `#KODIPROP:` lines, but it appends
+ * every unknown line between `#EXTINF` and the stream URL to `item.raw`
+ * (the dominant Kodi/TiviMate layout). This module post-processes that raw
+ * block into a typed {@link ChannelDrm} value.
+ *
+ * Supported properties:
+ * - `inputstream.adaptive.license_type` + `inputstream.adaptive.license_key`
+ * - `inputstream.adaptive.drm_legacy` (`<license type>|<license key>`)
+ *
+ * ClearKey key formats: single `kid:key` hex pair, comma-separated pairs, the
+ * W3C ClearKey license JSON (`{"keys":[{"kty":"oct","k":...,"kid":...}]}`)
+ * and the plain `{kid: key}` JSON map. Anything else (license-server URLs,
+ * Widevine/PlayReady types, malformed values) yields `supported: false` so the
+ * player can show a clear DRM diagnostic instead of crashing.
+ */
+
+const KODIPROP_PREFIX = '#kodiprop:';
+const LICENSE_TYPE_PROP = 'inputstream.adaptive.license_type';
+const LICENSE_KEY_PROP = 'inputstream.adaptive.license_key';
+const DRM_LEGACY_PROP = 'inputstream.adaptive.drm_legacy';
+
+const CLEARKEY_LICENSE_TYPES = new Set(['clearkey', 'org.w3.clearkey']);
+
+const HEX_128_BIT_PATTERN = /^[0-9a-f]{32}$/;
+
+export function isClearKeyLicenseType(licenseType: string): boolean {
+    return CLEARKEY_LICENSE_TYPES.has(licenseType.trim().toLowerCase());
+}
+
+/**
+ * Extracts DRM configuration from a playlist item's raw M3U block.
+ * Returns `undefined` when the block carries no DRM-related `#KODIPROP` lines,
+ * so channels without KODIPROP metadata stay untouched.
+ */
+export function extractDrmFromRaw(
+    raw: string | undefined
+): ChannelDrm | undefined {
+    const props = collectKodipropValues(raw);
+    if (props.size === 0) {
+        return undefined;
+    }
+
+    let licenseType = props.get(LICENSE_TYPE_PROP)?.trim() ?? '';
+    let licenseKey = props.get(LICENSE_KEY_PROP)?.trim() ?? '';
+
+    const drmLegacy = props.get(DRM_LEGACY_PROP)?.trim();
+    if (drmLegacy && (!licenseType || !licenseKey)) {
+        const [legacyType, ...legacyKeyParts] = drmLegacy.split('|');
+        licenseType ||= legacyType?.trim() ?? '';
+        licenseKey ||= legacyKeyParts.join('|').trim();
+    }
+
+    if (!licenseType && !licenseKey) {
+        return undefined;
+    }
+
+    const normalizedType = licenseType.toLowerCase();
+    const clearKeys = isClearKeyLicenseType(normalizedType)
+        ? parseClearKeys(licenseKey)
+        : !normalizedType
+          ? // No explicit type: a parseable kid:key value is ClearKey in practice.
+            parseClearKeys(licenseKey)
+          : undefined;
+
+    if (clearKeys) {
+        return {
+            licenseType: normalizedType || 'clearkey',
+            supported: true,
+            clearKeys,
+        };
+    }
+
+    return {
+        licenseType: normalizedType,
+        supported: false,
+    };
+}
+
+function collectKodipropValues(
+    raw: string | undefined
+): Map<string, string> {
+    const props = new Map<string, string>();
+    if (!raw) {
+        return props;
+    }
+
+    for (const line of raw.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed.toLowerCase().startsWith(KODIPROP_PREFIX)) {
+            continue;
+        }
+
+        const assignment = trimmed.slice(KODIPROP_PREFIX.length);
+        const separatorIndex = assignment.indexOf('=');
+        if (separatorIndex < 1) {
+            continue;
+        }
+
+        const name = assignment.slice(0, separatorIndex).trim().toLowerCase();
+        const value = assignment.slice(separatorIndex + 1).trim();
+        if (
+            name === LICENSE_TYPE_PROP ||
+            name === LICENSE_KEY_PROP ||
+            name === DRM_LEGACY_PROP
+        ) {
+            props.set(name, value);
+        }
+    }
+
+    return props;
+}
+
+function parseClearKeys(value: string): ChannelDrmClearKeys | undefined {
+    if (!value) {
+        return undefined;
+    }
+
+    return value.startsWith('{')
+        ? parseClearKeysFromJson(value)
+        : parseClearKeysFromPairs(value);
+}
+
+function parseClearKeysFromPairs(
+    value: string
+): ChannelDrmClearKeys | undefined {
+    const keys: ChannelDrmClearKeys = {};
+
+    for (const pair of value.split(',')) {
+        const [kid, key, ...rest] = pair.split(':');
+        if (rest.length > 0) {
+            return undefined;
+        }
+
+        const kidHex = normalizeKeyComponent(kid);
+        const keyHex = normalizeKeyComponent(key);
+        if (!kidHex || !keyHex) {
+            return undefined;
+        }
+
+        keys[kidHex] = keyHex;
+    }
+
+    return Object.keys(keys).length > 0 ? keys : undefined;
+}
+
+function parseClearKeysFromJson(
+    value: string
+): ChannelDrmClearKeys | undefined {
+    let parsed: unknown;
+    try {
+        parsed = JSON.parse(value);
+    } catch {
+        return undefined;
+    }
+
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return undefined;
+    }
+
+    const record = parsed as Record<string, unknown>;
+    return Array.isArray(record['keys'])
+        ? parseW3cClearKeyLicense(record['keys'])
+        : parseClearKeyMap(record);
+}
+
+/** W3C ClearKey license form: `{"keys":[{"kty":"oct","k":...,"kid":...}]}`. */
+function parseW3cClearKeyLicense(
+    entries: unknown[]
+): ChannelDrmClearKeys | undefined {
+    const keys: ChannelDrmClearKeys = {};
+
+    for (const entry of entries) {
+        if (!entry || typeof entry !== 'object') {
+            return undefined;
+        }
+
+        const { kid, k } = entry as { kid?: unknown; k?: unknown };
+        const kidHex = normalizeKeyComponent(
+            typeof kid === 'string' ? kid : undefined
+        );
+        const keyHex = normalizeKeyComponent(
+            typeof k === 'string' ? k : undefined
+        );
+        if (!kidHex || !keyHex) {
+            return undefined;
+        }
+
+        keys[kidHex] = keyHex;
+    }
+
+    return Object.keys(keys).length > 0 ? keys : undefined;
+}
+
+function parseClearKeyMap(
+    record: Record<string, unknown>
+): ChannelDrmClearKeys | undefined {
+    const keys: ChannelDrmClearKeys = {};
+
+    for (const [kid, key] of Object.entries(record)) {
+        if (typeof key !== 'string') {
+            return undefined;
+        }
+
+        const kidHex = normalizeKeyComponent(kid);
+        const keyHex = normalizeKeyComponent(key);
+        if (!kidHex || !keyHex) {
+            return undefined;
+        }
+
+        keys[kidHex] = keyHex;
+    }
+
+    return Object.keys(keys).length > 0 ? keys : undefined;
+}
+
+/**
+ * Normalizes a 128-bit key component to 32 lowercase hex chars. Accepts plain
+ * or dashed (UUID-style) hex and base64url (the W3C license encoding).
+ */
+function normalizeKeyComponent(value: string | undefined): string | undefined {
+    const compact = value?.trim().replace(/-/g, '').toLowerCase();
+    if (!compact) {
+        return undefined;
+    }
+
+    if (HEX_128_BIT_PATTERN.test(compact)) {
+        return compact;
+    }
+
+    const fromBase64 = base64UrlToHex(value?.trim() ?? '');
+    return fromBase64 && HEX_128_BIT_PATTERN.test(fromBase64)
+        ? fromBase64
+        : undefined;
+}
+
+function base64UrlToHex(value: string): string | undefined {
+    if (!/^[A-Za-z0-9_-]+={0,2}$/.test(value)) {
+        return undefined;
+    }
+
+    const base64 = value.replace(/-/g, '+').replace(/_/g, '/');
+    try {
+        const binary = decodeBase64(base64);
+        let hex = '';
+        for (let index = 0; index < binary.length; index += 1) {
+            hex += binary.charCodeAt(index).toString(16).padStart(2, '0');
+        }
+        return hex;
+    } catch {
+        return undefined;
+    }
+}
+
+/** Works in both the browser (atob) and Node workers (Buffer). */
+function decodeBase64(base64: string): string {
+    if (typeof atob === 'function') {
+        return atob(base64);
+    }
+
+    const nodeBuffer = (
+        globalThis as {
+            Buffer?: {
+                from(
+                    data: string,
+                    encoding: string
+                ): { toString(encoding: string): string };
+            };
+        }
+    ).Buffer;
+    if (!nodeBuffer) {
+        throw new Error('No base64 decoder available');
+    }
+    return nodeBuffer.from(base64, 'base64').toString('binary');
+}
diff --git a/libs/shared/m3u-utils/src/lib/playback-media-extension.util.ts b/libs/shared/m3u-utils/src/lib/playback-media-extension.util.ts
new file mode 100644
index 000000000..fe919896c
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/playback-media-extension.util.ts
@@ -0,0 +1,127 @@
+import { getExtensionFromUrl } from './playlist.utils';
+
+/**
+ * Normalized media-extension detection for playback URLs. Shared between the
+ * player engines (engine selection in `@iptvnator/ui/playback`) and M3U
+ * routing (`isDashChannel`), so both always agree on what a URL is.
+ */
+
+export const UNSUPPORTED_CONTAINER_EXTENSIONS = new Set([
+    'avi',
+    'asf',
+    'divx',
+    'flv',
+    'm2ts',
+    'm4v',
+    'mkv',
+    'mov',
+    'mpeg',
+    'mpg',
+    'rm',
+    'rmvb',
+    'ts',
+    'vob',
+    'wmv',
+]);
+
+const EXPLICIT_MEDIA_EXTENSION_QUERY_KEYS = ['extension', 'ext'];
+
+const DECLARED_MEDIA_FORMAT_QUERY_KEYS = ['format', 'container'];
+
+const DECLARED_MEDIA_EXTENSION_ALIASES = new Map([
+    ['hls', 'm3u8'],
+    ['mpegts', 'ts'],
+    ['mpeg-ts', 'ts'],
+]);
+
+const DECLARED_MEDIA_EXTENSIONS = new Set([
+    ...UNSUPPORTED_CONTAINER_EXTENSIONS,
+    'aac',
+    'flac',
+    'm3u',
+    'm3u8',
+    'm4s',
+    'mp3',
+    'mp4',
+    'mpd',
+    'oga',
+    'ogg',
+    'ogv',
+    'webm',
+]);
+
+const NON_MEDIA_URL_EXTENSIONS = new Set([
+    'asp',
+    'aspx',
+    'cgi',
+    'jsp',
+    'mpv',
+    'php',
+    'pl',
+]);
+
+export function getPlaybackMediaExtensionFromUrl(url: string): string {
+    const explicitQueryExtension = getMediaExtensionFromQuery(
+        url,
+        EXPLICIT_MEDIA_EXTENSION_QUERY_KEYS
+    );
+    if (explicitQueryExtension) {
+        return explicitQueryExtension;
+    }
+
+    const pathExtension = normalizeExtensionToken(getExtensionFromUrl(url));
+    if (DECLARED_MEDIA_EXTENSIONS.has(pathExtension)) {
+        return pathExtension;
+    }
+
+    const formatQueryExtension = getMediaExtensionFromQuery(
+        url,
+        DECLARED_MEDIA_FORMAT_QUERY_KEYS
+    );
+    if (formatQueryExtension) {
+        return formatQueryExtension;
+    }
+
+    if (NON_MEDIA_URL_EXTENSIONS.has(pathExtension)) {
+        return '';
+    }
+
+    return pathExtension;
+}
+
+function normalizeExtensionToken(value: string | undefined): string {
+    return (value?.trim().toLowerCase() ?? '').replace(/^\.+/, '');
+}
+
+function getMediaExtensionFromQuery(
+    url: string,
+    queryKeys: readonly string[]
+): string {
+    try {
+        const parsedUrl = new URL(url, 'http://iptvnator.local');
+        for (const key of queryKeys) {
+            const declaredExtension = normalizeDeclaredMediaExtension(
+                parsedUrl.searchParams.get(key) ?? undefined
+            );
+            if (declaredExtension) {
+                return declaredExtension;
+            }
+        }
+
+        return '';
+    } catch {
+        return '';
+    }
+}
+
+function normalizeDeclaredMediaExtension(value: string | undefined): string {
+    const extension = normalizeExtensionToken(value);
+    const normalized =
+        DECLARED_MEDIA_EXTENSION_ALIASES.get(extension) ?? extension;
+
+    if (!normalized || NON_MEDIA_URL_EXTENSIONS.has(normalized)) {
+        return '';
+    }
+
+    return DECLARED_MEDIA_EXTENSIONS.has(normalized) ? normalized : '';
+}
diff --git a/libs/shared/m3u-utils/src/lib/playlist.utils.spec.ts b/libs/shared/m3u-utils/src/lib/playlist.utils.spec.ts
index 37e296596..55eebfbc5 100644
--- a/libs/shared/m3u-utils/src/lib/playlist.utils.spec.ts
+++ b/libs/shared/m3u-utils/src/lib/playlist.utils.spec.ts
@@ -240,6 +240,47 @@ describe('playlist utils', () => {
         expect(playlist.epgUrls).toEqual(epgUrls.slice(0, 5));
     });
 
+    it('attaches ClearKey DRM extracted from raw KODIPROP lines and leaves other channels untouched', () => {
+        const kid = '9eb4050de44b4802932e27d75083e266';
+        const key = '166634c675823c235a4a9446fad52e4d';
+        const baseItem = {
+            tvg: { id: '', name: '', url: '', logo: '', rec: '' },
+            group: { title: 'DASH' },
+            http: { referrer: '', 'user-agent': '' },
+        };
+        const playlist = createPlaylistObject('DRM playlist', {
+            header: { attrs: {}, raw: '#EXTM3U' },
+            items: [
+                {
+                    ...baseItem,
+                    name: 'Encrypted DASH',
+                    url: 'https://example.com/enc.mpd',
+                    raw: [
+                        '#EXTINF:-1,Encrypted DASH',
+                        '#KODIPROP:inputstream.adaptive.license_type=clearkey',
+                        `#KODIPROP:inputstream.adaptive.license_key=${kid}:${key}`,
+                        'https://example.com/enc.mpd',
+                    ].join('\r\n'),
+                },
+                {
+                    ...baseItem,
+                    name: 'Plain HLS',
+                    url: 'https://example.com/live.m3u8',
+                    raw: '#EXTINF:-1,Plain HLS\r\nhttps://example.com/live.m3u8',
+                },
+            ],
+        });
+
+        const [encrypted, plain] = playlist.playlist.items;
+        expect(encrypted.drm).toEqual({
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { [kid]: key },
+        });
+        expect(plain.drm).toBeUndefined();
+        expect('drm' in plain).toBe(false);
+    });
+
     it('keeps disabled playlist EPG sources out while preserving manually enabled URLs', () => {
         expect(
             resolvePlaylistEpgSourceState({
diff --git a/libs/shared/m3u-utils/src/lib/playlist.utils.ts b/libs/shared/m3u-utils/src/lib/playlist.utils.ts
index 2aa9e23d8..5688c077e 100644
--- a/libs/shared/m3u-utils/src/lib/playlist.utils.ts
+++ b/libs/shared/m3u-utils/src/lib/playlist.utils.ts
@@ -1,10 +1,11 @@
 import {
     Channel,
+    createRandomId,
     ParsedPlaylist,
     ParsedPlaylistItem,
     Playlist,
 } from '@iptvnator/shared/interfaces';
-import { v4 as uuidv4 } from 'uuid';
+import { extractDrmFromRaw } from './kodiprop.utils';
 
 /**
  * Aggregates favorite channels as objects from all available playlists
@@ -386,16 +387,20 @@ export const createPlaylistObject = (
     });
 
     return {
-        _id: uuidv4(),
+        _id: createRandomId(),
         filename: name,
         title: name,
         count: playlist.items.length,
         playlist: {
             ...playlist,
-            items: playlist.items.map((item: ParsedPlaylistItem) => ({
-                ...item,
-                id: uuidv4(),
-            })),
+            items: playlist.items.map((item: ParsedPlaylistItem) => {
+                const drm = extractDrmFromRaw(item.raw);
+                return {
+                    ...item,
+                    id: createRandomId(),
+                    ...(drm ? { drm } : {}),
+                };
+            }),
         },
         importDate: new Date().toISOString(),
         lastUsage: new Date().toISOString(),
diff --git a/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.spec.ts b/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.spec.ts
new file mode 100644
index 000000000..3633d4e2e
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.spec.ts
@@ -0,0 +1,137 @@
+import {
+    applyChannelNameStrip,
+    stripCountryPrefix,
+} from './strip-country-prefix.util';
+
+describe('stripCountryPrefix', () => {
+    describe('pipe separators', () => {
+        it('strips a "XX | " prefix', () => {
+            expect(stripCountryPrefix('US | CNN')).toBe('CNN');
+        });
+
+        it('strips a bare-pipe prefix', () => {
+            expect(stripCountryPrefix('FR|TF1')).toBe('TF1');
+        });
+
+        it('strips a wrapped tag like "|DE| ARD"', () => {
+            expect(stripCountryPrefix('|DE| ARD')).toBe('ARD');
+        });
+
+        it('strips long prefixes before a pipe', () => {
+            expect(stripCountryPrefix('US East | CNN')).toBe('CNN');
+        });
+
+        it('only strips up to the first pipe', () => {
+            expect(stripCountryPrefix('US | CNN | HD')).toBe('CNN | HD');
+        });
+    });
+
+    describe('dash and colon separators (short-tag prefixes only)', () => {
+        it('strips a two-letter country tag', () => {
+            expect(stripCountryPrefix('UK - BBC One')).toBe('BBC One');
+        });
+
+        it('strips a three-letter country tag', () => {
+            expect(stripCountryPrefix('USA - CNN')).toBe('CNN');
+        });
+
+        it('strips alphanumeric tags like 4K', () => {
+            expect(stripCountryPrefix('4K - Discovery')).toBe('Discovery');
+        });
+
+        it('strips a colon-separated tag', () => {
+            expect(stripCountryPrefix('US: CNN')).toBe('CNN');
+        });
+
+        it('strips compound quality/provider tags', () => {
+            expect(stripCountryPrefix('4K-DE - The Pitt (2025)')).toBe(
+                'The Pitt (2025)'
+            );
+            expect(stripCountryPrefix('AR-SUBS - Fallout')).toBe('Fallout');
+            expect(stripCountryPrefix('4K-OSN+ - The Last of Us')).toBe(
+                'The Last of Us'
+            );
+        });
+
+        it('strips longer pipe-tagged prefixes', () => {
+            expect(stripCountryPrefix('EXYU| News')).toBe('News');
+            expect(stripCountryPrefix('MULTI| Movies')).toBe('Movies');
+        });
+
+        it('never treats numeric fragments as tags', () => {
+            expect(stripCountryPrefix('1917 - Documentary')).toBe(
+                '1917 - Documentary'
+            );
+        });
+
+        it('keeps bare 4-5 char words before a spaced dash (real titles)', () => {
+            expect(stripCountryPrefix('DUNE - Part Two')).toBe(
+                'DUNE - Part Two'
+            );
+            expect(stripCountryPrefix('ALIEN - Covenant')).toBe(
+                'ALIEN - Covenant'
+            );
+        });
+
+        it('only strips the first tag segment', () => {
+            expect(stripCountryPrefix('ES - A3 - Sports')).toBe('A3 - Sports');
+        });
+
+        it('keeps names whose prefix is not a short uppercase tag', () => {
+            expect(stripCountryPrefix('Sky - Sports F1')).toBe(
+                'Sky - Sports F1'
+            );
+            expect(stripCountryPrefix('Discovery - Science')).toBe(
+                'Discovery - Science'
+            );
+            expect(stripCountryPrefix('Mission: Impossible - Fallout')).toBe(
+                'Mission: Impossible - Fallout'
+            );
+        });
+
+        it('keeps hyphenated names without separator spacing', () => {
+            expect(stripCountryPrefix('T-Mobile TV')).toBe('T-Mobile TV');
+            expect(stripCountryPrefix('US-CNN')).toBe('US-CNN');
+        });
+
+        it('keeps single-character prefixes', () => {
+            expect(stripCountryPrefix('A - Team')).toBe('A - Team');
+        });
+    });
+
+    describe('edge cases', () => {
+        it('returns names without separators unchanged', () => {
+            expect(stripCountryPrefix('BBC One')).toBe('BBC One');
+        });
+
+        it('trims surrounding whitespace', () => {
+            expect(stripCountryPrefix('  BBC One  ')).toBe('BBC One');
+        });
+
+        it('returns the original name when stripping would leave nothing', () => {
+            expect(stripCountryPrefix('US | ')).toBe('US |');
+        });
+
+        it('handles empty input', () => {
+            expect(stripCountryPrefix('')).toBe('');
+            expect(stripCountryPrefix('   ')).toBe('');
+        });
+    });
+});
+
+describe('applyChannelNameStrip', () => {
+    it('strips when enabled', () => {
+        expect(applyChannelNameStrip('US | CNN', true)).toBe('CNN');
+    });
+
+    it('returns the raw name when disabled', () => {
+        expect(applyChannelNameStrip('US | CNN', false)).toBe('US | CNN');
+        expect(applyChannelNameStrip('US | CNN', undefined)).toBe('US | CNN');
+        expect(applyChannelNameStrip('US | CNN', null)).toBe('US | CNN');
+    });
+
+    it('normalizes nullish names to an empty string', () => {
+        expect(applyChannelNameStrip(null, true)).toBe('');
+        expect(applyChannelNameStrip(undefined, false)).toBe('');
+    });
+});
diff --git a/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.ts b/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.ts
new file mode 100644
index 000000000..d0b8b74dc
--- /dev/null
+++ b/libs/shared/m3u-utils/src/lib/strip-country-prefix.util.ts
@@ -0,0 +1,93 @@
+/**
+ * Dash/colon separators only count when the prefix looks like a short
+ * country/group tag — they routinely appear inside real channel names
+ * ("Sky - Sports F1", "Discovery - Science"). Pipes are conventionally
+ * used only as tag separators, so they always count.
+ *
+ * Before a dash a tag is either a compound ("4K-DE", "AR-SUBS", "4K-OSN+"
+ * — the inner hyphen is the tag signal) or a plain 2–3 char code ("US",
+ * "4K"). A bare 4–5 char word before a spaced dash is a real title
+ * ("DUNE - Part Two", "ALIEN - Covenant"), so it is not a tag. Colon tags
+ * stay 2–3 chars — longer acronyms are franchise titles ("NCIS: LA").
+ * Every segment must contain a letter so numbers ("1917 - ...") are safe.
+ */
+const DASH_SEPARATORS = [' - ', '- ', ' -'];
+const COLON_SEPARATOR = ': ';
+const TAG_PREFIX_PATTERN =
+    /^(?:(?=[0-9+]*[A-Z])[A-Z0-9+]{2,5}(?:-(?=[0-9+]*[A-Z])[A-Z0-9+]{2,6}){1,2}|(?=[0-9+]*[A-Z])[A-Z0-9+]{2,3})$/;
+const COLON_TAG_PATTERN = /^(?=[0-9+]*[A-Z])[A-Z0-9+]{2,3}$/;
+
+interface SeparatorMatch {
+    index: number;
+    length: number;
+}
+
+/**
+ * Strip country / group prefixes from channel names.
+ *
+ * Finds the first tag separator and returns everything to its right.
+ * Only the prefix is removed — if the separator appears multiple times,
+ * only the first match counts. If stripping would leave an empty name,
+ * the original (trimmed) name is returned instead.
+ *
+ * Examples:
+ *   "US | CNN"           → "CNN"
+ *   "UK - BBC One"       → "BBC One"
+ *   "FR|TF1"             → "TF1"
+ *   "|DE| ARD"           → "ARD"
+ *   "US: CNN"            → "CNN"
+ *   "ES - A3 - Sports"   → "A3 - Sports"
+ *   "Sky - Sports F1"    → "Sky - Sports F1"  (prefix is not a short tag)
+ *   "BBC One"            → "BBC One"          (no separator)
+ *   "US | "              → "US |"             (stripping would leave nothing)
+ */
+export function stripCountryPrefix(name: string): string {
+    const trimmed = name.trim();
+    if (!trimmed) return trimmed;
+
+    const match = findTagSeparator(trimmed);
+    if (!match) return trimmed;
+
+    const prefix = trimmed.slice(0, match.index).trim();
+    const stripped = trimmed.slice(match.index + match.length).trim();
+    if (!stripped) return trimmed;
+
+    // A leading separator ("|DE| ARD") strips nothing by itself — retry on
+    // the remainder so the actual tag segment is removed too.
+    return prefix ? stripped : stripCountryPrefix(stripped);
+}
+
+/**
+ * Settings-aware wrapper for display bindings: strips the prefix only when
+ * the `stripCountryPrefix` setting is enabled, and normalizes nullish names
+ * to an empty string.
+ */
+export function applyChannelNameStrip(
+    name: string | null | undefined,
+    enabled: boolean | null | undefined
+): string {
+    const raw = name ?? '';
+    return enabled ? stripCountryPrefix(raw) : raw;
+}
+
+function findTagSeparator(name: string): SeparatorMatch | null {
+    let best: SeparatorMatch | null = null;
+
+    const pipeIndex = name.indexOf('|');
+    if (pipeIndex !== -1) {
+        best = { index: pipeIndex, length: 1 };
+    }
+
+    for (const separator of [...DASH_SEPARATORS, COLON_SEPARATOR]) {
+        const index = name.indexOf(separator);
+        if (index === -1 || (best && best.index <= index)) continue;
+        const pattern =
+            separator === COLON_SEPARATOR
+                ? COLON_TAG_PATTERN
+                : TAG_PREFIX_PATTERN;
+        if (!pattern.test(name.slice(0, index).trim())) continue;
+        best = { index, length: separator.length };
+    }
+
+    return best;
+}
diff --git a/libs/shared/marketing-fixtures/eslint.config.mjs b/libs/shared/marketing-fixtures/eslint.config.mjs
new file mode 100644
index 000000000..f8e354126
--- /dev/null
+++ b/libs/shared/marketing-fixtures/eslint.config.mjs
@@ -0,0 +1,21 @@
+import baseConfig from '../../../eslint.config.mjs';
+
+export default [
+    ...baseConfig,
+    {
+        files: ['**/*.json'],
+        rules: {
+            '@nx/dependency-checks': [
+                'error',
+                {
+                    ignoredFiles: [
+                        '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
+                    ],
+                },
+            ],
+        },
+        languageOptions: {
+            parser: await import('jsonc-eslint-parser'),
+        },
+    },
+];
diff --git a/libs/shared/marketing-fixtures/jest.config.cts b/libs/shared/marketing-fixtures/jest.config.cts
new file mode 100644
index 000000000..bff4ed299
--- /dev/null
+++ b/libs/shared/marketing-fixtures/jest.config.cts
@@ -0,0 +1,13 @@
+module.exports = {
+    displayName: 'shared-marketing-fixtures',
+    preset: '../../../jest.preset.js',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.[tj]s$': [
+            'ts-jest',
+            { tsconfig: '<rootDir>/tsconfig.spec.json' },
+        ],
+    },
+    moduleFileExtensions: ['ts', 'js', 'html'],
+    coverageDirectory: '../../../coverage/libs/shared/marketing-fixtures',
+};
diff --git a/libs/shared/marketing-fixtures/package.json b/libs/shared/marketing-fixtures/package.json
new file mode 100644
index 000000000..0cdab979a
--- /dev/null
+++ b/libs/shared/marketing-fixtures/package.json
@@ -0,0 +1,11 @@
+{
+    "name": "@iptvnator/shared/marketing-fixtures",
+    "version": "0.0.1",
+    "private": true,
+    "type": "commonjs",
+    "main": "./src/index.js",
+    "types": "./src/index.d.ts",
+    "dependencies": {
+        "tslib": "^2.3.0"
+    }
+}
diff --git a/libs/shared/marketing-fixtures/project.json b/libs/shared/marketing-fixtures/project.json
new file mode 100644
index 000000000..c65adad9c
--- /dev/null
+++ b/libs/shared/marketing-fixtures/project.json
@@ -0,0 +1,26 @@
+{
+    "name": "shared-marketing-fixtures",
+    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+    "sourceRoot": "libs/shared/marketing-fixtures/src",
+    "projectType": "library",
+    "tags": ["scope:shared", "domain:shared-runtime", "type:util"],
+    "targets": {
+        "build": {
+            "executor": "@nx/js:tsc",
+            "outputs": ["{options.outputPath}"],
+            "options": {
+                "outputPath": "dist/libs/shared/marketing-fixtures",
+                "main": "libs/shared/marketing-fixtures/src/index.ts",
+                "tsConfig": "libs/shared/marketing-fixtures/tsconfig.lib.json",
+                "assets": []
+            }
+        },
+        "test": {
+            "executor": "@nx/jest:jest",
+            "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+            "options": {
+                "jestConfig": "libs/shared/marketing-fixtures/jest.config.cts"
+            }
+        }
+    }
+}
diff --git a/libs/shared/marketing-fixtures/src/index.ts b/libs/shared/marketing-fixtures/src/index.ts
new file mode 100644
index 000000000..7446381e4
--- /dev/null
+++ b/libs/shared/marketing-fixtures/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/shared-marketing-fixtures';
diff --git a/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.spec.ts b/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.spec.ts
new file mode 100644
index 000000000..5171545ff
--- /dev/null
+++ b/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.spec.ts
@@ -0,0 +1,71 @@
+import {
+    NEW_MARKETING_MOVIES,
+    POSTER_SHOWCASE_MOVIES,
+} from './shared-marketing-fixtures';
+
+const EXPECTED_NEW_TITLES = [
+    'Black Harbor',
+    'The Paper Astronaut',
+    'Summer Static',
+    'House of Tides',
+    'Open Late',
+    'White Room Six',
+    'Field Notes',
+    'A Thousand Steps',
+    'The Small Hours',
+    'Copper Rain',
+    'Willow Engine',
+    'Quiet Thunder',
+    'Parallel Kitchens',
+    'First String',
+    'The Long Museum',
+    'Cloud Hotel',
+    'Unpaid Overtime',
+    'Deep Green',
+    'November Radio',
+    'The Last Orange',
+];
+
+describe('poster showcase marketing fixtures', () => {
+    it('keeps the 20 new movies first in the approved order', () => {
+        expect(NEW_MARKETING_MOVIES).toHaveLength(20);
+        expect(NEW_MARKETING_MOVIES.map((movie) => movie.name)).toEqual(
+            EXPECTED_NEW_TITLES
+        );
+        expect(
+            POSTER_SHOWCASE_MOVIES.slice(0, EXPECTED_NEW_TITLES.length).map(
+                (movie) => movie.name
+            )
+        ).toEqual(EXPECTED_NEW_TITLES);
+    });
+
+    it('exposes 35 unique titles and slugs', () => {
+        expect(POSTER_SHOWCASE_MOVIES).toHaveLength(35);
+        expect(
+            new Set(POSTER_SHOWCASE_MOVIES.map((movie) => movie.name)).size
+        ).toBe(35);
+        expect(
+            new Set(POSTER_SHOWCASE_MOVIES.map((movie) => movie.slug)).size
+        ).toBe(35);
+        expect(
+            POSTER_SHOWCASE_MOVIES.every((movie) =>
+                /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(movie.slug)
+            )
+        ).toBe(true);
+    });
+
+    it('uses only provider-neutral category keys', () => {
+        const validCategoryKeys = new Set([
+            'action-mystery',
+            'future-fantasy',
+            'family-comedy',
+            'drama-documentary',
+        ]);
+
+        expect(
+            POSTER_SHOWCASE_MOVIES.every((movie) =>
+                validCategoryKeys.has(movie.categoryKey)
+            )
+        ).toBe(true);
+    });
+});
diff --git a/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.ts b/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.ts
new file mode 100644
index 000000000..a14e42d4d
--- /dev/null
+++ b/libs/shared/marketing-fixtures/src/lib/shared-marketing-fixtures.ts
@@ -0,0 +1,483 @@
+/* eslint-disable max-lines -- This file is a single static, provider-neutral catalog with no behavior. */
+
+export type MarketingMovieCategoryKey =
+    'action-mystery' | 'future-fantasy' | 'family-comedy' | 'drama-documentary';
+
+export type MarketingMovieFixture = {
+    actors: string;
+    categoryKey: MarketingMovieCategoryKey;
+    description: string;
+    director: string;
+    genre: string;
+    name: string;
+    rating: number;
+    slug: string;
+    tagline: string;
+    year: number;
+};
+
+export const NEW_MARKETING_MOVIES = [
+    {
+        categoryKey: 'action-mystery',
+        name: 'Black Harbor',
+        slug: 'black-harbor',
+        description:
+            'A dock inspector follows a missing cargo ledger through a fogbound harbor where every night crew remembers a different ship.',
+        director: 'Nadia Rook',
+        actors: 'Mara Venn, Elias Shore, Tomas Bell, June Cross',
+        genre: 'Maritime Crime Thriller',
+        rating: 8.2,
+        tagline: 'Every tide returns a secret.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'The Paper Astronaut',
+        slug: 'the-paper-astronaut',
+        description:
+            'A careful paper astronaut crosses a handmade bedroom universe to return one fallen star before morning.',
+        director: 'Lumi North',
+        actors: 'Kit Arden, Orla Moss, Finn Vale, Mina Hart',
+        genre: 'Stop-Motion Family Animation',
+        rating: 8.6,
+        tagline: 'Fold a small world. Take a giant step.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'Summer Static',
+        slug: 'summer-static',
+        description:
+            'Four friends rebuild an abandoned community radio booth during the final week before their coastal town changes forever.',
+        director: 'Elise March',
+        actors: 'Ari Cole, Leni Wynn, Milo Reed, Tessa Vale',
+        genre: 'Coming-of-Age Drama',
+        rating: 8.0,
+        tagline: 'The clearest signal never lasts.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'House of Tides',
+        slug: 'house-of-tides',
+        description:
+            'A marine surveyor returns to a cliff house whose rooms appear only when the winter tide retreats.',
+        director: 'Iris Shore',
+        actors: 'Rhea Voss, Owen Marr, Selah Quinn, Bram North',
+        genre: 'Gothic Coastal Mystery',
+        rating: 8.3,
+        tagline: 'The sea leaves one door open.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Open Late',
+        slug: 'open-late',
+        description:
+            'Three exhausted night-shift clerks turn a quiet neighborhood shop into an accidental refuge before sunrise.',
+        director: 'Milo Hart',
+        actors: 'Clara Moss, Ben Rowe, Juno Pike, Evelyn Cole',
+        genre: 'Workplace Comedy',
+        rating: 7.8,
+        tagline: 'Nothing ordinary happens after midnight.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'White Room Six',
+        slug: 'white-room-six',
+        description:
+            'A sleep researcher wakes inside her own clinical trial with five empty rooms and a recording she does not remember making.',
+        director: 'Noah Venn',
+        actors: 'Amara Cross, Theo Holt, Cora Wynn, Elias Vale',
+        genre: 'Psychological Thriller',
+        rating: 8.1,
+        tagline: 'The experiment ended yesterday.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'Field Notes',
+        slug: 'field-notes',
+        description:
+            'A patient botanist documents the last flowering season of an overlooked wetland and the people protecting it.',
+        director: 'Ruth Arden',
+        actors: 'Nora Bell, Kai March, Mina Shore, Owen Reed',
+        genre: 'Nature Documentary',
+        rating: 8.5,
+        tagline: 'Look closely before it changes.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'A Thousand Steps',
+        slug: 'a-thousand-steps',
+        description:
+            'A retired mountain guide returns to a vertical race carrying a promise made twenty years earlier.',
+        director: 'Tomas North',
+        actors: 'Darius Holt, Lina Cross, Rafi Bell, Selah Moss',
+        genre: 'Mountain Sports Drama',
+        rating: 8.2,
+        tagline: 'The summit is not the finish.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'The Small Hours',
+        slug: 'the-small-hours',
+        description:
+            'Two strangers waiting for the first tram walk through a sleeping city and borrow one honest night from their real lives.',
+        director: 'Mara Shore',
+        actors: 'Nadia Wynn, Julian Hart, Elise Vale, Theo Reed',
+        genre: 'Urban Romantic Drama',
+        rating: 8.0,
+        tagline: 'Morning can wait one more stop.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Copper Rain',
+        slug: 'copper-rain',
+        description:
+            'A municipal photographer discovers the same copper umbrella at every unexplained blackout across the old city.',
+        director: 'Ren Voss',
+        actors: 'Iris Marr, Leo Cross, Omar Vale, June Hart',
+        genre: 'Neo-Noir Mystery',
+        rating: 8.1,
+        tagline: 'Some reflections arrive first.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'future-fantasy',
+        name: 'Willow Engine',
+        slug: 'willow-engine',
+        description:
+            'A young mechanic awakens a walking wooden engine and follows it into a valley disappearing from every map.',
+        director: 'Talia Moss',
+        actors: 'Lumi Vale, Kit Shore, Orla Reed, Finn Arden',
+        genre: 'Family Fantasy Adventure',
+        rating: 8.4,
+        tagline: 'Every old tree remembers a road.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'Quiet Thunder',
+        slug: 'quiet-thunder',
+        description:
+            'A widowed horse trainer and her estranged son prepare one stubborn mare for the final county storm season.',
+        director: 'Owen Rook',
+        actors: 'Tessa Marr, Adrian Cole, Ruth Bell, Nico Hart',
+        genre: 'Contemporary Western Drama',
+        rating: 7.9,
+        tagline: 'The land speaks before the sky.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Parallel Kitchens',
+        slug: 'parallel-kitchens',
+        description:
+            'Two rival cooks discover matching pantry doors that open into each other’s restaurants in neighboring realities.',
+        director: 'Cora March',
+        actors: 'Mina Wynn, Elias Rowe, Bram Pike, Juno Vale',
+        genre: 'Science-Fiction Comedy',
+        rating: 7.9,
+        tagline: 'Dinner is served twice.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'First String',
+        slug: 'first-string',
+        description:
+            'A reserve orchestra cellist receives one unexpected solo and twenty-four hours to decide whose career it will replace.',
+        director: 'Lina Venn',
+        actors: 'Amara Moss, Theo North, Clara Shore, Ren Hart',
+        genre: 'Music Drama',
+        rating: 8.3,
+        tagline: 'One note changes every seat.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'The Long Museum',
+        slug: 'the-long-museum',
+        description:
+            'An overnight guard follows a newly appeared corridor through galleries that display tomorrow’s missing objects.',
+        director: 'June Vale',
+        actors: 'Bram Cole, Iris Wynn, Selah Hart, Rafi Cross',
+        genre: 'Art Mystery',
+        rating: 8.2,
+        tagline: 'The newest room has always been there.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Cloud Hotel',
+        slug: 'cloud-hotel',
+        description:
+            'A shy apprentice opens a tiny floating hotel for weather creatures stranded between seasons.',
+        director: 'Orla March',
+        actors: 'Lumi Bell, Kit Vale, Finn Moss, Ari Shore',
+        genre: 'Animated Family Fantasy',
+        rating: 8.5,
+        tagline: 'Every storm needs somewhere to rest.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Unpaid Overtime',
+        slug: 'unpaid-overtime',
+        description:
+            'Five office workers locked in after hours attempt to finish one impossible presentation without doing any more work.',
+        director: 'Milo Cross',
+        actors: 'Cora Hart, Ben Vale, Juno Moss, Adrian Reed',
+        genre: 'Office Satire',
+        rating: 7.7,
+        tagline: 'The deadline already went home.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Deep Green',
+        slug: 'deep-green',
+        description:
+            'Two cave ecologists follow an underground forest beyond the mapped air line after their only exit floods.',
+        director: 'Nadia Holt',
+        actors: 'Rhea Shore, Elias North, Mina Cross, Tomas Bell',
+        genre: 'Survival Adventure',
+        rating: 8.0,
+        tagline: 'Below the roots, keep breathing.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'November Radio',
+        slug: 'november-radio',
+        description:
+            'In 1978, a remote weather announcer keeps broadcasting through a mountain blackout to listeners she cannot hear.',
+        director: 'Elena Rook',
+        actors: 'Mara Voss, Owen Hart, Ruth Vale, Theo March',
+        genre: 'Period Drama',
+        rating: 8.4,
+        tagline: 'Stay with the signal.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'The Last Orange',
+        slug: 'the-last-orange',
+        description:
+            'Three generations gather to harvest a failing seaside orchard and divide everything except the final fruit.',
+        director: 'Iris Cole',
+        actors: 'Evelyn Shore, Nadia Bell, Leo Hart, Mina Vale',
+        genre: 'Mediterranean Family Drama',
+        rating: 8.1,
+        tagline: 'Some inheritances must be shared.',
+        year: 2025,
+    },
+] as const satisfies readonly MarketingMovieFixture[];
+
+export const EXISTING_MARKETING_MOVIES = [
+    {
+        categoryKey: 'drama-documentary',
+        name: 'Orchard Walls',
+        slug: 'orchard-walls',
+        description:
+            'A quiet prison gardener and a new volunteer rebuild an abandoned orchard while both reconsider the lives waiting beyond its walls.',
+        director: 'Elena March',
+        actors: 'Darius Cole, Mina Hart, Ruth Bell, Owen Pike',
+        genre: 'Human Drama',
+        rating: 8.4,
+        tagline: 'Some walls are grown, not built.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Blue Current',
+        slug: 'blue-current',
+        description:
+            'A young reef fish and an anxious lantern companion cross a changing ocean current to guide their family home.',
+        director: 'Talia North',
+        actors: 'Lumi Vale, Finn Reed, Orla Moss, Kit Arden',
+        genre: 'Animated Family Adventure',
+        rating: 8.6,
+        tagline: 'The smallest light can find the way.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Signal Nine',
+        slug: 'signal-nine',
+        description:
+            'A transit reporter and a railway investigator trace a repeating emergency signal through a city that insists nothing happened.',
+        director: 'Mara Venn',
+        actors: 'Nadia Cross, Elias Rowe, June Mercer, Tomas Vale',
+        genre: 'Urban Conspiracy Thriller',
+        rating: 8.1,
+        tagline: 'The ninth signal was never sent.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Checkout at Noon',
+        slug: 'checkout-at-noon',
+        description:
+            'An exhausted hotel manager has one morning to settle a cheerful traveler and a formidable guest into the same impossible room.',
+        director: 'Milo Hart',
+        actors: 'Adrian Moss, Clara Wynn, Evelyn Shore, Ben Vale',
+        genre: 'Ensemble Comedy',
+        rating: 7.7,
+        tagline: 'Every guest has a different plan.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'future-fantasy',
+        name: 'Vesper Crown',
+        slug: 'vesper-crown',
+        description:
+            'A royal archivist crosses a silent salt kingdom to recover a broken crown before its seven pieces choose a new ruler.',
+        director: 'Iris March',
+        actors: 'Selah Quinn, Rowan Pike, Mira Holt, Theo Arden',
+        genre: 'Fantasy Adventure',
+        rating: 8.3,
+        tagline: 'Seven pieces remember the throne.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Last Detour',
+        slug: 'last-detour',
+        description:
+            'A veteran mechanic and a bicycle courier take one mountain road too far and discover why every map avoids it.',
+        director: 'Noah Rook',
+        actors: 'Tessa Marr, Leo Venn, Omar Pike, Nina Cross',
+        genre: 'Road Action Thriller',
+        rating: 7.9,
+        tagline: 'The long way back is the only way out.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'Borrowed Summer',
+        slug: 'borrowed-summer',
+        description:
+            'Two former friends meet beside a lakeside bus route and spend one final season deciding which memories still belong to them.',
+        director: 'Lina Shore',
+        actors: 'Mara Wynn, Julian Hart, Elise Rowe, Finn Cole',
+        genre: 'Romantic Drama',
+        rating: 8.0,
+        tagline: 'Some seasons are only passing through.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Under the Floor',
+        slug: 'under-the-floor',
+        description:
+            'A tenant renovating an empty family home follows a red thread beneath the floorboards and into a history no room remembers.',
+        director: 'Oren Vale',
+        actors: 'Rhea Moss, Daniel Cross, Mina Shore, Asa Bell',
+        genre: 'Supernatural Horror',
+        rating: 7.8,
+        tagline: 'The house kept one thing hidden.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'future-fantasy',
+        name: 'Red Winter',
+        slug: 'red-winter',
+        description:
+            'A planetary botanist crosses a frozen red plain with the last living samples after her remote habitat falls silent.',
+        director: 'Vera Holt',
+        actors: 'Nora Venn, Kai March, Elias Moss, Ruth Arden',
+        genre: 'Science Fiction Survival',
+        rating: 8.5,
+        tagline: 'Life travels light.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Saturday Champions',
+        slug: 'saturday-champions',
+        description:
+            'Six neighborhood footballers with mismatched kits train for the one match their muddy community field has been waiting for.',
+        director: 'Tomas Hart',
+        actors: 'Milo Quinn, Ari Bell, Leni Moss, Kit Rowe',
+        genre: 'Family Sports Comedy',
+        rating: 7.9,
+        tagline: 'The score is not the whole story.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'drama-documentary',
+        name: 'The Silent Verdict',
+        slug: 'the-silent-verdict',
+        description:
+            'A public defender receives one sealed envelope after an empty courtroom closes and must decide whether justice can survive the truth.',
+        director: 'June Marr',
+        actors: 'Amara Voss, Theo Reed, Elias Hart, Cora Wynn',
+        genre: 'Courtroom Drama',
+        rating: 8.2,
+        tagline: 'The final evidence said nothing.',
+        year: 2026,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Low Tide Letters',
+        slug: 'low-tide-letters',
+        description:
+            'An aging postal worker crosses the tidal flats to deliver a final bundle of letters to a village missing from every new map.',
+        director: 'Owen Shore',
+        actors: 'Bram North, Iris Cole, Lena March, Rafi Bell',
+        genre: 'Coastal Mystery',
+        rating: 8.1,
+        tagline: 'The sea returns every address.',
+        year: 2024,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Salt & Cedar',
+        slug: 'salt-cedar',
+        description:
+            'Two estranged siblings reopen their family restaurant and discover that the old recipes settle fewer arguments than they start.',
+        director: 'Cora Vale',
+        actors: 'Mina Wynn, Adrian Rowe, Ruth Moss, Nico Hart',
+        genre: 'Culinary Dramedy',
+        rating: 7.8,
+        tagline: 'Every table remembers.',
+        year: 2025,
+    },
+    {
+        categoryKey: 'action-mystery',
+        name: 'Brass Horizon',
+        slug: 'brass-horizon',
+        description:
+            'A desert aircraft engineer races an experimental survey plane ahead of a dust front that has erased every route home.',
+        director: 'Ren Arden',
+        actors: 'Talia Cross, Owen Pike, Mara Bell, Jules North',
+        genre: 'Retro Aviation Adventure',
+        rating: 8.0,
+        tagline: 'Build what the horizon cannot stop.',
+        year: 2023,
+    },
+    {
+        categoryKey: 'family-comedy',
+        name: 'Moonlight Delivery',
+        slug: 'moonlight-delivery',
+        description:
+            'A young night courier climbs a winding miniature city to deliver three glowing parcels before the moon disappears.',
+        director: 'Lumi Hart',
+        actors: 'Kit Vale, Orla Reed, Finn Moss, Ari Shore',
+        genre: 'Animated Family Adventure',
+        rating: 8.4,
+        tagline: 'Every doorstep needs a little light.',
+        year: 2026,
+    },
+] as const satisfies readonly MarketingMovieFixture[];
+
+export const POSTER_SHOWCASE_MOVIES = [
+    ...NEW_MARKETING_MOVIES,
+    ...EXISTING_MARKETING_MOVIES,
+] as const satisfies readonly MarketingMovieFixture[];
diff --git a/libs/shared/marketing-fixtures/tsconfig.json b/libs/shared/marketing-fixtures/tsconfig.json
new file mode 100644
index 000000000..c0906eb5f
--- /dev/null
+++ b/libs/shared/marketing-fixtures/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "forceConsistentCasingInFileNames": true,
+        "strict": true,
+        "importHelpers": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "noPropertyAccessFromIndexSignature": true
+    },
+    "files": [],
+    "include": [],
+    "references": [
+        {
+            "path": "./tsconfig.lib.json"
+        },
+        {
+            "path": "./tsconfig.spec.json"
+        }
+    ]
+}
diff --git a/libs/shared/marketing-fixtures/tsconfig.lib.json b/libs/shared/marketing-fixtures/tsconfig.lib.json
new file mode 100644
index 000000000..df88d529f
--- /dev/null
+++ b/libs/shared/marketing-fixtures/tsconfig.lib.json
@@ -0,0 +1,15 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../../dist/out-tsc",
+        "declaration": true,
+        "types": ["node"]
+    },
+    "include": ["src/**/*.ts"],
+    "exclude": [
+        "jest.config.ts",
+        "jest.config.cts",
+        "src/**/*.spec.ts",
+        "src/**/*.test.ts"
+    ]
+}
diff --git a/libs/shared/marketing-fixtures/tsconfig.spec.json b/libs/shared/marketing-fixtures/tsconfig.spec.json
new file mode 100644
index 000000000..1adf5fc4b
--- /dev/null
+++ b/libs/shared/marketing-fixtures/tsconfig.spec.json
@@ -0,0 +1,16 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "outDir": "../../../dist/out-tsc",
+        "module": "commonjs",
+        "moduleResolution": "node10",
+        "types": ["jest", "node"]
+    },
+    "include": [
+        "jest.config.ts",
+        "jest.config.cts",
+        "src/**/*.test.ts",
+        "src/**/*.spec.ts",
+        "src/**/*.d.ts"
+    ]
+}
diff --git a/libs/ui/components/src/index.ts b/libs/ui/components/src/index.ts
index a725b7ea6..09fca1a52 100644
--- a/libs/ui/components/src/index.ts
+++ b/libs/ui/components/src/index.ts
@@ -1,5 +1,6 @@
 export * from './lib/channel-list-container/channel-list-container.component';
 export * from './lib/channel-list-container/channel-details-dialog/channel-details-dialog.component';
+export * from './lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component';
 export * from './lib/channel-list-container/channel-list-item/channel-list-item.component';
 export * from './lib/channel-list-container/channel-list-item-skeleton/channel-list-item-skeleton.component';
 export * from './lib/channel-list-container/channel-list-skeleton/channel-list-skeleton.component';
diff --git a/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.html b/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.html
index 92006c4d0..accebb6d3 100644
--- a/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.html
@@ -110,6 +110,12 @@
 ></div>
 
 <mat-menu #channelContextMenu="matMenu">
+    @if (supportsEpgMapping) {
+        <button mat-menu-item (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+        </button>
+    }
     <button mat-menu-item (click)="openChannelDetails()">
         <mat-icon>info</mat-icon>
         <span>{{ 'CHANNELS.SHOW_DETAILS' | translate }}</span>
diff --git a/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.ts b/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.ts
index 4c840a4fb..1516362ea 100644
--- a/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/all-channels-view/all-channels-view.component.ts
@@ -16,6 +16,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslatePipe } from '@ngx-translate/core';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
 import { Channel, EpgProgram } from '@iptvnator/shared/interfaces';
 import {
@@ -28,6 +29,7 @@ import {
 import { resolveChannelLogo } from '../channel-logo-fallback.util';
 import { buildChannelEpgMetadataMap } from '../epg-enrichment.util';
 import { ChannelDetailsDialogComponent } from '../channel-details-dialog/channel-details-dialog.component';
+import { EpgMappingDialogComponent } from '../epg-mapping-dialog/epg-mapping-dialog.component';
 import { ChannelListItemComponent } from '../channel-list-item/channel-list-item.component';
 
 const ALL_CHANNELS_SORT_STORAGE_KEY = 'm3u-all-channels-sort-mode';
@@ -51,6 +53,8 @@ export type { ChannelEpgMetadata } from '../epg-enrichment.util';
 })
 export class AllChannelsViewComponent {
     private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
 
     readonly contextMenuTrigger =
         viewChild.required<MatMenuTrigger>('contextMenuTrigger');
@@ -202,4 +206,22 @@ export class AllChannelsViewComponent {
             width: 'calc(100vw - 32px)',
         });
     }
+
+    openEpgMapping(): void {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const channelKey = resolveChannelEpgLookupKey(channel);
+        if (!channelKey) {
+            return;
+        }
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.name ?? channelKey,
+        });
+    }
 }
diff --git a/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.html b/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.html
index 2ad0bbc02..d50563d69 100644
--- a/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.html
@@ -227,6 +227,12 @@
 </mat-dialog-content>
 
 <mat-dialog-actions class="channel-dialog__actions">
+    @if (supportsEpgMapping) {
+        <button mat-stroked-button (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            {{ 'CHANNELS.MAP_EPG' | translate }}
+        </button>
+    }
     <button mat-stroked-button mat-dialog-close class="channel-dialog__close">
         {{ 'CLOSE' | translate }}
     </button>
diff --git a/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.ts b/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.ts
index 73f85d009..d8aaca3ca 100644
--- a/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/channel-details-dialog/channel-details-dialog.component.ts
@@ -1,11 +1,18 @@
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
+import {
+    MAT_DIALOG_DATA,
+    MatDialog,
+    MatDialogModule,
+} from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { getM3uArchiveDays, isM3uCatchupPlaybackSupported } from '@iptvnator/shared/m3u-utils';
 import { Channel } from '@iptvnator/shared/interfaces';
+import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
+import { EpgMappingDialogComponent } from '../epg-mapping-dialog/epg-mapping-dialog.component';
 
 interface ChannelDetailField {
     readonly empty?: boolean;
@@ -35,6 +42,9 @@ interface HeroStat {
 })
 export class ChannelDetailsDialogComponent {
     readonly channel = inject<Channel>(MAT_DIALOG_DATA);
+    private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
 
     readonly archiveDays = getM3uArchiveDays(this.channel);
     readonly catchupAvailable = this.archiveDays > 0;
@@ -182,4 +192,16 @@ export class ChannelDetailsDialogComponent {
 
         return { labelKey, monospace, value: normalized };
     }
+
+    openEpgMapping(): void {
+        const channelKey = resolveChannelEpgLookupKey(this.channel);
+        if (!channelKey) {
+            return;
+        }
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: this.channel.name ?? channelKey,
+        });
+    }
 }
diff --git a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.html b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.html
index c215f2cb8..8caa8f672 100644
--- a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.html
@@ -28,7 +28,7 @@
             }
         </div>
         <div class="channel-details">
-            <div class="channel-name">{{ name() }}</div>
+            <div class="channel-name">{{ displayName() }}</div>
             @if (showEpg()) {
                 @if (epgProgram(); as program) {
                     <div class="epg-title">
diff --git a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.spec.ts b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.spec.ts
index e101df100..733e0e2ab 100644
--- a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.spec.ts
+++ b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.spec.ts
@@ -1,8 +1,10 @@
 import { DatePipe } from '@angular/common';
+import { signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
+import { SettingsStore } from '@iptvnator/services';
 import { EpgProgram } from '@iptvnator/shared/interfaces';
 import { ChannelListItemComponent } from './channel-list-item.component';
 
@@ -141,4 +143,48 @@ describe('ChannelListItemComponent', () => {
             })
         );
     });
+
+    it('renders the raw channel name while prefix stripping is disabled', () => {
+        fixture.componentRef.setInput('name', 'US | CNN');
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement
+                .querySelector('.channel-name')
+                .textContent.trim()
+        ).toBe('US | CNN');
+    });
+
+    describe('with strip country prefix enabled', () => {
+        beforeEach(async () => {
+            TestBed.resetTestingModule();
+            await TestBed.configureTestingModule({
+                imports: [
+                    ChannelListItemComponent,
+                    NoopAnimationsModule,
+                    TranslateModule.forRoot(),
+                ],
+                providers: [
+                    { provide: MatDialog, useValue: dialog },
+                    {
+                        provide: SettingsStore,
+                        useValue: { stripCountryPrefix: signal(true) },
+                    },
+                ],
+            }).compileComponents();
+
+            fixture = TestBed.createComponent(ChannelListItemComponent);
+        });
+
+        it('strips the country prefix from the rendered channel name', () => {
+            fixture.componentRef.setInput('name', 'US | CNN');
+            fixture.detectChanges();
+
+            expect(
+                fixture.nativeElement
+                    .querySelector('.channel-name')
+                    .textContent.trim()
+            ).toBe('CNN');
+        });
+    });
 });
diff --git a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.ts b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.ts
index 06400bc0a..97f4f9132 100644
--- a/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/channel-list-item/channel-list-item.component.ts
@@ -3,6 +3,7 @@ import { DatePipe, NgStyle } from '@angular/common';
 import {
     ChangeDetectionStrategy,
     Component,
+    computed,
     effect,
     inject,
     input,
@@ -16,6 +17,8 @@ import { MatTooltip } from '@angular/material/tooltip';
 import { TranslatePipe } from '@ngx-translate/core';
 import { EpgItemDescriptionComponent } from '@iptvnator/ui/epg';
 import { EpgProgram } from '@iptvnator/shared/interfaces';
+import { SettingsStore } from '@iptvnator/services';
+import { applyChannelNameStrip } from '@iptvnator/shared/m3u-utils';
 
 @Component({
     selector: 'app-channel-list-item',
@@ -35,10 +38,17 @@ import { EpgProgram } from '@iptvnator/shared/interfaces';
 export class ChannelListItemComponent {
     private readonly dialog = inject(MatDialog);
     private readonly logoFailed = signal(false);
+    private readonly settingsStore = inject(SettingsStore);
 
     readonly isDraggable = input(false);
     readonly logo = input<string | null | undefined>('');
     readonly name = input('');
+    readonly displayName = computed(() =>
+        applyChannelNameStrip(
+            this.name(),
+            this.settingsStore.stripCountryPrefix?.()
+        )
+    );
     readonly showFavoriteButton = input(false);
     readonly showAuxActionButton = input(false);
     readonly showProgramInfoButton = input(true);
diff --git a/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.html b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.html
new file mode 100644
index 000000000..e4be4b844
--- /dev/null
+++ b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.html
@@ -0,0 +1,77 @@
+<h2 mat-dialog-title>{{ 'EPG_MAPPING_DIALOG.TITLE' | translate }}</h2>
+
+<mat-dialog-content>
+    <p class="epg-mapping-subtitle">
+        {{ 'EPG_MAPPING_DIALOG.SUBTITLE' | translate : { channelName: data.channelName } }}
+    </p>
+
+    <div class="epg-mapping-current">
+        <span class="epg-mapping-current__label">
+            {{ 'EPG_MAPPING_DIALOG.CURRENT_MAPPING' | translate }}:
+        </span>
+        <span class="epg-mapping-current__value">
+            {{ currentMapping() || ('EPG_MAPPING_DIALOG.NO_MAPPING' | translate) }}
+        </span>
+    </div>
+
+    <mat-form-field class="epg-mapping-search" appearance="outline">
+        <mat-label>{{ 'EPG_MAPPING_DIALOG.SEARCH_PLACEHOLDER' | translate }}</mat-label>
+        <input
+            matInput
+            [ngModel]="searchTerm()"
+            (ngModelChange)="onSearchInput($event)"
+            [placeholder]="'EPG_MAPPING_DIALOG.SEARCH_PLACEHOLDER' | translate"
+        />
+        <mat-icon matPrefix>search</mat-icon>
+        @if (loading()) {
+            <mat-spinner matSuffix diameter="20" />
+        }
+        @if (!hasSearchTerm()) {
+            <mat-hint>
+                {{
+                    'EPG_MAPPING_DIALOG.SEARCH_HINT'
+                        | translate: { min: searchMinChars }
+                }}
+            </mat-hint>
+        }
+    </mat-form-field>
+
+    @if (hasSearchTerm()) {
+        <div class="epg-mapping-results">
+            @for (channel of results(); track channel.id) {
+                <button
+                    class="epg-mapping-result"
+                    [class.epg-mapping-result--selected]="selectedId() === channel.id"
+                    (click)="selectChannel(channel.id)"
+                >
+                    <span class="epg-mapping-result__name">{{ channel.displayName }}</span>
+                    <span class="epg-mapping-result__id">{{ channel.id }}</span>
+                </button>
+            } @empty {
+                <div class="epg-mapping-empty">
+                    <mat-icon>search_off</mat-icon>
+                    <span>{{ 'EPG_MAPPING_DIALOG.NO_RESULTS' | translate }}</span>
+                </div>
+            }
+        </div>
+    }
+</mat-dialog-content>
+
+<mat-dialog-actions align="end">
+    @if (currentMapping()) {
+        <button mat-button color="warn" (click)="removeMapping()">
+            {{ 'EPG_MAPPING_DIALOG.REMOVE' | translate }}
+        </button>
+    }
+    <button mat-button (click)="close()">
+        {{ 'EPG_MAPPING_DIALOG.CLOSE' | translate }}
+    </button>
+    <button
+        mat-raised-button
+        color="primary"
+        [disabled]="!selectedId()"
+        (click)="save()"
+    >
+        {{ 'EPG_MAPPING_DIALOG.SAVE' | translate }}
+    </button>
+</mat-dialog-actions>
diff --git a/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.scss b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.scss
new file mode 100644
index 000000000..dde913830
--- /dev/null
+++ b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.scss
@@ -0,0 +1,95 @@
+.epg-mapping-subtitle {
+    margin: 0 0 16px;
+    color: var(--mat-sys-on-surface-variant);
+    font-size: 14px;
+}
+
+.epg-mapping-current {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 16px;
+    padding: 8px 12px;
+    border-radius: 8px;
+    background: var(--mat-sys-surface-container-high);
+
+    &__label {
+        font-size: 12px;
+        color: var(--mat-sys-on-surface-variant);
+    }
+
+    &__value {
+        font-size: 14px;
+        font-weight: 500;
+        font-family: monospace;
+    }
+}
+
+.epg-mapping-search {
+    width: 100%;
+    margin-bottom: 8px;
+}
+
+.epg-mapping-results {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.epg-mapping-result {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 2px;
+    padding: 10px 12px;
+    border: 1px solid transparent;
+    border-radius: 6px;
+    background: transparent;
+    cursor: pointer;
+    text-align: left;
+    width: 100%;
+    color: inherit;
+    transition: background 0.15s, border-color 0.15s;
+
+    &:hover {
+        background: var(--mat-sys-surface-container-high);
+    }
+
+    &--selected {
+        border-color: var(--mat-sys-primary);
+        background: color-mix(
+            in srgb,
+            var(--mat-sys-primary) 10%,
+            transparent
+        );
+    }
+
+    &__name {
+        font-size: 14px;
+        font-weight: 500;
+        color: var(--mat-sys-on-surface);
+    }
+
+    &__id {
+        font-size: 11px;
+        color: var(--mat-sys-on-surface-variant);
+        font-family: monospace;
+    }
+}
+
+.epg-mapping-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+    padding: 32px;
+    color: var(--mat-sys-on-surface-variant);
+
+    mat-icon {
+        font-size: 40px;
+        width: 40px;
+        height: 40px;
+    }
+}
diff --git a/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.ts b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.ts
new file mode 100644
index 000000000..bc0e423c8
--- /dev/null
+++ b/libs/ui/components/src/lib/channel-list-container/epg-mapping-dialog/epg-mapping-dialog.component.ts
@@ -0,0 +1,205 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    computed,
+    inject,
+    signal,
+} from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import {
+    MAT_DIALOG_DATA,
+    MatDialog,
+    MatDialogModule,
+    MatDialogRef,
+} from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { EpgRuntimeBridgeService, EpgService } from '@iptvnator/epg/data-access';
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+import { debounceTime, from, Subject, switchMap } from 'rxjs';
+
+export interface EpgMappingDialogData {
+    channelKey: string;
+    channelName: string;
+    /** Owning playlist for portal channels; omitted for M3U lookup keys. */
+    playlistId?: string | null;
+}
+
+export interface EpgMappingDialogResult {
+    channelKey: string;
+    epgChannelId: string;
+}
+
+const SEARCH_MIN_CHARS = 2;
+
+@Component({
+    selector: 'app-epg-mapping-dialog',
+    templateUrl: './epg-mapping-dialog.component.html',
+    styleUrl: './epg-mapping-dialog.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    imports: [
+        FormsModule,
+        MatButtonModule,
+        MatDialogModule,
+        MatFormFieldModule,
+        MatIconModule,
+        MatInputModule,
+        MatProgressSpinnerModule,
+        TranslatePipe,
+    ],
+})
+export class EpgMappingDialogComponent {
+    readonly data = inject<EpgMappingDialogData>(MAT_DIALOG_DATA);
+    private readonly dialogRef = inject(
+        MatDialogRef<EpgMappingDialogComponent, EpgMappingDialogResult>
+    );
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    private readonly epgService = inject(EpgService);
+    private readonly snackBar = inject(MatSnackBar);
+    private readonly translate = inject(TranslateService);
+
+    readonly searchMinChars = SEARCH_MIN_CHARS;
+    readonly searchTerm = signal('');
+    readonly loading = signal(false);
+    readonly results = signal<
+        Array<{ id: string; displayName: string; iconUrl: string | null }>
+    >([]);
+    readonly selectedId = signal<string | null>(null);
+    readonly currentMapping = signal<string | null>(null);
+
+    private readonly search$ = new Subject<string>();
+
+    /** Open the dialog with the shared sizing used by every caller. */
+    static open(
+        dialog: MatDialog,
+        data: EpgMappingDialogData
+    ): MatDialogRef<EpgMappingDialogComponent, EpgMappingDialogResult> {
+        return dialog.open(EpgMappingDialogComponent, {
+            data,
+            width: '500px',
+            maxHeight: '90vh',
+        });
+    }
+
+    constructor() {
+        // Fetch the current mapping (if any) on open — callers don't know it.
+        this.loadCurrentMapping();
+
+        this.search$
+            .pipe(
+                debounceTime(300),
+                switchMap((term) => {
+                    if (term.trim().length < SEARCH_MIN_CHARS) {
+                        return from(Promise.resolve([]));
+                    }
+                    this.loading.set(true);
+                    const promise = this.epgBridge.searchEpgChannels(term);
+                    return from(promise ?? Promise.resolve([]));
+                }),
+                takeUntilDestroyed()
+            )
+            .subscribe({
+                next: (items) => {
+                    this.results.set(items ?? []);
+                    this.loading.set(false);
+                },
+                error: () => {
+                    this.results.set([]);
+                    this.loading.set(false);
+                },
+            });
+    }
+
+    readonly hasSearchTerm = computed(
+        () => this.searchTerm().trim().length >= SEARCH_MIN_CHARS
+    );
+
+    onSearchInput(value: string): void {
+        this.searchTerm.set(value);
+        this.search$.next(value);
+    }
+
+    selectChannel(id: string): void {
+        this.selectedId.set(id);
+    }
+
+    save(): void {
+        const epgChannelId = this.selectedId();
+        if (!epgChannelId) return;
+
+        this.epgBridge
+            .setEpgMapping(
+                this.data.channelKey,
+                epgChannelId,
+                this.data.playlistId ?? undefined
+            )
+            .then((result) => {
+                if (!result?.success) {
+                    this.notify('EPG_MAPPING_DIALOG.SAVE_FAILED');
+                    return;
+                }
+                this.epgService.clearCache();
+                this.notify('EPG_MAPPING_DIALOG.SAVED');
+                this.dialogRef.close({
+                    channelKey: this.data.channelKey,
+                    epgChannelId,
+                });
+            });
+    }
+
+    removeMapping(): void {
+        this.epgBridge.deleteEpgMapping(this.data.channelKey).then((result) => {
+            if (!result?.success) {
+                this.notify('EPG_MAPPING_DIALOG.SAVE_FAILED');
+                return;
+            }
+            this.epgService.clearCache();
+            this.notify('EPG_MAPPING_DIALOG.REMOVED');
+            this.dialogRef.close();
+        });
+    }
+
+    close(): void {
+        this.dialogRef.close();
+    }
+
+    /**
+     * Resolve the stored mapping and enrich it with the EPG channel's
+     * display name so the user sees "BBC One (bbc.one.uk)" instead of a
+     * bare ID.
+     */
+    private loadCurrentMapping(): void {
+        this.epgBridge.getEpgMapping(this.data.channelKey).then(async (m) => {
+            const mappedId = m?.epgChannelId ?? null;
+            if (!mappedId) {
+                this.currentMapping.set(null);
+                return;
+            }
+            this.currentMapping.set(mappedId);
+            try {
+                const matches =
+                    (await this.epgBridge.searchEpgChannels(mappedId, 10)) ??
+                    [];
+                const exact = matches.find((r) => r.id === mappedId);
+                if (exact?.displayName && exact.displayName !== mappedId) {
+                    this.currentMapping.set(
+                        `${exact.displayName} (${mappedId})`
+                    );
+                }
+            } catch {
+                // Display name enrichment is cosmetic — keep the bare ID.
+            }
+        });
+    }
+
+    private notify(key: string): void {
+        this.snackBar.open(this.translate.instant(key), undefined, {
+            duration: 2000,
+        });
+    }
+}
diff --git a/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.html b/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.html
index 9960ee3db..769c96a45 100644
--- a/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.html
@@ -69,6 +69,12 @@
 ></div>
 
 <mat-menu #channelContextMenu="matMenu">
+    @if (supportsEpgMapping) {
+        <button mat-menu-item (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+        </button>
+    }
     <button mat-menu-item (click)="openChannelDetails()">
         <mat-icon>info</mat-icon>
         <span>{{ 'CHANNELS.SHOW_DETAILS' | translate }}</span>
diff --git a/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.ts b/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.ts
index fab2c9f9b..125db3b3e 100644
--- a/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/favorites-view/favorites-view.component.ts
@@ -17,9 +17,11 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { TranslatePipe } from '@ngx-translate/core';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
 import { Channel, EpgProgram } from '@iptvnator/shared/interfaces';
 import { buildChannelEpgMetadataMap } from '../epg-enrichment.util';
+import { EpgMappingDialogComponent } from '../epg-mapping-dialog/epg-mapping-dialog.component';
 import { ChannelDetailsDialogComponent } from '../channel-details-dialog/channel-details-dialog.component';
 import { resolveChannelLogo } from '../channel-logo-fallback.util';
 import { ChannelListItemComponent } from '../channel-list-item/channel-list-item.component';
@@ -39,6 +41,8 @@ import { ChannelListItemComponent } from '../channel-list-item/channel-list-item
 })
 export class FavoritesViewComponent {
     private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
 
     readonly contextMenuTrigger =
         viewChild.required<MatMenuTrigger>('contextMenuTrigger');
@@ -152,6 +156,25 @@ export class FavoritesViewComponent {
         });
     }
 
+    openEpgMapping(): void {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const channelKey = resolveChannelEpgLookupKey(channel);
+        if (!channelKey) {
+            return;
+        }
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.name ?? channelKey,
+        });
+    }
+
+
     openChannelDetails(): void {
         const channel = this.contextMenuChannel();
         if (!channel) {
diff --git a/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.html b/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.html
index 7b57b770f..d696a52ca 100644
--- a/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.html
@@ -331,6 +331,12 @@
 ></div>
 
 <mat-menu #channelContextMenu="matMenu">
+    @if (supportsEpgMapping) {
+        <button mat-menu-item (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+        </button>
+    }
     <button mat-menu-item (click)="openChannelDetails()">
         <mat-icon>info</mat-icon>
         <span>{{ 'CHANNELS.SHOW_DETAILS' | translate }}</span>
diff --git a/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.ts b/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.ts
index 87201268f..eea1018d8 100644
--- a/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/groups-view/groups-view.component.ts
@@ -19,6 +19,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { TranslatePipe } from '@ngx-translate/core';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
 import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
 import { Channel, EpgProgram } from '@iptvnator/shared/interfaces';
 import { buildChannelEpgMetadataMap } from '../epg-enrichment.util';
@@ -30,6 +31,7 @@ import {
     sortPlaylistChannelItems,
 } from '../channel-list-sort.util';
 import { resolveChannelLogo } from '../channel-logo-fallback.util';
+import { EpgMappingDialogComponent } from '../epg-mapping-dialog/epg-mapping-dialog.component';
 import { ChannelDetailsDialogComponent } from '../channel-details-dialog/channel-details-dialog.component';
 import { ChannelListItemComponent } from '../channel-list-item/channel-list-item.component';
 import { ResizableDirective } from '../../resizable/resizable.directive';
@@ -72,6 +74,8 @@ interface FilteredGroupView {
 })
 export class GroupsViewComponent {
     private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
     private readonly hostEl = inject(ElementRef<HTMLElement>);
 
     readonly contextMenuTrigger =
@@ -490,6 +494,25 @@ export class GroupsViewComponent {
         });
     }
 
+    openEpgMapping(): void {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const channelKey = resolveChannelEpgLookupKey(channel);
+        if (!channelKey) {
+            return;
+        }
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.name ?? channelKey,
+        });
+    }
+
+
     openChannelDetails(): void {
         const channel = this.contextMenuChannel();
         if (!channel) {
diff --git a/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.html b/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.html
index b55c31cd0..19e670420 100644
--- a/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.html
+++ b/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.html
@@ -62,6 +62,12 @@
 ></div>
 
 <mat-menu #channelContextMenu="matMenu">
+    @if (supportsEpgMapping) {
+        <button mat-menu-item (click)="openEpgMapping()">
+            <mat-icon>settings_remote</mat-icon>
+            <span>{{ 'CHANNELS.MAP_EPG' | translate }}</span>
+        </button>
+    }
     <button mat-menu-item (click)="openChannelDetails()">
         <mat-icon>info</mat-icon>
         <span>{{ 'CHANNELS.SHOW_DETAILS' | translate }}</span>
diff --git a/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.ts b/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.ts
index d93985528..e865ecf02 100644
--- a/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.ts
+++ b/libs/ui/components/src/lib/channel-list-container/recent-view/recent-view.component.ts
@@ -12,7 +12,10 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { TranslatePipe } from '@ngx-translate/core';
+import { EpgRuntimeBridgeService } from '@iptvnator/epg/data-access';
+import { resolveChannelEpgLookupKey } from '@iptvnator/m3u-state';
 import { Channel, EpgProgram } from '@iptvnator/shared/interfaces';
+import { EpgMappingDialogComponent } from '../epg-mapping-dialog/epg-mapping-dialog.component';
 import { ChannelDetailsDialogComponent } from '../channel-details-dialog/channel-details-dialog.component';
 import { resolveChannelLogo } from '../channel-logo-fallback.util';
 import {
@@ -40,6 +43,8 @@ export interface RecentViewItem {
 })
 export class RecentViewComponent {
     private readonly dialog = inject(MatDialog);
+    private readonly epgBridge = inject(EpgRuntimeBridgeService);
+    readonly supportsEpgMapping = this.epgBridge.supportsEpgMapping;
 
     readonly contextMenuTrigger =
         viewChild.required<MatMenuTrigger>('contextMenuTrigger');
@@ -133,6 +138,25 @@ export class RecentViewComponent {
         });
     }
 
+    openEpgMapping(): void {
+        const channel = this.contextMenuChannel();
+        if (!channel) {
+            return;
+        }
+
+        this.contextMenuTrigger().closeMenu();
+        const channelKey = resolveChannelEpgLookupKey(channel);
+        if (!channelKey) {
+            return;
+        }
+
+        EpgMappingDialogComponent.open(this.dialog, {
+            channelKey,
+            channelName: channel.name ?? channelKey,
+        });
+    }
+
+
     openChannelDetails(): void {
         const channel = this.contextMenuChannel();
         if (!channel) {
diff --git a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.html b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.html
index 9998539e6..e9d55f521 100644
--- a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.html
+++ b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.html
@@ -30,7 +30,7 @@
     </button>
 
     <div class="external-playback-dock__meta">
-        <div class="external-playback-dock__title">{{ session().title }}</div>
+        <div class="external-playback-dock__title">{{ displayTitle() }}</div>
         <div class="external-playback-dock__status">
             <span class="external-playback-dock__chip">{{ playerLabel() }}</span>
             <span
diff --git a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.spec.ts b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.spec.ts
index 008f059c3..45a39d7a7 100644
--- a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.spec.ts
+++ b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.spec.ts
@@ -1,3 +1,4 @@
+import { signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import {
@@ -6,6 +7,7 @@ import {
     TranslateService,
 } from '@ngx-translate/core';
 import { Observable, of } from 'rxjs';
+import { SettingsStore } from '@iptvnator/services';
 import { ExternalPlayerSession } from '@iptvnator/shared/interfaces';
 import { ExternalPlaybackDockComponent } from './external-playback-dock.component';
 
@@ -146,4 +148,62 @@ describe('ExternalPlaybackDockComponent', () => {
                 .nativeElement.textContent.trim()
         ).toBe('movie');
     });
+
+    describe('with strip country prefix enabled', () => {
+        beforeEach(async () => {
+            TestBed.resetTestingModule();
+            await TestBed.configureTestingModule({
+                imports: [
+                    ExternalPlaybackDockComponent,
+                    TranslateModule.forRoot({
+                        loader: {
+                            provide: TranslateLoader,
+                            useClass: FakeTranslateLoader,
+                        },
+                    }),
+                ],
+                providers: [
+                    {
+                        provide: SettingsStore,
+                        useValue: { stripCountryPrefix: signal(true) },
+                    },
+                ],
+            }).compileComponents();
+
+            fixture = TestBed.createComponent(ExternalPlaybackDockComponent);
+        });
+
+        it('strips the prefix from live session titles', () => {
+            fixture.componentRef.setInput('session', {
+                ...session,
+                title: 'US | CNN',
+            });
+            fixture.detectChanges();
+
+            expect(
+                fixture.nativeElement
+                    .querySelector('.external-playback-dock__title')
+                    .textContent.trim()
+            ).toBe('CNN');
+        });
+
+        it('keeps VOD/episode titles untouched', () => {
+            fixture.componentRef.setInput('session', {
+                ...session,
+                title: 'US | Some Movie',
+                contentInfo: {
+                    playlistId: 'playlist-1',
+                    contentXtreamId: 42,
+                    contentType: 'vod',
+                },
+            });
+            fixture.detectChanges();
+
+            expect(
+                fixture.nativeElement
+                    .querySelector('.external-playback-dock__title')
+                    .textContent.trim()
+            ).toBe('US | Some Movie');
+        });
+    });
 });
diff --git a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.ts b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.ts
index af9e3d4a2..5e5713c83 100644
--- a/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.ts
+++ b/libs/ui/components/src/lib/external-playback-dock/external-playback-dock.component.ts
@@ -3,6 +3,7 @@ import {
     Component,
     computed,
     effect,
+    inject,
     input,
     output,
     signal,
@@ -12,6 +13,8 @@ import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { TranslatePipe } from '@ngx-translate/core';
 import { ExternalPlayerSession } from '@iptvnator/shared/interfaces';
+import { SettingsStore } from '@iptvnator/services';
+import { applyChannelNameStrip } from '@iptvnator/shared/m3u-utils';
 
 @Component({
     selector: 'app-external-playback-dock',
@@ -26,6 +29,8 @@ import { ExternalPlayerSession } from '@iptvnator/shared/interfaces';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ExternalPlaybackDockComponent {
+    private readonly settingsStore = inject(SettingsStore);
+
     readonly session = input.required<ExternalPlayerSession>();
     readonly compact = input(false);
 
@@ -33,6 +38,19 @@ export class ExternalPlaybackDockComponent {
     readonly artworkClicked = output<void>();
     private readonly artworkFailed = signal(false);
 
+    /**
+     * Sessions with contentInfo are tracked VOD/episode playback — their
+     * titles are movie/episode names, so the channel-prefix strip is
+     * applied only to sessions without it (live channels).
+     */
+    readonly displayTitle = computed(() =>
+        applyChannelNameStrip(
+            this.session().title,
+            !this.session().contentInfo &&
+                this.settingsStore.stripCountryPrefix?.()
+        )
+    );
+
     readonly playerLabel = computed(() => this.session().player.toUpperCase());
     readonly artworkUrl = computed(
         () => this.session().thumbnail?.trim() ?? ''
diff --git a/libs/ui/components/src/lib/season-container/season-container.component.html b/libs/ui/components/src/lib/season-container/season-container.component.html
index 427f5e276..0cb1f81ba 100644
--- a/libs/ui/components/src/lib/season-container/season-container.component.html
+++ b/libs/ui/components/src/lib/season-container/season-container.component.html
@@ -173,6 +173,25 @@
                                             >
                                                 <mat-icon>play_circle</mat-icon>
                                             </button>
+                                        } @else if (
+                                            isEpisodePaused(episode)
+                                        ) {
+                                            <button
+                                                mat-icon-button
+                                                class="download-btn download-btn--paused"
+                                                (click)="
+                                                    resumeEpisodeDownload(
+                                                        $event,
+                                                        episode
+                                                    )
+                                                "
+                                                [matTooltip]="
+                                                    'DOWNLOADS.RESUME'
+                                                        | translate
+                                                "
+                                            >
+                                                <mat-icon>play_arrow</mat-icon>
+                                            </button>
                                         } @else if (
                                             isEpisodeDownloading(episode)
                                         ) {
@@ -413,6 +432,22 @@
                                         >
                                             <mat-icon>folder_open</mat-icon>
                                         </button>
+                                    } @else if (isEpisodePaused(episode)) {
+                                        <button
+                                            mat-icon-button
+                                            class="action-btn"
+                                            (click)="
+                                                resumeEpisodeDownload(
+                                                    $event,
+                                                    episode
+                                                )
+                                            "
+                                            [matTooltip]="
+                                                'DOWNLOADS.RESUME' | translate
+                                            "
+                                        >
+                                            <mat-icon>play_arrow</mat-icon>
+                                        </button>
                                     } @else if (isEpisodeDownloading(episode)) {
                                         <button
                                             mat-icon-button
diff --git a/libs/ui/components/src/lib/season-container/season-container.component.scss b/libs/ui/components/src/lib/season-container/season-container.component.scss
index 40736e31f..ecf7c5860 100644
--- a/libs/ui/components/src/lib/season-container/season-container.component.scss
+++ b/libs/ui/components/src/lib/season-container/season-container.component.scss
@@ -394,6 +394,14 @@ app-season-tabs {
             color: rgba(255, 255, 255, 0.5) !important;
             cursor: not-allowed;
         }
+
+        .download-btn--paused {
+            color: #fbbf24 !important;
+
+            &:hover {
+                background: color-mix(in srgb, #fbbf24 20%, transparent);
+            }
+        }
     }
 
     &:hover {
diff --git a/libs/ui/components/src/lib/season-container/season-container.component.ts b/libs/ui/components/src/lib/season-container/season-container.component.ts
index f3b8cc857..6c9a05bf2 100644
--- a/libs/ui/components/src/lib/season-container/season-container.component.ts
+++ b/libs/ui/components/src/lib/season-container/season-container.component.ts
@@ -414,6 +414,35 @@ export class SeasonContainerComponent implements OnInit {
         );
     }
 
+    isEpisodePaused(episode: XtreamSerieEpisode): boolean {
+        if (!this.playlistId()) {
+            return false;
+        }
+
+        this.downloadsService.downloads();
+        return this.downloadsService.isPaused(
+            getEpisodeDownloadId(episode),
+            this.playlistId(),
+            'episode'
+        );
+    }
+
+    async resumeEpisodeDownload(
+        event: Event,
+        episode: XtreamSerieEpisode
+    ): Promise<void> {
+        event.stopPropagation();
+        if (!this.playlistId()) {
+            return;
+        }
+
+        await this.downloadsService.resumeDownloadByContent(
+            getEpisodeDownloadId(episode),
+            this.playlistId(),
+            'episode'
+        );
+    }
+
     async playFromLocal(event: Event, episode: XtreamSerieEpisode) {
         event.stopPropagation();
         if (!this.playlistId()) {
diff --git a/libs/ui/epg/src/lib/epg-progress-panel/epg-progress-panel.component.scss b/libs/ui/epg/src/lib/epg-progress-panel/epg-progress-panel.component.scss
index f3d46d3c2..61914a45c 100644
--- a/libs/ui/epg/src/lib/epg-progress-panel/epg-progress-panel.component.scss
+++ b/libs/ui/epg/src/lib/epg-progress-panel/epg-progress-panel.component.scss
@@ -120,6 +120,8 @@
     overflow-y: auto;
     padding: 4px 0;
     scrollbar-width: thin;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
 }
 
 .import-item {
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.spec.ts b/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.spec.ts
index 08fd1e6d9..badef32e9 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.spec.ts
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.spec.ts
@@ -64,10 +64,19 @@ describe('epg-archive.util', () => {
             ).toBe(false);
         });
 
-        it('denies when the programme is not in the past', () => {
+        it('allows start-over on the currently-airing programme', () => {
             expect(
                 canCatchUpProgramme('now', inWindowStart, true, 7, NOW)
+            ).toBe(true);
+        });
+
+        it('denies start-over when archive playback is unavailable', () => {
+            expect(
+                canCatchUpProgramme('now', inWindowStart, false, 7, NOW)
             ).toBe(false);
+        });
+
+        it('denies future programmes', () => {
             expect(
                 canCatchUpProgramme('future', NOW + 60_000, true, 7, NOW)
             ).toBe(false);
@@ -91,8 +100,8 @@ describe('epg-archive.util', () => {
             expect(epgDialogActionFor('now', false)).toBe('live');
         });
 
-        it('prefers live over timeshift for an on-air programme', () => {
-            expect(epgDialogActionFor('now', true)).toBe('live');
+        it('prefers start-over timeshift for a catch-up-able on-air programme', () => {
+            expect(epgDialogActionFor('now', true)).toBe('timeshift');
         });
 
         it('maps a catch-up-able past programme to timeshift', () => {
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.ts b/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.ts
index a529ce6d2..b7d491b20 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.ts
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-archive.util.ts
@@ -21,7 +21,8 @@ export function isWithinArchiveWindow(
     return startMs >= nowMs - archiveDays * DAY_MS;
 }
 
-/** Whether a past programme is playable from the catch-up archive. */
+/** Whether a programme is playable from the catch-up archive —
+ *  both past programmes and the currently-airing programme (start-over). */
 export function canCatchUpProgramme(
     when: TimelineWhen,
     startMs: number,
@@ -31,7 +32,7 @@ export function canCatchUpProgramme(
 ): boolean {
     return (
         archivePlaybackAvailable &&
-        when === 'past' &&
+        (when === 'past' || when === 'now') &&
         isWithinArchiveWindow(startMs, archiveDays, nowMs)
     );
 }
@@ -41,7 +42,7 @@ export function epgDialogActionFor(
     when: TimelineWhen,
     canCatchUp: boolean
 ): EpgItemDialogAction | null {
-    if (when === 'now') {
+    if (when === 'now' && !canCatchUp) {
         return 'live';
     }
     if (canCatchUp) {
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-render.util.ts b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-render.util.ts
index 1c730a98a..a7afd196b 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-render.util.ts
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-render.util.ts
@@ -109,7 +109,7 @@ function toRenderBlock(
         nowFillPercent: nowFillFor(block, nowMs),
         canCatchUp:
             archivePlaybackAvailable &&
-            block.when === 'past' &&
+            (block.when === 'past' || block.when === 'now') &&
             block.startMs >= archiveWindowStartMs,
     };
 }
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-scroll.controller.spec.ts b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-scroll.controller.spec.ts
index aa7ae36bd..0c4185104 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-scroll.controller.spec.ts
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-scroll.controller.spec.ts
@@ -8,6 +8,7 @@ import {
     buildTimelineBlocks,
     hasProgramsForDateKey,
     TIMELINE_MINUTE_MS,
+    TimelineBlock,
 } from './epg-timeline.utils';
 
 function programAt(
@@ -52,15 +53,73 @@ describe('TimelineScrollController', () => {
         });
     });
 
+    describe('focusCurrentProgram (target selection)', () => {
+        const axisStartMs = Date.UTC(2026, 0, 1);
+        const nowMs = axisStartMs + 3 * TIMELINE_MINUTE_MS;
+        const currentBlock: TimelineBlock = {
+            program: programAt(0, 2),
+            key: 'current',
+            startMs: axisStartMs + TIMELINE_MINUTE_MS,
+            stopMs: axisStartMs + 3 * TIMELINE_MINUTE_MS,
+            when: 'now',
+            offsetMin: 1,
+            durationMin: 2,
+        };
+
+        function controllerWith(
+            blocks: readonly TimelineBlock[]
+        ): TimelineScrollController {
+            return new TimelineScrollController({
+                ribbon: () => undefined,
+                scale: () => 1,
+                axis: () => ({
+                    startMs: axisStartMs,
+                    endMs: axisStartMs + 24 * 60 * TIMELINE_MINUTE_MS,
+                }),
+                blocks: () => blocks,
+                nowMs: () => nowMs,
+                viewDayKey: () => '2026-01-01',
+                commitDay: () => undefined,
+                hasProgramsForDay: () => true,
+            });
+        }
+
+        it('centres the midpoint of the current programme', () => {
+            const controller = controllerWith([currentBlock]);
+            const scrollSpy = jest
+                .spyOn(controller, 'scrollToOffset')
+                .mockImplementation(() => undefined);
+
+            controller.focusCurrentProgram(false);
+
+            expect(scrollSpy).toHaveBeenCalledWith(2, 0.5, false);
+        });
+
+        it('centres now when no programme is currently airing', () => {
+            const controller = controllerWith([
+                { ...currentBlock, when: 'future' },
+            ]);
+            const scrollSpy = jest
+                .spyOn(controller, 'scrollToOffset')
+                .mockImplementation(() => undefined);
+
+            controller.focusCurrentProgram(false);
+
+            expect(scrollSpy).toHaveBeenCalledWith(3, 0.5, false);
+        });
+    });
+
     describe('maybeAutoFocus (channel-select centring)', () => {
         let programs: EpgProgram[];
         let controller: TimelineScrollController;
         let scrollSpy: jest.SpyInstance;
         let commitDaySpy: jest.Mock;
+        let dateNowSpy: jest.SpyInstance;
 
         beforeEach(() => {
             programs = [];
             const nowMs = Date.now();
+            dateNowSpy = jest.spyOn(Date, 'now').mockReturnValue(nowMs);
             commitDaySpy = jest.fn();
             controller = new TimelineScrollController({
                 ribbon: () => undefined,
@@ -83,6 +142,8 @@ describe('TimelineScrollController', () => {
                 .mockImplementation(() => undefined);
         });
 
+        afterEach(() => dateNowSpy.mockRestore());
+
         function focus(
             scroller: HTMLElement | undefined,
             next: EpgProgram[] = programs
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.html b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.html
index ce0709cc6..30e604276 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.html
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.html
@@ -80,6 +80,15 @@
                     <span class="epg-timeline__tag is-now">{{
                         'EPG.TIMELINE.ON_NOW' | translate
                     }}</span>
+                    @if (item.canCatchUp) {
+                        <button
+                            type="button"
+                            class="epg-timeline__watch"
+                            (click)="watchClick.emit(item.block); $event.stopPropagation()"
+                        >
+                            <mat-icon>replay</mat-icon>
+                        </button>
+                    }
                 } @else if (isPlaying(item)) {
                     <span class="epg-timeline__tag is-arch">{{
                         'EPG.TIMELINE.FROM_ARCHIVE' | translate
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.scss b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.scss
index 801603a49..57cb96ef6 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.scss
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-timeline-track.component.scss
@@ -167,6 +167,9 @@ $font-mono: var(--font-mono, ui-monospace, 'SF Mono', Menlo, monospace);
     position: relative;
     z-index: 1;
     flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 }
 
 .epg-timeline__block-time {
diff --git a/libs/ui/epg/src/lib/epg-timeline/epg-timeline.component.ts b/libs/ui/epg/src/lib/epg-timeline/epg-timeline.component.ts
index 9ecc95204..1c7471de2 100644
--- a/libs/ui/epg/src/lib/epg-timeline/epg-timeline.component.ts
+++ b/libs/ui/epg/src/lib/epg-timeline/epg-timeline.component.ts
@@ -316,15 +316,15 @@ export class EpgTimelineComponent {
 
     onBlockClick(block: TimelineBlock): void {
         this.selectedKey.set(block.key);
-        if (block.when === 'now') {
-            this.returnToLive.emit();
-            return;
-        }
         if (this.canCatchUp(block)) {
             this.programActivated.emit({
                 program: block.program,
                 type: 'timeshift',
             });
+            return;
+        }
+        if (block.when === 'now') {
+            this.returnToLive.emit();
         }
     }
 
diff --git a/libs/ui/playback/src/index.ts b/libs/ui/playback/src/index.ts
index f3a4b4e7b..3f8e6fcb3 100644
--- a/libs/ui/playback/src/index.ts
+++ b/libs/ui/playback/src/index.ts
@@ -6,8 +6,11 @@ export * from './lib/embedded-mpv-player/embedded-mpv-session-controller';
 export * from './lib/external-player-info-dialog/external-player-info-dialog.component';
 export * from './lib/html-video-player/html-video-player.component';
 export * from './lib/playback-diagnostics/playback-diagnostics.util';
+export * from './lib/player-controls';
 export * from './lib/portal-inline-player/portal-inline-player.component';
 export * from './lib/portal-inline-player/series-playback-navigation';
+export * from './lib/portal-inline-player/up-next-rail.component';
+export * from './lib/portal-inline-player/up-next-rail.util';
 export * from './lib/vjs-player/vjs-player.component';
 export * from './lib/video-player/sidebar/sidebar.component';
 export * from './lib/vod-details/vod-details.component';
diff --git a/libs/ui/playback/src/lib/art-player/art-player-setup.spec.ts b/libs/ui/playback/src/lib/art-player/art-player-setup.spec.ts
new file mode 100644
index 000000000..f02a4b006
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-setup.spec.ts
@@ -0,0 +1,151 @@
+import {
+    buildArtPlayerChrome,
+    exitOwnedArtPlayerFullscreen,
+    getArtPlayerVideoType,
+    resolveArtPlayerIsLive,
+} from './art-player-setup';
+
+describe('ArtPlayer setup', () => {
+    it('preserves the complete legacy chrome when shared controls are disabled', () => {
+        expect(buildArtPlayerChrome(false)).toEqual({
+            pip: true,
+            autoPlayback: true,
+            autoSize: true,
+            autoMini: true,
+            screenshot: true,
+            setting: true,
+            playbackRate: true,
+            aspectRatio: true,
+            fullscreen: true,
+            fullscreenWeb: true,
+            airplay: true,
+        });
+    });
+
+    it('removes every duplicate ArtPlayer interaction surface in shared mode', () => {
+        expect(buildArtPlayerChrome(true)).toEqual({
+            controls: [],
+            pip: false,
+            autoPlayback: false,
+            autoSize: false,
+            autoMini: false,
+            screenshot: false,
+            setting: false,
+            playbackRate: false,
+            aspectRatio: false,
+            fullscreen: false,
+            fullscreenWeb: false,
+            airplay: false,
+            hotkey: false,
+            fastForward: false,
+            autoOrientation: false,
+            lock: false,
+            gesture: false,
+            miniProgressBar: false,
+            subtitleOffset: false,
+        });
+    });
+
+    it('uses authoritative live metadata only in shared mode', () => {
+        expect(
+            resolveArtPlayerIsLive(true, false, 'https://example.test/movie.ts')
+        ).toBe(false);
+        expect(
+            resolveArtPlayerIsLive(true, true, 'https://example.test/movie.mp4')
+        ).toBe(true);
+        expect(
+            resolveArtPlayerIsLive(
+                false,
+                false,
+                'https://example.test/movie.ts'
+            )
+        ).toBe(true);
+        expect(
+            resolveArtPlayerIsLive(
+                false,
+                true,
+                'https://example.test/movie.mp4'
+            )
+        ).toBe(false);
+    });
+
+    it('keeps extensionless IPTV URLs on MPEG-TS playback', () => {
+        expect(
+            getArtPlayerVideoType('https://example.test/live.php?id=7')
+        ).toBe('ts');
+        expect(
+            getArtPlayerVideoType(
+                'https://example.test/play?extension=m3u8&token=signed'
+            )
+        ).toBe('m3u8');
+        expect(getArtPlayerVideoType('https://example.test/movie.mkv')).toBe(
+            'video/matroska'
+        );
+    });
+
+    it('routes DASH manifests to the mpd custom type', () => {
+        expect(getArtPlayerVideoType('https://example.test/live.mpd')).toBe(
+            'mpd'
+        );
+        expect(
+            getArtPlayerVideoType(
+                'https://example.test/live.mpd?token=signed#frag'
+            )
+        ).toBe('mpd');
+    });
+
+    it('exits fullscreen only when the shared ArtPlayer shell owns it', () => {
+        const fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        const exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        const surface = document.createElement('div');
+        let fullscreenElement: Element | null = document.createElement('div');
+        const exitFullscreen = jest.fn().mockResolvedValue(undefined);
+        const reportError = jest.fn();
+
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            value: exitFullscreen,
+        });
+
+        try {
+            exitOwnedArtPlayerFullscreen(true, surface, reportError);
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            fullscreenElement = surface;
+            exitOwnedArtPlayerFullscreen(false, surface, reportError);
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            exitOwnedArtPlayerFullscreen(true, surface, reportError);
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+            expect(reportError).not.toHaveBeenCalled();
+        } finally {
+            restoreDocumentProperty(
+                'fullscreenElement',
+                fullscreenElementDescriptor
+            );
+            restoreDocumentProperty('exitFullscreen', exitFullscreenDescriptor);
+        }
+    });
+});
+
+function restoreDocumentProperty(
+    property: 'exitFullscreen' | 'fullscreenElement',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+
+    delete (document as unknown as Record<string, unknown>)[property];
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player-setup.ts b/libs/ui/playback/src/lib/art-player/art-player-setup.ts
new file mode 100644
index 000000000..9e78fe990
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-setup.ts
@@ -0,0 +1,104 @@
+import { getPlaybackMediaExtensionFromUrl } from '../playback-diagnostics/playback-diagnostics.util';
+
+/**
+ * ArtPlayer option overrides for the legacy and shared-control surfaces.
+ *
+ * The flag-off branch deliberately mirrors the existing runtime options. The
+ * flag-on branch disables every optional ArtPlayer interaction owner; a
+ * transparent capture surface blocks the core click/double-click handlers that
+ * ArtPlayer installs independently of these options.
+ */
+export function buildArtPlayerChrome(
+    sharedControls: boolean
+): Record<string, unknown> {
+    if (!sharedControls) {
+        return {
+            pip: true,
+            autoPlayback: true,
+            autoSize: true,
+            autoMini: true,
+            screenshot: true,
+            setting: true,
+            playbackRate: true,
+            aspectRatio: true,
+            fullscreen: true,
+            fullscreenWeb: true,
+            airplay: true,
+        };
+    }
+
+    return {
+        controls: [],
+        pip: false,
+        autoPlayback: false,
+        autoSize: false,
+        autoMini: false,
+        screenshot: false,
+        setting: false,
+        playbackRate: false,
+        aspectRatio: false,
+        fullscreen: false,
+        fullscreenWeb: false,
+        airplay: false,
+        hotkey: false,
+        fastForward: false,
+        autoOrientation: false,
+        lock: false,
+        gesture: false,
+        miniProgressBar: false,
+        subtitleOffset: false,
+    };
+}
+
+export function resolveArtPlayerIsLive(
+    sharedControls: boolean,
+    authoritativeIsLive: boolean,
+    url: string
+): boolean {
+    if (sharedControls) {
+        return authoritativeIsLive;
+    }
+
+    const extension = getPlaybackMediaExtensionFromUrl(url);
+    return extension === 'm3u8' || extension === 'ts' || !extension;
+}
+
+export function getArtPlayerVideoType(url: string): string {
+    const extension = getPlaybackMediaExtensionFromUrl(url);
+    switch (extension) {
+        case 'mkv':
+            return 'video/matroska';
+        case 'm3u8':
+            return 'm3u8';
+        case 'mp4':
+            return 'mp4';
+        case 'mpd':
+            return 'mpd';
+        case 'ts':
+            return 'ts';
+        default:
+            // Extensionless IPTV proxy/script URLs are predominantly raw
+            // MPEG-TS and retain the established ArtPlayer fallback.
+            return extension ? 'auto' : 'ts';
+    }
+}
+
+export function exitOwnedArtPlayerFullscreen(
+    sharedControls: boolean,
+    surface: HTMLElement | undefined,
+    reportError: (error: unknown) => void
+): void {
+    if (
+        !sharedControls ||
+        document.fullscreenElement !== surface ||
+        typeof document.exitFullscreen !== 'function'
+    ) {
+        return;
+    }
+
+    try {
+        void Promise.resolve(document.exitFullscreen()).catch(reportError);
+    } catch (error: unknown) {
+        reportError(error);
+    }
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player-source-session.captions.spec.ts b/libs/ui/playback/src/lib/art-player/art-player-source-session.captions.spec.ts
new file mode 100644
index 000000000..0e769e077
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-source-session.captions.spec.ts
@@ -0,0 +1,109 @@
+import {
+    MockHls,
+    createSession,
+    hlsInstances,
+    initArtPlayerSourceSessionModule,
+    resetArtPlayerSourceFixtures,
+} from './art-player-source-session.spec-fixtures';
+
+/**
+ * Regression coverage for #1155: with ArtPlayer's own chrome (shared controls
+ * off, the shipping default) the `showCaptions` preference reached no engine at
+ * all, so an HLS rendition flagged DEFAULT/AUTOSELECT kept subtitles on screen.
+ *
+ * The preference seeds each source here rather than staying authoritative, so
+ * the engine's caption menu still works once playback is running.
+ */
+describe('ArtPlayerSourceSession caption preference without shared controls', () => {
+    beforeAll(async () => {
+        await initArtPlayerSourceSessionModule();
+    });
+
+    beforeEach(() => {
+        resetArtPlayerSourceFixtures();
+    });
+
+    it('deselects the HLS default subtitle track while the preference is off', () => {
+        const { session, player, video } = startHls(() => false);
+
+        const hls = selectDefaultSubtitleTrack(hlsInstances[0]);
+
+        expect(hls.subtitleTrack).toBe(-1);
+        // Display stays enabled: hls.js applies `subtitleDisplay` to whatever
+        // the vendor caption menu picks, so suppressing it would make the menu
+        // inert while the preference is off.
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(player.video).toBe(video);
+        session.destroy();
+    });
+
+    it('keeps a selection made after playback started', () => {
+        const { session, video } = startHls(() => false);
+        const hls = selectDefaultSubtitleTrack(hlsInstances[0]);
+        expect(hls.subtitleTrack).toBe(-1);
+
+        video.dispatchEvent(new Event('playing'));
+        hls.subtitleTrack = 0;
+        hls.emit(MockHls.Events.SUBTITLE_TRACK_SWITCH);
+
+        expect(hls.subtitleTrack).toBe(0);
+        session.destroy();
+    });
+
+    it('keeps HLS subtitles selected while the preference is on', () => {
+        const { session } = startHls(() => true);
+
+        const hls = selectDefaultSubtitleTrack(hlsInstances[0]);
+
+        expect(hls.subtitleTrack).toBe(0);
+        session.destroy();
+    });
+
+    it('re-seeds the preference for a replacement source', () => {
+        const { session, player, video } = startHls(() => false);
+        video.dispatchEvent(new Event('playing'));
+
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/second.m3u8',
+            player
+        );
+        const replacement = selectDefaultSubtitleTrack(hlsInstances[1]);
+
+        expect(replacement.subtitleTrack).toBe(-1);
+        session.destroy();
+    });
+
+    it('stops touching the engine after the session is destroyed', () => {
+        const { session } = startHls(() => false);
+        const hls = hlsInstances[0];
+
+        session.destroy();
+        const untouched = selectDefaultSubtitleTrack(hls);
+
+        expect(untouched.subtitleTrack).toBe(0);
+    });
+
+    function startHls(showCaptions: () => boolean) {
+        const { session, player, video } = createSession({
+            sharedControls: false,
+            showCaptions,
+        });
+        session.attach(player);
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/live.m3u8',
+            player
+        );
+        return { session, player, video };
+    }
+
+    /** Mimics hls.js auto-selecting a DEFAULT/AUTOSELECT rendition. */
+    function selectDefaultSubtitleTrack(hls: MockHls): MockHls {
+        hls.subtitleTracks = [{ name: 'English' }];
+        hls.subtitleDisplay = true;
+        hls.subtitleTrack = 0;
+        hls.emit(MockHls.Events.SUBTITLE_TRACKS_UPDATED);
+        return hls;
+    }
+});
diff --git a/libs/ui/playback/src/lib/art-player/art-player-source-session.dash.spec.ts b/libs/ui/playback/src/lib/art-player/art-player-source-session.dash.spec.ts
new file mode 100644
index 000000000..dd48c9565
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-source-session.dash.spec.ts
@@ -0,0 +1,85 @@
+import type { ChannelDrm } from '@iptvnator/shared/interfaces';
+import {
+    createFakeShakaEnvironment,
+    flushShakaMicrotasks,
+} from '../shaka-engine/shaka-player-test-double';
+import {
+    createSession,
+    hlsInstances,
+    initArtPlayerSourceSessionModule,
+    mpegTsInstances,
+    resetArtPlayerSourceFixtures,
+} from './art-player-source-session.spec-fixtures';
+
+describe('ArtPlayerSourceSession DASH (mpd custom type)', () => {
+    beforeAll(async () => {
+        await initArtPlayerSourceSessionModule();
+    });
+
+    beforeEach(() => {
+        resetArtPlayerSourceFixtures();
+    });
+
+    it('starts the Shaka engine with channel DRM for the mpd custom type', async () => {
+        const fakeShaka = createFakeShakaEnvironment();
+        const drm: ChannelDrm = {
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { abc: 'def' },
+        };
+        const { session, player, video } = createSession({
+            sharedControls: true,
+            getDrm: () => drm,
+            loadShaka: fakeShaka.loader,
+        });
+        session.attach(player);
+
+        session.customType['mpd']?.(
+            video,
+            'https://example.test/live.mpd',
+            player
+        );
+        await flushShakaMicrotasks();
+
+        expect(fakeShaka.loaderCalls).toBe(1);
+        expect(fakeShaka.instances).toHaveLength(1);
+        expect(fakeShaka.instances[0].attachedTo).toBe(video);
+        expect(fakeShaka.instances[0].loadedUrls).toEqual([
+            'https://example.test/live.mpd',
+        ]);
+        expect(fakeShaka.instances[0].configureCalls).toEqual([
+            { drm: { clearKeys: { abc: 'def' } } },
+        ]);
+        expect(hlsInstances).toHaveLength(0);
+        expect(mpegTsInstances).toHaveLength(0);
+    });
+
+    it('destroys the Shaka engine when the source changes or the session dies', async () => {
+        const fakeShaka = createFakeShakaEnvironment();
+        const { session, player, video } = createSession({
+            sharedControls: false,
+            loadShaka: fakeShaka.loader,
+        });
+        session.attach(player);
+
+        session.customType['mpd']?.(
+            video,
+            'https://example.test/live.mpd',
+            player
+        );
+        await flushShakaMicrotasks();
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/live.m3u8',
+            player
+        );
+        await flushShakaMicrotasks();
+
+        expect(fakeShaka.instances[0].destroyCount).toBe(1);
+        expect(hlsInstances).toHaveLength(1);
+
+        session.destroy();
+        await flushShakaMicrotasks();
+        expect(fakeShaka.instances).toHaveLength(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/art-player/art-player-source-session.spec-fixtures.ts b/libs/ui/playback/src/lib/art-player/art-player-source-session.spec-fixtures.ts
new file mode 100644
index 000000000..cbc8b0ce5
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-source-session.spec-fixtures.ts
@@ -0,0 +1,193 @@
+import type Artplayer from 'artplayer';
+import type { ChannelDrm } from '@iptvnator/shared/interfaces';
+import type { PlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
+import { WebVideoControlsAdapter } from '../player-controls';
+import type { ShakaModuleLoader } from '../shaka-engine/shaka-module.types';
+import type { ArtPlayerSourceSession as ArtPlayerSourceSessionInstance } from './art-player-source-session';
+
+/**
+ * Shared engine mocks and session bootstrap for the ArtPlayerSourceSession
+ * spec files. Importing this module registers the hls.js/mpegts.js module
+ * mocks, so it must be imported before `initArtPlayerSourceSessionModule()`
+ * dynamically loads the session under test.
+ */
+
+export const hlsInstances: MockHls[] = [];
+export const mpegTsInstances: MockMpegTsPlayer[] = [];
+
+export class MockHls {
+    static Events = {
+        MANIFEST_PARSED: 'manifestParsed',
+        ERROR: 'error',
+        AUDIO_TRACKS_UPDATED: 'audioTracksUpdated',
+        AUDIO_TRACK_SWITCHING: 'audioTrackSwitching',
+        AUDIO_TRACK_SWITCHED: 'audioTrackSwitched',
+        SUBTITLE_TRACKS_UPDATED: 'subtitleTracksUpdated',
+        SUBTITLE_TRACKS_CLEARED: 'subtitleTracksCleared',
+        SUBTITLE_TRACK_SWITCH: 'subtitleTrackSwitch',
+        MANIFEST_LOADING: 'manifestLoading',
+    };
+
+    static isSupported = jest.fn(() => true);
+
+    readonly handlers = new Map<string, Array<(...args: unknown[]) => void>>();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            handlers.push(handler);
+            this.handlers.set(event, handlers);
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            this.handlers.set(
+                event,
+                handlers.filter((candidate) => candidate !== handler)
+            );
+        }
+    );
+    readonly attachMedia = jest.fn();
+    readonly loadSource = jest.fn();
+    readonly destroy = jest.fn();
+    audioTracks: Array<{ name?: string; lang?: string }> = [];
+    audioTrack = 0;
+    subtitleTracks: Array<{ name?: string; lang?: string }> = [];
+    subtitleTrack = -1;
+    subtitleDisplay = false;
+
+    constructor() {
+        hlsInstances.push(this);
+    }
+
+    emit(event: string, ...args: unknown[]): void {
+        for (const handler of this.handlers.get(event) ?? []) {
+            handler(...args);
+        }
+    }
+}
+
+export class MockMpegTsPlayer {
+    readonly handlers = new Map<string, (...args: unknown[]) => void>();
+    readonly attachMediaElement = jest.fn();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            this.handlers.set(event, handler);
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            if (this.handlers.get(event) === handler) {
+                this.handlers.delete(event);
+            }
+        }
+    );
+    readonly load = jest.fn();
+    readonly play = jest.fn(() => undefined as Promise<void> | void);
+    readonly pause = jest.fn();
+    readonly unload = jest.fn();
+    readonly detachMediaElement = jest.fn();
+    readonly destroy = jest.fn();
+
+    constructor() {
+        mpegTsInstances.push(this);
+    }
+}
+
+export const createMpegTsPlayer = jest.fn(() => new MockMpegTsPlayer());
+
+jest.unstable_mockModule('hls.js', () => ({
+    default: MockHls,
+}));
+
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: createMpegTsPlayer,
+        isSupported: jest.fn(() => true),
+    },
+}));
+
+let sessionConstructor:
+    | typeof import('./art-player-source-session').ArtPlayerSourceSession
+    | undefined;
+
+/** Loads the session module after the engine mocks above are registered. */
+export async function initArtPlayerSourceSessionModule(): Promise<void> {
+    ({ ArtPlayerSourceSession: sessionConstructor } = await import(
+        './art-player-source-session'
+    ));
+}
+
+export function resetArtPlayerSourceFixtures(): void {
+    hlsInstances.length = 0;
+    mpegTsInstances.length = 0;
+    createMpegTsPlayer
+        .mockClear()
+        .mockImplementation(() => new MockMpegTsPlayer());
+    MockHls.isSupported.mockReturnValue(true);
+}
+
+export function createSession({
+    sharedControls,
+    isLive = true,
+    showCaptions = () => false,
+    emitPlaybackIssue = () => undefined,
+    getDrm,
+    loadShaka,
+}: {
+    sharedControls: boolean;
+    isLive?: boolean;
+    showCaptions?: () => boolean;
+    emitPlaybackIssue?: (issue: PlaybackDiagnostic) => void;
+    getDrm?: () => ChannelDrm | undefined;
+    loadShaka?: ShakaModuleLoader;
+}): {
+    session: ArtPlayerSourceSessionInstance;
+    player: Artplayer;
+    video: HTMLVideoElement;
+    adapter: WebVideoControlsAdapter;
+    settingAdd: jest.Mock;
+} {
+    const video = document.createElement('video');
+    const settingAdd = jest.fn();
+    const player = {
+        video,
+        setting: { add: settingAdd },
+    } as unknown as Artplayer;
+    const adapter = new WebVideoControlsAdapter();
+    const Session = requireSessionConstructor();
+
+    return {
+        session: new Session({
+            sharedControls,
+            controlsAdapter: adapter,
+            isLive: () => isLive,
+            showCaptions,
+            emitPlaybackIssue,
+            getDrm,
+            loadShaka,
+        }),
+        player,
+        video,
+        adapter,
+        settingAdd,
+    };
+}
+
+function requireSessionConstructor(): typeof import('./art-player-source-session').ArtPlayerSourceSession {
+    if (!sessionConstructor) {
+        throw new Error(
+            'ArtPlayerSourceSession test module is not initialized'
+        );
+    }
+    return sessionConstructor;
+}
+
+export function createTimeRanges(ends: number[]): TimeRanges {
+    return {
+        length: ends.length,
+        start: () => 0,
+        end: (index: number) => ends[index],
+    };
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player-source-session.spec.ts b/libs/ui/playback/src/lib/art-player/art-player-source-session.spec.ts
new file mode 100644
index 000000000..05b7f031f
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-source-session.spec.ts
@@ -0,0 +1,243 @@
+import type { PlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    MockHls,
+    MockMpegTsPlayer,
+    createMpegTsPlayer,
+    createSession,
+    createTimeRanges,
+    hlsInstances,
+    initArtPlayerSourceSessionModule,
+    mpegTsInstances,
+    resetArtPlayerSourceFixtures,
+} from './art-player-source-session.spec-fixtures';
+
+describe('ArtPlayerSourceSession', () => {
+    beforeAll(async () => {
+        await initArtPlayerSourceSessionModule();
+    });
+
+    beforeEach(() => {
+        resetArtPlayerSourceFixtures();
+    });
+
+    it('binds HLS tracks to shared controls and tears every listener down exactly', () => {
+        const { session, player, video, adapter } = createSession({
+            sharedControls: true,
+        });
+        const attach = jest.spyOn(adapter, 'attach');
+        const detach = jest.spyOn(adapter, 'detach');
+        session.attach(player);
+        detach.mockClear();
+
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/live.m3u8',
+            player
+        );
+
+        const hls = hlsInstances[0];
+        hls.audioTracks = [{ name: 'Main' }, { name: 'Alternate' }];
+        hls.emit(MockHls.Events.AUDIO_TRACKS_UPDATED);
+
+        expect(attach).toHaveBeenCalledWith(
+            video,
+            expect.objectContaining({
+                getAudioTracks: expect.any(Function),
+                getSubtitleTracks: expect.any(Function),
+            })
+        );
+        expect(adapter.capabilities().audioTracks).toBe(true);
+        expect(hls.attachMedia).toHaveBeenCalledWith(video);
+        expect(hls.loadSource).toHaveBeenCalledWith(
+            'https://example.test/live.m3u8'
+        );
+
+        session.destroy();
+
+        expect(detach).toHaveBeenCalledTimes(1);
+        expect(hls.off).toHaveBeenCalledWith(
+            MockHls.Events.MANIFEST_PARSED,
+            expect.any(Function)
+        );
+        expect(hls.off).toHaveBeenCalledWith(
+            MockHls.Events.ERROR,
+            expect.any(Function)
+        );
+        expect(hls.off).toHaveBeenCalledWith(
+            MockHls.Events.AUDIO_TRACKS_UPDATED,
+            expect.any(Function)
+        );
+        expect(hls.destroy).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the legacy HLS audio menu and does not attach shared controls', () => {
+        const { session, player, video, adapter, settingAdd } = createSession({
+            sharedControls: false,
+        });
+        const attach = jest.spyOn(adapter, 'attach');
+        session.attach(player);
+
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/live.m3u8',
+            player
+        );
+        const hls = hlsInstances[0];
+        hls.audioTracks = [{ name: 'Main' }, { name: 'Alternate' }];
+        hls.emit(MockHls.Events.AUDIO_TRACKS_UPDATED);
+
+        expect(settingAdd).toHaveBeenCalledTimes(1);
+        expect(attach).not.toHaveBeenCalled();
+    });
+
+    it('uses authoritative VOD metadata for shared MPEG-TS and catches autoplay rejection', async () => {
+        const { session, player, video, adapter } = createSession({
+            sharedControls: true,
+            isLive: false,
+        });
+        const rejectedPlay = Promise.reject(new Error('autoplay blocked'));
+        const engine = new MockMpegTsPlayer();
+        engine.play.mockReturnValue(rejectedPlay);
+        createMpegTsPlayer.mockReturnValueOnce(engine);
+        Object.defineProperty(video, 'duration', {
+            configurable: true,
+            value: Number.POSITIVE_INFINITY,
+        });
+        Object.defineProperty(video, 'seekable', {
+            configurable: true,
+            value: createTimeRanges([135]),
+        });
+        session.attach(player);
+
+        session.customType['ts']?.(
+            video,
+            'https://example.test/movie.ts',
+            player
+        );
+        await rejectedPlay.catch(() => undefined);
+
+        expect(createMpegTsPlayer).toHaveBeenCalledWith({
+            type: 'mpegts',
+            isLive: false,
+            url: 'https://example.test/movie.ts',
+        });
+        expect(adapter.state()).toEqual(
+            expect.objectContaining({
+                isLive: false,
+                durationSeconds: 135,
+            })
+        );
+        expect(session.resolveDuration(Number.POSITIVE_INFINITY)).toBe(135);
+        expect(engine.attachMediaElement).toHaveBeenCalledWith(video);
+        expect(engine.load).toHaveBeenCalledTimes(1);
+        expect(engine.play).toHaveBeenCalledTimes(1);
+    });
+
+    it('preserves legacy live MPEG-TS semantics when the rollout flag is off', () => {
+        const { session, player, video } = createSession({
+            sharedControls: false,
+            isLive: false,
+        });
+        session.attach(player);
+
+        session.customType['ts']?.(
+            video,
+            'https://example.test/movie.ts',
+            player
+        );
+
+        expect(createMpegTsPlayer).toHaveBeenCalledWith({
+            type: 'mpegts',
+            isLive: true,
+            url: 'https://example.test/movie.ts',
+        });
+    });
+
+    it('reports HLS and MPEG-TS diagnostics from the session-local source', () => {
+        const emitted: PlaybackDiagnostic[] = [];
+        const { session, player, video } = createSession({
+            sharedControls: true,
+            emitPlaybackIssue: (issue) => emitted.push(issue),
+        });
+        session.attach(player);
+
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/live.m3u8',
+            player
+        );
+        const staleHlsError = hlsInstances[0].handlers.get(
+            MockHls.Events.ERROR
+        )?.[0];
+        hlsInstances[0].emit(MockHls.Events.ERROR, null, {
+            type: 'mediaError',
+            details: 'bufferAddCodecError',
+            fatal: true,
+            error: new Error('unsupported codec'),
+        });
+
+        session.customType['ts']?.(
+            video,
+            'https://example.test/live.ts',
+            player
+        );
+        staleHlsError?.(null, {
+            type: 'networkError',
+            details: 'stale callback',
+            fatal: true,
+        });
+        mpegTsInstances.at(-1)?.handlers.get('error')?.(
+            'mediaError',
+            'unsupported codec',
+            {}
+        );
+
+        expect(emitted).toEqual([
+            expect.objectContaining({
+                source: 'hls',
+                sourceUrl: 'https://example.test/live.m3u8',
+                player: 'artplayer',
+            }),
+            expect.objectContaining({
+                source: 'mpegts',
+                sourceUrl: 'https://example.test/live.ts',
+                player: 'artplayer',
+            }),
+        ]);
+    });
+
+    it('ignores a delayed customType callback after its player was destroyed', () => {
+        const { session, player, video } = createSession({
+            sharedControls: true,
+        });
+        session.attach(player);
+        session.destroy();
+
+        session.customType['m3u8']?.(
+            video,
+            'https://example.test/stale.m3u8',
+            player
+        );
+        session.customType['ts']?.(
+            video,
+            'https://example.test/stale.ts',
+            player
+        );
+
+        expect(hlsInstances).toHaveLength(0);
+        expect(createMpegTsPlayer).not.toHaveBeenCalled();
+    });
+
+    it('refreshes caption inputs only through the active shared bridge', () => {
+        const { session, player, adapter } = createSession({
+            sharedControls: true,
+        });
+        const refresh = jest.spyOn(adapter, 'refresh');
+        session.attach(player);
+        refresh.mockClear();
+
+        session.refreshInputs();
+
+        expect(refresh).toHaveBeenCalled();
+    });
+});
diff --git a/libs/ui/playback/src/lib/art-player/art-player-source-session.ts b/libs/ui/playback/src/lib/art-player/art-player-source-session.ts
new file mode 100644
index 000000000..eb6cedb3a
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-source-session.ts
@@ -0,0 +1,347 @@
+import type Artplayer from 'artplayer';
+import type { Option } from 'artplayer';
+import Hls, { type ErrorData, type ManifestParsedData } from 'hls.js';
+import mpegts from 'mpegts.js';
+import type { ChannelDrm } from '@iptvnator/shared/interfaces';
+import {
+    InlinePlaybackPlayer,
+    type PlaybackDiagnostic,
+    classifyHlsPlaybackIssue,
+    classifyMpegTsPlaybackIssue,
+    classifyUnsupportedHlsManifestCodecs,
+    createPlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.util';
+import type { WebVideoControlsAdapter } from '../player-controls';
+import type { ShakaModuleLoader } from '../shaka-engine/shaka-module.types';
+import { ShakaVideoSession } from '../shaka-engine/shaka-video-session';
+import {
+    type WebVideoControlsSource,
+    WebVideoSourceControlsBridge,
+} from '../web-video-support/web-video-source-controls.bridge';
+import { WebVideoSourceTracks } from '../web-video-support/web-video-source-tracks';
+import { addHlsAudioTrackSettings } from './art-player-audio-tracks';
+
+export interface ArtPlayerSourceSessionConfig {
+    sharedControls: boolean;
+    controlsAdapter: WebVideoControlsAdapter;
+    isLive: () => boolean;
+    showCaptions: () => boolean;
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void;
+    /** DRM config of the active channel, used by the DASH (`mpd`) engine. */
+    getDrm?: () => ChannelDrm | undefined;
+    /** Test seam for the lazily imported shaka-player module. */
+    loadShaka?: ShakaModuleLoader;
+}
+
+/**
+ * Owns ArtPlayer's custom source engines and the shared-controls track bridge.
+ *
+ * A session belongs to one ArtPlayer instance. Its customType callbacks use the
+ * callback-local `art` argument and become no-ops after destroy, so ArtPlayer's
+ * delayed URL dispatch cannot mutate a newer component player.
+ */
+export class ArtPlayerSourceSession {
+    readonly customType: NonNullable<Option['customType']> = {
+        m3u8: (video, url, art) => this.startHls(video, url, art),
+        mpd: (video, url) => this.startDash(video, url),
+        ts: (video, url) => this.startMpegTs(video, url),
+        'video/matroska': (video, url) => this.startNative(video, url),
+    };
+
+    private player: Artplayer | null = null;
+    private controlsBridge: WebVideoSourceControlsBridge | null = null;
+    /**
+     * Legacy (ArtPlayer chrome) counterpart of {@link controlsBridge}: keeps
+     * the `showCaptions` preference authoritative without a controls adapter.
+     */
+    private captionTracks: WebVideoSourceTracks | null = null;
+    private pendingControlsSource: WebVideoControlsSource = { kind: 'native' };
+    private hls: Hls | null = null;
+    private hlsManifestListener:
+        | ((event: unknown, data: ManifestParsedData) => void)
+        | null = null;
+    private hlsErrorListener:
+        | ((event: unknown, data: ErrorData) => void)
+        | null = null;
+    private mpegTsPlayer: mpegts.Player | null = null;
+    private mpegTsErrorListener:
+        | ((type: string, details: string, info: unknown) => void)
+        | null = null;
+    private shakaSession: ShakaVideoSession | null = null;
+    private destroyed = false;
+
+    constructor(private readonly config: ArtPlayerSourceSessionConfig) {}
+
+    attach(player: Artplayer): void {
+        if (this.destroyed || this.player) {
+            return;
+        }
+
+        this.player = player;
+        if (!this.config.sharedControls) {
+            this.captionTracks = new WebVideoSourceTracks({
+                video: player.video,
+                showCaptions: this.config.showCaptions,
+                vendorCaptionControls: true,
+            });
+            this.captionTracks.setSource(this.pendingControlsSource);
+            return;
+        }
+
+        const bridge = new WebVideoSourceControlsBridge({
+            video: player.video,
+            adapter: this.config.controlsAdapter,
+            isLive: this.config.isLive,
+            showCaptions: this.config.showCaptions,
+        });
+        this.controlsBridge = bridge;
+        bridge.attach();
+        bridge.setSource(this.pendingControlsSource);
+    }
+
+    refreshInputs(): void {
+        this.controlsBridge?.refreshInputs();
+        this.captionTracks?.refreshInputs();
+    }
+
+    resolveDuration(fallbackDuration: number): number {
+        const correctedDuration = this.controlsBridge?.readDuration() ?? NaN;
+        return Number.isNaN(correctedDuration)
+            ? fallbackDuration
+            : correctedDuration;
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.destroyed = true;
+        this.controlsBridge?.destroy();
+        this.controlsBridge = null;
+        this.captionTracks?.destroy();
+        this.captionTracks = null;
+        this.destroyHls();
+        this.destroyMpegTs();
+        this.shakaSession?.destroy();
+        this.shakaSession = null;
+        this.player = null;
+    }
+
+    private startHls(
+        video: HTMLVideoElement,
+        url: string,
+        art: Artplayer
+    ): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.prepareForSourceChange();
+        if (Hls.isSupported()) {
+            const hls = new Hls();
+            this.hls = hls;
+            this.hlsManifestListener = (_event, data) => {
+                if (this.destroyed || this.hls !== hls) {
+                    return;
+                }
+                this.handleHlsManifestParsed(url, data);
+            };
+            this.hlsErrorListener = (_event, data) => {
+                if (this.destroyed || this.hls !== hls) {
+                    return;
+                }
+                this.handleHlsError(url, data);
+            };
+            hls.on(Hls.Events.MANIFEST_PARSED, this.hlsManifestListener);
+            hls.on(Hls.Events.ERROR, this.hlsErrorListener);
+            hls.attachMedia(video);
+            this.bindControlsSource({ kind: 'hls', hls });
+            hls.loadSource(url);
+            if (!this.config.sharedControls) {
+                addHlsAudioTrackSettings(art, hls);
+            }
+            return;
+        }
+
+        if (video.canPlayType('application/vnd.apple.mpegurl')) {
+            video.src = url;
+            this.bindControlsSource({ kind: 'native' });
+        }
+    }
+
+    private startMpegTs(video: HTMLVideoElement, url: string): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.prepareForSourceChange();
+        if (!mpegts.isSupported()) {
+            return;
+        }
+        const engine = mpegts.createPlayer({
+            type: 'mpegts',
+            isLive: this.config.sharedControls ? this.config.isLive() : true,
+            url,
+        });
+        this.mpegTsPlayer = engine;
+        this.mpegTsErrorListener = (type, details, info) => {
+            if (this.destroyed || this.mpegTsPlayer !== engine) {
+                return;
+            }
+            this.config.emitPlaybackIssue(
+                classifyMpegTsPlaybackIssue(
+                    { type, details, info },
+                    this.createSourceMetadata(url, 'video/mp2t')
+                )
+            );
+        };
+
+        engine.attachMediaElement(video);
+        this.bindControlsSource({ kind: 'mpegts' });
+        engine.on(mpegts.Events.ERROR, this.mpegTsErrorListener);
+        engine.load();
+        const playResult = engine.play();
+        if (playResult) {
+            void playResult.catch(() => undefined);
+        }
+    }
+
+    private startDash(video: HTMLVideoElement, url: string): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.prepareForSourceChange();
+        const session = this.getShakaSession();
+        this.bindControlsSource({ kind: 'shaka', session });
+        session.start(video, url, this.config.getDrm?.());
+    }
+
+    private startNative(video: HTMLVideoElement, url: string): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.prepareForSourceChange();
+        video.src = url;
+        this.bindControlsSource({ kind: 'native' });
+    }
+
+    private prepareForSourceChange(): void {
+        this.controlsBridge?.clearSource();
+        this.captionTracks?.clearSource();
+        this.destroyHls();
+        this.destroyMpegTs();
+        this.shakaSession?.stop();
+    }
+
+    private getShakaSession(): ShakaVideoSession {
+        this.shakaSession ??= new ShakaVideoSession({
+            player: InlinePlaybackPlayer.ArtPlayer,
+            emitPlaybackIssue: (issue) =>
+                this.config.emitPlaybackIssue(issue),
+            showCaptions: this.config.showCaptions,
+            loadShaka: this.config.loadShaka,
+        });
+        return this.shakaSession;
+    }
+
+    private bindControlsSource(source: WebVideoControlsSource): void {
+        this.pendingControlsSource = source;
+        this.controlsBridge?.setSource(source);
+        this.captionTracks?.setSource(source);
+    }
+
+    private destroyHls(): void {
+        const hls = this.hls;
+        if (!hls) {
+            this.hlsManifestListener = null;
+            this.hlsErrorListener = null;
+            return;
+        }
+
+        if (this.hlsManifestListener) {
+            hls.off(Hls.Events.MANIFEST_PARSED, this.hlsManifestListener);
+        }
+        if (this.hlsErrorListener) {
+            hls.off(Hls.Events.ERROR, this.hlsErrorListener);
+        }
+        this.hlsManifestListener = null;
+        this.hlsErrorListener = null;
+        hls.destroy();
+        this.hls = null;
+    }
+
+    private destroyMpegTs(): void {
+        const engine = this.mpegTsPlayer;
+        if (!engine) {
+            this.mpegTsErrorListener = null;
+            return;
+        }
+
+        if (this.mpegTsErrorListener) {
+            engine.off(mpegts.Events.ERROR, this.mpegTsErrorListener);
+        }
+        this.mpegTsErrorListener = null;
+        engine.pause();
+        engine.unload();
+        engine.detachMediaElement();
+        engine.destroy();
+        this.mpegTsPlayer = null;
+    }
+
+    private handleHlsManifestParsed(
+        url: string,
+        data: ManifestParsedData
+    ): void {
+        const metadata = this.createSourceMetadata(
+            url,
+            'application/x-mpegURL',
+            data.levels
+                .map((level) => level.audioCodec)
+                .filter((codec): codec is string => Boolean(codec)),
+            data.levels
+                .map((level) => level.videoCodec)
+                .filter((codec): codec is string => Boolean(codec))
+        );
+        const issue = classifyUnsupportedHlsManifestCodecs(metadata);
+        if (issue) {
+            this.config.emitPlaybackIssue(issue);
+        }
+    }
+
+    private handleHlsError(url: string, data: ErrorData): void {
+        if (!data.fatal) {
+            return;
+        }
+
+        this.config.emitPlaybackIssue(
+            classifyHlsPlaybackIssue(
+                {
+                    type: data.type,
+                    details: data.details,
+                    fatal: data.fatal,
+                    message: data.error?.message,
+                    error: data.error,
+                },
+                this.createSourceMetadata(url, 'application/x-mpegURL')
+            )
+        );
+    }
+
+    private createSourceMetadata(
+        url: string,
+        mimeType?: string,
+        audioCodecs: readonly string[] = [],
+        videoCodecs: readonly string[] = []
+    ) {
+        return createPlaybackSourceMetadata({
+            url,
+            mimeType,
+            player: InlinePlaybackPlayer.ArtPlayer,
+            audioCodecs,
+            videoCodecs,
+        });
+    }
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player-video-session.spec.ts b/libs/ui/playback/src/lib/art-player/art-player-video-session.spec.ts
new file mode 100644
index 000000000..da0897083
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-video-session.spec.ts
@@ -0,0 +1,180 @@
+import type Artplayer from 'artplayer';
+import { ArtPlayerVideoSession } from './art-player-video-session';
+
+describe('ArtPlayerVideoSession', () => {
+    beforeEach(() => {
+        localStorage.clear();
+    });
+
+    it('owns ready, time, ended, and native diagnostic propagation', () => {
+        const player = createPlayer();
+        const issues: unknown[] = [];
+        const times: unknown[] = [];
+        const ended = jest.fn();
+        const session = new ArtPlayerVideoSession({
+            player,
+            sourceUrl: 'https://example.test/movie.mkv',
+            getStartTime: () => 42,
+            getDuration: () => player.duration,
+            persistSharedVolume: false,
+            emitPlaybackIssue: (issue) => issues.push(issue),
+            emitTimeUpdate: (value) => times.push(value),
+            emitPlaybackEnded: ended,
+        });
+        session.attach();
+
+        player.emit('ready');
+        expect(player.seek).toBe(42);
+
+        player.currentTime = 45;
+        player.duration = 120;
+        player.emit('video:timeupdate');
+        expect(times).toEqual([{ currentTime: 45, duration: 120 }]);
+
+        Object.defineProperty(player.video, 'error', {
+            configurable: true,
+            value: { code: 4, message: 'unsupported source' },
+        });
+        player.video.dispatchEvent(new Event('error'));
+        expect(issues.at(-1)).toEqual(
+            expect.objectContaining({
+                code: 'unsupported-container',
+                sourceUrl: 'https://example.test/movie.mkv',
+                player: 'artplayer',
+            })
+        );
+
+        player.video.dispatchEvent(new Event('loadeddata'));
+        player.video.dispatchEvent(new Event('playing'));
+        player.video.dispatchEvent(new Event('ended'));
+        expect(issues.slice(-2)).toEqual([null, null]);
+        expect(ended).toHaveBeenCalledTimes(1);
+    });
+
+    it('persists shared-control volume without changing legacy storage behavior', () => {
+        const sharedPlayer = createPlayer();
+        const sharedSession = createSession(sharedPlayer, true);
+        sharedSession.attach();
+        sharedPlayer.video.volume = 0.35;
+        sharedPlayer.video.dispatchEvent(new Event('volumechange'));
+        expect(localStorage.getItem('volume')).toBe('0.35');
+
+        localStorage.removeItem('volume');
+        const legacyPlayer = createPlayer();
+        const legacySession = createSession(legacyPlayer, false);
+        legacySession.attach();
+        legacyPlayer.video.volume = 0.7;
+        legacyPlayer.video.dispatchEvent(new Event('volumechange'));
+        expect(localStorage.getItem('volume')).toBeNull();
+    });
+
+    it('uses the source-resolved duration for time updates', () => {
+        const player = createPlayer();
+        const times: Array<{ currentTime: number; duration: number }> = [];
+        player.currentTime = 45;
+        player.duration = Number.POSITIVE_INFINITY;
+        const session = new ArtPlayerVideoSession({
+            player,
+            sourceUrl: 'https://example.test/movie.ts',
+            getStartTime: () => 0,
+            getDuration: () => 135,
+            persistSharedVolume: true,
+            emitPlaybackIssue: () => undefined,
+            emitTimeUpdate: (value) => times.push(value),
+            emitPlaybackEnded: () => undefined,
+        });
+        session.attach();
+
+        player.emit('video:timeupdate');
+
+        expect(times).toEqual([{ currentTime: 45, duration: 135 }]);
+    });
+
+    it('removes native and ArtPlayer listeners exactly on destroy', () => {
+        const player = createPlayer();
+        const ended = jest.fn();
+        const session = new ArtPlayerVideoSession({
+            player,
+            sourceUrl: 'https://example.test/movie.mp4',
+            getStartTime: () => 0,
+            getDuration: () => player.duration,
+            persistSharedVolume: true,
+            emitPlaybackIssue: () => undefined,
+            emitTimeUpdate: () => undefined,
+            emitPlaybackEnded: ended,
+        });
+        const removeEventListener = jest.spyOn(
+            player.video,
+            'removeEventListener'
+        );
+        session.attach();
+
+        session.destroy();
+        session.destroy();
+        player.video.dispatchEvent(new Event('ended'));
+        player.emit('video:timeupdate');
+
+        expect(removeEventListener).toHaveBeenCalledWith(
+            'ended',
+            expect.any(Function)
+        );
+        expect(player.off).toHaveBeenCalledWith('ready', expect.any(Function));
+        expect(player.off).toHaveBeenCalledWith(
+            'video:timeupdate',
+            expect.any(Function)
+        );
+        expect(ended).not.toHaveBeenCalled();
+    });
+});
+
+function createSession(
+    player: MockArtplayer,
+    persistSharedVolume: boolean
+): ArtPlayerVideoSession {
+    return new ArtPlayerVideoSession({
+        player,
+        sourceUrl: 'https://example.test/movie.mp4',
+        getStartTime: () => 0,
+        getDuration: () => player.duration,
+        persistSharedVolume,
+        emitPlaybackIssue: () => undefined,
+        emitTimeUpdate: () => undefined,
+        emitPlaybackEnded: () => undefined,
+    });
+}
+
+class MockArtplayer {
+    readonly video = document.createElement('video');
+    readonly handlers = new Map<string, Array<(...args: unknown[]) => void>>();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            handlers.push(handler);
+            this.handlers.set(event, handlers);
+            return this;
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            this.handlers.set(
+                event,
+                handlers.filter((candidate) => candidate !== handler)
+            );
+            return this;
+        }
+    );
+    currentTime = 0;
+    duration = 0;
+    seek = 0;
+
+    emit(event: string, ...args: unknown[]): void {
+        for (const handler of this.handlers.get(event) ?? []) {
+            handler(...args);
+        }
+    }
+}
+
+function createPlayer(): MockArtplayer & Artplayer {
+    return new MockArtplayer() as MockArtplayer & Artplayer;
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player-video-session.ts b/libs/ui/playback/src/lib/art-player/art-player-video-session.ts
new file mode 100644
index 000000000..20bf5ef20
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player-video-session.ts
@@ -0,0 +1,109 @@
+import type Artplayer from 'artplayer';
+import {
+    InlinePlaybackPlayer,
+    type PlaybackDiagnostic,
+    classifyNativePlaybackIssue,
+    createPlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+export interface ArtPlayerVideoSessionConfig {
+    player: Artplayer;
+    sourceUrl: string;
+    getStartTime: () => number;
+    getDuration: () => number;
+    persistSharedVolume: boolean;
+    emitPlaybackIssue: (issue: PlaybackDiagnostic | null) => void;
+    emitTimeUpdate: (value: { currentTime: number; duration: number }) => void;
+    emitPlaybackEnded: () => void;
+}
+
+/** Owns native video and ArtPlayer event listeners for one player instance. */
+export class ArtPlayerVideoSession {
+    private attached = false;
+    private destroyed = false;
+
+    private readonly handleNativePlaybackError = (): void => {
+        const { player, sourceUrl } = this.config;
+        this.config.emitPlaybackIssue(
+            classifyNativePlaybackIssue(
+                player.video.error,
+                createPlaybackSourceMetadata({
+                    url: sourceUrl || player.video.currentSrc,
+                    player: InlinePlaybackPlayer.ArtPlayer,
+                })
+            )
+        );
+    };
+
+    private readonly clearPlaybackIssue = (): void => {
+        this.config.emitPlaybackIssue(null);
+    };
+
+    private readonly handleVolumeChange = (): void => {
+        if (!this.config.persistSharedVolume) {
+            return;
+        }
+        localStorage.setItem(
+            'volume',
+            this.config.player.video.volume.toString()
+        );
+    };
+
+    private readonly handlePlaybackEnded = (): void => {
+        this.config.emitPlaybackEnded();
+    };
+
+    private readonly handleReady = (): void => {
+        const startTime = this.config.getStartTime();
+        if (startTime > 0) {
+            this.config.player.seek = startTime;
+        }
+    };
+
+    private readonly handleTimeUpdate = (): void => {
+        const player = this.config.player;
+        this.config.emitTimeUpdate({
+            currentTime: player.currentTime,
+            duration: this.config.getDuration(),
+        });
+    };
+
+    private readonly nativeListeners: ReadonlyArray<
+        readonly [event: string, listener: EventListener]
+    > = [
+        ['error', this.handleNativePlaybackError],
+        ['loadeddata', this.clearPlaybackIssue],
+        ['playing', this.clearPlaybackIssue],
+        ['volumechange', this.handleVolumeChange],
+        ['ended', this.handlePlaybackEnded],
+    ];
+
+    constructor(private readonly config: ArtPlayerVideoSessionConfig) {}
+
+    attach(): void {
+        if (this.attached || this.destroyed) {
+            return;
+        }
+
+        this.attached = true;
+        for (const [event, listener] of this.nativeListeners) {
+            this.config.player.video.addEventListener(event, listener);
+        }
+        this.config.player.on('ready', this.handleReady);
+        this.config.player.on('video:timeupdate', this.handleTimeUpdate);
+    }
+
+    destroy(): void {
+        if (!this.attached || this.destroyed) {
+            return;
+        }
+
+        this.destroyed = true;
+        this.attached = false;
+        for (const [event, listener] of this.nativeListeners) {
+            this.config.player.video.removeEventListener(event, listener);
+        }
+        this.config.player.off('ready', this.handleReady);
+        this.config.player.off('video:timeupdate', this.handleTimeUpdate);
+    }
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.html b/libs/ui/playback/src/lib/art-player/art-player.component.html
index b1d1d60c8..1aa103113 100644
--- a/libs/ui/playback/src/lib/art-player/art-player.component.html
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.html
@@ -1,9 +1,26 @@
-<div class="art-player-shell">
+<div
+    #playerRoot
+    class="art-player-shell"
+    [class.art-player-shell--shared-controls]="sharedControls"
+>
     <div #artplayer class="artplayer-container"></div>
 
-    <app-series-playback-navigation-controls
-        [navigation]="seriesNavigation"
-        (previousEpisodeRequested)="previousEpisodeRequested.emit()"
-        (nextEpisodeRequested)="nextEpisodeRequested.emit()"
-    />
+    @if (sharedControls) {
+        <div class="art-player-interaction-capture" aria-hidden="true"></div>
+        <app-player-controls
+            [controller]="controlsAdapter"
+            [playerSurface]="playerRoot"
+            [mediaTitle]="mediaTitle()"
+            [showControls]="interactionEnabled()"
+            [shortcutsEnabled]="interactionEnabled()"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    } @else {
+        <app-series-playback-navigation-controls
+            [navigation]="seriesNavigation()"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    }
 </div>
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.scss b/libs/ui/playback/src/lib/art-player/art-player.component.scss
index f1436d05e..62d96fdd5 100644
--- a/libs/ui/playback/src/lib/art-player/art-player.component.scss
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.scss
@@ -2,6 +2,8 @@
     display: block;
     width: 100%;
     height: 100%;
+    min-height: 0;
+    overflow: hidden;
 }
 
 .art-player-shell {
@@ -16,3 +18,40 @@
     width: 100%;
     height: 100%;
 }
+
+.art-player-shell--shared-controls {
+    isolation: isolate;
+
+    .artplayer-container {
+        position: relative;
+        z-index: 0;
+        isolation: isolate;
+    }
+
+    .art-player-interaction-capture {
+        position: absolute;
+        z-index: 1;
+        inset: 0;
+        pointer-events: auto;
+    }
+
+    // ArtPlayer's flags remove optional widgets, but its core mask, bottom bar,
+    // menus, notices and loading layer remain mounted. Scope all suppression to
+    // the rollout class so the default-off vendor skin is untouched.
+    ::ng-deep .art-video-player {
+        .art-bottom,
+        .art-mask,
+        .art-settings,
+        .art-contextmenus,
+        .art-info,
+        .art-notice,
+        .art-loading,
+        .art-layers {
+            display: none !important;
+        }
+
+        &.art-control-show .art-subtitle {
+            bottom: var(--art-subtitle-bottom);
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.shared-controls.spec.ts b/libs/ui/playback/src/lib/art-player/art-player.component.shared-controls.spec.ts
new file mode 100644
index 000000000..e5da6c9f9
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.shared-controls.spec.ts
@@ -0,0 +1,345 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import type { Channel } from '@iptvnator/shared/interfaces';
+import {
+    PlayerControlsComponent,
+    WEB_PLAYER_SHARED_CONTROLS,
+} from '../player-controls';
+import { PictureInPictureTestEnvironment } from '../player-controls/picture-in-picture.spec-helpers';
+import type { ArtPlayerComponent as ArtPlayerComponentInstance } from './art-player.component';
+
+const artPlayerInstances: MockArtplayer[] = [];
+
+class MockArtplayer {
+    static AUTO_PLAYBACK_TIMEOUT = 0;
+
+    readonly video = document.createElement('video');
+    readonly setting = { add: jest.fn() };
+    readonly handlers = new Map<string, Array<(...args: unknown[]) => void>>();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            handlers.push(handler);
+            this.handlers.set(event, handlers);
+            return this;
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            const handlers = this.handlers.get(event) ?? [];
+            this.handlers.set(
+                event,
+                handlers.filter((candidate) => candidate !== handler)
+            );
+            return this;
+        }
+    );
+    readonly destroy = jest.fn();
+    currentTime = 0;
+    duration = 0;
+    seek = 0;
+
+    constructor(readonly options: Record<string, unknown>) {
+        this.video.volume = Number(options['volume'] ?? 1);
+        const stored = JSON.parse(
+            localStorage.getItem('artplayer_settings') ?? '{}'
+        ) as { volume?: unknown };
+        if (typeof stored.volume === 'number') {
+            this.video.volume = stored.volume;
+        }
+        artPlayerInstances.push(this);
+    }
+
+    get volume(): number {
+        return this.video.volume;
+    }
+
+    set volume(value: number) {
+        this.video.volume = value;
+    }
+}
+
+class MockHls {
+    static Events = {
+        MANIFEST_PARSED: 'manifestParsed',
+        ERROR: 'error',
+        AUDIO_TRACKS_UPDATED: 'audioTracksUpdated',
+        AUDIO_TRACK_SWITCHING: 'audioTrackSwitching',
+        AUDIO_TRACK_SWITCHED: 'audioTrackSwitched',
+        SUBTITLE_TRACKS_UPDATED: 'subtitleTracksUpdated',
+        SUBTITLE_TRACKS_CLEARED: 'subtitleTracksCleared',
+        SUBTITLE_TRACK_SWITCH: 'subtitleTrackSwitch',
+        MANIFEST_LOADING: 'manifestLoading',
+    };
+    static isSupported = jest.fn(() => true);
+}
+
+jest.unstable_mockModule('artplayer', () => ({
+    default: MockArtplayer,
+}));
+
+jest.unstable_mockModule('hls.js', () => ({
+    default: MockHls,
+}));
+
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: jest.fn(),
+        isSupported: jest.fn(() => true),
+    },
+}));
+
+describe('ArtPlayerComponent with shared controls', () => {
+    let ArtPlayerComponent: typeof import('./art-player.component').ArtPlayerComponent;
+    let fixture: ComponentFixture<ArtPlayerComponentInstance>;
+    let component: ArtPlayerComponentInstance;
+
+    beforeAll(async () => {
+        ({ ArtPlayerComponent } = await import('./art-player.component'));
+    });
+
+    beforeEach(() => {
+        artPlayerInstances.length = 0;
+        localStorage.clear();
+
+        TestBed.configureTestingModule({
+            imports: [ArtPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true },
+            ],
+        });
+    });
+
+    afterEach(() => {
+        fixture?.destroy();
+    });
+
+    it('renders exactly one shared controls surface and disables vendor interaction owners', () => {
+        createComponent({
+            url: 'https://example.test/movie.mp4',
+            name: 'Movie',
+        });
+
+        const options = artPlayerInstances[0].options;
+        expect(options).toEqual(
+            expect.objectContaining({
+                controls: [],
+                pip: false,
+                autoPlayback: false,
+                autoSize: false,
+                autoMini: false,
+                setting: false,
+                fullscreen: false,
+                fullscreenWeb: false,
+                hotkey: false,
+                fastForward: false,
+                autoOrientation: false,
+            })
+        );
+        expect(
+            fixture.debugElement.queryAll(By.css('app-player-controls'))
+        ).toHaveLength(1);
+        expect(
+            fixture.debugElement.query(
+                By.css('.art-player-interaction-capture')
+            )
+        ).not.toBeNull();
+        expect(
+            fixture.debugElement.query(
+                By.css('app-series-playback-navigation-controls')
+            )
+        ).toBeNull();
+        expect(
+            fixture.debugElement
+                .query(By.css('.art-player-shell'))
+                .nativeElement.classList.contains(
+                    'art-player-shell--shared-controls'
+                )
+        ).toBe(true);
+    });
+
+    it('reapplies the app volume after ArtPlayer restores vendor storage', () => {
+        localStorage.setItem(
+            'artplayer_settings',
+            JSON.stringify({ volume: 0.2 })
+        );
+
+        createComponent(
+            {
+                url: 'https://example.test/movie.mp4',
+                name: 'Movie',
+            },
+            { volume: 0.8 }
+        );
+
+        expect(artPlayerInstances[0].video.volume).toBe(0.8);
+    });
+
+    it('keeps the vendor event capture active while diagnostics disable shared interaction', () => {
+        createComponent({
+            url: 'https://example.test/movie.mp4',
+            name: 'Movie',
+        });
+
+        fixture.componentRef.setInput('interactionEnabled', false);
+        fixture.detectChanges();
+
+        const controls = fixture.debugElement.query(
+            By.directive(PlayerControlsComponent)
+        ).componentInstance as PlayerControlsComponent;
+        expect(controls.showControls()).toBe(false);
+        expect(controls.shortcutsEnabled()).toBe(false);
+        expect(
+            fixture.debugElement.query(
+                By.css('.art-player-interaction-capture')
+            )
+        ).not.toBeNull();
+    });
+
+    it('updates shared series navigation without recreating the player', () => {
+        createComponent(
+            {
+                url: 'https://example.test/series/episode.mp4',
+                name: 'Episode',
+            },
+            { isLive: false }
+        );
+
+        fixture.componentRef.setInput('seriesNavigation', {
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        fixture.detectChanges();
+
+        expect(component.controlsAdapter.capabilities().seriesNavigation).toBe(
+            true
+        );
+        expect(component.controlsAdapter.state()).toEqual(
+            expect.objectContaining({
+                canPreviousEpisode: true,
+                canNextEpisode: false,
+            })
+        );
+        expect(artPlayerInstances).toHaveLength(1);
+    });
+
+    it('restarts the shared ArtPlayer session when authoritative live metadata changes', () => {
+        createComponent(
+            {
+                url: 'https://example.test/movie.ts',
+                name: 'Movie',
+            },
+            { isLive: true }
+        );
+
+        fixture.componentRef.setInput('isLive', false);
+        fixture.detectChanges();
+
+        expect(artPlayerInstances).toHaveLength(2);
+        expect(artPlayerInstances[1].options['isLive']).toBe(false);
+        expect(artPlayerInstances[0].destroy).toHaveBeenCalledTimes(1);
+    });
+
+    it('exits owned PiP when a channel change rebuilds ArtPlayer', () => {
+        const environment = new PictureInPictureTestEnvironment();
+        try {
+            createComponent({
+                url: 'https://example.test/movie-one.mp4',
+                name: 'Movie one',
+            });
+            const firstVideo = artPlayerInstances[0].video;
+            environment.installVideo(firstVideo);
+            firstVideo.dispatchEvent(new Event('loadedmetadata'));
+            environment.setActive(firstVideo);
+
+            fixture.componentRef.setInput('channel', {
+                url: 'https://example.test/movie-two.mp4',
+                name: 'Movie two',
+            });
+            fixture.detectChanges();
+
+            const replacementVideo = artPlayerInstances[1].video;
+            environment.installVideo(replacementVideo);
+            replacementVideo.dispatchEvent(new Event('loadedmetadata'));
+
+            expect(environment.exit).toHaveBeenCalledTimes(1);
+            expect(
+                component.controlsAdapter.state().pictureInPictureActive
+            ).toBe(false);
+            expect(
+                component.controlsAdapter.capabilities().pictureInPicture
+            ).toBe(true);
+        } finally {
+            environment.restore();
+        }
+    });
+
+    it('exits only the ArtPlayer shell fullscreen when interaction is disabled', () => {
+        const fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        const exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        let fullscreenElement: Element | null = null;
+        const exitFullscreen = jest.fn().mockResolvedValue(undefined);
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            value: exitFullscreen,
+        });
+
+        try {
+            createComponent({
+                url: 'https://example.test/movie.mp4',
+                name: 'Movie',
+            });
+            fullscreenElement = fixture.debugElement.query(
+                By.css('.art-player-shell')
+            ).nativeElement;
+
+            fixture.componentRef.setInput('interactionEnabled', false);
+            fixture.detectChanges();
+
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+        } finally {
+            restoreDocumentProperty(
+                'fullscreenElement',
+                fullscreenElementDescriptor
+            );
+            restoreDocumentProperty('exitFullscreen', exitFullscreenDescriptor);
+        }
+    });
+
+    function createComponent(
+        channel: Pick<Channel, 'url' | 'name'>,
+        inputs: { volume?: number; isLive?: boolean } = {}
+    ): void {
+        fixture = TestBed.createComponent(ArtPlayerComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput('channel', channel);
+        fixture.componentRef.setInput('volume', inputs.volume ?? 1);
+        fixture.componentRef.setInput('isLive', inputs.isLive ?? true);
+        fixture.detectChanges();
+    }
+});
+
+function restoreDocumentProperty(
+    property: 'exitFullscreen' | 'fullscreenElement',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+
+    delete (document as unknown as Record<string, unknown>)[property];
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.spec-fixtures.ts b/libs/ui/playback/src/lib/art-player/art-player.component.spec-fixtures.ts
new file mode 100644
index 000000000..edf8de332
--- /dev/null
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.spec-fixtures.ts
@@ -0,0 +1,111 @@
+export const artPlayerInstances: MockArtplayer[] = [];
+export const hlsInstances: MockHls[] = [];
+export const mpegTsInstances: MockMpegTsPlayer[] = [];
+
+export class MockArtplayer {
+    static AUTO_PLAYBACK_TIMEOUT = 0;
+
+    readonly video = document.createElement('video');
+    readonly setting = { add: jest.fn() };
+    readonly on = jest.fn();
+    readonly off = jest.fn();
+    readonly destroy = jest.fn();
+    readonly currentTime = 0;
+    readonly duration = 0;
+    seek = 0;
+    volume: number;
+
+    constructor(readonly options: Record<string, unknown>) {
+        this.volume = Number(options['volume'] ?? 1);
+        const stored = JSON.parse(
+            localStorage.getItem('artplayer_settings') ?? '{}'
+        ) as { volume?: unknown };
+        if (typeof stored.volume === 'number') {
+            this.volume = stored.volume;
+        }
+        artPlayerInstances.push(this);
+    }
+}
+
+export class MockHls {
+    static Events = {
+        MANIFEST_PARSED: 'manifestParsed',
+        ERROR: 'error',
+        AUDIO_TRACKS_UPDATED: 'audioTracksUpdated',
+        AUDIO_TRACK_SWITCHING: 'audioTrackSwitching',
+        AUDIO_TRACK_SWITCHED: 'audioTrackSwitched',
+        SUBTITLE_TRACKS_UPDATED: 'subtitleTracksUpdated',
+        SUBTITLE_TRACKS_CLEARED: 'subtitleTracksCleared',
+        SUBTITLE_TRACK_SWITCH: 'subtitleTrackSwitch',
+        MANIFEST_LOADING: 'manifestLoading',
+    };
+
+    static isSupported = jest.fn(() => true);
+
+    readonly handlers = new Map<string, (...args: unknown[]) => void>();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            this.handlers.set(event, handler);
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            if (this.handlers.get(event) === handler) {
+                this.handlers.delete(event);
+            }
+        }
+    );
+    readonly loadSource = jest.fn();
+    readonly attachMedia = jest.fn();
+    readonly destroy = jest.fn();
+    readonly audioTracks: unknown[] = [];
+
+    constructor() {
+        hlsInstances.push(this);
+    }
+}
+
+export class MockMpegTsPlayer {
+    readonly handlers = new Map<string, (...args: unknown[]) => void>();
+    readonly attachMediaElement = jest.fn();
+    readonly on = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            this.handlers.set(event, handler);
+        }
+    );
+    readonly off = jest.fn(
+        (event: string, handler: (...args: unknown[]) => void) => {
+            if (this.handlers.get(event) === handler) {
+                this.handlers.delete(event);
+            }
+        }
+    );
+    readonly load = jest.fn();
+    readonly play = jest.fn();
+    readonly pause = jest.fn();
+    readonly unload = jest.fn();
+    readonly detachMediaElement = jest.fn();
+    readonly destroy = jest.fn();
+
+    constructor() {
+        mpegTsInstances.push(this);
+    }
+}
+
+export function resetArtPlayerSpecFixtures(): void {
+    artPlayerInstances.length = 0;
+    hlsInstances.length = 0;
+    mpegTsInstances.length = 0;
+}
+
+export function getCustomType(
+    type: 'm3u8' | 'ts' | 'mkv'
+): (video: HTMLVideoElement, url: string) => void {
+    const customType = (
+        artPlayerInstances[0].options['customType'] as Record<
+            string,
+            (video: HTMLVideoElement, url: string, art: MockArtplayer) => void
+        >
+    )[type];
+    return (video, url) => customType(video, url, artPlayerInstances[0]);
+}
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.spec.ts b/libs/ui/playback/src/lib/art-player/art-player.component.spec.ts
index 4cdab391f..a122c07c6 100644
--- a/libs/ui/playback/src/lib/art-player/art-player.component.spec.ts
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.spec.ts
@@ -1,73 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Channel } from '@iptvnator/shared/interfaces';
+import { WEB_PLAYER_SHARED_CONTROLS } from '../player-controls';
 import type { ArtPlayerComponent as ArtPlayerComponentInstance } from './art-player.component';
-
-const artPlayerInstances: MockArtplayer[] = [];
-const hlsInstances: MockHls[] = [];
-const mpegTsInstances: MockMpegTsPlayer[] = [];
-
-class MockArtplayer {
-    static AUTO_PLAYBACK_TIMEOUT = 0;
-
-    readonly video = document.createElement('video');
-    readonly setting = { add: jest.fn() };
-    readonly on = jest.fn();
-    readonly destroy = jest.fn();
-    readonly currentTime = 0;
-    readonly duration = 0;
-    volume: number;
-
-    constructor(readonly options: Record<string, unknown>) {
-        this.volume = Number(options['volume'] ?? 1);
-        artPlayerInstances.push(this);
-    }
-}
-
-class MockHls {
-    static Events = {
-        MANIFEST_PARSED: 'manifestParsed',
-        ERROR: 'error',
-        AUDIO_TRACKS_UPDATED: 'audioTracksUpdated',
-    };
-
-    static isSupported = jest.fn(() => true);
-
-    readonly handlers = new Map<string, (...args: unknown[]) => void>();
-    readonly on = jest.fn(
-        (event: string, handler: (...args: unknown[]) => void) => {
-            this.handlers.set(event, handler);
-        }
-    );
-    readonly loadSource = jest.fn();
-    readonly attachMedia = jest.fn();
-    readonly destroy = jest.fn();
-    readonly audioTracks: unknown[] = [];
-
-    constructor() {
-        hlsInstances.push(this);
-    }
-}
-
-class MockMpegTsPlayer {
-    readonly handlers = new Map<string, (...args: unknown[]) => void>();
-    readonly attachMediaElement = jest.fn();
-    readonly on = jest.fn(
-        (event: string, handler: (...args: unknown[]) => void) => {
-            this.handlers.set(event, handler);
-        }
-    );
-    readonly load = jest.fn();
-    readonly play = jest.fn();
-    readonly pause = jest.fn();
-    readonly unload = jest.fn();
-    readonly detachMediaElement = jest.fn();
-    readonly destroy = jest.fn();
-
-    constructor() {
-        mpegTsInstances.push(this);
-    }
-}
+import {
+    MockArtplayer,
+    MockHls,
+    MockMpegTsPlayer,
+    artPlayerInstances,
+    getCustomType,
+    hlsInstances,
+    mpegTsInstances,
+    resetArtPlayerSpecFixtures,
+} from './art-player.component.spec-fixtures';
 
 jest.unstable_mockModule('artplayer', () => ({
     default: MockArtplayer,
@@ -97,12 +42,14 @@ describe('ArtPlayerComponent', () => {
     });
 
     beforeEach(() => {
-        artPlayerInstances.length = 0;
-        hlsInstances.length = 0;
-        mpegTsInstances.length = 0;
+        resetArtPlayerSpecFixtures();
+        localStorage.clear();
 
         TestBed.configureTestingModule({
             imports: [ArtPlayerComponent],
+            providers: [
+                { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: false },
+            ],
         });
     });
 
@@ -128,7 +75,7 @@ describe('ArtPlayerComponent', () => {
             },
         });
 
-        getCustomType('mkv')(
+        getCustomType('video/matroska')(
             artPlayerInstances[0].video,
             'https://example.com/archive/movie.mkv'
         );
@@ -224,6 +171,54 @@ describe('ArtPlayerComponent', () => {
         expect(artPlayerInstances).toHaveLength(1);
     });
 
+    it('applies a simultaneous volume change after rebuilding the legacy player', () => {
+        localStorage.setItem(
+            'artplayer_settings',
+            JSON.stringify({ volume: 0.2 })
+        );
+        createComponent({
+            url: 'https://example.com/live/first.m3u8',
+            name: 'First channel',
+        });
+
+        fixture.componentRef.setInput('channel', {
+            url: 'https://example.com/live/second.m3u8',
+            name: 'Second channel',
+        });
+        fixture.componentRef.setInput('volume', 0.73);
+        fixture.detectChanges();
+
+        expect(artPlayerInstances).toHaveLength(2);
+        expect(artPlayerInstances[1].volume).toBe(0.73);
+    });
+
+    it('keeps the complete ArtPlayer skin and legacy series controls when the flag is off', () => {
+        createComponent({
+            url: 'https://example.com/movie.mp4',
+            name: 'Movie',
+        });
+
+        expect(artPlayerInstances[0].options).toEqual(
+            expect.objectContaining({
+                autoPlayback: true,
+                autoSize: true,
+                autoMini: true,
+                setting: true,
+                fullscreen: true,
+                fullscreenWeb: true,
+            })
+        );
+        expect(artPlayerInstances[0].options['hotkey']).toBeUndefined();
+        expect(
+            fixture.debugElement.query(By.css('app-player-controls'))
+        ).toBeNull();
+        expect(
+            fixture.debugElement.query(
+                By.css('.art-player-interaction-capture')
+            )
+        ).toBeNull();
+    });
+
     it('emits a playback issue when mpegts.js reports an unsupported codec', () => {
         createComponent({
             url: 'https://example.com/live/channel.ts',
@@ -351,15 +346,4 @@ describe('ArtPlayerComponent', () => {
         fixture.componentRef.setInput('channel', channel);
         fixture.detectChanges();
     }
-
-    function getCustomType(
-        type: 'm3u8' | 'ts' | 'mkv'
-    ): (video: HTMLVideoElement, url: string) => void {
-        return (
-            artPlayerInstances[0].options['customType'] as Record<
-                string,
-                (video: HTMLVideoElement, url: string) => void
-            >
-        )[type];
-    }
 });
diff --git a/libs/ui/playback/src/lib/art-player/art-player.component.ts b/libs/ui/playback/src/lib/art-player/art-player.component.ts
index f4ccd861d..61cb5235f 100644
--- a/libs/ui/playback/src/lib/art-player/art-player.component.ts
+++ b/libs/ui/playback/src/lib/art-player/art-player.component.ts
@@ -1,256 +1,214 @@
 import {
     Component,
     ElementRef,
-    EventEmitter,
     inject,
-    Input,
+    input,
     OnChanges,
     OnDestroy,
     OnInit,
-    Output,
+    output,
+    signal,
     SimpleChanges,
+    viewChild,
 } from '@angular/core';
 import Artplayer from 'artplayer';
-import Hls, { type ErrorData, type ManifestParsedData } from 'hls.js';
-import mpegts from 'mpegts.js';
-import { Channel } from '@iptvnator/shared/interfaces';
-import { addHlsAudioTrackSettings } from './art-player-audio-tracks';
+import { Channel, createDevLogger } from '@iptvnator/shared/interfaces';
+import type { PlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
 import {
-    InlinePlaybackPlayer,
-    PlaybackDiagnostic,
-    classifyHlsPlaybackIssue,
-    classifyMpegTsPlaybackIssue,
-    classifyNativePlaybackIssue,
-    classifyUnsupportedHlsManifestCodecs,
-    createPlaybackSourceMetadata,
-    getPlaybackMediaExtensionFromUrl,
-} from '../playback-diagnostics/playback-diagnostics.util';
+    PlayerControlsComponent,
+    type PlayerMediaTitle,
+    WEB_PLAYER_SHARED_CONTROLS,
+    WebVideoControlsAdapter,
+} from '../player-controls';
 import { SeriesPlaybackNavigationControlsComponent } from '../portal-inline-player/series-playback-navigation-controls.component';
 import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import {
+    buildArtPlayerChrome,
+    exitOwnedArtPlayerFullscreen,
+    getArtPlayerVideoType,
+    resolveArtPlayerIsLive,
+} from './art-player-setup';
+import { ArtPlayerSourceSession } from './art-player-source-session';
+import { ArtPlayerVideoSession } from './art-player-video-session';
+
+const debugArtPlayer = createDevLogger('ArtPlayer');
 
 Artplayer.AUTO_PLAYBACK_TIMEOUT = 10000;
 
 @Component({
     selector: 'app-art-player',
-    imports: [SeriesPlaybackNavigationControlsComponent],
+    imports: [
+        PlayerControlsComponent,
+        SeriesPlaybackNavigationControlsComponent,
+    ],
+    providers: [WebVideoControlsAdapter],
     templateUrl: './art-player.component.html',
     styleUrls: ['./art-player.component.scss'],
 })
 export class ArtPlayerComponent implements OnInit, OnDestroy, OnChanges {
-    @Input() channel!: Channel;
-    @Input() volume = 1;
-    @Input() showCaptions = false;
-    @Input() startTime = 0;
-    @Input() seriesNavigation: SeriesPlaybackNavigation | null = null;
-    @Output() timeUpdate = new EventEmitter<{
+    readonly channel = input.required<Channel>();
+    readonly volume = input(1);
+    readonly showCaptions = input(false);
+    readonly startTime = input(0);
+    readonly seriesNavigation = input<SeriesPlaybackNavigation | null>(null);
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
+    readonly mediaTitle = input<PlayerMediaTitle | null>(null);
+
+    readonly timeUpdate = output<{
         currentTime: number;
         duration: number;
     }>();
-    @Output() playbackIssue = new EventEmitter<PlaybackDiagnostic | null>();
-    @Output() playbackEnded = new EventEmitter<void>();
-    @Output() previousEpisodeRequested = new EventEmitter<void>();
-    @Output() nextEpisodeRequested = new EventEmitter<void>();
+    readonly playbackIssue = output<PlaybackDiagnostic | null>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
 
-    private player!: Artplayer;
-    private hls: Hls | null = null;
-    private mpegtsPlayer: mpegts.Player | null = null;
+    readonly sharedControls = inject(WEB_PLAYER_SHARED_CONTROLS);
+    readonly controlsAdapter = inject(WebVideoControlsAdapter);
+    readonly playerRoot = viewChild<ElementRef<HTMLElement>>('playerRoot');
+    private readonly artplayerContainer =
+        viewChild.required<ElementRef<HTMLDivElement>>('artplayer');
+    private readonly seriesNavigationSignal =
+        signal<SeriesPlaybackNavigation | null>(null);
 
-    private readonly elementRef = inject(ElementRef);
-
-    private readonly handleNativePlaybackError = () => {
-        this.playbackIssue.emit(
-            classifyNativePlaybackIssue(
-                this.player?.video?.error,
-                this.createSourceMetadata(
-                    this.channel?.url ?? this.player?.video?.currentSrc ?? ''
-                )
-            )
-        );
-    };
-
-    private readonly clearPlaybackIssue = () => {
-        this.playbackIssue.emit(null);
-    };
-
-    private readonly handlePlaybackEnded = () => {
-        this.playbackEnded.emit();
-    };
+    private player: Artplayer | null = null;
+    private sourceSession: ArtPlayerSourceSession | null = null;
+    private videoSession: ArtPlayerVideoSession | null = null;
 
     ngOnInit(): void {
+        this.seriesNavigationSignal.set(this.seriesNavigation());
+        if (this.sharedControls) {
+            this.controlsAdapter.setContext({
+                seriesNavigation: this.seriesNavigationSignal,
+            });
+        }
         this.initPlayer();
     }
 
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['seriesNavigation']) {
+            this.seriesNavigationSignal.set(this.seriesNavigation());
+        }
+
+        const channelChanged =
+            changes['channel'] && !changes['channel'].firstChange;
+        const authoritativeLiveChanged =
+            this.sharedControls &&
+            changes['isLive'] &&
+            !changes['isLive'].firstChange &&
+            changes['isLive'].previousValue !== changes['isLive'].currentValue;
+        if (this.player && (channelChanged || authoritativeLiveChanged)) {
+            this.destroyPlayer();
+            this.initPlayer();
+        }
+
+        if (changes['showCaptions']) {
+            this.sourceSession?.refreshInputs();
+        }
+        if (changes['interactionEnabled']?.currentValue === false) {
+            exitOwnedArtPlayerFullscreen(
+                this.sharedControls,
+                this.playerRoot()?.nativeElement,
+                (error) =>
+                    debugArtPlayer(
+                        'Failed to exit ArtPlayer fullscreen:',
+                        error
+                    )
+            );
+        }
+        if (changes['volume']?.currentValue !== undefined && this.player) {
+            this.applyVolume(changes['volume'].currentValue);
+        }
+    }
+
     ngOnDestroy(): void {
         this.destroyPlayer();
     }
 
-    ngOnChanges(changes: SimpleChanges): void {
-        if (changes['channel'] && !changes['channel'].firstChange) {
-            this.destroyPlayer();
-            this.initPlayer();
-        }
-        if (changes['volume'] && this.player) {
-            this.applyVolume(changes['volume'].currentValue);
+    private initPlayer(): void {
+        this.playbackIssue.emit(null);
+        const channel = this.channel();
+        const sourceUrl = channel.url + (channel.epgParams ?? '');
+        const sourceSession = new ArtPlayerSourceSession({
+            sharedControls: this.sharedControls,
+            controlsAdapter: this.controlsAdapter,
+            isLive: () => this.isLive(),
+            showCaptions: () => this.showCaptions(),
+            emitPlaybackIssue: (issue) => this.playbackIssue.emit(issue),
+            getDrm: () => this.channel().drm,
+        });
+        this.sourceSession = sourceSession;
+
+        const player = new Artplayer({
+            container: this.artplayerContainer().nativeElement,
+            url: sourceUrl,
+            volume: this.clampVolume(this.volume()),
+            isLive: resolveArtPlayerIsLive(
+                this.sharedControls,
+                this.isLive(),
+                channel.url
+            ),
+            autoplay: true,
+            type: getArtPlayerVideoType(channel.url),
+            playsInline: true,
+            backdrop: true,
+            mutex: true,
+            theme: '#ff0000',
+            ...buildArtPlayerChrome(this.sharedControls),
+            customType: sourceSession.customType,
+        });
+        this.player = player;
+        sourceSession.attach(player);
+
+        const videoSession = new ArtPlayerVideoSession({
+            player,
+            sourceUrl: channel.url,
+            getStartTime: () => this.startTime(),
+            getDuration: () => sourceSession.resolveDuration(player.duration),
+            persistSharedVolume: this.sharedControls,
+            emitPlaybackIssue: (issue) => this.playbackIssue.emit(issue),
+            emitTimeUpdate: (value) => this.timeUpdate.emit(value),
+            emitPlaybackEnded: () => this.playbackEnded.emit(),
+        });
+        this.videoSession = videoSession;
+        videoSession.attach();
+
+        // ArtPlayer synchronously restores `artplayer_settings.volume` after
+        // applying the constructor option. Shared controls use the app-wide
+        // volume as authoritative, so reapply it directly to the media element.
+        if (this.sharedControls) {
+            this.applyVolume(this.volume());
         }
     }
 
     private destroyPlayer(): void {
-        if (this.mpegtsPlayer) {
-            this.mpegtsPlayer.pause();
-            this.mpegtsPlayer.unload();
-            this.mpegtsPlayer.detachMediaElement();
-            this.mpegtsPlayer.destroy();
-            this.mpegtsPlayer = null;
-        }
-        if (this.hls) {
-            this.hls.destroy();
-            this.hls = null;
-        }
-        if (this.player) {
-            this.player.video?.removeEventListener(
-                'error',
-                this.handleNativePlaybackError
-            );
-            this.player.video?.removeEventListener(
-                'loadeddata',
-                this.clearPlaybackIssue
-            );
-            this.player.video?.removeEventListener(
-                'playing',
-                this.clearPlaybackIssue
-            );
-            this.player.video?.removeEventListener(
-                'ended',
-                this.handlePlaybackEnded
-            );
-            this.player.destroy();
-        }
-    }
+        const sourceSession = this.sourceSession;
+        this.sourceSession = null;
+        sourceSession?.destroy();
 
-    private initPlayer(): void {
-        this.playbackIssue.emit(null);
-        const el = this.elementRef.nativeElement.querySelector(
-            '.artplayer-container'
-        );
-        const extension = getPlaybackMediaExtensionFromUrl(
-            this.channel?.url ?? ''
-        );
-        const isLive = extension === 'm3u8' || extension === 'ts' || !extension;
+        const videoSession = this.videoSession;
+        this.videoSession = null;
+        videoSession?.destroy();
 
-        this.player = new Artplayer({
-            container: el,
-            url: this.channel.url + (this.channel.epgParams || ''),
-            volume: this.clampVolume(this.volume),
-            isLive: isLive,
-            autoplay: true,
-            type: this.getVideoType(this.channel.url),
-            pip: true,
-            autoPlayback: true,
-            autoSize: true,
-            autoMini: true,
-            screenshot: true,
-            setting: true,
-            playbackRate: true,
-            aspectRatio: true,
-            fullscreen: true,
-            fullscreenWeb: true,
-            playsInline: true,
-            airplay: true,
-            backdrop: true,
-            mutex: true,
-            theme: '#ff0000',
-            customType: {
-                m3u8: (video: HTMLVideoElement, url: string) => {
-                    if (Hls.isSupported()) {
-                        if (this.hls) {
-                            this.hls.destroy();
-                        }
-                        this.hls = new Hls();
-                        this.hls.on(Hls.Events.MANIFEST_PARSED, (_, data) => {
-                            this.handleHlsManifestParsed(url, data);
-                        });
-                        this.hls.on(Hls.Events.ERROR, (_, data) => {
-                            this.handleHlsError(url, data);
-                        });
-                        this.hls.loadSource(url);
-                        this.hls.attachMedia(video);
-                        addHlsAudioTrackSettings(this.player, this.hls);
-                    } else if (
-                        video.canPlayType('application/vnd.apple.mpegurl')
-                    ) {
-                        video.src = url;
-                    }
-                },
-                ts: (video: HTMLVideoElement, url: string) => {
-                    if (mpegts.isSupported()) {
-                        if (this.mpegtsPlayer) {
-                            this.mpegtsPlayer.destroy();
-                        }
-                        this.mpegtsPlayer = mpegts.createPlayer({
-                            type: 'mpegts',
-                            isLive: true,
-                            url: url,
-                        });
-                        this.mpegtsPlayer.attachMediaElement(video);
-                        this.mpegtsPlayer.on(
-                            mpegts.Events.ERROR,
-                            (
-                                type: string,
-                                details: string,
-                                info: unknown
-                            ): void => {
-                                this.playbackIssue.emit(
-                                    classifyMpegTsPlaybackIssue(
-                                        {
-                                            type,
-                                            details,
-                                            info,
-                                        },
-                                        this.createSourceMetadata(
-                                            url,
-                                            'video/mp2t'
-                                        )
-                                    )
-                                );
-                            }
-                        );
-                        this.mpegtsPlayer.load();
-                        this.mpegtsPlayer.play();
-                    }
-                },
-                mkv: (video: HTMLVideoElement, url: string) => {
-                    video.src = url;
-                },
-            },
-        });
-
-        this.player.video.addEventListener(
-            'error',
-            this.handleNativePlaybackError
-        );
-        this.player.video.addEventListener(
-            'loadeddata',
-            this.clearPlaybackIssue
-        );
-        this.player.video.addEventListener('playing', this.clearPlaybackIssue);
-        this.player.video.addEventListener('ended', this.handlePlaybackEnded);
-
-        if (this.startTime > 0) {
-            this.player.on('ready', () => {
-                this.player.seek = this.startTime;
-            });
-        }
-
-        this.player.on('video:timeupdate', () => {
-            this.timeUpdate.emit({
-                currentTime: this.player.currentTime,
-                duration: this.player.duration,
-            });
-        });
+        const player = this.player;
+        this.player = null;
+        player?.destroy();
     }
 
     private applyVolume(value: number): void {
-        this.player.volume = this.clampVolume(value);
+        const player = this.player;
+        if (!player) {
+            return;
+        }
+
+        const volume = this.clampVolume(value);
+        if (this.sharedControls) {
+            player.video.volume = volume;
+            player.video.muted = volume <= 0;
+        } else {
+            player.volume = volume;
+        }
     }
 
     private clampVolume(value: number): number {
@@ -258,79 +216,6 @@ export class ArtPlayerComponent implements OnInit, OnDestroy, OnChanges {
         if (!Number.isFinite(numericValue)) {
             return 1;
         }
-
         return Math.max(0, Math.min(1, numericValue));
     }
-
-    private handleHlsManifestParsed(
-        url: string,
-        data: ManifestParsedData
-    ): void {
-        const metadata = this.createSourceMetadata(
-            url,
-            'application/x-mpegURL',
-            data.levels
-                .map((level) => level.audioCodec)
-                .filter((codec): codec is string => Boolean(codec)),
-            data.levels
-                .map((level) => level.videoCodec)
-                .filter((codec): codec is string => Boolean(codec))
-        );
-        const issue = classifyUnsupportedHlsManifestCodecs(metadata);
-        if (issue) {
-            this.playbackIssue.emit(issue);
-        }
-    }
-
-    private handleHlsError(url: string, data: ErrorData): void {
-        if (!data.fatal) {
-            return;
-        }
-
-        this.playbackIssue.emit(
-            classifyHlsPlaybackIssue(
-                {
-                    type: data.type,
-                    details: data.details,
-                    fatal: data.fatal,
-                    message: data.error?.message,
-                    error: data.error,
-                },
-                this.createSourceMetadata(url, 'application/x-mpegURL')
-            )
-        );
-    }
-
-    private getVideoType(url: string): string {
-        const extension = getPlaybackMediaExtensionFromUrl(url);
-        switch (extension) {
-            case 'mkv':
-                return 'video/matroska';
-            case 'm3u8':
-                return 'm3u8';
-            case 'mp4':
-                return 'mp4';
-            case 'ts':
-                return 'ts';
-            default:
-                // No recognized extension (e.g. IPTV proxy URL) → default to
-                // MPEG-TS which is the most common format for live IPTV streams.
-                return extension ? 'auto' : 'ts';
-        }
-    }
-
-    private createSourceMetadata(
-        url: string,
-        mimeType?: string,
-        audioCodecs: readonly string[] = [],
-        videoCodecs: readonly string[] = []
-    ) {
-        return createPlaybackSourceMetadata({
-            url,
-            mimeType,
-            player: InlinePlaybackPlayer.ArtPlayer,
-            audioCodecs,
-            videoCodecs,
-        });
-    }
 }
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.spec.ts
new file mode 100644
index 000000000..c79a09064
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.spec.ts
@@ -0,0 +1,329 @@
+import { signal } from '@angular/core';
+import { EmbeddedMpvSession } from '@iptvnator/shared/interfaces';
+import { EmbeddedMpvCommandRunner } from './embedded-mpv-command-runner';
+
+function createSession(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'mpv-1',
+        title: 'Example Movie',
+        streamUrl: 'https://example.com/movie.mp4',
+        status: 'playing',
+        positionSeconds: 10,
+        durationSeconds: 120,
+        volume: 0.7,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-06-02T00:00:00.000Z',
+        updatedAt: '2026-06-02T00:00:01.000Z',
+        ...overrides,
+    };
+}
+
+describe('EmbeddedMpvCommandRunner', () => {
+    const sessionId = signal<string | null>('mpv-1');
+    const session = signal<EmbeddedMpvSession | null>(createSession());
+    let runner: EmbeddedMpvCommandRunner;
+    let electron: Record<string, jest.Mock>;
+
+    const setBridge = (value: unknown) =>
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value,
+        });
+
+    beforeEach(() => {
+        sessionId.set('mpv-1');
+        session.set(createSession());
+        electron = {
+            setEmbeddedMpvPaused: jest
+                .fn()
+                .mockResolvedValue(createSession({ status: 'paused' })),
+            seekEmbeddedMpv: jest
+                .fn()
+                .mockResolvedValue(createSession({ positionSeconds: 42 })),
+            setEmbeddedMpvVolume: jest
+                .fn()
+                .mockResolvedValue(createSession({ volume: 0.3 })),
+            setEmbeddedMpvAudioTrack: jest.fn().mockResolvedValue(null),
+            setEmbeddedMpvSubtitleTrack: jest.fn().mockResolvedValue(null),
+            setEmbeddedMpvSpeed: jest
+                .fn()
+                .mockResolvedValue(createSession({ playbackSpeed: 1.5 })),
+            setEmbeddedMpvAspect: jest
+                .fn()
+                .mockResolvedValue(createSession({ aspectOverride: '16:9' })),
+            startEmbeddedMpvRecording: jest.fn().mockResolvedValue(
+                createSession({
+                    recording: { active: true, targetPath: '/tmp/rec.ts' },
+                })
+            ),
+            stopEmbeddedMpvRecording: jest.fn().mockResolvedValue(
+                createSession({
+                    recording: { active: false, targetPath: '/tmp/rec.ts' },
+                })
+            ),
+            getEmbeddedMpvDefaultRecordingFolder: jest
+                .fn()
+                .mockResolvedValue('/movies/recordings'),
+        };
+        setBridge(electron);
+        runner = new EmbeddedMpvCommandRunner({ sessionId, session });
+    });
+
+    afterEach(() => {
+        delete (window as unknown as { electron?: unknown }).electron;
+    });
+
+    it('togglePaused flips based on the current status and reconciles the snapshot', async () => {
+        await runner.togglePaused();
+        expect(electron.setEmbeddedMpvPaused).toHaveBeenCalledWith(
+            'mpv-1',
+            true
+        );
+        expect(session()?.status).toBe('paused');
+
+        await runner.togglePaused();
+        // Now paused → resume.
+        expect(electron.setEmbeddedMpvPaused).toHaveBeenLastCalledWith(
+            'mpv-1',
+            false
+        );
+    });
+
+    it('guards commands when no session id is set', async () => {
+        sessionId.set(null);
+        await runner.togglePaused();
+        expect(await runner.seekBy(10)).toBe(false);
+        await runner.seekTo(5);
+        await runner.applyVolume(0.5);
+        await runner.setSpeed(2);
+        expect(await runner.startRecording(undefined, 'Title')).toBeNull();
+        expect(await runner.stopRecording()).toBeNull();
+        expect(electron.setEmbeddedMpvPaused).not.toHaveBeenCalled();
+        expect(electron.seekEmbeddedMpv).not.toHaveBeenCalled();
+    });
+
+    it('guards session-dependent commands when the session snapshot is missing', async () => {
+        session.set(null);
+        await runner.togglePaused();
+        expect(await runner.seekBy(10)).toBe(false);
+        expect(electron.setEmbeddedMpvPaused).not.toHaveBeenCalled();
+        expect(electron.seekEmbeddedMpv).not.toHaveBeenCalled();
+    });
+
+    it('guards every command when the bridge method is unavailable', async () => {
+        setBridge({});
+        await runner.togglePaused();
+        expect(await runner.seekBy(5)).toBe(false);
+        await runner.seekTo(5);
+        await runner.applyVolume(0.4);
+        await runner.setAudioTrack(1);
+        await runner.setSubtitleTrack(2);
+        await runner.setSpeed(1.25);
+        await runner.setAspect('4:3');
+        expect(await runner.startRecording('/tmp', 'Title')).toBeNull();
+        expect(await runner.stopRecording()).toBeNull();
+        expect(session()?.status).toBe('playing');
+    });
+
+    it('seekTo seeks to an absolute position and reconciles the snapshot', async () => {
+        await runner.seekTo(42);
+        expect(electron.seekEmbeddedMpv).toHaveBeenCalledWith('mpv-1', 42);
+        expect(session()?.positionSeconds).toBe(42);
+    });
+
+    it('seekBy clamps to zero and reports that it ran', async () => {
+        expect(await runner.seekBy(-999)).toBe(true);
+        expect(electron.seekEmbeddedMpv).toHaveBeenCalledWith('mpv-1', 0);
+        expect(session()?.positionSeconds).toBe(42);
+    });
+
+    it('delegates track/speed/aspect commands and keeps state on null snapshots', async () => {
+        const before = session();
+        await runner.setAudioTrack(3);
+        await runner.setSubtitleTrack(-1);
+        expect(electron.setEmbeddedMpvAudioTrack).toHaveBeenCalledWith(
+            'mpv-1',
+            3
+        );
+        expect(electron.setEmbeddedMpvSubtitleTrack).toHaveBeenCalledWith(
+            'mpv-1',
+            -1
+        );
+        // Null snapshots must not clear the current session.
+        expect(session()).toBe(before);
+
+        await runner.setSpeed(1.5);
+        expect(session()?.playbackSpeed).toBe(1.5);
+        await runner.setAspect('16:9');
+        expect(session()?.aspectOverride).toBe('16:9');
+    });
+
+    it('swallows IPC errors and leaves the session untouched', async () => {
+        const current = session();
+        electron.seekEmbeddedMpv.mockRejectedValueOnce(
+            new Error('session disposed')
+        );
+        expect(await runner.seekBy(10)).toBe(true);
+        expect(session()).toBe(current);
+
+        electron.setEmbeddedMpvVolume.mockRejectedValueOnce(new Error('gone'));
+        await expect(runner.applyVolume(0.2)).resolves.toBeUndefined();
+        expect(session()).toBe(current);
+    });
+
+    it('ignores a command reply after the active session is replaced', async () => {
+        let resolveCommand:
+            | ((value: EmbeddedMpvSession | null) => void)
+            | null = null;
+        electron.seekEmbeddedMpv.mockImplementationOnce(
+            () =>
+                new Promise<EmbeddedMpvSession | null>((resolve) => {
+                    resolveCommand = resolve;
+                })
+        );
+
+        const pendingCommand = runner.seekTo(42);
+        const replacement = createSession({
+            id: 'mpv-2',
+            title: 'Replacement Movie',
+        });
+        sessionId.set('mpv-2');
+        session.set(replacement);
+        resolveCommand?.(createSession({ id: 'mpv-1', positionSeconds: 42 }));
+        await pendingCommand;
+
+        expect(session()).toBe(replacement);
+    });
+
+    it.each([
+        ['older', '2026-06-02T00:00:02.000Z'],
+        ['same-timestamp', '2026-06-02T00:00:03.000Z'],
+    ])(
+        'keeps a newer same-session snapshot when a %s command reply settles',
+        async (_, replyUpdatedAt) => {
+            let resolveCommand:
+                | ((value: EmbeddedMpvSession | null) => void)
+                | null = null;
+            electron.startEmbeddedMpvRecording.mockImplementationOnce(
+                () =>
+                    new Promise<EmbeddedMpvSession | null>((resolve) => {
+                        resolveCommand = resolve;
+                    })
+            );
+
+            const pendingRecording = runner.startRecording(
+                '/custom',
+                'My Show'
+            );
+            const acknowledged = createSession({
+                recording: {
+                    active: true,
+                    targetPath: '/tmp/rec.ts',
+                    startedAt: '2026-06-02T00:00:02.000Z',
+                },
+                updatedAt: '2026-06-02T00:00:03.000Z',
+            });
+            session.set(acknowledged);
+            resolveCommand?.(
+                createSession({
+                    recording: { active: false },
+                    updatedAt: replyUpdatedAt,
+                })
+            );
+
+            const recording = await pendingRecording;
+
+            expect(session()).toBe(acknowledged);
+            expect(recording).toEqual(acknowledged.recording);
+        }
+    );
+
+    it('startRecording resolves the default folder for blank directories', async () => {
+        const recording = await runner.startRecording('   ', 'My Show');
+        expect(
+            electron.getEmbeddedMpvDefaultRecordingFolder
+        ).toHaveBeenCalled();
+        expect(electron.startEmbeddedMpvRecording).toHaveBeenCalledWith(
+            'mpv-1',
+            { directory: '/movies/recordings', title: 'My Show' }
+        );
+        expect(recording).toEqual({ active: true, targetPath: '/tmp/rec.ts' });
+        expect(session()?.recording?.active).toBe(true);
+    });
+
+    it('does not start recording after the session changes during folder lookup', async () => {
+        let resolveFolder: ((folder: string) => void) | null = null;
+        electron.getEmbeddedMpvDefaultRecordingFolder.mockImplementationOnce(
+            () =>
+                new Promise<string>((resolve) => {
+                    resolveFolder = resolve;
+                })
+        );
+
+        const pendingRecording = runner.startRecording('   ', 'My Show');
+        expect(
+            electron.getEmbeddedMpvDefaultRecordingFolder
+        ).toHaveBeenCalled();
+        const replacement = createSession({
+            id: 'mpv-2',
+            title: 'Replacement Movie',
+        });
+        sessionId.set('mpv-2');
+        session.set(replacement);
+        resolveFolder?.('/movies/recordings');
+
+        const recording = await pendingRecording;
+
+        expect(electron.startEmbeddedMpvRecording).not.toHaveBeenCalled();
+        expect(recording).toBeNull();
+        expect(session()).toBe(replacement);
+    });
+
+    it('startRecording uses the explicit directory when provided', async () => {
+        await runner.startRecording('/custom/dir', 'My Show');
+        expect(
+            electron.getEmbeddedMpvDefaultRecordingFolder
+        ).not.toHaveBeenCalled();
+        expect(electron.startEmbeddedMpvRecording).toHaveBeenCalledWith(
+            'mpv-1',
+            { directory: '/custom/dir', title: 'My Show' }
+        );
+    });
+
+    it('startRecording returns null when the IPC call fails', async () => {
+        electron.startEmbeddedMpvRecording.mockRejectedValueOnce(
+            new Error('no disk')
+        );
+        expect(await runner.startRecording('/custom', 'Title')).toBeNull();
+    });
+
+    it('ignores a recording reply whose session id does not match the request', async () => {
+        const current = session();
+        electron.startEmbeddedMpvRecording.mockResolvedValueOnce(
+            createSession({
+                id: 'mpv-mismatch',
+                recording: { active: true, targetPath: '/tmp/rec.ts' },
+            })
+        );
+
+        const recording = await runner.startRecording('/custom', 'Title');
+
+        expect(recording).toBeNull();
+        expect(session()).toBe(current);
+    });
+
+    it('stopRecording returns the reconciled recording state', async () => {
+        const recording = await runner.stopRecording();
+        expect(electron.stopEmbeddedMpvRecording).toHaveBeenCalledWith('mpv-1');
+        expect(recording).toEqual({ active: false, targetPath: '/tmp/rec.ts' });
+        expect(session()?.recording).toEqual(recording);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.ts
new file mode 100644
index 000000000..06692fc43
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-command-runner.ts
@@ -0,0 +1,211 @@
+import { Signal, WritableSignal } from '@angular/core';
+import { EmbeddedMpvSession } from '@iptvnator/shared/interfaces';
+
+type ElectronBridge = Window['electron'];
+
+/**
+ * Context the {@link EmbeddedMpvCommandRunner} reads/writes. The controller owns
+ * the signals; the runner only delegates IPC and reconciles the returned
+ * snapshot back into `session`.
+ */
+export interface EmbeddedMpvCommandContext {
+    readonly sessionId: Signal<string | null>;
+    readonly session: WritableSignal<EmbeddedMpvSession | null>;
+}
+
+/**
+ * Thin IPC delegators for embedded-MPV transport/track/recording commands.
+ * Split out of the controller so each stays a one-liner around `guardIpc`,
+ * which swallows races where the session was torn down mid-call (the next
+ * broadcast snapshot resyncs state).
+ */
+export class EmbeddedMpvCommandRunner {
+    constructor(private readonly ctx: EmbeddedMpvCommandContext) {}
+
+    async togglePaused(): Promise<void> {
+        const id = this.ctx.sessionId();
+        const session = this.ctx.session();
+        const electron = this.bridge();
+        if (!id || !session || !electron?.setEmbeddedMpvPaused) {
+            return;
+        }
+        await this.run(id, () =>
+            electron.setEmbeddedMpvPaused(id, session.status !== 'paused')
+        );
+    }
+
+    async seekBy(deltaSeconds: number): Promise<boolean> {
+        const id = this.ctx.sessionId();
+        const session = this.ctx.session();
+        const electron = this.bridge();
+        if (!id || !session || !electron?.seekEmbeddedMpv) {
+            return false;
+        }
+        const next = Math.max(0, session.positionSeconds + deltaSeconds);
+        await this.run(id, () => electron.seekEmbeddedMpv(id, next));
+        return true;
+    }
+
+    async seekTo(seconds: number): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.seekEmbeddedMpv) {
+            return;
+        }
+        await this.run(id, () => electron.seekEmbeddedMpv(id, seconds));
+    }
+
+    async applyVolume(value: number): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.setEmbeddedMpvVolume) {
+            return;
+        }
+        await this.run(id, () => electron.setEmbeddedMpvVolume(id, value));
+    }
+
+    async setAudioTrack(trackId: number): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.setEmbeddedMpvAudioTrack) {
+            return;
+        }
+        await this.run(id, () =>
+            electron.setEmbeddedMpvAudioTrack(id, trackId)
+        );
+    }
+
+    async setSubtitleTrack(trackId: number): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.setEmbeddedMpvSubtitleTrack) {
+            return;
+        }
+        const setSubtitleTrack = electron.setEmbeddedMpvSubtitleTrack;
+        await this.run(id, () => setSubtitleTrack(id, trackId));
+    }
+
+    async setSpeed(speed: number): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.setEmbeddedMpvSpeed) {
+            return;
+        }
+        const setSpeed = electron.setEmbeddedMpvSpeed;
+        await this.run(id, () => setSpeed(id, speed));
+    }
+
+    async setAspect(aspect: string): Promise<void> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.setEmbeddedMpvAspect) {
+            return;
+        }
+        const setAspect = electron.setEmbeddedMpvAspect;
+        await this.run(id, () => setAspect(id, aspect));
+    }
+
+    async startRecording(
+        directory: string | undefined,
+        title: string
+    ): Promise<EmbeddedMpvSession['recording'] | null> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.startEmbeddedMpvRecording) {
+            return null;
+        }
+
+        const startEmbeddedMpvRecording = electron.startEmbeddedMpvRecording;
+        const resolvedDirectory =
+            directory?.trim() ||
+            (await electron.getEmbeddedMpvDefaultRecordingFolder?.());
+        if (this.ctx.sessionId() !== id) {
+            return null;
+        }
+        const updated = await this.run(id, () =>
+            startEmbeddedMpvRecording(id, {
+                directory: resolvedDirectory,
+                title,
+            })
+        );
+        return updated?.recording ?? null;
+    }
+
+    async stopRecording(): Promise<EmbeddedMpvSession['recording'] | null> {
+        const id = this.ctx.sessionId();
+        const electron = this.bridge();
+        if (!id || !electron?.stopEmbeddedMpvRecording) {
+            return null;
+        }
+        const stopEmbeddedMpvRecording = electron.stopEmbeddedMpvRecording;
+        const updated = await this.run(id, () => stopEmbeddedMpvRecording(id));
+        return updated?.recording ?? null;
+    }
+
+    /**
+     * Run an IPC call, reconcile the returned snapshot into `session`, and
+     * return it (or null when the call was swallowed). Errors are intentionally
+     * swallowed: the session may have been torn down or an addon-side throw may
+     * have raced the IPC — the next snapshot resyncs state.
+     */
+    private async run(
+        expectedSessionId: string,
+        call: () => Promise<EmbeddedMpvSession | null>
+    ): Promise<EmbeddedMpvSession | null> {
+        const sessionBeforeCall = this.ctx.session();
+        const updated = await this.guardIpc(call);
+        if (
+            !updated ||
+            this.ctx.sessionId() !== expectedSessionId ||
+            updated.id !== expectedSessionId
+        ) {
+            return null;
+        }
+        const current = this.ctx.session();
+        if (
+            current?.id === expectedSessionId &&
+            this.shouldKeepCurrentSnapshot(current, updated, sessionBeforeCall)
+        ) {
+            return current;
+        }
+        this.ctx.session.set(updated);
+        return updated;
+    }
+
+    /**
+     * Session broadcasts and invoke replies can cross in flight. Preserve a
+     * broadcast observed during this command when it is newer than the reply;
+     * for equal timestamps, renderer arrival order breaks the tie.
+     */
+    private shouldKeepCurrentSnapshot(
+        current: EmbeddedMpvSession,
+        candidate: EmbeddedMpvSession,
+        sessionBeforeCall: EmbeddedMpvSession | null
+    ): boolean {
+        const currentUpdatedAt = Date.parse(current.updatedAt);
+        const candidateUpdatedAt = Date.parse(candidate.updatedAt);
+        if (
+            !Number.isFinite(currentUpdatedAt) ||
+            !Number.isFinite(candidateUpdatedAt)
+        ) {
+            return false;
+        }
+        return (
+            currentUpdatedAt > candidateUpdatedAt ||
+            (currentUpdatedAt === candidateUpdatedAt &&
+                current !== sessionBeforeCall)
+        );
+    }
+
+    private async guardIpc<T>(call: () => Promise<T>): Promise<T | null> {
+        try {
+            return await call();
+        } catch {
+            return null;
+        }
+    }
+
+    private bridge(): ElectronBridge | undefined {
+        return window.electron;
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-feedback.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-feedback.ts
new file mode 100644
index 000000000..60979d4c0
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-feedback.ts
@@ -0,0 +1,42 @@
+import type { TranslateService } from '@ngx-translate/core';
+
+export const RECORDING_FEEDBACK = {
+    RAW: 'raw',
+    TRANSLATED: 'translated',
+} as const;
+
+export const RECORDING_TRANSLATION = {
+    START_FAILED: 'EMBEDDED_MPV.PLAYER.RECORDING_FAILED_TO_START',
+    STOP_FAILED: 'EMBEDDED_MPV.PLAYER.RECORDING_FAILED_TO_STOP',
+    SAVED_TO: 'EMBEDDED_MPV.PLAYER.SAVED_TO',
+} as const;
+
+type RecordingTranslationKey =
+    (typeof RECORDING_TRANSLATION)[keyof typeof RECORDING_TRANSLATION];
+
+interface RawRecordingFeedback {
+    readonly kind: typeof RECORDING_FEEDBACK.RAW;
+    readonly text: string;
+}
+
+interface TranslatedRecordingFeedback {
+    readonly kind: typeof RECORDING_FEEDBACK.TRANSLATED;
+    readonly key: RecordingTranslationKey;
+    readonly params?: Readonly<Record<string, string>>;
+}
+
+export type RecordingFeedback =
+    | RawRecordingFeedback
+    | TranslatedRecordingFeedback;
+
+export function resolveRecordingFeedback(
+    feedback: RecordingFeedback | null,
+    translate: TranslateService
+): string | null {
+    if (!feedback) {
+        return null;
+    }
+    return feedback.kind === RECORDING_FEEDBACK.RAW
+        ? feedback.text
+        : translate.instant(feedback.key, feedback.params);
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-timers.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-timers.ts
new file mode 100644
index 000000000..355d70572
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording-timers.ts
@@ -0,0 +1,65 @@
+import { signal } from '@angular/core';
+import type { RecordingFeedback } from './embedded-mpv-controls-recording-feedback';
+
+const RECORDING_ACK_TIMEOUT_MS = 5000;
+const RECORDING_MESSAGE_DISMISS_DELAY_MS = 5000;
+
+export class EmbeddedMpvControlsRecordingTimers {
+    private readonly feedbackState = signal<RecordingFeedback | null>(null);
+    readonly feedback = this.feedbackState.asReadonly();
+
+    private acknowledgementTimer: number | null = null;
+    private messageTimer: number | null = null;
+    private destroyed = false;
+
+    setFeedback(feedback: RecordingFeedback | null, autoDismiss = false): void {
+        if (this.destroyed) {
+            return;
+        }
+        this.clearMessage();
+        this.feedbackState.set(feedback);
+        if (!feedback || !autoDismiss) {
+            return;
+        }
+        const timerId = window.setTimeout(() => {
+            if (!this.destroyed && this.feedbackState() === feedback) {
+                this.feedbackState.set(null);
+            }
+            if (this.messageTimer === timerId) {
+                this.messageTimer = null;
+            }
+        }, RECORDING_MESSAGE_DISMISS_DELAY_MS);
+        this.messageTimer = timerId;
+    }
+
+    scheduleAcknowledgement(callback: () => void): void {
+        this.clearAcknowledgement();
+        this.acknowledgementTimer = window.setTimeout(() => {
+            this.acknowledgementTimer = null;
+            callback();
+        }, RECORDING_ACK_TIMEOUT_MS);
+    }
+
+    clearAcknowledgement(): void {
+        if (this.acknowledgementTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.acknowledgementTimer);
+        this.acknowledgementTimer = null;
+    }
+
+    destroy(): void {
+        this.destroyed = true;
+        this.clearAcknowledgement();
+        this.clearMessage();
+        this.feedbackState.set(null);
+    }
+
+    private clearMessage(): void {
+        if (this.messageTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.messageTimer);
+        this.messageTimer = null;
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording.ts
new file mode 100644
index 000000000..8f3f57782
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls-recording.ts
@@ -0,0 +1,350 @@
+import type {
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import {
+    RECORDING_FEEDBACK,
+    RECORDING_TRANSLATION,
+    type RecordingFeedback,
+} from './embedded-mpv-controls-recording-feedback';
+import { EmbeddedMpvControlsRecordingTimers } from './embedded-mpv-controls-recording-timers';
+import type { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const RECORDING_OPERATION = {
+    START: 'start',
+    STOP: 'stop',
+} as const;
+
+type RecordingOperation =
+    (typeof RECORDING_OPERATION)[keyof typeof RECORDING_OPERATION];
+
+interface RecordingOutcome {
+    readonly feedback: RecordingFeedback | null;
+    readonly autoDismiss?: boolean;
+    readonly expectedActive?: boolean;
+}
+
+interface PendingRecordingOperation {
+    readonly generation: number;
+    readonly kind: RecordingOperation;
+    readonly playbackIdentity: string;
+    readonly sessionId: string;
+    readonly expectedActive: boolean;
+    readonly initialError: string | null;
+    readonly targetPath: string | null;
+    readonly baselineSnapshotIdentity: string | null;
+    observedOutcome: RecordingOutcome | null;
+    timeoutFeedback: RecordingFeedback | null;
+    commandSettled: boolean;
+    sawErrorClear: boolean;
+}
+
+export interface RecordingToggleContext {
+    readonly folder: string;
+    readonly playback: ResolvedPortalPlayback;
+    readonly playbackIdentity: string;
+    readonly session: EmbeddedMpvSession;
+}
+
+export class EmbeddedMpvControlsRecording {
+    private readonly timers = new EmbeddedMpvControlsRecordingTimers();
+    readonly feedback = this.timers.feedback;
+
+    private pending: PendingRecordingOperation | null = null;
+    private operationGeneration = 0;
+    private ownerIdentity: string | null | undefined;
+    private destroyed = false;
+
+    constructor(
+        private readonly controller: EmbeddedMpvSessionController,
+        private readonly currentPlaybackIdentity: () => string | null
+    ) {}
+
+    toggle(context: RecordingToggleContext): void {
+        if (this.destroyed || this.pending) {
+            return;
+        }
+        const recording = context.session.recording;
+        const initialError = this.recordingError(context.session);
+        const kind = recording?.active
+            ? RECORDING_OPERATION.STOP
+            : RECORDING_OPERATION.START;
+        const generation = ++this.operationGeneration;
+        this.pending = {
+            generation,
+            kind,
+            playbackIdentity: context.playbackIdentity,
+            sessionId: context.session.id,
+            expectedActive: kind === RECORDING_OPERATION.START,
+            initialError,
+            targetPath: recording?.targetPath ?? null,
+            baselineSnapshotIdentity: this.recordingSnapshotIdentity(
+                context.session
+            ),
+            observedOutcome: null,
+            timeoutFeedback: null,
+            commandSettled: false,
+            sawErrorClear: initialError === null,
+        };
+        this.setFeedback(null);
+        this.timers.scheduleAcknowledgement(() =>
+            this.handleAcknowledgementTimeout(generation)
+        );
+        const command =
+            kind === RECORDING_OPERATION.START
+                ? this.controller.startRecording(
+                      context.folder,
+                      context.playback.title
+                  )
+                : this.controller.stopRecording();
+        void command.then(
+            () => this.markCommandSettled(generation),
+            () => this.markCommandSettled(generation)
+        );
+    }
+
+    reconcile(
+        session: EmbeddedMpvSession | null,
+        playbackIdentity: string | null
+    ): void {
+        const pending = this.pending;
+        if (!pending) {
+            return;
+        }
+        if (
+            !session ||
+            session.id !== pending.sessionId ||
+            playbackIdentity !== pending.playbackIdentity
+        ) {
+            this.cancelPending();
+            this.setFeedback(null);
+            return;
+        }
+        const observedOutcome = pending.observedOutcome;
+        if (
+            pending.commandSettled &&
+            observedOutcome?.expectedActive !== undefined &&
+            !this.recordingError(session) &&
+            session.recording?.active === observedOutcome.expectedActive
+        ) {
+            this.completePending(
+                observedOutcome.feedback,
+                observedOutcome.autoDismiss
+            );
+            return;
+        }
+        if (
+            this.recordingSnapshotIdentity(session) ===
+            pending.baselineSnapshotIdentity
+        ) {
+            return;
+        }
+        const recording = session.recording;
+        if (!recording) {
+            return;
+        }
+        const error = this.recordingError(session);
+        if (error) {
+            if (pending.sawErrorClear || error !== pending.initialError) {
+                this.observeOutcome(pending, {
+                    feedback: {
+                        kind: RECORDING_FEEDBACK.RAW,
+                        text: error,
+                    },
+                });
+            }
+            return;
+        }
+        pending.sawErrorClear = true;
+        if (recording.active !== pending.expectedActive) {
+            return;
+        }
+        if (pending.kind === RECORDING_OPERATION.START) {
+            this.observeOutcome(pending, {
+                feedback: null,
+                expectedActive: pending.expectedActive,
+            });
+            return;
+        }
+        const targetPath = recording.targetPath ?? pending.targetPath;
+        this.observeOutcome(pending, {
+            feedback: targetPath
+                ? {
+                      kind: RECORDING_FEEDBACK.TRANSLATED,
+                      key: RECORDING_TRANSLATION.SAVED_TO,
+                      params: { path: targetPath },
+                  }
+                : null,
+            autoDismiss: Boolean(targetPath),
+            expectedActive: pending.expectedActive,
+        });
+    }
+
+    syncOwner(playbackIdentity: string | null, sessionId: string | null): void {
+        const nextIdentity =
+            playbackIdentity === null
+                ? null
+                : JSON.stringify([playbackIdentity, sessionId]);
+        if (this.ownerIdentity === undefined) {
+            this.ownerIdentity = nextIdentity;
+            return;
+        }
+        if (this.ownerIdentity === nextIdentity) {
+            return;
+        }
+        this.ownerIdentity = nextIdentity;
+        this.setFeedback(null);
+        if (
+            this.pending &&
+            (this.pending.playbackIdentity !== playbackIdentity ||
+                this.pending.sessionId !== sessionId)
+        ) {
+            this.cancelPending();
+        }
+    }
+
+    destroy(): void {
+        this.destroyed = true;
+        this.cancelPending();
+        this.timers.destroy();
+    }
+
+    private handleAcknowledgementTimeout(generation: number): void {
+        let pending = this.pending;
+        if (!pending || pending.generation !== generation) {
+            return;
+        }
+        this.reconcile(
+            this.controller.session(),
+            this.currentPlaybackIdentity()
+        );
+        pending = this.pending;
+        if (
+            !pending ||
+            pending.generation !== generation ||
+            (pending.observedOutcome && !pending.commandSettled)
+        ) {
+            return;
+        }
+        const currentSession = this.controller.session();
+        const currentOwnerIdentity = JSON.stringify([
+            pending.playbackIdentity,
+            pending.sessionId,
+        ]);
+        const error =
+            currentSession?.id === pending.sessionId &&
+            this.ownerIdentity === currentOwnerIdentity
+                ? this.recordingError(currentSession)
+                : null;
+        const feedback: RecordingFeedback = {
+            ...(error
+                ? { kind: RECORDING_FEEDBACK.RAW, text: error }
+                : {
+                      kind: RECORDING_FEEDBACK.TRANSLATED,
+                      key:
+                          pending.kind === RECORDING_OPERATION.START
+                              ? RECORDING_TRANSLATION.START_FAILED
+                              : RECORDING_TRANSLATION.STOP_FAILED,
+                  }),
+        };
+        pending.timeoutFeedback = feedback;
+        if (pending.commandSettled) {
+            this.completePending(feedback);
+            return;
+        }
+        this.setFeedback(feedback);
+    }
+
+    private markCommandSettled(generation: number): void {
+        const pending = this.pending;
+        if (!pending || pending.generation !== generation) {
+            return;
+        }
+        pending.commandSettled = true;
+        this.reconcile(
+            this.controller.session(),
+            this.currentPlaybackIdentity()
+        );
+        const reconciledPending = this.pending;
+        if (!reconciledPending || reconciledPending.generation !== generation) {
+            return;
+        }
+        const outcome = reconciledPending.observedOutcome;
+        if (outcome && outcome.expectedActive === undefined) {
+            this.completePending(outcome.feedback, outcome.autoDismiss);
+            return;
+        }
+        if (outcome) {
+            this.setFeedback(outcome.feedback);
+            this.timers.scheduleAcknowledgement(() =>
+                this.handleAcknowledgementTimeout(generation)
+            );
+            return;
+        }
+        if (reconciledPending.timeoutFeedback) {
+            this.completePending(reconciledPending.timeoutFeedback);
+        }
+    }
+
+    private observeOutcome(
+        pending: PendingRecordingOperation,
+        outcome: RecordingOutcome
+    ): void {
+        if (this.pending !== pending || pending.observedOutcome) {
+            return;
+        }
+        pending.observedOutcome = outcome;
+        this.timers.clearAcknowledgement();
+        if (pending.commandSettled) {
+            this.completePending(outcome.feedback, outcome.autoDismiss);
+        } else if (
+            pending.timeoutFeedback ||
+            outcome.feedback?.kind === RECORDING_FEEDBACK.RAW
+        ) {
+            this.setFeedback(outcome.feedback, outcome.autoDismiss);
+        }
+    }
+
+    private recordingSnapshotIdentity(
+        session: EmbeddedMpvSession | null
+    ): string | null {
+        if (!session) {
+            return null;
+        }
+        const recording = session.recording;
+        return JSON.stringify([
+            session.id,
+            recording?.active ?? false,
+            recording?.targetPath ?? null,
+            recording?.startedAt ?? null,
+            recording?.error ?? null,
+        ]);
+    }
+
+    private recordingError(session: EmbeddedMpvSession): string | null {
+        const error = session.recording?.error;
+        return error?.trim() ? error : null;
+    }
+
+    private completePending(
+        feedback: RecordingFeedback | null,
+        autoDismiss = false
+    ): void {
+        this.timers.clearAcknowledgement();
+        this.pending = null;
+        this.setFeedback(feedback, autoDismiss);
+    }
+
+    private cancelPending(): void {
+        this.operationGeneration += 1;
+        this.pending = null;
+        this.timers.clearAcknowledgement();
+    }
+
+    private setFeedback(
+        feedback: RecordingFeedback | null,
+        autoDismiss = false
+    ): void {
+        this.timers.setFeedback(feedback, autoDismiss);
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.command-order.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.command-order.spec.ts
new file mode 100644
index 000000000..f9786f23c
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.command-order.spec.ts
@@ -0,0 +1,397 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const ACK_TIMEOUT_MS = 5000;
+const LIVE_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/live',
+    title: 'Live news',
+    isLive: true,
+};
+
+interface Deferred<T> {
+    readonly promise: Promise<T>;
+    readonly resolve: (value: T) => void;
+}
+
+type RecordingState = EmbeddedMpvSession['recording'] | null;
+
+function deferred<T>(): Deferred<T> {
+    let resolve!: (value: T) => void;
+    const promise = new Promise<T>((resolver) => {
+        resolve = resolver;
+    });
+    return { promise, resolve };
+}
+
+function support(): EmbeddedMpvSupport {
+    return {
+        supported: true,
+        platform: 'darwin',
+        engine: 'frame-copy',
+        capabilities: {
+            subtitles: true,
+            playbackSpeed: true,
+            aspectOverride: true,
+            screenshot: false,
+            recording: true,
+        },
+    };
+}
+
+function session(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'session-1',
+        title: LIVE_PLAYBACK.title,
+        streamUrl: LIVE_PLAYBACK.streamUrl,
+        status: 'playing',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-07-16T10:00:00.000Z',
+        updatedAt: '2026-07-16T10:00:01.000Z',
+        ...overrides,
+    };
+}
+
+function createController() {
+    return {
+        support: signal<EmbeddedMpvSupport | null>(support()),
+        session: signal<EmbeddedMpvSession | null>(session()),
+        stalled: signal(false),
+        togglePaused: jest.fn<Promise<void>, []>().mockResolvedValue(undefined),
+        seekTo: jest.fn<Promise<void>, [number]>().mockResolvedValue(undefined),
+        seekBy: jest.fn<Promise<boolean>, [number]>().mockResolvedValue(true),
+        applyVolume: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAudioTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSubtitleTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSpeed: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAspect: jest
+            .fn<Promise<void>, [string]>()
+            .mockResolvedValue(undefined),
+        startRecording: jest
+            .fn<Promise<RecordingState>, [string | undefined, string]>()
+            .mockResolvedValue({ active: false }),
+        stopRecording: jest
+            .fn<Promise<RecordingState>, []>()
+            .mockResolvedValue({ active: true }),
+    };
+}
+
+function translations(): object {
+    return {
+        EMBEDDED_MPV: {
+            PLAYER: {
+                RECORDING_FAILED_TO_START: 'Failed to start recording',
+                RECORDING_FAILED_TO_STOP: 'Failed to stop recording',
+                SAVED_TO: 'Saved to {{path}}',
+            },
+        },
+    };
+}
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('EmbeddedMpvControlsAdapter command/session ordering', () => {
+    let adapter: EmbeddedMpvControlsAdapter;
+    let controller: ReturnType<typeof createController>;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+        const translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', translations());
+        translate.setDefaultLang('en');
+        translate.use('en');
+
+        adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        adapter.configure({
+            playback: signal(LIVE_PLAYBACK),
+            seriesNavigation: signal(null),
+            recordingFolder: signal('/recordings'),
+        });
+        TestBed.tick();
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        jest.useRealTimers();
+    });
+
+    it('accepts a start acknowledgement written immediately before command resolution', async () => {
+        const startedRecording = {
+            active: true,
+            startedAt: '2026-07-16T10:00:02.000Z',
+        };
+        controller.startRecording.mockImplementation(async () => {
+            controller.session.set(session({ recording: startedRecording }));
+            return startedRecording;
+        });
+        controller.stopRecording.mockImplementation(async () => {
+            const stoppedRecording = { active: false };
+            controller.session.set(session({ recording: stoppedRecording }));
+            return stoppedRecording;
+        });
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(adapter.state().recording.active).toBe(true);
+        adapter.commands.toggleRecording();
+        expect(controller.stopRecording).toHaveBeenCalledTimes(1);
+        await flushPromises();
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+        expect(adapter.state().recording.message).toBeNull();
+    });
+
+    it('accepts a stop acknowledgement written immediately before command resolution', async () => {
+        const targetPath = '/recordings/live.ts';
+        const stoppedRecording = { active: false, targetPath };
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    targetPath,
+                    startedAt: '2026-07-16T10:00:02.000Z',
+                },
+            })
+        );
+        controller.stopRecording.mockImplementation(async () => {
+            controller.session.set(session({ recording: stoppedRecording }));
+            return stoppedRecording;
+        });
+        controller.startRecording.mockImplementation(async () => {
+            const startedRecording = {
+                active: true,
+                startedAt: '2026-07-16T10:00:03.000Z',
+            };
+            controller.session.set(session({ recording: startedRecording }));
+            return startedRecording;
+        });
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(adapter.state().recording.message).toBe(
+            `Saved to ${targetPath}`
+        );
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+        await flushPromises();
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+        expect(adapter.state().recording.message).toBeNull();
+    });
+
+    it.each(['start', 'stop'] as const)(
+        'latches a buffered %s success through stale settlement',
+        async (operation) => {
+            const targetPath = '/recordings/live.ts';
+            const baselineRecording =
+                operation === 'start'
+                    ? { active: false }
+                    : {
+                          active: true,
+                          startedAt: '2026-07-16T10:00:02.000Z',
+                      };
+            const acknowledgedRecording =
+                operation === 'start'
+                    ? {
+                          active: true,
+                          targetPath,
+                          startedAt: '2026-07-16T10:00:03.000Z',
+                      }
+                    : { active: false, targetPath };
+            const command = deferred<RecordingState>();
+            const lateCommand = deferred<RecordingState>();
+            const successMessage =
+                operation === 'stop' ? `Saved to ${targetPath}` : null;
+            const failureMessage = `Failed to ${operation} recording`;
+            const setRecording = (recording: RecordingState) =>
+                controller.session.set(session({ recording }));
+            const originalCommand =
+                operation === 'start'
+                    ? controller.startRecording
+                    : controller.stopRecording;
+            const inverseCommand =
+                operation === 'start'
+                    ? controller.stopRecording
+                    : controller.startRecording;
+            setRecording(baselineRecording);
+            originalCommand
+                .mockReturnValueOnce(command.promise)
+                .mockReturnValueOnce(lateCommand.promise);
+            inverseCommand.mockImplementation(async () => {
+                setRecording(baselineRecording);
+                return baselineRecording;
+            });
+            adapter.commands.toggleRecording();
+            setRecording(acknowledgedRecording);
+            jest.advanceTimersByTime(ACK_TIMEOUT_MS + 1);
+            expect(adapter.state().recording.message).toBeNull();
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(1);
+            expect(inverseCommand).not.toHaveBeenCalled();
+            setRecording(baselineRecording);
+            command.resolve(baselineRecording);
+            await flushPromises();
+            expect(adapter.state().recording.message).toBe(successMessage);
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(1);
+            expect(inverseCommand).not.toHaveBeenCalled();
+            setRecording(acknowledgedRecording);
+            TestBed.tick();
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(1);
+            expect(inverseCommand).toHaveBeenCalledTimes(1);
+            await flushPromises();
+            adapter.commands.toggleRecording();
+            jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+            expect(adapter.state().recording.message).toBe(failureMessage);
+            setRecording(acknowledgedRecording);
+            TestBed.tick();
+            expect(adapter.state().recording.message).toBe(successMessage);
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(2);
+            expect(inverseCommand).toHaveBeenCalledTimes(1);
+            setRecording(baselineRecording);
+            lateCommand.resolve(baselineRecording);
+            await flushPromises();
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(2);
+            expect(inverseCommand).toHaveBeenCalledTimes(1);
+            jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+            expect(adapter.state().recording.message).toBe(failureMessage);
+            adapter.commands.toggleRecording();
+            expect(originalCommand).toHaveBeenCalledTimes(3);
+            expect(inverseCommand).toHaveBeenCalledTimes(1);
+        }
+    );
+
+    it('discards a stored acknowledgement when the session changes before settlement', async () => {
+        const targetPath = '/recordings/live.ts';
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.session.set(session({ recording: { active: true } }));
+        controller.stopRecording.mockReturnValue(command.promise);
+        adapter.commands.toggleRecording();
+        controller.session.set(
+            session({ recording: { active: false, targetPath } })
+        );
+        TestBed.tick();
+        controller.session.set(
+            session({ id: 'session-2', recording: { active: false } })
+        );
+        command.resolve({ active: true });
+        await flushPromises();
+        expect(adapter.state().recording.message).toBeNull();
+    });
+
+    it('shows a pre-settlement recording error without unlocking the command', async () => {
+        const addonError = '  Addon rejected stream-record  ';
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.startRecording.mockReturnValue(command.promise);
+
+        adapter.commands.toggleRecording();
+        controller.session.set(
+            session({
+                recording: { active: false, error: addonError },
+            })
+        );
+        TestBed.tick();
+
+        expect(adapter.state().recording.message).toBe(addonError);
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS + 1);
+        expect(adapter.state().recording.message).toBe(addonError);
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+
+        controller.session.set(session({ recording: { active: false } }));
+        command.resolve({ active: false });
+        await flushPromises();
+
+        expect(adapter.state().recording.message).toBe(addonError);
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(2);
+    });
+
+    it('keeps an unacknowledged timed-out command serialized until its promise settles', async () => {
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.startRecording.mockReturnValue(command.promise);
+
+        adapter.commands.toggleRecording();
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+
+        expect(adapter.state().recording.message).toBe(
+            'Failed to start recording'
+        );
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+
+        command.resolve({ active: false });
+        await flushPromises();
+
+        expect(adapter.state().recording.message).toBe(
+            'Failed to start recording'
+        );
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(2);
+    });
+
+    it('waits for a post-settlement acknowledgement when only baseline snapshots arrive', async () => {
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.startRecording.mockReturnValue(command.promise);
+
+        adapter.commands.toggleRecording();
+        controller.session.set(session({ recording: { active: false } }));
+        command.resolve({ active: false });
+        await flushPromises();
+
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:03.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+        adapter.commands.toggleRecording();
+
+        expect(controller.stopRecording).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.engine-handoff.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.engine-handoff.spec.ts
new file mode 100644
index 000000000..de59c0005
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.engine-handoff.spec.ts
@@ -0,0 +1,199 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvEngine,
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule } from '@ngx-translate/core';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.test/live.ts',
+    title: 'Live news',
+    isLive: true,
+};
+
+interface Deferred<T> {
+    readonly promise: Promise<T>;
+    readonly resolve: (value: T) => void;
+}
+
+function deferred<T>(): Deferred<T> {
+    let resolve!: (value: T) => void;
+    const promise = new Promise<T>((resolver) => {
+        resolve = resolver;
+    });
+    return { promise, resolve };
+}
+
+function support(engine: EmbeddedMpvEngine): EmbeddedMpvSupport {
+    return {
+        supported: true,
+        platform: 'darwin',
+        engine,
+        capabilities: {
+            subtitles: true,
+            playbackSpeed: true,
+            aspectOverride: true,
+            screenshot: false,
+            recording: true,
+        },
+    };
+}
+
+function session(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'session-1',
+        title: PLAYBACK.title,
+        streamUrl: PLAYBACK.streamUrl,
+        status: 'playing',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-07-16T10:00:00.000Z',
+        updatedAt: '2026-07-16T10:00:01.000Z',
+        ...overrides,
+    };
+}
+
+function createController() {
+    return {
+        support: signal<EmbeddedMpvSupport | null>(support('frame-copy')),
+        session: signal<EmbeddedMpvSession | null>(session()),
+        stalled: signal(false),
+        togglePaused: jest.fn().mockResolvedValue(undefined),
+        seekTo: jest.fn().mockResolvedValue(undefined),
+        seekBy: jest.fn().mockResolvedValue(true),
+        applyVolume: jest.fn().mockResolvedValue(undefined),
+        setAudioTrack: jest.fn().mockResolvedValue(undefined),
+        setSubtitleTrack: jest.fn().mockResolvedValue(undefined),
+        setSpeed: jest.fn().mockResolvedValue(undefined),
+        setAspect: jest.fn().mockResolvedValue(undefined),
+        startRecording: jest
+            .fn<
+                Promise<EmbeddedMpvSession['recording'] | null>,
+                [string | undefined, string]
+            >()
+            .mockResolvedValue({ active: false }),
+        stopRecording: jest
+            .fn<Promise<EmbeddedMpvSession['recording'] | null>, []>()
+            .mockResolvedValue({ active: true }),
+    };
+}
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('EmbeddedMpvControlsAdapter engine handoff', () => {
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        jest.useRealTimers();
+    });
+
+    it('cancels frame-copy recording work before a native session can reconcile it', async () => {
+        jest.useFakeTimers();
+        const controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+        const adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        adapter.configure({
+            playback: signal(PLAYBACK),
+            seriesNavigation: signal(null),
+            recordingFolder: signal('/recordings'),
+        });
+        TestBed.tick();
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.startRecording.mockReturnValueOnce(command.promise);
+
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+
+        controller.support.set(support('native'));
+        TestBed.tick();
+        controller.session.set(
+            session({
+                recording: {
+                    active: false,
+                    error: 'Late native recording failure',
+                },
+            })
+        );
+        TestBed.tick();
+        command.resolve({ active: false });
+        await flushPromises();
+        jest.advanceTimersByTime(5000);
+        TestBed.tick();
+
+        expect(adapter.state().recording.message).toBeNull();
+
+        controller.session.set(session());
+        controller.support.set(support('frame-copy'));
+        TestBed.tick();
+        adapter.commands.toggleRecording();
+
+        expect(controller.startRecording).toHaveBeenCalledTimes(2);
+    });
+
+    it('changes the recording transition key across session handoff', () => {
+        const controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+        const adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        adapter.configure({
+            playback: signal(PLAYBACK),
+            seriesNavigation: signal(null),
+            recordingFolder: signal('/recordings'),
+        });
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+        const activeKey = adapter.state().recording.transitionKey;
+
+        controller.session.set(null);
+        TestBed.tick();
+        expect(adapter.state().recording).toMatchObject({
+            active: false,
+            transitionKey: null,
+        });
+
+        controller.session.set(session({ id: 'session-2' }));
+        TestBed.tick();
+        expect(adapter.state().recording.transitionKey).not.toBe(activeKey);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.messages.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.messages.spec.ts
new file mode 100644
index 000000000..da14adcbc
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.messages.spec.ts
@@ -0,0 +1,398 @@
+import { signal, WritableSignal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const LIVE_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/live',
+    title: 'Live news',
+    isLive: true,
+};
+
+const VOD_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/movie',
+    title: 'Movie',
+    isLive: false,
+    contentInfo: {
+        contentXtreamId: 42,
+        contentType: 'vod',
+        playlistId: 'playlist-1',
+    },
+};
+
+function supported(recording = true): EmbeddedMpvSupport {
+    return {
+        supported: true,
+        platform: 'darwin',
+        engine: 'frame-copy',
+        capabilities: {
+            subtitles: true,
+            playbackSpeed: true,
+            aspectOverride: true,
+            screenshot: false,
+            recording,
+        },
+    };
+}
+
+function session(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'session-1',
+        title: LIVE_PLAYBACK.title,
+        streamUrl: LIVE_PLAYBACK.streamUrl,
+        status: 'playing',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        audioTracks: [{ id: 1, selected: true }],
+        selectedAudioTrackId: 1,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-07-16T10:00:00.000Z',
+        updatedAt: '2026-07-16T10:00:01.000Z',
+        ...overrides,
+    };
+}
+
+function createController() {
+    return {
+        support: signal<EmbeddedMpvSupport | null>(supported()),
+        session: signal<EmbeddedMpvSession | null>(session()),
+        stalled: signal(false),
+        togglePaused: jest.fn<Promise<void>, []>().mockResolvedValue(undefined),
+        seekTo: jest.fn<Promise<void>, [number]>().mockResolvedValue(undefined),
+        seekBy: jest.fn<Promise<boolean>, [number]>().mockResolvedValue(true),
+        applyVolume: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAudioTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSubtitleTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSpeed: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAspect: jest
+            .fn<Promise<void>, [string]>()
+            .mockResolvedValue(undefined),
+        startRecording: jest
+            .fn<
+                Promise<EmbeddedMpvSession['recording'] | null>,
+                [string | undefined, string]
+            >()
+            .mockResolvedValue(null),
+        stopRecording: jest
+            .fn<Promise<EmbeddedMpvSession['recording'] | null>, []>()
+            .mockResolvedValue(null),
+    };
+}
+
+function translations(prefix = ''): object {
+    return {
+        EMBEDDED_MPV: {
+            PLAYER: {
+                PLAYBACK_FAILED: `${prefix}Playback failed`,
+                CHECKING_SUPPORT: `${prefix}Checking support`,
+                NOT_AVAILABLE: `${prefix}Not available`,
+                LOADING_STREAM: `${prefix}Loading stream`,
+                TRACK_DEFAULT: `${prefix}Default`,
+                AUDIO_TRACK_FALLBACK: `${prefix}Audio {{index}}`,
+                SUBTITLE_TRACK_FALLBACK: `${prefix}Subtitle {{index}}`,
+                RECORDING_FAILED_TO_START: `${prefix}Failed to start recording`,
+                RECORDING_FAILED_TO_STOP: `${prefix}Failed to stop recording`,
+                SAVED_TO: `${prefix}Saved to {{path}}`,
+            },
+        },
+    };
+}
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('EmbeddedMpvControlsAdapter recording messages and lifecycle', () => {
+    let adapter: EmbeddedMpvControlsAdapter;
+    let controller: ReturnType<typeof createController>;
+    let translate: TranslateService;
+    let playback: WritableSignal<ResolvedPortalPlayback>;
+    let seriesNavigation: WritableSignal<SeriesPlaybackNavigation | null>;
+    let recordingFolder: WritableSignal<string>;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        jest.setSystemTime(new Date('2026-07-16T10:00:10.000Z'));
+
+        controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+
+        translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', translations());
+        translate.setDefaultLang('en');
+        translate.use('en');
+
+        adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        playback = signal(LIVE_PLAYBACK);
+        seriesNavigation = signal(null);
+        recordingFolder = signal('/recordings');
+        adapter.configure({
+            playback,
+            seriesNavigation,
+            recordingFolder,
+        });
+        TestBed.tick();
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        jest.useRealTimers();
+    });
+
+    it('guards recording unless playback is live and recording is supported', async () => {
+        playback.set(VOD_PLAYBACK);
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(controller.startRecording).not.toHaveBeenCalled();
+
+        playback.set(LIVE_PLAYBACK);
+        controller.support.set(supported(false));
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(controller.startRecording).not.toHaveBeenCalled();
+
+        controller.support.set(supported(true));
+        controller.session.set(session({ status: 'error' }));
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(controller.startRecording).not.toHaveBeenCalled();
+    });
+
+    it('computes recording elapsed time and refreshes it every second', () => {
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+
+        expect(adapter.state().recording).toMatchObject({
+            active: true,
+            elapsedSeconds: 10,
+        });
+
+        jest.advanceTimersByTime(1000);
+        expect(adapter.state().recording.elapsedSeconds).toBe(11);
+
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: 'not-a-date',
+                },
+            })
+        );
+        expect(adapter.state().recording.elapsedSeconds).toBe(0);
+    });
+
+    it('reacts to active-language changes', () => {
+        expect(adapter.state().audioTracks[0].label).toBe('Audio 1');
+
+        translate.setTranslation('de', translations('DE '));
+        translate.use('de');
+
+        expect(adapter.state().audioTracks[0].label).toBe('DE Audio 1');
+    });
+
+    it('reacts when translations for the active language change', () => {
+        expect(adapter.state().audioTracks[0].label).toBe('Audio 1');
+
+        translate.setTranslation('en', translations('Updated '));
+
+        expect(adapter.state().audioTracks[0].label).toBe('Updated Audio 1');
+    });
+
+    it('reacts when the default language changes', () => {
+        translate.setTranslation('de', translations('DE '));
+        translate.use('');
+        translate.setDefaultLang('en');
+        expect(adapter.state().audioTracks[0].label).toBe('Audio 1');
+
+        translate.setDefaultLang('de');
+
+        expect(adapter.state().audioTracks[0].label).toBe('DE Audio 1');
+    });
+
+    it('relocalizes saved feedback for every translate event source', async () => {
+        const targetPath = '/recordings/live.ts';
+        controller.session.set(
+            session({ recording: { active: true, targetPath } })
+        );
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        controller.session.set(
+            session({ recording: { active: false, targetPath } })
+        );
+        TestBed.tick();
+        expect(adapter.state().recording.message).toBe(
+            `Saved to ${targetPath}`
+        );
+
+        translate.setTranslation('de', translations('DE '));
+        translate.use('de');
+        expect(adapter.state().recording.message).toBe(
+            `DE Saved to ${targetPath}`
+        );
+
+        translate.setTranslation('de', translations('Updated '));
+        expect(adapter.state().recording.message).toBe(
+            `Updated Saved to ${targetPath}`
+        );
+
+        translate.setTranslation('fr', translations('FR '));
+        translate.use('');
+        translate.setDefaultLang('fr');
+        expect(adapter.state().recording.message).toBe(
+            `FR Saved to ${targetPath}`
+        );
+    });
+
+    it('times out and relocalizes generic feedback for every translate event source', async () => {
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        jest.advanceTimersByTime(5000);
+        expect(adapter.state().recording.message).toBe(
+            'Failed to start recording'
+        );
+
+        translate.setTranslation('de', translations('DE '));
+        translate.use('de');
+        expect(adapter.state().recording.message).toBe(
+            'DE Failed to start recording'
+        );
+
+        translate.setTranslation('de', translations('Updated '));
+        expect(adapter.state().recording.message).toBe(
+            'Updated Failed to start recording'
+        );
+
+        translate.setTranslation('fr', translations('FR '));
+        translate.use('');
+        translate.setDefaultLang('fr');
+        expect(adapter.state().recording.message).toBe(
+            'FR Failed to start recording'
+        );
+    });
+
+    it('retains the pre-stop path and protects newer feedback from the saved timer', async () => {
+        const targetPath = '/recordings/original.ts';
+        controller.session.set(
+            session({ recording: { active: true, targetPath } })
+        );
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        controller.session.set(session({ recording: { active: false } }));
+        TestBed.tick();
+        expect(adapter.state().recording.message).toBe(
+            `Saved to ${targetPath}`
+        );
+
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        controller.session.set(
+            session({
+                recording: {
+                    active: false,
+                    error: 'Newer addon failure',
+                },
+            })
+        );
+        TestBed.tick();
+        jest.advanceTimersByTime(5000);
+
+        expect(adapter.state().recording.message).toBe('Newer addon failure');
+    });
+
+    it('does not restart the elapsed interval for position-only snapshots', () => {
+        const setIntervalSpy = jest.spyOn(window, 'setInterval');
+        const clearIntervalSpy = jest.spyOn(window, 'clearInterval');
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+
+        controller.session.set(
+            session({
+                positionSeconds: 1,
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+        controller.session.set(
+            session({
+                positionSeconds: 2,
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+
+        expect(setIntervalSpy).toHaveBeenCalledTimes(1);
+        expect(clearIntervalSpy).not.toHaveBeenCalled();
+        setIntervalSpy.mockRestore();
+        clearIntervalSpy.mockRestore();
+    });
+
+    it('clears an active elapsed interval on destruction', () => {
+        const clearIntervalSpy = jest.spyOn(window, 'clearInterval');
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    startedAt: '2026-07-16T10:00:00.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+
+        TestBed.resetTestingModule();
+
+        expect(clearIntervalSpy).toHaveBeenCalled();
+        clearIntervalSpy.mockRestore();
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.races.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.races.spec.ts
new file mode 100644
index 000000000..e71a15118
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.races.spec.ts
@@ -0,0 +1,395 @@
+import { signal, WritableSignal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const ACK_TIMEOUT_MS = 5000;
+const LIVE_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/live',
+    title: 'Live news',
+    isLive: true,
+};
+const REPLACEMENT_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/replacement',
+    title: 'Replacement news',
+    isLive: true,
+};
+
+interface Deferred<T> {
+    promise: Promise<T>;
+    resolve: (value: T) => void;
+}
+
+function deferred<T>(): Deferred<T> {
+    let resolve!: (value: T) => void;
+    const promise = new Promise<T>((resolver) => {
+        resolve = resolver;
+    });
+    return { promise, resolve };
+}
+
+function support(): EmbeddedMpvSupport {
+    return {
+        supported: true,
+        platform: 'darwin',
+        engine: 'frame-copy',
+        capabilities: {
+            subtitles: true,
+            playbackSpeed: true,
+            aspectOverride: true,
+            screenshot: false,
+            recording: true,
+        },
+    };
+}
+
+function session(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'session-1',
+        title: LIVE_PLAYBACK.title,
+        streamUrl: LIVE_PLAYBACK.streamUrl,
+        status: 'playing',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-07-16T10:00:00.000Z',
+        updatedAt: '2026-07-16T10:00:01.000Z',
+        ...overrides,
+    };
+}
+
+function createController() {
+    return {
+        support: signal<EmbeddedMpvSupport | null>(support()),
+        session: signal<EmbeddedMpvSession | null>(session()),
+        stalled: signal(false),
+        togglePaused: jest.fn<Promise<void>, []>().mockResolvedValue(undefined),
+        seekTo: jest.fn<Promise<void>, [number]>().mockResolvedValue(undefined),
+        seekBy: jest.fn<Promise<boolean>, [number]>().mockResolvedValue(true),
+        applyVolume: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAudioTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSubtitleTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSpeed: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAspect: jest
+            .fn<Promise<void>, [string]>()
+            .mockResolvedValue(undefined),
+        startRecording: jest
+            .fn<
+                Promise<EmbeddedMpvSession['recording'] | null>,
+                [string | undefined, string]
+            >()
+            .mockResolvedValue({ active: false }),
+        stopRecording: jest
+            .fn<Promise<EmbeddedMpvSession['recording'] | null>, []>()
+            .mockResolvedValue({ active: true }),
+    };
+}
+
+function translations(prefix = ''): object {
+    return {
+        EMBEDDED_MPV: {
+            PLAYER: {
+                PLAYBACK_FAILED: `${prefix}Playback failed`,
+                CHECKING_SUPPORT: `${prefix}Checking support`,
+                NOT_AVAILABLE: `${prefix}Not available`,
+                LOADING_STREAM: `${prefix}Loading stream`,
+                TRACK_DEFAULT: `${prefix}Default`,
+                AUDIO_TRACK_FALLBACK: `${prefix}Audio {{index}}`,
+                SUBTITLE_TRACK_FALLBACK: `${prefix}Subtitle {{index}}`,
+                RECORDING_FAILED_TO_START: `${prefix}Failed to start recording`,
+                RECORDING_FAILED_TO_STOP: `${prefix}Failed to stop recording`,
+                SAVED_TO: `${prefix}Saved to {{path}}`,
+            },
+        },
+    };
+}
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('EmbeddedMpvControlsAdapter recording acknowledgement races', () => {
+    let adapter: EmbeddedMpvControlsAdapter;
+    let controller: ReturnType<typeof createController>;
+    let translate: TranslateService;
+    let playback: WritableSignal<ResolvedPortalPlayback>;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+        translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', translations());
+        translate.setDefaultLang('en');
+        translate.use('en');
+        adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        playback = signal(LIVE_PLAYBACK);
+        adapter.configure({
+            playback,
+            seriesNavigation: signal(null),
+            recordingFolder: signal('/recordings'),
+        });
+        TestBed.tick();
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        jest.useRealTimers();
+    });
+
+    it('waits for a same-session active transition instead of trusting a stale start result', async () => {
+        controller.startRecording.mockImplementation(async () => {
+            const staleRecording = {
+                active: false,
+            };
+            controller.session.set(session({ recording: staleRecording }));
+            return staleRecording;
+        });
+
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        TestBed.tick();
+
+        expect(controller.startRecording).toHaveBeenCalledWith(
+            '/recordings',
+            LIVE_PLAYBACK.title
+        );
+        expect(adapter.state().recording.message).toBeNull();
+        controller.session.update((current) => ({
+            ...(current ?? session()),
+            positionSeconds: 1,
+            updatedAt: '2026-07-16T10:00:02.000Z',
+        }));
+        TestBed.tick();
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    targetPath: '/recordings/live.ts',
+                    startedAt: '2026-07-16T10:00:02.000Z',
+                },
+            })
+        );
+        TestBed.tick();
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+
+        expect(adapter.state().recording.active).toBe(true);
+        expect(adapter.state().recording.message).toBeNull();
+    });
+
+    it('waits for an inactive transition before reporting a saved stop', async () => {
+        const targetPath = '/recordings/live.ts';
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    targetPath,
+                    startedAt: '2026-07-16T10:00:02.000Z',
+                },
+            })
+        );
+        controller.stopRecording.mockResolvedValue({
+            active: true,
+            targetPath,
+        });
+
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        expect(adapter.state().recording.message).toBeNull();
+
+        controller.session.set(
+            session({ recording: { active: false, targetPath } })
+        );
+        TestBed.tick();
+
+        expect(adapter.state().recording.message).toBe(
+            `Saved to ${targetPath}`
+        );
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS - 1);
+        expect(adapter.state().recording.message).toBe(
+            `Saved to ${targetPath}`
+        );
+        jest.advanceTimersByTime(1);
+        expect(adapter.state().recording.message).toBeNull();
+    });
+
+    it('uses a same-session recording error present at command settlement', async () => {
+        const addonError = '  Addon rejected stream-record  ';
+        controller.startRecording.mockImplementation(async () => {
+            const failedRecording = { active: false, error: addonError };
+            controller.session.set(session({ recording: failedRecording }));
+            return failedRecording;
+        });
+        adapter.commands.toggleRecording();
+        await flushPromises();
+
+        expect(adapter.state().recording.message).toBe(addonError);
+        translate.setTranslation('en', translations('Updated '));
+        expect(adapter.state().recording.message).toBe(addonError);
+    });
+
+    it('reports the same addon error again when a retry times out', async () => {
+        const addonError = 'Disk is still full';
+        controller.session.set(
+            session({ recording: { active: false, error: addonError } })
+        );
+        adapter.commands.toggleRecording();
+        await flushPromises();
+        controller.session.set(
+            session({
+                updatedAt: '2026-07-16T10:00:03.000Z',
+                recording: { active: false, error: addonError },
+            })
+        );
+        TestBed.tick();
+        jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+
+        expect(adapter.state().recording.message).toBe(addonError);
+    });
+
+    it('serializes two immediate start toggles while acknowledgement is pending', async () => {
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.startRecording.mockReturnValue(command.promise);
+
+        adapter.commands.toggleRecording();
+        adapter.commands.toggleRecording();
+        expect(controller.startRecording).toHaveBeenCalledTimes(1);
+        command.resolve({ active: false });
+        await flushPromises();
+    });
+
+    it('serializes two immediate stop toggles while acknowledgement is pending', async () => {
+        controller.session.set(
+            session({
+                recording: {
+                    active: true,
+                    targetPath: '/recordings/live.ts',
+                },
+            })
+        );
+        const command = deferred<EmbeddedMpvSession['recording'] | null>();
+        controller.stopRecording.mockReturnValue(command.promise);
+
+        adapter.commands.toggleRecording();
+        adapter.commands.toggleRecording();
+        expect(controller.stopRecording).toHaveBeenCalledTimes(1);
+        command.resolve({ active: true });
+        await flushPromises();
+    });
+
+    it.each(['playback', 'session'] as const)(
+        'invalidates a pending result after %s identity replacement',
+        async (replacement) => {
+            const command = deferred<EmbeddedMpvSession['recording'] | null>();
+            controller.startRecording.mockReturnValue(command.promise);
+            adapter.commands.toggleRecording();
+
+            if (replacement === 'playback') {
+                playback.set(REPLACEMENT_PLAYBACK);
+            } else {
+                controller.session.set(
+                    session({
+                        id: 'session-2',
+                        streamUrl: REPLACEMENT_PLAYBACK.streamUrl,
+                    })
+                );
+            }
+            TestBed.tick();
+            command.resolve(null);
+            await flushPromises();
+            jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+            expect(adapter.state().recording.message).toBeNull();
+        }
+    );
+
+    it.each(['playback', 'session'] as const)(
+        'clears recording feedback after %s identity changes',
+        async (replacement) => {
+            adapter.commands.toggleRecording();
+            await flushPromises();
+            controller.session.set(
+                session({
+                    recording: {
+                        active: false,
+                        error: 'Current channel failure',
+                    },
+                })
+            );
+            TestBed.tick();
+            expect(adapter.state().recording.message).toBe(
+                'Current channel failure'
+            );
+
+            if (replacement === 'playback') {
+                playback.set(REPLACEMENT_PLAYBACK);
+            } else {
+                controller.session.set(session({ id: 'session-2' }));
+            }
+            TestBed.tick();
+
+            expect(adapter.state().recording.message).toBeNull();
+        }
+    );
+
+    it.each(['start', 'stop'] as const)(
+        'ignores a deferred %s result after destruction',
+        async (operation) => {
+            const command = deferred<EmbeddedMpvSession['recording'] | null>();
+            if (operation === 'start') {
+                controller.startRecording.mockReturnValue(command.promise);
+            } else {
+                controller.session.set(
+                    session({ recording: { active: true } })
+                );
+                controller.stopRecording.mockReturnValue(command.promise);
+            }
+            adapter.commands.toggleRecording();
+            const state = adapter.state;
+            const bufferedRecording =
+                operation === 'start'
+                    ? { active: false, error: 'Buffered failure' }
+                    : { active: false, targetPath: '/recordings/live.ts' };
+            controller.session.set(session({ recording: bufferedRecording }));
+            TestBed.tick();
+
+            TestBed.resetTestingModule();
+            command.resolve(null);
+            await flushPromises();
+            jest.advanceTimersByTime(ACK_TIMEOUT_MS);
+            expect(state().recording.message).toBeNull();
+        }
+    );
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts
new file mode 100644
index 000000000..a08d6e3d1
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.spec.ts
@@ -0,0 +1,400 @@
+import { signal, WritableSignal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+    DEFAULT_ASPECT_PRESETS,
+    DEFAULT_PLAYER_CAPABILITIES,
+    DEFAULT_SPEED_PRESETS,
+    createEmptyControlsState,
+} from '../player-controls/player-controls-defaults';
+import { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const LIVE_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/live',
+    title: 'Live news',
+};
+
+const VOD_PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.com/movie',
+    title: 'Movie',
+    contentInfo: {
+        contentXtreamId: 42,
+        contentType: 'vod',
+        playlistId: 'playlist-1',
+    },
+};
+
+function supported(
+    overrides: Partial<EmbeddedMpvSupport> = {}
+): EmbeddedMpvSupport {
+    return {
+        supported: true,
+        platform: 'darwin',
+        engine: 'frame-copy',
+        capabilities: {
+            subtitles: true,
+            playbackSpeed: true,
+            aspectOverride: true,
+            screenshot: false,
+            recording: true,
+        },
+        ...overrides,
+    };
+}
+
+function session(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'session-1',
+        title: 'Movie',
+        streamUrl: VOD_PLAYBACK.streamUrl,
+        status: 'playing',
+        positionSeconds: 25,
+        durationSeconds: 100,
+        volume: 0.65,
+        audioTracks: [
+            {
+                id: 1,
+                title: 'English',
+                selected: true,
+                defaultTrack: true,
+            },
+            { id: 2, selected: false },
+        ],
+        selectedAudioTrackId: 1,
+        subtitleTracks: [
+            { id: 3, language: 'de', selected: true },
+            { id: 4, selected: false },
+        ],
+        selectedSubtitleTrackId: 3,
+        playbackSpeed: 1.25,
+        aspectOverride: '16:9',
+        recording: { active: false },
+        startedAt: '2026-07-16T10:00:00.000Z',
+        updatedAt: '2026-07-16T10:00:01.000Z',
+        ...overrides,
+    };
+}
+
+function createController() {
+    return {
+        support: signal<EmbeddedMpvSupport | null>(supported()),
+        session: signal<EmbeddedMpvSession | null>(session()),
+        stalled: signal(false),
+        togglePaused: jest.fn<Promise<void>, []>().mockResolvedValue(undefined),
+        seekTo: jest.fn<Promise<void>, [number]>().mockResolvedValue(undefined),
+        seekBy: jest.fn<Promise<boolean>, [number]>().mockResolvedValue(true),
+        applyVolume: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAudioTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSubtitleTrack: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setSpeed: jest
+            .fn<Promise<void>, [number]>()
+            .mockResolvedValue(undefined),
+        setAspect: jest
+            .fn<Promise<void>, [string]>()
+            .mockResolvedValue(undefined),
+        startRecording: jest
+            .fn<
+                Promise<EmbeddedMpvSession['recording'] | null>,
+                [string | undefined, string]
+            >()
+            .mockResolvedValue(null),
+        stopRecording: jest
+            .fn<Promise<EmbeddedMpvSession['recording'] | null>, []>()
+            .mockResolvedValue(null),
+    };
+}
+
+function translations(prefix = ''): object {
+    return {
+        EMBEDDED_MPV: {
+            PLAYER: {
+                PLAYBACK_FAILED: `${prefix}Playback failed`,
+                CHECKING_SUPPORT: `${prefix}Checking support`,
+                NOT_AVAILABLE: `${prefix}Not available`,
+                LOADING_STREAM: `${prefix}Loading stream`,
+                TRACK_DEFAULT: `${prefix}Default`,
+                AUDIO_TRACK_FALLBACK: `${prefix}Audio {{index}}`,
+                SUBTITLE_TRACK_FALLBACK: `${prefix}Subtitle {{index}}`,
+            },
+        },
+    };
+}
+
+describe('EmbeddedMpvControlsAdapter', () => {
+    let adapter: EmbeddedMpvControlsAdapter;
+    let controller: ReturnType<typeof createController>;
+    let playback: WritableSignal<ResolvedPortalPlayback>;
+    let seriesNavigation: WritableSignal<SeriesPlaybackNavigation | null>;
+
+    beforeEach(() => {
+        localStorage.clear();
+        controller = createController();
+        TestBed.configureTestingModule({
+            imports: [TranslateModule.forRoot()],
+            providers: [
+                EmbeddedMpvControlsAdapter,
+                {
+                    provide: EmbeddedMpvSessionController,
+                    useValue: controller,
+                },
+            ],
+        });
+
+        const translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', translations());
+        translate.setDefaultLang('en');
+        translate.use('en');
+
+        adapter = TestBed.inject(EmbeddedMpvControlsAdapter);
+        playback = signal(VOD_PLAYBACK);
+        seriesNavigation = signal({
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        localStorage.clear();
+    });
+
+    function configure(): void {
+        adapter.configure({
+            playback,
+            seriesNavigation,
+            recordingFolder: signal('/recordings'),
+        });
+    }
+
+    it('returns safe empty defaults before it is configured', () => {
+        expect(adapter.capabilities()).toEqual(DEFAULT_PLAYER_CAPABILITIES);
+        expect(adapter.state()).toEqual(createEmptyControlsState());
+    });
+
+    it('derives baseline, optional, and VOD series capabilities', () => {
+        configure();
+
+        expect(adapter.capabilities()).toEqual({
+            seek: true,
+            volume: true,
+            audioTracks: true,
+            subtitles: true,
+            playbackSpeed: true,
+            aspectRatio: true,
+            recording: true,
+            pictureInPicture: false,
+            fullscreen: true,
+            seriesNavigation: true,
+        });
+
+        controller.support.set(
+            supported({
+                capabilities: {
+                    subtitles: false,
+                    playbackSpeed: false,
+                    aspectOverride: false,
+                    screenshot: true,
+                    recording: false,
+                },
+            })
+        );
+
+        expect(adapter.capabilities()).toEqual({
+            seek: true,
+            volume: true,
+            audioTracks: true,
+            subtitles: false,
+            playbackSpeed: false,
+            aspectRatio: false,
+            recording: false,
+            pictureInPicture: false,
+            fullscreen: true,
+            seriesNavigation: true,
+        });
+    });
+
+    it('uses semantic live detection and disables seek and series navigation for live playback', () => {
+        configure();
+        expect(adapter.state().isLive).toBe(false);
+
+        playback.set({ ...LIVE_PLAYBACK, isLive: false });
+        expect(adapter.state().isLive).toBe(false);
+
+        playback.set({ ...VOD_PLAYBACK, isLive: true });
+
+        expect(adapter.capabilities().seek).toBe(false);
+        expect(adapter.capabilities().seriesNavigation).toBe(false);
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.state().durationSeconds).toBeNull();
+        expect(adapter.state().canSeek).toBe(false);
+        expect(adapter.state().canPreviousEpisode).toBe(false);
+        expect(adapter.state().canNextEpisode).toBe(false);
+    });
+
+    it('maps session state, presets, seekability, stalled state, and reactive series navigation', () => {
+        configure();
+        controller.stalled.set(true);
+
+        expect(adapter.state()).toMatchObject({
+            status: 'playing',
+            statusMessage: '',
+            stalled: true,
+            positionSeconds: 25,
+            durationSeconds: 100,
+            isLive: false,
+            canSeek: true,
+            volume: 0.65,
+            subtitlesEnabled: true,
+            playbackSpeed: 1.25,
+            speedPresets: DEFAULT_SPEED_PRESETS,
+            aspectRatio: '16:9',
+            aspectPresets: DEFAULT_ASPECT_PRESETS,
+            pictureInPictureActive: false,
+            canPictureInPicture: false,
+            canPreviousEpisode: true,
+            canNextEpisode: false,
+        });
+
+        seriesNavigation.set({
+            canPrevious: false,
+            canNext: true,
+            autoplayEnabled: false,
+        });
+        expect(adapter.state().canPreviousEpisode).toBe(false);
+        expect(adapter.state().canNextEpisode).toBe(true);
+
+        controller.session.set(
+            session({ positionSeconds: -5, durationSeconds: 0 })
+        );
+        expect(adapter.state().positionSeconds).toBe(0);
+        expect(adapter.state().canSeek).toBe(false);
+    });
+
+    it('uses the stored volume when there is no session', () => {
+        localStorage.setItem('volume', '0.35');
+        controller.session.set(null);
+        controller.support.set(supported());
+        configure();
+
+        expect(adapter.state().volume).toBe(0.35);
+    });
+
+    it('uses translated existing helpers for audio and subtitle labels', () => {
+        configure();
+
+        expect(adapter.state().audioTracks).toEqual([
+            {
+                id: 1,
+                label: 'English · Default',
+                selected: true,
+            },
+            { id: 2, label: 'Audio 2', selected: false },
+        ]);
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 3, label: 'de', selected: true },
+            { id: 4, label: 'Subtitle 2', selected: false },
+        ]);
+    });
+
+    it('maps support and session statuses with detailed and translated fallback messages', () => {
+        configure();
+
+        controller.support.set(null);
+        expect(adapter.state()).toMatchObject({
+            status: 'loading',
+            statusMessage: 'Checking support',
+        });
+
+        controller.support.set({
+            supported: false,
+            platform: 'linux',
+            reason: 'libmpv is missing',
+        });
+        expect(adapter.state()).toMatchObject({
+            status: 'idle',
+            statusMessage: 'libmpv is missing',
+        });
+
+        controller.support.set({ supported: false, platform: 'linux' });
+        expect(adapter.state().statusMessage).toBe('Not available');
+
+        controller.support.set(supported());
+        controller.session.set(null);
+        expect(adapter.state()).toMatchObject({
+            status: 'loading',
+            statusMessage: 'Loading stream',
+        });
+
+        controller.session.set(session({ status: 'loading' }));
+        expect(adapter.state()).toMatchObject({
+            status: 'loading',
+            statusMessage: 'Loading stream',
+        });
+
+        for (const status of ['playing', 'paused', 'idle'] as const) {
+            controller.session.set(session({ status }));
+            expect(adapter.state()).toMatchObject({
+                status,
+                statusMessage: '',
+            });
+        }
+
+        for (const status of ['ended', 'closed'] as const) {
+            controller.session.set(session({ status }));
+            expect(adapter.state()).toMatchObject({
+                status: 'ended',
+                statusMessage: '',
+            });
+        }
+
+        controller.session.set(
+            session({ status: 'error', error: 'Decoder exploded' })
+        );
+        expect(adapter.state()).toMatchObject({
+            status: 'error',
+            statusMessage: 'Decoder exploded',
+        });
+
+        controller.session.set(session({ status: 'error', error: undefined }));
+        expect(adapter.state().statusMessage).toBe('Playback failed');
+    });
+
+    it('delegates every non-recording shared-controls command', () => {
+        configure();
+
+        expect(() => adapter.commands.togglePictureInPicture()).not.toThrow();
+        adapter.commands.togglePlay();
+        adapter.commands.seekTo(45);
+        adapter.commands.seekBy(-10);
+        adapter.commands.setVolume(0.4);
+        adapter.commands.setAudioTrack(2);
+        adapter.commands.setSubtitleTrack(-1);
+        adapter.commands.setPlaybackSpeed(1.5);
+        adapter.commands.setAspectRatio('4:3');
+
+        expect(controller.togglePaused).toHaveBeenCalledTimes(1);
+        expect(controller.seekTo).toHaveBeenCalledWith(45);
+        expect(controller.seekBy).toHaveBeenCalledWith(-10);
+        expect(controller.applyVolume).toHaveBeenCalledWith(0.4);
+        expect(controller.setAudioTrack).toHaveBeenCalledWith(2);
+        expect(controller.setSubtitleTrack).toHaveBeenCalledWith(-1);
+        expect(controller.setSpeed).toHaveBeenCalledWith(1.5);
+        expect(controller.setAspect).toHaveBeenCalledWith('4:3');
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts
new file mode 100644
index 000000000..cfed72188
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-controls.adapter.ts
@@ -0,0 +1,350 @@
+import {
+    DestroyRef,
+    Injectable,
+    Signal,
+    computed,
+    effect,
+    inject,
+    signal,
+    untracked,
+} from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+import {
+    EmbeddedMpvSession,
+    EmbeddedMpvSupport,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { TranslateService } from '@ngx-translate/core';
+import { merge } from 'rxjs';
+import {
+    DEFAULT_ASPECT_PRESETS,
+    DEFAULT_PLAYER_CAPABILITIES,
+    DEFAULT_SPEED_PRESETS,
+    createEmptyControlsState,
+} from '../player-controls/player-controls-defaults';
+import {
+    PlayerController,
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerStatus,
+} from '../player-controls/player-controls.model';
+import { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import {
+    audioTrackLabel,
+    readStoredVolume,
+    subtitleTrackLabel,
+} from './embedded-mpv-format.utils';
+import { resolveRecordingFeedback } from './embedded-mpv-controls-recording-feedback';
+import { EmbeddedMpvControlsRecording } from './embedded-mpv-controls-recording';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+export interface EmbeddedMpvControlsContext {
+    readonly playback: Signal<ResolvedPortalPlayback>;
+    readonly seriesNavigation: Signal<SeriesPlaybackNavigation | null>;
+    readonly recordingFolder: Signal<string>;
+}
+
+interface MappedPlayerStatus {
+    status: PlayerStatus;
+    statusMessage: string;
+}
+
+@Injectable()
+export class EmbeddedMpvControlsAdapter implements PlayerController {
+    private readonly controller = inject(EmbeddedMpvSessionController);
+    private readonly translate = inject(TranslateService);
+    private readonly destroyRef = inject(DestroyRef);
+    private readonly translationsTick = toSignal(
+        merge(
+            this.translate.onLangChange,
+            this.translate.onTranslationChange,
+            this.translate.onDefaultLangChange
+        ),
+        { initialValue: null }
+    );
+
+    private readonly configuredContext =
+        signal<EmbeddedMpvControlsContext | null>(null);
+    private readonly playbackIdentity = computed(() => {
+        const playback = this.configuredContext()?.playback();
+        return playback ? JSON.stringify(playback) : null;
+    });
+    private readonly recordingPlaybackIdentity = computed(() =>
+        this.controller.support()?.engine === 'frame-copy'
+            ? this.playbackIdentity()
+            : null
+    );
+    private readonly recordingControls = new EmbeddedMpvControlsRecording(
+        this.controller,
+        () => this.recordingPlaybackIdentity()
+    );
+    private readonly recordingActive = computed(
+        () =>
+            this.controller.support()?.engine === 'frame-copy' &&
+            this.controller.session()?.recording?.active === true
+    );
+    private readonly activeSessionId = computed(
+        () => this.controller.session()?.id ?? null
+    );
+    private readonly recordingTransitionKey = computed(() => {
+        const playbackIdentity = this.recordingPlaybackIdentity();
+        const sessionId = this.activeSessionId();
+        return playbackIdentity === null || sessionId === null
+            ? null
+            : JSON.stringify([playbackIdentity, sessionId]);
+    });
+    private readonly recordingTick = signal(Date.now());
+
+    readonly capabilities = computed<PlayerControlsCapabilities>(() => {
+        const context = this.configuredContext();
+        if (!context) {
+            return DEFAULT_PLAYER_CAPABILITIES;
+        }
+
+        const isLive = this.isLivePlayback(context.playback());
+        const optionalCapabilities = this.controller.support()?.capabilities;
+
+        return {
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            seek: !isLive,
+            volume: true,
+            audioTracks: true,
+            subtitles: optionalCapabilities?.subtitles ?? false,
+            playbackSpeed: optionalCapabilities?.playbackSpeed ?? false,
+            aspectRatio: optionalCapabilities?.aspectOverride ?? false,
+            recording: optionalCapabilities?.recording ?? false,
+            pictureInPicture: false,
+            fullscreen: true,
+            seriesNavigation: !isLive && context.seriesNavigation() !== null,
+        };
+    });
+
+    readonly state = computed<PlayerControlsState>(() => {
+        const context = this.configuredContext();
+        if (!context) {
+            return createEmptyControlsState();
+        }
+
+        this.translationsTick();
+        const support = this.controller.support();
+        const session = this.controller.session();
+        const playback = context.playback();
+        const isLive = this.isLivePlayback(playback);
+        const durationSeconds = isLive
+            ? null
+            : (session?.durationSeconds ?? null);
+        const seriesNavigation = context.seriesNavigation();
+        const hasSeriesNavigation = !isLive && seriesNavigation !== null;
+        const mappedStatus = this.mapStatus(support, session);
+        const recording = session?.recording;
+
+        return {
+            ...mappedStatus,
+            stalled: this.controller.stalled(),
+            positionSeconds: Math.max(0, session?.positionSeconds ?? 0),
+            durationSeconds,
+            isLive,
+            canSeek: !isLive && (durationSeconds ?? 0) > 0,
+            volume: session?.volume ?? readStoredVolume(),
+            audioTracks: (session?.audioTracks ?? []).map((track, index) => ({
+                id: track.id,
+                label: audioTrackLabel(track, index, {
+                    fallback: this.translate.instant(
+                        'EMBEDDED_MPV.PLAYER.AUDIO_TRACK_FALLBACK',
+                        { index: index + 1 }
+                    ),
+                    defaultLabel: this.translate.instant(
+                        'EMBEDDED_MPV.PLAYER.TRACK_DEFAULT'
+                    ),
+                }),
+                selected: track.selected,
+            })),
+            subtitleTracks: (session?.subtitleTracks ?? []).map(
+                (track, index) => ({
+                    id: track.id,
+                    label: subtitleTrackLabel(track, index, {
+                        fallback: this.translate.instant(
+                            'EMBEDDED_MPV.PLAYER.SUBTITLE_TRACK_FALLBACK',
+                            { index: index + 1 }
+                        ),
+                        defaultLabel: this.translate.instant(
+                            'EMBEDDED_MPV.PLAYER.TRACK_DEFAULT'
+                        ),
+                    }),
+                    selected: track.selected,
+                })
+            ),
+            subtitlesEnabled: (session?.selectedSubtitleTrackId ?? -1) >= 0,
+            playbackSpeed: session?.playbackSpeed ?? 1,
+            speedPresets: DEFAULT_SPEED_PRESETS,
+            aspectRatio: session?.aspectOverride ?? 'no',
+            aspectPresets: DEFAULT_ASPECT_PRESETS,
+            recording: {
+                active: recording?.active === true,
+                elapsedSeconds: this.recordingElapsedSeconds(
+                    recording?.startedAt
+                ),
+                message: resolveRecordingFeedback(
+                    this.recordingControls.feedback(),
+                    this.translate
+                ),
+                transitionKey: this.recordingTransitionKey(),
+            },
+            pictureInPictureActive: false,
+            canPictureInPicture: false,
+            canPreviousEpisode:
+                hasSeriesNavigation && seriesNavigation?.canPrevious === true,
+            canNextEpisode:
+                hasSeriesNavigation && seriesNavigation?.canNext === true,
+        };
+    });
+
+    readonly commands: PlayerControlsCommands = {
+        togglePlay: () => void this.controller.togglePaused(),
+        seekTo: (seconds) => void this.controller.seekTo(seconds),
+        seekBy: (deltaSeconds) => void this.controller.seekBy(deltaSeconds),
+        setVolume: (value) => void this.controller.applyVolume(value),
+        setAudioTrack: (id) => void this.controller.setAudioTrack(id),
+        setSubtitleTrack: (id) => void this.controller.setSubtitleTrack(id),
+        setPlaybackSpeed: (speed) => void this.controller.setSpeed(speed),
+        setAspectRatio: (value) => void this.controller.setAspect(value),
+        toggleRecording: () => void this.toggleRecording(),
+        togglePictureInPicture: () => undefined,
+    };
+
+    constructor() {
+        effect((onCleanup) => {
+            if (!this.recordingActive()) {
+                return;
+            }
+
+            untracked(() => this.recordingTick.set(Date.now()));
+            const intervalId = window.setInterval(
+                () => this.recordingTick.set(Date.now()),
+                1000
+            );
+            onCleanup(() => window.clearInterval(intervalId));
+        });
+
+        effect(() => {
+            const playbackIdentity = this.recordingPlaybackIdentity();
+            const sessionId = this.activeSessionId();
+            untracked(() =>
+                this.recordingControls.syncOwner(playbackIdentity, sessionId)
+            );
+        });
+
+        effect(() => {
+            const session = this.controller.session();
+            const playbackIdentity = this.recordingPlaybackIdentity();
+            untracked(() =>
+                this.recordingControls.reconcile(session, playbackIdentity)
+            );
+        });
+
+        this.destroyRef.onDestroy(() => this.recordingControls.destroy());
+    }
+
+    configure(context: EmbeddedMpvControlsContext): void {
+        this.configuredContext.set(context);
+    }
+
+    private isLivePlayback(playback: ResolvedPortalPlayback): boolean {
+        if (typeof playback.isLive === 'boolean') {
+            return playback.isLive;
+        }
+        return !playback.contentInfo;
+    }
+
+    private mapStatus(
+        support: EmbeddedMpvSupport | null,
+        session: EmbeddedMpvSession | null
+    ): MappedPlayerStatus {
+        if (!support) {
+            return {
+                status: 'loading',
+                statusMessage: this.translate.instant(
+                    'EMBEDDED_MPV.PLAYER.CHECKING_SUPPORT'
+                ),
+            };
+        }
+
+        if (!support.supported) {
+            return {
+                status: 'idle',
+                statusMessage:
+                    support.reason ??
+                    this.translate.instant('EMBEDDED_MPV.PLAYER.NOT_AVAILABLE'),
+            };
+        }
+
+        if (!session || session.status === 'loading') {
+            return {
+                status: 'loading',
+                statusMessage: this.translate.instant(
+                    'EMBEDDED_MPV.PLAYER.LOADING_STREAM'
+                ),
+            };
+        }
+
+        switch (session.status) {
+            case 'playing':
+            case 'paused':
+            case 'idle':
+                return { status: session.status, statusMessage: '' };
+            case 'ended':
+            case 'closed':
+                return { status: 'ended', statusMessage: '' };
+            case 'error':
+                return {
+                    status: 'error',
+                    statusMessage:
+                        session.error ??
+                        this.translate.instant(
+                            'EMBEDDED_MPV.PLAYER.PLAYBACK_FAILED'
+                        ),
+                };
+        }
+    }
+
+    private recordingElapsedSeconds(startedAt: string | undefined): number {
+        this.recordingTick();
+        if (!startedAt) {
+            return 0;
+        }
+
+        const startedAtMs = Date.parse(startedAt);
+        if (!Number.isFinite(startedAtMs)) {
+            return 0;
+        }
+
+        return Math.max(0, Math.floor((Date.now() - startedAtMs) / 1000));
+    }
+
+    private toggleRecording(): void {
+        const context = this.configuredContext();
+        const support = this.controller.support();
+        const session = this.controller.session();
+        const playbackIdentity = this.recordingPlaybackIdentity();
+        if (
+            !context ||
+            !session ||
+            !playbackIdentity ||
+            !support?.supported ||
+            support.engine !== 'frame-copy' ||
+            support.capabilities?.recording !== true ||
+            !this.isLivePlayback(context.playback()) ||
+            session?.status === 'error'
+        ) {
+            return;
+        }
+
+        this.recordingControls.toggle({
+            folder: context.recordingFolder(),
+            playback: context.playback(),
+            playbackIdentity,
+            session,
+        });
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.html b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.html
new file mode 100644
index 000000000..1f8a300d0
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.html
@@ -0,0 +1,65 @@
+<div class="embedded-mpv-dock-panel" (keydown)="onPanelKeydown($event)">
+    <button
+        mat-icon-button
+        type="button"
+        class="embedded-mpv-dock-panel__back"
+        data-test-id="embedded-mpv-dock-panel-back"
+        (click)="closed.emit()"
+        [attr.aria-label]="backLabel()"
+        [matTooltip]="backLabel()"
+        matTooltipPosition="above"
+    >
+        <mat-icon>arrow_back</mat-icon>
+    </button>
+
+    <span class="embedded-mpv-dock-panel__title">{{ panel().title }}</span>
+
+    <div class="embedded-mpv-dock-panel__ribbon-shell">
+        <div
+            #ribbon
+            class="embedded-mpv-dock-panel__ribbon"
+            role="menu"
+            aria-orientation="horizontal"
+            [attr.aria-label]="panel().title"
+            (scroll)="onRibbonScroll()"
+            (wheel)="onRibbonWheel($event)"
+        >
+            @for (
+                chip of panel().chips;
+                track chip.id;
+                let index = $index
+            ) {
+                <button
+                    #chip
+                    type="button"
+                    role="menuitemradio"
+                    class="embedded-mpv-dock-panel__chip"
+                    [class.embedded-mpv-dock-panel__chip--selected]="
+                        chip.selected
+                    "
+                    [attr.aria-checked]="chip.selected"
+                    [attr.tabindex]="chipTabIndex(chip.selected, index)"
+                    [title]="chip.label"
+                    (click)="chipSelected.emit(chip.id)"
+                >
+                    @if (chip.selected) {
+                        <mat-icon aria-hidden="true">check</mat-icon>
+                    }
+                    <span class="embedded-mpv-dock-panel__chip-label">{{
+                        chip.label
+                    }}</span>
+                </button>
+            }
+        </div>
+        <div
+            class="embedded-mpv-dock-panel__fade embedded-mpv-dock-panel__fade--start"
+            [class.embedded-mpv-dock-panel__fade--visible]="canScrollStart()"
+            aria-hidden="true"
+        ></div>
+        <div
+            class="embedded-mpv-dock-panel__fade embedded-mpv-dock-panel__fade--end"
+            [class.embedded-mpv-dock-panel__fade--visible]="canScrollEnd()"
+            aria-hidden="true"
+        ></div>
+    </div>
+</div>
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.scss b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.scss
new file mode 100644
index 000000000..d4a021e3f
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.scss
@@ -0,0 +1,166 @@
+:host {
+    display: block;
+    min-width: 0;
+}
+
+.embedded-mpv-dock-panel {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    min-width: 0;
+    animation: embedded-mpv-dock-panel-in 160ms ease-out;
+}
+
+@keyframes embedded-mpv-dock-panel-in {
+    from {
+        opacity: 0;
+        transform: translateY(4px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.embedded-mpv-dock-panel__back {
+    flex: 0 0 auto;
+}
+
+.embedded-mpv-dock-panel__title {
+    flex: 0 0 auto;
+    max-width: 180px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: color-mix(in srgb, var(--mat-sys-on-surface) 70%, transparent);
+    font-size: 0.7rem;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    white-space: nowrap;
+}
+
+.embedded-mpv-dock-panel__ribbon-shell {
+    position: relative;
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.embedded-mpv-dock-panel__ribbon {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 2px;
+    overflow-x: auto;
+    overscroll-behavior-x: contain;
+    scrollbar-width: none;
+}
+
+.embedded-mpv-dock-panel__ribbon::-webkit-scrollbar {
+    display: none;
+}
+
+.embedded-mpv-dock-panel__chip {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    flex: 0 0 auto;
+    max-width: 220px;
+    height: 34px;
+    padding: 0 14px;
+    color: var(--mat-sys-on-surface);
+    background: transparent;
+    border: 1px solid var(--embedded-mpv-border);
+    border-radius: 999px;
+    cursor: pointer;
+    font: inherit;
+    font-size: 0.82rem;
+    white-space: nowrap;
+}
+
+.embedded-mpv-dock-panel__chip:hover,
+.embedded-mpv-dock-panel__chip:focus-visible {
+    background: color-mix(in srgb, var(--embedded-mpv-accent) 14%, transparent);
+}
+
+.embedded-mpv-dock-panel__chip:focus-visible {
+    outline: 2px solid var(--embedded-mpv-accent);
+    outline-offset: 1px;
+}
+
+.embedded-mpv-dock-panel__chip--selected {
+    background: color-mix(in srgb, var(--embedded-mpv-accent) 18%, transparent);
+    border-color: color-mix(
+        in srgb,
+        var(--embedded-mpv-accent) 55%,
+        transparent
+    );
+}
+
+.embedded-mpv-dock-panel__chip mat-icon {
+    flex: 0 0 auto;
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    color: var(--embedded-mpv-accent);
+}
+
+.embedded-mpv-dock-panel__chip-label {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.embedded-mpv-dock-panel__fade {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 36px;
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 140ms ease-out;
+}
+
+.embedded-mpv-dock-panel__fade--visible {
+    opacity: 1;
+}
+
+.embedded-mpv-dock-panel__fade--start {
+    inset-inline-start: 0;
+    background: linear-gradient(
+        to right,
+        var(--embedded-mpv-glass),
+        transparent
+    );
+}
+
+.embedded-mpv-dock-panel__fade--end {
+    inset-inline-end: 0;
+    background: linear-gradient(
+        to left,
+        var(--embedded-mpv-glass),
+        transparent
+    );
+}
+
+:host-context([dir='rtl']) .embedded-mpv-dock-panel__fade--start {
+    background: linear-gradient(
+        to left,
+        var(--embedded-mpv-glass),
+        transparent
+    );
+}
+
+:host-context([dir='rtl']) .embedded-mpv-dock-panel__fade--end {
+    background: linear-gradient(
+        to right,
+        var(--embedded-mpv-glass),
+        transparent
+    );
+}
+
+@media (max-width: 720px) {
+    .embedded-mpv-dock-panel__title {
+        display: none;
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.spec.ts
new file mode 100644
index 000000000..ba51e7313
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.spec.ts
@@ -0,0 +1,189 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { EmbeddedMpvDockPanelComponent } from './embedded-mpv-dock-panel.component';
+import { EmbeddedMpvDockPanelView } from './embedded-mpv-dock-panels';
+
+const PANEL: EmbeddedMpvDockPanelView = {
+    kind: 'audio',
+    title: 'Audio tracks',
+    chips: Array.from({ length: 12 }, (_, index) => ({
+        id: String(index + 1),
+        label: `Track ${index + 1} with a fairly long descriptive name`,
+        selected: index === 3,
+    })),
+};
+
+describe('EmbeddedMpvDockPanelComponent', () => {
+    let fixture: ComponentFixture<EmbeddedMpvDockPanelComponent>;
+
+    const chipButtons = (): HTMLButtonElement[] =>
+        fixture.debugElement
+            .queryAll(By.css('.embedded-mpv-dock-panel__chip'))
+            .map((chip) => chip.nativeElement);
+
+    const panelRoot = (): HTMLElement =>
+        fixture.debugElement.query(By.css('.embedded-mpv-dock-panel'))
+            .nativeElement;
+
+    const ribbon = (): HTMLElement =>
+        fixture.debugElement.query(By.css('.embedded-mpv-dock-panel__ribbon'))
+            .nativeElement;
+
+    const dispatchPanelKey = (key: string): KeyboardEvent => {
+        const event = new KeyboardEvent('keydown', {
+            key,
+            bubbles: true,
+            cancelable: true,
+        });
+        (document.activeElement ?? panelRoot()).dispatchEvent(event);
+        return event;
+    };
+
+    const flushMicrotasks = () => new Promise<void>(queueMicrotask);
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [EmbeddedMpvDockPanelComponent],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(EmbeddedMpvDockPanelComponent);
+        fixture.componentRef.setInput('panel', PANEL);
+        fixture.componentRef.setInput('backLabel', 'Back');
+        fixture.detectChanges();
+        await flushMicrotasks();
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    it('renders chips with tooltips, roving tabindex, and a selected marker', () => {
+        const chips = chipButtons();
+
+        expect(chips).toHaveLength(12);
+        expect(chips[3].getAttribute('aria-checked')).toBe('true');
+        expect(chips[3].tabIndex).toBe(0);
+        expect(chips[0].tabIndex).toBe(-1);
+        expect(chips[5].getAttribute('title')).toBe(PANEL.chips[5].label);
+        expect(chips[3].querySelector('mat-icon')).not.toBeNull();
+        expect(chips[0].querySelector('mat-icon')).toBeNull();
+    });
+
+    it('focuses the selected chip when the panel opens', () => {
+        expect(document.activeElement).toBe(chipButtons()[3]);
+    });
+
+    it('walks chips with arrow keys, Home, and End', () => {
+        const chips = chipButtons();
+
+        dispatchPanelKey('ArrowRight');
+        expect(document.activeElement).toBe(chips[4]);
+
+        dispatchPanelKey('ArrowLeft');
+        dispatchPanelKey('ArrowLeft');
+        expect(document.activeElement).toBe(chips[2]);
+
+        dispatchPanelKey('End');
+        expect(document.activeElement).toBe(chips[11]);
+        dispatchPanelKey('ArrowRight');
+        expect(document.activeElement).toBe(chips[11]);
+
+        dispatchPanelKey('Home');
+        expect(document.activeElement).toBe(chips[0]);
+        dispatchPanelKey('ArrowLeft');
+        expect(document.activeElement).toBe(chips[0]);
+    });
+
+    it('claims arrow keys so document-level shortcuts never see them', () => {
+        const documentKeydown = jest.fn();
+        document.addEventListener('keydown', documentKeydown);
+
+        const horizontal = dispatchPanelKey('ArrowRight');
+        const vertical = dispatchPanelKey('ArrowUp');
+        const escape = dispatchPanelKey('Escape');
+
+        expect(horizontal.defaultPrevented).toBe(true);
+        expect(vertical.defaultPrevented).toBe(true);
+        expect(escape.defaultPrevented).toBe(false);
+
+        const seenKeys = documentKeydown.mock.calls.map(
+            ([event]: [KeyboardEvent]) => event.key
+        );
+        expect(seenKeys).toEqual(['Escape']);
+
+        document.removeEventListener('keydown', documentKeydown);
+    });
+
+    it('lets Space/Enter activate a chip without leaking to global shortcuts', () => {
+        // The global shortcut handler's Space case calls preventDefault() +
+        // togglePaused(); preventing the keydown default would suppress the
+        // chip button's native activation. The panel must stop Space/Enter
+        // from reaching the document without cancelling their default action.
+        const documentKeydown = jest.fn();
+        document.addEventListener('keydown', documentKeydown);
+
+        const space = dispatchPanelKey(' ');
+        const enter = dispatchPanelKey('Enter');
+
+        // Not defaultPrevented → the focused chip button still activates.
+        expect(space.defaultPrevented).toBe(false);
+        expect(enter.defaultPrevented).toBe(false);
+        // stopPropagation → the global handler never sees them.
+        expect(documentKeydown).not.toHaveBeenCalled();
+
+        document.removeEventListener('keydown', documentKeydown);
+    });
+
+    it('maps vertical wheel deltas to horizontal ribbon scrolling', () => {
+        const ribbonEl = ribbon();
+        ribbonEl.scrollLeft = 0;
+
+        const wheel = new WheelEvent('wheel', {
+            deltaY: 120,
+            deltaX: 0,
+            cancelable: true,
+        });
+        ribbonEl.dispatchEvent(wheel);
+
+        expect(ribbonEl.scrollLeft).toBe(120);
+        expect(wheel.defaultPrevented).toBe(true);
+
+        const horizontalSwipe = new WheelEvent('wheel', {
+            deltaY: 2,
+            deltaX: 40,
+            cancelable: true,
+        });
+        ribbonEl.dispatchEvent(horizontalSwipe);
+
+        expect(ribbonEl.scrollLeft).toBe(120);
+        expect(horizontalSwipe.defaultPrevented).toBe(false);
+    });
+
+    it('emits chipSelected and closed', () => {
+        const selected = jest.fn();
+        const closed = jest.fn();
+        fixture.componentInstance.chipSelected.subscribe(selected);
+        fixture.componentInstance.closed.subscribe(closed);
+
+        chipButtons()[7].click();
+        expect(selected).toHaveBeenCalledWith('8');
+
+        fixture.debugElement
+            .query(By.css('[data-test-id="embedded-mpv-dock-panel-back"]'))
+            .nativeElement.click();
+        expect(closed).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the first chip tabbable when no chip is selected', () => {
+        fixture.componentRef.setInput('panel', {
+            kind: 'aspect',
+            title: 'Aspect ratio',
+            chips: PANEL.chips.map((chip) => ({ ...chip, selected: false })),
+        });
+        fixture.detectChanges();
+
+        const chips = chipButtons();
+        expect(chips[0].tabIndex).toBe(0);
+        expect(chips[1].tabIndex).toBe(-1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.ts
new file mode 100644
index 000000000..712bb1e01
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panel.component.ts
@@ -0,0 +1,213 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    ElementRef,
+    OnDestroy,
+    effect,
+    inject,
+    input,
+    output,
+    signal,
+    untracked,
+    viewChild,
+    viewChildren,
+} from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import type {
+    EmbeddedMpvDockPanelKind,
+    EmbeddedMpvDockPanelView,
+} from './embedded-mpv-dock-panels';
+
+/**
+ * Horizontal chip panel that morphs the native-view embedded MPV dock row:
+ * back button + title on the inline-start side, then a scrollable chip
+ * ribbon. It lives inside the fixed-height controls strip, so opening it
+ * never changes the native MPV view bounds (no video re-letterboxing).
+ */
+@Component({
+    selector: 'app-embedded-mpv-dock-panel',
+    templateUrl: './embedded-mpv-dock-panel.component.html',
+    styleUrl: './embedded-mpv-dock-panel.component.scss',
+    imports: [MatButtonModule, MatIconModule, MatTooltipModule],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EmbeddedMpvDockPanelComponent implements OnDestroy {
+    readonly panel = input.required<EmbeddedMpvDockPanelView>();
+    readonly backLabel = input.required<string>();
+
+    readonly chipSelected = output<string>();
+    readonly closed = output<void>();
+
+    readonly canScrollStart = signal(false);
+    readonly canScrollEnd = signal(false);
+
+    private readonly elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
+    private readonly ribbon =
+        viewChild<ElementRef<HTMLDivElement>>('ribbon');
+    private readonly chips =
+        viewChildren<ElementRef<HTMLButtonElement>>('chip');
+
+    private lastRevealedKind: EmbeddedMpvDockPanelKind | null = null;
+    private destroyed = false;
+
+    constructor() {
+        effect(() => {
+            const panel = this.panel();
+            const kind = panel.kind;
+            const hasChips = panel.chips.length > 0;
+            untracked(() => {
+                const isNewPanel = kind !== this.lastRevealedKind;
+                this.lastRevealedKind = kind;
+                queueMicrotask(() => {
+                    if (this.destroyed) {
+                        return;
+                    }
+                    this.updateScrollState();
+                    if (isNewPanel && hasChips) {
+                        this.focusAndRevealSelectedChip();
+                    }
+                });
+            });
+        });
+    }
+
+    ngOnDestroy(): void {
+        this.destroyed = true;
+    }
+
+    chipTabIndex(selected: boolean, index: number): number {
+        if (selected) {
+            return 0;
+        }
+        const hasSelected = this.panel().chips.some((chip) => chip.selected);
+        return !hasSelected && index === 0 ? 0 : -1;
+    }
+
+    onRibbonScroll(): void {
+        this.updateScrollState();
+    }
+
+    onRibbonWheel(event: WheelEvent): void {
+        // Vertical wheel drives horizontal ribbon scrolling; dominant
+        // horizontal deltas (trackpad swipes) keep native scrolling.
+        if (Math.abs(event.deltaY) <= Math.abs(event.deltaX)) {
+            return;
+        }
+        const ribbonEl = this.ribbon()?.nativeElement;
+        if (!ribbonEl) {
+            return;
+        }
+        event.preventDefault();
+        ribbonEl.scrollLeft += event.deltaY * (this.isRtl() ? -1 : 1);
+        this.updateScrollState();
+    }
+
+    onPanelKeydown(event: KeyboardEvent): void {
+        const key = event.key;
+        if (key === ' ' || key === 'Enter') {
+            // Let the focused chip button activate natively (Space/Enter →
+            // click → chipSelected), but stop the keydown before it reaches
+            // the global shortcut handler, whose Space case would otherwise
+            // preventDefault() the activation and toggle playback instead.
+            // No preventDefault here — that would re-suppress the click.
+            event.stopPropagation();
+            return;
+        }
+        if (key === 'ArrowUp' || key === 'ArrowDown') {
+            // The panel owns the keyboard: never let the global volume
+            // shortcuts fire while a chip panel is open.
+            event.preventDefault();
+            event.stopPropagation();
+            return;
+        }
+        if (
+            key !== 'ArrowLeft' &&
+            key !== 'ArrowRight' &&
+            key !== 'Home' &&
+            key !== 'End'
+        ) {
+            return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+        const chips = this.chips().map((chip) => chip.nativeElement);
+        if (!chips.length) {
+            return;
+        }
+        chips[this.nextChipIndex(key, chips)]?.focus();
+    }
+
+    private nextChipIndex(key: string, chips: HTMLButtonElement[]): number {
+        if (key === 'Home') {
+            return 0;
+        }
+        if (key === 'End') {
+            return chips.length - 1;
+        }
+        const forward = (key === 'ArrowRight') !== this.isRtl();
+        const currentIndex = chips.indexOf(
+            document.activeElement as HTMLButtonElement
+        );
+        if (currentIndex === -1) {
+            return forward ? 0 : chips.length - 1;
+        }
+        return Math.max(
+            0,
+            Math.min(chips.length - 1, currentIndex + (forward ? 1 : -1))
+        );
+    }
+
+    private focusAndRevealSelectedChip(): void {
+        const chips = this.chips().map((chip) => chip.nativeElement);
+        const selected =
+            chips.find((chip) => chip.getAttribute('aria-checked') === 'true') ??
+            chips[0];
+        if (!selected) {
+            return;
+        }
+        try {
+            selected.focus({ preventScroll: true });
+        } catch {
+            selected.focus();
+        }
+        this.centerChipInRibbon(selected);
+    }
+
+    private centerChipInRibbon(chip: HTMLElement): void {
+        const ribbonEl = this.ribbon()?.nativeElement;
+        if (!ribbonEl) {
+            return;
+        }
+        const ribbonRect = ribbonEl.getBoundingClientRect();
+        const chipRect = chip.getBoundingClientRect();
+        // Physical-axis math keeps this correct in RTL; the browser clamps
+        // scrollLeft to the valid range on both directions.
+        ribbonEl.scrollLeft +=
+            chipRect.left +
+            chipRect.width / 2 -
+            (ribbonRect.left + ribbonRect.width / 2);
+        this.updateScrollState();
+    }
+
+    private updateScrollState(): void {
+        const ribbonEl = this.ribbon()?.nativeElement;
+        if (!ribbonEl) {
+            return;
+        }
+        const maxScroll = Math.max(
+            0,
+            ribbonEl.scrollWidth - ribbonEl.clientWidth
+        );
+        const offset = Math.abs(ribbonEl.scrollLeft);
+        this.canScrollStart.set(maxScroll > 1 && offset > 1);
+        this.canScrollEnd.set(maxScroll > 1 && offset < maxScroll - 1);
+    }
+
+    private isRtl(): boolean {
+        return (
+            getComputedStyle(this.elementRef.nativeElement).direction === 'rtl'
+        );
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panels.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panels.ts
new file mode 100644
index 000000000..e12e0c5ae
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-dock-panels.ts
@@ -0,0 +1,205 @@
+import { Signal, computed } from '@angular/core';
+import { EmbeddedMpvAudioTrack } from '@iptvnator/shared/interfaces';
+import { ASPECT_PRESETS, SPEED_PRESETS } from './embedded-mpv-format.utils';
+import type { EmbeddedMpvMenuState } from './embedded-mpv-ui-state';
+
+export type EmbeddedMpvDockPanelKind =
+    | 'audio'
+    | 'subtitle'
+    | 'speed'
+    | 'aspect';
+
+export interface EmbeddedMpvDockChip {
+    readonly id: string;
+    readonly label: string;
+    readonly selected: boolean;
+}
+
+export interface EmbeddedMpvDockPanelView {
+    readonly kind: EmbeddedMpvDockPanelKind;
+    readonly title: string;
+    readonly chips: readonly EmbeddedMpvDockChip[];
+}
+
+/** Chip id representing the "subtitles off" (-1) selection. */
+export const SUBTITLES_OFF_CHIP_ID = 'off';
+
+export interface EmbeddedMpvDockPanelDeps {
+    readonly menus: EmbeddedMpvMenuState;
+    readonly audioTracks: Signal<EmbeddedMpvAudioTrack[]>;
+    readonly subtitleTracks: Signal<EmbeddedMpvAudioTrack[]>;
+    readonly selectedSubtitleTrackId: Signal<number | null>;
+    readonly playbackSpeed: Signal<number>;
+    readonly aspectOverride: Signal<string>;
+    readonly translateLabel: (key: string) => string;
+    readonly audioTrackLabel: (
+        track: EmbeddedMpvAudioTrack,
+        index: number
+    ) => string;
+    readonly subtitleTrackLabel: (
+        track: EmbeddedMpvAudioTrack,
+        index: number
+    ) => string;
+    readonly aspectLabel: (aspect: string) => string;
+    readonly selectAudioTrack: (trackId: number) => void;
+    readonly selectSubtitleTrack: (trackId: number) => void;
+    readonly selectSpeed: (speed: number) => void;
+    readonly selectAspect: (aspect: string) => void;
+    readonly closePanels: () => void;
+    readonly playerRoot: () => HTMLElement | null;
+    readonly revealControls: () => void;
+}
+
+/**
+ * View model for the horizontal in-dock chip panels of the native-view
+ * embedded MPV dock (audio, subtitle, speed, aspect). The panels morph the
+ * controls row inside its fixed-height strip, so opening one never changes
+ * the native MPV view bounds — unlike the removed popover-era bottom cutout.
+ */
+export class EmbeddedMpvDockPanelState {
+    readonly active: Signal<EmbeddedMpvDockPanelView | null>;
+
+    private openerKind: EmbeddedMpvDockPanelKind | null = null;
+
+    constructor(private readonly deps: EmbeddedMpvDockPanelDeps) {
+        this.active = computed(() => this.buildActivePanel());
+    }
+
+    toggle(kind: EmbeddedMpvDockPanelKind): void {
+        // Always remember the button that opened a panel so focus returns to
+        // it when the panel closes. restoreOpenerFocus() only acts when focus
+        // has fallen to document.body, so re-toggling a panel with focus still
+        // on its button never steals focus.
+        this.openerKind = kind;
+        this.deps.menus.toggle(kind);
+        this.deps.revealControls();
+    }
+
+    /**
+     * Call whenever `menus.dockPanelOpen()` changes. When a panel closes it
+     * takes keyboard focus down with it (the dock row re-renders, so the
+     * pre-open button instance no longer exists); focus is handed to the
+     * freshly rendered toggle button of the menu that was open.
+     */
+    handlePanelOpenChange(panelOpen: boolean): void {
+        if (panelOpen) {
+            return;
+        }
+        const kind = this.openerKind;
+        this.openerKind = null;
+        if (!kind) {
+            return;
+        }
+        queueMicrotask(() => this.restoreOpenerFocus(kind));
+    }
+
+    select(chipId: string): void {
+        const panel = this.active();
+        if (!panel) {
+            return;
+        }
+        switch (panel.kind) {
+            case 'audio':
+                this.deps.selectAudioTrack(Number(chipId));
+                return;
+            case 'subtitle':
+                this.deps.selectSubtitleTrack(
+                    chipId === SUBTITLES_OFF_CHIP_ID ? -1 : Number(chipId)
+                );
+                return;
+            case 'speed':
+                this.deps.selectSpeed(Number(chipId));
+                return;
+            case 'aspect':
+                this.deps.selectAspect(chipId);
+                return;
+        }
+    }
+
+    close(): void {
+        this.deps.closePanels();
+    }
+
+    private restoreOpenerFocus(kind: EmbeddedMpvDockPanelKind): void {
+        if (
+            document.activeElement !== document.body &&
+            document.activeElement !== null
+        ) {
+            return;
+        }
+        this.deps
+            .playerRoot()
+            ?.querySelector<HTMLElement>(
+                `[data-embedded-mpv-menu-button="${kind}"]`
+            )
+            ?.focus();
+    }
+
+    private buildActivePanel(): EmbeddedMpvDockPanelView | null {
+        const { menus } = this.deps;
+        if (menus.audioOpen()) {
+            return {
+                kind: 'audio',
+                title: this.deps.translateLabel(
+                    'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS'
+                ),
+                chips: this.deps
+                    .audioTracks()
+                    .map((track, index) => ({
+                        id: String(track.id),
+                        label: this.deps.audioTrackLabel(track, index),
+                        selected: track.selected === true,
+                    })),
+            };
+        }
+        if (menus.subtitleOpen()) {
+            return {
+                kind: 'subtitle',
+                title: this.deps.translateLabel('EMBEDDED_MPV.PLAYER.SUBTITLES'),
+                chips: [
+                    {
+                        id: SUBTITLES_OFF_CHIP_ID,
+                        label: this.deps.translateLabel(
+                            'EMBEDDED_MPV.PLAYER.SUBTITLES_OFF'
+                        ),
+                        selected: this.deps.selectedSubtitleTrackId() === null,
+                    },
+                    ...this.deps.subtitleTracks().map((track, index) => ({
+                        id: String(track.id),
+                        label: this.deps.subtitleTrackLabel(track, index),
+                        selected: track.selected === true,
+                    })),
+                ],
+            };
+        }
+        if (menus.speedOpen()) {
+            const speed = this.deps.playbackSpeed();
+            return {
+                kind: 'speed',
+                title: this.deps.translateLabel(
+                    'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED'
+                ),
+                chips: SPEED_PRESETS.map((preset) => ({
+                    id: String(preset.value),
+                    label: preset.label,
+                    selected: preset.value === speed,
+                })),
+            };
+        }
+        if (menus.aspectOpen()) {
+            const aspect = this.deps.aspectOverride();
+            return {
+                kind: 'aspect',
+                title: this.deps.translateLabel(
+                    'EMBEDDED_MPV.PLAYER.ASPECT_RATIO'
+                ),
+                chips: ASPECT_PRESETS.map((preset) => ({
+                    id: preset.value,
+                    label: this.deps.aspectLabel(preset.value),
+                    selected: preset.value === aspect,
+                })),
+            };
+        }
+        return null;
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.spec.ts
index 9b80e2dfb..0c250d405 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.spec.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.spec.ts
@@ -59,7 +59,10 @@ describe('embedded MPV format utilities', () => {
         expect(volumeLabel(0.755)).toBe('Volume 76%');
     });
 
-    it('rounds host bounds and keeps minimum native view dimensions', () => {
+    it('preserves fractional host edges and keeps minimum native view dimensions', () => {
+        // Rounding happens once in the main process, after CSS→native
+        // scaling — pre-rounded edges would drift by up to 1px per scale
+        // factor on scaled displays.
         const host = {
             getBoundingClientRect: () => ({
                 left: 10.4,
@@ -70,8 +73,8 @@ describe('embedded MPV format utilities', () => {
         } as HTMLElement;
 
         expect(measureBounds(host)).toEqual({
-            x: 10,
-            y: 21,
+            x: 10.4,
+            y: 20.6,
             width: 1,
             height: 1,
         });
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.ts
index f91ae12b3..2fb657c2a 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-format.utils.ts
@@ -1,4 +1,7 @@
-import { EmbeddedMpvAudioTrack, EmbeddedMpvBounds } from '@iptvnator/shared/interfaces';
+import {
+    EmbeddedMpvAudioTrack,
+    EmbeddedMpvBounds,
+} from '@iptvnator/shared/interfaces';
 
 export const HIDDEN_BOUNDS: EmbeddedMpvBounds = Object.freeze({
     x: -100000,
@@ -7,16 +10,6 @@ export const HIDDEN_BOUNDS: EmbeddedMpvBounds = Object.freeze({
     height: 1,
 }) as EmbeddedMpvBounds;
 
-/**
- * Vertical pixels to subtract from the MPV view's height when a control
- * popover (volume, audio, subtitle, speed, aspect) is open above the
- * controls strip. The native NSView paints over the WebContents, so we
- * shrink it from the bottom to expose the popover region in DOM. Sized to
- * cover the tallest popover (audio/subtitle list capped at ~240 px plus
- * title + padding); video keeps playing in the upper region.
- */
-export const MENU_OPEN_BOTTOM_CUTOUT_PX = 300;
-
 export const SPEED_PRESETS: ReadonlyArray<{ value: number; label: string }> = [
     { value: 0.5, label: '0.5×' },
     { value: 0.75, label: '0.75×' },
@@ -117,12 +110,19 @@ export function persistVolume(value: number): void {
     localStorage.setItem('volume', String(value));
 }
 
+/**
+ * Measures the host element in CSS pixels without rounding. The main process
+ * converts these bounds to native units (page zoom × display scale) and
+ * rounds exactly once, after scaling — pre-rounding here would bake up to
+ * ±0.5px of CSS error that the scale factor then amplifies into visible
+ * off-by-one seams (e.g. a 10.49px edge at 200% renders at 21px, not 20px).
+ */
 export function measureBounds(host: HTMLElement): EmbeddedMpvBounds {
     const rect = host.getBoundingClientRect();
     return {
-        x: Math.round(rect.left),
-        y: Math.round(rect.top),
-        width: Math.max(1, Math.round(rect.width)),
-        height: Math.max(1, Math.round(rect.height)),
+        x: rect.left,
+        y: rect.top,
+        width: Math.max(1, rect.width),
+        height: Math.max(1, rect.height),
     };
 }
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-legacy-interactions.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-legacy-interactions.ts
new file mode 100644
index 000000000..20b3b3bb0
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-legacy-interactions.ts
@@ -0,0 +1,249 @@
+import type { WritableSignal } from '@angular/core';
+import type { EmbeddedMpvMenuState } from './embedded-mpv-ui-state';
+
+const HIDE_CONTROLS_DELAY_MS = 2500;
+const VOLUME_POPOVER_CLOSE_DELAY_MS = 220;
+const VIEWPORT_CLICK_PAUSE_DELAY_MS = 250;
+
+export interface EmbeddedMpvLegacyInteractionsDeps {
+    readonly isAvailable: () => boolean;
+    readonly playerRoot: () => HTMLElement | null;
+    readonly menus: EmbeddedMpvMenuState;
+    readonly controlsVisible: WritableSignal<boolean>;
+    readonly isLoading: () => boolean;
+    readonly isErrored: () => boolean;
+    readonly isStalled: () => boolean;
+    readonly isPlaying: () => boolean;
+    readonly statusLabel: () => string;
+    readonly togglePaused: () => void | Promise<void>;
+    readonly toggleFullscreen: () => void | Promise<void>;
+}
+
+export class EmbeddedMpvLegacyInteractions {
+    private controlsHideTimer: number | null = null;
+    private volumeCloseTimer: number | null = null;
+    private viewportClickTimer: number | null = null;
+    private attached = false;
+
+    private readonly onDocumentPointerDown = (event: PointerEvent) => {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        const playerRoot = this.deps.playerRoot();
+        if (!playerRoot || event.composedPath().includes(playerRoot)) {
+            return;
+        }
+        this.closePopovers();
+    };
+
+    private readonly onDocumentPointerMove = (event: PointerEvent) => {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        const playerRoot = this.deps.playerRoot();
+        if (
+            playerRoot &&
+            !event.composedPath().includes(playerRoot) &&
+            this.isPointerInsidePlayer(event)
+        ) {
+            this.revealControls();
+        }
+    };
+
+    constructor(private readonly deps: EmbeddedMpvLegacyInteractionsDeps) {}
+
+    attach(): void {
+        if (this.attached || typeof document === 'undefined') {
+            return;
+        }
+        document.addEventListener('pointerdown', this.onDocumentPointerDown);
+        document.addEventListener('pointermove', this.onDocumentPointerMove, {
+            passive: true,
+        });
+        this.attached = true;
+    }
+
+    dispose(): void {
+        if (this.attached && typeof document !== 'undefined') {
+            document.removeEventListener(
+                'pointerdown',
+                this.onDocumentPointerDown
+            );
+            document.removeEventListener(
+                'pointermove',
+                this.onDocumentPointerMove
+            );
+        }
+        this.attached = false;
+        this.clearControlsHideTimer();
+        this.clearVolumeCloseTimer();
+        this.clearViewportClickTimer();
+    }
+
+    isAvailable(): boolean {
+        return this.deps.isAvailable();
+    }
+
+    handleEngineTransition(isFrameCopyEngine: boolean): void {
+        if (!isFrameCopyEngine) {
+            return;
+        }
+        this.clearControlsHideTimer();
+        this.clearVolumeCloseTimer();
+        this.clearViewportClickTimer();
+        this.deps.menus.closeAll();
+    }
+
+    onPlayerInteraction(): void {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        this.revealControls();
+    }
+
+    onViewportClick(event: MouseEvent): void {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        const target = event.target as HTMLElement | null;
+        if (target?.closest('button, input, [role="slider"]')) {
+            return;
+        }
+        if (this.deps.menus.anyOpen()) {
+            this.deps.menus.closeAll();
+            return;
+        }
+        if (
+            this.deps.isLoading() ||
+            this.deps.isErrored() ||
+            this.deps.isStalled()
+        ) {
+            return;
+        }
+        // Delay the single-click transport toggle so a double-click can
+        // cancel it and claim the interaction for fullscreen instead.
+        this.clearViewportClickTimer();
+        this.viewportClickTimer = window.setTimeout(() => {
+            this.viewportClickTimer = null;
+            void this.deps.togglePaused();
+        }, VIEWPORT_CLICK_PAUSE_DELAY_MS);
+    }
+
+    onPlayerDblClick(event: MouseEvent): void {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        const target = event.target as HTMLElement | null;
+        if (target?.closest('button, input, [role="slider"]')) {
+            return;
+        }
+        this.clearViewportClickTimer();
+        void this.deps.toggleFullscreen();
+    }
+
+    onVolumeHoverEnter(): void {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        this.clearVolumeCloseTimer();
+        this.deps.menus.open('volume');
+    }
+
+    onVolumeHoverLeave(): void {
+        if (!this.deps.isAvailable()) {
+            return;
+        }
+        this.clearVolumeCloseTimer();
+        this.volumeCloseTimer = window.setTimeout(() => {
+            this.deps.menus.close('volume');
+            this.volumeCloseTimer = null;
+        }, VOLUME_POPOVER_CLOSE_DELAY_MS);
+    }
+
+    closePopovers(): void {
+        if (!this.deps.isAvailable() || !this.deps.menus.anyOpen()) {
+            return;
+        }
+        // Menus live inside the fixed-height dock strip, so closing them
+        // needs no bounds resync — the native MPV view never moved.
+        this.deps.menus.closeAll();
+        this.scheduleControlsHide();
+    }
+
+    revealControls(scheduleHide = true): void {
+        if (!this.deps.isAvailable()) {
+            this.clearControlsHideTimer();
+            return;
+        }
+        this.deps.controlsVisible.set(true);
+        if (scheduleHide) {
+            this.clearControlsHideTimer();
+            this.scheduleControlsHide();
+        }
+    }
+
+    scheduleControlsHide(): void {
+        if (!this.deps.isAvailable()) {
+            this.clearControlsHideTimer();
+            return;
+        }
+        if (
+            !this.deps.isPlaying() ||
+            this.deps.menus.anyOpen() ||
+            Boolean(this.deps.statusLabel())
+        ) {
+            this.clearControlsHideTimer();
+            return;
+        }
+        if (!this.deps.controlsVisible() || this.controlsHideTimer !== null) {
+            return;
+        }
+        this.controlsHideTimer = window.setTimeout(() => {
+            if (
+                this.deps.isPlaying() &&
+                !this.deps.menus.anyOpen() &&
+                !this.deps.statusLabel()
+            ) {
+                this.deps.controlsVisible.set(false);
+            }
+        }, HIDE_CONTROLS_DELAY_MS);
+    }
+
+    private clearControlsHideTimer(): void {
+        if (this.controlsHideTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.controlsHideTimer);
+        this.controlsHideTimer = null;
+    }
+
+    private clearVolumeCloseTimer(): void {
+        if (this.volumeCloseTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.volumeCloseTimer);
+        this.volumeCloseTimer = null;
+    }
+
+    private clearViewportClickTimer(): void {
+        if (this.viewportClickTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.viewportClickTimer);
+        this.viewportClickTimer = null;
+    }
+
+    private isPointerInsidePlayer(event: PointerEvent): boolean {
+        const playerRoot = this.deps.playerRoot();
+        if (!playerRoot) {
+            return false;
+        }
+        const rect = playerRoot.getBoundingClientRect();
+        return (
+            event.clientX >= rect.left &&
+            event.clientX <= rect.right &&
+            event.clientY >= rect.top &&
+            event.clientY <= rect.bottom
+        );
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.dock-panels.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.dock-panels.spec.ts
new file mode 100644
index 000000000..b7d38ed10
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.dock-panels.spec.ts
@@ -0,0 +1,324 @@
+import { Component, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { HIDDEN_BOUNDS } from './embedded-mpv-format.utils';
+import { EmbeddedMpvOverlayVisibilityService } from './embedded-mpv-overlay-visibility.service';
+import { EmbeddedMpvPlayerComponent } from './embedded-mpv-player.component';
+import {
+    EmbeddedMpvBoundsProvider,
+    EmbeddedMpvSessionController,
+} from './embedded-mpv-session-controller';
+
+@Component({
+    imports: [EmbeddedMpvPlayerComponent],
+    template: `<app-embedded-mpv-player [playback]="playback" />`,
+})
+class DockPanelsHostComponent {
+    playback: ResolvedPortalPlayback = {
+        streamUrl: 'https://example.test/movie/42.mp4',
+        title: 'Movie',
+        contentInfo: {
+            playlistId: 'playlist-1',
+            contentXtreamId: 42,
+            contentType: 'movie',
+        },
+    };
+}
+
+const HOST_RECT = { left: 4, top: 8, width: 1280, height: 720 };
+const FULL_BOUNDS = { x: 4, y: 8, width: 1280, height: 720 };
+const HOST_STUB = {
+    getBoundingClientRect: () => HOST_RECT,
+} as unknown as HTMLElement;
+
+describe('EmbeddedMpvPlayerComponent dock panels', () => {
+    let fixture: ComponentFixture<DockPanelsHostComponent>;
+    let player: EmbeddedMpvPlayerComponent;
+    let controller: EmbeddedMpvSessionController;
+    let boundsProviderSpy: jest.SpyInstance;
+    const overlayActive = signal(false);
+
+    const boundsProvider = (): EmbeddedMpvBoundsProvider =>
+        boundsProviderSpy.mock.calls[0][0];
+
+    const query = (selector: string) =>
+        fixture.debugElement.query(By.css(selector));
+    const queryAll = (selector: string) =>
+        fixture.debugElement.queryAll(By.css(selector));
+
+    const configureReadyController = () => {
+        controller.support.set({
+            supported: true,
+            platform: 'darwin',
+            engine: 'native',
+            capabilities: {
+                subtitles: true,
+                playbackSpeed: true,
+                aspectOverride: true,
+                screenshot: false,
+                recording: false,
+            },
+        });
+        controller.session.set({
+            id: 'session-1',
+            title: 'Movie',
+            streamUrl: 'https://example.test/movie/42.mp4',
+            status: 'playing',
+            positionSeconds: 30,
+            durationSeconds: 120,
+            volume: 1,
+            audioTracks: [
+                {
+                    id: 1,
+                    language: 'eng',
+                    selected: true,
+                    defaultTrack: true,
+                },
+                { id: 2, language: 'deu', selected: false },
+            ],
+            selectedAudioTrackId: 1,
+            subtitleTracks: [
+                { id: 21, language: 'eng', selected: false },
+                { id: 22, language: 'deu', selected: false },
+            ],
+            selectedSubtitleTrackId: null,
+            playbackSpeed: 1,
+            aspectOverride: 'no',
+            recording: { active: false },
+            startedAt: '2026-07-19T12:00:00Z',
+            updatedAt: '2026-07-19T12:00:00Z',
+        } satisfies EmbeddedMpvSession);
+        fixture.detectChanges();
+    };
+
+    beforeEach(async () => {
+        overlayActive.set(false);
+        boundsProviderSpy = jest.spyOn(
+            EmbeddedMpvSessionController.prototype,
+            'setBoundsProvider'
+        );
+
+        await TestBed.configureTestingModule({
+            imports: [DockPanelsHostComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: EmbeddedMpvOverlayVisibilityService,
+                    useValue: { overlayActive },
+                },
+            ],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(DockPanelsHostComponent);
+        fixture.detectChanges();
+        const playerDebugElement = fixture.debugElement.query(
+            By.directive(EmbeddedMpvPlayerComponent)
+        );
+        player = playerDebugElement.componentInstance;
+        controller = playerDebugElement.injector.get(
+            EmbeddedMpvSessionController
+        );
+        configureReadyController();
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+        boundsProviderSpy.mockRestore();
+    });
+
+    it('keeps full host bounds while every control menu is open', () => {
+        const provider = boundsProvider();
+
+        expect(provider(HOST_STUB)).toEqual(FULL_BOUNDS);
+
+        for (const menu of [
+            'volume',
+            'audio',
+            'subtitle',
+            'speed',
+            'aspect',
+        ] as const) {
+            player.menus.open(menu);
+            // Core regression: menus render inside the fixed dock strip, so
+            // the native MPV view must never shrink (no bottom cutout).
+            expect(provider(HOST_STUB)).toEqual(FULL_BOUNDS);
+        }
+    });
+
+    it('still hides the native view while a modal overlay is active', () => {
+        overlayActive.set(true);
+        expect(boundsProvider()(HOST_STUB)).toEqual(HIDDEN_BOUNDS);
+
+        overlayActive.set(false);
+        expect(boundsProvider()(HOST_STUB)).toEqual(FULL_BOUNDS);
+    });
+
+    it('morphs the dock row into a horizontal audio panel with menu roles', () => {
+        query('[data-embedded-mpv-menu-button="audio"]').nativeElement.click();
+        fixture.detectChanges();
+
+        expect(query('.embedded-mpv-player__transport')).toBeNull();
+        expect(query('app-embedded-mpv-dock-panel')).not.toBeNull();
+
+        const ribbon = query('.embedded-mpv-dock-panel__ribbon');
+        expect(ribbon.attributes['role']).toBe('menu');
+        expect(ribbon.attributes['aria-orientation']).toBe('horizontal');
+
+        const chips = queryAll('.embedded-mpv-dock-panel__chip');
+        expect(chips).toHaveLength(2);
+        expect(chips[0].attributes['role']).toBe('menuitemradio');
+        expect(chips[0].nativeElement.getAttribute('aria-checked')).toBe(
+            'true'
+        );
+        expect(chips[0].nativeElement.tabIndex).toBe(0);
+        expect(chips[1].nativeElement.getAttribute('aria-checked')).toBe(
+            'false'
+        );
+        expect(chips[1].nativeElement.tabIndex).toBe(-1);
+        expect(chips[1].nativeElement.getAttribute('title')).toContain('deu');
+    });
+
+    it('selects an audio chip, closes the panel, and restores the row', async () => {
+        const setAudioTrack = jest
+            .spyOn(controller, 'setAudioTrack')
+            .mockResolvedValue(undefined);
+
+        query('[data-embedded-mpv-menu-button="audio"]').nativeElement.click();
+        fixture.detectChanges();
+        queryAll('.embedded-mpv-dock-panel__chip')[1].nativeElement.click();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        expect(setAudioTrack).toHaveBeenCalledWith(2);
+        expect(player.menus.audioOpen()).toBe(false);
+        expect(query('app-embedded-mpv-dock-panel')).toBeNull();
+        expect(query('.embedded-mpv-player__transport')).not.toBeNull();
+    });
+
+    it('renders the subtitles-off chip first and maps it to track -1', async () => {
+        const setSubtitleTrack = jest
+            .spyOn(controller, 'setSubtitleTrack')
+            .mockResolvedValue(undefined);
+
+        query(
+            '[data-embedded-mpv-menu-button="subtitle"]'
+        ).nativeElement.click();
+        fixture.detectChanges();
+
+        const chips = queryAll('.embedded-mpv-dock-panel__chip');
+        expect(chips).toHaveLength(3);
+        expect(chips[0].nativeElement.getAttribute('aria-checked')).toBe(
+            'true'
+        );
+
+        chips[0].nativeElement.click();
+        await fixture.whenStable();
+        expect(setSubtitleTrack).toHaveBeenCalledWith(-1);
+
+        query(
+            '[data-embedded-mpv-menu-button="subtitle"]'
+        ).nativeElement.click();
+        fixture.detectChanges();
+        queryAll('.embedded-mpv-dock-panel__chip')[2].nativeElement.click();
+        await fixture.whenStable();
+        expect(setSubtitleTrack).toHaveBeenCalledWith(22);
+    });
+
+    it('selects speed and aspect presets from horizontal chip rows', async () => {
+        const setSpeed = jest
+            .spyOn(controller, 'setSpeed')
+            .mockResolvedValue(undefined);
+        const setAspect = jest
+            .spyOn(controller, 'setAspect')
+            .mockResolvedValue(undefined);
+
+        query('[data-embedded-mpv-menu-button="speed"]').nativeElement.click();
+        fixture.detectChanges();
+        expect(queryAll('.embedded-mpv-dock-panel__chip')).toHaveLength(6);
+        queryAll('.embedded-mpv-dock-panel__chip')[4].nativeElement.click();
+        await fixture.whenStable();
+        fixture.detectChanges();
+        expect(setSpeed).toHaveBeenCalledWith(1.5);
+
+        query('[data-embedded-mpv-menu-button="aspect"]').nativeElement.click();
+        fixture.detectChanges();
+        expect(queryAll('.embedded-mpv-dock-panel__chip')).toHaveLength(5);
+        queryAll('.embedded-mpv-dock-panel__chip')[1].nativeElement.click();
+        await fixture.whenStable();
+        expect(setAspect).toHaveBeenCalledWith('16:9');
+    });
+
+    it('expands volume inline without morphing the row', () => {
+        player.menus.open('volume');
+        fixture.detectChanges();
+
+        expect(query('.embedded-mpv-player__volume-inline')).not.toBeNull();
+        expect(query('.embedded-mpv-player__transport')).not.toBeNull();
+        expect(query('app-embedded-mpv-dock-panel')).toBeNull();
+
+        const slider = query('.embedded-mpv-player__slider--volume')
+            .nativeElement as HTMLInputElement;
+        slider.value = '0.4';
+        slider.dispatchEvent(new Event('input', { bubbles: true }));
+        fixture.detectChanges();
+
+        expect(player.volume()).toBe(0.4);
+    });
+
+    it('closes an open panel with Escape', () => {
+        query('[data-embedded-mpv-menu-button="speed"]').nativeElement.click();
+        fixture.detectChanges();
+        expect(player.menus.speedOpen()).toBe(true);
+
+        document.dispatchEvent(
+            new KeyboardEvent('keydown', { key: 'Escape', bubbles: true })
+        );
+        fixture.detectChanges();
+
+        expect(player.menus.anyOpen()).toBe(false);
+        expect(query('.embedded-mpv-player__transport')).not.toBeNull();
+    });
+
+    it('blocks seek and volume arrow shortcuts while a chip panel is open', () => {
+        const seekBy = jest
+            .spyOn(controller, 'seekBy')
+            .mockResolvedValue(true);
+        const volumeBefore = player.volume();
+
+        query('[data-embedded-mpv-menu-button="audio"]').nativeElement.click();
+        fixture.detectChanges();
+
+        for (const key of [
+            'ArrowLeft',
+            'ArrowRight',
+            'ArrowUp',
+            'ArrowDown',
+        ]) {
+            document.dispatchEvent(
+                new KeyboardEvent('keydown', {
+                    key,
+                    bubbles: true,
+                    cancelable: true,
+                })
+            );
+        }
+
+        expect(seekBy).not.toHaveBeenCalled();
+        expect(player.volume()).toBe(volumeBefore);
+
+        player.menus.closeAll();
+        fixture.detectChanges();
+        document.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: 'ArrowRight',
+                bubbles: true,
+                cancelable: true,
+            })
+        );
+        expect(seekBy).toHaveBeenCalledWith(5);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.html b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.html
index 7921f2b09..a6e4cd5f0 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.html
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.html
@@ -3,10 +3,14 @@
     class="embedded-mpv-player"
     [class.embedded-mpv-player--fullscreen]="isFullscreen()"
     [class.embedded-mpv-player--controls-enabled]="
-        showControls() && isSupported()
+        !isFrameCopyEngine() && showControls() && isSupported()
+    "
+    [class.embedded-mpv-player--controls-visible]="
+        !isFrameCopyEngine() && controlsAreVisible()
+    "
+    [class.embedded-mpv-player--cursor-hidden]="
+        !isFrameCopyEngine() && hideCursor()
     "
-    [class.embedded-mpv-player--controls-visible]="controlsAreVisible()"
-    [class.embedded-mpv-player--cursor-hidden]="hideCursor()"
     (pointerenter)="onPlayerInteraction()"
     (pointermove)="onPlayerInteraction()"
     (click)="onPlayerInteraction()"
@@ -18,6 +22,15 @@
         class="embedded-mpv-player__viewport"
         (click)="onViewportClick($event)"
     >
+        @if (isFrameCopyEngine()) {
+            <!-- Frame-copy engine: the preload frame pump paints helper
+                 frames onto this canvas. It is ordinary DOM, so controls
+                 and dialogs stack above it without native-layer tricks. -->
+            <canvas
+                class="embedded-mpv-player__frame-canvas"
+                data-embedded-mpv-frame
+            ></canvas>
+        }
         @if (isErrored()) {
             <div
                 class="embedded-mpv-player__stalled"
@@ -69,7 +82,7 @@
             </div>
         }
 
-        @if (feedback.current(); as feedback) {
+        @if (!isFrameCopyEngine() && feedback.current(); as feedback) {
             <div
                 class="embedded-mpv-player__feedback"
                 [attr.data-feedback-key]="feedback.key"
@@ -81,227 +94,267 @@
         }
     </div>
 
-    @if (showControls() && isSupported()) {
+    @if (isFrameCopyEngine() && isSupported()) {
+        <app-player-controls
+            [controller]="sharedControls"
+            [playerSurface]="playerSurface()"
+            [mediaTitle]="mediaTitle()"
+            [showControls]="showControls()"
+            [shortcutsEnabled]="sharedShortcutsEnabled()"
+            (previousEpisodeRequested)="requestPreviousEpisode()"
+            (nextEpisodeRequested)="requestNextEpisode()"
+        />
+    }
+
+    @if (!isFrameCopyEngine() && showControls() && isSupported()) {
         <div
             class="embedded-mpv-player__controls"
             [class.embedded-mpv-player__controls--visible]="
                 controlsAreVisible()
             "
+            [class.embedded-mpv-player__controls--panel]="
+                dockPanels.active() !== null
+            "
         >
-            <div class="embedded-mpv-player__transport">
-                <button
-                    mat-icon-button
-                    type="button"
-                    class="embedded-mpv-player__control-button"
-                    [disabled]="isLoading()"
-                    (click)="togglePaused()"
-                    [attr.aria-label]="(isPaused()
-                            ? 'EMBEDDED_MPV.PLAYER.PLAY'
-                            : 'EMBEDDED_MPV.PLAYER.PAUSE'
-                        ) | translate"
-                    [matTooltip]="(isPaused()
-                            ? 'EMBEDDED_MPV.PLAYER.PLAY'
-                            : 'EMBEDDED_MPV.PLAYER.PAUSE'
-                        ) | translate"
-                    matTooltipPosition="above"
-                >
-                    <mat-icon>{{
-                        isPaused() ? 'play_arrow' : 'pause'
-                    }}</mat-icon>
-                </button>
-
-                @if (showSeriesNavigation()) {
-                    <button
-                        mat-icon-button
-                        type="button"
-                        class="embedded-mpv-player__control-button"
-                        data-test-id="embedded-mpv-previous-episode"
-                        [disabled]="isLoading() || !canPreviousEpisode()"
-                        (click)="requestPreviousEpisode()"
-                        [attr.aria-label]="
-                            'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE' | translate
-                        "
-                        [matTooltip]="
-                            'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE' | translate
-                        "
-                        matTooltipPosition="above"
-                    >
-                        <mat-icon>skip_previous</mat-icon>
-                    </button>
-
-                    <button
-                        mat-icon-button
-                        type="button"
-                        class="embedded-mpv-player__control-button"
-                        data-test-id="embedded-mpv-next-episode"
-                        [disabled]="isLoading() || !canNextEpisode()"
-                        (click)="requestNextEpisode()"
-                        [attr.aria-label]="
-                            'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
-                        "
-                        [matTooltip]="
-                            'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
-                        "
-                        matTooltipPosition="above"
-                    >
-                        <mat-icon>skip_next</mat-icon>
-                    </button>
-                }
-
-                <button
-                    mat-icon-button
-                    type="button"
-                    class="embedded-mpv-player__control-button"
-                    [disabled]="!canSeek()"
-                    (click)="seekBy(-10)"
-                    [attr.aria-label]="
-                        'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
-                    "
-                    [matTooltip]="
-                        'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
-                    "
-                    matTooltipPosition="above"
-                >
-                    <mat-icon>replay_10</mat-icon>
-                </button>
-
-                <button
-                    mat-icon-button
-                    type="button"
-                    class="embedded-mpv-player__control-button"
-                    [disabled]="!canSeek()"
-                    (click)="seekBy(10)"
-                    [attr.aria-label]="
-                        'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS' | translate
-                    "
-                    [matTooltip]="
-                        'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS' | translate
-                    "
-                    matTooltipPosition="above"
-                >
-                    <mat-icon>forward_10</mat-icon>
-                </button>
-            </div>
-
-            <div class="embedded-mpv-player__timeline">
-                <input
-                    class="embedded-mpv-player__slider"
-                    [style.--slider-progress.%]="
-                        canSeek()
-                            ? (timelineValue() /
-                                  ((session()?.durationSeconds ?? 0) || 1)) *
-                              100
-                            : 0
-                    "
-                    type="range"
-                    min="0"
-                    [max]="session()?.durationSeconds ?? 0"
-                    [value]="timelineValue()"
-                    [disabled]="!canSeek()"
-                    [attr.aria-valuetext]="formatTime(timelineValue())"
-                    (input)="onTimelineInput($event)"
-                    (change)="onTimelineCommit($event)"
+            @if (dockPanels.active(); as dockPanel) {
+                <app-embedded-mpv-dock-panel
+                    [panel]="dockPanel"
+                    [backLabel]="dockPanelBackLabel()"
+                    (chipSelected)="dockPanels.select($event)"
+                    (closed)="dockPanels.close()"
                 />
-                <div class="embedded-mpv-player__time">
-                    <span>{{ formatTime(timelineValue()) }}</span>
-                    @if (canSeek()) {
-                        <span>{{
-                            formatTime(session()?.durationSeconds)
-                        }}</span>
-                    } @else if (isLivePlayback()) {
-                        <span
-                            class="embedded-mpv-player__live-badge"
-                            [attr.aria-label]="
-                                'EMBEDDED_MPV.PLAYER.LIVE_STREAM' | translate
-                            "
-                        >
-                            <span
-                                class="embedded-mpv-player__live-dot"
-                                aria-hidden="true"
-                            ></span>
-                            LIVE
-                        </span>
-                    } @else {
-                        <span>--:--</span>
-                    }
-                </div>
-                @if (recordingStatusText(); as recordingStatus) {
-                    <div
-                        class="embedded-mpv-player__recording-status"
-                        [class.embedded-mpv-player__recording-status--active]="
-                            isRecording()
+            } @else {
+                <div class="embedded-mpv-player__transport">
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="embedded-mpv-player__control-button"
+                        [disabled]="isLoading()"
+                        (click)="togglePaused()"
+                        [attr.aria-label]="
+                            (isPaused()
+                                ? 'EMBEDDED_MPV.PLAYER.PLAY'
+                                : 'EMBEDDED_MPV.PLAYER.PAUSE'
+                            ) | translate
                         "
-                        [attr.aria-live]="isRecording() ? 'off' : 'polite'"
+                        [matTooltip]="
+                            (isPaused()
+                                ? 'EMBEDDED_MPV.PLAYER.PLAY'
+                                : 'EMBEDDED_MPV.PLAYER.PAUSE'
+                            ) | translate
+                        "
+                        matTooltipPosition="above"
                     >
                         <mat-icon>{{
-                            isRecording()
-                                ? 'fiber_manual_record'
-                                : 'check_circle'
+                            isPaused() ? 'play_arrow' : 'pause'
                         }}</mat-icon>
-                        <span>{{ recordingStatus }}</span>
-                    </div>
-                }
-            </div>
-
-            <div class="embedded-mpv-player__actions">
-                <div
-                    class="embedded-mpv-player__popover-anchor"
-                    (pointerenter)="onVolumeHoverEnter()"
-                    (pointerleave)="onVolumeHoverLeave()"
-                    (focusin)="onVolumeHoverEnter()"
-                    (focusout)="onVolumeHoverLeave()"
-                    (wheel)="onVolumeWheel($event)"
-                >
-                    <button
-                        mat-icon-button
-                        type="button"
-                        class="embedded-mpv-player__control-button"
-                        (click)="toggleMute()"
-                        [attr.aria-label]="(volume() <= 0
-                                ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
-                                : 'EMBEDDED_MPV.PLAYER.MUTE'
-                            ) | translate"
-                        [matTooltip]="(volume() <= 0
-                                ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
-                                : 'EMBEDDED_MPV.PLAYER.MUTE'
-                            ) | translate"
-                        matTooltipPosition="above"
-                    >
-                        <mat-icon>{{ volumeIcon() }}</mat-icon>
                     </button>
-                    @if (menus.volumeOpen()) {
-                        <div
-                            class="embedded-mpv-player__control-panel embedded-mpv-player__volume-popover"
-                            role="dialog"
-                            [attr.aria-label]="
-                                'EMBEDDED_MPV.PLAYER.VOLUME' | translate
-                            "
-                        >
-                            <input
-                                class="embedded-mpv-player__slider embedded-mpv-player__slider--volume"
-                                [style.--slider-progress.%]="volume() * 100"
-                                type="range"
-                                min="0"
-                                max="1"
-                                step="0.01"
-                                [value]="volume()"
-                                [attr.aria-label]="volumeLabel()"
-                                [attr.aria-valuetext]="volumeLabel()"
-                                (input)="onVolumeInput($event)"
-                            />
-                            <span class="embedded-mpv-player__volume-value">
-                                {{ volumeLabel() }}
-                            </span>
-                        </div>
-                    }
-                </div>
 
-                @if (hasAudioTracks()) {
-                    <div class="embedded-mpv-player__popover-anchor">
+                    @if (showSeriesNavigation()) {
                         <button
                             mat-icon-button
                             type="button"
                             class="embedded-mpv-player__control-button"
+                            data-test-id="embedded-mpv-previous-episode"
+                            [disabled]="isLoading() || !canPreviousEpisode()"
+                            (click)="requestPreviousEpisode()"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE'
+                                    | translate
+                            "
+                            [matTooltip]="
+                                'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE'
+                                    | translate
+                            "
+                            matTooltipPosition="above"
+                        >
+                            <mat-icon>skip_previous</mat-icon>
+                        </button>
+
+                        <button
+                            mat-icon-button
+                            type="button"
+                            class="embedded-mpv-player__control-button"
+                            data-test-id="embedded-mpv-next-episode"
+                            [disabled]="isLoading() || !canNextEpisode()"
+                            (click)="requestNextEpisode()"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
+                            "
+                            [matTooltip]="
+                                'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
+                            "
+                            matTooltipPosition="above"
+                        >
+                            <mat-icon>skip_next</mat-icon>
+                        </button>
+                    }
+
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="embedded-mpv-player__control-button"
+                        [disabled]="!canSeek()"
+                        (click)="seekBy(-10)"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>replay_10</mat-icon>
+                    </button>
+
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="embedded-mpv-player__control-button"
+                        [disabled]="!canSeek()"
+                        (click)="seekBy(10)"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS'
+                                | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS'
+                                | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>forward_10</mat-icon>
+                    </button>
+                </div>
+
+                <div class="embedded-mpv-player__timeline">
+                    <input
+                        class="embedded-mpv-player__slider"
+                        [style.--slider-progress.%]="
+                            canSeek()
+                                ? (timelineValue() /
+                                      ((session()?.durationSeconds ?? 0) ||
+                                          1)) *
+                                  100
+                                : 0
+                        "
+                        type="range"
+                        min="0"
+                        [max]="session()?.durationSeconds ?? 0"
+                        [value]="timelineValue()"
+                        [disabled]="!canSeek()"
+                        [attr.aria-valuetext]="formatTime(timelineValue())"
+                        (input)="onTimelineInput($event)"
+                        (change)="onTimelineCommit($event)"
+                    />
+                    <div class="embedded-mpv-player__time">
+                        <span>{{ formatTime(timelineValue()) }}</span>
+                        @if (canSeek()) {
+                            <span>{{
+                                formatTime(session()?.durationSeconds)
+                            }}</span>
+                        } @else if (isLivePlayback()) {
+                            <span
+                                class="embedded-mpv-player__live-badge"
+                                [attr.aria-label]="
+                                    'EMBEDDED_MPV.PLAYER.LIVE_STREAM'
+                                        | translate
+                                "
+                            >
+                                <span
+                                    class="embedded-mpv-player__live-dot"
+                                    aria-hidden="true"
+                                ></span>
+                                LIVE
+                            </span>
+                        } @else {
+                            <span>--:--</span>
+                        }
+                    </div>
+                    @if (recordingStatusText(); as recordingStatus) {
+                        <div
+                            class="embedded-mpv-player__recording-status"
+                            [class.embedded-mpv-player__recording-status--active]="
+                                isRecording()
+                            "
+                            [attr.aria-live]="isRecording() ? 'off' : 'polite'"
+                        >
+                            <mat-icon>{{
+                                isRecording()
+                                    ? 'fiber_manual_record'
+                                    : 'check_circle'
+                            }}</mat-icon>
+                            <span>{{ recordingStatus }}</span>
+                        </div>
+                    }
+                </div>
+
+                <div class="embedded-mpv-player__actions">
+                    <div
+                        class="embedded-mpv-player__volume-group"
+                        (pointerenter)="onVolumeHoverEnter()"
+                        (pointerleave)="onVolumeHoverLeave()"
+                        (focusin)="onVolumeHoverEnter()"
+                        (focusout)="onVolumeHoverLeave()"
+                        (wheel)="onVolumeWheel($event)"
+                    >
+                        <button
+                            mat-icon-button
+                            type="button"
+                            class="embedded-mpv-player__control-button"
+                            (click)="toggleMute()"
+                            [attr.aria-label]="
+                                (volume() <= 0
+                                    ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
+                                    : 'EMBEDDED_MPV.PLAYER.MUTE'
+                                ) | translate
+                            "
+                            [matTooltip]="
+                                (volume() <= 0
+                                    ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
+                                    : 'EMBEDDED_MPV.PLAYER.MUTE'
+                                ) | translate
+                            "
+                            matTooltipPosition="above"
+                        >
+                            <mat-icon>{{ volumeIcon() }}</mat-icon>
+                        </button>
+                        @if (menus.volumeOpen()) {
+                            <div
+                                class="embedded-mpv-player__volume-inline"
+                                role="group"
+                                [attr.aria-label]="
+                                    'EMBEDDED_MPV.PLAYER.VOLUME' | translate
+                                "
+                            >
+                                <input
+                                    class="embedded-mpv-player__slider embedded-mpv-player__slider--volume"
+                                    [style.--slider-progress.%]="
+                                        volume() * 100
+                                    "
+                                    type="range"
+                                    min="0"
+                                    max="1"
+                                    step="0.01"
+                                    [value]="volume()"
+                                    [attr.aria-label]="volumeLabel()"
+                                    [attr.aria-valuetext]="volumeLabel()"
+                                    (input)="onVolumeInput($event)"
+                                />
+                                <span
+                                    class="embedded-mpv-player__volume-value"
+                                    >{{ volumePercent() }}</span
+                                >
+                            </div>
+                        }
+                    </div>
+
+                    @if (hasAudioTracks()) {
+                        <button
+                            mat-icon-button
+                            type="button"
+                            class="embedded-mpv-player__control-button"
+                            data-embedded-mpv-menu-button="audio"
                             (click)="toggleAudioMenu()"
                             [attr.aria-expanded]="menus.audioOpen()"
                             [attr.aria-label]="
@@ -314,59 +367,14 @@
                         >
                             <mat-icon>graphic_eq</mat-icon>
                         </button>
-                        @if (menus.audioOpen()) {
-                            <div
-                                class="embedded-mpv-player__control-panel embedded-mpv-player__audio-popover"
-                                role="menu"
-                                [attr.aria-label]="
-                                    'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS'
-                                        | translate
-                                "
-                            >
-                                <div class="embedded-mpv-player__menu-title">
-                                    {{
-                                        'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS'
-                                            | translate
-                                    }}
-                                </div>
-                                <div
-                                    class="embedded-mpv-player__audio-track-list"
-                                >
-                                    @for (
-                                        track of audioTracks();
-                                        track track.id;
-                                        let index = $index
-                                    ) {
-                                        <button
-                                            type="button"
-                                            role="menuitemradio"
-                                            [attr.aria-checked]="track.selected"
-                                            class="embedded-mpv-player__audio-track"
-                                            [class.embedded-mpv-player__audio-track--selected]="
-                                                track.selected
-                                            "
-                                            (click)="selectAudioTrack(track.id)"
-                                        >
-                                            <span>{{
-                                                trackLabel(track, index)
-                                            }}</span>
-                                            @if (track.selected) {
-                                                <mat-icon>check</mat-icon>
-                                            }
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        }
-                    </div>
-                }
+                    }
 
-                @if (capabilities().subtitles && hasSubtitleTracks()) {
-                    <div class="embedded-mpv-player__popover-anchor">
+                    @if (capabilities().subtitles && hasSubtitleTracks()) {
                         <button
                             mat-icon-button
                             type="button"
                             class="embedded-mpv-player__control-button"
+                            data-embedded-mpv-menu-button="subtitle"
                             (click)="toggleSubtitleMenu()"
                             [attr.aria-expanded]="menus.subtitleOpen()"
                             [attr.aria-label]="
@@ -383,82 +391,14 @@
                                     : 'subtitles'
                             }}</mat-icon>
                         </button>
-                        @if (menus.subtitleOpen()) {
-                            <div
-                                class="embedded-mpv-player__control-panel embedded-mpv-player__audio-popover"
-                                role="menu"
-                                [attr.aria-label]="
-                                    'EMBEDDED_MPV.PLAYER.SUBTITLES' | translate
-                                "
-                            >
-                                <div class="embedded-mpv-player__menu-title">
-                                    {{
-                                        'EMBEDDED_MPV.PLAYER.SUBTITLES'
-                                            | translate
-                                    }}
-                                </div>
-                                <div
-                                    class="embedded-mpv-player__audio-track-list"
-                                >
-                                    <button
-                                        type="button"
-                                        role="menuitemradio"
-                                        [attr.aria-checked]="
-                                            selectedSubtitleTrackId() === null
-                                        "
-                                        class="embedded-mpv-player__audio-track"
-                                        [class.embedded-mpv-player__audio-track--selected]="
-                                            selectedSubtitleTrackId() === null
-                                        "
-                                        (click)="selectSubtitleTrack(-1)"
-                                    >
-                                        <span>{{
-                                            'EMBEDDED_MPV.PLAYER.SUBTITLES_OFF'
-                                                | translate
-                                        }}</span>
-                                        @if (
-                                            selectedSubtitleTrackId() === null
-                                        ) {
-                                            <mat-icon>check</mat-icon>
-                                        }
-                                    </button>
-                                    @for (
-                                        track of subtitleTracks();
-                                        track track.id;
-                                        let index = $index
-                                    ) {
-                                        <button
-                                            type="button"
-                                            role="menuitemradio"
-                                            [attr.aria-checked]="track.selected"
-                                            class="embedded-mpv-player__audio-track"
-                                            [class.embedded-mpv-player__audio-track--selected]="
-                                                track.selected
-                                            "
-                                            (click)="
-                                                selectSubtitleTrack(track.id)
-                                            "
-                                        >
-                                            <span>{{
-                                                subtitleLabel(track, index)
-                                            }}</span>
-                                            @if (track.selected) {
-                                                <mat-icon>check</mat-icon>
-                                            }
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        }
-                    </div>
-                }
+                    }
 
-                @if (capabilities().playbackSpeed) {
-                    <div class="embedded-mpv-player__popover-anchor">
+                    @if (capabilities().playbackSpeed) {
                         <button
                             mat-icon-button
                             type="button"
                             class="embedded-mpv-player__control-button"
+                            data-embedded-mpv-menu-button="speed"
                             (click)="toggleSpeedMenu()"
                             [attr.aria-expanded]="menus.speedOpen()"
                             [attr.aria-label]="
@@ -473,67 +413,21 @@
                                         : {
                                               speed: speedLabel(
                                                   playbackSpeed()
-                                              )
+                                              ),
                                           }
                             "
                             matTooltipPosition="above"
                         >
                             <mat-icon>speed</mat-icon>
                         </button>
-                        @if (menus.speedOpen()) {
-                            <div
-                                class="embedded-mpv-player__control-panel embedded-mpv-player__audio-popover"
-                                role="menu"
-                                [attr.aria-label]="
-                                    'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED'
-                                        | translate
-                                "
-                            >
-                                <div class="embedded-mpv-player__menu-title">
-                                    {{
-                                        'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED'
-                                            | translate
-                                    }}
-                                </div>
-                                <div
-                                    class="embedded-mpv-player__audio-track-list"
-                                >
-                                    @for (
-                                        preset of speedPresets;
-                                        track preset.value
-                                    ) {
-                                        <button
-                                            type="button"
-                                            role="menuitemradio"
-                                            [attr.aria-checked]="
-                                                preset.value === playbackSpeed()
-                                            "
-                                            class="embedded-mpv-player__audio-track"
-                                            [class.embedded-mpv-player__audio-track--selected]="
-                                                preset.value === playbackSpeed()
-                                            "
-                                            (click)="selectSpeed(preset.value)"
-                                        >
-                                            <span>{{ preset.label }}</span>
-                                            @if (
-                                                preset.value === playbackSpeed()
-                                            ) {
-                                                <mat-icon>check</mat-icon>
-                                            }
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        }
-                    </div>
-                }
+                    }
 
-                @if (capabilities().aspectOverride) {
-                    <div class="embedded-mpv-player__popover-anchor">
+                    @if (capabilities().aspectOverride) {
                         <button
                             mat-icon-button
                             type="button"
                             class="embedded-mpv-player__control-button"
+                            data-embedded-mpv-menu-button="aspect"
                             (click)="toggleAspectMenu()"
                             [attr.aria-expanded]="menus.aspectOpen()"
                             [attr.aria-label]="
@@ -548,112 +442,64 @@
                                         : {
                                               aspect: aspectLabel(
                                                   aspectOverride()
-                                              )
+                                              ),
                                           }
                             "
                             matTooltipPosition="above"
                         >
                             <mat-icon>aspect_ratio</mat-icon>
                         </button>
-                        @if (menus.aspectOpen()) {
-                            <div
-                                class="embedded-mpv-player__control-panel embedded-mpv-player__audio-popover"
-                                role="menu"
-                                [attr.aria-label]="
-                                    'EMBEDDED_MPV.PLAYER.ASPECT_RATIO'
-                                        | translate
-                                "
-                            >
-                                <div class="embedded-mpv-player__menu-title">
-                                    {{
-                                        'EMBEDDED_MPV.PLAYER.ASPECT_RATIO'
-                                            | translate
-                                    }}
-                                </div>
-                                <div
-                                    class="embedded-mpv-player__audio-track-list"
-                                >
-                                    @for (
-                                        preset of aspectPresets;
-                                        track preset.value
-                                    ) {
-                                        <button
-                                            type="button"
-                                            role="menuitemradio"
-                                            [attr.aria-checked]="
-                                                preset.value ===
-                                                aspectOverride()
-                                            "
-                                            class="embedded-mpv-player__audio-track"
-                                            [class.embedded-mpv-player__audio-track--selected]="
-                                                preset.value ===
-                                                aspectOverride()
-                                            "
-                                            (click)="selectAspect(preset.value)"
-                                        >
-                                            <span>{{ preset.label }}</span>
-                                            @if (
-                                                preset.value ===
-                                                aspectOverride()
-                                            ) {
-                                                <mat-icon>check</mat-icon>
-                                            }
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        }
-                    </div>
-                }
+                    }
+
+                    @if (canRecord()) {
+                        <button
+                            mat-icon-button
+                            type="button"
+                            class="embedded-mpv-player__control-button embedded-mpv-player__record-button"
+                            [class.embedded-mpv-player__record-button--active]="
+                                isRecording()
+                            "
+                            [disabled]="isLoading()"
+                            (click)="toggleRecording()"
+                            [attr.aria-pressed]="isRecording()"
+                            [attr.aria-label]="
+                                (isRecording()
+                                    ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
+                                    : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
+                                ) | translate
+                            "
+                            [matTooltip]="
+                                (isRecording()
+                                    ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
+                                    : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
+                                ) | translate
+                            "
+                            matTooltipPosition="above"
+                        >
+                            <mat-icon>{{
+                                isRecording()
+                                    ? 'stop_circle'
+                                    : 'fiber_manual_record'
+                            }}</mat-icon>
+                        </button>
+                    }
 
-                @if (canRecord()) {
                     <button
                         mat-icon-button
                         type="button"
-                        class="embedded-mpv-player__control-button embedded-mpv-player__record-button"
-                        [class.embedded-mpv-player__record-button--active]="
-                            isRecording()
-                        "
-                        [disabled]="isLoading()"
-                        (click)="toggleRecording()"
-                        [attr.aria-pressed]="isRecording()"
-                        [attr.aria-label]="
-                            (isRecording()
-                                ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
-                                : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
-                            ) | translate
-                        "
-                        [matTooltip]="
-                            (isRecording()
-                                ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
-                                : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
-                            ) | translate
-                        "
+                        class="embedded-mpv-player__control-button"
+                        [disabled]="!canFullscreen()"
+                        (click)="toggleFullscreen()"
+                        [attr.aria-label]="fullscreenLabel()"
+                        [matTooltip]="fullscreenLabel()"
                         matTooltipPosition="above"
                     >
                         <mat-icon>{{
-                            isRecording()
-                                ? 'stop_circle'
-                                : 'fiber_manual_record'
+                            isFullscreen() ? 'fullscreen_exit' : 'fullscreen'
                         }}</mat-icon>
                     </button>
-                }
-
-                <button
-                    mat-icon-button
-                    type="button"
-                    class="embedded-mpv-player__control-button"
-                    [disabled]="!canFullscreen()"
-                    (click)="toggleFullscreen()"
-                    [attr.aria-label]="fullscreenLabel()"
-                    [matTooltip]="fullscreenLabel()"
-                    matTooltipPosition="above"
-                >
-                    <mat-icon>{{
-                        isFullscreen() ? 'fullscreen_exit' : 'fullscreen'
-                    }}</mat-icon>
-                </button>
-            </div>
+                </div>
+            }
         </div>
     }
 </div>
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.scss b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.scss
index 94e4fca2d..3c4151932 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.scss
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.scss
@@ -51,6 +51,21 @@
     background: var(--mat-sys-surface);
 }
 
+// Frame-copy engine: video frames are painted onto this canvas by the
+// preload frame pump. The helper renders at the aspect-fit size of the
+// video inside the viewport (no letterbox bars are baked into frames), so
+// object-fit: contain centers the content and the sides show the app
+// surface instead of TV-style black bars. Fullscreen keeps a black
+// backdrop via the viewport rule above.
+.embedded-mpv-player__frame-canvas {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+    background: transparent;
+}
+
 .embedded-mpv-player--controls-enabled .embedded-mpv-player__viewport {
     bottom: var(--embedded-mpv-controls-height);
 }
@@ -279,17 +294,29 @@
     display: flex;
     align-items: center;
     gap: 8px;
+    // Let the actions cell shrink below its content so the inline volume
+    // (a scroll container) clips its own slider instead of pushing the
+    // fullscreen button past the overflow:hidden player edge on narrow
+    // sidebar-constrained widths (viewport wider than the 720px breakpoint).
+    min-width: 0;
 }
 
-.embedded-mpv-player__popover-anchor {
-    position: relative;
+.embedded-mpv-player__volume-group {
     display: flex;
+    align-items: center;
+    min-width: 0;
 }
 
 .embedded-mpv-player__control-button {
     position: relative;
 }
 
+/* A dock panel morphs the whole controls row into a single full-width
+   cell; the strip keeps its fixed height so MPV bounds stay untouched. */
+.embedded-mpv-player__controls--panel {
+    grid-template-columns: minmax(0, 1fr);
+}
+
 .embedded-mpv-player__record-button--active {
     color: var(--mat-sys-error) !important;
 }
@@ -383,113 +410,40 @@
     box-shadow: none;
 }
 
-.embedded-mpv-player__control-panel {
-    min-width: 0;
-    color: var(--mat-sys-on-surface);
-    background: var(--embedded-mpv-glass);
-    border: 1px solid var(--embedded-mpv-border);
-    border-radius: 14px;
-    box-shadow: 0 12px 32px rgba(0, 0, 0, 0.35);
-    backdrop-filter: blur(18px);
+/* Volume expands inline next to the mute icon, inside the actions row —
+   never above the strip, so it needs no compositor workarounds. */
+.embedded-mpv-player__volume-inline {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    overflow: hidden;
+    animation: embedded-mpv-volume-in 160ms ease-out;
 }
 
-.embedded-mpv-player__volume-popover {
-    position: absolute;
-    bottom: calc(100% + 6px);
-    right: 0;
-    display: grid;
-    grid-template-columns: minmax(160px, 200px);
-    gap: 4px;
-    padding: 12px 14px 10px;
-    z-index: 3;
+@keyframes embedded-mpv-volume-in {
+    from {
+        max-width: 0;
+        opacity: 0;
+    }
+    to {
+        max-width: 200px;
+        opacity: 1;
+    }
 }
 
-.embedded-mpv-player__volume-popover::before {
-    /* Hover-bridge so the cursor can move from the button to the popover
-       without crossing a dead zone. */
-    content: '';
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: -8px;
-    height: 8px;
-}
-
-.embedded-mpv-player__volume-popover .embedded-mpv-player__slider--volume {
-    width: 100%;
+.embedded-mpv-player__volume-inline .embedded-mpv-player__slider--volume {
+    width: 132px;
 }
 
 .embedded-mpv-player__volume-value {
     color: color-mix(in srgb, var(--mat-sys-on-surface) 80%, transparent);
     font-size: 0.74rem;
     font-variant-numeric: tabular-nums;
-    text-align: right;
+    min-width: 34px;
+    text-align: end;
     white-space: nowrap;
 }
 
-.embedded-mpv-player__audio-popover {
-    position: absolute;
-    bottom: calc(100% + 6px);
-    right: 0;
-    min-width: 220px;
-    max-width: min(420px, 80vw);
-    padding: 10px 12px;
-    z-index: 3;
-}
-
-.embedded-mpv-player__menu-title {
-    padding: 0 2px 6px;
-    color: color-mix(in srgb, var(--mat-sys-on-surface) 70%, transparent);
-    font-size: 0.7rem;
-    font-weight: 700;
-    letter-spacing: 0.08em;
-    text-transform: uppercase;
-    white-space: nowrap;
-}
-
-.embedded-mpv-player__audio-track-list {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    max-height: 240px;
-    overflow-y: auto;
-    scrollbar-width: thin;
-}
-
-.embedded-mpv-player__audio-track {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 12px;
-    padding: 8px 10px;
-    color: var(--mat-sys-on-surface);
-    background: transparent;
-    border: 0;
-    border-radius: 10px;
-    cursor: pointer;
-    font: inherit;
-    text-align: left;
-}
-
-.embedded-mpv-player__audio-track span {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.embedded-mpv-player__audio-track:hover,
-.embedded-mpv-player__audio-track:focus-visible,
-.embedded-mpv-player__audio-track--selected {
-    background: color-mix(in srgb, var(--embedded-mpv-accent) 16%, transparent);
-}
-
-.embedded-mpv-player__audio-track mat-icon {
-    color: var(--embedded-mpv-accent);
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-}
-
 .embedded-mpv-player :is(button[mat-icon-button]) {
     color: var(--mat-sys-on-surface);
 }
@@ -514,9 +468,7 @@
         min-width: 0;
     }
 
-    .embedded-mpv-player__volume-popover,
-    .embedded-mpv-player__audio-popover {
-        right: 0;
-        left: auto;
+    .embedded-mpv-player__volume-inline .embedded-mpv-player__slider--volume {
+        width: 96px;
     }
 }
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-controls.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-controls.spec.ts
new file mode 100644
index 000000000..dd0b54223
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-controls.spec.ts
@@ -0,0 +1,383 @@
+import { signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import type {
+    EmbeddedMpvEngine,
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { PlayerControlsComponent } from '../player-controls/player-controls.component';
+import { EmbeddedMpvOverlayVisibilityService } from './embedded-mpv-overlay-visibility.service';
+import { EmbeddedMpvPlayerComponent } from './embedded-mpv-player.component';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.test/movie.mp4',
+    title: 'Movie',
+    contentInfo: {
+        playlistId: 'playlist-1',
+        contentXtreamId: 42,
+        contentType: 'movie',
+    },
+};
+
+const READY_SESSION: EmbeddedMpvSession = {
+    id: 'session-1',
+    title: 'Movie',
+    streamUrl: PLAYBACK.streamUrl,
+    status: 'playing',
+    positionSeconds: 30,
+    durationSeconds: 120,
+    volume: 1,
+    audioTracks: [],
+    selectedAudioTrackId: null,
+    subtitleTracks: [],
+    selectedSubtitleTrackId: null,
+    playbackSpeed: 1,
+    aspectOverride: 'no',
+    recording: { active: false },
+    startedAt: '2026-07-16T10:00:00Z',
+    updatedAt: '2026-07-16T10:00:00Z',
+};
+
+const overlayActive = signal(false);
+
+describe('EmbeddedMpvPlayerComponent shared controls host', () => {
+    const fixtures: ComponentFixture<EmbeddedMpvPlayerComponent>[] = [];
+    let fullscreenElement: Element | null;
+    let fullscreenElementDescriptor: PropertyDescriptor | undefined;
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        overlayActive.set(false);
+        fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        fullscreenElement = null;
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+
+        await TestBed.configureTestingModule({
+            imports: [EmbeddedMpvPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: EmbeddedMpvOverlayVisibilityService,
+                    useValue: { overlayActive },
+                },
+            ],
+        }).compileComponents();
+    });
+
+    afterEach(() => {
+        for (const fixture of fixtures.splice(0)) {
+            fixture.destroy();
+        }
+        restoreProperty(
+            document,
+            'fullscreenElement',
+            fullscreenElementDescriptor
+        );
+        jest.useRealTimers();
+        jest.restoreAllMocks();
+    });
+
+    function restoreProperty(
+        target: object,
+        property: PropertyKey,
+        descriptor: PropertyDescriptor | undefined
+    ): void {
+        if (descriptor) {
+            Object.defineProperty(target, property, descriptor);
+            return;
+        }
+        Reflect.deleteProperty(target, property);
+    }
+
+    function support(engine: EmbeddedMpvEngine) {
+        return {
+            supported: true,
+            platform: 'darwin',
+            engine,
+            capabilities: {
+                subtitles: true,
+                playbackSpeed: true,
+                aspectOverride: true,
+                screenshot: true,
+                recording: true,
+            },
+        } as const;
+    }
+
+    function render(
+        engine: EmbeddedMpvEngine = 'frame-copy',
+        showControls = true
+    ) {
+        const fixture = TestBed.createComponent(EmbeddedMpvPlayerComponent);
+        fixtures.push(fixture);
+        fixture.componentRef.setInput('playback', PLAYBACK);
+        fixture.componentRef.setInput('showControls', showControls);
+        fixture.componentRef.setInput('seriesNavigation', {
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        const component = fixture.componentInstance;
+        const controller = fixture.debugElement.injector.get(
+            EmbeddedMpvSessionController
+        );
+        controller.support.set(support(engine));
+        controller.session.set({ ...READY_SESSION });
+        fixture.detectChanges();
+        fixture.detectChanges();
+        return { fixture, component, controller };
+    }
+
+    function sharedControls(
+        fixture: ComponentFixture<EmbeddedMpvPlayerComponent>
+    ): PlayerControlsComponent | null {
+        return (
+            fixture.debugElement.query(By.directive(PlayerControlsComponent))
+                ?.componentInstance ?? null
+        );
+    }
+
+    function root(
+        fixture: ComponentFixture<EmbeddedMpvPlayerComponent>
+    ): HTMLElement {
+        return fixture.debugElement.query(By.css('.embedded-mpv-player'))
+            .nativeElement;
+    }
+
+    function canvas(
+        fixture: ComponentFixture<EmbeddedMpvPlayerComponent>
+    ): HTMLCanvasElement {
+        return fixture.debugElement.query(By.css('[data-embedded-mpv-frame]'))
+            .nativeElement;
+    }
+
+    it('renders the frame-copy canvas with shared controls and no legacy dock', () => {
+        const { fixture } = render();
+        const playerRoot = root(fixture);
+
+        expect(canvas(fixture)).toBeTruthy();
+        expect(sharedControls(fixture)).not.toBeNull();
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__controls'))
+        ).toBeNull();
+        expect(
+            playerRoot.classList.contains(
+                'embedded-mpv-player--controls-enabled'
+            )
+        ).toBe(false);
+        expect(
+            playerRoot.classList.contains(
+                'embedded-mpv-player--controls-visible'
+            )
+        ).toBe(false);
+    });
+
+    it('keeps native playback on the legacy dock without shared controls', () => {
+        const { fixture } = render('native');
+
+        expect(sharedControls(fixture)).toBeNull();
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__controls'))
+        ).not.toBeNull();
+        expect(
+            root(fixture).classList.contains(
+                'embedded-mpv-player--controls-enabled'
+            )
+        ).toBe(true);
+    });
+
+    it('preserves the host previous and next episode guards', () => {
+        const { fixture, component } = render();
+        const controls = sharedControls(fixture);
+        const previous = jest.fn();
+        const next = jest.fn();
+        component.previousEpisodeRequested.subscribe(previous);
+        component.nextEpisodeRequested.subscribe(next);
+
+        controls?.previousEpisodeRequested.emit();
+        controls?.nextEpisodeRequested.emit();
+        expect(previous).toHaveBeenCalledTimes(1);
+        expect(next).not.toHaveBeenCalled();
+
+        fixture.componentRef.setInput('seriesNavigation', {
+            canPrevious: false,
+            canNext: true,
+            autoplayEnabled: true,
+        });
+        fixture.detectChanges();
+        controls?.previousEpisodeRequested.emit();
+        controls?.nextEpisodeRequested.emit();
+
+        expect(previous).toHaveBeenCalledTimes(1);
+        expect(next).toHaveBeenCalledTimes(1);
+    });
+
+    it('syncs bounds on fullscreen changes without revealing legacy state', () => {
+        const { fixture, component, controller } = render();
+        const triggerBoundsSync = jest.spyOn(controller, 'triggerBoundsSync');
+        component.controlsVisible.set(false);
+        fullscreenElement = root(fixture);
+
+        document.dispatchEvent(new Event('fullscreenchange'));
+
+        expect(component.isFullscreen()).toBe(true);
+        expect(triggerBoundsSync).toHaveBeenCalledTimes(1);
+        expect(component.controlsVisible()).toBe(false);
+    });
+
+    it('syncs fullscreen state when shared controls attach after entering fullscreen', () => {
+        const { fixture, controller } = render('native');
+        fullscreenElement = root(fixture);
+        document.dispatchEvent(new Event('fullscreenchange'));
+
+        controller.support.set(support('frame-copy'));
+        fixture.detectChanges();
+
+        expect(sharedControls(fixture)?.isFullscreen()).toBe(true);
+    });
+
+    it('never renders both control systems across engine transitions', () => {
+        const { fixture, controller } = render();
+        jest.useFakeTimers();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+        expect(sharedControls(fixture)).not.toBeNull();
+
+        controller.support.set(support('native'));
+        fixture.detectChanges();
+        expect(sharedControls(fixture)).toBeNull();
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__controls'))
+        ).not.toBeNull();
+        fixture.debugElement
+            .query(By.css('.embedded-mpv-player__viewport'))
+            .nativeElement.dispatchEvent(
+                new MouseEvent('click', { bubbles: true })
+            );
+
+        controller.support.set(support('frame-copy'));
+        fixture.detectChanges();
+        expect(sharedControls(fixture)).not.toBeNull();
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__controls'))
+        ).toBeNull();
+        jest.advanceTimersByTime(1000);
+        expect(togglePaused).not.toHaveBeenCalled();
+    });
+
+    it('clears a native volume-close timer during a frame-copy handoff', () => {
+        jest.useFakeTimers();
+        const { fixture, component, controller } = render('native');
+        component.onVolumeHoverEnter();
+        component.onVolumeHoverLeave();
+
+        controller.support.set(support('frame-copy'));
+        fixture.detectChanges();
+        controller.support.set(support('native'));
+        fixture.detectChanges();
+        component.menus.open('volume');
+
+        jest.advanceTimersByTime(220);
+
+        expect(component.menus.volumeOpen()).toBe(true);
+    });
+
+    it('does not render or revive legacy feedback across a frame-copy handoff', () => {
+        jest.useFakeTimers();
+        const { fixture, component, controller } = render('native');
+        component.feedback.flash('forward_10', '+10s', 5000);
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__feedback'))
+        ).not.toBeNull();
+
+        controller.support.set(support('frame-copy'));
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__feedback'))
+        ).toBeNull();
+
+        component.feedback.flash('error_outline', 'Late native failure', 5000);
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__feedback'))
+        ).toBeNull();
+
+        controller.support.set(support('native'));
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.query(By.css('.embedded-mpv-player__feedback'))
+        ).toBeNull();
+    });
+
+    it('leaves legacy pointer and popover state untouched on frame-copy', () => {
+        const { fixture, component } = render();
+        component.controlsVisible.set(false);
+        component.menus.open('audio');
+
+        root(fixture).dispatchEvent(new MouseEvent('pointermove'));
+        root(fixture).dispatchEvent(
+            new FocusEvent('focusin', { bubbles: true })
+        );
+        document.dispatchEvent(
+            new MouseEvent('pointermove', { clientX: 0, clientY: 0 })
+        );
+        document.body.dispatchEvent(
+            new MouseEvent('pointerdown', { bubbles: true })
+        );
+
+        expect(component.controlsVisible()).toBe(false);
+        expect(component.menus.audioOpen()).toBe(true);
+    });
+
+    it.each(['frame-copy', 'native'] as const)(
+        'uses exactly one recording interval for the %s engine',
+        (engine) => {
+            const { fixture, controller } = render(engine);
+            const setInterval = jest.spyOn(window, 'setInterval');
+
+            controller.session.update((session) =>
+                session
+                    ? {
+                          ...session,
+                          recording: {
+                              active: true,
+                              startedAt: new Date().toISOString(),
+                          },
+                      }
+                    : session
+            );
+            fixture.detectChanges();
+
+            expect(setInterval).toHaveBeenCalledTimes(1);
+        }
+    );
+
+    it('keeps the component-scoped recording adapter inert for native', () => {
+        const { fixture, component, controller } = render('native');
+        fixture.componentRef.setInput('playback', {
+            streamUrl: 'https://example.test/live.ts',
+            title: 'Live news',
+            isLive: true,
+        });
+        fixture.detectChanges();
+        const startRecording = jest.spyOn(controller, 'startRecording');
+
+        component.sharedControls.commands.toggleRecording();
+
+        expect(startRecording).not.toHaveBeenCalled();
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-interactions.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-interactions.spec.ts
new file mode 100644
index 000000000..eb02c9517
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.shared-interactions.spec.ts
@@ -0,0 +1,251 @@
+import { signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import type {
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { EmbeddedMpvOverlayVisibilityService } from './embedded-mpv-overlay-visibility.service';
+import { EmbeddedMpvPlayerComponent } from './embedded-mpv-player.component';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+const PLAYBACK: ResolvedPortalPlayback = {
+    streamUrl: 'https://example.test/movie.mp4',
+    title: 'Movie',
+    contentInfo: {
+        playlistId: 'playlist-1',
+        contentXtreamId: 42,
+        contentType: 'movie',
+    },
+};
+
+const READY_SESSION: EmbeddedMpvSession = {
+    id: 'session-1',
+    title: 'Movie',
+    streamUrl: PLAYBACK.streamUrl,
+    status: 'playing',
+    positionSeconds: 30,
+    durationSeconds: 120,
+    volume: 1,
+    audioTracks: [],
+    selectedAudioTrackId: null,
+    subtitleTracks: [],
+    selectedSubtitleTrackId: null,
+    playbackSpeed: 1,
+    aspectOverride: 'no',
+    recording: { active: false },
+    startedAt: '2026-07-16T10:00:00Z',
+    updatedAt: '2026-07-16T10:00:00Z',
+};
+
+const overlayActive = signal(false);
+
+describe('EmbeddedMpvPlayerComponent shared controls interactions', () => {
+    const fixtures: ComponentFixture<EmbeddedMpvPlayerComponent>[] = [];
+    let requestFullscreen: jest.Mock;
+    let requestFullscreenDescriptor: PropertyDescriptor | undefined;
+    let exitFullscreenDescriptor: PropertyDescriptor | undefined;
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        overlayActive.set(false);
+        requestFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            HTMLElement.prototype,
+            'requestFullscreen'
+        );
+        exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        requestFullscreen = jest.fn().mockResolvedValue(undefined);
+        Object.defineProperty(HTMLElement.prototype, 'requestFullscreen', {
+            configurable: true,
+            writable: true,
+            value: requestFullscreen,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            writable: true,
+            value: jest.fn().mockResolvedValue(undefined),
+        });
+        await TestBed.configureTestingModule({
+            imports: [EmbeddedMpvPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: EmbeddedMpvOverlayVisibilityService,
+                    useValue: { overlayActive },
+                },
+            ],
+        }).compileComponents();
+    });
+
+    afterEach(() => {
+        for (const fixture of fixtures.splice(0)) {
+            fixture.destroy();
+        }
+        restoreProperty(
+            HTMLElement.prototype,
+            'requestFullscreen',
+            requestFullscreenDescriptor
+        );
+        restoreProperty(document, 'exitFullscreen', exitFullscreenDescriptor);
+        jest.useRealTimers();
+        jest.restoreAllMocks();
+    });
+
+    function restoreProperty(
+        target: object,
+        property: PropertyKey,
+        descriptor: PropertyDescriptor | undefined
+    ): void {
+        if (descriptor) {
+            Object.defineProperty(target, property, descriptor);
+            return;
+        }
+        Reflect.deleteProperty(target, property);
+    }
+
+    function render(showControls = true) {
+        const fixture = TestBed.createComponent(EmbeddedMpvPlayerComponent);
+        fixtures.push(fixture);
+        fixture.componentRef.setInput('playback', PLAYBACK);
+        fixture.componentRef.setInput('showControls', showControls);
+        const controller = fixture.debugElement.injector.get(
+            EmbeddedMpvSessionController
+        );
+        controller.support.set({
+            supported: true,
+            platform: 'darwin',
+            engine: 'frame-copy',
+            capabilities: {
+                subtitles: true,
+                playbackSpeed: true,
+                aspectOverride: true,
+                screenshot: true,
+                recording: true,
+            },
+        });
+        controller.session.set({ ...READY_SESSION });
+        fixture.detectChanges();
+        fixture.detectChanges();
+        return { fixture, controller };
+    }
+
+    function root(
+        fixture: ComponentFixture<EmbeddedMpvPlayerComponent>
+    ): HTMLElement {
+        return fixture.debugElement.query(By.css('.embedded-mpv-player'))
+            .nativeElement;
+    }
+
+    function canvas(
+        fixture: ComponentFixture<EmbeddedMpvPlayerComponent>
+    ): HTMLCanvasElement {
+        return fixture.debugElement.query(By.css('[data-embedded-mpv-frame]'))
+            .nativeElement;
+    }
+
+    function pressKey(key: string): KeyboardEvent {
+        const event = new KeyboardEvent('keydown', {
+            key,
+            bubbles: true,
+            cancelable: true,
+        });
+        document.dispatchEvent(event);
+        return event;
+    }
+
+    it('toggles pause exactly once after the shared click grace period', () => {
+        const { fixture, controller } = render();
+        jest.useFakeTimers();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+
+        canvas(fixture).dispatchEvent(
+            new MouseEvent('click', { bubbles: true })
+        );
+        jest.advanceTimersByTime(249);
+        expect(togglePaused).not.toHaveBeenCalled();
+        jest.advanceTimersByTime(1);
+
+        expect(togglePaused).toHaveBeenCalledTimes(1);
+    });
+
+    it('double-clicks fullscreen exactly once on the player root', () => {
+        const { fixture, controller } = render();
+        jest.useFakeTimers();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+
+        canvas(fixture).dispatchEvent(
+            new MouseEvent('click', { bubbles: true })
+        );
+        canvas(fixture).dispatchEvent(
+            new MouseEvent('dblclick', { bubbles: true })
+        );
+        jest.advanceTimersByTime(1000);
+
+        expect(togglePaused).not.toHaveBeenCalled();
+        expect(requestFullscreen).toHaveBeenCalledTimes(1);
+        expect(requestFullscreen.mock.instances[0]).toBe(root(fixture));
+    });
+
+    it('routes a keyboard playback toggle through shared controls once', () => {
+        const { controller } = render();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+
+        const event = pressKey('k');
+
+        expect(event.defaultPrevented).toBe(true);
+        expect(togglePaused).toHaveBeenCalledTimes(1);
+    });
+
+    it('detaches shared surface and keyboard behavior when controls are hidden', () => {
+        const { fixture, controller } = render(false);
+        jest.useFakeTimers();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+
+        canvas(fixture).dispatchEvent(
+            new MouseEvent('click', { bubbles: true })
+        );
+        canvas(fixture).dispatchEvent(
+            new MouseEvent('dblclick', { bubbles: true })
+        );
+        pressKey('k');
+        jest.advanceTimersByTime(1000);
+
+        expect(togglePaused).not.toHaveBeenCalled();
+        expect(requestFullscreen).not.toHaveBeenCalled();
+    });
+
+    it('disables shared keyboard shortcuts while an app overlay is active', () => {
+        const { fixture, controller } = render();
+        const togglePaused = jest
+            .spyOn(controller, 'togglePaused')
+            .mockResolvedValue(undefined);
+        overlayActive.set(true);
+        fixture.detectChanges();
+
+        const event = pressKey('k');
+
+        expect(event.defaultPrevented).toBe(false);
+        expect(togglePaused).not.toHaveBeenCalled();
+    });
+
+    it('does not let the legacy Escape handler mutate frame-copy menus', () => {
+        const { fixture } = render();
+        const component = fixture.componentInstance;
+        component.menus.open('audio');
+
+        pressKey('Escape');
+
+        expect(component.menus.audioOpen()).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.spec.ts
index 38236e087..4116af872 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.spec.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.spec.ts
@@ -55,6 +55,7 @@ describe('EmbeddedMpvPlayerComponent series navigation', () => {
         controller.support.set({
             supported: true,
             platform: 'darwin',
+            engine: 'native',
             capabilities: {
                 subtitles: false,
                 playbackSpeed: false,
@@ -97,7 +98,10 @@ describe('EmbeddedMpvPlayerComponent series navigation', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            imports: [EmbeddedMpvPlayerHostComponent, TranslateModule.forRoot()],
+            imports: [
+                EmbeddedMpvPlayerHostComponent,
+                TranslateModule.forRoot(),
+            ],
             providers: [
                 {
                     provide: EmbeddedMpvOverlayVisibilityService,
@@ -233,9 +237,8 @@ describe('EmbeddedMpvPlayerComponent series navigation', () => {
 
     describe('timeline scrubbing', () => {
         const slider = () =>
-            fixture.debugElement.query(
-                By.css('.embedded-mpv-player__slider')
-            ).nativeElement as HTMLInputElement;
+            fixture.debugElement.query(By.css('.embedded-mpv-player__slider'))
+                .nativeElement as HTMLInputElement;
 
         const dispatch = (type: string, value: string) => {
             slider().value = value;
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts
index a2f32dee2..7e4cc7806 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts
@@ -23,7 +23,13 @@ import {
     EmbeddedMpvAudioTrack,
     ResolvedPortalPlayback,
 } from '@iptvnator/shared/interfaces';
+import { PlayerControlsComponent } from '../player-controls/player-controls.component';
+import type { PlayerMediaTitle } from '../player-controls/player-controls.model';
 import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import { EmbeddedMpvControlsAdapter } from './embedded-mpv-controls.adapter';
+import { EmbeddedMpvDockPanelComponent } from './embedded-mpv-dock-panel.component';
+import { EmbeddedMpvDockPanelState } from './embedded-mpv-dock-panels';
+import { EmbeddedMpvLegacyInteractions } from './embedded-mpv-legacy-interactions';
 import { EmbeddedMpvOverlayVisibilityService } from './embedded-mpv-overlay-visibility.service';
 import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
 import { EmbeddedMpvShortcuts } from './embedded-mpv-shortcuts';
@@ -34,7 +40,6 @@ import {
 import {
     ASPECT_PRESETS,
     HIDDEN_BOUNDS,
-    MENU_OPEN_BOTTOM_CUTOUT_PX,
     SPEED_PRESETS,
     aspectLabel,
     audioTrackLabel,
@@ -47,23 +52,22 @@ import {
     volumeIcon,
 } from './embedded-mpv-format.utils';
 
-const HIDE_CONTROLS_DELAY_MS = 2500;
 const RECORDING_MESSAGE_DISMISS_DELAY_MS = 5000;
-const VOLUME_POPOVER_CLOSE_DELAY_MS = 220;
-const VIEWPORT_CLICK_PAUSE_DELAY_MS = 250;
 
 @Component({
     selector: 'app-embedded-mpv-player',
     templateUrl: './embedded-mpv-player.component.html',
     styleUrl: './embedded-mpv-player.component.scss',
     imports: [
+        EmbeddedMpvDockPanelComponent,
         MatButtonModule,
         MatIconModule,
         MatProgressSpinnerModule,
         MatTooltipModule,
+        PlayerControlsComponent,
         TranslatePipe,
     ],
-    providers: [EmbeddedMpvSessionController],
+    providers: [EmbeddedMpvControlsAdapter, EmbeddedMpvSessionController],
     changeDetection: ChangeDetectionStrategy.OnPush,
     host: {
         class: 'embedded-mpv-player-host',
@@ -74,6 +78,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     readonly showControls = input(true);
     readonly recordingFolder = input('');
     readonly seriesNavigation = input<SeriesPlaybackNavigation | null>(null);
+    readonly mediaTitle = input<PlayerMediaTitle | null>(null);
 
     readonly timeUpdate = output<{
         currentTime: number;
@@ -102,13 +107,21 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
         ),
         { initialValue: null }
     );
-    private readonly controller = inject(EmbeddedMpvSessionController);
+    readonly controller = inject(EmbeddedMpvSessionController);
+    readonly sharedControls = inject(EmbeddedMpvControlsAdapter);
     private readonly shortcuts = new EmbeddedMpvShortcuts();
     readonly menus = new EmbeddedMpvMenuState();
     readonly feedback = new EmbeddedMpvFeedback();
+    readonly dockPanels: EmbeddedMpvDockPanelState;
 
     readonly viewport = viewChild<ElementRef<HTMLDivElement>>('viewport');
     readonly playerRoot = viewChild<ElementRef<HTMLDivElement>>('playerRoot');
+    readonly playerSurface = computed(
+        () => this.playerRoot()?.nativeElement ?? null
+    );
+    readonly sharedShortcutsEnabled = computed(
+        () => !this.overlayVisibility.overlayActive()
+    );
 
     readonly support = this.controller.support;
     readonly session = this.controller.session;
@@ -122,6 +135,9 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     readonly aspectPresets = ASPECT_PRESETS;
 
     readonly isSupported = computed(() => this.support()?.supported ?? false);
+    readonly isFrameCopyEngine = computed(
+        () => this.support()?.engine === 'frame-copy'
+    );
     readonly capabilities = computed(
         () =>
             this.support()?.capabilities ?? {
@@ -185,9 +201,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
             );
         }
         if (!session || session.status === 'loading') {
-            return this.translate.instant(
-                'EMBEDDED_MPV.PLAYER.LOADING_STREAM'
-            );
+            return this.translate.instant('EMBEDDED_MPV.PLAYER.LOADING_STREAM');
         }
         return '';
     });
@@ -221,6 +235,13 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
             percent: Math.round(this.volume() * 100),
         });
     });
+    readonly volumePercent = computed(
+        () => `${Math.round(this.volume() * 100)}%`
+    );
+    readonly dockPanelBackLabel = computed(() => {
+        this.translationsTick();
+        return this.translate.instant('EMBEDDED_MPV.PLAYER.BACK');
+    });
     /**
      * Non-null while the user drags the timeline: the slider and time label
      * preview this value locally and the single seek IPC call is deferred to
@@ -291,77 +312,98 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     });
 
     private mutedVolume = 0;
-    private controlsHideTimer: number | null = null;
-    private volumeCloseTimer: number | null = null;
     private recordingMessageTimer: number | null = null;
-    private viewportClickTimer: number | null = null;
     private lastEndedSessionId: string | null = null;
     private readonly recordingTick = signal(Date.now());
     private readonly recordingMessage = signal<string | null>(null);
+    private readonly legacyInteractions: EmbeddedMpvLegacyInteractions;
 
-    private readonly onDocumentPointerDown = (event: PointerEvent) => {
-        const playerRoot = this.playerRoot()?.nativeElement;
-        if (!playerRoot || event.composedPath().includes(playerRoot)) {
-            return;
-        }
-        this.closePopovers();
-    };
-    private readonly onDocumentPointerMove = (event: PointerEvent) => {
-        const playerRoot = this.playerRoot()?.nativeElement;
-        if (
-            playerRoot &&
-            !event.composedPath().includes(playerRoot) &&
-            this.isPointerInsidePlayer(event)
-        ) {
-            this.revealControls();
-        }
-    };
     private readonly onFullscreenChange = () => {
         const playerRoot = this.playerRoot()?.nativeElement;
         this.isFullscreen.set(
             Boolean(playerRoot && document.fullscreenElement === playerRoot)
         );
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         this.controller.triggerBoundsSync();
     };
 
     constructor() {
+        this.legacyInteractions = new EmbeddedMpvLegacyInteractions({
+            isAvailable: () => !this.isFrameCopyEngine(),
+            playerRoot: () => this.playerRoot()?.nativeElement ?? null,
+            menus: this.menus,
+            controlsVisible: this.controlsVisible,
+            isLoading: this.isLoading,
+            isErrored: this.isErrored,
+            isStalled: this.stalled,
+            isPlaying: this.isPlaying,
+            statusLabel: this.statusLabel,
+            togglePaused: () => this.togglePaused(),
+            toggleFullscreen: () => this.toggleFullscreen(),
+        });
+        this.legacyInteractions.attach();
+
+        this.dockPanels = new EmbeddedMpvDockPanelState({
+            menus: this.menus,
+            audioTracks: this.audioTracks,
+            subtitleTracks: this.subtitleTracks,
+            selectedSubtitleTrackId: this.selectedSubtitleTrackId,
+            playbackSpeed: this.playbackSpeed,
+            aspectOverride: this.aspectOverride,
+            translateLabel: (key) => {
+                this.translationsTick();
+                return this.translate.instant(key);
+            },
+            audioTrackLabel: (track, index) => this.trackLabel(track, index),
+            subtitleTrackLabel: (track, index) =>
+                this.subtitleLabel(track, index),
+            aspectLabel: (aspect) => this.aspectLabel(aspect),
+            selectAudioTrack: (trackId) => void this.selectAudioTrack(trackId),
+            selectSubtitleTrack: (trackId) =>
+                void this.selectSubtitleTrack(trackId),
+            selectSpeed: (speed) => void this.selectSpeed(speed),
+            selectAspect: (aspect) => void this.selectAspect(aspect),
+            closePanels: () => this.legacyInteractions.closePopovers(),
+            playerRoot: () => this.playerRoot()?.nativeElement ?? null,
+            revealControls: () => this.legacyInteractions.revealControls(),
+        });
+
+        this.sharedControls.configure({
+            playback: this.playback,
+            seriesNavigation: this.seriesNavigation,
+            recordingFolder: this.recordingFolder,
+        });
+
         if (typeof document !== 'undefined') {
             document.addEventListener(
                 'fullscreenchange',
                 this.onFullscreenChange
             );
-            document.addEventListener(
-                'pointerdown',
-                this.onDocumentPointerDown
-            );
-            document.addEventListener(
-                'pointermove',
-                this.onDocumentPointerMove,
-                { passive: true }
-            );
         }
 
         this.controller.setBoundsProvider((host) => {
+            // The frame-copy engine paints into an ordinary DOM canvas:
+            // dialogs and overlays stack above it natively, so the
+            // hide-offscreen compositor workaround must not shrink its
+            // render size.
+            if (this.isFrameCopyEngine()) {
+                return measureBounds(host);
+            }
             if (this.overlayVisibility.overlayActive()) {
                 return HIDDEN_BOUNDS;
             }
-            const rect = measureBounds(host);
-            if (this.menus.anyOpen()) {
-                return {
-                    ...rect,
-                    height: Math.max(
-                        1,
-                        rect.height - MENU_OPEN_BOTTOM_CUTOUT_PX
-                    ),
-                };
-            }
-            return rect;
+            // Control menus render as horizontal panels inside the
+            // fixed-height dock strip below the video host, so open menus
+            // never require shrinking the native MPV view.
+            return measureBounds(host);
         });
 
         this.shortcuts.attach({
-            isAvailable: () => !this.overlayVisibility.overlayActive(),
-            onEscape: () => this.closePopovers(),
+            isAvailable: () =>
+                this.legacyInteractions.isAvailable() &&
+                !this.overlayVisibility.overlayActive(),
+            arrowKeysBlocked: () => this.menus.dockPanelOpen(),
+            onEscape: () => this.legacyInteractions.closePopovers(),
             togglePaused: () => void this.togglePaused(),
             toggleFullscreen: () => void this.toggleFullscreen(),
             seekBy: (delta) => void this.seekBy(delta),
@@ -399,10 +441,14 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
 
         effect(() => {
             this.overlayVisibility.overlayActive();
-            this.menus.anyOpen();
             this.controller.triggerBoundsSync();
         });
 
+        effect(() => {
+            const panelOpen = this.menus.dockPanelOpen();
+            untracked(() => this.dockPanels.handlePanelOpenChange(panelOpen));
+        });
+
         effect(() => {
             const session = this.session();
             if (!session) {
@@ -419,7 +465,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
                     currentTime: session.positionSeconds,
                     duration: session.durationSeconds ?? 0,
                 });
-                this.scheduleControlsHide();
+                this.legacyInteractions.scheduleControlsHide();
             });
         });
 
@@ -437,7 +483,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
         });
 
         effect((onCleanup) => {
-            if (!this.isRecording()) {
+            if (this.isFrameCopyEngine() || !this.isRecording()) {
                 return;
             }
             this.recordingTick.set(Date.now());
@@ -447,6 +493,17 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
             );
             onCleanup(() => window.clearInterval(intervalId));
         });
+
+        effect(() => {
+            const isFrameCopyEngine = this.isFrameCopyEngine();
+            untracked(() => {
+                this.feedback.clear();
+                this.setRecordingMessage(null);
+                this.legacyInteractions.handleEngineTransition(
+                    isFrameCopyEngine
+                );
+            });
+        });
     }
 
     ngOnDestroy(): void {
@@ -457,73 +514,30 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
                 'fullscreenchange',
                 this.onFullscreenChange
             );
-            document.removeEventListener(
-                'pointerdown',
-                this.onDocumentPointerDown
-            );
-            document.removeEventListener(
-                'pointermove',
-                this.onDocumentPointerMove
-            );
-        }
-        if (this.volumeCloseTimer !== null) {
-            clearTimeout(this.volumeCloseTimer);
-            this.volumeCloseTimer = null;
         }
+        this.legacyInteractions.dispose();
         this.clearRecordingMessageTimer();
-        this.clearControlsHideTimer();
-        this.clearViewportClickTimer();
-    }
-
-    private clearViewportClickTimer(): void {
-        if (this.viewportClickTimer !== null) {
-            window.clearTimeout(this.viewportClickTimer);
-            this.viewportClickTimer = null;
-        }
     }
 
     onPlayerInteraction(): void {
-        this.revealControls();
+        this.legacyInteractions.onPlayerInteraction();
     }
 
     onViewportClick(event: MouseEvent): void {
-        const target = event.target as HTMLElement | null;
-        if (target?.closest('button, input, [role="slider"]')) {
-            return;
-        }
-        if (this.menus.anyOpen()) {
-            this.menus.closeAll();
-            return;
-        }
-        if (this.isLoading() || this.isErrored() || this.stalled()) {
-            return;
-        }
-        // The pause is deferred so a double-click (fullscreen) can cancel it;
-        // pause feedback is the transport icon in the dock — the native video
-        // surface paints over any DOM overlay we could flash here.
-        this.clearViewportClickTimer();
-        this.viewportClickTimer = window.setTimeout(() => {
-            this.viewportClickTimer = null;
-            void this.togglePaused();
-        }, VIEWPORT_CLICK_PAUSE_DELAY_MS);
+        this.legacyInteractions.onViewportClick(event);
     }
 
     onPlayerDblClick(event: MouseEvent): void {
-        const target = event.target as HTMLElement | null;
-        if (target?.closest('button, input, [role="slider"]')) {
-            return;
-        }
-        this.clearViewportClickTimer();
-        void this.toggleFullscreen();
+        this.legacyInteractions.onPlayerDblClick(event);
     }
 
     async togglePaused(): Promise<void> {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         await this.controller.togglePaused();
     }
 
     async toggleFullscreen(): Promise<void> {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         const playerRoot = this.playerRoot()?.nativeElement;
         if (!playerRoot || !this.canFullscreen()) {
             return;
@@ -542,7 +556,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     }
 
     async seekBy(deltaSeconds: number): Promise<void> {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         const ok = await this.controller.seekBy(deltaSeconds);
         if (ok) {
             this.feedback.flash(
@@ -553,7 +567,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     }
 
     requestPreviousEpisode(): void {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         if (!this.canPreviousEpisode()) {
             return;
         }
@@ -561,7 +575,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     }
 
     requestNextEpisode(): void {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         if (!this.canNextEpisode()) {
             return;
         }
@@ -569,7 +583,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     }
 
     onTimelineInput(event: Event): void {
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         this.scrubPosition.set(
             Number((event.target as HTMLInputElement).value)
         );
@@ -584,7 +598,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     onVolumeInput(event: Event): void {
         const next = Number((event.target as HTMLInputElement).value);
         this.applyVolume(next);
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
     }
 
     onVolumeWheel(event: WheelEvent): void {
@@ -593,21 +607,11 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     }
 
     onVolumeHoverEnter(): void {
-        if (this.volumeCloseTimer !== null) {
-            clearTimeout(this.volumeCloseTimer);
-            this.volumeCloseTimer = null;
-        }
-        this.menus.open('volume');
+        this.legacyInteractions.onVolumeHoverEnter();
     }
 
     onVolumeHoverLeave(): void {
-        if (this.volumeCloseTimer !== null) {
-            clearTimeout(this.volumeCloseTimer);
-        }
-        this.volumeCloseTimer = window.setTimeout(() => {
-            this.menus.close('volume');
-            this.volumeCloseTimer = null;
-        }, VOLUME_POPOVER_CLOSE_DELAY_MS);
+        this.legacyInteractions.onVolumeHoverLeave();
     }
 
     toggleMute(): void {
@@ -627,52 +631,48 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
                 `${Math.round(restored * 100)}%`
             );
         }
-        this.revealControls();
+        this.legacyInteractions.revealControls();
     }
 
     toggleAudioMenu(): void {
-        this.menus.toggle('audio');
-        this.revealControls();
+        this.dockPanels.toggle('audio');
     }
     toggleSubtitleMenu(): void {
-        this.menus.toggle('subtitle');
-        this.revealControls();
+        this.dockPanels.toggle('subtitle');
     }
     toggleSpeedMenu(): void {
-        this.menus.toggle('speed');
-        this.revealControls();
+        this.dockPanels.toggle('speed');
     }
     toggleAspectMenu(): void {
-        this.menus.toggle('aspect');
-        this.revealControls();
+        this.dockPanels.toggle('aspect');
     }
 
     async selectAudioTrack(trackId: number): Promise<void> {
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
         await this.controller.setAudioTrack(trackId);
         this.menus.close('audio');
-        this.scheduleControlsHide();
+        this.legacyInteractions.scheduleControlsHide();
     }
 
     async selectSubtitleTrack(trackId: number): Promise<void> {
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
         await this.controller.setSubtitleTrack(trackId);
         this.menus.close('subtitle');
-        this.scheduleControlsHide();
+        this.legacyInteractions.scheduleControlsHide();
     }
 
     async selectSpeed(speed: number): Promise<void> {
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
         await this.controller.setSpeed(speed);
         this.menus.close('speed');
-        this.scheduleControlsHide();
+        this.legacyInteractions.scheduleControlsHide();
     }
 
     async selectAspect(aspect: string): Promise<void> {
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
         await this.controller.setAspect(aspect);
         this.menus.close('aspect');
-        this.scheduleControlsHide();
+        this.legacyInteractions.scheduleControlsHide();
     }
 
     async toggleRecording(): Promise<void> {
@@ -680,7 +680,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
             return;
         }
 
-        this.revealControls(false);
+        this.legacyInteractions.revealControls(false);
         if (this.isRecording()) {
             const recording = await this.controller.stopRecording();
             if (recording?.targetPath) {
@@ -710,7 +710,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
                 );
                 this.flashRecordingFailed();
             }
-            this.scheduleControlsHide();
+            this.legacyInteractions.scheduleControlsHide();
             return;
         }
 
@@ -815,7 +815,7 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
     private adjustVolume(delta: number): void {
         const next = Math.max(0, Math.min(1, this.volume() + delta));
         this.applyVolume(next);
-        this.revealControls();
+        this.legacyInteractions.revealControls();
         this.feedback.flash(volumeIcon(next), `${Math.round(next * 100)}%`);
     }
 
@@ -824,68 +824,6 @@ export class EmbeddedMpvPlayerComponent implements OnDestroy {
         persistVolume(value);
         void this.controller.applyVolume(value);
     }
-
-    private closePopovers(): void {
-        if (!this.menus.anyOpen()) {
-            return;
-        }
-        this.menus.closeAll();
-        this.controller.triggerBoundsSync();
-        this.scheduleControlsHide();
-    }
-
-    private revealControls(scheduleHide = true): void {
-        this.controlsVisible.set(true);
-        if (scheduleHide) {
-            this.clearControlsHideTimer();
-            this.scheduleControlsHide();
-        }
-    }
-
-    private scheduleControlsHide(): void {
-        if (
-            !this.isPlaying() ||
-            this.menus.anyOpen() ||
-            Boolean(this.statusLabel())
-        ) {
-            this.clearControlsHideTimer();
-            return;
-        }
-        if (!this.controlsVisible() || this.controlsHideTimer !== null) {
-            return;
-        }
-        this.controlsHideTimer = window.setTimeout(() => {
-            if (
-                this.isPlaying() &&
-                !this.menus.anyOpen() &&
-                !this.statusLabel()
-            ) {
-                this.controlsVisible.set(false);
-            }
-        }, HIDE_CONTROLS_DELAY_MS);
-    }
-
-    private clearControlsHideTimer(): void {
-        if (this.controlsHideTimer === null) {
-            return;
-        }
-        window.clearTimeout(this.controlsHideTimer);
-        this.controlsHideTimer = null;
-    }
-
-    private isPointerInsidePlayer(event: PointerEvent): boolean {
-        const playerRoot = this.playerRoot()?.nativeElement;
-        if (!playerRoot) {
-            return false;
-        }
-        const rect = playerRoot.getBoundingClientRect();
-        return (
-            event.clientX >= rect.left &&
-            event.clientX <= rect.right &&
-            event.clientY >= rect.top &&
-            event.clientY <= rect.bottom
-        );
-    }
 }
 
 export type EmbeddedMpvAudioTrackView = EmbeddedMpvAudioTrack;
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.dpr.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.dpr.spec.ts
new file mode 100644
index 000000000..79cf74df6
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.dpr.spec.ts
@@ -0,0 +1,213 @@
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+/**
+ * Moving the window to a display with a different scale (or changing the
+ * page zoom) rescales the CSS→native mapping the backend applies to bounds,
+ * without necessarily resizing the host element. The controller watches
+ * devicePixelRatio through a re-armed matchMedia query and re-syncs bounds
+ * when it changes (#1145).
+ */
+describe('EmbeddedMpvSessionController devicePixelRatio watch', () => {
+    class FakeMediaQueryList {
+        private readonly listeners = new Set<() => void>();
+
+        constructor(readonly media: string) {}
+
+        addEventListener(_type: 'change', listener: () => void): void {
+            this.listeners.add(listener);
+        }
+
+        removeEventListener(_type: 'change', listener: () => void): void {
+            this.listeners.delete(listener);
+        }
+
+        fire(): void {
+            for (const listener of [...this.listeners]) {
+                listener();
+            }
+        }
+
+        get listenerCount(): number {
+            return this.listeners.size;
+        }
+    }
+
+    let electron: {
+        platform: string;
+        getEmbeddedMpvSupport: jest.Mock;
+        prepareEmbeddedMpv: jest.Mock;
+        createEmbeddedMpvSession: jest.Mock;
+        loadEmbeddedMpvPlayback: jest.Mock;
+        disposeEmbeddedMpvSession: jest.Mock;
+        setEmbeddedMpvBounds: jest.Mock;
+        onEmbeddedMpvSessionUpdate: jest.Mock;
+    };
+    let mediaQueries: FakeMediaQueryList[];
+
+    beforeEach(() => {
+        electron = {
+            platform: 'win32',
+            getEmbeddedMpvSupport: jest
+                .fn()
+                .mockResolvedValue({ supported: true, platform: 'win32' }),
+            prepareEmbeddedMpv: jest
+                .fn()
+                .mockResolvedValue({ supported: true, platform: 'win32' }),
+            createEmbeddedMpvSession: jest
+                .fn()
+                .mockResolvedValue(createSession()),
+            loadEmbeddedMpvPlayback: jest.fn().mockResolvedValue(undefined),
+            disposeEmbeddedMpvSession: jest.fn().mockResolvedValue(undefined),
+            setEmbeddedMpvBounds: jest.fn().mockResolvedValue(undefined),
+            onEmbeddedMpvSessionUpdate: jest.fn(() => jest.fn()),
+        };
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: electron,
+        });
+
+        mediaQueries = [];
+        Object.defineProperty(window, 'matchMedia', {
+            configurable: true,
+            value: (media: string) => {
+                const query = new FakeMediaQueryList(media);
+                mediaQueries.push(query);
+                return query;
+            },
+        });
+        Object.defineProperty(window, 'devicePixelRatio', {
+            configurable: true,
+            value: 1,
+        });
+        Object.defineProperty(globalThis, 'ResizeObserver', {
+            configurable: true,
+            value: class MockResizeObserver {
+                observe = jest.fn();
+                disconnect = jest.fn();
+            },
+        });
+        Object.defineProperty(window, 'requestAnimationFrame', {
+            configurable: true,
+            value: (callback: FrameRequestCallback) =>
+                window.setTimeout(() => callback(0), 0),
+        });
+        Object.defineProperty(window, 'cancelAnimationFrame', {
+            configurable: true,
+            value: (handle: number) => window.clearTimeout(handle),
+        });
+
+        TestBed.configureTestingModule({
+            providers: [EmbeddedMpvSessionController],
+        });
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        delete (window as unknown as { electron?: unknown }).electron;
+        delete (window as unknown as { matchMedia?: unknown }).matchMedia;
+        jest.restoreAllMocks();
+    });
+
+    it('re-syncs bounds and re-arms the query when devicePixelRatio changes', async () => {
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+        const teardown = controller.startSession(
+            createHost(),
+            createPlayback(),
+            0.5
+        );
+        await waitFor(
+            () => controller.sessionId() === 'mpv-1',
+            'session to start'
+        );
+
+        expect(mediaQueries.length).toBe(1);
+        expect(mediaQueries[0].media).toBe('(resolution: 1dppx)');
+        electron.setEmbeddedMpvBounds.mockClear();
+
+        // Simulate a move to a 150%-scaled display.
+        Object.defineProperty(window, 'devicePixelRatio', {
+            configurable: true,
+            value: 1.5,
+        });
+        mediaQueries[0].fire();
+        await waitFor(
+            () => electron.setEmbeddedMpvBounds.mock.calls.length > 0,
+            'bounds re-sync after dPR change'
+        );
+
+        // The stale query is released and a new one tracks the new ratio.
+        expect(mediaQueries[0].listenerCount).toBe(0);
+        expect(mediaQueries.length).toBe(2);
+        expect(mediaQueries[1].media).toBe('(resolution: 1.5dppx)');
+
+        // A second display change must fire through the re-armed query.
+        electron.setEmbeddedMpvBounds.mockClear();
+        mediaQueries[1].fire();
+        await waitFor(
+            () => electron.setEmbeddedMpvBounds.mock.calls.length > 0,
+            'bounds re-sync after second dPR change'
+        );
+
+        teardown();
+        expect(mediaQueries[mediaQueries.length - 1].listenerCount).toBe(0);
+    });
+});
+
+function createHost(): HTMLElement {
+    return {
+        getBoundingClientRect: () => ({
+            left: 10,
+            top: 20,
+            width: 640,
+            height: 360,
+        }),
+    } as HTMLElement;
+}
+
+function createPlayback(): ResolvedPortalPlayback {
+    return {
+        streamUrl: 'https://example.com/movie.mp4',
+        title: 'Example Movie',
+    };
+}
+
+function createSession(): EmbeddedMpvSession {
+    return {
+        id: 'mpv-1',
+        title: 'Example Movie',
+        streamUrl: 'https://example.com/movie.mp4',
+        status: 'playing',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 0.5,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-07-19T00:00:00.000Z',
+        updatedAt: '2026-07-19T00:00:01.000Z',
+    };
+}
+
+async function waitFor(
+    condition: () => boolean,
+    description: string
+): Promise<void> {
+    const deadline = Date.now() + 1_000;
+    while (Date.now() < deadline) {
+        if (condition()) {
+            return;
+        }
+        await Promise.resolve();
+        await new Promise((resolve) => window.setTimeout(resolve, 0));
+    }
+    throw new Error(`Timed out waiting for ${description}`);
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.lifecycle.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.lifecycle.spec.ts
new file mode 100644
index 000000000..f708cdb7d
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.lifecycle.spec.ts
@@ -0,0 +1,393 @@
+import { TestBed } from '@angular/core/testing';
+import {
+    EmbeddedMpvEngine,
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+import { EmbeddedMpvSessionController } from './embedded-mpv-session-controller';
+
+describe('EmbeddedMpvSessionController (lifecycle & support edges)', () => {
+    let electron: {
+        platform: string;
+        getEmbeddedMpvSupport: jest.Mock;
+        prepareEmbeddedMpv: jest.Mock;
+        createEmbeddedMpvSession: jest.Mock;
+        loadEmbeddedMpvPlayback: jest.Mock;
+        attachEmbeddedMpvFrameView: jest.Mock;
+        detachEmbeddedMpvFrameView: jest.Mock;
+        disposeEmbeddedMpvSession: jest.Mock;
+        setEmbeddedMpvBounds: jest.Mock;
+        onEmbeddedMpvSessionUpdate: jest.Mock;
+    };
+
+    const setBridge = (value: unknown) =>
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value,
+        });
+
+    beforeEach(() => {
+        electron = {
+            platform: 'darwin',
+            getEmbeddedMpvSupport: jest
+                .fn()
+                .mockResolvedValue({ supported: true, platform: 'darwin' }),
+            prepareEmbeddedMpv: jest
+                .fn()
+                .mockResolvedValue({ supported: true, platform: 'darwin' }),
+            createEmbeddedMpvSession: jest
+                .fn()
+                .mockResolvedValue(createSession({ id: 'mpv-1' })),
+            loadEmbeddedMpvPlayback: jest.fn().mockResolvedValue(undefined),
+            attachEmbeddedMpvFrameView: jest.fn().mockResolvedValue(true),
+            detachEmbeddedMpvFrameView: jest.fn(),
+            disposeEmbeddedMpvSession: jest.fn().mockResolvedValue(undefined),
+            setEmbeddedMpvBounds: jest.fn().mockResolvedValue(undefined),
+            onEmbeddedMpvSessionUpdate: jest.fn(() => jest.fn()),
+        };
+        setBridge(electron);
+        Object.defineProperty(globalThis, 'ResizeObserver', {
+            configurable: true,
+            value: class MockResizeObserver {
+                observe = jest.fn();
+                disconnect = jest.fn();
+            },
+        });
+        Object.defineProperty(window, 'requestAnimationFrame', {
+            configurable: true,
+            value: (callback: FrameRequestCallback) =>
+                window.setTimeout(() => callback(0), 0),
+        });
+        Object.defineProperty(window, 'cancelAnimationFrame', {
+            configurable: true,
+            value: (handle: number) => window.clearTimeout(handle),
+        });
+
+        TestBed.configureTestingModule({
+            providers: [EmbeddedMpvSessionController],
+        });
+    });
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+        delete (window as unknown as { electron?: unknown }).electron;
+        jest.useRealTimers();
+        jest.restoreAllMocks();
+    });
+
+    it('reports unsupported outside the Electron desktop build', () => {
+        setBridge(undefined);
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        expect(controller.support()).toEqual({
+            supported: false,
+            platform: 'unknown',
+            reason: 'Embedded MPV requires the Electron desktop build.',
+        });
+    });
+
+    it('maps a support-probe failure onto an unsupported result', async () => {
+        electron.getEmbeddedMpvSupport.mockRejectedValueOnce(
+            new Error('addon load failed')
+        );
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        await waitFor(
+            () => controller.support() !== null,
+            'support fallback to be set'
+        );
+        expect(controller.support()).toEqual({
+            supported: false,
+            platform: 'darwin',
+            reason: 'addon load failed',
+        });
+    });
+
+    it('preserves the constructor support probe after preparing a session', async () => {
+        const probedSupport = createSupport('native');
+        const preparedSupport = createSupport('frame-copy');
+        electron.getEmbeddedMpvSupport.mockResolvedValueOnce(probedSupport);
+        electron.prepareEmbeddedMpv.mockResolvedValueOnce(preparedSupport);
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        await waitFor(
+            () => controller.support() === probedSupport,
+            'constructor support probe to resolve'
+        );
+        const teardown = controller.startSession(
+            createHost(),
+            createPlayback(),
+            0.5
+        );
+
+        try {
+            await waitFor(
+                () => electron.loadEmbeddedMpvPlayback.mock.calls.length > 0,
+                'playback load to start'
+            );
+
+            expect(controller.support()).toBe(probedSupport);
+            expect(electron.createEmbeddedMpvSession).toHaveBeenCalled();
+            expect(electron.loadEmbeddedMpvPlayback).toHaveBeenCalled();
+        } finally {
+            teardown();
+        }
+    });
+
+    it('sets an error session when prepare reports unsupported', async () => {
+        electron.prepareEmbeddedMpv.mockResolvedValueOnce({
+            supported: false,
+            platform: 'darwin',
+            reason: 'libmpv not found',
+        });
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        controller.startSession(createHost(), createPlayback(), 0.5);
+        await waitFor(
+            () => controller.session()?.status === 'error',
+            'error session to be set'
+        );
+
+        expect(controller.session()?.error).toBe('libmpv not found');
+        expect(electron.createEmbeddedMpvSession).not.toHaveBeenCalled();
+    });
+
+    it('retry clears session state, stall flag, and bumps the retry token', () => {
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+        controller.sessionId.set('mpv-1');
+        controller.session.set(createSession({ status: 'error' }));
+
+        controller.retry();
+
+        expect(controller.session()).toBeNull();
+        expect(controller.sessionId()).toBeNull();
+        expect(controller.stalled()).toBe(false);
+        expect(controller.retryToken()).toBe(1);
+    });
+
+    it('flags a stalled session after 30s of loading and clears it on playback', async () => {
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+        jest.useFakeTimers();
+
+        controller.session.set(createSession({ status: 'loading' }));
+        TestBed.tick();
+        jest.advanceTimersByTime(30_000);
+        expect(controller.stalled()).toBe(true);
+
+        controller.session.set(createSession({ status: 'playing' }));
+        TestBed.tick();
+        expect(controller.stalled()).toBe(false);
+    });
+
+    it('disposes a session whose creation resolves only after teardown', async () => {
+        let resolveCreate: ((session: EmbeddedMpvSession) => void) | null =
+            null;
+        electron.createEmbeddedMpvSession.mockImplementationOnce(
+            () =>
+                new Promise((resolve) => {
+                    resolveCreate = resolve;
+                })
+        );
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        const teardown = controller.startSession(
+            createHost(),
+            createPlayback(),
+            0.5
+        );
+        await waitFor(
+            () => resolveCreate !== null,
+            'startup to reach createEmbeddedMpvSession'
+        );
+        teardown();
+
+        resolveCreate?.(createSession({ id: 'mpv-late' }));
+        await waitFor(
+            () => electron.disposeEmbeddedMpvSession.mock.calls.length > 0,
+            'late session to be disposed'
+        );
+
+        expect(electron.disposeEmbeddedMpvSession).toHaveBeenCalledWith(
+            'mpv-late'
+        );
+        expect(controller.sessionId()).toBeNull();
+        expect(electron.loadEmbeddedMpvPlayback).not.toHaveBeenCalled();
+    });
+
+    it('does not continue frame setup when teardown happens during playback load', async () => {
+        const frameCopySupport = createSupport('frame-copy');
+        let resolveLoad: (() => void) | null = null;
+        electron.getEmbeddedMpvSupport.mockResolvedValueOnce(frameCopySupport);
+        electron.prepareEmbeddedMpv.mockResolvedValueOnce(frameCopySupport);
+        electron.loadEmbeddedMpvPlayback.mockImplementationOnce(
+            () =>
+                new Promise<void>((resolve) => {
+                    resolveLoad = resolve;
+                })
+        );
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        await waitFor(
+            () => controller.support() === frameCopySupport,
+            'frame-copy support probe to resolve'
+        );
+        const teardown = controller.startSession(
+            createHost(),
+            createPlayback(),
+            0.5
+        );
+        await waitFor(
+            () => electron.loadEmbeddedMpvPlayback.mock.calls.length > 0,
+            'playback load to start'
+        );
+
+        teardown();
+        resolveLoad?.();
+        await Promise.resolve();
+        await new Promise((resolve) => window.setTimeout(resolve, 0));
+
+        expect(electron.attachEmbeddedMpvFrameView).not.toHaveBeenCalled();
+        expect(controller.session()).toBeNull();
+        expect(controller.sessionId()).toBeNull();
+        expect(electron.disposeEmbeddedMpvSession).toHaveBeenCalledWith(
+            'mpv-1'
+        );
+        expect(electron.detachEmbeddedMpvFrameView).toHaveBeenCalled();
+    });
+
+    it('does not schedule bounds after teardown during frame view attachment', async () => {
+        const frameCopySupport = createSupport('frame-copy');
+        let resolveAttach: ((attached: boolean) => void) | null = null;
+        electron.getEmbeddedMpvSupport.mockResolvedValueOnce(frameCopySupport);
+        electron.prepareEmbeddedMpv.mockResolvedValueOnce(frameCopySupport);
+        electron.attachEmbeddedMpvFrameView.mockImplementationOnce(
+            () =>
+                new Promise<boolean>((resolve) => {
+                    resolveAttach = resolve;
+                })
+        );
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+
+        await waitFor(
+            () => controller.support() === frameCopySupport,
+            'frame-copy support probe to resolve'
+        );
+        const teardown = controller.startSession(
+            createHost(),
+            createPlayback(),
+            0.5
+        );
+        await waitFor(
+            () => electron.attachEmbeddedMpvFrameView.mock.calls.length > 0,
+            'frame view attachment to start'
+        );
+
+        teardown();
+        const requestAnimationFrame = jest.spyOn(
+            window,
+            'requestAnimationFrame'
+        );
+        resolveAttach?.(true);
+        await Promise.resolve();
+        await new Promise((resolve) => window.setTimeout(resolve, 0));
+
+        expect(requestAnimationFrame).not.toHaveBeenCalled();
+        expect(controller.session()).toBeNull();
+        expect(controller.sessionId()).toBeNull();
+        expect(electron.disposeEmbeddedMpvSession).toHaveBeenCalledWith(
+            'mpv-1'
+        );
+        expect(electron.detachEmbeddedMpvFrameView).toHaveBeenCalledTimes(1);
+    });
+
+    it('syncs bounds through a custom provider on triggerBoundsSync', async () => {
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+        controller.setBoundsProvider(() => ({
+            x: 1,
+            y: 2,
+            width: 300,
+            height: 200,
+        }));
+
+        controller.startSession(createHost(), createPlayback(), 0.5);
+        await waitFor(
+            () => controller.sessionId() === 'mpv-1',
+            'session to start'
+        );
+        electron.setEmbeddedMpvBounds.mockClear();
+
+        controller.triggerBoundsSync();
+        await waitFor(
+            () => electron.setEmbeddedMpvBounds.mock.calls.length > 0,
+            'bounds sync to run'
+        );
+
+        expect(electron.setEmbeddedMpvBounds).toHaveBeenCalledWith('mpv-1', {
+            x: 1,
+            y: 2,
+            width: 300,
+            height: 200,
+        });
+    });
+});
+
+function createHost(): HTMLElement {
+    return {
+        getBoundingClientRect: () => ({
+            left: 10,
+            top: 20,
+            width: 640,
+            height: 360,
+        }),
+    } as HTMLElement;
+}
+
+function createPlayback(): ResolvedPortalPlayback {
+    return {
+        streamUrl: 'https://example.com/movie.mp4',
+        title: 'Example Movie',
+    };
+}
+
+function createSupport(engine: EmbeddedMpvEngine) {
+    return { supported: true, platform: 'darwin', engine };
+}
+
+function createSession(
+    overrides: Partial<EmbeddedMpvSession> = {}
+): EmbeddedMpvSession {
+    return {
+        id: 'mpv-1',
+        title: 'Example Movie',
+        streamUrl: 'https://example.com/movie.mp4',
+        status: 'playing',
+        positionSeconds: 10,
+        durationSeconds: 120,
+        volume: 0.7,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: '2026-06-02T00:00:00.000Z',
+        updatedAt: '2026-06-02T00:00:01.000Z',
+        ...overrides,
+    };
+}
+
+async function waitFor(
+    condition: () => boolean,
+    description: string
+): Promise<void> {
+    const deadline = Date.now() + 1_000;
+    while (Date.now() < deadline) {
+        if (condition()) {
+            return;
+        }
+        await Promise.resolve();
+        await new Promise((resolve) => window.setTimeout(resolve, 0));
+    }
+    throw new Error(`Timed out waiting for ${description}`);
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.spec.ts
index 557fea9e3..b70512184 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.spec.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.spec.ts
@@ -141,8 +141,10 @@ describe('EmbeddedMpvSessionController', () => {
         );
 
         expect(electron.prepareEmbeddedMpv).toHaveBeenCalled();
+        // Fractional CSS edges stay unrounded: the main process rounds once,
+        // after converting them to native units.
         expect(electron.createEmbeddedMpvSession).toHaveBeenCalledWith(
-            { x: 11, y: 21, width: 640, height: 360 },
+            { x: 10.6, y: 20.5, width: 640, height: 360 },
             'Example Movie',
             0.7
         );
@@ -222,6 +224,58 @@ describe('EmbeddedMpvSessionController', () => {
         expect(controller.sessionId()).toBe('mpv-2');
     });
 
+    it('delegates track, speed, aspect, and recording commands to the runner', async () => {
+        const commandBridge = {
+            setEmbeddedMpvAudioTrack: jest.fn().mockResolvedValue(null),
+            setEmbeddedMpvSubtitleTrack: jest.fn().mockResolvedValue(null),
+            setEmbeddedMpvSpeed: jest.fn().mockResolvedValue(null),
+            setEmbeddedMpvAspect: jest.fn().mockResolvedValue(null),
+            seekEmbeddedMpv: jest.fn().mockResolvedValue(null),
+            startEmbeddedMpvRecording: jest.fn().mockResolvedValue(
+                createSession({
+                    recording: { active: true, targetPath: '/tmp/rec.ts' },
+                })
+            ),
+            stopEmbeddedMpvRecording: jest
+                .fn()
+                .mockResolvedValue(
+                    createSession({ recording: { active: false } })
+                ),
+        };
+        Object.assign(electron, commandBridge);
+        const controller = TestBed.inject(EmbeddedMpvSessionController);
+        controller.sessionId.set('mpv-1');
+        controller.session.set(createSession());
+
+        await controller.seekTo(75);
+        await controller.setAudioTrack(2);
+        await controller.setSubtitleTrack(-1);
+        await controller.setSpeed(1.5);
+        await controller.setAspect('16:9');
+        const started = await controller.startRecording('/rec', 'Show');
+        const stopped = await controller.stopRecording();
+
+        expect(commandBridge.seekEmbeddedMpv).toHaveBeenCalledWith('mpv-1', 75);
+        expect(commandBridge.setEmbeddedMpvAudioTrack).toHaveBeenCalledWith(
+            'mpv-1',
+            2
+        );
+        expect(commandBridge.setEmbeddedMpvSubtitleTrack).toHaveBeenCalledWith(
+            'mpv-1',
+            -1
+        );
+        expect(commandBridge.setEmbeddedMpvSpeed).toHaveBeenCalledWith(
+            'mpv-1',
+            1.5
+        );
+        expect(commandBridge.setEmbeddedMpvAspect).toHaveBeenCalledWith(
+            'mpv-1',
+            '16:9'
+        );
+        expect(started).toEqual({ active: true, targetPath: '/tmp/rec.ts' });
+        expect(stopped).toEqual({ active: false });
+    });
+
     it('forwards playback commands and updates session snapshots', async () => {
         const controller = TestBed.inject(EmbeddedMpvSessionController);
         controller.sessionId.set('mpv-1');
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.ts
index 09beb8b80..f760bec97 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.ts
@@ -13,14 +13,19 @@ import {
     EmbeddedMpvSupport,
     ResolvedPortalPlayback,
 } from '@iptvnator/shared/interfaces';
+import { EmbeddedMpvCommandRunner } from './embedded-mpv-command-runner';
 import { measureBounds } from './embedded-mpv-format.utils';
+import {
+    createErrorSession,
+    createLoadingSession,
+    waitForStartupPaint,
+} from './embedded-mpv-session-factory';
+import { EmbeddedMpvStalledTracker } from './embedded-mpv-stalled-tracker';
 
 export type EmbeddedMpvBoundsProvider = (
     host: HTMLElement
 ) => EmbeddedMpvBounds;
 
-const STALLED_TIMEOUT_MS = 30_000;
-
 type ElectronBridge = Window['electron'];
 
 @Injectable()
@@ -28,9 +33,20 @@ export class EmbeddedMpvSessionController {
     readonly support = signal<EmbeddedMpvSupport | null>(null);
     readonly session = signal<EmbeddedMpvSession | null>(null);
     readonly sessionId = signal<string | null>(null);
-    readonly stalled = signal(false);
     readonly retryToken = signal(0);
 
+    private readonly stalledTracker = new EmbeddedMpvStalledTracker();
+    readonly stalled = this.stalledTracker.stalled;
+
+    private readonly commands = new EmbeddedMpvCommandRunner({
+        sessionId: this.sessionId,
+        session: this.session,
+    });
+
+    readonly isFrameCopyEngine = computed(
+        () => this.support()?.engine === 'frame-copy'
+    );
+
     private readonly sessionStatus = computed(
         () => this.session()?.status ?? null
     );
@@ -42,7 +58,6 @@ export class EmbeddedMpvSessionController {
         measureBounds(host);
     private activeBoundsSync: (() => void) | null = null;
     private boundsAnimationFrame: number | null = null;
-    private stalledTimer: number | null = null;
 
     constructor() {
         this.unsubscribeSessionUpdate =
@@ -63,17 +78,16 @@ export class EmbeddedMpvSessionController {
             });
         }
 
-        // Track the narrowest possible signal — status only — so this effect
-        // does not re-run on every position-poll snapshot (~2 Hz during play)
-        // even though handleStalledTracking would be a no-op for those.
+        // Track status only so this effect does not re-run on every
+        // position-poll snapshot (~2 Hz) where stalled tracking is a no-op.
         effect(() => {
             const status = this.sessionStatus();
-            untracked(() => this.handleStalledTracking(status));
+            untracked(() => this.stalledTracker.track(status));
         });
 
         this.destroyRef.onDestroy(() => {
             this.unsubscribeSessionUpdate?.();
-            this.cancelStalledTimer();
+            this.stalledTracker.cancel();
             if (this.boundsAnimationFrame !== null) {
                 cancelAnimationFrame(this.boundsAnimationFrame);
                 this.boundsAnimationFrame = null;
@@ -90,17 +104,15 @@ export class EmbeddedMpvSessionController {
     }
 
     retry(): void {
-        this.stalled.set(false);
+        this.stalledTracker.reset();
         this.session.set(null);
         this.sessionId.set(null);
         this.retryToken.update((value) => value + 1);
     }
 
     /**
-     * Spin up an embedded MPV session bound to `host`. Returns a teardown
-     * function the caller must invoke when the host or playback changes (or
-     * the component tears down). All bounds and lifecycle bookkeeping lives
-     * here so the component can stay view-focused.
+     * Spin up an embedded MPV session bound to `host`. Returns a teardown the
+     * caller invokes when host/playback changes or the component tears down.
      */
     startSession(
         host: HTMLElement,
@@ -114,9 +126,11 @@ export class EmbeddedMpvSessionController {
             if (!activeSessionId) {
                 return;
             }
-            const bounds = this.boundsProvider(host);
             void window.electron
-                ?.setEmbeddedMpvBounds(activeSessionId, bounds)
+                ?.setEmbeddedMpvBounds(
+                    activeSessionId,
+                    this.boundsProvider(host)
+                )
                 .catch(() => undefined);
         };
 
@@ -137,11 +151,34 @@ export class EmbeddedMpvSessionController {
         window.addEventListener('resize', scheduleBoundsSync);
         window.addEventListener('scroll', scheduleBoundsSync, true);
 
-        const create = async () => {
-            this.session.set(
-                this.createLoadingSession(playback, initialVolume)
+        // Page zoom and monitor DPI rescale the CSS→native-pixel mapping the
+        // backend applies to these bounds. Moving the window to a display
+        // with a different scale can keep the CSS layout identical (no
+        // resize, no ResizeObserver), so watch devicePixelRatio through a
+        // re-armed matchMedia query and re-sync when it changes.
+        let detachDprWatch: (() => void) | null = null;
+        const watchDevicePixelRatio = () => {
+            detachDprWatch?.();
+            detachDprWatch = null;
+            const query = window.matchMedia?.(
+                `(resolution: ${window.devicePixelRatio}dppx)`
             );
-            await this.waitForStartupPaint();
+            if (!query) {
+                return;
+            }
+            const onChange = () => {
+                watchDevicePixelRatio();
+                scheduleBoundsSync();
+            };
+            query.addEventListener('change', onChange);
+            detachDprWatch = () =>
+                query.removeEventListener('change', onChange);
+        };
+        watchDevicePixelRatio();
+
+        const create = async () => {
+            this.session.set(createLoadingSession(playback, initialVolume));
+            await waitForStartupPaint();
             if (disposed) {
                 return;
             }
@@ -163,9 +200,6 @@ export class EmbeddedMpvSessionController {
                         'Embedded MPV is not available in this environment.'
                 );
             }
-            if (prepared?.supported) {
-                this.support.set(prepared);
-            }
 
             const created = await electron.createEmbeddedMpvSession(
                 measureBounds(host),
@@ -182,6 +216,30 @@ export class EmbeddedMpvSessionController {
             this.sessionId.set(created.id);
             this.session.set(created);
             await electron.loadEmbeddedMpvPlayback(created.id, playback);
+            if (disposed) {
+                return;
+            }
+            if (untracked(() => this.isFrameCopyEngine())) {
+                // Frame-copy engine: start the preload frame pump that
+                // paints helper frames onto the component's canvas. A failed
+                // attach (no canvas, no WebGL2, reader missing) must surface
+                // as a session error — otherwise the helper keeps playing
+                // audio behind a black canvas with no recovery UI.
+                const attached = await electron
+                    .attachEmbeddedMpvFrameView?.(created.id)
+                    .catch(() => false);
+                if (disposed) {
+                    return;
+                }
+                if (attached === false && !disposed) {
+                    await electron
+                        .disposeEmbeddedMpvSession(created.id)
+                        .catch(() => undefined);
+                    throw new Error(
+                        'The embedded MPV frame view failed to initialize.'
+                    );
+                }
+            }
             scheduleBoundsSync();
         };
 
@@ -192,8 +250,10 @@ export class EmbeddedMpvSessionController {
             if (disposed) {
                 return;
             }
+            // Factory is pure; clear sessionId here (controller owns mutation).
+            this.sessionId.set(null);
             this.session.set(
-                this.createErrorSession(playback, initialVolume, error)
+                createErrorSession(playback, initialVolume, error)
             );
         });
 
@@ -202,6 +262,8 @@ export class EmbeddedMpvSessionController {
             resizeObserver.disconnect();
             window.removeEventListener('resize', scheduleBoundsSync);
             window.removeEventListener('scroll', scheduleBoundsSync, true);
+            detachDprWatch?.();
+            detachDprWatch = null;
 
             if (this.activeBoundsSync === scheduleBoundsSync) {
                 this.activeBoundsSync = null;
@@ -217,177 +279,39 @@ export class EmbeddedMpvSessionController {
             this.session.set(null);
 
             if (id) {
+                if (untracked(() => this.isFrameCopyEngine())) {
+                    window.electron?.detachEmbeddedMpvFrameView?.();
+                }
                 void window.electron?.disposeEmbeddedMpvSession(id);
             }
         };
     }
 
-    async togglePaused(): Promise<void> {
-        const id = this.sessionId();
-        const session = this.session();
-        const electron = this.getElectronBridge();
-        if (!id || !session || !electron?.setEmbeddedMpvPaused) {
-            return;
-        }
-        const updated = await this.guardIpc(() =>
-            electron.setEmbeddedMpvPaused(id, session.status !== 'paused')
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async seekBy(deltaSeconds: number): Promise<boolean> {
-        const id = this.sessionId();
-        const session = this.session();
-        const electron = this.getElectronBridge();
-        if (!id || !session || !electron?.seekEmbeddedMpv) {
-            return false;
-        }
-        const next = Math.max(0, session.positionSeconds + deltaSeconds);
-        const updated = await this.guardIpc(() =>
-            electron.seekEmbeddedMpv(id, next)
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-        return true;
-    }
-
-    async seekTo(seconds: number): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.seekEmbeddedMpv) {
-            return;
-        }
-        const updated = await this.guardIpc(() =>
-            electron.seekEmbeddedMpv(id, seconds)
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async applyVolume(value: number): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.setEmbeddedMpvVolume) {
-            return;
-        }
-        const updated = await this.guardIpc(() =>
-            electron.setEmbeddedMpvVolume(id, value)
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async setAudioTrack(trackId: number): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.setEmbeddedMpvAudioTrack) {
-            return;
-        }
-        const updated = await this.guardIpc(() =>
-            electron.setEmbeddedMpvAudioTrack(id, trackId)
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async setSubtitleTrack(trackId: number): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.setEmbeddedMpvSubtitleTrack) {
-            return;
-        }
-        const setSubtitleTrack = electron.setEmbeddedMpvSubtitleTrack;
-        const updated = await this.guardIpc(() =>
-            setSubtitleTrack(id, trackId)
-        );
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async setSpeed(speed: number): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.setEmbeddedMpvSpeed) {
-            return;
-        }
-        const setSpeed = electron.setEmbeddedMpvSpeed;
-        const updated = await this.guardIpc(() => setSpeed(id, speed));
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async setAspect(aspect: string): Promise<void> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.setEmbeddedMpvAspect) {
-            return;
-        }
-        const setAspect = electron.setEmbeddedMpvAspect;
-        const updated = await this.guardIpc(() => setAspect(id, aspect));
-        if (updated) {
-            this.session.set(updated);
-        }
-    }
-
-    async startRecording(
+    // Transport/track/recording commands delegate to the command runner (owns
+    // IPC + snapshot reconciliation). Bound fields keep the public API stable.
+    readonly togglePaused = (): Promise<void> => this.commands.togglePaused();
+    readonly seekBy = (deltaSeconds: number): Promise<boolean> =>
+        this.commands.seekBy(deltaSeconds);
+    readonly seekTo = (seconds: number): Promise<void> =>
+        this.commands.seekTo(seconds);
+    readonly applyVolume = (value: number): Promise<void> =>
+        this.commands.applyVolume(value);
+    readonly setAudioTrack = (trackId: number): Promise<void> =>
+        this.commands.setAudioTrack(trackId);
+    readonly setSubtitleTrack = (trackId: number): Promise<void> =>
+        this.commands.setSubtitleTrack(trackId);
+    readonly setSpeed = (speed: number): Promise<void> =>
+        this.commands.setSpeed(speed);
+    readonly setAspect = (aspect: string): Promise<void> =>
+        this.commands.setAspect(aspect);
+    readonly startRecording = (
         directory: string | undefined,
         title: string
-    ): Promise<EmbeddedMpvSession['recording'] | null> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.startEmbeddedMpvRecording) {
-            return null;
-        }
-
-        const startEmbeddedMpvRecording = electron.startEmbeddedMpvRecording;
-        const resolvedDirectory =
-            directory?.trim() ||
-            (await electron.getEmbeddedMpvDefaultRecordingFolder?.());
-        const updated = await this.guardIpc(() =>
-            startEmbeddedMpvRecording(id, {
-                directory: resolvedDirectory,
-                title,
-            })
-        );
-        if (updated) {
-            this.session.set(updated);
-            return updated.recording ?? null;
-        }
-        return null;
-    }
-
-    async stopRecording(): Promise<EmbeddedMpvSession['recording'] | null> {
-        const id = this.sessionId();
-        const electron = this.getElectronBridge();
-        if (!id || !electron?.stopEmbeddedMpvRecording) {
-            return null;
-        }
-        const stopEmbeddedMpvRecording = electron.stopEmbeddedMpvRecording;
-        const updated = await this.guardIpc(() => stopEmbeddedMpvRecording(id));
-        if (updated) {
-            this.session.set(updated);
-            return updated.recording ?? null;
-        }
-        return null;
-    }
-
-    private async guardIpc<T>(call: () => Promise<T>): Promise<T | null> {
-        try {
-            return await call();
-        } catch {
-            // The session may have been torn down or an addon-side throw
-            // raced the IPC. Swallow — the next snapshot will resync state.
-            return null;
-        }
-    }
+    ): Promise<EmbeddedMpvSession['recording'] | null> =>
+        this.commands.startRecording(directory, title);
+    readonly stopRecording = (): Promise<
+        EmbeddedMpvSession['recording'] | null
+    > => this.commands.stopRecording();
 
     private async loadSupport(): Promise<void> {
         try {
@@ -410,94 +334,4 @@ export class EmbeddedMpvSessionController {
     private getElectronBridge(): ElectronBridge | undefined {
         return window.electron;
     }
-
-    private handleStalledTracking(
-        status: EmbeddedMpvSession['status'] | null
-    ): void {
-        if (status === 'loading') {
-            if (this.stalledTimer === null) {
-                this.stalledTimer = window.setTimeout(() => {
-                    this.stalled.set(true);
-                    this.stalledTimer = null;
-                }, STALLED_TIMEOUT_MS);
-            }
-            return;
-        }
-
-        this.cancelStalledTimer();
-        if (this.stalled()) {
-            this.stalled.set(false);
-        }
-    }
-
-    private cancelStalledTimer(): void {
-        if (this.stalledTimer !== null) {
-            clearTimeout(this.stalledTimer);
-            this.stalledTimer = null;
-        }
-    }
-
-    private createLoadingSession(
-        playback: ResolvedPortalPlayback,
-        volume: number
-    ): EmbeddedMpvSession {
-        const now = new Date().toISOString();
-        return {
-            id: 'embedded-mpv-starting',
-            title: playback.title,
-            streamUrl: playback.streamUrl,
-            status: 'loading',
-            positionSeconds: 0,
-            durationSeconds: null,
-            volume,
-            audioTracks: [],
-            selectedAudioTrackId: null,
-            subtitleTracks: [],
-            selectedSubtitleTrackId: null,
-            playbackSpeed: 1,
-            aspectOverride: 'no',
-            recording: { active: false },
-            startedAt: now,
-            updatedAt: now,
-        };
-    }
-
-    private createErrorSession(
-        playback: ResolvedPortalPlayback,
-        volume: number,
-        error: unknown
-    ): EmbeddedMpvSession {
-        const now = new Date().toISOString();
-        this.sessionId.set(null);
-        return {
-            id: 'embedded-mpv-error',
-            title: playback.title,
-            streamUrl: playback.streamUrl,
-            status: 'error',
-            positionSeconds: 0,
-            durationSeconds: null,
-            volume,
-            audioTracks: [],
-            selectedAudioTrackId: null,
-            subtitleTracks: [],
-            selectedSubtitleTrackId: null,
-            playbackSpeed: 1,
-            aspectOverride: 'no',
-            recording: { active: false },
-            startedAt: now,
-            updatedAt: now,
-            error: error instanceof Error ? error.message : String(error),
-        };
-    }
-
-    private waitForStartupPaint(): Promise<void> {
-        if (typeof requestAnimationFrame !== 'function') {
-            return Promise.resolve();
-        }
-        return new Promise((resolve) => {
-            requestAnimationFrame(() => {
-                requestAnimationFrame(() => resolve());
-            });
-        });
-    }
 }
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-factory.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-factory.ts
new file mode 100644
index 000000000..e28be1678
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-factory.ts
@@ -0,0 +1,79 @@
+import {
+    EmbeddedMpvSession,
+    ResolvedPortalPlayback,
+} from '@iptvnator/shared/interfaces';
+
+/**
+ * Pure snapshot factories for the placeholder {@link EmbeddedMpvSession} states
+ * the controller renders before (or instead of) a real native session. Keeping
+ * them side-effect free means the controller owns all signal mutations — the
+ * error placeholder no longer clears `sessionId` itself; its caller does.
+ */
+
+function baseSession(
+    overrides: Partial<EmbeddedMpvSession>
+): EmbeddedMpvSession {
+    const now = new Date().toISOString();
+    return {
+        id: 'embedded-mpv-placeholder',
+        title: '',
+        streamUrl: '',
+        status: 'loading',
+        positionSeconds: 0,
+        durationSeconds: null,
+        volume: 1,
+        audioTracks: [],
+        selectedAudioTrackId: null,
+        subtitleTracks: [],
+        selectedSubtitleTrackId: null,
+        playbackSpeed: 1,
+        aspectOverride: 'no',
+        recording: { active: false },
+        startedAt: now,
+        updatedAt: now,
+        ...overrides,
+    };
+}
+
+export function createLoadingSession(
+    playback: ResolvedPortalPlayback,
+    volume: number
+): EmbeddedMpvSession {
+    return baseSession({
+        id: 'embedded-mpv-starting',
+        title: playback.title,
+        streamUrl: playback.streamUrl,
+        status: 'loading',
+        volume,
+    });
+}
+
+export function createErrorSession(
+    playback: ResolvedPortalPlayback,
+    volume: number,
+    error: unknown
+): EmbeddedMpvSession {
+    return baseSession({
+        id: 'embedded-mpv-error',
+        title: playback.title,
+        streamUrl: playback.streamUrl,
+        status: 'error',
+        volume,
+        error: error instanceof Error ? error.message : String(error),
+    });
+}
+
+/**
+ * Wait two animation frames so the loading placeholder paints before the
+ * (potentially blocking) native session creation kicks off.
+ */
+export function waitForStartupPaint(): Promise<void> {
+    if (typeof requestAnimationFrame !== 'function') {
+        return Promise.resolve();
+    }
+    return new Promise((resolve) => {
+        requestAnimationFrame(() => {
+            requestAnimationFrame(() => resolve());
+        });
+    });
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.spec.ts
index c9140dd44..5c39d60d7 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.spec.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.spec.ts
@@ -48,6 +48,23 @@ describe('EmbeddedMpvShortcuts', () => {
         expect(handlers.toggleMute).toHaveBeenCalledTimes(1);
     });
 
+    it('suspends arrow shortcuts while a dock chip panel owns the keyboard', () => {
+        shortcuts.detach();
+        shortcuts.attach({ ...handlers, arrowKeysBlocked: () => true });
+
+        expect(dispatchKey('ArrowLeft')).toBe(false);
+        expect(dispatchKey('ArrowRight')).toBe(false);
+        expect(dispatchKey('ArrowUp')).toBe(false);
+        expect(dispatchKey('ArrowDown')).toBe(false);
+        expect(dispatchKey(' ')).toBe(true);
+        expect(dispatchKey('m')).toBe(true);
+
+        expect(handlers.seekBy).not.toHaveBeenCalled();
+        expect(handlers.adjustVolume).not.toHaveBeenCalled();
+        expect(handlers.togglePaused).toHaveBeenCalledTimes(1);
+        expect(handlers.toggleMute).toHaveBeenCalledTimes(1);
+    });
+
     it('always allows escape to close popovers even when playback is unavailable', () => {
         handlers.isAvailable.mockReturnValue(false);
 
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.ts
index 785cb6131..80f01e253 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-shortcuts.ts
@@ -1,5 +1,10 @@
 export interface EmbeddedMpvShortcutHandlers {
     isAvailable: () => boolean;
+    /**
+     * While true, arrow keys stop seeking/adjusting volume — an open dock
+     * chip panel owns them for chip navigation instead.
+     */
+    arrowKeysBlocked?: () => boolean;
     onEscape: () => void;
     togglePaused: () => void;
     toggleFullscreen: () => void;
@@ -41,6 +46,8 @@ export class EmbeddedMpvShortcuts {
             return;
         }
 
+        const arrowsBlocked = handlers.arrowKeysBlocked?.() === true;
+
         switch (event.key) {
             case ' ':
             case 'k':
@@ -54,18 +61,30 @@ export class EmbeddedMpvShortcuts {
                 handlers.toggleFullscreen();
                 return;
             case 'ArrowLeft':
+                if (arrowsBlocked) {
+                    return;
+                }
                 event.preventDefault();
                 handlers.seekBy(-5);
                 return;
             case 'ArrowRight':
+                if (arrowsBlocked) {
+                    return;
+                }
                 event.preventDefault();
                 handlers.seekBy(5);
                 return;
             case 'ArrowUp':
+                if (arrowsBlocked) {
+                    return;
+                }
                 event.preventDefault();
                 handlers.adjustVolume(0.05);
                 return;
             case 'ArrowDown':
+                if (arrowsBlocked) {
+                    return;
+                }
                 event.preventDefault();
                 handlers.adjustVolume(-0.05);
                 return;
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.spec.ts
new file mode 100644
index 000000000..1f2e3c1e8
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.spec.ts
@@ -0,0 +1,71 @@
+import { EmbeddedMpvStalledTracker } from './embedded-mpv-stalled-tracker';
+
+describe('EmbeddedMpvStalledTracker', () => {
+    let tracker: EmbeddedMpvStalledTracker;
+
+    beforeEach(() => {
+        jest.useFakeTimers();
+        tracker = new EmbeddedMpvStalledTracker();
+    });
+
+    afterEach(() => {
+        tracker.cancel();
+        jest.useRealTimers();
+    });
+
+    it('flags a stall when loading exceeds the timeout', () => {
+        tracker.track('loading');
+        expect(tracker.stalled()).toBe(false);
+
+        jest.advanceTimersByTime(29_999);
+        expect(tracker.stalled()).toBe(false);
+
+        jest.advanceTimersByTime(1);
+        expect(tracker.stalled()).toBe(true);
+    });
+
+    it('keeps a single timer across repeated loading snapshots', () => {
+        tracker.track('loading');
+        jest.advanceTimersByTime(20_000);
+        // Position-poll snapshots re-report 'loading' — must not restart timer.
+        tracker.track('loading');
+        jest.advanceTimersByTime(10_000);
+        expect(tracker.stalled()).toBe(true);
+    });
+
+    it('cancels the pending timer when playback starts', () => {
+        tracker.track('loading');
+        tracker.track('playing');
+
+        jest.advanceTimersByTime(60_000);
+        expect(tracker.stalled()).toBe(false);
+    });
+
+    it('clears an already-raised stall on any non-loading status', () => {
+        tracker.track('loading');
+        jest.advanceTimersByTime(30_000);
+        expect(tracker.stalled()).toBe(true);
+
+        tracker.track('error');
+        expect(tracker.stalled()).toBe(false);
+    });
+
+    it('reset cancels the timer and clears the flag', () => {
+        tracker.track('loading');
+        jest.advanceTimersByTime(30_000);
+        expect(tracker.stalled()).toBe(true);
+
+        tracker.reset();
+        expect(tracker.stalled()).toBe(false);
+
+        jest.advanceTimersByTime(60_000);
+        expect(tracker.stalled()).toBe(false);
+    });
+
+    it('cancel alone leaves an existing stalled flag untouched', () => {
+        tracker.track('loading');
+        jest.advanceTimersByTime(30_000);
+        tracker.cancel();
+        expect(tracker.stalled()).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.ts
new file mode 100644
index 000000000..2f9915131
--- /dev/null
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-stalled-tracker.ts
@@ -0,0 +1,45 @@
+import { signal } from '@angular/core';
+import { EmbeddedMpvSession } from '@iptvnator/shared/interfaces';
+
+const STALLED_TIMEOUT_MS = 30_000;
+
+/**
+ * Tracks whether a loading embedded-MPV session has stalled: if `status` stays
+ * `loading` longer than {@link STALLED_TIMEOUT_MS}, `stalled` flips true so the
+ * UI can offer a retry. Any non-loading status cancels the timer and clears the
+ * flag. Owns its own timer so the controller stays lifecycle-focused.
+ */
+export class EmbeddedMpvStalledTracker {
+    readonly stalled = signal(false);
+
+    private stalledTimer: number | null = null;
+
+    track(status: EmbeddedMpvSession['status'] | null): void {
+        if (status === 'loading') {
+            if (this.stalledTimer === null) {
+                this.stalledTimer = window.setTimeout(() => {
+                    this.stalled.set(true);
+                    this.stalledTimer = null;
+                }, STALLED_TIMEOUT_MS);
+            }
+            return;
+        }
+
+        this.cancel();
+        if (this.stalled()) {
+            this.stalled.set(false);
+        }
+    }
+
+    reset(): void {
+        this.cancel();
+        this.stalled.set(false);
+    }
+
+    cancel(): void {
+        if (this.stalledTimer !== null) {
+            clearTimeout(this.stalledTimer);
+            this.stalledTimer = null;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.spec.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.spec.ts
index f4a27a224..ed1a57041 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.spec.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.spec.ts
@@ -19,6 +19,22 @@ describe('EmbeddedMpvMenuState', () => {
         expect(menus.audioOpen()).toBe(false);
         expect(menus.anyOpen()).toBe(false);
     });
+
+    it('reports dockPanelOpen for chip panels but not the volume slider', () => {
+        const menus = new EmbeddedMpvMenuState();
+
+        menus.open('volume');
+        expect(menus.anyOpen()).toBe(true);
+        expect(menus.dockPanelOpen()).toBe(false);
+
+        for (const menu of ['audio', 'subtitle', 'speed', 'aspect'] as const) {
+            menus.open(menu);
+            expect(menus.dockPanelOpen()).toBe(true);
+        }
+
+        menus.closeAll();
+        expect(menus.dockPanelOpen()).toBe(false);
+    });
 });
 
 describe('EmbeddedMpvFeedback', () => {
diff --git a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.ts b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.ts
index fee6a58c2..962c42568 100644
--- a/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.ts
+++ b/libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-ui-state.ts
@@ -8,8 +8,10 @@ export type EmbeddedMpvMenu =
     | 'aspect';
 
 /**
- * Tracks which menu/popover is currently open and exposes individual signals
- * the template binds to. Only one menu can be open at a time.
+ * Tracks which menu is currently open and exposes individual signals the
+ * template binds to. Only one menu can be open at a time. Menus render as
+ * horizontal panels inside the fixed-height controls strip, so open state
+ * never affects the native MPV view bounds.
  */
 export class EmbeddedMpvMenuState {
     readonly volumeOpen = signal(false);
@@ -27,6 +29,19 @@ export class EmbeddedMpvMenuState {
             this.aspectOpen()
     );
 
+    /**
+     * True while a chip panel morphs the dock row (audio, subtitle, speed,
+     * aspect — not the inline volume slider). While open, arrow keys walk
+     * the chips instead of seeking or changing the volume.
+     */
+    readonly dockPanelOpen = computed(
+        () =>
+            this.audioOpen() ||
+            this.subtitleOpen() ||
+            this.speedOpen() ||
+            this.aspectOpen()
+    );
+
     toggle(menu: EmbeddedMpvMenu): void {
         const target = this.signalFor(menu);
         const next = !target();
@@ -97,6 +112,14 @@ export class EmbeddedMpvFeedback {
         }, durationMs);
     }
 
+    clear(): void {
+        if (this.timer !== null) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+        this.current.set(null);
+    }
+
     dispose(): void {
         if (this.timer !== null) {
             clearTimeout(this.timer);
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-element-session.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-element-session.spec.ts
new file mode 100644
index 000000000..d1a44277b
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-element-session.spec.ts
@@ -0,0 +1,127 @@
+import { HtmlVideoElementSession } from './html-video-element-session';
+
+describe('HtmlVideoElementSession', () => {
+    it('owns native video events and detaches them idempotently', () => {
+        const video = document.createElement('video');
+        const playbackIssues: unknown[] = [];
+        const timeUpdates: Array<{ currentTime: number; duration: number }> =
+            [];
+        const playbackEnded = jest.fn();
+        const removeEventListener = jest.spyOn(video, 'removeEventListener');
+        const session = new HtmlVideoElementSession({
+            video,
+            getChannelUrl: () => 'https://example.test/video.ts',
+            getStartTime: () => 12,
+            emitPlaybackIssue: (issue) => playbackIssues.push(issue),
+            emitTimeUpdate: (value) => timeUpdates.push(value),
+            emitPlaybackEnded: playbackEnded,
+        });
+        Object.defineProperty(video, 'duration', {
+            configurable: true,
+            value: 90,
+        });
+        Object.defineProperty(video, 'error', {
+            configurable: true,
+            value: {
+                code: 4,
+                message: 'No compatible source was found',
+            },
+        });
+
+        session.attach();
+        session.attach();
+        video.dispatchEvent(new Event('loadedmetadata'));
+        expect(video.currentTime).toBe(12);
+        video.currentTime = 18;
+        video.dispatchEvent(new Event('timeupdate'));
+        video.dispatchEvent(new Event('error'));
+        video.dispatchEvent(new Event('loadeddata'));
+        video.dispatchEvent(new Event('playing'));
+        video.dispatchEvent(new Event('ended'));
+
+        expect(video.currentTime).toBe(18);
+        expect(timeUpdates).toEqual([{ currentTime: 18, duration: 90 }]);
+        expect(playbackIssues[0]).toEqual(
+            expect.objectContaining({
+                code: 'unsupported-container',
+                source: 'native',
+                sourceUrl: 'https://example.test/video.ts',
+            })
+        );
+        expect(playbackIssues.slice(1)).toEqual([null, null]);
+        expect(playbackEnded).toHaveBeenCalledTimes(1);
+
+        session.destroy();
+        session.destroy();
+        video.dispatchEvent(new Event('ended'));
+
+        expect(playbackEnded).toHaveBeenCalledTimes(1);
+        expect(removeEventListener).toHaveBeenCalledTimes(7);
+    });
+
+    it('persists volume changes from the native video element', () => {
+        const video = document.createElement('video');
+        video.volume = 0.35;
+        const session = createSession(video);
+        localStorage.removeItem('volume');
+
+        session.attach();
+        video.dispatchEvent(new Event('volumechange'));
+
+        expect(localStorage.getItem('volume')).toBe('0.35');
+        session.destroy();
+    });
+
+    // Caption state belongs to WebVideoSourceTracks, which follows the active
+    // source engine. The old play()-time one-shot ran before hls.js had added
+    // its text tracks, which is what made the preference look like a no-op.
+    it('leaves text tracks alone when playback starts', async () => {
+        const video = document.createElement('video');
+        const tracks = [
+            { mode: 'showing' as TextTrackMode },
+            { mode: 'showing' as TextTrackMode },
+        ];
+        Object.defineProperty(video, 'textTracks', {
+            configurable: true,
+            value: tracks,
+        });
+        jest.spyOn(video, 'play').mockResolvedValue(undefined);
+        const session = createSession(video);
+
+        session.play();
+        await Promise.resolve();
+
+        expect(tracks.map((track) => track.mode)).toEqual([
+            'showing',
+            'showing',
+        ]);
+    });
+
+    it('swallows autoplay rejections', async () => {
+        const video = document.createElement('video');
+        jest.spyOn(video, 'play').mockRejectedValue(
+            new Error('autoplay blocked')
+        );
+        const session = createSession(video);
+
+        expect(() => session.play()).not.toThrow();
+        await Promise.resolve();
+    });
+});
+
+function createSession(
+    video: HTMLVideoElement,
+    overrides: Partial<
+        ConstructorParameters<typeof HtmlVideoElementSession>[0]
+    > = {}
+): HtmlVideoElementSession {
+    return new HtmlVideoElementSession({
+        video,
+        getChannelUrl: () => undefined,
+        getStartTime: () => 0,
+        emitPlaybackIssue: jest.fn(),
+        emitTimeUpdate: jest.fn(),
+        emitPlaybackEnded: jest.fn(),
+        ...overrides,
+    });
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-element-session.ts b/libs/ui/playback/src/lib/html-video-player/html-video-element-session.ts
new file mode 100644
index 000000000..3e320c19b
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-element-session.ts
@@ -0,0 +1,111 @@
+import { createDevLogger } from '@iptvnator/shared/interfaces';
+import {
+    InlinePlaybackPlayer,
+    type PlaybackDiagnostic,
+    classifyNativePlaybackIssue,
+    createPlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+const debugHtmlPlayer = createDevLogger('HtmlVideoPlayer');
+
+export interface HtmlVideoElementSessionConfig {
+    video: HTMLVideoElement;
+    getChannelUrl: () => string | undefined;
+    getStartTime: () => number;
+    emitPlaybackIssue: (issue: PlaybackDiagnostic | null) => void;
+    emitTimeUpdate: (value: { currentTime: number; duration: number }) => void;
+    emitPlaybackEnded: () => void;
+}
+
+export class HtmlVideoElementSession {
+    private attached = false;
+
+    private readonly handleNativePlaybackError = (): void => {
+        const video = this.config.video;
+        const url = this.config.getChannelUrl() ?? video.currentSrc;
+        this.config.emitPlaybackIssue(
+            classifyNativePlaybackIssue(
+                video.error,
+                createPlaybackSourceMetadata({
+                    url,
+                    player: InlinePlaybackPlayer.Html5,
+                })
+            )
+        );
+    };
+
+    private readonly clearPlaybackIssue = (): void => {
+        this.config.emitPlaybackIssue(null);
+    };
+
+    private readonly handleVolumeChange = (): void => {
+        const currentVolume = this.config.video.volume;
+        debugHtmlPlayer('Volume changed to:', currentVolume);
+        localStorage.setItem('volume', currentVolume.toString());
+    };
+
+    private readonly handleLoadedMetadata = (): void => {
+        const startTime = this.config.getStartTime();
+        if (startTime > 0) {
+            this.config.video.currentTime = startTime;
+        }
+    };
+
+    private readonly handleTimeUpdate = (): void => {
+        const video = this.config.video;
+        this.config.emitTimeUpdate({
+            currentTime: video.currentTime,
+            duration: video.duration,
+        });
+    };
+
+    private readonly handlePlaybackEnded = (): void => {
+        this.config.emitPlaybackEnded();
+    };
+
+    private readonly listeners: ReadonlyArray<
+        readonly [event: string, listener: EventListener]
+    > = [
+        ['volumechange', this.handleVolumeChange],
+        ['loadedmetadata', this.handleLoadedMetadata],
+        ['timeupdate', this.handleTimeUpdate],
+        ['error', this.handleNativePlaybackError],
+        ['loadeddata', this.clearPlaybackIssue],
+        ['playing', this.clearPlaybackIssue],
+        ['ended', this.handlePlaybackEnded],
+    ];
+
+    constructor(private readonly config: HtmlVideoElementSessionConfig) {}
+
+    attach(): void {
+        if (this.attached) {
+            return;
+        }
+        this.attached = true;
+        for (const [event, listener] of this.listeners) {
+            this.config.video.addEventListener(event, listener);
+        }
+    }
+
+    play(): void {
+        const playPromise = this.config.video.play();
+        if (playPromise === undefined) {
+            return;
+        }
+
+        // Autoplay failures are surfaced by the surrounding player UI. Caption
+        // state is owned by WebVideoSourceTracks, which tracks the active
+        // source engine instead of guessing once when playback starts.
+        void playPromise.catch(() => undefined);
+    }
+
+    destroy(): void {
+        if (!this.attached) {
+            return;
+        }
+        this.attached = false;
+        for (const [event, listener] of this.listeners) {
+            this.config.video.removeEventListener(event, listener);
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.spec.ts
new file mode 100644
index 000000000..2ac95567a
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.spec.ts
@@ -0,0 +1,197 @@
+import { WebVideoControlsAdapter } from '../player-controls/web-video-controls.adapter';
+import { HtmlVideoPlayerControlsBridge } from './html-video-player-controls.bridge';
+import {
+    createVideo,
+    readMpegtsState,
+} from './html-video-player-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerControlsBridge MPEG-TS duration', () => {
+    it('prefers a finite positive video duration', () => {
+        const state = readMpegtsState({
+            duration: 120,
+            seekableEnds: [115],
+            bufferedEnds: [112],
+        });
+
+        expect(state.durationSeconds).toBe(120);
+        expect(state.isLive).toBe(false);
+        expect(state.canSeek).toBe(true);
+    });
+
+    it('falls back to the last finite positive seekable end', () => {
+        const state = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [90, NaN, 115],
+            bufferedEnds: [112],
+        });
+
+        expect(state.durationSeconds).toBe(115);
+        expect(state.isLive).toBe(false);
+        expect(state.canSeek).toBe(true);
+    });
+
+    it('scans seekable ranges backward past invalid ends', () => {
+        const state = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [105, NaN, -1],
+            bufferedEnds: [112],
+        });
+
+        expect(state.durationSeconds).toBe(105);
+    });
+
+    it('falls back to the last finite positive buffered end', () => {
+        const state = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [NaN],
+            bufferedEnds: [80, NaN, 112],
+        });
+
+        expect(state.durationSeconds).toBe(112);
+        expect(state.isLive).toBe(false);
+        expect(state.canSeek).toBe(true);
+    });
+
+    it('returns no corrected duration when ranges throw or are invalid', () => {
+        const throwingState = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [115],
+            bufferedEnds: [112],
+            seekableThrows: true,
+            bufferedThrows: true,
+        });
+        const invalidState = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [NaN, -1, 0],
+            bufferedEnds: [Infinity, -1, 0],
+        });
+
+        expect(throwingState.durationSeconds).toBeNull();
+        expect(invalidState.durationSeconds).toBeNull();
+    });
+
+    it('keeps non-live MPEG-TS non-seekable until a seekable range exists', () => {
+        const state = readMpegtsState({
+            duration: Infinity,
+            bufferedEnds: [112],
+        });
+
+        expect(state.durationSeconds).toBe(112);
+        expect(state.isLive).toBe(false);
+        expect(state.canSeek).toBe(false);
+    });
+
+    it('uses only the authoritative live input for live classification', () => {
+        const liveState = readMpegtsState(
+            {
+                duration: 120,
+                seekableEnds: [115],
+            },
+            true
+        );
+        const vodState = readMpegtsState({
+            duration: Infinity,
+            seekableEnds: [115],
+        });
+
+        expect(liveState.isLive).toBe(true);
+        expect(liveState.durationSeconds).toBeNull();
+        expect(vodState.isLive).toBe(false);
+        expect(vodState.durationSeconds).toBe(115);
+    });
+});
+
+describe('HtmlVideoPlayerControlsBridge lifecycle', () => {
+    it('attaches the adapter exactly once with engine accessors', () => {
+        const video = createVideo({ duration: 90 });
+        const adapter = new WebVideoControlsAdapter();
+        const attachSpy = jest.spyOn(adapter, 'attach');
+        const bridge = new HtmlVideoPlayerControlsBridge({
+            video,
+            adapter,
+            isLive: () => false,
+            showCaptions: () => true,
+        });
+
+        bridge.attach();
+        bridge.attach();
+
+        expect(attachSpy).toHaveBeenCalledTimes(1);
+        expect(attachSpy).toHaveBeenCalledWith(
+            video,
+            expect.objectContaining({
+                isLive: expect.any(Function),
+                getDuration: expect.any(Function),
+                getAudioTracks: expect.any(Function),
+                setAudioTrack: expect.any(Function),
+                getSubtitleTracks: expect.any(Function),
+                setSubtitleTrack: expect.any(Function),
+            })
+        );
+        bridge.destroy();
+    });
+
+    it('lets non-MPEG-TS sources fall back to the video duration', () => {
+        const adapter = new WebVideoControlsAdapter();
+        const bridge = new HtmlVideoPlayerControlsBridge({
+            video: createVideo({ duration: 87, seekableEnds: [80] }),
+            adapter,
+            isLive: () => false,
+            showCaptions: () => true,
+        });
+
+        bridge.attach();
+        bridge.setSource({ kind: 'native' });
+
+        expect(adapter.state().durationSeconds).toBe(87);
+        bridge.destroy();
+    });
+
+    it('clears corrected source state and refreshes authoritative inputs', () => {
+        let isLive = false;
+        const adapter = new WebVideoControlsAdapter();
+        const bridge = new HtmlVideoPlayerControlsBridge({
+            video: createVideo({
+                duration: Infinity,
+                seekableEnds: [115],
+            }),
+            adapter,
+            isLive: () => isLive,
+            showCaptions: () => true,
+        });
+
+        bridge.attach();
+        bridge.setSource({ kind: 'mpegts' });
+        expect(adapter.state().durationSeconds).toBe(115);
+        expect(adapter.state().isLive).toBe(false);
+
+        isLive = true;
+        bridge.refreshInputs();
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.state().durationSeconds).toBeNull();
+
+        isLive = false;
+        bridge.clearSource();
+        expect(adapter.state().isLive).toBe(false);
+        expect(adapter.state().durationSeconds).toBeNull();
+        bridge.destroy();
+    });
+
+    it('detaches the adapter exactly once when destroyed twice', () => {
+        const adapter = new WebVideoControlsAdapter();
+        const detachSpy = jest.spyOn(adapter, 'detach');
+        const bridge = new HtmlVideoPlayerControlsBridge({
+            video: createVideo(),
+            adapter,
+            isLive: () => false,
+            showCaptions: () => true,
+        });
+        bridge.attach();
+        detachSpy.mockClear();
+
+        bridge.destroy();
+        bridge.destroy();
+
+        expect(detachSpy).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.ts
new file mode 100644
index 000000000..3efb50461
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.bridge.ts
@@ -0,0 +1,5 @@
+export { WebVideoSourceControlsBridge as HtmlVideoPlayerControlsBridge } from '../web-video-support/web-video-source-controls.bridge';
+export type {
+    WebVideoControlsSource as HtmlVideoControlsSource,
+    WebVideoSourceControlsBridgeConfig as HtmlVideoPlayerControlsBridgeConfig,
+} from '../web-video-support/web-video-source-controls.bridge';
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls-captions.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls-captions.spec.ts
new file mode 100644
index 000000000..351f56498
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls-captions.spec.ts
@@ -0,0 +1,176 @@
+import Hls from 'hls.js';
+import { bindHls, FakeHls } from './html-video-player-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerControlsBridge HLS caption preference', () => {
+    it('suppresses initial and late HLS subtitle display while disabled', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }];
+        hls.subtitleTrack = 0;
+        hls.subtitleDisplay = true;
+        const { adapter, bridge } = bindHls(hls, false);
+
+        expect(hls.subtitleDisplay).toBe(false);
+        expect(adapter.state().subtitleTracks[0].selected).toBe(false);
+
+        hls.subtitleDisplay = true;
+        hls.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+
+        expect(hls.subtitleDisplay).toBe(false);
+        expect(adapter.state().subtitleTracks[0].selected).toBe(false);
+        bridge.destroy();
+    });
+
+    it('restores an HLS default selected while display remains disabled', () => {
+        const hls = new FakeHls();
+        const { bridge, captionPreference } = bindHls(hls, false);
+        hls.subtitleTracks = [{ name: 'English' }];
+        hls.subtitleTrack = 0;
+        hls.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+
+        expect(hls.subtitleDisplay).toBe(false);
+
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(hls.subtitleTrack).toBe(0);
+        expect(hls.subtitleDisplay).toBe(true);
+        bridge.destroy();
+    });
+
+    it('restores the retained HLS subtitle when preference returns', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }, { name: 'German' }];
+        hls.subtitleTrack = 1;
+        hls.subtitleDisplay = true;
+        const { adapter, bridge, captionPreference } = bindHls(hls, false);
+        hls.subtitleTrack = -1;
+
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.subtitleTrack).toBe(1);
+        expect(adapter.state().subtitleTracks[1].selected).toBe(true);
+        bridge.destroy();
+    });
+
+    it('keeps an explicit HLS selection through events and preference changes', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }, { name: 'German' }];
+        const { adapter, bridge, captionPreference } = bindHls(hls);
+
+        adapter.commands.setSubtitleTrack(1);
+        captionPreference.value = false;
+        bridge.refreshInputs();
+        hls.subtitleDisplay = false;
+        hls.subtitleTrack = 0;
+        hls.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.subtitleTrack).toBe(1);
+        bridge.destroy();
+    });
+
+    it('keeps explicit HLS off through events and preference changes', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }];
+        const { adapter, bridge, captionPreference } = bindHls(hls);
+
+        adapter.commands.setSubtitleTrack(-1);
+        hls.subtitleTrack = 0;
+        hls.subtitleDisplay = true;
+        hls.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+        captionPreference.value = false;
+        bridge.refreshInputs();
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(hls.subtitleTrack).toBe(-1);
+        expect(hls.subtitleDisplay).toBe(false);
+        bridge.destroy();
+    });
+
+    it('resets the explicit HLS override on source replacement', () => {
+        const firstHls = new FakeHls();
+        firstHls.subtitleTracks = [{ name: 'One' }, { name: 'Two' }];
+        const { adapter, bridge } = bindHls(firstHls);
+        adapter.commands.setSubtitleTrack(1);
+        const secondHls = new FakeHls();
+        secondHls.subtitleTracks = [{ name: 'Alpha' }, { name: 'Beta' }];
+        secondHls.subtitleTrack = 0;
+        secondHls.subtitleDisplay = true;
+
+        bridge.setSource({ kind: 'hls', hls: secondHls.asHls() });
+
+        expect(secondHls.subtitleTrack).toBe(0);
+        expect(secondHls.subtitleDisplay).toBe(true);
+        bridge.destroy();
+    });
+});
+
+describe('HtmlVideoPlayerControlsBridge HLS subtitle event reentry', () => {
+    it('settles explicit valid selection after one synchronous switch event', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }, { name: 'German' }];
+        const { adapter, bridge } = bindHls(hls);
+        hls.assignments.length = 0;
+        hls.enableSynchronousSubtitleTrackSwitch();
+
+        expect(() => adapter.commands.setSubtitleTrack(1)).not.toThrow();
+
+        expect(hls.assignments).toEqual([
+            'subtitleDisplay:true',
+            'subtitleTrack:1',
+        ]);
+        expect(hls.subtitleTrackSwitchEvents).toBe(1);
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.subtitleTrack).toBe(1);
+        bridge.destroy();
+    });
+
+    it('settles explicit off after one synchronous switch event', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }];
+        hls.subtitleTrack = 0;
+        hls.subtitleDisplay = true;
+        const { adapter, bridge } = bindHls(hls);
+        hls.assignments.length = 0;
+        hls.enableSynchronousSubtitleTrackSwitch();
+
+        expect(() => adapter.commands.setSubtitleTrack(-1)).not.toThrow();
+
+        expect(hls.assignments).toEqual([
+            'subtitleTrack:-1',
+            'subtitleDisplay:false',
+        ]);
+        expect(hls.subtitleTrackSwitchEvents).toBe(1);
+        expect(hls.subtitleTrack).toBe(-1);
+        expect(hls.subtitleDisplay).toBe(false);
+        bridge.destroy();
+    });
+
+    it('restores retained preference after one synchronous switch event', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'English' }, { name: 'German' }];
+        hls.subtitleTrack = 1;
+        hls.subtitleDisplay = true;
+        const { bridge, captionPreference } = bindHls(hls, false);
+        hls.subtitleTrack = -1;
+        captionPreference.value = true;
+        hls.assignments.length = 0;
+        hls.enableSynchronousSubtitleTrackSwitch();
+
+        expect(() => bridge.refreshInputs()).not.toThrow();
+
+        expect(hls.assignments).toEqual([
+            'subtitleDisplay:true',
+            'subtitleTrack:1',
+        ]);
+        expect(hls.subtitleTrackSwitchEvents).toBe(1);
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.subtitleTrack).toBe(1);
+        bridge.destroy();
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls.spec.ts
new file mode 100644
index 000000000..7daf64d08
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.hls.spec.ts
@@ -0,0 +1,182 @@
+import Hls from 'hls.js';
+import { WebVideoControlsAdapter } from '../player-controls/web-video-controls.adapter';
+import { HtmlVideoPlayerControlsBridge } from './html-video-player-controls.bridge';
+import {
+    bindHls,
+    createVideo,
+    FakeHls,
+} from './html-video-player-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerControlsBridge HLS tracks', () => {
+    it('projects current list indices, labels, and selected audio state', () => {
+        const hls = new FakeHls();
+        hls.audioTracks = [
+            { id: 41, name: 'English' },
+            { id: 3, lang: 'de' },
+            { id: 99 },
+        ];
+        hls.audioTrack = 1;
+        const { adapter, bridge } = bindHls(hls);
+
+        expect(adapter.state().audioTracks).toEqual([
+            { id: 0, label: 'English', selected: false },
+            { id: 1, label: 'de', selected: true },
+            { id: 2, label: 'Audio 3', selected: false },
+        ]);
+        bridge.destroy();
+    });
+
+    it('selects an HLS subtitle only when display is enabled', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [
+            { id: 17, name: 'English CC' },
+            { id: 4, lang: 'fr' },
+            { id: 88 },
+        ];
+        hls.subtitleTrack = 0;
+        hls.subtitleDisplay = false;
+        const { adapter, bridge } = bindHls(hls);
+
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 0, label: 'English CC', selected: false },
+            { id: 1, label: 'fr', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+        ]);
+
+        hls.subtitleDisplay = true;
+        hls.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+        expect(adapter.state().subtitleTracks[0].selected).toBe(true);
+        bridge.destroy();
+    });
+
+    it('accepts only valid current HLS audio indices', () => {
+        const hls = new FakeHls();
+        hls.audioTracks = [{ name: 'One' }, { name: 'Two' }, { name: 'Three' }];
+        hls.audioTrack = 0;
+        const { adapter, bridge } = bindHls(hls);
+        hls.assignments.length = 0;
+
+        adapter.commands.setAudioTrack(2);
+        expect(hls.audioTrack).toBe(2);
+        expect(hls.assignments).toEqual(['audioTrack:2']);
+
+        hls.audioTrack = 0;
+        hls.assignments.length = 0;
+        adapter.commands.setAudioTrack(-1);
+        adapter.commands.setAudioTrack(1.5);
+        adapter.commands.setAudioTrack(8);
+        adapter.commands.setAudioTrack(NaN);
+        hls.audioTracks = [{ name: 'One' }];
+        adapter.commands.setAudioTrack(2);
+
+        expect(hls.audioTrack).toBe(0);
+        expect(hls.assignments).toEqual([]);
+        bridge.destroy();
+    });
+
+    it('enables valid HLS subtitles before selection and supports explicit off', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'One' }, { name: 'Two' }];
+        const { adapter, bridge } = bindHls(hls);
+        hls.assignments.length = 0;
+
+        adapter.commands.setSubtitleTrack(1);
+        expect(hls.assignments).toEqual([
+            'subtitleDisplay:true',
+            'subtitleTrack:1',
+        ]);
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.subtitleTrack).toBe(1);
+
+        hls.assignments.length = 0;
+        adapter.commands.setSubtitleTrack(-1);
+        expect(hls.assignments).toEqual([
+            'subtitleTrack:-1',
+            'subtitleDisplay:false',
+        ]);
+        expect(hls.subtitleTrack).toBe(-1);
+        expect(hls.subtitleDisplay).toBe(false);
+        bridge.destroy();
+    });
+
+    it('ignores invalid and stale HLS subtitle indices', () => {
+        const hls = new FakeHls();
+        hls.subtitleTracks = [{ name: 'One' }, { name: 'Two' }];
+        hls.subtitleTrack = 0;
+        hls.subtitleDisplay = true;
+        const { adapter, bridge } = bindHls(hls);
+        hls.assignments.length = 0;
+
+        adapter.commands.setSubtitleTrack(-2);
+        adapter.commands.setSubtitleTrack(0.5);
+        adapter.commands.setSubtitleTrack(4);
+        adapter.commands.setSubtitleTrack(NaN);
+        hls.subtitleTracks = [{ name: 'One' }];
+        adapter.commands.setSubtitleTrack(1);
+
+        expect(hls.subtitleTrack).toBe(0);
+        expect(hls.subtitleDisplay).toBe(true);
+        expect(hls.assignments).toEqual([]);
+        bridge.destroy();
+    });
+});
+
+describe('HtmlVideoPlayerControlsBridge HLS listener lifecycle', () => {
+    const refreshEvents = [
+        Hls.Events.AUDIO_TRACKS_UPDATED,
+        Hls.Events.AUDIO_TRACK_SWITCHING,
+        Hls.Events.AUDIO_TRACK_SWITCHED,
+        Hls.Events.SUBTITLE_TRACKS_UPDATED,
+        Hls.Events.SUBTITLE_TRACKS_CLEARED,
+        Hls.Events.SUBTITLE_TRACK_SWITCH,
+        Hls.Events.MANIFEST_LOADING,
+    ];
+
+    it('refreshes from every relevant HLS event with one callback reference', () => {
+        const hls = new FakeHls();
+        const adapter = new WebVideoControlsAdapter();
+        const refreshSpy = jest.spyOn(adapter, 'refresh');
+        const bridge = new HtmlVideoPlayerControlsBridge({
+            video: createVideo(),
+            adapter,
+            isLive: () => false,
+            showCaptions: () => true,
+        });
+        bridge.attach();
+        bridge.setSource({ kind: 'hls', hls: hls.asHls() });
+
+        const registrations = hls.on.mock.calls;
+        expect(registrations.map(([event]) => event)).toEqual(refreshEvents);
+        expect(
+            new Set(registrations.map(([, listener]) => listener)).size
+        ).toBe(1);
+
+        refreshSpy.mockClear();
+        for (const event of refreshEvents) {
+            hls.emit(event);
+        }
+        expect(refreshSpy).toHaveBeenCalledTimes(refreshEvents.length);
+        bridge.destroy();
+    });
+
+    it('removes exact old HLS listeners before rebinding a source', () => {
+        const firstHls = new FakeHls();
+        const secondHls = new FakeHls();
+        const { bridge } = bindHls(firstHls);
+        const firstRegistrations = [...firstHls.on.mock.calls];
+
+        bridge.setSource({ kind: 'hls', hls: secondHls.asHls() });
+
+        expect(firstHls.off).toHaveBeenCalledTimes(refreshEvents.length);
+        for (const [event, listener] of firstRegistrations) {
+            expect(firstHls.off).toHaveBeenCalledWith(event, listener);
+        }
+        expect(firstHls.off.mock.calls.every((call) => call.length === 2)).toBe(
+            true
+        );
+        expect(secondHls.on.mock.calls.map(([event]) => event)).toEqual(
+            refreshEvents
+        );
+        bridge.destroy();
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native-captions.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native-captions.spec.ts
new file mode 100644
index 000000000..1a0abf261
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native-captions.spec.ts
@@ -0,0 +1,144 @@
+import {
+    bindNativeTracks,
+    createTextTrack,
+} from './html-video-player-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerControlsBridge native caption preference', () => {
+    it('suppresses initial and late default captions while disabled', () => {
+        const initial = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const { adapter, bridge, textTracks } = bindNativeTracks(
+            [initial],
+            false
+        );
+        const late = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+
+        expect(initial.mode).toBe('hidden');
+        textTracks.add(late);
+
+        expect(late.mode).toBe('hidden');
+        expect(
+            adapter.state().subtitleTracks.some((track) => track.selected)
+        ).toBe(false);
+        bridge.destroy();
+    });
+
+    it('restores suppressed engine/default modes when preference returns', () => {
+        const initial = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const untouched = createTextTrack({
+            kind: 'subtitles',
+            mode: 'disabled',
+        });
+        const { bridge, captionPreference, textTracks } = bindNativeTracks(
+            [initial, untouched],
+            false
+        );
+        const late = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        textTracks.add(late);
+
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(initial.mode).toBe('showing');
+        expect(late.mode).toBe('showing');
+        expect(untouched.mode).toBe('disabled');
+        bridge.destroy();
+    });
+
+    it('keeps an explicit selection through events and preference changes', () => {
+        const selected = createTextTrack({
+            kind: 'captions',
+            mode: 'hidden',
+        });
+        const other = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        const { adapter, bridge, captionPreference, textTracks } =
+            bindNativeTracks([selected, other]);
+
+        adapter.commands.setSubtitleTrack(0);
+        captionPreference.value = false;
+        bridge.refreshInputs();
+        selected.mode = 'hidden';
+        other.mode = 'showing';
+        textTracks.emit('change');
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(selected.mode).toBe('showing');
+        expect(other.mode).toBe('hidden');
+        bridge.destroy();
+    });
+
+    it('keeps explicit off through events and preference changes', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'hidden',
+        });
+        const { adapter, bridge, captionPreference, textTracks } =
+            bindNativeTracks([first, second]);
+
+        adapter.commands.setSubtitleTrack(-1);
+        first.mode = 'showing';
+        second.mode = 'showing';
+        textTracks.emit('change');
+        captionPreference.value = false;
+        bridge.refreshInputs();
+        captionPreference.value = true;
+        bridge.refreshInputs();
+
+        expect(first.mode).toBe('hidden');
+        expect(second.mode).toBe('hidden');
+        bridge.destroy();
+    });
+
+    it('resets native IDs and the explicit override on source replacement', () => {
+        const first = createTextTrack({ kind: 'captions' });
+        const second = createTextTrack({ kind: 'subtitles' });
+        const { adapter, bridge, textTracks } = bindNativeTracks([
+            first,
+            second,
+        ]);
+        adapter.commands.setSubtitleTrack(1);
+        const replacement = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        textTracks.replaceSilently([replacement]);
+
+        bridge.setSource({ kind: 'native' });
+
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 0, label: 'Subtitle 1', selected: true },
+        ]);
+        expect(replacement.mode).toBe('showing');
+        bridge.destroy();
+    });
+
+    it('cleans native listeners and detaches once on double destroy', () => {
+        const { adapter, bridge, textTracks } = bindNativeTracks([]);
+        const detachSpy = jest.spyOn(adapter, 'detach');
+
+        bridge.destroy();
+        bridge.destroy();
+
+        expect(textTracks.removeEventListener).toHaveBeenCalledTimes(3);
+        expect(detachSpy).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native.spec.ts
new file mode 100644
index 000000000..123d87490
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.native.spec.ts
@@ -0,0 +1,162 @@
+import {
+    bindNativeTracks,
+    createTextTrack,
+} from './html-video-player-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerControlsBridge native text tracks', () => {
+    it('projects only captions/subtitles with stable IDs and fallback labels', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            label: 'English CC',
+            mode: 'showing',
+        });
+        const ignored = createTextTrack({
+            kind: 'metadata',
+            label: 'Cue metadata',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            language: 'de',
+        });
+        const third = createTextTrack({ kind: 'captions' });
+        const { adapter, bridge, textTracks } = bindNativeTracks([
+            first,
+            ignored,
+            second,
+            third,
+        ]);
+
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 0, label: 'English CC', selected: true },
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+        ]);
+
+        textTracks.remove(first);
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+        ]);
+        bridge.destroy();
+    });
+
+    it('uses native text tracks for MPEG-TS sources too', () => {
+        const subtitle = createTextTrack({
+            kind: 'subtitles',
+            label: 'English',
+            mode: 'showing',
+        });
+        const { adapter, bridge } = bindNativeTracks(
+            [subtitle],
+            true,
+            'mpegts'
+        );
+
+        expect(adapter.state().subtitleTracks).toEqual([
+            { id: 0, label: 'English', selected: true },
+        ]);
+        bridge.destroy();
+    });
+
+    it('selects a valid native track and hides other eligible tracks', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'hidden',
+        });
+        const ignored = createTextTrack({
+            kind: 'metadata',
+            mode: 'showing',
+        });
+        const { adapter, bridge } = bindNativeTracks([first, second, ignored]);
+
+        adapter.commands.setSubtitleTrack(1);
+
+        expect(first.mode).toBe('hidden');
+        expect(second.mode).toBe('showing');
+        expect(ignored.mode).toBe('showing');
+        bridge.destroy();
+    });
+
+    it('supports explicit native subtitle off', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        const { adapter, bridge } = bindNativeTracks([first, second]);
+
+        adapter.commands.setSubtitleTrack(-1);
+
+        expect(first.mode).toBe('hidden');
+        expect(second.mode).toBe('hidden');
+        bridge.destroy();
+    });
+
+    it('ignores invalid, non-integer, and stale native track IDs', () => {
+        const removed = createTextTrack({
+            kind: 'captions',
+            mode: 'hidden',
+        });
+        const remaining = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        const { adapter, bridge, textTracks } = bindNativeTracks([
+            removed,
+            remaining,
+        ]);
+        textTracks.remove(removed);
+
+        adapter.commands.setSubtitleTrack(0);
+        adapter.commands.setSubtitleTrack(0.5);
+        adapter.commands.setSubtitleTrack(-2);
+        adapter.commands.setSubtitleTrack(8);
+        adapter.commands.setSubtitleTrack(NaN);
+
+        expect(remaining.mode).toBe('showing');
+        bridge.destroy();
+    });
+
+    it('refreshes on addtrack, removetrack, and change', () => {
+        const { adapter, bridge, textTracks } = bindNativeTracks([]);
+        const refreshSpy = jest.spyOn(adapter, 'refresh');
+
+        textTracks.emit('addtrack');
+        textTracks.emit('removetrack');
+        textTracks.emit('change');
+
+        expect(refreshSpy).toHaveBeenCalledTimes(3);
+        bridge.destroy();
+    });
+
+    it('removes exact native listener references on rebind and destroy', () => {
+        const { bridge, textTracks } = bindNativeTracks([]);
+        const firstRegistrations = [...textTracks.addEventListener.mock.calls];
+
+        bridge.setSource({ kind: 'mpegts' });
+
+        expect(textTracks.removeEventListener).toHaveBeenCalledTimes(3);
+        for (const [event, listener] of firstRegistrations) {
+            expect(textTracks.removeEventListener).toHaveBeenCalledWith(
+                event,
+                listener
+            );
+        }
+        expect(
+            textTracks.removeEventListener.mock.calls.every(
+                (call) => call.length === 2
+            )
+        ).toBe(true);
+
+        bridge.destroy();
+        expect(textTracks.removeEventListener).toHaveBeenCalledTimes(6);
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.spec-fixtures.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.spec-fixtures.ts
new file mode 100644
index 000000000..0de7e84a9
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-controls.spec-fixtures.ts
@@ -0,0 +1,312 @@
+import { jest } from '@jest/globals';
+import Hls from 'hls.js';
+import { WebVideoControlsAdapter } from '../player-controls/web-video-controls.adapter';
+import { HtmlVideoPlayerControlsBridge } from './html-video-player-controls.bridge';
+
+export interface VideoFixtureOptions {
+    duration?: number;
+    seekableEnds?: number[];
+    bufferedEnds?: number[];
+    seekableThrows?: boolean;
+    bufferedThrows?: boolean;
+}
+
+interface FakeHlsTrack {
+    id?: number;
+    name?: string;
+    lang?: string;
+}
+
+type FakeHlsListener = (...args: unknown[]) => void;
+
+export class FakeHls {
+    audioTracks: FakeHlsTrack[] = [];
+    subtitleTracks: FakeHlsTrack[] = [];
+    readonly assignments: string[] = [];
+    subtitleTrackSwitchEvents = 0;
+    private readonly listeners = new Map<string, Set<FakeHlsListener>>();
+    private emitSubtitleTrackSwitchOnAssignment = false;
+    private selectedAudioTrack = -1;
+    private selectedSubtitleTrack = -1;
+    private displaySubtitles = false;
+
+    readonly on = jest.fn((event: string, listener: FakeHlsListener): void => {
+        const eventListeners =
+            this.listeners.get(event) ?? new Set<FakeHlsListener>();
+        eventListeners.add(listener);
+        this.listeners.set(event, eventListeners);
+    });
+
+    readonly off = jest.fn((event: string, listener: FakeHlsListener): void => {
+        this.listeners.get(event)?.delete(listener);
+    });
+
+    get audioTrack(): number {
+        return this.selectedAudioTrack;
+    }
+
+    set audioTrack(value: number) {
+        this.assignments.push(`audioTrack:${value}`);
+        this.selectedAudioTrack = value;
+    }
+
+    get subtitleTrack(): number {
+        return this.selectedSubtitleTrack;
+    }
+
+    set subtitleTrack(value: number) {
+        this.assignments.push(`subtitleTrack:${value}`);
+        this.selectedSubtitleTrack = value;
+        if (this.emitSubtitleTrackSwitchOnAssignment) {
+            this.subtitleTrackSwitchEvents += 1;
+            if (this.subtitleTrackSwitchEvents > 10) {
+                throw new Error('recursive HLS subtitle track assignment');
+            }
+            this.emit(Hls.Events.SUBTITLE_TRACK_SWITCH);
+        }
+    }
+
+    get subtitleDisplay(): boolean {
+        return this.displaySubtitles;
+    }
+
+    set subtitleDisplay(value: boolean) {
+        this.assignments.push(`subtitleDisplay:${value}`);
+        this.displaySubtitles = value;
+    }
+
+    emit(event: string): void {
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(event, {});
+        }
+    }
+
+    enableSynchronousSubtitleTrackSwitch(): void {
+        this.subtitleTrackSwitchEvents = 0;
+        this.emitSubtitleTrackSwitchOnAssignment = true;
+    }
+
+    asHls(): Hls {
+        return this as unknown as Hls;
+    }
+}
+
+export interface FakeTextTrackOptions {
+    kind?: string;
+    label?: string;
+    language?: string;
+    mode?: TextTrackMode;
+}
+
+export function createTextTrack(options: FakeTextTrackOptions = {}): TextTrack {
+    return {
+        kind: options.kind ?? 'subtitles',
+        label: options.label ?? '',
+        language: options.language ?? '',
+        mode: options.mode ?? 'hidden',
+    } as unknown as TextTrack;
+}
+
+export class FakeTextTrackList {
+    private readonly listeners = new Map<
+        string,
+        Set<EventListenerOrEventListenerObject>
+    >();
+    private tracks: TextTrack[];
+    private indexedLength = 0;
+
+    readonly addEventListener = jest.fn(
+        (event: string, listener: EventListenerOrEventListenerObject): void => {
+            const eventListeners =
+                this.listeners.get(event) ??
+                new Set<EventListenerOrEventListenerObject>();
+            eventListeners.add(listener);
+            this.listeners.set(event, eventListeners);
+        }
+    );
+
+    readonly removeEventListener = jest.fn(
+        (event: string, listener: EventListenerOrEventListenerObject): void => {
+            this.listeners.get(event)?.delete(listener);
+        }
+    );
+
+    constructor(tracks: TextTrack[] = []) {
+        this.tracks = [...tracks];
+        this.syncIndexedTracks();
+    }
+
+    get length(): number {
+        return this.tracks.length;
+    }
+
+    getTrackById(): TextTrack | null {
+        return null;
+    }
+
+    add(track: TextTrack): void {
+        this.tracks.push(track);
+        this.syncIndexedTracks();
+        this.emit('addtrack');
+    }
+
+    remove(track: TextTrack): void {
+        const index = this.tracks.indexOf(track);
+        if (index < 0) {
+            return;
+        }
+        this.tracks.splice(index, 1);
+        this.syncIndexedTracks();
+        this.emit('removetrack');
+    }
+
+    replaceSilently(tracks: TextTrack[]): void {
+        this.tracks = [...tracks];
+        this.syncIndexedTracks();
+    }
+
+    emit(eventName: 'addtrack' | 'removetrack' | 'change'): void {
+        const event = new Event(eventName);
+        for (const listener of this.listeners.get(eventName) ?? []) {
+            if (typeof listener === 'function') {
+                listener.call(this, event);
+            } else {
+                listener.handleEvent(event);
+            }
+        }
+    }
+
+    asTextTrackList(): TextTrackList {
+        return this as unknown as TextTrackList;
+    }
+
+    private syncIndexedTracks(): void {
+        for (let index = 0; index < this.indexedLength; index += 1) {
+            Reflect.deleteProperty(this, index);
+        }
+        this.tracks.forEach((track, index) => {
+            Object.defineProperty(this, index, {
+                configurable: true,
+                enumerable: true,
+                value: track,
+            });
+        });
+        this.indexedLength = this.tracks.length;
+    }
+}
+
+function createTimeRanges(ends: number[], throwsWhenRead: boolean): TimeRanges {
+    return {
+        length: ends.length,
+        start: (index: number) => {
+            if (throwsWhenRead) {
+                throw new Error('range start unavailable');
+            }
+            return index === 0 ? 0 : (ends[index - 1] ?? 0);
+        },
+        end: (index: number) => {
+            if (throwsWhenRead) {
+                throw new Error('range end unavailable');
+            }
+            return ends[index] ?? NaN;
+        },
+    };
+}
+
+export function createVideo(
+    options: VideoFixtureOptions = {}
+): HTMLVideoElement {
+    const video = document.createElement('video');
+    Object.defineProperties(video, {
+        duration: {
+            configurable: true,
+            value: options.duration ?? NaN,
+        },
+        seekable: {
+            configurable: true,
+            value: createTimeRanges(
+                options.seekableEnds ?? [],
+                options.seekableThrows ?? false
+            ),
+        },
+        buffered: {
+            configurable: true,
+            value: createTimeRanges(
+                options.bufferedEnds ?? [],
+                options.bufferedThrows ?? false
+            ),
+        },
+        readyState: {
+            configurable: true,
+            value: 4,
+        },
+        networkState: {
+            configurable: true,
+            value: 1,
+        },
+        paused: {
+            configurable: true,
+            value: false,
+        },
+    });
+    return video;
+}
+
+export function readMpegtsState(options: VideoFixtureOptions, isLive = false) {
+    const adapter = new WebVideoControlsAdapter();
+    const bridge = new HtmlVideoPlayerControlsBridge({
+        video: createVideo(options),
+        adapter,
+        isLive: () => isLive,
+        showCaptions: () => true,
+    });
+
+    bridge.attach();
+    bridge.setSource({ kind: 'mpegts' });
+    const state = adapter.state();
+    bridge.destroy();
+    return state;
+}
+
+export function bindHls(fakeHls: FakeHls, showCaptions = true) {
+    const adapter = new WebVideoControlsAdapter();
+    const captionPreference = { value: showCaptions };
+    const bridge = new HtmlVideoPlayerControlsBridge({
+        video: createVideo({ duration: 90, seekableEnds: [80] }),
+        adapter,
+        isLive: () => false,
+        showCaptions: () => captionPreference.value,
+    });
+    bridge.attach();
+    bridge.setSource({ kind: 'hls', hls: fakeHls.asHls() });
+    return { adapter, bridge, captionPreference };
+}
+
+export function bindNativeTracks(
+    tracks: TextTrack[],
+    showCaptions = true,
+    kind: 'native' | 'mpegts' = 'native'
+) {
+    const textTracks = new FakeTextTrackList(tracks);
+    const video = createVideo({ duration: 90, seekableEnds: [80] });
+    Object.defineProperty(video, 'textTracks', {
+        configurable: true,
+        value: textTracks.asTextTrackList(),
+    });
+    const captionPreference = { value: showCaptions };
+    const adapter = new WebVideoControlsAdapter();
+    const bridge = new HtmlVideoPlayerControlsBridge({
+        video,
+        adapter,
+        isLive: () => false,
+        showCaptions: () => captionPreference.value,
+    });
+    bridge.attach();
+    bridge.setSource({ kind });
+    return {
+        adapter,
+        bridge,
+        captionPreference,
+        textTracks,
+    };
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-diagnostics.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-diagnostics.ts
new file mode 100644
index 000000000..4c5284892
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-diagnostics.ts
@@ -0,0 +1,87 @@
+import type { ErrorData, ManifestParsedData } from 'hls.js';
+import {
+    InlinePlaybackPlayer,
+    type PlaybackDiagnostic,
+    type PlaybackSourceMetadata,
+    classifyHlsPlaybackIssue,
+    classifyMpegTsPlaybackIssue,
+    classifyUnsupportedHlsManifestCodecs,
+    createPlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+/**
+ * HTML5-player diagnostics glue extracted from the component: builds source
+ * metadata and turns engine error payloads into emitted playback issues.
+ */
+
+export function createHtml5SourceMetadata(
+    url: string,
+    mimeType?: string,
+    audioCodecs: readonly string[] = [],
+    videoCodecs: readonly string[] = []
+): PlaybackSourceMetadata {
+    return createPlaybackSourceMetadata({
+        url,
+        mimeType,
+        player: InlinePlaybackPlayer.Html5,
+        audioCodecs,
+        videoCodecs,
+    });
+}
+
+export function emitUnsupportedHlsManifestCodecs(
+    url: string,
+    data: ManifestParsedData,
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void
+): void {
+    const metadata = createHtml5SourceMetadata(
+        url,
+        'application/x-mpegURL',
+        data.levels
+            .map((level) => level.audioCodec)
+            .filter((codec): codec is string => Boolean(codec)),
+        data.levels
+            .map((level) => level.videoCodec)
+            .filter((codec): codec is string => Boolean(codec))
+    );
+    const issue = classifyUnsupportedHlsManifestCodecs(metadata);
+    if (issue) {
+        emitPlaybackIssue(issue);
+    }
+}
+
+export function emitFatalHlsPlaybackError(
+    url: string,
+    data: ErrorData,
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void
+): void {
+    if (!data.fatal) {
+        return;
+    }
+
+    emitPlaybackIssue(
+        classifyHlsPlaybackIssue(
+            {
+                type: data.type,
+                details: data.details,
+                fatal: data.fatal,
+                message: data.error?.message,
+                error: data.error,
+            },
+            createHtml5SourceMetadata(url, 'application/x-mpegURL')
+        )
+    );
+}
+
+export function emitMpegTsPlaybackError(
+    url: string,
+    error: { type: string; details: string; info: unknown },
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void
+): void {
+    emitPlaybackIssue(
+        classifyMpegTsPlaybackIssue(
+            error,
+            createHtml5SourceMetadata(url, 'video/mp2t')
+        )
+    );
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-hls-controls.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-hls-controls.ts
new file mode 100644
index 000000000..7df5a2ae7
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-hls-controls.ts
@@ -0,0 +1,2 @@
+export { WebVideoHlsControls as HtmlVideoPlayerHlsControls } from '../web-video-support/web-video-hls-controls';
+export type { WebVideoHlsControlsConfig as HtmlVideoPlayerHlsControlsConfig } from '../web-video-support/web-video-hls-controls';
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player-native-text-tracks.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player-native-text-tracks.ts
new file mode 100644
index 000000000..6e40f45dd
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player-native-text-tracks.ts
@@ -0,0 +1,2 @@
+export { WebVideoNativeTextTracks as HtmlVideoPlayerNativeTextTracks } from '../web-video-support/web-video-native-text-tracks';
+export type { WebVideoNativeTextTracksConfig as HtmlVideoPlayerNativeTextTracksConfig } from '../web-video-support/web-video-native-text-tracks';
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.captions.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.captions.spec.ts
new file mode 100644
index 000000000..b8396f8be
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.captions.spec.ts
@@ -0,0 +1,150 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { DataService } from '@iptvnator/services';
+import { Channel } from '@iptvnator/shared/interfaces';
+import {
+    createTextTrack,
+    FakeTextTrackList,
+} from './html-video-player-controls.spec-fixtures';
+import { HtmlVideoPlayerComponent } from './html-video-player.component';
+
+/** `.mp4` skips the hls.js/mpegts.js branches and binds the native source. */
+const NATIVE_SOURCE_URL = 'http://test.example/stream.mp4';
+const OTHER_SOURCE_URL = 'http://test.example/next.mp4';
+
+const TEST_CHANNEL: Channel = {
+    id: '1234',
+    url: NATIVE_SOURCE_URL,
+    name: 'Test channel',
+    group: { title: 'News group' },
+    http: { origin: '', referrer: '', 'user-agent': 'localhost' },
+    radio: 'false',
+    tvg: { id: '', logo: '', name: '', rec: '', url: '' },
+};
+
+/**
+ * Regression coverage for #1155: without shared controls (the shipping
+ * default) the `showCaptions` preference had no owner at all, so a track the
+ * source engine enabled by default kept subtitles on screen.
+ */
+describe('HtmlVideoPlayerComponent caption preference without shared controls', () => {
+    let component: HtmlVideoPlayerComponent;
+    let fixture: ComponentFixture<HtmlVideoPlayerComponent>;
+
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [HtmlVideoPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: DataService,
+                    useValue: {
+                        sendIpcEvent: jest.fn().mockResolvedValue(undefined),
+                    },
+                },
+            ],
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: { setUserAgent: jest.fn().mockResolvedValue(true) },
+        });
+        fixture = TestBed.createComponent(HtmlVideoPlayerComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        delete (window as unknown as { electron?: unknown }).electron;
+        jest.restoreAllMocks();
+    });
+
+    it('suppresses initial and late default captions when the preference is off', () => {
+        const initial = createTextTrack({ kind: 'captions', mode: 'showing' });
+        const textTracks = stubTextTracks([initial]);
+        setPreference(false);
+
+        component.playChannel(TEST_CHANNEL);
+
+        expect(initial.mode).toBe('hidden');
+
+        const late = createTextTrack({ kind: 'subtitles', mode: 'showing' });
+        textTracks.add(late);
+
+        expect(late.mode).toBe('hidden');
+    });
+
+    it('leaves captions alone when the preference is on', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        stubTextTracks([track]);
+        setPreference(true);
+
+        component.playChannel(TEST_CHANNEL);
+
+        expect(track.mode).toBe('showing');
+    });
+
+    // The native controls stay visible in this mode, so the preference must
+    // seed the source and then get out of the user's way.
+    it('keeps a caption the user enables after playback started', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        const textTracks = stubTextTracks([track]);
+        setPreference(false);
+        component.playChannel(TEST_CHANNEL);
+        expect(track.mode).toBe('hidden');
+
+        component.videoPlayer.nativeElement.dispatchEvent(
+            new Event('playing')
+        );
+        track.mode = 'showing';
+        textTracks.emit('change');
+
+        expect(track.mode).toBe('showing');
+    });
+
+    it('re-seeds the preference for the next channel', () => {
+        const first = createTextTrack({ kind: 'captions', mode: 'showing' });
+        const textTracks = stubTextTracks([first]);
+        setPreference(false);
+        component.playChannel(TEST_CHANNEL);
+        component.videoPlayer.nativeElement.dispatchEvent(
+            new Event('playing')
+        );
+
+        const next = createTextTrack({ kind: 'captions', mode: 'showing' });
+        textTracks.replaceSilently([next]);
+        component.playChannel({ ...TEST_CHANNEL, url: OTHER_SOURCE_URL });
+
+        expect(next.mode).toBe('hidden');
+    });
+
+    it('restores suppressed captions when the preference is turned on', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        stubTextTracks([track]);
+        setPreference(false);
+        component.playChannel(TEST_CHANNEL);
+        expect(track.mode).toBe('hidden');
+
+        setPreference(true);
+
+        expect(track.mode).toBe('showing');
+    });
+
+    function setPreference(showCaptions: boolean): void {
+        fixture.componentRef.setInput('showCaptions', showCaptions);
+        fixture.detectChanges();
+    }
+
+    function stubTextTracks(tracks: TextTrack[]): FakeTextTrackList {
+        const video = component.videoPlayer.nativeElement;
+        const textTracks = new FakeTextTrackList(tracks);
+        Object.defineProperty(video, 'textTracks', {
+            configurable: true,
+            value: textTracks.asTextTrackList(),
+        });
+        jest.spyOn(video, 'play').mockResolvedValue(undefined);
+        jest.spyOn(video, 'load').mockImplementation(() => undefined);
+        return textTracks;
+    }
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.dash.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.dash.spec.ts
new file mode 100644
index 000000000..02223c14e
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.dash.spec.ts
@@ -0,0 +1,81 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { DataService } from '@iptvnator/services';
+import { Channel } from '@iptvnator/shared/interfaces';
+import { HtmlVideoPlayerComponent } from './html-video-player.component';
+
+/** DASH-specific behavior of the HTML5 player (legacy controls mode). */
+describe('HtmlVideoPlayerComponent DASH', () => {
+    let component: HtmlVideoPlayerComponent;
+    let fixture: ComponentFixture<HtmlVideoPlayerComponent>;
+    const electronApi = {
+        setUserAgent: jest.fn().mockResolvedValue(true),
+    };
+
+    const TEST_CHANNEL: Channel = {
+        id: 'dash-1',
+        url: 'https://stream.example/enc.mpd',
+        name: 'DASH channel',
+        group: { title: 'DASH' },
+        http: { origin: '', referrer: '', 'user-agent': '' },
+        radio: 'false',
+        tvg: { id: '', logo: '', name: '', rec: '', url: '' },
+    };
+
+    beforeEach(waitForAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [HtmlVideoPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: DataService,
+                    useValue: {
+                        sendIpcEvent: jest.fn().mockResolvedValue(undefined),
+                    },
+                },
+            ],
+        }).compileComponents();
+    }));
+
+    beforeEach(() => {
+        Object.defineProperty(window, 'electron', {
+            configurable: true,
+            value: electronApi,
+        });
+        fixture = TestBed.createComponent(HtmlVideoPlayerComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        delete (window as unknown as { electron?: unknown }).electron;
+        jest.restoreAllMocks();
+    });
+
+    it('does not resume the previous source when a channel declares unsupported DRM', () => {
+        const video = component.videoPlayer.nativeElement;
+        const loadSpy = jest
+            .spyOn(video, 'load')
+            .mockImplementation(() => undefined);
+        const playSpy = jest.spyOn(video, 'play').mockResolvedValue(undefined);
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            url: 'https://stream.example/movie.mp4',
+        });
+        playSpy.mockClear();
+        loadSpy.mockClear();
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            drm: {
+                licenseType: 'com.widevine.alpha',
+                supported: false,
+            },
+        });
+
+        // No source is loaded for unsupported DRM: play() must not run, and
+        // the element is reset so the old stream cannot keep playing.
+        expect(playSpy).not.toHaveBeenCalled();
+        expect(loadSpy).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.html b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.html
index ca9596274..6ac0f8913 100644
--- a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.html
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.html
@@ -1,14 +1,26 @@
-<div class="html-video-player-shell">
+<div #playerRoot class="html-video-player-shell">
     <video
         #videoPlayer
         id="video-player"
-        autoplay="true"
-        controls="true"
+        autoplay
+        [controls]="!sharedControls"
     ></video>
 
-    <app-series-playback-navigation-controls
-        [navigation]="seriesNavigation"
-        (previousEpisodeRequested)="previousEpisodeRequested.emit()"
-        (nextEpisodeRequested)="nextEpisodeRequested.emit()"
-    />
+    @if (sharedControls) {
+        <app-player-controls
+            [controller]="controlsAdapter"
+            [playerSurface]="playerRoot"
+            [mediaTitle]="mediaTitle()"
+            [showControls]="interactionEnabled()"
+            [shortcutsEnabled]="interactionEnabled()"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    } @else {
+        <app-series-playback-navigation-controls
+            [navigation]="seriesNavigation"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    }
 </div>
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.sources.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.sources.spec.ts
new file mode 100644
index 000000000..1c82ec2b4
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.sources.spec.ts
@@ -0,0 +1,278 @@
+import { By } from '@angular/platform-browser';
+import {
+    MockHls,
+    TEST_CHANNEL,
+    cleanupSharedControlsTests,
+    configureSharedControlsTests,
+    hlsInstances,
+    lifecycle,
+    mpegTsCreatePlayer,
+    mpegTsInstances,
+    mpegTsIsSupported,
+    observeBridgeSourceBinding,
+    readHtmlPlayerInternals,
+    renderSharedControls,
+    type SharedControlsFixture,
+} from './html-video-player.component.shared-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerComponent shared controls sources', () => {
+    let HtmlVideoPlayerComponent: typeof import('./html-video-player.component').HtmlVideoPlayerComponent;
+    const fixtures: SharedControlsFixture[] = [];
+
+    beforeAll(async () => {
+        ({ HtmlVideoPlayerComponent } =
+            await import('./html-video-player.component'));
+    });
+
+    beforeEach(async () => {
+        await configureSharedControlsTests(HtmlVideoPlayerComponent);
+    });
+
+    afterEach(() => {
+        cleanupSharedControlsTests(fixtures);
+    });
+
+    it('retains an HLS source created before bridge initialization', () => {
+        const { adapter } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            {
+                channel: TEST_CHANNEL,
+                isLive: false,
+                showCaptions: true,
+            }
+        );
+
+        expect(hlsInstances).toHaveLength(1);
+        expect(adapter.capabilities().audioTracks).toBe(true);
+        expect(adapter.state().audioTracks).toEqual([
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'Deutsch', selected: false },
+        ]);
+    });
+
+    it('binds HLS controls after media attach and before source loading', () => {
+        const { component } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+        lifecycle.length = 0;
+
+        component.playChannel(TEST_CHANNEL);
+
+        const attachIndex = lifecycle.indexOf('hls:attachMedia');
+        const bindIndex = lifecycle.indexOf(
+            `on:${MockHls.Events.AUDIO_TRACKS_UPDATED}`
+        );
+        const loadIndex = lifecycle.indexOf('hls:loadSource');
+        expect(attachIndex).toBeGreaterThanOrEqual(0);
+        expect(bindIndex).toBeGreaterThanOrEqual(0);
+        expect(loadIndex).toBeGreaterThanOrEqual(0);
+        expect(attachIndex).toBeLessThan(bindIndex);
+        expect(bindIndex).toBeLessThan(loadIndex);
+    });
+
+    it.each([false, true])(
+        'passes authoritative isLive=%s to raw MPEG-TS playback',
+        (isLive) => {
+            mpegTsIsSupported.mockReturnValue(true);
+
+            renderSharedControls(HtmlVideoPlayerComponent, fixtures, {
+                channel: {
+                    ...TEST_CHANNEL,
+                    url: 'https://example.test/raw.ts',
+                },
+                isLive,
+            });
+
+            expect(mpegTsCreatePlayer).toHaveBeenCalledWith({
+                type: 'mpegts',
+                isLive,
+                url: 'https://example.test/raw.ts',
+            });
+        }
+    );
+
+    it('owns one MPEG-TS source between media attachment and loading', () => {
+        mpegTsIsSupported.mockReturnValue(true);
+        const { component } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            { isLive: false }
+        );
+        const setSource = observeBridgeSourceBinding(component);
+        lifecycle.length = 0;
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            url: 'https://example.test/raw.ts',
+        });
+
+        const internals = readHtmlPlayerInternals(component);
+        expect(setSource).toHaveBeenCalledTimes(1);
+        expect(setSource).toHaveBeenCalledWith({ kind: 'mpegts' });
+        expect(internals.controlsSource).toEqual({ kind: 'mpegts' });
+        expect(internals.hls).toBeNull();
+        expect(hlsInstances).toHaveLength(0);
+        expect(mpegTsInstances).toHaveLength(1);
+        expect(internals.mpegtsPlayer).toBe(mpegTsInstances[0]);
+        expect(mpegTsInstances[0].attachMediaElement).toHaveBeenCalledTimes(1);
+        expect(mpegTsInstances[0].load).toHaveBeenCalledTimes(1);
+        expect(lifecycle.indexOf('mpegts:attachMedia')).toBeLessThan(
+            lifecycle.indexOf('bridge:mpegts')
+        );
+        expect(lifecycle.indexOf('bridge:mpegts')).toBeLessThan(
+            lifecycle.indexOf('mpegts:load')
+        );
+    });
+
+    it('owns one Shaka source for DASH (.mpd) streams', () => {
+        const { component } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+        const setSource = observeBridgeSourceBinding(component);
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            url: 'https://example.test/live.mpd',
+            drm: {
+                licenseType: 'clearkey',
+                supported: true,
+                clearKeys: { abc: 'def' },
+            },
+        });
+
+        const internals = readHtmlPlayerInternals(component);
+        expect(setSource).toHaveBeenCalledTimes(1);
+        expect(setSource).toHaveBeenCalledWith(
+            expect.objectContaining({ kind: 'shaka' })
+        );
+        expect(internals.controlsSource).toEqual(
+            expect.objectContaining({ kind: 'shaka' })
+        );
+        expect(internals.hls).toBeNull();
+        expect(internals.mpegtsPlayer).toBeNull();
+        expect(hlsInstances).toHaveLength(0);
+        expect(mpegTsInstances).toHaveLength(0);
+    });
+
+    it('owns one native source before loading native media', () => {
+        const { component, fixture } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+        const setSource = observeBridgeSourceBinding(component);
+        const video = fixture.debugElement.query(By.css('video'))
+            .nativeElement as HTMLVideoElement;
+        const load = jest
+            .spyOn(video, 'load')
+            .mockImplementation(() => lifecycle.push('native:load'));
+        lifecycle.length = 0;
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            url: 'https://example.test/movie.mp4',
+        });
+
+        const internals = readHtmlPlayerInternals(component);
+        expect(setSource).toHaveBeenCalledTimes(1);
+        expect(setSource).toHaveBeenCalledWith({ kind: 'native' });
+        expect(internals.controlsSource).toEqual({ kind: 'native' });
+        expect(internals.hls).toBeNull();
+        expect(internals.mpegtsPlayer).toBeNull();
+        expect(hlsInstances).toHaveLength(0);
+        expect(mpegTsInstances).toHaveLength(0);
+        expect(load).toHaveBeenCalledTimes(1);
+        expect(lifecycle.indexOf('bridge:native')).toBeLessThan(
+            lifecycle.indexOf('native:load')
+        );
+    });
+
+    it('refreshes live and caption inputs through authoritative closures', () => {
+        const { fixture, adapter } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            {
+                channel: TEST_CHANNEL,
+                isLive: true,
+                showCaptions: false,
+            }
+        );
+        const hls = hlsInstances[0];
+
+        expect(adapter.state().isLive).toBe(true);
+        expect(hls.subtitleDisplay).toBe(false);
+
+        fixture.componentRef.setInput('isLive', false);
+        fixture.componentRef.setInput('showCaptions', true);
+        fixture.detectChanges();
+
+        expect(adapter.state().isLive).toBe(false);
+        expect(hls.subtitleDisplay).toBe(true);
+    });
+
+    it('clears old HLS listeners and tracks before destroying the engine', () => {
+        const { component, adapter } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            {
+                channel: TEST_CHANNEL,
+                isLive: false,
+                showCaptions: true,
+            }
+        );
+        const hls = hlsInstances[0];
+        const setSource = observeBridgeSourceBinding(component);
+        lifecycle.length = 0;
+
+        component.playChannel({
+            ...TEST_CHANNEL,
+            url: 'https://example.test/movie.mp4',
+        });
+
+        const destroyIndex = lifecycle.indexOf('hls:destroy');
+        expect(destroyIndex).toBeGreaterThan(0);
+        expect(
+            lifecycle
+                .slice(0, destroyIndex)
+                .filter((event) => event.startsWith('off:'))
+        ).toHaveLength(7);
+        const internals = readHtmlPlayerInternals(component);
+        expect(setSource).toHaveBeenCalledTimes(1);
+        expect(setSource).toHaveBeenCalledWith({ kind: 'native' });
+        expect(internals.controlsSource).toEqual({ kind: 'native' });
+        expect(internals.hls).toBeNull();
+        expect(internals.mpegtsPlayer).toBeNull();
+        expect(hlsInstances).toHaveLength(1);
+        expect(mpegTsInstances).toHaveLength(0);
+        expect(hls.off).toHaveBeenCalledTimes(7);
+        expect(adapter.state().audioTracks).toEqual([]);
+        expect(adapter.state().subtitleTracks).toEqual([]);
+    });
+
+    it('destroys the bridge before HLS and detaches the adapter once', () => {
+        const { component, adapter } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            {
+                channel: TEST_CHANNEL,
+                showCaptions: true,
+            }
+        );
+        const originalDetach = adapter.detach.bind(adapter);
+        const detach = jest.spyOn(adapter, 'detach').mockImplementation(() => {
+            lifecycle.push('adapter:detach');
+            originalDetach();
+        });
+        lifecycle.length = 0;
+
+        component.ngOnDestroy();
+        component.ngOnDestroy();
+
+        expect(detach).toHaveBeenCalledTimes(1);
+        expect(lifecycle.indexOf('adapter:detach')).toBeLessThan(
+            lifecycle.indexOf('hls:destroy')
+        );
+    });
+});
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec-fixtures.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec-fixtures.ts
new file mode 100644
index 000000000..ade52f86e
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec-fixtures.ts
@@ -0,0 +1,250 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { DataService } from '@iptvnator/services';
+import type { Channel } from '@iptvnator/shared/interfaces';
+import {
+    PlayerControlsComponent,
+    WEB_PLAYER_SHARED_CONTROLS,
+    WebVideoControlsAdapter,
+} from '../player-controls';
+import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import type { HtmlVideoPlayerComponent as HtmlVideoPlayerComponentInstance } from './html-video-player.component';
+
+type HtmlVideoPlayerComponentType =
+    typeof import('./html-video-player.component').HtmlVideoPlayerComponent;
+type HlsListener = (event: string, data: unknown) => void;
+
+export type SharedControlsFixture =
+    ComponentFixture<HtmlVideoPlayerComponentInstance>;
+
+export interface ControlsSource {
+    kind: 'native' | 'mpegts' | 'hls' | 'shaka';
+}
+
+export interface HtmlPlayerInternals {
+    controlsBridge: {
+        setSource(source: ControlsSource): void;
+    } | null;
+    controlsSource: ControlsSource | null;
+    hls: MockHls | null;
+    mpegtsPlayer: MockMpegTsPlayer | null;
+}
+
+export interface RenderOptions {
+    channel?: Channel;
+    interactionEnabled?: boolean;
+    isLive?: boolean;
+    seriesNavigation?: SeriesPlaybackNavigation | null;
+    showCaptions?: boolean;
+}
+
+export const lifecycle: string[] = [];
+export const hlsInstances: MockHls[] = [];
+export const mpegTsInstances: MockMpegTsPlayer[] = [];
+
+export class MockHls {
+    static readonly Events = {
+        MANIFEST_PARSED: 'manifestParsed',
+        ERROR: 'error',
+        AUDIO_TRACKS_UPDATED: 'audioTracksUpdated',
+        AUDIO_TRACK_SWITCHING: 'audioTrackSwitching',
+        AUDIO_TRACK_SWITCHED: 'audioTrackSwitched',
+        SUBTITLE_TRACKS_UPDATED: 'subtitleTracksUpdated',
+        SUBTITLE_TRACKS_CLEARED: 'subtitleTracksCleared',
+        SUBTITLE_TRACK_SWITCH: 'subtitleTrackSwitch',
+        MANIFEST_LOADING: 'manifestLoading',
+    };
+    static readonly isSupported = jest.fn(() => true);
+
+    readonly audioTracks = [{ name: 'English' }, { name: 'Deutsch' }];
+    readonly subtitleTracks = [{ name: 'English CC' }];
+    audioTrack = 0;
+    subtitleTrack = 0;
+    subtitleDisplay = true;
+    private readonly listeners = new Map<string, Set<HlsListener>>();
+
+    readonly on = jest.fn((event: string, listener: HlsListener) => {
+        lifecycle.push(`on:${event}`);
+        const listeners = this.listeners.get(event) ?? new Set<HlsListener>();
+        listeners.add(listener);
+        this.listeners.set(event, listeners);
+    });
+    readonly off = jest.fn((event: string, listener: HlsListener) => {
+        lifecycle.push(`off:${event}`);
+        this.listeners.get(event)?.delete(listener);
+    });
+    readonly attachMedia = jest.fn(() => lifecycle.push('hls:attachMedia'));
+    readonly loadSource = jest.fn(() => {
+        lifecycle.push('hls:loadSource');
+        this.emit(MockHls.Events.MANIFEST_LOADING);
+    });
+    readonly destroy = jest.fn(() => lifecycle.push('hls:destroy'));
+
+    constructor() {
+        hlsInstances.push(this);
+    }
+
+    emit(event: string, data: unknown = {}): void {
+        for (const listener of this.listeners.get(event) ?? []) {
+            listener(event, data);
+        }
+    }
+}
+
+export class MockMpegTsPlayer {
+    readonly attachMediaElement = jest.fn(() =>
+        lifecycle.push('mpegts:attachMedia')
+    );
+    readonly on = jest.fn();
+    readonly load = jest.fn(() => lifecycle.push('mpegts:load'));
+    readonly pause = jest.fn();
+    readonly unload = jest.fn();
+    readonly detachMediaElement = jest.fn();
+    readonly destroy = jest.fn();
+
+    constructor() {
+        mpegTsInstances.push(this);
+    }
+}
+
+export const mpegTsCreatePlayer = jest.fn(() => new MockMpegTsPlayer());
+export const mpegTsIsSupported = jest.fn(() => false);
+
+jest.unstable_mockModule('hls.js', () => ({ default: MockHls }));
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: mpegTsCreatePlayer,
+        isSupported: mpegTsIsSupported,
+    },
+}));
+
+export const TEST_CHANNEL: Channel = {
+    id: 'channel-1',
+    url: 'https://example.test/live/playlist.m3u8',
+    name: 'Test channel',
+    group: { title: 'Test' },
+    http: { origin: '', referrer: '', 'user-agent': '' },
+    radio: 'false',
+    tvg: { id: '', logo: '', name: '', rec: '', url: '' },
+};
+
+export async function configureSharedControlsTests(
+    HtmlVideoPlayerComponent: HtmlVideoPlayerComponentType
+): Promise<void> {
+    lifecycle.length = 0;
+    hlsInstances.length = 0;
+    mpegTsInstances.length = 0;
+    MockHls.isSupported.mockReset().mockReturnValue(true);
+    mpegTsIsSupported.mockReset().mockReturnValue(false);
+    mpegTsCreatePlayer
+        .mockReset()
+        .mockImplementation(() => new MockMpegTsPlayer());
+    Object.defineProperty(window, 'electron', {
+        configurable: true,
+        value: { setUserAgent: jest.fn().mockResolvedValue(true) },
+    });
+    jest.spyOn(HTMLMediaElement.prototype, 'play').mockResolvedValue(undefined);
+    jest.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(
+        () => undefined
+    );
+
+    await TestBed.configureTestingModule({
+        imports: [HtmlVideoPlayerComponent, TranslateModule.forRoot()],
+        providers: [
+            {
+                provide: DataService,
+                useValue: {
+                    sendIpcEvent: jest.fn().mockResolvedValue(undefined),
+                },
+            },
+            { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true },
+        ],
+    }).compileComponents();
+}
+
+export function cleanupSharedControlsTests(
+    fixtures: SharedControlsFixture[]
+): void {
+    for (const fixture of fixtures.splice(0)) {
+        fixture.destroy();
+    }
+    delete (window as unknown as { electron?: unknown }).electron;
+    jest.restoreAllMocks();
+}
+
+export function renderSharedControls(
+    HtmlVideoPlayerComponent: HtmlVideoPlayerComponentType,
+    fixtures: SharedControlsFixture[],
+    options: RenderOptions = {}
+) {
+    const fixture = createFixture(HtmlVideoPlayerComponent, fixtures);
+    if (options.channel) {
+        fixture.componentRef.setInput('channel', options.channel);
+    }
+    fixture.componentRef.setInput(
+        'interactionEnabled',
+        options.interactionEnabled ?? true
+    );
+    fixture.componentRef.setInput('isLive', options.isLive ?? true);
+    fixture.componentRef.setInput(
+        'seriesNavigation',
+        options.seriesNavigation ?? null
+    );
+    fixture.componentRef.setInput(
+        'showCaptions',
+        options.showCaptions ?? false
+    );
+    fixture.detectChanges();
+    return renderedFixture(fixture);
+}
+
+export function renderSharedControlsDefaults(
+    HtmlVideoPlayerComponent: HtmlVideoPlayerComponentType,
+    fixtures: SharedControlsFixture[]
+) {
+    const fixture = createFixture(HtmlVideoPlayerComponent, fixtures);
+    fixture.detectChanges();
+    return renderedFixture(fixture);
+}
+
+export function readHtmlPlayerInternals(
+    component: HtmlVideoPlayerComponentInstance
+): HtmlPlayerInternals {
+    return component as unknown as HtmlPlayerInternals;
+}
+
+export function observeBridgeSourceBinding(
+    component: HtmlVideoPlayerComponentInstance
+) {
+    const bridge = readHtmlPlayerInternals(component).controlsBridge;
+    if (!bridge) {
+        throw new Error('Expected initialized HTML player controls bridge');
+    }
+    const setSource = bridge.setSource.bind(bridge);
+    return jest.spyOn(bridge, 'setSource').mockImplementation((source) => {
+        lifecycle.push(`bridge:${source.kind}`);
+        setSource(source);
+    });
+}
+
+function createFixture(
+    HtmlVideoPlayerComponent: HtmlVideoPlayerComponentType,
+    fixtures: SharedControlsFixture[]
+): SharedControlsFixture {
+    const fixture = TestBed.createComponent(HtmlVideoPlayerComponent);
+    fixtures.push(fixture);
+    return fixture;
+}
+
+function renderedFixture(fixture: SharedControlsFixture) {
+    return {
+        fixture,
+        component: fixture.componentInstance,
+        adapter: fixture.debugElement.injector.get(WebVideoControlsAdapter),
+        controls: fixture.debugElement.query(
+            By.directive(PlayerControlsComponent)
+        )?.componentInstance as PlayerControlsComponent | undefined,
+    };
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec.ts
new file mode 100644
index 000000000..33349e0e3
--- /dev/null
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.shared-controls.spec.ts
@@ -0,0 +1,245 @@
+import { By } from '@angular/platform-browser';
+import {
+    PlayerControlsComponent,
+    WebVideoControlsAdapter,
+} from '../player-controls';
+import { PictureInPictureTestEnvironment } from '../player-controls/picture-in-picture.spec-helpers';
+import { SeriesPlaybackNavigationControlsComponent } from '../portal-inline-player/series-playback-navigation-controls.component';
+import type { HtmlVideoPlayerComponent as HtmlVideoPlayerComponentInstance } from './html-video-player.component';
+import {
+    cleanupSharedControlsTests,
+    configureSharedControlsTests,
+    renderSharedControls,
+    renderSharedControlsDefaults,
+    type SharedControlsFixture,
+} from './html-video-player.component.shared-controls.spec-fixtures';
+
+describe('HtmlVideoPlayerComponent shared controls host', () => {
+    let HtmlVideoPlayerComponent: typeof import('./html-video-player.component').HtmlVideoPlayerComponent;
+    const fixtures: SharedControlsFixture[] = [];
+
+    beforeAll(async () => {
+        ({ HtmlVideoPlayerComponent } =
+            await import('./html-video-player.component'));
+    });
+
+    beforeEach(async () => {
+        await configureSharedControlsTests(HtmlVideoPlayerComponent);
+    });
+
+    afterEach(() => {
+        cleanupSharedControlsTests(fixtures);
+    });
+
+    it('uses declared shared-control defaults without input overrides', () => {
+        const { component, controls } = renderSharedControlsDefaults(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+
+        expect(component.isLive()).toBe(true);
+        expect(component.interactionEnabled()).toBe(true);
+        expect(component.showCaptions()).toBe(false);
+        expect(controls?.showControls()).toBe(true);
+        expect(controls?.shortcutsEnabled()).toBe(true);
+    });
+
+    it('scopes one adapter and context initialization to each component', () => {
+        const setContext = jest.spyOn(
+            WebVideoControlsAdapter.prototype,
+            'setContext'
+        );
+        const first = renderSharedControls(HtmlVideoPlayerComponent, fixtures);
+        const second = renderSharedControls(HtmlVideoPlayerComponent, fixtures);
+
+        expect(first.adapter).not.toBe(second.adapter);
+        expect(setContext).toHaveBeenCalledTimes(2);
+
+        first.fixture.detectChanges();
+        second.fixture.detectChanges();
+        expect(setContext).toHaveBeenCalledTimes(2);
+    });
+
+    it('uses one shared controls instance on the actual player shell', () => {
+        const { fixture, controls } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            {
+                seriesNavigation: {
+                    canPrevious: true,
+                    canNext: true,
+                    autoplayEnabled: true,
+                },
+            }
+        );
+        const shell = fixture.debugElement.query(
+            By.css('.html-video-player-shell')
+        ).nativeElement;
+        const video = fixture.debugElement.query(By.css('video'))
+            .nativeElement as HTMLVideoElement;
+
+        expect(video.controls).toBe(false);
+        expect(
+            fixture.debugElement.queryAll(By.directive(PlayerControlsComponent))
+        ).toHaveLength(1);
+        expect(
+            fixture.debugElement.query(
+                By.directive(SeriesPlaybackNavigationControlsComponent)
+            )
+        ).toBeNull();
+        expect(controls?.playerSurface()).toBe(shell);
+    });
+
+    it('attaches PiP support to the actual video after metadata', () => {
+        const environment = new PictureInPictureTestEnvironment();
+        try {
+            const { fixture, adapter } = renderSharedControls(
+                HtmlVideoPlayerComponent,
+                fixtures
+            );
+            const video = fixture.debugElement.query(By.css('video'))
+                .nativeElement as HTMLVideoElement;
+            environment.installVideo(video, { readyState: 0 });
+
+            environment.setReadyState(video, 1);
+            video.dispatchEvent(new Event('loadedmetadata'));
+
+            expect(adapter.capabilities().pictureInPicture).toBe(true);
+            expect(adapter.state().canPictureInPicture).toBe(true);
+        } finally {
+            environment.restore();
+        }
+    });
+
+    it('gates the shared surface and shortcuts with interaction availability', () => {
+        const { fixture, controls } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            { interactionEnabled: false }
+        );
+
+        expect(controls?.showControls()).toBe(false);
+        expect(controls?.shortcutsEnabled()).toBe(false);
+
+        fixture.componentRef.setInput('interactionEnabled', true);
+        fixture.detectChanges();
+
+        expect(controls?.showControls()).toBe(true);
+        expect(controls?.shortcutsEnabled()).toBe(true);
+    });
+
+    it('exits only its own fullscreen shell when interactions become unavailable', () => {
+        const { fixture } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+        const shell = fixture.debugElement.query(
+            By.css('.html-video-player-shell')
+        ).nativeElement as HTMLElement;
+        const unrelatedSurface = document.createElement('div');
+        const fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        const exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        let fullscreenElement: Element | null = unrelatedSurface;
+        const exitFullscreen = jest.fn().mockResolvedValue(undefined);
+
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            value: exitFullscreen,
+        });
+
+        try {
+            fixture.componentRef.setInput('interactionEnabled', false);
+            fixture.detectChanges();
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            fixture.componentRef.setInput('interactionEnabled', true);
+            fixture.detectChanges();
+            fullscreenElement = shell;
+            fixture.componentRef.setInput('interactionEnabled', false);
+            fixture.detectChanges();
+
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+        } finally {
+            restoreDocumentProperty(
+                'fullscreenElement',
+                fullscreenElementDescriptor
+            );
+            restoreDocumentProperty('exitFullscreen', exitFullscreenDescriptor);
+        }
+    });
+
+    it('keeps series context reactive and forwards navigation outputs', () => {
+        const setContext = jest.spyOn(
+            WebVideoControlsAdapter.prototype,
+            'setContext'
+        );
+        const { fixture, component, adapter, controls } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures,
+            { isLive: false }
+        );
+        const previous = jest.fn();
+        const next = jest.fn();
+        component.previousEpisodeRequested.subscribe(previous);
+        component.nextEpisodeRequested.subscribe(next);
+
+        expect(adapter.capabilities().seriesNavigation).toBe(false);
+        fixture.componentRef.setInput('seriesNavigation', {
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        fixture.detectChanges();
+
+        expect(adapter.capabilities().seriesNavigation).toBe(true);
+        expect(adapter.state().canPreviousEpisode).toBe(true);
+        expect(adapter.state().canNextEpisode).toBe(false);
+        controls?.previousEpisodeRequested.emit();
+        controls?.nextEpisodeRequested.emit();
+        expect(previous).toHaveBeenCalledTimes(1);
+        expect(next).toHaveBeenCalledTimes(1);
+        expect(setContext).toHaveBeenCalledTimes(1);
+    });
+
+    it('leaves caption state to the controls bridge when playback starts', async () => {
+        const { component } = renderSharedControls(
+            HtmlVideoPlayerComponent,
+            fixtures
+        );
+        const video = (component as HtmlVideoPlayerComponentInstance)
+            .videoPlayer.nativeElement;
+        const tracks = [{ mode: 'showing' as TextTrackMode }];
+        Object.defineProperty(video, 'textTracks', {
+            configurable: true,
+            value: tracks,
+        });
+        jest.spyOn(video, 'play').mockResolvedValue(undefined);
+
+        component.handlePlayOperation();
+        await Promise.resolve();
+
+        expect(tracks[0].mode).toBe('showing');
+    });
+});
+
+function restoreDocumentProperty(
+    property: 'exitFullscreen' | 'fullscreenElement',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+
+    delete (document as unknown as Record<string, unknown>)[property];
+}
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.spec.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.spec.ts
index e4e449a44..63304da58 100644
--- a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.spec.ts
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.spec.ts
@@ -4,11 +4,17 @@ import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { DataService } from '@iptvnator/services';
 import { Channel } from '@iptvnator/shared/interfaces';
+import {
+    PlayerControlsComponent,
+    WebVideoControlsAdapter,
+} from '../player-controls';
+import { SeriesPlaybackNavigationControlsComponent } from '../portal-inline-player/series-playback-navigation-controls.component';
 import { HtmlVideoPlayerComponent } from './html-video-player.component';
 
 describe('HtmlVideoPlayerComponent', () => {
     let component: HtmlVideoPlayerComponent;
     let fixture: ComponentFixture<HtmlVideoPlayerComponent>;
+    let adapterAttach: jest.SpiedFunction<WebVideoControlsAdapter['attach']>;
     const electronApi = {
         setUserAgent: jest.fn().mockResolvedValue(true),
     };
@@ -49,6 +55,7 @@ describe('HtmlVideoPlayerComponent', () => {
     }));
 
     beforeEach(() => {
+        adapterAttach = jest.spyOn(WebVideoControlsAdapter.prototype, 'attach');
         Object.defineProperty(window, 'electron', {
             configurable: true,
             value: electronApi,
@@ -62,34 +69,44 @@ describe('HtmlVideoPlayerComponent', () => {
 
     afterEach(() => {
         delete (window as unknown as { electron?: unknown }).electron;
+        jest.restoreAllMocks();
     });
 
     it('should create', () => {
         expect(component).toBeTruthy();
     });
 
+    it('keeps native and legacy controls when shared controls are disabled', () => {
+        const video = component.videoPlayer.nativeElement;
+
+        expect(video.controls).toBe(true);
+        expect(
+            fixture.debugElement.query(By.directive(PlayerControlsComponent))
+        ).toBeNull();
+        expect(
+            fixture.debugElement.query(
+                By.directive(SeriesPlaybackNavigationControlsComponent)
+            )
+        ).not.toBeNull();
+        expect(adapterAttach).not.toHaveBeenCalled();
+    });
+
     it('detaches volume/metadata/timeupdate listeners on destroy (no leak)', () => {
         const el = component.videoPlayer.nativeElement;
         const removeSpy = jest.spyOn(el, 'removeEventListener');
-        const handlers = component as unknown as {
-            handleVolumeChange: EventListener;
-            handleLoadedMetadata: EventListener;
-            handleTimeUpdate: EventListener;
-        };
-
         fixture.destroy();
 
         expect(removeSpy).toHaveBeenCalledWith(
             'volumechange',
-            handlers.handleVolumeChange
+            expect.any(Function)
         );
         expect(removeSpy).toHaveBeenCalledWith(
             'loadedmetadata',
-            handlers.handleLoadedMetadata
+            expect.any(Function)
         );
         expect(removeSpy).toHaveBeenCalledWith(
             'timeupdate',
-            handlers.handleTimeUpdate
+            expect.any(Function)
         );
     });
 
@@ -181,9 +198,7 @@ describe('HtmlVideoPlayerComponent', () => {
         const sources = Array.from(video.querySelectorAll('source'));
         const [source] = sources;
         expect(sources).toHaveLength(1);
-        expect(source?.src).toBe(
-            'https://stream.example/series/s01e02.mp4'
-        );
+        expect(source?.src).toBe('https://stream.example/series/s01e02.mp4');
         expect(source?.type).toBe('video/mp4');
         expect(loadSpy).toHaveBeenCalledTimes(2);
         expect(playSpy).toHaveBeenCalledTimes(2);
diff --git a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts
index f24183368..25f80a8ca 100644
--- a/libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts
+++ b/libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts
@@ -3,30 +3,50 @@ import {
     ElementRef,
     EventEmitter,
     inject,
+    input,
     Input,
     OnChanges,
     OnDestroy,
     OnInit,
     Output,
     SimpleChanges,
+    viewChild,
     ViewChild,
+    signal,
 } from '@angular/core';
 import Hls, { type ErrorData, type ManifestParsedData } from 'hls.js';
 import mpegts from 'mpegts.js';
-import { DataService } from '@iptvnator/services';
 import { Channel, createDevLogger } from '@iptvnator/shared/interfaces';
 import {
     InlinePlaybackPlayer,
     PlaybackDiagnostic,
-    classifyHlsPlaybackIssue,
-    classifyMpegTsPlaybackIssue,
-    classifyNativePlaybackIssue,
-    classifyUnsupportedHlsManifestCodecs,
-    createPlaybackSourceMetadata,
     getPlaybackMediaExtensionFromUrl,
 } from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    PlayerControlsComponent,
+    type PlayerMediaTitle,
+    WEB_PLAYER_SHARED_CONTROLS,
+    WebVideoControlsAdapter,
+} from '../player-controls';
 import { SeriesPlaybackNavigationControlsComponent } from '../portal-inline-player/series-playback-navigation-controls.component';
 import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import { ShakaVideoSession } from '../shaka-engine/shaka-video-session';
+import { exitOwnedFullscreen } from '../web-video-support/exit-owned-fullscreen.util';
+import {
+    clearNativeVideoSources,
+    setNativeVideoSource,
+} from '../web-video-support/web-video-native-source.util';
+import { WebVideoSourceTracks } from '../web-video-support/web-video-source-tracks';
+import { HtmlVideoElementSession } from './html-video-element-session';
+import {
+    emitFatalHlsPlaybackError,
+    emitMpegTsPlaybackError,
+    emitUnsupportedHlsManifestCodecs,
+} from './html-video-player-diagnostics';
+import {
+    HtmlVideoPlayerControlsBridge,
+    type HtmlVideoControlsSource,
+} from './html-video-player-controls.bridge';
 
 const debugHtmlPlayer = createDevLogger('HtmlVideoPlayer');
 
@@ -37,7 +57,11 @@ const debugHtmlPlayer = createDevLogger('HtmlVideoPlayer');
     selector: 'app-html-video-player',
     templateUrl: './html-video-player.component.html',
     styleUrls: ['./html-video-player.component.scss'],
-    imports: [SeriesPlaybackNavigationControlsComponent],
+    imports: [
+        PlayerControlsComponent,
+        SeriesPlaybackNavigationControlsComponent,
+    ],
+    providers: [WebVideoControlsAdapter],
     standalone: true,
 })
 export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
@@ -46,6 +70,10 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
     @Input() volume = 1;
     @Input() startTime = 0;
     @Input() seriesNavigation: SeriesPlaybackNavigation | null = null;
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
+    readonly showCaptions = input(false);
+    readonly mediaTitle = input<PlayerMediaTitle | null>(null);
     @Output() timeUpdate = new EventEmitter<{
         currentTime: number;
         duration: number;
@@ -55,90 +83,57 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
     @Output() previousEpisodeRequested = new EventEmitter<void>();
     @Output() nextEpisodeRequested = new EventEmitter<void>();
 
-    private readonly dataService = inject(DataService);
+    readonly sharedControls = inject(WEB_PLAYER_SHARED_CONTROLS);
+    readonly controlsAdapter = inject(WebVideoControlsAdapter);
+    private readonly seriesNavigationSignal =
+        signal<SeriesPlaybackNavigation | null>(null);
 
     /** Video player DOM element */
+    readonly playerRoot = viewChild<ElementRef<HTMLElement>>('playerRoot');
+
     @ViewChild('videoPlayer', { static: true })
     videoPlayer!: ElementRef<HTMLVideoElement>;
 
     /** HLS object */
-    hls!: Hls;
+    hls: Hls | null = null;
     /** mpegts.js player for raw MPEG-TS streams */
     private mpegtsPlayer: mpegts.Player | null = null;
-
-    /** Captions/subtitles indicator */
-    @Input() showCaptions!: boolean;
-
-    private readonly handleNativePlaybackError = () => {
-        const metadata = this.createSourceMetadata(
-            this.channel?.url ?? this.videoPlayer.nativeElement.currentSrc
-        );
-
-        this.playbackIssue.emit(
-            classifyNativePlaybackIssue(
-                this.videoPlayer.nativeElement.error,
-                metadata
-            )
-        );
-    };
-
-    private readonly clearPlaybackIssue = () => {
-        this.playbackIssue.emit(null);
-    };
-
-    private readonly handleVolumeChange = (): void => {
-        this.onVolumeChange();
-    };
-
-    private readonly handleLoadedMetadata = (): void => {
-        if (this.startTime > 0) {
-            this.videoPlayer.nativeElement.currentTime = this.startTime;
-        }
-    };
-
-    private readonly handleTimeUpdate = (): void => {
-        this.timeUpdate.emit({
-            currentTime: this.videoPlayer.nativeElement.currentTime,
-            duration: this.videoPlayer.nativeElement.duration,
-        });
-    };
-
-    private readonly handlePlaybackEnded = (): void => {
-        this.playbackEnded.emit();
-    };
+    /** Shaka session for DASH (.mpd) streams, created on first use */
+    private shakaSession: ShakaVideoSession | null = null;
+    private controlsSource: HtmlVideoControlsSource | null = null;
+    private controlsBridge: HtmlVideoPlayerControlsBridge | null = null;
+    /**
+     * Legacy (vendor-chrome) counterpart of {@link controlsBridge}: without
+     * shared controls there is no adapter to feed, but the `showCaptions`
+     * preference still has to reach the active source engine.
+     */
+    private captionTracks: WebVideoSourceTracks | null = null;
+    private videoSession: HtmlVideoElementSession | null = null;
 
     ngOnInit() {
-        this.videoPlayer.nativeElement.addEventListener(
-            'volumechange',
-            this.handleVolumeChange
-        );
-
-        this.videoPlayer.nativeElement.addEventListener(
-            'loadedmetadata',
-            this.handleLoadedMetadata
-        );
-
-        this.videoPlayer.nativeElement.addEventListener(
-            'timeupdate',
-            this.handleTimeUpdate
-        );
-
-        this.videoPlayer.nativeElement.addEventListener(
-            'error',
-            this.handleNativePlaybackError
-        );
-        this.videoPlayer.nativeElement.addEventListener(
-            'loadeddata',
-            this.clearPlaybackIssue
-        );
-        this.videoPlayer.nativeElement.addEventListener(
-            'playing',
-            this.clearPlaybackIssue
-        );
-        this.videoPlayer.nativeElement.addEventListener(
-            'ended',
-            this.handlePlaybackEnded
-        );
+        if (this.sharedControls) {
+            this.seriesNavigationSignal.set(this.seriesNavigation);
+            this.controlsAdapter.setContext({
+                seriesNavigation: this.seriesNavigationSignal,
+            });
+            this.controlsBridge = new HtmlVideoPlayerControlsBridge({
+                video: this.videoPlayer.nativeElement,
+                adapter: this.controlsAdapter,
+                isLive: () => this.isLive(),
+                showCaptions: () => this.showCaptions(),
+            });
+            this.controlsBridge.attach();
+        } else {
+            this.captionTracks = new WebVideoSourceTracks({
+                video: this.videoPlayer.nativeElement,
+                showCaptions: () => this.showCaptions(),
+                vendorCaptionControls: true,
+            });
+        }
+        if (this.controlsSource) {
+            this.bindControlsSource(this.controlsSource);
+        }
+        this.getVideoSession().attach();
     }
 
     /**
@@ -146,9 +141,27 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
      * @param changes component changes
      */
     ngOnChanges(changes: SimpleChanges): void {
+        if (changes['seriesNavigation']) {
+            this.seriesNavigationSignal.set(this.seriesNavigation);
+        }
         if (changes['channel'] && changes['channel'].currentValue) {
             this.playChannel(changes['channel'].currentValue);
         }
+        if (changes['isLive'] || changes['showCaptions']) {
+            this.controlsBridge?.refreshInputs();
+            this.captionTracks?.refreshInputs();
+        }
+        if (changes['interactionEnabled']?.currentValue === false) {
+            exitOwnedFullscreen(
+                this.sharedControls,
+                this.playerRoot()?.nativeElement,
+                (error) =>
+                    debugHtmlPlayer(
+                        'Failed to exit HTML5 player fullscreen:',
+                        error
+                    )
+            );
+        }
         if (changes['volume']?.currentValue !== undefined) {
             debugHtmlPlayer(
                 'Setting HTML5 player volume to:',
@@ -164,15 +177,11 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
      * @param channel given channel object
      */
     playChannel(channel: Channel): void {
-        if (this.mpegtsPlayer) {
-            this.mpegtsPlayer.pause();
-            this.mpegtsPlayer.unload();
-            this.mpegtsPlayer.detachMediaElement();
-            this.mpegtsPlayer.destroy();
-            this.mpegtsPlayer = null;
-        }
-        if (this.hls) this.hls.destroy();
-        this.clearNativeVideoSources(this.videoPlayer.nativeElement);
+        this.clearControlsSource();
+        this.destroyMpegtsPlayer();
+        this.destroyHls();
+        this.shakaSession?.stop();
+        clearNativeVideoSources(this.videoPlayer.nativeElement);
         if (channel.url) {
             this.playbackIssue.emit(null);
             const url = channel.url + (channel.epgParams ?? '');
@@ -191,7 +200,31 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
                     );
                 });
 
-            if ((extension === 'ts' || !extension) && mpegts.isSupported()) {
+            if (extension === 'mpd') {
+                debugHtmlPlayer(
+                    'Using Shaka Player for DASH stream:',
+                    channel.name,
+                    url
+                );
+                const session = this.getShakaSession();
+                this.bindControlsSource({ kind: 'shaka', session });
+                session.start(
+                    this.videoPlayer.nativeElement,
+                    url,
+                    channel.drm
+                );
+                if (channel.drm && !channel.drm.supported) {
+                    // No source is loaded for unsupported DRM; reset the
+                    // element so the previous stream cannot resume playing
+                    // underneath the diagnostic banner.
+                    this.videoPlayer.nativeElement.load();
+                } else {
+                    this.handlePlayOperation();
+                }
+            } else if (
+                (extension === 'ts' || !extension) &&
+                mpegts.isSupported()
+            ) {
                 debugHtmlPlayer(
                     'Using mpegts.js for TS stream:',
                     channel.name,
@@ -199,24 +232,20 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 );
                 this.mpegtsPlayer = mpegts.createPlayer({
                     type: 'mpegts',
-                    isLive: true,
+                    isLive: this.isLive(),
                     url: url,
                 });
                 this.mpegtsPlayer.attachMediaElement(
                     this.videoPlayer.nativeElement
                 );
+                this.bindControlsSource({ kind: 'mpegts' });
                 this.mpegtsPlayer.on(
                     mpegts.Events.ERROR,
                     (type: string, details: string, info: unknown): void => {
-                        this.playbackIssue.emit(
-                            classifyMpegTsPlaybackIssue(
-                                {
-                                    type,
-                                    details,
-                                    info,
-                                },
-                                this.createSourceMetadata(url, 'video/mp2t')
-                            )
+                        emitMpegTsPlaybackError(
+                            url,
+                            { type, details, info },
+                            (issue) => this.playbackIssue.emit(issue)
                         );
                     }
                 );
@@ -229,183 +258,119 @@ export class HtmlVideoPlayerComponent implements OnInit, OnChanges, OnDestroy {
                 Hls.isSupported()
             ) {
                 debugHtmlPlayer('Switching channel to:', channel.name, url);
-                this.hls = new Hls();
-                this.hls.on(Hls.Events.MANIFEST_PARSED, (_, data) => {
+                const hls = new Hls();
+                this.hls = hls;
+                hls.on(Hls.Events.MANIFEST_PARSED, (_, data) => {
                     this.handleHlsManifestParsed(url, data);
                 });
-                this.hls.on(Hls.Events.ERROR, (_, data) => {
+                hls.on(Hls.Events.ERROR, (_, data) => {
                     this.handleHlsError(url, data);
                 });
-                this.hls.attachMedia(this.videoPlayer.nativeElement);
-                this.hls.loadSource(url);
+                hls.attachMedia(this.videoPlayer.nativeElement);
+                this.bindControlsSource({ kind: 'hls', hls });
+                hls.loadSource(url);
                 this.handlePlayOperation();
             } else {
                 debugHtmlPlayer('Using native video player');
-                this.replaceNativeVideoSource(
+                setNativeVideoSource(
                     this.videoPlayer.nativeElement,
                     url,
                     'video/mp4'
                 );
+                this.bindControlsSource({ kind: 'native' });
+                this.videoPlayer.nativeElement.load();
                 this.handlePlayOperation();
             }
         }
     }
 
-    private clearNativeVideoSources(element: HTMLVideoElement): void {
-        element.removeAttribute('src');
-        element.replaceChildren();
+    private bindControlsSource(source: HtmlVideoControlsSource): void {
+        this.controlsSource = source;
+        this.controlsBridge?.setSource(source);
+        this.captionTracks?.setSource(source);
     }
 
-    private replaceNativeVideoSource(
-        element: HTMLVideoElement,
-        url: string,
-        type: string
-    ): void {
-        this.clearNativeVideoSources(element);
-        const source = document.createElement('source');
-        source.src = url;
-        source.type = type;
-        element.appendChild(source);
-        element.load();
+    private clearControlsSource(): void {
+        this.controlsBridge?.clearSource();
+        this.captionTracks?.clearSource();
+        this.controlsSource = null;
     }
 
-    /**
-     * Disables text based captions based on the global settings
-     */
-    disableCaptions(): void {
-        for (
-            let i = 0;
-            i < this.videoPlayer.nativeElement.textTracks.length;
-            i++
-        ) {
-            this.videoPlayer.nativeElement.textTracks[i].mode = 'hidden';
+    private destroyMpegtsPlayer(): void {
+        const player = this.mpegtsPlayer;
+        this.mpegtsPlayer = null;
+        if (!player) {
+            return;
         }
+        player.pause();
+        player.unload();
+        player.detachMediaElement();
+        player.destroy();
+    }
+
+    private destroyHls(): void {
+        const hls = this.hls;
+        this.hls = null;
+        hls?.destroy();
+    }
+
+    private getShakaSession(): ShakaVideoSession {
+        this.shakaSession ??= new ShakaVideoSession({
+            player: InlinePlaybackPlayer.Html5,
+            emitPlaybackIssue: (issue) => this.playbackIssue.emit(issue),
+            showCaptions: () => this.showCaptions(),
+        });
+        return this.shakaSession;
     }
 
     /**
      * Handles promise based play operation
      */
     handlePlayOperation(): void {
-        const playPromise = this.videoPlayer.nativeElement.play();
-
-        if (playPromise !== undefined) {
-            playPromise
-                .then(() => {
-                    // Automatic playback started!
-                    if (!this.showCaptions) {
-                        this.disableCaptions();
-                    }
-                })
-                .catch(() => {
-                    // Do nothing
-                });
-        }
+        this.getVideoSession().play();
     }
 
     private handleHlsManifestParsed(
         url: string,
         data: ManifestParsedData
     ): void {
-        const metadata = this.createSourceMetadata(
-            url,
-            'application/x-mpegURL',
-            data.levels
-                .map((level) => level.audioCodec)
-                .filter((codec): codec is string => Boolean(codec)),
-            data.levels
-                .map((level) => level.videoCodec)
-                .filter((codec): codec is string => Boolean(codec))
+        emitUnsupportedHlsManifestCodecs(url, data, (issue) =>
+            this.playbackIssue.emit(issue)
         );
-        const issue = classifyUnsupportedHlsManifestCodecs(metadata);
-        if (issue) {
-            this.playbackIssue.emit(issue);
-        }
     }
 
     private handleHlsError(url: string, data: ErrorData): void {
-        if (!data.fatal) {
-            return;
-        }
-
-        this.playbackIssue.emit(
-            classifyHlsPlaybackIssue(
-                {
-                    type: data.type,
-                    details: data.details,
-                    fatal: data.fatal,
-                    message: data.error?.message,
-                    error: data.error,
-                },
-                this.createSourceMetadata(url, 'application/x-mpegURL')
-            )
+        emitFatalHlsPlaybackError(url, data, (issue) =>
+            this.playbackIssue.emit(issue)
         );
     }
 
-    private createSourceMetadata(
-        url: string,
-        mimeType?: string,
-        audioCodecs: readonly string[] = [],
-        videoCodecs: readonly string[] = []
-    ) {
-        return createPlaybackSourceMetadata({
-            url,
-            mimeType,
-            player: InlinePlaybackPlayer.Html5,
-            audioCodecs,
-            videoCodecs,
-        });
-    }
-
-    /**
-     * Save volume when user changes it
-     */
-    onVolumeChange(): void {
-        const currentVolume = this.videoPlayer.nativeElement.volume;
-        debugHtmlPlayer('Volume changed to:', currentVolume);
-        localStorage.setItem('volume', currentVolume.toString());
-    }
-
     /**
      * Destroy hls instance on component destroy and clean up event listener
      */
     ngOnDestroy(): void {
-        this.videoPlayer.nativeElement.removeEventListener(
-            'volumechange',
-            this.handleVolumeChange
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'loadedmetadata',
-            this.handleLoadedMetadata
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'timeupdate',
-            this.handleTimeUpdate
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'error',
-            this.handleNativePlaybackError
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'loadeddata',
-            this.clearPlaybackIssue
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'playing',
-            this.clearPlaybackIssue
-        );
-        this.videoPlayer.nativeElement.removeEventListener(
-            'ended',
-            this.handlePlaybackEnded
-        );
-        if (this.mpegtsPlayer) {
-            this.mpegtsPlayer.pause();
-            this.mpegtsPlayer.unload();
-            this.mpegtsPlayer.detachMediaElement();
-            this.mpegtsPlayer.destroy();
-            this.mpegtsPlayer = null;
-        }
-        if (this.hls) {
-            this.hls.destroy();
-        }
+        this.controlsBridge?.destroy();
+        this.controlsBridge = null;
+        this.captionTracks?.destroy();
+        this.captionTracks = null;
+        this.controlsSource = null;
+        this.videoSession?.destroy();
+        this.videoSession = null;
+        this.destroyMpegtsPlayer();
+        this.destroyHls();
+        this.shakaSession?.destroy();
+        this.shakaSession = null;
+    }
+
+    private getVideoSession(): HtmlVideoElementSession {
+        this.videoSession ??= new HtmlVideoElementSession({
+            video: this.videoPlayer.nativeElement,
+            getChannelUrl: () => this.channel?.url,
+            getStartTime: () => this.startTime,
+            emitPlaybackIssue: (issue) => this.playbackIssue.emit(issue),
+            emitTimeUpdate: (value) => this.timeUpdate.emit(value),
+            emitPlaybackEnded: () => this.playbackEnded.emit(),
+        });
+        return this.videoSession;
     }
 }
diff --git a/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.model.ts b/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.model.ts
index 4bc4f8195..1079ab2f1 100644
--- a/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.model.ts
+++ b/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.model.ts
@@ -21,6 +21,7 @@ export const PlaybackDiagnosticSource = {
     Native: 'native',
     Hls: 'hls',
     MpegTs: 'mpegts',
+    Shaka: 'shaka',
 } as const;
 
 export type PlaybackDiagnosticSource =
diff --git a/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.util.ts b/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.util.ts
index 8cf24499c..298f054bb 100644
--- a/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.util.ts
+++ b/libs/ui/playback/src/lib/playback-diagnostics/playback-diagnostics.util.ts
@@ -45,7 +45,7 @@ export function classifyNativePlaybackIssue(
         // Native MediaError details are often opaque for browser security
         // failures. Only classify browser access when the runtime exposes a
         // concrete CORS/mixed-content/CSP-style message.
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: isBrowserAccessFailure(lowerNativeErrorMessage)
                 ? DiagnosticCode.BrowserAccessError
                 : DiagnosticCode.NetworkError,
@@ -57,7 +57,7 @@ export function classifyNativePlaybackIssue(
     }
 
     if (nativeErrorCode === DECODE_ERROR_CODE) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.MediaDecodeError,
             source: DiagnosticSource.Native,
             metadata,
@@ -67,7 +67,7 @@ export function classifyNativePlaybackIssue(
     }
 
     if (nativeErrorCode === SOURCE_NOT_SUPPORTED_CODE) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: isLikelyContainerIssue(metadata)
                 ? DiagnosticCode.UnsupportedContainer
                 : DiagnosticCode.UnsupportedCodec,
@@ -78,7 +78,7 @@ export function classifyNativePlaybackIssue(
         });
     }
 
-    return createDiagnostic({
+    return createPlaybackDiagnostic({
         code: DiagnosticCode.UnknownPlaybackError,
         source: DiagnosticSource.Native,
         metadata,
@@ -100,7 +100,7 @@ export function classifyHlsPlaybackIssue(
     });
 
     if (isNetworkFailure(lowerType, lowerDetails)) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: isBrowserAccessFailure(lowerDetails)
                 ? DiagnosticCode.BrowserAccessError
                 : DiagnosticCode.NetworkError,
@@ -111,7 +111,7 @@ export function classifyHlsPlaybackIssue(
     }
 
     if (isDrmOrEncryptionFailure(lowerDetails)) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.DrmOrEncryption,
             source: DiagnosticSource.Hls,
             metadata: mergedMetadata,
@@ -120,7 +120,7 @@ export function classifyHlsPlaybackIssue(
     }
 
     if (isCodecFailure(lowerDetails)) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.UnsupportedCodec,
             source: DiagnosticSource.Hls,
             metadata: mergedMetadata,
@@ -129,7 +129,7 @@ export function classifyHlsPlaybackIssue(
     }
 
     if (lowerType.includes('media') || lowerType.includes('mux')) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.MediaDecodeError,
             source: DiagnosticSource.Hls,
             metadata: mergedMetadata,
@@ -137,7 +137,7 @@ export function classifyHlsPlaybackIssue(
         });
     }
 
-    return createDiagnostic({
+    return createPlaybackDiagnostic({
         code: DiagnosticCode.UnknownPlaybackError,
         source: DiagnosticSource.Hls,
         metadata: mergedMetadata,
@@ -154,7 +154,7 @@ export function classifyMpegTsPlaybackIssue(
     const lowerType = (error.type ?? '').toLowerCase();
 
     if (isEarlyEofFailure(lowerDetails)) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.MediaDecodeError,
             source: DiagnosticSource.MpegTs,
             metadata,
@@ -163,7 +163,7 @@ export function classifyMpegTsPlaybackIssue(
     }
 
     if (isNetworkFailure(lowerType, lowerDetails)) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: isBrowserAccessFailure(lowerDetails)
                 ? DiagnosticCode.BrowserAccessError
                 : DiagnosticCode.NetworkError,
@@ -174,7 +174,7 @@ export function classifyMpegTsPlaybackIssue(
     }
 
     if (lowerDetails.includes('codec')) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.UnsupportedCodec,
             source: DiagnosticSource.MpegTs,
             metadata,
@@ -183,7 +183,7 @@ export function classifyMpegTsPlaybackIssue(
     }
 
     if (lowerDetails.includes('format') || lowerDetails.includes('mse')) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.UnsupportedContainer,
             source: DiagnosticSource.MpegTs,
             metadata,
@@ -192,7 +192,7 @@ export function classifyMpegTsPlaybackIssue(
     }
 
     if (lowerType.includes('media')) {
-        return createDiagnostic({
+        return createPlaybackDiagnostic({
             code: DiagnosticCode.MediaDecodeError,
             source: DiagnosticSource.MpegTs,
             metadata,
@@ -200,7 +200,7 @@ export function classifyMpegTsPlaybackIssue(
         });
     }
 
-    return createDiagnostic({
+    return createPlaybackDiagnostic({
         code: DiagnosticCode.UnknownPlaybackError,
         source: DiagnosticSource.MpegTs,
         metadata,
@@ -222,7 +222,7 @@ export function classifyUnsupportedHlsManifestCodecs(
         return null;
     }
 
-    return createDiagnostic({
+    return createPlaybackDiagnostic({
         code: DiagnosticCode.UnsupportedCodec,
         source: DiagnosticSource.Source,
         metadata,
@@ -230,13 +230,16 @@ export function classifyUnsupportedHlsManifestCodecs(
     });
 }
 
-function createDiagnostic(options: {
+export function createPlaybackDiagnostic(options: {
     readonly code: PlaybackDiagnosticCode;
     readonly source: PlaybackDiagnosticSource;
     readonly metadata: PlaybackSourceMetadata;
     readonly details?: string;
     readonly nativeErrorCode?: number;
     readonly nativeErrorMessage?: string;
+    /** Overrides the code-derived recommendation, e.g. when external players
+     * are known to be unable to handle the stream either. */
+    readonly externalFallbackRecommended?: boolean;
 }): PlaybackDiagnostic {
     const {
         code,
@@ -259,7 +262,9 @@ function createDiagnostic(options: {
         details: details || undefined,
         nativeErrorCode,
         nativeErrorMessage,
-        externalFallbackRecommended: isExternalFallbackRecommended(code),
+        externalFallbackRecommended:
+            options.externalFallbackRecommended ??
+            isExternalFallbackRecommended(code),
     };
 }
 
diff --git a/libs/ui/playback/src/lib/playback-diagnostics/playback-media-source.util.ts b/libs/ui/playback/src/lib/playback-diagnostics/playback-media-source.util.ts
index ba3ab2000..8ac8ff5d9 100644
--- a/libs/ui/playback/src/lib/playback-diagnostics/playback-media-source.util.ts
+++ b/libs/ui/playback/src/lib/playback-diagnostics/playback-media-source.util.ts
@@ -1,27 +1,17 @@
-import { getExtensionFromUrl } from '@iptvnator/shared/m3u-utils';
+import {
+    UNSUPPORTED_CONTAINER_EXTENSIONS,
+    getPlaybackMediaExtensionFromUrl,
+} from '@iptvnator/shared/m3u-utils';
 
 import type {
     PlaybackSourceMetadata,
     PlaybackSourceMetadataInput,
 } from './playback-diagnostics.model';
 
-const UNSUPPORTED_CONTAINER_EXTENSIONS = new Set([
-    'avi',
-    'asf',
-    'divx',
-    'flv',
-    'm2ts',
-    'm4v',
-    'mkv',
-    'mov',
-    'mpeg',
-    'mpg',
-    'rm',
-    'rmvb',
-    'ts',
-    'vob',
-    'wmv',
-]);
+// Media-extension normalization lives in @iptvnator/shared/m3u-utils so M3U
+// routing (isDashChannel) and engine selection always agree; re-exported here
+// to keep the playback-lib import surface stable.
+export { getPlaybackMediaExtensionFromUrl };
 
 const UNSUPPORTED_CONTAINER_NAMES = new Set([
     ...UNSUPPORTED_CONTAINER_EXTENSIONS,
@@ -31,42 +21,6 @@ const UNSUPPORTED_CONTAINER_NAMES = new Set([
     'x-msvideo',
 ]);
 
-const EXPLICIT_MEDIA_EXTENSION_QUERY_KEYS = ['extension', 'ext'];
-
-const DECLARED_MEDIA_FORMAT_QUERY_KEYS = ['format', 'container'];
-
-const DECLARED_MEDIA_EXTENSION_ALIASES = new Map([
-    ['hls', 'm3u8'],
-    ['mpegts', 'ts'],
-    ['mpeg-ts', 'ts'],
-]);
-
-const DECLARED_MEDIA_EXTENSIONS = new Set([
-    ...UNSUPPORTED_CONTAINER_EXTENSIONS,
-    'aac',
-    'flac',
-    'm3u',
-    'm3u8',
-    'm4s',
-    'mp3',
-    'mp4',
-    'mpd',
-    'oga',
-    'ogg',
-    'ogv',
-    'webm',
-]);
-
-const NON_MEDIA_URL_EXTENSIONS = new Set([
-    'asp',
-    'aspx',
-    'cgi',
-    'jsp',
-    'mpv',
-    'php',
-    'pl',
-]);
-
 const BROWSER_LIMITED_CODEC_PATTERNS: ReadonlyArray<{
     readonly label: string;
     readonly pattern: RegExp;
@@ -95,35 +49,6 @@ export function createPlaybackSourceMetadata(
     };
 }
 
-export function getPlaybackMediaExtensionFromUrl(url: string): string {
-    const explicitQueryExtension = getMediaExtensionFromQuery(
-        url,
-        EXPLICIT_MEDIA_EXTENSION_QUERY_KEYS
-    );
-    if (explicitQueryExtension) {
-        return explicitQueryExtension;
-    }
-
-    const pathExtension = normalizeExtensionToken(getExtensionFromUrl(url));
-    if (DECLARED_MEDIA_EXTENSIONS.has(pathExtension)) {
-        return pathExtension;
-    }
-
-    const formatQueryExtension = getMediaExtensionFromQuery(
-        url,
-        DECLARED_MEDIA_FORMAT_QUERY_KEYS
-    );
-    if (formatQueryExtension) {
-        return formatQueryExtension;
-    }
-
-    if (NON_MEDIA_URL_EXTENSIONS.has(pathExtension)) {
-        return '';
-    }
-
-    return pathExtension;
-}
-
 export function getLikelyBrowserUnsupportedCodecLabels(
     metadata: Pick<PlaybackSourceMetadata, 'audioCodecs' | 'videoCodecs'>
 ): string[] {
@@ -188,40 +113,3 @@ function normalizeCodecs(codecs: readonly string[] | undefined): string[] {
 function normalizeToken(value: string | undefined): string {
     return value?.trim().toLowerCase() ?? '';
 }
-
-function normalizeExtensionToken(value: string | undefined): string {
-    return normalizeToken(value).replace(/^\.+/, '');
-}
-
-function getMediaExtensionFromQuery(
-    url: string,
-    queryKeys: readonly string[]
-): string {
-    try {
-        const parsedUrl = new URL(url, 'http://iptvnator.local');
-        for (const key of queryKeys) {
-            const declaredExtension = normalizeDeclaredMediaExtension(
-                parsedUrl.searchParams.get(key) ?? undefined
-            );
-            if (declaredExtension) {
-                return declaredExtension;
-            }
-        }
-
-        return '';
-    } catch {
-        return '';
-    }
-}
-
-function normalizeDeclaredMediaExtension(value: string | undefined): string {
-    const extension = normalizeExtensionToken(value);
-    const normalized =
-        DECLARED_MEDIA_EXTENSION_ALIASES.get(extension) ?? extension;
-
-    if (!normalized || NON_MEDIA_URL_EXTENSIONS.has(normalized)) {
-        return '';
-    }
-
-    return DECLARED_MEDIA_EXTENSIONS.has(normalized) ? normalized : '';
-}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-feedback.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-feedback.spec.ts
new file mode 100644
index 000000000..1d113f446
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-feedback.spec.ts
@@ -0,0 +1,75 @@
+import { ControlsFeedback } from './controls-feedback';
+
+describe('ControlsFeedback', () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    it('flashes feedback and clears the previous timeout when replaced', () => {
+        const feedback = new ControlsFeedback();
+
+        feedback.flash('volume_up', '60%', 700);
+        expect(feedback.current()).toEqual({
+            icon: 'volume_up',
+            label: '60%',
+            key: 1,
+        });
+
+        jest.advanceTimersByTime(500);
+        feedback.flash('volume_down', '55%', 700);
+        expect(feedback.current()).toEqual({
+            icon: 'volume_down',
+            label: '55%',
+            key: 2,
+        });
+
+        jest.advanceTimersByTime(699);
+        expect(feedback.current()?.label).toBe('55%');
+        jest.advanceTimersByTime(1);
+        expect(feedback.current()).toBeNull();
+    });
+
+    it('disposes pending feedback timers', () => {
+        const feedback = new ControlsFeedback();
+
+        feedback.flash('volume_off', 'Muted', 700);
+        feedback.dispose();
+        jest.advanceTimersByTime(700);
+
+        expect(feedback.current()?.label).toBe('Muted');
+    });
+
+    it('uses caller-provided recording transition labels', () => {
+        const feedback = new ControlsFeedback();
+        const labels = {
+            active: 'Aufnahme',
+            inactive: 'Aufnahme gespeichert',
+        };
+
+        feedback.flashRecordingTransition(true, labels);
+        expect(feedback.current()?.label).toBe('Aufnahme');
+
+        feedback.flashRecordingTransition(false, labels);
+        expect(feedback.current()?.label).toBe('Aufnahme gespeichert');
+    });
+
+    it('clears only recording-owned feedback across owner handoff', () => {
+        const feedback = new ControlsFeedback();
+        const labels = {
+            active: 'Recording',
+            inactive: 'Recording saved',
+        };
+
+        feedback.flashRecordingTransition(true, labels, 'session-1');
+        feedback.flashRecordingTransition(false, labels, 'session-2');
+        expect(feedback.current()).toBeNull();
+
+        feedback.flash('volume_up', '60%');
+        feedback.flashRecordingTransition(false, labels, 'session-3');
+        expect(feedback.current()?.label).toBe('60%');
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-feedback.ts b/libs/ui/playback/src/lib/player-controls/controls-feedback.ts
new file mode 100644
index 000000000..8633cd090
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-feedback.ts
@@ -0,0 +1,106 @@
+import { signal } from '@angular/core';
+import type { PlayerRecordingState } from './player-controls.model';
+
+export interface RecordingFeedbackLabels {
+    active: string;
+    inactive: string;
+}
+
+/**
+ * Transient feedback overlay shown when the user adjusts volume/seek/mute via
+ * keyboard. Caller calls flash() with an icon + label; auto-clears after the
+ * given duration.
+ */
+export class ControlsFeedback {
+    readonly current = signal<{
+        icon: string;
+        label: string;
+        key: number;
+    } | null>(null);
+
+    private timer: number | null = null;
+    private nextKey = 0;
+    private lastRecordingActive = false;
+    private recordingFeedbackKey: number | null = null;
+    private recordingTransitionKey: string | null | undefined;
+
+    flash(icon: string, label: string, durationMs = 700): void {
+        if (this.timer !== null) {
+            clearTimeout(this.timer);
+        }
+        this.recordingFeedbackKey = null;
+        this.nextKey += 1;
+        this.current.set({ icon, label, key: this.nextKey });
+        this.timer = window.setTimeout(() => {
+            this.current.set(null);
+            this.recordingFeedbackKey = null;
+            this.timer = null;
+        }, durationMs);
+    }
+
+    /**
+     * Flash a transient overlay on recording start/stop transitions, ignoring
+     * repeated states. Tracks the last known active state internally.
+     */
+    flashRecordingState(
+        recording: PlayerRecordingState,
+        labels: RecordingFeedbackLabels
+    ): void {
+        this.flashRecordingTransition(
+            recording.active,
+            {
+                ...labels,
+                inactive: recording.message || labels.inactive,
+            },
+            recording.transitionKey ?? null
+        );
+    }
+
+    flashRecordingTransition(
+        active: boolean,
+        labels: RecordingFeedbackLabels,
+        transitionKey: string | null = null
+    ): void {
+        const ownerChanged =
+            this.recordingTransitionKey !== undefined &&
+            this.recordingTransitionKey !== transitionKey;
+        this.recordingTransitionKey = transitionKey;
+        if (ownerChanged) {
+            this.clearRecordingFeedback();
+            this.lastRecordingActive = active;
+            return;
+        }
+        if (active === this.lastRecordingActive) {
+            return;
+        }
+        this.lastRecordingActive = active;
+        if (active) {
+            this.flash('fiber_manual_record', labels.active, 900);
+        } else {
+            this.flash('stop_circle', labels.inactive, 900);
+        }
+        this.recordingFeedbackKey = this.current()?.key ?? null;
+    }
+
+    dispose(): void {
+        if (this.timer !== null) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+    }
+
+    private clearRecordingFeedback(): void {
+        if (
+            this.recordingFeedbackKey === null ||
+            this.current()?.key !== this.recordingFeedbackKey
+        ) {
+            return;
+        }
+        if (this.timer !== null) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+        this.recordingFeedbackKey = null;
+        this.current.set(null);
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-format.utils.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-format.utils.spec.ts
new file mode 100644
index 000000000..95513efd2
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-format.utils.spec.ts
@@ -0,0 +1,41 @@
+import {
+    formatTime,
+    persistVolume,
+    readStoredVolume,
+    volumeIcon,
+    volumeLabel,
+} from './controls-format.utils';
+
+describe('controls format utilities', () => {
+    afterEach(() => {
+        localStorage.clear();
+    });
+
+    it('formats playback time with hour rollover and safe null values', () => {
+        expect(formatTime(null)).toBe('0:00');
+        expect(formatTime(-30)).toBe('0:00');
+        expect(formatTime(75.9)).toBe('1:15');
+        expect(formatTime(3661)).toBe('1:01:01');
+    });
+
+    it('clamps stored volume reads and persists raw volume values', () => {
+        localStorage.setItem('volume', '2');
+        expect(readStoredVolume()).toBe(1);
+
+        localStorage.setItem('volume', '-0.5');
+        expect(readStoredVolume()).toBe(0);
+
+        localStorage.setItem('volume', 'not-a-number');
+        expect(readStoredVolume()).toBe(1);
+
+        persistVolume(0.35);
+        expect(localStorage.getItem('volume')).toBe('0.35');
+    });
+
+    it('maps volume to an icon and a readable label', () => {
+        expect(volumeIcon(0)).toBe('volume_off');
+        expect(volumeIcon(0.25)).toBe('volume_down');
+        expect(volumeIcon(0.75)).toBe('volume_up');
+        expect(volumeLabel(0.755)).toBe('Volume 76%');
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-format.utils.ts b/libs/ui/playback/src/lib/player-controls/controls-format.utils.ts
new file mode 100644
index 000000000..14ee11dda
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-format.utils.ts
@@ -0,0 +1,43 @@
+export function formatTime(value: number | null | undefined): string {
+    const safeValue = Math.max(0, Math.floor(value ?? 0));
+    const hours = Math.floor(safeValue / 3600);
+    const minutes = Math.floor((safeValue % 3600) / 60);
+    const seconds = safeValue % 60;
+
+    if (hours > 0) {
+        return `${hours}:${String(minutes).padStart(2, '0')}:${String(
+            seconds
+        ).padStart(2, '0')}`;
+    }
+
+    return `${minutes}:${String(seconds).padStart(2, '0')}`;
+}
+
+export function volumeIcon(value: number): string {
+    if (value <= 0) {
+        return 'volume_off';
+    }
+    return value < 0.5 ? 'volume_down' : 'volume_up';
+}
+
+export function volumeLabel(value: number): string {
+    return `Volume ${Math.round(value * 100)}%`;
+}
+
+/** Rounds and formats a playback rate as e.g. `1.5×` for tooltips. */
+export function speedLabel(speed: number): string {
+    const value = Math.round(speed * 100) / 100;
+    return `${value}×`;
+}
+
+export function readStoredVolume(): number {
+    const rawValue = Number(localStorage.getItem('volume') ?? '1');
+    if (Number.isNaN(rawValue)) {
+        return 1;
+    }
+    return Math.max(0, Math.min(1, rawValue));
+}
+
+export function persistVolume(value: number): void {
+    localStorage.setItem('volume', String(value));
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-fullscreen.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-fullscreen.spec.ts
new file mode 100644
index 000000000..3ab31754c
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-fullscreen.spec.ts
@@ -0,0 +1,95 @@
+import { ControlsFullscreen } from './controls-fullscreen';
+
+describe('ControlsFullscreen', () => {
+    let target: HTMLElement;
+    let requestFullscreen: jest.Mock;
+    let exitFullscreen: jest.Mock;
+    let originalExit: typeof document.exitFullscreen;
+
+    const setFullscreenElement = (element: Element | null) => {
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            value: element,
+        });
+    };
+
+    beforeEach(() => {
+        target = document.createElement('div');
+        requestFullscreen = jest.fn().mockResolvedValue(undefined);
+        exitFullscreen = jest.fn().mockResolvedValue(undefined);
+        (
+            target as HTMLElement & { requestFullscreen: jest.Mock }
+        ).requestFullscreen = requestFullscreen;
+        originalExit = document.exitFullscreen;
+        document.exitFullscreen = exitFullscreen;
+        setFullscreenElement(null);
+    });
+
+    afterEach(() => {
+        document.exitFullscreen = originalExit;
+        setFullscreenElement(null);
+    });
+
+    it('reports capability based on the target and document support', () => {
+        const fs = new ControlsFullscreen(() => target);
+        expect(fs.canFullscreen()).toBe(true);
+        fs.dispose();
+
+        const noTarget = new ControlsFullscreen(() => null);
+        expect(noTarget.canFullscreen()).toBe(false);
+        noTarget.dispose();
+    });
+
+    it('requests fullscreen on the target when not already fullscreen', async () => {
+        const fs = new ControlsFullscreen(() => target);
+        await fs.toggle();
+        expect(requestFullscreen).toHaveBeenCalledTimes(1);
+        expect(exitFullscreen).not.toHaveBeenCalled();
+        fs.dispose();
+    });
+
+    it('exits fullscreen when the target is already fullscreen', async () => {
+        setFullscreenElement(target);
+        const fs = new ControlsFullscreen(() => target);
+        await fs.toggle();
+        expect(exitFullscreen).toHaveBeenCalledTimes(1);
+        expect(requestFullscreen).not.toHaveBeenCalled();
+        fs.dispose();
+    });
+
+    it('tracks fullscreen state and invokes onChange on fullscreenchange', () => {
+        const onChange = jest.fn();
+        const fs = new ControlsFullscreen(() => target, onChange);
+
+        setFullscreenElement(target);
+        document.dispatchEvent(new Event('fullscreenchange'));
+        expect(fs.isFullscreen()).toBe(true);
+        expect(onChange).toHaveBeenCalledTimes(1);
+
+        setFullscreenElement(null);
+        document.dispatchEvent(new Event('fullscreenchange'));
+        expect(fs.isFullscreen()).toBe(false);
+        fs.dispose();
+    });
+
+    it('synchronizes an existing fullscreen target without invoking onChange', () => {
+        const onChange = jest.fn();
+        const fs = new ControlsFullscreen(() => target, onChange);
+        setFullscreenElement(target);
+
+        fs.sync();
+
+        expect(fs.isFullscreen()).toBe(true);
+        expect(onChange).not.toHaveBeenCalled();
+        fs.dispose();
+    });
+
+    it('stops reacting to fullscreenchange after dispose', () => {
+        const onChange = jest.fn();
+        const fs = new ControlsFullscreen(() => target, onChange);
+        fs.dispose();
+        setFullscreenElement(target);
+        document.dispatchEvent(new Event('fullscreenchange'));
+        expect(onChange).not.toHaveBeenCalled();
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-fullscreen.ts b/libs/ui/playback/src/lib/player-controls/controls-fullscreen.ts
new file mode 100644
index 000000000..99d3f3320
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-fullscreen.ts
@@ -0,0 +1,73 @@
+import { signal } from '@angular/core';
+
+/**
+ * Owns the fullscreen lifecycle for a player surface: tracks the current
+ * fullscreen state, listens for `fullscreenchange`, and toggles fullscreen on
+ * the target element. The component keeps the capability gating and the
+ * label/icon derivation; this helper only deals with the browser API.
+ */
+export class ControlsFullscreen {
+    readonly isFullscreen = signal(false);
+
+    private readonly onFullscreenChange = () => {
+        this.sync();
+        this.onChange?.();
+    };
+
+    constructor(
+        private readonly target: () => HTMLElement | null,
+        private readonly onChange?: () => void
+    ) {
+        if (typeof document !== 'undefined') {
+            document.addEventListener(
+                'fullscreenchange',
+                this.onFullscreenChange
+            );
+        }
+    }
+
+    sync(): void {
+        const target = this.target();
+        this.isFullscreen.set(
+            Boolean(
+                target &&
+                typeof document !== 'undefined' &&
+                document.fullscreenElement === target
+            )
+        );
+    }
+
+    canFullscreen(): boolean {
+        const target = this.target();
+        return (
+            typeof document !== 'undefined' &&
+            Boolean(target?.requestFullscreen) &&
+            Boolean(document.exitFullscreen)
+        );
+    }
+
+    async toggle(): Promise<void> {
+        const target = this.target();
+        if (!target || !this.canFullscreen()) {
+            return;
+        }
+        try {
+            if (document.fullscreenElement === target) {
+                await document.exitFullscreen();
+            } else {
+                await target.requestFullscreen();
+            }
+        } catch {
+            return;
+        }
+    }
+
+    dispose(): void {
+        if (typeof document !== 'undefined') {
+            document.removeEventListener(
+                'fullscreenchange',
+                this.onFullscreenChange
+            );
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-menu-selection.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-menu-selection.spec.ts
new file mode 100644
index 000000000..791b81a87
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-menu-selection.spec.ts
@@ -0,0 +1,88 @@
+import { ControlsMenuSelection } from './controls-menu-selection';
+import { ControlsMenuState } from './controls-menu-state';
+import { ControlsVisibility } from './controls-visibility';
+import type { PlayerControlsCommands } from './player-controls.model';
+
+describe('ControlsMenuSelection', () => {
+    let commands: jest.Mocked<PlayerControlsCommands>;
+    let menus: ControlsMenuState;
+    let visibility: ControlsVisibility;
+    let revealSticky: jest.Mock;
+    let selection: ControlsMenuSelection;
+
+    beforeEach(() => {
+        commands = {
+            togglePlay: jest.fn(),
+            seekTo: jest.fn(),
+            seekBy: jest.fn(),
+            setVolume: jest.fn(),
+            setAudioTrack: jest.fn(),
+            setSubtitleTrack: jest.fn(),
+            setPlaybackSpeed: jest.fn(),
+            setAspectRatio: jest.fn(),
+            toggleRecording: jest.fn(),
+            togglePictureInPicture: jest.fn(),
+        };
+        menus = new ControlsMenuState();
+        visibility = new ControlsVisibility(() => false);
+        jest.spyOn(visibility, 'scheduleHide');
+        revealSticky = jest.fn();
+        selection = new ControlsMenuSelection({
+            commands: () => commands,
+            menus,
+            visibility,
+            revealSticky,
+        });
+    });
+
+    it('toggles a menu through the menu state', () => {
+        selection.toggle('audio');
+        expect(menus.audioOpen()).toBe(true);
+
+        selection.toggle('audio');
+        expect(menus.audioOpen()).toBe(false);
+    });
+
+    it('selects an audio track: reveal sticky, command, close menu, reschedule hide', () => {
+        menus.open('audio');
+        selection.audioTrack(3);
+
+        expect(revealSticky).toHaveBeenCalledTimes(1);
+        expect(commands.setAudioTrack).toHaveBeenCalledWith(3);
+        expect(menus.audioOpen()).toBe(false);
+        expect(visibility.scheduleHide).toHaveBeenCalledTimes(1);
+    });
+
+    it('selects a subtitle track and closes the subtitle menu', () => {
+        menus.open('subtitle');
+        selection.subtitleTrack(-1);
+
+        expect(commands.setSubtitleTrack).toHaveBeenCalledWith(-1);
+        expect(menus.subtitleOpen()).toBe(false);
+        expect(visibility.scheduleHide).toHaveBeenCalled();
+    });
+
+    it('applies a playback speed and closes the speed menu', () => {
+        menus.open('speed');
+        selection.speed(1.5);
+
+        expect(commands.setPlaybackSpeed).toHaveBeenCalledWith(1.5);
+        expect(menus.speedOpen()).toBe(false);
+    });
+
+    it('applies an aspect ratio and closes the aspect menu', () => {
+        menus.open('aspect');
+        selection.aspect('16:9');
+
+        expect(commands.setAspectRatio).toHaveBeenCalledWith('16:9');
+        expect(menus.aspectOpen()).toBe(false);
+    });
+
+    it('only closes the menu the selection belongs to', () => {
+        menus.open('volume');
+        selection.speed(2);
+
+        // Closing 'speed' must not blindly close every popover.
+        expect(menus.volumeOpen()).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-menu-selection.ts b/libs/ui/playback/src/lib/player-controls/controls-menu-selection.ts
new file mode 100644
index 000000000..b676207ff
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-menu-selection.ts
@@ -0,0 +1,49 @@
+import type { ControlsMenuState } from './controls-menu-state';
+import type { ControlsVisibility } from './controls-visibility';
+import type { PlayerControlsCommands } from './player-controls.model';
+
+type MenuKey = 'audio' | 'subtitle' | 'speed' | 'aspect';
+
+export interface MenuSelectionDeps {
+    commands: () => PlayerControlsCommands;
+    menus: ControlsMenuState;
+    visibility: ControlsVisibility;
+    /** Reveal without rescheduling the auto-hide (kept open while choosing). */
+    revealSticky: () => void;
+}
+
+/**
+ * Owns track/speed/aspect menu selection: reveal-without-hide, run the command,
+ * close the menu, then reschedule the auto-hide. Keeps the component lean while
+ * the template still binds to thin delegating methods.
+ */
+export class ControlsMenuSelection {
+    constructor(private readonly deps: MenuSelectionDeps) {}
+
+    toggle(menu: MenuKey): void {
+        this.deps.menus.toggle(menu);
+    }
+
+    audioTrack(trackId: number): void {
+        this.apply('audio', (c) => c.setAudioTrack(trackId));
+    }
+
+    subtitleTrack(trackId: number): void {
+        this.apply('subtitle', (c) => c.setSubtitleTrack(trackId));
+    }
+
+    speed(value: number): void {
+        this.apply('speed', (c) => c.setPlaybackSpeed(value));
+    }
+
+    aspect(value: string): void {
+        this.apply('aspect', (c) => c.setAspectRatio(value));
+    }
+
+    private apply(menu: MenuKey, run: (c: PlayerControlsCommands) => void): void {
+        this.deps.revealSticky();
+        run(this.deps.commands());
+        this.deps.menus.close(menu);
+        this.deps.visibility.scheduleHide();
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-menu-state.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-menu-state.spec.ts
new file mode 100644
index 000000000..dee25dfa2
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-menu-state.spec.ts
@@ -0,0 +1,122 @@
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { ControlsMenuState } from './controls-menu-state';
+
+describe('ControlsMenuState', () => {
+    it('keeps only one menu open at a time', () => {
+        const menus = new ControlsMenuState();
+
+        menus.open('volume');
+        expect(menus.volumeOpen()).toBe(true);
+        expect(menus.anyOpen()).toBe(true);
+
+        menus.open('audio');
+        expect(menus.volumeOpen()).toBe(false);
+        expect(menus.audioOpen()).toBe(true);
+
+        menus.toggle('audio');
+        expect(menus.audioOpen()).toBe(false);
+        expect(menus.anyOpen()).toBe(false);
+    });
+
+    it('closes all menus', () => {
+        const menus = new ControlsMenuState();
+        menus.open('speed');
+        menus.closeAll();
+        expect(menus.anyOpen()).toBe(false);
+    });
+
+    it.each(['volume', 'audio', 'subtitle', 'speed', 'aspect'] as const)(
+        'closes an open %s menu when it becomes unavailable',
+        (menu) => {
+            const menus = new ControlsMenuState();
+            menus.open(menu);
+
+            const changed = menus.reconcile({
+                volume: menu !== 'volume',
+                audio: menu !== 'audio',
+                subtitle: menu !== 'subtitle',
+                speed: menu !== 'speed',
+                aspect: menu !== 'aspect',
+            });
+
+            expect(changed).toBe(true);
+            expect(menus.anyOpen()).toBe(false);
+        }
+    );
+
+    it('leaves an available menu open without reporting a change', () => {
+        const menus = new ControlsMenuState();
+        menus.open('speed');
+
+        expect(
+            menus.reconcile({
+                volume: true,
+                audio: true,
+                subtitle: true,
+                speed: true,
+                aspect: true,
+            })
+        ).toBe(false);
+        expect(menus.speedOpen()).toBe(true);
+    });
+
+    it('closes every unavailable menu if state was made inconsistent', () => {
+        const menus = new ControlsMenuState();
+        menus.volumeOpen.set(true);
+        menus.speedOpen.set(true);
+
+        expect(
+            menus.reconcile({
+                volume: false,
+                audio: false,
+                subtitle: false,
+                speed: false,
+                aspect: false,
+            })
+        ).toBe(true);
+        expect(menus.anyOpen()).toBe(false);
+    });
+
+    it.each([
+        ['volume', { volume: false }, {}],
+        ['audio', {}, { audioTracks: [] }],
+        ['subtitle', {}, { subtitleTracks: [] }],
+        ['speed', { playbackSpeed: false }, {}],
+        ['aspect', { aspectRatio: false }, {}],
+    ] as const)(
+        'maps runtime controller state to %s menu availability',
+        (menu, capabilityOverrides, stateOverrides) => {
+            const menus = new ControlsMenuState();
+            menus.open(menu);
+
+            menus.reconcileControllerAvailability(
+                true,
+                {
+                    ...DEFAULT_PLAYER_CAPABILITIES,
+                    volume: true,
+                    audioTracks: true,
+                    subtitles: true,
+                    playbackSpeed: true,
+                    aspectRatio: true,
+                    ...capabilityOverrides,
+                },
+                {
+                    ...createEmptyControlsState(),
+                    audioTracks: [
+                        { id: 1, label: 'English', selected: true },
+                        { id: 2, label: 'German', selected: false },
+                    ],
+                    subtitleTracks: [
+                        { id: 1, label: 'English', selected: true },
+                    ],
+                    ...stateOverrides,
+                }
+            );
+
+            expect(menus.anyOpen()).toBe(false);
+        }
+    );
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-menu-state.ts b/libs/ui/playback/src/lib/player-controls/controls-menu-state.ts
new file mode 100644
index 000000000..835ae1b15
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-menu-state.ts
@@ -0,0 +1,121 @@
+import { computed, signal } from '@angular/core';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsState,
+} from './player-controls.model';
+
+const CONTROL_MENUS = [
+    'volume',
+    'audio',
+    'subtitle',
+    'speed',
+    'aspect',
+] as const;
+
+export type ControlsMenu = (typeof CONTROL_MENUS)[number];
+export type ControlsMenuAvailability = Readonly<Record<ControlsMenu, boolean>>;
+
+function getControlsMenuAvailability(
+    showControls: boolean,
+    capabilities: PlayerControlsCapabilities,
+    state: PlayerControlsState
+): ControlsMenuAvailability {
+    return {
+        volume: showControls && capabilities.volume,
+        audio:
+            showControls &&
+            capabilities.audioTracks &&
+            state.audioTracks.length > 1,
+        subtitle:
+            showControls &&
+            capabilities.subtitles &&
+            state.subtitleTracks.length > 0,
+        speed: showControls && capabilities.playbackSpeed,
+        aspect: showControls && capabilities.aspectRatio,
+    };
+}
+
+/**
+ * Tracks which menu/popover is currently open and exposes individual signals
+ * the template binds to. Only one menu can be open at a time.
+ */
+export class ControlsMenuState {
+    readonly volumeOpen = signal(false);
+    readonly audioOpen = signal(false);
+    readonly subtitleOpen = signal(false);
+    readonly speedOpen = signal(false);
+    readonly aspectOpen = signal(false);
+
+    readonly anyOpen = computed(
+        () =>
+            this.volumeOpen() ||
+            this.audioOpen() ||
+            this.subtitleOpen() ||
+            this.speedOpen() ||
+            this.aspectOpen()
+    );
+
+    toggle(menu: ControlsMenu): void {
+        const target = this.signalFor(menu);
+        const next = !target();
+        this.closeAll();
+        target.set(next);
+    }
+
+    open(menu: ControlsMenu): void {
+        if (this.signalFor(menu)()) {
+            return;
+        }
+        this.closeAll();
+        this.signalFor(menu).set(true);
+    }
+
+    close(menu: ControlsMenu): void {
+        this.signalFor(menu).set(false);
+    }
+
+    closeAll(): void {
+        this.volumeOpen.set(false);
+        this.audioOpen.set(false);
+        this.subtitleOpen.set(false);
+        this.speedOpen.set(false);
+        this.aspectOpen.set(false);
+    }
+
+    reconcile(availability: ControlsMenuAvailability): boolean {
+        let changed = false;
+        for (const menu of CONTROL_MENUS) {
+            const open = this.signalFor(menu);
+            if (open() && !availability[menu]) {
+                open.set(false);
+                changed = true;
+            }
+        }
+        return changed;
+    }
+
+    reconcileControllerAvailability(
+        showControls: boolean,
+        capabilities: PlayerControlsCapabilities,
+        state: PlayerControlsState
+    ): boolean {
+        return this.reconcile(
+            getControlsMenuAvailability(showControls, capabilities, state)
+        );
+    }
+
+    private signalFor(menu: ControlsMenu) {
+        switch (menu) {
+            case 'volume':
+                return this.volumeOpen;
+            case 'audio':
+                return this.audioOpen;
+            case 'subtitle':
+                return this.subtitleOpen;
+            case 'speed':
+                return this.speedOpen;
+            case 'aspect':
+                return this.aspectOpen;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-shortcuts.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-shortcuts.spec.ts
new file mode 100644
index 000000000..64135ad46
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-shortcuts.spec.ts
@@ -0,0 +1,266 @@
+import { ControlsShortcuts } from './controls-shortcuts';
+
+describe('ControlsShortcuts', () => {
+    let shortcuts: ControlsShortcuts;
+    let handlers: {
+        isAvailable: jest.Mock<boolean, []>;
+        canTogglePaused: jest.Mock<boolean, []>;
+        canSeek: jest.Mock<boolean, []>;
+        canAdjustVolume: jest.Mock<boolean, []>;
+        canToggleFullscreen: jest.Mock<boolean, []>;
+        onEscape: jest.Mock;
+        togglePaused: jest.Mock;
+        toggleFullscreen: jest.Mock;
+        seekBy: jest.Mock;
+        adjustVolume: jest.Mock;
+        toggleMute: jest.Mock;
+    };
+
+    beforeEach(() => {
+        shortcuts = new ControlsShortcuts();
+        handlers = {
+            isAvailable: jest.fn(() => true),
+            canTogglePaused: jest.fn(() => true),
+            canSeek: jest.fn(() => true),
+            canAdjustVolume: jest.fn(() => true),
+            canToggleFullscreen: jest.fn(() => true),
+            onEscape: jest.fn(),
+            togglePaused: jest.fn(),
+            toggleFullscreen: jest.fn(),
+            seekBy: jest.fn(),
+            adjustVolume: jest.fn(),
+            toggleMute: jest.fn(),
+        };
+        shortcuts.attach(handlers);
+    });
+
+    afterEach(() => {
+        shortcuts.detach();
+    });
+
+    it('forwards playback, seek, volume, and fullscreen shortcuts', () => {
+        expect(dispatchKey(' ')).toBe(true);
+        expect(dispatchKey('ArrowLeft')).toBe(true);
+        expect(dispatchKey('ArrowRight')).toBe(true);
+        expect(dispatchKey('ArrowUp')).toBe(true);
+        expect(dispatchKey('ArrowDown')).toBe(true);
+        expect(dispatchKey('f')).toBe(true);
+        expect(dispatchKey('M')).toBe(true);
+
+        expect(handlers.togglePaused).toHaveBeenCalledTimes(1);
+        expect(handlers.seekBy).toHaveBeenCalledWith(-5);
+        expect(handlers.seekBy).toHaveBeenCalledWith(5);
+        expect(handlers.adjustVolume).toHaveBeenCalledWith(0.05);
+        expect(handlers.adjustVolume).toHaveBeenCalledWith(-0.05);
+        expect(handlers.toggleFullscreen).toHaveBeenCalledTimes(1);
+        expect(handlers.toggleMute).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not consume keys for unsupported actions', () => {
+        handlers.canTogglePaused.mockReturnValue(false);
+        handlers.canSeek.mockReturnValue(false);
+        handlers.canAdjustVolume.mockReturnValue(false);
+        handlers.canToggleFullscreen.mockReturnValue(false);
+
+        expect(dispatchKey('k')).toBe(false);
+        expect(dispatchKey('ArrowRight')).toBe(false);
+        expect(dispatchKey('ArrowDown')).toBe(false);
+        expect(dispatchKey('m')).toBe(false);
+        expect(dispatchKey('f')).toBe(false);
+
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+        expect(handlers.seekBy).not.toHaveBeenCalled();
+        expect(handlers.adjustVolume).not.toHaveBeenCalled();
+        expect(handlers.toggleMute).not.toHaveBeenCalled();
+        expect(handlers.toggleFullscreen).not.toHaveBeenCalled();
+    });
+
+    it('always allows escape to close popovers even when playback is unavailable', () => {
+        handlers.isAvailable.mockReturnValue(false);
+
+        expect(dispatchKey('k')).toBe(false);
+        expect(dispatchKey('Escape')).toBe(false);
+
+        expect(handlers.onEscape).toHaveBeenCalledTimes(1);
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+    });
+
+    it('ignores shortcuts inside form controls', () => {
+        const input = document.createElement('input');
+        const select = document.createElement('select');
+        document.body.append(input, select);
+
+        input.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: 'ArrowUp',
+                bubbles: true,
+                cancelable: true,
+            })
+        );
+        select.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: 'm',
+                bubbles: true,
+                cancelable: true,
+            })
+        );
+
+        expect(handlers.adjustVolume).not.toHaveBeenCalled();
+        expect(handlers.toggleMute).not.toHaveBeenCalled();
+        input.remove();
+        select.remove();
+    });
+
+    it('ignores shortcuts from buttons and ARIA menu controls', () => {
+        const button = document.createElement('button');
+        const menuItem = document.createElement('div');
+        menuItem.setAttribute('role', 'menuitemradio');
+        document.body.append(button, menuItem);
+
+        button.focus();
+        button.dispatchEvent(
+            new KeyboardEvent('keydown', {
+                key: ' ',
+                bubbles: true,
+                cancelable: true,
+            })
+        );
+        const menuEvent = new KeyboardEvent('keydown', {
+            key: 'k',
+            bubbles: true,
+            cancelable: true,
+        });
+        Object.defineProperty(menuEvent, 'composedPath', {
+            value: () => [menuItem, document.body, document],
+        });
+        document.dispatchEvent(menuEvent);
+
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+        button.remove();
+        menuItem.remove();
+    });
+
+    it('ignores modified playback shortcuts without preventing their defaults', () => {
+        expect(dispatchKey('k', { metaKey: true })).toBe(false);
+        expect(dispatchKey('f', { ctrlKey: true })).toBe(false);
+        expect(dispatchKey('f', { metaKey: true })).toBe(false);
+        expect(dispatchKey('ArrowRight', { altKey: true })).toBe(false);
+
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+        expect(handlers.toggleFullscreen).not.toHaveBeenCalled();
+        expect(handlers.seekBy).not.toHaveBeenCalled();
+    });
+
+    it('still forwards Escape when modifier keys are held', () => {
+        expect(
+            dispatchKey('Escape', {
+                altKey: true,
+                ctrlKey: true,
+                metaKey: true,
+            })
+        ).toBe(false);
+
+        expect(handlers.onEscape).toHaveBeenCalledTimes(1);
+    });
+
+    it('ignores shortcuts when a text control is anywhere in the composed path', () => {
+        // Simulate a shadow-DOM retargeted event: target is a host element,
+        // but the real input is exposed via composedPath().
+        const host = document.createElement('div');
+        const input = document.createElement('input');
+        document.body.append(host);
+
+        const event = new KeyboardEvent('keydown', {
+            key: 'ArrowUp',
+            bubbles: true,
+            cancelable: true,
+        });
+        Object.defineProperty(event, 'composedPath', {
+            value: () => [input, host, document.body, document],
+        });
+        Object.defineProperty(event, 'target', { value: host });
+        document.dispatchEvent(event);
+
+        expect(handlers.adjustVolume).not.toHaveBeenCalled();
+        host.remove();
+    });
+
+    it('routes shortcuts to the active instance and falls back after detach', () => {
+        const other = new ControlsShortcuts();
+        const otherHandlers = {
+            isAvailable: jest.fn(() => true),
+            canTogglePaused: jest.fn(() => true),
+            canSeek: jest.fn(() => true),
+            canAdjustVolume: jest.fn(() => true),
+            canToggleFullscreen: jest.fn(() => true),
+            onEscape: jest.fn(),
+            togglePaused: jest.fn(),
+            toggleFullscreen: jest.fn(),
+            seekBy: jest.fn(),
+            adjustVolume: jest.fn(),
+            toggleMute: jest.fn(),
+        };
+        other.attach(otherHandlers);
+
+        dispatchKey('k');
+        expect(handlers.togglePaused).toHaveBeenCalledTimes(1);
+        expect(otherHandlers.togglePaused).not.toHaveBeenCalled();
+
+        other.activate();
+        dispatchKey('k');
+        expect(handlers.togglePaused).toHaveBeenCalledTimes(1);
+        expect(otherHandlers.togglePaused).toHaveBeenCalledTimes(1);
+
+        dispatchKey('Escape');
+        expect(handlers.onEscape).toHaveBeenCalledTimes(1);
+        expect(otherHandlers.onEscape).toHaveBeenCalledTimes(1);
+
+        other.detach();
+        dispatchKey('k');
+        expect(handlers.togglePaused).toHaveBeenCalledTimes(2);
+    });
+
+    it('falls back to an available instance when the active one is unavailable', () => {
+        const other = new ControlsShortcuts();
+        const otherHandlers = {
+            isAvailable: jest.fn(() => true),
+            canTogglePaused: jest.fn(() => true),
+            canSeek: jest.fn(() => true),
+            canAdjustVolume: jest.fn(() => true),
+            canToggleFullscreen: jest.fn(() => true),
+            onEscape: jest.fn(),
+            togglePaused: jest.fn(),
+            toggleFullscreen: jest.fn(),
+            seekBy: jest.fn(),
+            adjustVolume: jest.fn(),
+            toggleMute: jest.fn(),
+        };
+        other.attach(otherHandlers);
+        handlers.isAvailable.mockReturnValue(false);
+
+        dispatchKey('k');
+
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+        expect(otherHandlers.togglePaused).toHaveBeenCalledTimes(1);
+        other.detach();
+    });
+
+    it('detaches its document listener', () => {
+        shortcuts.detach();
+
+        dispatchKey('k');
+
+        expect(handlers.togglePaused).not.toHaveBeenCalled();
+    });
+});
+
+function dispatchKey(key: string, init: KeyboardEventInit = {}): boolean {
+    const event = new KeyboardEvent('keydown', {
+        key,
+        bubbles: true,
+        cancelable: true,
+        ...init,
+    });
+    document.dispatchEvent(event);
+    return event.defaultPrevented;
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-shortcuts.ts b/libs/ui/playback/src/lib/player-controls/controls-shortcuts.ts
new file mode 100644
index 000000000..696925149
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-shortcuts.ts
@@ -0,0 +1,203 @@
+export interface ControlsShortcutHandlers {
+    isAvailable: () => boolean;
+    canTogglePaused: () => boolean;
+    canSeek: () => boolean;
+    canAdjustVolume: () => boolean;
+    canToggleFullscreen: () => boolean;
+    onEscape: () => void;
+    togglePaused: () => void;
+    toggleFullscreen: () => void;
+    seekBy: (deltaSeconds: number) => void;
+    adjustVolume: (delta: number) => void;
+    toggleMute: () => void;
+}
+
+const INTERACTIVE_SELECTOR = [
+    'a[href]',
+    'button',
+    'input',
+    'select',
+    'summary',
+    'textarea',
+    '[contenteditable]:not([contenteditable="false"])',
+    '[role="button"]',
+    '[role="checkbox"]',
+    '[role="combobox"]',
+    '[role="link"]',
+    '[role="listbox"]',
+    '[role^="menuitem"]',
+    '[role="option"]',
+    '[role="radio"]',
+    '[role="slider"]',
+    '[role="switch"]',
+    '[role="textbox"]',
+].join(',');
+
+export class ControlsShortcuts {
+    private static readonly instances = new Set<ControlsShortcuts>();
+    private static active: ControlsShortcuts | null = null;
+
+    private handlers: ControlsShortcutHandlers | null = null;
+    private readonly listener = (event: KeyboardEvent) => this.handle(event);
+
+    attach(handlers: ControlsShortcutHandlers): void {
+        this.handlers = handlers;
+        ControlsShortcuts.instances.add(this);
+        ControlsShortcuts.active ??= this;
+        if (typeof document !== 'undefined') {
+            document.addEventListener('keydown', this.listener);
+        }
+    }
+
+    activate(): void {
+        if (this.handlers) {
+            ControlsShortcuts.active = this;
+        }
+    }
+
+    detach(): void {
+        if (typeof document !== 'undefined') {
+            document.removeEventListener('keydown', this.listener);
+        }
+        this.handlers = null;
+        ControlsShortcuts.instances.delete(this);
+        if (ControlsShortcuts.active === this) {
+            ControlsShortcuts.active = ControlsShortcuts.lastAttachedInstance();
+        }
+    }
+
+    private handle(event: KeyboardEvent): void {
+        const handlers = this.handlers;
+        if (!handlers) {
+            return;
+        }
+
+        // If another mounted controls instance already handled this keypress
+        // (it calls preventDefault below), don't double-execute it here.
+        if (event.defaultPrevented) {
+            return;
+        }
+
+        if (event.key === 'Escape') {
+            handlers.onEscape();
+            return;
+        }
+
+        if (
+            this.shouldIgnore(event) ||
+            ControlsShortcuts.resolvePlaybackOwner() !== this
+        ) {
+            return;
+        }
+
+        switch (event.key) {
+            case ' ':
+            case 'k':
+            case 'K':
+                if (!handlers.canTogglePaused()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.togglePaused();
+                return;
+            case 'f':
+            case 'F':
+                if (!handlers.canToggleFullscreen()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.toggleFullscreen();
+                return;
+            case 'ArrowLeft':
+                if (!handlers.canSeek()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.seekBy(-5);
+                return;
+            case 'ArrowRight':
+                if (!handlers.canSeek()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.seekBy(5);
+                return;
+            case 'ArrowUp':
+                if (!handlers.canAdjustVolume()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.adjustVolume(0.05);
+                return;
+            case 'ArrowDown':
+                if (!handlers.canAdjustVolume()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.adjustVolume(-0.05);
+                return;
+            case 'm':
+            case 'M':
+                if (!handlers.canAdjustVolume()) {
+                    return;
+                }
+                event.preventDefault();
+                handlers.toggleMute();
+                return;
+        }
+    }
+
+    /**
+     * Ignore modified playback keys so app/native shortcuts retain ownership,
+     * and ignore events originating from an interactive control anywhere in
+     * the composed path. Escape is handled before this check so it can still
+     * close controls popovers while a modifier key is held.
+     */
+    private shouldIgnore(event: KeyboardEvent): boolean {
+        if (event.metaKey || event.ctrlKey || event.altKey) {
+            return true;
+        }
+
+        const path =
+            typeof event.composedPath === 'function'
+                ? event.composedPath()
+                : [];
+        const nodes = path.length > 0 ? path : [event.target];
+        return nodes.some((node) => {
+            const element = node as HTMLElement | null;
+            if (!element || typeof element.tagName !== 'string') {
+                return false;
+            }
+            if (
+                typeof element.matches === 'function' &&
+                element.matches(INTERACTIVE_SELECTOR)
+            ) {
+                return true;
+            }
+            return element.isContentEditable === true;
+        });
+    }
+
+    private static resolvePlaybackOwner(): ControlsShortcuts | null {
+        if (this.active?.handlers?.isAvailable()) {
+            return this.active;
+        }
+
+        let fallback: ControlsShortcuts | null = null;
+        for (const instance of this.instances) {
+            if (instance.handlers?.isAvailable()) {
+                fallback = instance;
+            }
+        }
+        this.active = fallback;
+        return fallback;
+    }
+
+    private static lastAttachedInstance(): ControlsShortcuts | null {
+        let last: ControlsShortcuts | null = null;
+        for (const instance of this.instances) {
+            last = instance;
+        }
+        return last;
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-surface.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-surface.spec.ts
new file mode 100644
index 000000000..fdff8227c
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-surface.spec.ts
@@ -0,0 +1,179 @@
+import { ControlsSurface } from './controls-surface';
+
+describe('ControlsSurface', () => {
+    let reveal: jest.Mock;
+    let toggleFullscreen: jest.Mock;
+    let closePopovers: jest.Mock;
+    let togglePlay: jest.Mock;
+    let canTogglePlay: boolean;
+    let menuOpen: boolean;
+    let surface: ControlsSurface;
+    let element: HTMLElement;
+
+    beforeEach(() => {
+        reveal = jest.fn();
+        toggleFullscreen = jest.fn();
+        closePopovers = jest.fn();
+        togglePlay = jest.fn();
+        canTogglePlay = true;
+        menuOpen = false;
+        element = document.createElement('div');
+        document.body.appendChild(element);
+        surface = new ControlsSurface({
+            reveal,
+            toggleFullscreen,
+            closePopovers,
+            togglePlay,
+            canTogglePlay: () => canTogglePlay,
+            isMenuOpen: () => menuOpen,
+        });
+    });
+
+    afterEach(() => {
+        surface.dispose();
+        element.remove();
+        jest.useRealTimers();
+    });
+
+    it('reveals on pointer activity over the surface', () => {
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('pointermove', { bubbles: true }));
+        element.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        expect(reveal).toHaveBeenCalledTimes(2);
+    });
+
+    it('toggles fullscreen on a double-click outside interactive elements', () => {
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+        expect(toggleFullscreen).toHaveBeenCalledTimes(1);
+    });
+
+    it('ignores double-clicks on buttons/inputs/sliders', () => {
+        const button = document.createElement('button');
+        element.appendChild(button);
+        surface.attachSurface(element);
+        button.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+        expect(toggleFullscreen).not.toHaveBeenCalled();
+    });
+
+    it('toggles play on a single click after the defer delay', () => {
+        jest.useFakeTimers();
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        expect(togglePlay).not.toHaveBeenCalled();
+        jest.advanceTimersByTime(300);
+        expect(togglePlay).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not queue play while toggling is unavailable', () => {
+        jest.useFakeTimers();
+        canTogglePlay = false;
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+
+        canTogglePlay = true;
+        jest.advanceTimersByTime(300);
+
+        expect(togglePlay).not.toHaveBeenCalled();
+    });
+
+    it('does not toggle play on a double-click, only fullscreens', () => {
+        jest.useFakeTimers();
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        element.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+        jest.advanceTimersByTime(300);
+        expect(togglePlay).not.toHaveBeenCalled();
+        expect(toggleFullscreen).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not toggle play on a click on a button', () => {
+        jest.useFakeTimers();
+        const button = document.createElement('button');
+        element.appendChild(button);
+        surface.attachSurface(element);
+        button.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        jest.advanceTimersByTime(300);
+        expect(togglePlay).not.toHaveBeenCalled();
+    });
+
+    it('ignores clicks and double-clicks from the controls root', () => {
+        jest.useFakeTimers();
+        surface.dispose();
+        const controlsRoot = document.createElement('div');
+        const timeLabel = document.createElement('span');
+        controlsRoot.appendChild(timeLabel);
+        element.appendChild(controlsRoot);
+        surface = new ControlsSurface(
+            {
+                reveal,
+                toggleFullscreen,
+                closePopovers,
+                togglePlay,
+                canTogglePlay: () => canTogglePlay,
+                isMenuOpen: () => menuOpen,
+            },
+            controlsRoot
+        );
+        surface.attachSurface(element);
+
+        timeLabel.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        jest.advanceTimersByTime(300);
+        expect(togglePlay).not.toHaveBeenCalled();
+
+        timeLabel.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+        expect(toggleFullscreen).not.toHaveBeenCalled();
+    });
+
+    it('closes an open menu on click instead of toggling play', () => {
+        jest.useFakeTimers();
+        menuOpen = true;
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+        jest.advanceTimersByTime(300);
+        expect(togglePlay).not.toHaveBeenCalled();
+        expect(closePopovers).toHaveBeenCalledTimes(1);
+    });
+
+    it('closes popovers on an outside pointer-down', () => {
+        surface.attachSurface(element);
+        const outside = document.createElement('div');
+        document.body.appendChild(outside);
+        outside.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true }));
+        expect(closePopovers).toHaveBeenCalledTimes(1);
+        outside.remove();
+    });
+
+    it('does not close popovers when the pointer-down is inside the surface', () => {
+        surface.attachSurface(element);
+        element.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true }));
+        expect(closePopovers).not.toHaveBeenCalled();
+    });
+
+    it('detaches the previous surface listeners when rebinding', () => {
+        const first = document.createElement('div');
+        surface.attachSurface(first);
+        surface.attachSurface(element);
+        first.dispatchEvent(new MouseEvent('pointermove', { bubbles: true }));
+        expect(reveal).not.toHaveBeenCalled();
+    });
+
+    it('cancels a pending click-to-play action when rebinding', () => {
+        jest.useFakeTimers();
+        const first = document.createElement('div');
+        surface.attachSurface(first);
+        first.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+
+        surface.attachSurface(element);
+        jest.advanceTimersByTime(300);
+
+        expect(togglePlay).not.toHaveBeenCalled();
+    });
+
+    it('stops reacting after dispose', () => {
+        surface.attachSurface(element);
+        surface.dispose();
+        element.dispatchEvent(new MouseEvent('pointermove', { bubbles: true }));
+        expect(reveal).not.toHaveBeenCalled();
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-surface.ts b/libs/ui/playback/src/lib/player-controls/controls-surface.ts
new file mode 100644
index 000000000..e47a2e77e
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-surface.ts
@@ -0,0 +1,161 @@
+export interface ControlsSurfaceHandlers {
+    /** Reveal the controls (pointer move / enter / click on the surface). */
+    reveal: () => void;
+    /** Toggle fullscreen on an unhandled double-click. */
+    toggleFullscreen: () => void;
+    /** Close popovers on an outside pointer-down. */
+    closePopovers: () => void;
+    /**
+     * Toggle play/pause on a single click on the viewport (optional). When
+     * provided, a single click on a non-interactive area of the surface toggles
+     * playback after a short delay so a double-click (fullscreen) can cancel it.
+     */
+    togglePlay?: () => void;
+    /** Whether a viewport click may currently queue a play/pause toggle. */
+    canTogglePlay?: () => boolean;
+    /** Whether a popover/menu is currently open (guards click-to-pause). */
+    isMenuOpen?: () => boolean;
+}
+
+/**
+ * The pause is deferred so a double-click (fullscreen) can cancel it before it
+ * runs. Mirrors the embedded-MPV viewport click behavior.
+ */
+const VIEWPORT_CLICK_PAUSE_DELAY_MS = 250;
+
+const INTERACTIVE_SELECTOR = 'button, input, [role="slider"]';
+
+/**
+ * Owns the surface + document interaction wiring for the controls: reveal on
+ * pointer activity, click-to-pause on the viewport, fullscreen on double-click,
+ * and popover dismissal on an outside pointer-down. The component binds
+ * {@link attachSurface} from an effect and can provide a separate inside root
+ * for controls rendered as a sibling of the playback surface.
+ */
+export class ControlsSurface {
+    private surface: HTMLElement | null = null;
+    private surfaceCleanup: (() => void) | null = null;
+    private clickPauseTimer: ReturnType<typeof setTimeout> | null = null;
+
+    private readonly onDocumentPointerDown = (event: PointerEvent) => {
+        const path = event.composedPath();
+        if (
+            !this.surface ||
+            path.includes(this.surface) ||
+            (this.insideRoot !== null && path.includes(this.insideRoot))
+        ) {
+            return;
+        }
+        this.handlers.closePopovers();
+    };
+
+    constructor(
+        private readonly handlers: ControlsSurfaceHandlers,
+        /** Additional root whose descendants count as inside for dismissal. */
+        private readonly insideRoot: HTMLElement | null = null
+    ) {
+        if (typeof document !== 'undefined') {
+            document.addEventListener(
+                'pointerdown',
+                this.onDocumentPointerDown
+            );
+        }
+    }
+
+    /** Rebind the per-surface listeners; returns a cleanup for the effect. */
+    attachSurface(surface: HTMLElement | null): () => void {
+        this.clearClickPauseTimer();
+        this.surfaceCleanup?.();
+        this.surfaceCleanup = null;
+        this.surface = surface;
+        if (!surface) {
+            return () => undefined;
+        }
+        const reveal = () => this.handlers.reveal();
+        const click = (event: MouseEvent) => this.onClick(event);
+        const dblclick = (event: MouseEvent) => this.onDblClick(event);
+        surface.addEventListener('pointermove', reveal, { passive: true });
+        surface.addEventListener('pointerenter', reveal);
+        surface.addEventListener('click', click);
+        surface.addEventListener('dblclick', dblclick);
+        this.surfaceCleanup = () => {
+            surface.removeEventListener('pointermove', reveal);
+            surface.removeEventListener('pointerenter', reveal);
+            surface.removeEventListener('click', click);
+            surface.removeEventListener('dblclick', dblclick);
+        };
+        return () => this.surfaceCleanup?.();
+    }
+
+    dispose(): void {
+        this.clearClickPauseTimer();
+        this.surfaceCleanup?.();
+        this.surfaceCleanup = null;
+        if (typeof document !== 'undefined') {
+            document.removeEventListener(
+                'pointerdown',
+                this.onDocumentPointerDown
+            );
+        }
+    }
+
+    private onClick(event: MouseEvent): void {
+        // Always reveal the controls on a click on the surface.
+        this.handlers.reveal();
+        if (this.isInsideRoot(event)) {
+            return;
+        }
+        if (!this.handlers.togglePlay) {
+            return;
+        }
+        const target = event.target as HTMLElement | null;
+        if (target?.closest(INTERACTIVE_SELECTOR)) {
+            return;
+        }
+        // A click while a menu is open dismisses it instead of toggling.
+        if (this.handlers.isMenuOpen?.()) {
+            this.handlers.closePopovers();
+            return;
+        }
+        if (this.handlers.canTogglePlay?.() === false) {
+            return;
+        }
+        this.clearClickPauseTimer();
+        this.clickPauseTimer = setTimeout(() => {
+            this.clickPauseTimer = null;
+            this.handlers.togglePlay?.();
+        }, VIEWPORT_CLICK_PAUSE_DELAY_MS);
+    }
+
+    private onDblClick(event: MouseEvent): void {
+        // Cancel a pending single-click pause so a dblclick only fullscreens.
+        this.clearClickPauseTimer();
+        if (this.isInsideRoot(event)) {
+            return;
+        }
+        const target = event.target as HTMLElement | null;
+        if (target?.closest(INTERACTIVE_SELECTOR)) {
+            return;
+        }
+        this.handlers.toggleFullscreen();
+    }
+
+    private isInsideRoot(event: MouseEvent): boolean {
+        if (!this.insideRoot) {
+            return false;
+        }
+        const path = event.composedPath();
+        const target = event.target as Node | null;
+        return (
+            path.includes(this.insideRoot) ||
+            (target !== null && this.insideRoot.contains(target))
+        );
+    }
+
+    private clearClickPauseTimer(): void {
+        if (this.clickPauseTimer !== null) {
+            clearTimeout(this.clickPauseTimer);
+            this.clickPauseTimer = null;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-timeline.ts b/libs/ui/playback/src/lib/player-controls/controls-timeline.ts
new file mode 100644
index 000000000..b6ac54130
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-timeline.ts
@@ -0,0 +1,51 @@
+import { Signal, computed, signal } from '@angular/core';
+import type { PlayerControlsState } from './player-controls.model';
+
+/**
+ * Owns the scrub state and timeline projections for the controls bar: the
+ * current slider value (scrub position while dragging, playback position
+ * otherwise), the bounded duration, and the progress percentage.
+ */
+export class ControlsTimeline {
+    readonly scrubPosition = signal<number | null>(null);
+
+    constructor(private readonly state: Signal<PlayerControlsState>) {}
+
+    readonly duration = computed(() => {
+        const duration = this.state().durationSeconds;
+        return typeof duration === 'number' && Number.isFinite(duration)
+            ? Math.max(0, duration)
+            : 0;
+    });
+
+    readonly value = computed(
+        () =>
+            this.normalize(
+                this.scrubPosition() ?? this.state().positionSeconds
+            ) ?? 0
+    );
+
+    readonly progress = computed(() => {
+        const duration = this.duration();
+        return this.state().canSeek && duration > 0
+            ? (this.value() / duration) * 100
+            : 0;
+    });
+
+    readEventValue(event: Event): number | null {
+        return this.normalize(Number((event.target as HTMLInputElement).value));
+    }
+
+    private normalize(value: number): number | null {
+        if (!Number.isFinite(value)) {
+            return null;
+        }
+
+        const duration = this.state().durationSeconds;
+        const upperBound =
+            typeof duration === 'number' && Number.isFinite(duration)
+                ? Math.max(0, duration)
+                : Number.POSITIVE_INFINITY;
+        return Math.min(Math.max(0, value), upperBound);
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-view-model.ts b/libs/ui/playback/src/lib/player-controls/controls-view-model.ts
new file mode 100644
index 000000000..c4dcf3ff5
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-view-model.ts
@@ -0,0 +1,114 @@
+import { Signal, computed } from '@angular/core';
+import { formatTime, volumeIcon } from './controls-format.utils';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsState,
+} from './player-controls.model';
+
+export interface ControlsViewModelDeps {
+    state: Signal<PlayerControlsState>;
+    capabilities: Signal<PlayerControlsCapabilities>;
+    volume: Signal<number>;
+    isFullscreen: Signal<boolean>;
+    canFullscreenNative: () => boolean;
+    showControls: Signal<boolean>;
+    /** Whether the auto-hide layer currently wants the bar visible. */
+    autoHideVisible: Signal<boolean>;
+    anyMenuOpen: Signal<boolean>;
+}
+
+/**
+ * Pure, framework-light bundle of the controls' derived presentation signals.
+ * Keeps the component lean: it derives status flags, track availability,
+ * recording status text, and the volume/fullscreen labels straight from the
+ * controller state + capabilities. The component still owns the auto-hide
+ * visibility (which depends on transient state) and binds these by name.
+ */
+export function createControlsViewModel(deps: ControlsViewModelDeps) {
+    const { state, capabilities, volume, isFullscreen } = deps;
+
+    const isLoading = computed(() => state().status === 'loading');
+    const isPaused = computed(() => {
+        const status = state().status;
+        return (
+            status === 'paused' ||
+            status === 'idle' ||
+            status === 'ended' ||
+            status === 'error'
+        );
+    });
+    const isPlaying = computed(() => state().status === 'playing');
+    const canTogglePlay = computed(() => {
+        const currentState = state();
+        return (
+            !currentState.stalled &&
+            currentState.status !== 'loading' &&
+            currentState.status !== 'error'
+        );
+    });
+
+    const hasAudioTracks = computed(
+        () => capabilities().audioTracks && state().audioTracks.length > 1
+    );
+    const hasSubtitleTracks = computed(
+        () => capabilities().subtitles && state().subtitleTracks.length > 0
+    );
+    const canRecord = computed(
+        () =>
+            capabilities().recording &&
+            state().isLive &&
+            state().status !== 'error'
+    );
+    const isRecording = computed(() => state().recording.active);
+    const recordingStatusText = computed(() => {
+        if (!capabilities().recording) {
+            return '';
+        }
+        const recording = state().recording;
+        if (recording.active) {
+            return `REC ${formatTime(recording.elapsedSeconds)}`;
+        }
+        return recording.message;
+    });
+
+    const volumeIconName = computed(() => volumeIcon(volume()));
+    const canFullscreen = computed(
+        () => capabilities().fullscreen && deps.canFullscreenNative()
+    );
+
+    const controlsAreVisible = computed(() => {
+        if (!deps.showControls()) {
+            return false;
+        }
+        return (
+            deps.autoHideVisible() ||
+            isLoading() ||
+            isPaused() ||
+            deps.anyMenuOpen() ||
+            Boolean(state().statusMessage)
+        );
+    });
+    const hideCursor = computed(
+        () =>
+            deps.showControls() &&
+            isFullscreen() &&
+            isPlaying() &&
+            !controlsAreVisible()
+    );
+
+    return {
+        isLoading,
+        isPaused,
+        isPlaying,
+        canTogglePlay,
+        hasAudioTracks,
+        hasSubtitleTracks,
+        canRecord,
+        isRecording,
+        recordingStatusText,
+        volumeIcon: volumeIconName,
+        canFullscreen,
+        controlsAreVisible,
+        hideCursor,
+    };
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-visibility.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-visibility.spec.ts
new file mode 100644
index 000000000..799b76955
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-visibility.spec.ts
@@ -0,0 +1,66 @@
+import { ControlsVisibility } from './controls-visibility';
+
+describe('ControlsVisibility', () => {
+    beforeEach(() => {
+        jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+        jest.useRealTimers();
+    });
+
+    it('reveals and auto-hides when the canHide predicate allows it', () => {
+        const visibility = new ControlsVisibility(() => true, 1000);
+
+        visibility.reveal();
+        expect(visibility.visible()).toBe(true);
+
+        jest.advanceTimersByTime(1000);
+        expect(visibility.visible()).toBe(false);
+    });
+
+    it('stays visible while canHide returns false', () => {
+        const visibility = new ControlsVisibility(() => false, 1000);
+
+        visibility.reveal();
+        jest.advanceTimersByTime(1000);
+        expect(visibility.visible()).toBe(true);
+    });
+
+    it('does not schedule a hide when reveal is called with scheduleHide:false', () => {
+        const visibility = new ControlsVisibility(() => true, 1000);
+
+        visibility.reveal({ scheduleHide: false });
+        jest.advanceTimersByTime(1000);
+        expect(visibility.visible()).toBe(true);
+    });
+
+    it('starts a full hide delay after leaving a pinned state', () => {
+        let canHide = true;
+        const visibility = new ControlsVisibility(() => canHide, 1000);
+
+        visibility.reveal();
+        jest.advanceTimersByTime(400);
+
+        canHide = false;
+        visibility.reveal({ scheduleHide: false });
+        jest.advanceTimersByTime(100);
+
+        canHide = true;
+        visibility.scheduleHide();
+        jest.advanceTimersByTime(999);
+        expect(visibility.visible()).toBe(true);
+
+        jest.advanceTimersByTime(1);
+        expect(visibility.visible()).toBe(false);
+    });
+
+    it('clears a pending hide timer on dispose', () => {
+        const visibility = new ControlsVisibility(() => true, 1000);
+
+        visibility.reveal();
+        visibility.dispose();
+        jest.advanceTimersByTime(1000);
+        expect(visibility.visible()).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-visibility.ts b/libs/ui/playback/src/lib/player-controls/controls-visibility.ts
new file mode 100644
index 000000000..37f3cab56
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-visibility.ts
@@ -0,0 +1,62 @@
+import { signal } from '@angular/core';
+
+export const HIDE_CONTROLS_DELAY_MS = 2500;
+
+export interface RevealOptions {
+    /** When false, reveals and clears any pending auto-hide without rescheduling. */
+    scheduleHide?: boolean;
+}
+
+/**
+ * Small framework-light helper that owns the controls reveal/auto-hide
+ * lifecycle. The controls become visible on user interaction and auto-hide
+ * after a delay, but only when the `canHide` predicate permits it (e.g. only
+ * while playing, no menu open, no status text showing).
+ */
+export class ControlsVisibility {
+    readonly visible = signal(true);
+
+    private hideTimer: number | null = null;
+
+    constructor(
+        private readonly canHide: () => boolean,
+        private readonly delayMs = HIDE_CONTROLS_DELAY_MS
+    ) {}
+
+    reveal(options: RevealOptions = {}): void {
+        const scheduleHide = options.scheduleHide ?? true;
+        this.visible.set(true);
+        this.clear();
+        if (scheduleHide) {
+            this.scheduleHide();
+        }
+    }
+
+    scheduleHide(): void {
+        if (!this.canHide()) {
+            this.clear();
+            return;
+        }
+        if (!this.visible() || this.hideTimer !== null) {
+            return;
+        }
+        this.hideTimer = window.setTimeout(() => {
+            this.hideTimer = null;
+            if (this.canHide()) {
+                this.visible.set(false);
+            }
+        }, this.delayMs);
+    }
+
+    clear(): void {
+        if (this.hideTimer === null) {
+            return;
+        }
+        window.clearTimeout(this.hideTimer);
+        this.hideTimer = null;
+    }
+
+    dispose(): void {
+        this.clear();
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/controls-volume.spec.ts b/libs/ui/playback/src/lib/player-controls/controls-volume.spec.ts
new file mode 100644
index 000000000..bfa521c86
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-volume.spec.ts
@@ -0,0 +1,130 @@
+import { ControlsVolume } from './controls-volume';
+import type { PlayerController } from './player-controls.model';
+
+describe('ControlsVolume', () => {
+    let applied: number[];
+    let flashes: Array<{ icon: string; label: string }>;
+    let openCount: number;
+    let closeCount: number;
+    let volume: ControlsVolume;
+
+    beforeEach(() => {
+        localStorage.clear();
+        applied = [];
+        flashes = [];
+        openCount = 0;
+        closeCount = 0;
+        volume = new ControlsVolume({
+            apply: (value) => applied.push(value),
+            flash: (icon, label) => flashes.push({ icon, label }),
+            mutedLabel: () => 'Stumm',
+            openPopover: () => (openCount += 1),
+            closePopover: () => (closeCount += 1),
+        });
+    });
+
+    afterEach(() => {
+        volume.dispose();
+        jest.useRealTimers();
+    });
+
+    it('set updates the signal, persists, and applies', () => {
+        volume.set(0.4);
+        expect(volume.value()).toBe(0.4);
+        expect(localStorage.getItem('volume')).toBe('0.4');
+        expect(applied).toEqual([0.4]);
+    });
+
+    it('clamps set values to [0, 1]', () => {
+        volume.set(2);
+        expect(volume.value()).toBe(1);
+        volume.set(-1);
+        expect(volume.value()).toBe(0);
+    });
+
+    it('adjust changes value and flashes percentage', () => {
+        volume.set(0.5);
+        flashes = [];
+        volume.adjust(0.1);
+        expect(volume.value()).toBeCloseTo(0.6);
+        expect(flashes.at(-1)?.label).toBe('60%');
+    });
+
+    it('toggleMute stores and restores the previous volume', () => {
+        volume.set(0.8);
+        volume.toggleMute();
+        expect(volume.value()).toBe(0);
+        expect(flashes.at(-1)).toEqual({ icon: 'volume_off', label: 'Stumm' });
+
+        volume.toggleMute();
+        expect(volume.value()).toBe(0.8);
+    });
+
+    it('toggleMute restores a default when nothing was muted from', () => {
+        volume.set(0);
+        flashes = [];
+        volume.toggleMute();
+        expect(volume.value()).toBe(0.5);
+    });
+
+    it('reconcile sets the value without persisting or applying', () => {
+        volume.reconcile(0.25);
+        expect(volume.value()).toBe(0.25);
+        expect(applied).toEqual([]);
+        expect(localStorage.getItem('volume')).toBeNull();
+    });
+
+    it('uses the first controller snapshot when no volume is persisted', () => {
+        const controller = {} as PlayerController;
+
+        volume.initializeController(controller, 0.4);
+
+        expect(volume.value()).toBe(0.4);
+        expect(applied).toEqual([]);
+    });
+
+    it('applies persisted volume before accepting a later controller snapshot', () => {
+        const controller = {} as PlayerController;
+        volume.set(0.3);
+        applied = [];
+
+        volume.initializeController(controller, 1);
+        volume.reconcileController(controller, 1);
+
+        expect(applied).toEqual([0.3]);
+        expect(volume.value()).toBe(0.3);
+
+        volume.reconcileController(controller, 0.5);
+        expect(volume.value()).toBe(0.5);
+    });
+
+    it('reapplies persisted volume after a controller capability epoch resets', () => {
+        const controller = {} as PlayerController;
+        volume.set(0.3);
+        applied = [];
+        volume.initializeController(controller, 1);
+        volume.deactivateController(controller);
+
+        volume.initializeController(controller, 1);
+
+        expect(applied).toEqual([0.3, 0.3]);
+        expect(volume.value()).toBe(0.3);
+    });
+
+    it('hoverEnter opens the popover and cancels any pending close', () => {
+        jest.useFakeTimers();
+        volume.hoverLeave();
+        volume.hoverEnter();
+        jest.runAllTimers();
+        expect(openCount).toBe(1);
+        expect(closeCount).toBe(0);
+    });
+
+    it('hoverLeave closes the popover after a delay', () => {
+        jest.useFakeTimers();
+        volume.hoverLeave();
+        expect(closeCount).toBe(0);
+        jest.runAllTimers();
+        expect(closeCount).toBe(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/controls-volume.ts b/libs/ui/playback/src/lib/player-controls/controls-volume.ts
new file mode 100644
index 000000000..f9f79cfde
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/controls-volume.ts
@@ -0,0 +1,148 @@
+import { signal } from '@angular/core';
+import {
+    persistVolume,
+    readStoredVolume,
+    volumeIcon,
+} from './controls-format.utils';
+import type { PlayerController } from './player-controls.model';
+
+const VOLUME_POPOVER_CLOSE_DELAY_MS = 220;
+
+export interface ControlsVolumeDeps {
+    /** Apply the volume to the underlying player (command). */
+    apply: (value: number) => void;
+    /** Flash transient feedback (icon + label). */
+    flash: (icon: string, label: string) => void;
+    /** Resolve the translated label used when muting. */
+    mutedLabel: () => string;
+    /** Open the hover popover. */
+    openPopover: () => void;
+    /** Close the hover popover. */
+    closePopover: () => void;
+}
+
+/**
+ * Owns the optimistic volume value, mute/unmute memory, and the hover-popover
+ * close timer. `set` is the single mutation point: it updates the optimistic
+ * value, persists it, and applies it to the player. The component still calls
+ * `reveal()` around these and binds the slider to `value`.
+ */
+export class ControlsVolume {
+    readonly value = signal(readStoredVolume());
+
+    private mutedVolume = 0;
+    private closeTimer: number | null = null;
+    private readonly initializedControllers = new WeakSet<PlayerController>();
+    private readonly pendingInitialSnapshots = new WeakMap<
+        PlayerController,
+        number
+    >();
+
+    constructor(private readonly deps: ControlsVolumeDeps) {}
+
+    set(value: number): void {
+        const clamped = Math.max(0, Math.min(1, value));
+        this.value.set(clamped);
+        persistVolume(clamped);
+        this.deps.apply(clamped);
+    }
+
+    hasInitializedController(controller: PlayerController): boolean {
+        return this.initializedControllers.has(controller);
+    }
+
+    beginCapabilityEpoch(
+        controller: PlayerController,
+        enabled: boolean
+    ): boolean {
+        if (!enabled) {
+            this.deactivateController(controller);
+            return false;
+        }
+        return !this.hasInitializedController(controller);
+    }
+
+    deactivateController(controller: PlayerController): void {
+        this.initializedControllers.delete(controller);
+        this.pendingInitialSnapshots.delete(controller);
+    }
+
+    initializeController(controller: PlayerController, snapshot: number): void {
+        if (this.initializedControllers.has(controller)) {
+            return;
+        }
+        this.initializedControllers.add(controller);
+        if (localStorage.getItem('volume') !== null) {
+            this.deps.apply(this.value());
+            this.pendingInitialSnapshots.set(controller, snapshot);
+        } else {
+            this.reconcile(snapshot);
+        }
+    }
+
+    reconcileController(controller: PlayerController, snapshot: number): void {
+        if (!this.initializedControllers.has(controller)) {
+            return;
+        }
+        if (this.pendingInitialSnapshots.get(controller) === snapshot) {
+            this.pendingInitialSnapshots.delete(controller);
+            return;
+        }
+        this.pendingInitialSnapshots.delete(controller);
+        this.reconcile(snapshot);
+    }
+
+    adjust(delta: number): void {
+        const next = this.value() + delta;
+        this.set(next);
+        this.deps.flash(
+            volumeIcon(this.value()),
+            `${Math.round(this.value() * 100)}%`
+        );
+    }
+
+    toggleMute(): void {
+        const current = this.value();
+        if (current > 0) {
+            this.mutedVolume = current;
+            this.set(0);
+            this.deps.flash('volume_off', this.deps.mutedLabel());
+        } else {
+            const restored = this.mutedVolume || 0.5;
+            this.set(restored);
+            this.deps.flash(
+                volumeIcon(restored),
+                `${Math.round(restored * 100)}%`
+            );
+        }
+    }
+
+    /** Reconcile the optimistic value with the authoritative player state. */
+    reconcile(value: number): void {
+        this.value.set(value);
+    }
+
+    hoverEnter(): void {
+        this.clearTimer();
+        this.deps.openPopover();
+    }
+
+    hoverLeave(): void {
+        this.clearTimer();
+        this.closeTimer = window.setTimeout(() => {
+            this.deps.closePopover();
+            this.closeTimer = null;
+        }, VOLUME_POPOVER_CLOSE_DELAY_MS);
+    }
+
+    dispose(): void {
+        this.clearTimer();
+    }
+
+    private clearTimer(): void {
+        if (this.closeTimer !== null) {
+            clearTimeout(this.closeTimer);
+            this.closeTimer = null;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/index.ts b/libs/ui/playback/src/lib/player-controls/index.ts
new file mode 100644
index 000000000..9fc2a65ea
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/index.ts
@@ -0,0 +1,16 @@
+export * from './player-controls.model';
+export * from './player-controls-defaults';
+export * from './player-controls.component';
+export * from './controls-menu-state';
+export * from './controls-feedback';
+export * from './controls-fullscreen';
+export * from './controls-shortcuts';
+export * from './controls-surface';
+export * from './controls-timeline';
+export * from './controls-view-model';
+export * from './controls-visibility';
+export * from './controls-volume';
+export * from './controls-format.utils';
+export * from './web-player-controls.flag';
+export * from './web-video-controls.adapter';
+export * from './web-video-controls.host';
diff --git a/libs/ui/playback/src/lib/player-controls/picture-in-picture.spec-helpers.ts b/libs/ui/playback/src/lib/player-controls/picture-in-picture.spec-helpers.ts
new file mode 100644
index 000000000..84b2d0e21
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/picture-in-picture.spec-helpers.ts
@@ -0,0 +1,213 @@
+export interface Deferred<T> {
+    readonly promise: Promise<T>;
+    resolve(value: T): void;
+    reject(reason?: unknown): void;
+}
+
+export interface PictureInPictureVideoOptions {
+    readonly disablePictureInPicture?: boolean;
+    readonly readyState?: number;
+    readonly request?: PictureInPictureRequest | null;
+}
+
+type PictureInPictureRequest = () => Promise<PictureInPictureWindow>;
+
+interface VideoPropertyDescriptors {
+    readonly disablePictureInPicture: PropertyDescriptor | undefined;
+    readonly readyState: PropertyDescriptor | undefined;
+    readonly requestPictureInPicture: PropertyDescriptor | undefined;
+}
+
+export function deferred<T>(): Deferred<T> {
+    let resolve!: (value: T) => void;
+    let reject!: (reason?: unknown) => void;
+    const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+        resolve = resolvePromise;
+        reject = rejectPromise;
+    });
+    return { promise, resolve, reject };
+}
+
+export class PictureInPictureTestEnvironment {
+    private activeElement: Element | null = null;
+    private enabled = true;
+    private readonly enabledDescriptor: PropertyDescriptor | undefined;
+    private readonly elementDescriptor: PropertyDescriptor | undefined;
+    private readonly exitDescriptor: PropertyDescriptor | undefined;
+    private readonly videoDescriptors = new Map<
+        HTMLVideoElement,
+        VideoPropertyDescriptors
+    >();
+
+    readonly exit: jest.MockedFunction<() => Promise<void>> = jest.fn(
+        async () => {
+            this.setActive(null);
+        }
+    );
+
+    constructor(private readonly ownerDocument: Document = document) {
+        this.enabledDescriptor = Object.getOwnPropertyDescriptor(
+            ownerDocument,
+            'pictureInPictureEnabled'
+        );
+        this.elementDescriptor = Object.getOwnPropertyDescriptor(
+            ownerDocument,
+            'pictureInPictureElement'
+        );
+        this.exitDescriptor = Object.getOwnPropertyDescriptor(
+            ownerDocument,
+            'exitPictureInPicture'
+        );
+        Object.defineProperty(ownerDocument, 'pictureInPictureEnabled', {
+            configurable: true,
+            get: () => this.enabled,
+        });
+        Object.defineProperty(ownerDocument, 'pictureInPictureElement', {
+            configurable: true,
+            get: () => this.activeElement,
+        });
+        this.setExitAvailable(true);
+    }
+
+    installVideo(
+        video: HTMLVideoElement,
+        options: PictureInPictureVideoOptions = {}
+    ): jest.MockedFunction<PictureInPictureRequest> | null {
+        this.assertOwnerDocument(video);
+        this.captureVideoDescriptors(video);
+        this.setReadyState(video, options.readyState ?? 1);
+        this.setDisablePictureInPicture(
+            video,
+            options.disablePictureInPicture ?? false
+        );
+
+        if (options.request === null) {
+            Object.defineProperty(video, 'requestPictureInPicture', {
+                configurable: true,
+                value: undefined,
+            });
+            return null;
+        }
+
+        const request =
+            options.request ??
+            (async () => {
+                this.setActive(video);
+                return {} as PictureInPictureWindow;
+            });
+        const requestMock: jest.MockedFunction<PictureInPictureRequest> =
+            jest.fn(request);
+        Object.defineProperty(video, 'requestPictureInPicture', {
+            configurable: true,
+            value: requestMock,
+        });
+        return requestMock;
+    }
+
+    setActive(element: Element | null, emit = true): void {
+        const previous = this.activeElement;
+        this.activeElement = element;
+        if (!emit || previous === element) {
+            return;
+        }
+        previous?.dispatchEvent(new Event('leavepictureinpicture'));
+        element?.dispatchEvent(new Event('enterpictureinpicture'));
+    }
+
+    setDisablePictureInPicture(video: HTMLVideoElement, value: boolean): void {
+        this.assertOwnerDocument(video);
+        this.captureVideoDescriptors(video);
+        Object.defineProperty(video, 'disablePictureInPicture', {
+            configurable: true,
+            writable: true,
+            value,
+        });
+    }
+
+    setEnabled(value: boolean): void {
+        this.enabled = value;
+    }
+
+    setExitAvailable(value: boolean): void {
+        Object.defineProperty(this.ownerDocument, 'exitPictureInPicture', {
+            configurable: true,
+            value: value ? this.exit : undefined,
+        });
+    }
+
+    setReadyState(video: HTMLVideoElement, value: number): void {
+        this.assertOwnerDocument(video);
+        this.captureVideoDescriptors(video);
+        Object.defineProperty(video, 'readyState', {
+            configurable: true,
+            value,
+        });
+    }
+
+    restore(): void {
+        for (const [video, descriptors] of this.videoDescriptors) {
+            this.restoreProperty(
+                video,
+                'disablePictureInPicture',
+                descriptors.disablePictureInPicture
+            );
+            this.restoreProperty(video, 'readyState', descriptors.readyState);
+            this.restoreProperty(
+                video,
+                'requestPictureInPicture',
+                descriptors.requestPictureInPicture
+            );
+        }
+        this.videoDescriptors.clear();
+        this.restoreProperty(
+            this.ownerDocument,
+            'pictureInPictureEnabled',
+            this.enabledDescriptor
+        );
+        this.restoreProperty(
+            this.ownerDocument,
+            'pictureInPictureElement',
+            this.elementDescriptor
+        );
+        this.restoreProperty(
+            this.ownerDocument,
+            'exitPictureInPicture',
+            this.exitDescriptor
+        );
+    }
+
+    private assertOwnerDocument(video: HTMLVideoElement): void {
+        if (video.ownerDocument !== this.ownerDocument) {
+            throw new Error('PiP test video belongs to a different document');
+        }
+    }
+
+    private captureVideoDescriptors(video: HTMLVideoElement): void {
+        if (this.videoDescriptors.has(video)) {
+            return;
+        }
+        this.videoDescriptors.set(video, {
+            disablePictureInPicture: Object.getOwnPropertyDescriptor(
+                video,
+                'disablePictureInPicture'
+            ),
+            readyState: Object.getOwnPropertyDescriptor(video, 'readyState'),
+            requestPictureInPicture: Object.getOwnPropertyDescriptor(
+                video,
+                'requestPictureInPicture'
+            ),
+        });
+    }
+
+    private restoreProperty(
+        target: object,
+        property: string,
+        descriptor: PropertyDescriptor | undefined
+    ): void {
+        if (descriptor) {
+            Object.defineProperty(target, property, descriptor);
+            return;
+        }
+        delete (target as Record<string, unknown>)[property];
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls-defaults.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls-defaults.spec.ts
new file mode 100644
index 000000000..53aaf4381
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls-defaults.spec.ts
@@ -0,0 +1,14 @@
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+
+describe('player-controls defaults', () => {
+    it('defaults Picture-in-Picture to unsupported and inactive', () => {
+        expect(DEFAULT_PLAYER_CAPABILITIES.pictureInPicture).toBe(false);
+        expect(createEmptyControlsState()).toMatchObject({
+            pictureInPictureActive: false,
+            canPictureInPicture: false,
+        });
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls-defaults.ts b/libs/ui/playback/src/lib/player-controls/player-controls-defaults.ts
new file mode 100644
index 000000000..ed003689a
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls-defaults.ts
@@ -0,0 +1,60 @@
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsState,
+    PlayerPreset,
+} from './player-controls.model';
+
+export const DEFAULT_PLAYER_CAPABILITIES: PlayerControlsCapabilities = {
+    seek: false,
+    volume: false,
+    audioTracks: false,
+    subtitles: false,
+    playbackSpeed: false,
+    aspectRatio: false,
+    recording: false,
+    pictureInPicture: false,
+    fullscreen: false,
+    seriesNavigation: false,
+};
+
+export const DEFAULT_SPEED_PRESETS: ReadonlyArray<PlayerPreset<number>> = [
+    { value: 0.5, label: '0.5×' },
+    { value: 0.75, label: '0.75×' },
+    { value: 1, label: '1×' },
+    { value: 1.25, label: '1.25×' },
+    { value: 1.5, label: '1.5×' },
+    { value: 2, label: '2×' },
+];
+
+export const DEFAULT_ASPECT_PRESETS: ReadonlyArray<PlayerPreset<string>> = [
+    { value: 'no', label: 'Default' },
+    { value: '16:9', label: '16:9' },
+    { value: '4:3', label: '4:3' },
+    { value: '21:9', label: '21:9' },
+    { value: '2.35:1', label: '2.35:1' },
+];
+
+export function createEmptyControlsState(): PlayerControlsState {
+    return {
+        status: 'idle',
+        statusMessage: '',
+        stalled: false,
+        positionSeconds: 0,
+        durationSeconds: null,
+        isLive: false,
+        canSeek: false,
+        volume: 1,
+        audioTracks: [],
+        subtitleTracks: [],
+        subtitlesEnabled: false,
+        playbackSpeed: 1,
+        speedPresets: DEFAULT_SPEED_PRESETS,
+        aspectRatio: 'no',
+        aspectPresets: DEFAULT_ASPECT_PRESETS,
+        recording: { active: false, elapsedSeconds: 0, message: null },
+        pictureInPictureActive: false,
+        canPictureInPicture: false,
+        canPreviousEpisode: false,
+        canNextEpisode: false,
+    };
+}
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.contract.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.contract.spec.ts
new file mode 100644
index 000000000..c71123976
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.contract.spec.ts
@@ -0,0 +1,317 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+interface FakeController {
+    controller: PlayerController;
+    capabilities: WritableSignal<PlayerControlsCapabilities>;
+    state: WritableSignal<PlayerControlsState>;
+    commands: jest.Mocked<PlayerControlsCommands>;
+}
+
+function createFakeController(): FakeController {
+    const capabilities = signal({ ...DEFAULT_PLAYER_CAPABILITIES });
+    const state = signal(createEmptyControlsState());
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    return {
+        controller: { capabilities, state, commands },
+        capabilities,
+        state,
+        commands,
+    };
+}
+
+describe('PlayerControlsComponent capability contract', () => {
+    const fixtures: ComponentFixture<PlayerControlsComponent>[] = [];
+    const surfaces: HTMLElement[] = [];
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+    });
+
+    afterEach(() => {
+        for (const fixture of fixtures.splice(0)) {
+            fixture.destroy();
+        }
+        for (const surface of surfaces.splice(0)) {
+            surface.remove();
+        }
+    });
+
+    function createControls(
+        fake: FakeController,
+        surface: HTMLElement | null = null
+    ): ComponentFixture<PlayerControlsComponent> {
+        const fixture = TestBed.createComponent(PlayerControlsComponent);
+        fixture.componentRef.setInput('controller', fake.controller);
+        if (surface) {
+            fixture.componentRef.setInput('playerSurface', surface);
+        }
+        fixture.detectChanges();
+        fixtures.push(fixture);
+        return fixture;
+    }
+
+    function createSurface(): HTMLElement {
+        const surface = document.createElement('div');
+        document.body.appendChild(surface);
+        surfaces.push(surface);
+        return surface;
+    }
+
+    function pressKey(key: string): boolean {
+        const event = new KeyboardEvent('keydown', {
+            key,
+            bubbles: true,
+            cancelable: true,
+        });
+        document.dispatchEvent(event);
+        return event.defaultPrevented;
+    }
+
+    it('routes shortcuts to the player the user interacted with most recently', () => {
+        const first = createFakeController();
+        const second = createFakeController();
+        createControls(first, createSurface());
+        const secondSurface = createSurface();
+        const secondFixture = createControls(second, secondSurface);
+
+        pressKey('k');
+        expect(first.commands.togglePlay).toHaveBeenCalledTimes(1);
+        expect(second.commands.togglePlay).not.toHaveBeenCalled();
+
+        secondSurface.dispatchEvent(new MouseEvent('pointermove'));
+        pressKey('k');
+        expect(first.commands.togglePlay).toHaveBeenCalledTimes(1);
+        expect(second.commands.togglePlay).toHaveBeenCalledTimes(1);
+
+        secondFixture.destroy();
+        fixtures.splice(fixtures.indexOf(secondFixture), 1);
+        pressKey('k');
+        expect(first.commands.togglePlay).toHaveBeenCalledTimes(2);
+    });
+
+    it('requires the volume capability for volume shortcuts', () => {
+        const fake = createFakeController();
+        const fixture = createControls(fake);
+
+        expect(pressKey('ArrowDown')).toBe(false);
+        expect(pressKey('m')).toBe(false);
+        expect(fake.commands.setVolume).not.toHaveBeenCalled();
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            volume: true,
+        });
+        fixture.detectChanges();
+        expect(pressKey('ArrowDown')).toBe(true);
+        expect(fake.commands.setVolume).toHaveBeenCalledWith(0.95);
+    });
+
+    it('applies persisted volume before reconciling the first controller snapshot', () => {
+        localStorage.setItem('volume', '0.3');
+        const fake = createFakeController();
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            volume: true,
+        });
+        fake.state.set({
+            ...createEmptyControlsState(),
+            volume: 1,
+        });
+
+        const fixture = createControls(fake);
+
+        expect(fake.commands.setVolume).toHaveBeenCalledTimes(1);
+        expect(fake.commands.setVolume).toHaveBeenCalledWith(0.3);
+        expect(fixture.componentInstance.displayVolume()).toBe(0.3);
+    });
+
+    it('requires both seek capability and seekable state for seek shortcuts', () => {
+        const fake = createFakeController();
+        const fixture = createControls(fake);
+        fake.state.set({
+            ...createEmptyControlsState(),
+            canSeek: true,
+            durationSeconds: 600,
+        });
+        fixture.detectChanges();
+
+        expect(pressKey('ArrowRight')).toBe(false);
+        expect(fake.commands.seekBy).not.toHaveBeenCalled();
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            seek: true,
+        });
+        fake.state.set({
+            ...createEmptyControlsState(),
+            canSeek: false,
+            durationSeconds: 600,
+        });
+        fixture.detectChanges();
+        expect(pressKey('ArrowRight')).toBe(false);
+        expect(fake.commands.seekBy).not.toHaveBeenCalled();
+
+        fake.state.set({
+            ...createEmptyControlsState(),
+            canSeek: true,
+            durationSeconds: 600,
+        });
+        fixture.detectChanges();
+        expect(pressKey('ArrowRight')).toBe(true);
+        expect(fake.commands.seekBy).toHaveBeenCalledWith(5);
+    });
+
+    it('closes menus when their runtime availability disappears', () => {
+        const fake = createFakeController();
+        const fixture = createControls(fake);
+        const component = fixture.componentInstance;
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            audioTracks: true,
+        });
+        fake.state.set({
+            ...createEmptyControlsState(),
+            audioTracks: [
+                { id: 1, label: 'English', selected: true },
+                { id: 2, label: 'German', selected: false },
+            ],
+        });
+        fixture.detectChanges();
+        component.toggleMenu('audio');
+        expect(component.menus.audioOpen()).toBe(true);
+
+        fake.state.set({
+            ...createEmptyControlsState(),
+            audioTracks: [{ id: 1, label: 'English', selected: true }],
+        });
+        fixture.detectChanges();
+        expect(component.anyMenuOpen()).toBe(false);
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            playbackSpeed: true,
+        });
+        fixture.detectChanges();
+        component.toggleMenu('speed');
+        expect(component.menus.speedOpen()).toBe(true);
+
+        fake.capabilities.set({ ...DEFAULT_PLAYER_CAPABILITIES });
+        fixture.detectChanges();
+        expect(component.anyMenuOpen()).toBe(false);
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            volume: true,
+        });
+        fixture.detectChanges();
+        component.onVolumeHoverEnter();
+        expect(component.menus.volumeOpen()).toBe(true);
+
+        fixture.componentRef.setInput('showControls', false);
+        fixture.detectChanges();
+        expect(component.anyMenuOpen()).toBe(false);
+    });
+
+    it('hides the scrub slider without hiding live and recording status', () => {
+        const fake = createFakeController();
+        const fixture = createControls(fake);
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            recording: true,
+        });
+        fake.state.set({
+            ...createEmptyControlsState(),
+            isLive: true,
+            recording: {
+                active: true,
+                elapsedSeconds: 12,
+                message: null,
+            },
+        });
+        fixture.detectChanges();
+
+        const root = fixture.nativeElement as HTMLElement;
+        expect(
+            root.querySelector('.player-controls__timeline > input')
+        ).toBeNull();
+        expect(
+            root.querySelector('.player-controls__live-badge')
+        ).not.toBeNull();
+        expect(
+            root.querySelector('.player-controls__recording-status')
+                ?.textContent
+        ).toContain('REC 0:12');
+    });
+
+    it('does not flash a saved recording across owner handoff', () => {
+        const fake = createFakeController();
+        const fixture = createControls(fake);
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            recording: true,
+        });
+        fake.state.set({
+            ...createEmptyControlsState(),
+            recording: {
+                active: false,
+                elapsedSeconds: 0,
+                message: null,
+                transitionKey: 'session-1',
+            },
+        });
+        fixture.detectChanges();
+        fake.state.update((state) => ({
+            ...state,
+            recording: {
+                ...state.recording,
+                active: true,
+                elapsedSeconds: 12,
+            },
+        }));
+        fixture.detectChanges();
+        expect(fixture.componentInstance.feedback.current()?.label).toBe(
+            'EMBEDDED_MPV.PLAYER.RECORDING'
+        );
+
+        fake.state.set({
+            ...createEmptyControlsState(),
+            recording: {
+                active: false,
+                elapsedSeconds: 0,
+                message: null,
+                transitionKey: 'session-2',
+            },
+        });
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.feedback.current()).toBeNull();
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.html b/libs/ui/playback/src/lib/player-controls/player-controls.component.html
new file mode 100644
index 000000000..585db0b26
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.html
@@ -0,0 +1,646 @@
+@if (feedback.current(); as fb) {
+    <div
+        class="player-controls__feedback"
+        [attr.data-feedback-key]="fb.key"
+        aria-hidden="true"
+    >
+        <mat-icon>{{ fb.icon }}</mat-icon>
+        <span>{{ fb.label }}</span>
+    </div>
+}
+
+@if (fullscreenMediaTitle(); as mediaTitle) {
+    <div
+        class="player-controls__title"
+        [class.player-controls__title--visible]="controlsAreVisible()"
+        data-test-id="player-controls-media-title"
+    >
+        <div class="player-controls__title-primary">
+            {{ mediaTitle.primary }}
+        </div>
+        @if (mediaTitle.secondary) {
+            <div class="player-controls__title-secondary">
+                {{ mediaTitle.secondary }}
+            </div>
+        }
+    </div>
+}
+
+@if (showControls()) {
+    <div
+        #controlsBar
+        class="player-controls__bar"
+        [class.player-controls__bar--visible]="controlsAreVisible()"
+        (pointerenter)="onBarPointerEnter()"
+        (pointerleave)="onBarPointerLeave()"
+        (focusin)="onBarFocusIn()"
+        (focusout)="onBarFocusOut($event)"
+    >
+        <div class="player-controls__transport">
+            <button
+                mat-icon-button
+                type="button"
+                class="player-controls__button"
+                [disabled]="!canTogglePlay()"
+                (click)="togglePlay()"
+                [attr.aria-label]="
+                    (isPaused()
+                        ? 'EMBEDDED_MPV.PLAYER.PLAY'
+                        : 'EMBEDDED_MPV.PLAYER.PAUSE'
+                    ) | translate
+                "
+                [matTooltip]="
+                    (isPaused()
+                        ? 'EMBEDDED_MPV.PLAYER.PLAY'
+                        : 'EMBEDDED_MPV.PLAYER.PAUSE'
+                    ) | translate
+                "
+                matTooltipPosition="above"
+            >
+                <mat-icon>{{ isPaused() ? 'play_arrow' : 'pause' }}</mat-icon>
+            </button>
+
+            @if (capabilities().seriesNavigation) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    data-test-id="player-controls-previous-episode"
+                    [disabled]="isLoading() || !state().canPreviousEpisode"
+                    (click)="requestPreviousEpisode()"
+                    [attr.aria-label]="
+                        'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE' | translate
+                    "
+                    [matTooltip]="
+                        'EMBEDDED_MPV.PLAYER.PREVIOUS_EPISODE' | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>skip_previous</mat-icon>
+                </button>
+
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    data-test-id="player-controls-next-episode"
+                    [disabled]="isLoading() || !state().canNextEpisode"
+                    (click)="requestNextEpisode()"
+                    [attr.aria-label]="
+                        'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
+                    "
+                    [matTooltip]="
+                        'EMBEDDED_MPV.PLAYER.NEXT_EPISODE' | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>skip_next</mat-icon>
+                </button>
+            }
+
+            @if (capabilities().seek) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    [disabled]="!state().canSeek"
+                    (click)="seekBy(-10)"
+                    [attr.aria-label]="
+                        'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
+                    "
+                    [matTooltip]="
+                        'EMBEDDED_MPV.PLAYER.BACK_10_SECONDS' | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>replay_10</mat-icon>
+                </button>
+
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    [disabled]="!state().canSeek"
+                    (click)="seekBy(10)"
+                    [attr.aria-label]="
+                        'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS' | translate
+                    "
+                    [matTooltip]="
+                        'EMBEDDED_MPV.PLAYER.FORWARD_10_SECONDS' | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>forward_10</mat-icon>
+                </button>
+            }
+        </div>
+
+        <div class="player-controls__timeline">
+            @if (capabilities().seek) {
+                <input
+                    class="player-controls__slider"
+                    [style.--slider-progress.%]="timelineProgress()"
+                    type="range"
+                    min="0"
+                    [max]="timelineDuration()"
+                    [value]="timelineValue()"
+                    [disabled]="!state().canSeek"
+                    [attr.aria-label]="
+                        'EMBEDDED_MPV.PLAYER.PLAYBACK_POSITION' | translate
+                    "
+                    [attr.aria-valuetext]="formatTime(timelineValue())"
+                    (input)="onTimelineInput($event)"
+                    (change)="onTimelineCommit($event)"
+                />
+            }
+            <div class="player-controls__time">
+                <span>{{ formatTime(timelineValue()) }}</span>
+                @if (state().canSeek) {
+                    <span>{{ formatTime(timelineDuration()) }}</span>
+                } @else if (state().isLive) {
+                    <span
+                        class="player-controls__live-badge"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.LIVE_STREAM' | translate
+                        "
+                    >
+                        <span
+                            class="player-controls__live-dot"
+                            aria-hidden="true"
+                        ></span>
+                        LIVE
+                    </span>
+                } @else {
+                    <span>--:--</span>
+                }
+            </div>
+            @if (recordingStatusText(); as recordingStatus) {
+                <div
+                    class="player-controls__recording-status"
+                    [class.player-controls__recording-status--active]="
+                        isRecording()
+                    "
+                    [attr.aria-live]="isRecording() ? 'off' : 'polite'"
+                >
+                    <mat-icon>{{
+                        isRecording() ? 'fiber_manual_record' : 'check_circle'
+                    }}</mat-icon>
+                    <span>{{ recordingStatus }}</span>
+                </div>
+            }
+        </div>
+
+        <div class="player-controls__actions">
+            @if (capabilities().volume) {
+                <div
+                    class="player-controls__popover-anchor"
+                    (pointerenter)="onVolumeHoverEnter()"
+                    (pointerleave)="onVolumeHoverLeave()"
+                    (focusin)="onVolumeHoverEnter()"
+                    (focusout)="onVolumeHoverLeave()"
+                    (wheel)="onVolumeWheel($event)"
+                >
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="player-controls__button"
+                        (click)="toggleMute()"
+                        [attr.aria-label]="
+                            (displayVolume() <= 0
+                                ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
+                                : 'EMBEDDED_MPV.PLAYER.MUTE'
+                            ) | translate
+                        "
+                        [matTooltip]="
+                            (displayVolume() <= 0
+                                ? 'EMBEDDED_MPV.PLAYER.UNMUTE'
+                                : 'EMBEDDED_MPV.PLAYER.MUTE'
+                            ) | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>{{ volumeIcon() }}</mat-icon>
+                    </button>
+                    @if (menus.volumeOpen()) {
+                        <div
+                            class="player-controls__panel player-controls__volume-popover"
+                            role="dialog"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.VOLUME' | translate
+                            "
+                        >
+                            <input
+                                class="player-controls__slider player-controls__slider--volume"
+                                [style.--slider-progress.%]="
+                                    displayVolume() * 100
+                                "
+                                type="range"
+                                min="0"
+                                max="1"
+                                step="0.01"
+                                [value]="displayVolume()"
+                                [attr.aria-label]="
+                                    'EMBEDDED_MPV.PLAYER.VOLUME_LABEL'
+                                        | translate
+                                            : { percent: volumePercent() }
+                                "
+                                [attr.aria-valuetext]="
+                                    'EMBEDDED_MPV.PLAYER.VOLUME_LABEL'
+                                        | translate
+                                            : { percent: volumePercent() }
+                                "
+                                (input)="onVolumeInput($event)"
+                            />
+                            <span class="player-controls__volume-value">
+                                {{
+                                    'EMBEDDED_MPV.PLAYER.VOLUME_LABEL'
+                                        | translate
+                                            : { percent: volumePercent() }
+                                }}
+                            </span>
+                        </div>
+                    }
+                </div>
+            }
+
+            @if (hasAudioTracks()) {
+                <div class="player-controls__popover-anchor">
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="player-controls__button"
+                        (click)="toggleMenu('audio')"
+                        [attr.aria-expanded]="menus.audioOpen()"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS' | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS' | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>graphic_eq</mat-icon>
+                    </button>
+                    @if (menus.audioOpen()) {
+                        <div
+                            class="player-controls__panel player-controls__track-popover"
+                            role="menu"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS' | translate
+                            "
+                        >
+                            <div class="player-controls__menu-title">
+                                {{
+                                    'EMBEDDED_MPV.PLAYER.AUDIO_TRACKS'
+                                        | translate
+                                }}
+                            </div>
+                            <div class="player-controls__track-list">
+                                @for (
+                                    track of state().audioTracks;
+                                    track track.id
+                                ) {
+                                    <button
+                                        type="button"
+                                        role="menuitemradio"
+                                        [attr.aria-checked]="track.selected"
+                                        class="player-controls__track"
+                                        [class.player-controls__track--selected]="
+                                            track.selected
+                                        "
+                                        (click)="
+                                            menuSelection.audioTrack(track.id)
+                                        "
+                                    >
+                                        <span>{{ track.label }}</span>
+                                        @if (track.selected) {
+                                            <mat-icon>check</mat-icon>
+                                        }
+                                    </button>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            }
+
+            @if (hasSubtitleTracks()) {
+                <div class="player-controls__popover-anchor">
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="player-controls__button"
+                        (click)="toggleMenu('subtitle')"
+                        [attr.aria-expanded]="menus.subtitleOpen()"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.SUBTITLES' | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.SUBTITLES' | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>{{
+                            state().subtitlesEnabled
+                                ? 'subtitles'
+                                : 'subtitles_off'
+                        }}</mat-icon>
+                    </button>
+                    @if (menus.subtitleOpen()) {
+                        <div
+                            class="player-controls__panel player-controls__track-popover"
+                            role="menu"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.SUBTITLES' | translate
+                            "
+                        >
+                            <div class="player-controls__menu-title">
+                                {{
+                                    'EMBEDDED_MPV.PLAYER.SUBTITLES' | translate
+                                }}
+                            </div>
+                            <div class="player-controls__track-list">
+                                <button
+                                    type="button"
+                                    role="menuitemradio"
+                                    [attr.aria-checked]="
+                                        !state().subtitlesEnabled
+                                    "
+                                    class="player-controls__track"
+                                    [class.player-controls__track--selected]="
+                                        !state().subtitlesEnabled
+                                    "
+                                    (click)="menuSelection.subtitleTrack(-1)"
+                                >
+                                    <span>{{
+                                        'EMBEDDED_MPV.PLAYER.SUBTITLES_OFF'
+                                            | translate
+                                    }}</span>
+                                    @if (!state().subtitlesEnabled) {
+                                        <mat-icon>check</mat-icon>
+                                    }
+                                </button>
+                                @for (
+                                    track of state().subtitleTracks;
+                                    track track.id
+                                ) {
+                                    <button
+                                        type="button"
+                                        role="menuitemradio"
+                                        [attr.aria-checked]="track.selected"
+                                        class="player-controls__track"
+                                        [class.player-controls__track--selected]="
+                                            track.selected
+                                        "
+                                        (click)="
+                                            menuSelection.subtitleTrack(
+                                                track.id
+                                            )
+                                        "
+                                    >
+                                        <span>{{ track.label }}</span>
+                                        @if (track.selected) {
+                                            <mat-icon>check</mat-icon>
+                                        }
+                                    </button>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            }
+
+            @if (capabilities().playbackSpeed) {
+                <div class="player-controls__popover-anchor">
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="player-controls__button"
+                        (click)="toggleMenu('speed')"
+                        [attr.aria-expanded]="menus.speedOpen()"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED' | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.SPEED_TOOLTIP'
+                                | translate
+                                    : {
+                                          speed: speedLabel(
+                                              state().playbackSpeed
+                                          ),
+                                      }
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>speed</mat-icon>
+                    </button>
+                    @if (menus.speedOpen()) {
+                        <div
+                            class="player-controls__panel player-controls__track-popover"
+                            role="menu"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED' | translate
+                            "
+                        >
+                            <div class="player-controls__menu-title">
+                                {{
+                                    'EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED'
+                                        | translate
+                                }}
+                            </div>
+                            <div class="player-controls__track-list">
+                                @for (
+                                    preset of state().speedPresets;
+                                    track preset.value
+                                ) {
+                                    <button
+                                        type="button"
+                                        role="menuitemradio"
+                                        [attr.aria-checked]="
+                                            preset.value ===
+                                            state().playbackSpeed
+                                        "
+                                        class="player-controls__track"
+                                        [class.player-controls__track--selected]="
+                                            preset.value ===
+                                            state().playbackSpeed
+                                        "
+                                        (click)="
+                                            menuSelection.speed(preset.value)
+                                        "
+                                    >
+                                        <span>{{ preset.label }}</span>
+                                        @if (
+                                            preset.value ===
+                                            state().playbackSpeed
+                                        ) {
+                                            <mat-icon>check</mat-icon>
+                                        }
+                                    </button>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            }
+
+            @if (capabilities().aspectRatio) {
+                <div class="player-controls__popover-anchor">
+                    <button
+                        mat-icon-button
+                        type="button"
+                        class="player-controls__button"
+                        (click)="toggleMenu('aspect')"
+                        [attr.aria-expanded]="menus.aspectOpen()"
+                        [attr.aria-label]="
+                            'EMBEDDED_MPV.PLAYER.ASPECT_RATIO' | translate
+                        "
+                        [matTooltip]="
+                            'EMBEDDED_MPV.PLAYER.ASPECT_RATIO' | translate
+                        "
+                        matTooltipPosition="above"
+                    >
+                        <mat-icon>aspect_ratio</mat-icon>
+                    </button>
+                    @if (menus.aspectOpen()) {
+                        <div
+                            class="player-controls__panel player-controls__track-popover"
+                            role="menu"
+                            [attr.aria-label]="
+                                'EMBEDDED_MPV.PLAYER.ASPECT_RATIO' | translate
+                            "
+                        >
+                            <div class="player-controls__menu-title">
+                                {{
+                                    'EMBEDDED_MPV.PLAYER.ASPECT_RATIO'
+                                        | translate
+                                }}
+                            </div>
+                            <div class="player-controls__track-list">
+                                @for (
+                                    preset of state().aspectPresets;
+                                    track preset.value
+                                ) {
+                                    <button
+                                        type="button"
+                                        role="menuitemradio"
+                                        [attr.aria-checked]="
+                                            preset.value === state().aspectRatio
+                                        "
+                                        class="player-controls__track"
+                                        [class.player-controls__track--selected]="
+                                            preset.value === state().aspectRatio
+                                        "
+                                        (click)="
+                                            menuSelection.aspect(preset.value)
+                                        "
+                                    >
+                                        <span>{{
+                                            preset.value === 'no'
+                                                ? ('EMBEDDED_MPV.PLAYER.ASPECT_DEFAULT'
+                                                  | translate)
+                                                : preset.label
+                                        }}</span>
+                                        @if (
+                                            preset.value === state().aspectRatio
+                                        ) {
+                                            <mat-icon>check</mat-icon>
+                                        }
+                                    </button>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            }
+
+            @if (canRecord()) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button player-controls__record-button"
+                    [class.player-controls__record-button--active]="
+                        isRecording()
+                    "
+                    [disabled]="isLoading()"
+                    (click)="toggleRecording()"
+                    [attr.aria-pressed]="isRecording()"
+                    [attr.aria-label]="
+                        (isRecording()
+                            ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
+                            : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
+                        ) | translate
+                    "
+                    [matTooltip]="
+                        (isRecording()
+                            ? 'EMBEDDED_MPV.PLAYER.STOP_RECORDING'
+                            : 'EMBEDDED_MPV.PLAYER.START_RECORDING'
+                        ) | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>{{
+                        isRecording() ? 'stop_circle' : 'fiber_manual_record'
+                    }}</mat-icon>
+                </button>
+            }
+
+            @if (capabilities().pictureInPicture) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    [disabled]="!state().canPictureInPicture"
+                    (click)="togglePictureInPicture()"
+                    [attr.aria-pressed]="state().pictureInPictureActive"
+                    [attr.aria-label]="
+                        (state().pictureInPictureActive
+                            ? 'EMBEDDED_MPV.PLAYER.EXIT_PICTURE_IN_PICTURE'
+                            : 'EMBEDDED_MPV.PLAYER.ENTER_PICTURE_IN_PICTURE'
+                        ) | translate
+                    "
+                    [matTooltip]="
+                        (state().pictureInPictureActive
+                            ? 'EMBEDDED_MPV.PLAYER.EXIT_PICTURE_IN_PICTURE'
+                            : 'EMBEDDED_MPV.PLAYER.ENTER_PICTURE_IN_PICTURE'
+                        ) | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>{{
+                        state().pictureInPictureActive
+                            ? 'picture_in_picture_alt'
+                            : 'picture_in_picture'
+                    }}</mat-icon>
+                </button>
+            }
+
+            @if (capabilities().fullscreen) {
+                <button
+                    mat-icon-button
+                    type="button"
+                    class="player-controls__button"
+                    [disabled]="!canFullscreen()"
+                    (click)="toggleFullscreen()"
+                    [attr.aria-label]="
+                        (isFullscreen()
+                            ? 'EMBEDDED_MPV.PLAYER.EXIT_FULLSCREEN'
+                            : 'EMBEDDED_MPV.PLAYER.ENTER_FULLSCREEN'
+                        ) | translate
+                    "
+                    [matTooltip]="
+                        (isFullscreen()
+                            ? 'EMBEDDED_MPV.PLAYER.EXIT_FULLSCREEN'
+                            : 'EMBEDDED_MPV.PLAYER.ENTER_FULLSCREEN'
+                        ) | translate
+                    "
+                    matTooltipPosition="above"
+                >
+                    <mat-icon>{{
+                        isFullscreen() ? 'fullscreen_exit' : 'fullscreen'
+                    }}</mat-icon>
+                </button>
+            }
+        </div>
+    </div>
+}
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.interactions.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.interactions.spec.ts
new file mode 100644
index 000000000..06e9e13b0
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.interactions.spec.ts
@@ -0,0 +1,383 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities: WritableSignal<PlayerControlsCapabilities> = signal({
+        ...DEFAULT_PLAYER_CAPABILITIES,
+    });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = { capabilities, state, commands };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent interactions', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let component: PlayerControlsComponent;
+    let fake: ReturnType<typeof createFakeController>;
+
+    const setCapabilities = (overrides: Partial<PlayerControlsCapabilities>) =>
+        fake.capabilities.set({ ...DEFAULT_PLAYER_CAPABILITIES, ...overrides });
+
+    const setState = (overrides: Partial<PlayerControlsState>) =>
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+
+    const query = (selector: string) =>
+        fixture.nativeElement.querySelector(selector) as HTMLElement | null;
+
+    const queryAll = (selector: string) =>
+        Array.from(
+            fixture.nativeElement.querySelectorAll(selector)
+        ) as HTMLElement[];
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput('controller', fake.controller);
+        fixture.detectChanges();
+    });
+
+    describe('timeline', () => {
+        it('ignores seekBy while the stream cannot seek', () => {
+            setState({ canSeek: false });
+            fixture.detectChanges();
+
+            component.seekBy(10);
+            expect(fake.commands.seekBy).not.toHaveBeenCalled();
+            expect(component.feedback.current()).toBeNull();
+        });
+
+        it('flashes seek feedback with a signed label', () => {
+            jest.useFakeTimers();
+            setCapabilities({ seek: true });
+            setState({ canSeek: true, durationSeconds: 600 });
+            fixture.detectChanges();
+
+            component.seekBy(-10);
+            fixture.detectChanges();
+
+            expect(fake.commands.seekBy).toHaveBeenCalledWith(-10);
+            const feedback = query('.player-controls__feedback');
+            expect(feedback?.textContent).toContain('replay_10');
+            expect(feedback?.textContent).toContain('-10s');
+
+            jest.advanceTimersByTime(800);
+            fixture.detectChanges();
+            expect(query('.player-controls__feedback')).toBeNull();
+            jest.useRealTimers();
+        });
+    });
+
+    describe('volume', () => {
+        beforeEach(() => {
+            setCapabilities({ volume: true });
+            fixture.detectChanges();
+        });
+
+        it('opens the popover on hover and applies slider input', () => {
+            component.onVolumeHoverEnter();
+            fixture.detectChanges();
+
+            const slider = query(
+                '.player-controls__slider--volume'
+            ) as HTMLInputElement;
+            expect(slider).not.toBeNull();
+
+            slider.value = '0.3';
+            slider.dispatchEvent(new Event('input'));
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0.3);
+            expect(component.displayVolume()).toBe(0.3);
+        });
+
+        it('closes the popover shortly after hover leave', () => {
+            jest.useFakeTimers();
+            component.onVolumeHoverEnter();
+            fixture.detectChanges();
+            expect(component.menus.volumeOpen()).toBe(true);
+
+            component.onVolumeHoverLeave();
+            jest.advanceTimersByTime(300);
+            fixture.detectChanges();
+            expect(component.menus.volumeOpen()).toBe(false);
+            jest.useRealTimers();
+        });
+
+        it('adjusts volume via wheel and flashes feedback', () => {
+            component.onVolumeWheel(
+                new WheelEvent('wheel', { deltaY: 100, cancelable: true })
+            );
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0.95);
+            expect(component.feedback.current()?.label).toBe('95%');
+
+            component.onVolumeWheel(new WheelEvent('wheel', { deltaY: -100 }));
+            expect(fake.commands.setVolume).toHaveBeenLastCalledWith(1);
+        });
+
+        it('mutes on click and restores the previous volume on unmute', () => {
+            const muteButton = query('[aria-label="EMBEDDED_MPV.PLAYER.MUTE"]');
+            muteButton?.click();
+            fixture.detectChanges();
+
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0);
+            expect(component.displayVolume()).toBe(0);
+            expect(component.volumeIcon()).toBe('volume_off');
+
+            query('[aria-label="EMBEDDED_MPV.PLAYER.UNMUTE"]')?.click();
+            expect(fake.commands.setVolume).toHaveBeenLastCalledWith(1);
+            expect(component.displayVolume()).toBe(1);
+        });
+
+        it('reconciles the optimistic volume with controller state', () => {
+            setState({ volume: 0.25 });
+            fixture.detectChanges();
+            expect(component.displayVolume()).toBe(0.25);
+            expect(component.volumePercent()).toBe(25);
+        });
+
+        it('keeps optimistic volume across capability and visibility changes', () => {
+            component.onVolumeWheel(new WheelEvent('wheel', { deltaY: 100 }));
+            expect(component.displayVolume()).toBe(0.95);
+
+            setState({ positionSeconds: 15, volume: 1 });
+            fixture.detectChanges();
+            expect(component.displayVolume()).toBe(0.95);
+
+            setCapabilities({ volume: true, playbackSpeed: true });
+            fixture.detectChanges();
+            expect(component.displayVolume()).toBe(0.95);
+
+            fixture.componentRef.setInput('showControls', false);
+            fixture.detectChanges();
+            expect(component.displayVolume()).toBe(0.95);
+        });
+
+        it('reapplies persisted volume when the capability returns', () => {
+            component.onVolumeWheel(new WheelEvent('wheel', { deltaY: 100 }));
+            fake.commands.setVolume.mockClear();
+
+            setCapabilities({ volume: false });
+            setState({ volume: 1 });
+            fixture.detectChanges();
+            setCapabilities({ volume: true });
+            fixture.detectChanges();
+
+            expect(fake.commands.setVolume).toHaveBeenCalledTimes(1);
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0.95);
+            expect(component.displayVolume()).toBe(0.95);
+        });
+
+        it('reconciles volume when the controller changes at the same value', () => {
+            component.onVolumeWheel(new WheelEvent('wheel', { deltaY: 100 }));
+            expect(component.displayVolume()).toBe(0.95);
+            localStorage.removeItem('volume');
+
+            const replacement = createFakeController();
+            replacement.capabilities.set({
+                ...DEFAULT_PLAYER_CAPABILITIES,
+                volume: true,
+            });
+            fixture.componentRef.setInput('controller', replacement.controller);
+            fixture.detectChanges();
+
+            expect(component.displayVolume()).toBe(1);
+        });
+    });
+
+    describe('menu selections', () => {
+        it('applies a speed preset and closes the menu', () => {
+            setCapabilities({ playbackSpeed: true });
+            fixture.detectChanges();
+
+            query('[aria-label="EMBEDDED_MPV.PLAYER.PLAYBACK_SPEED"]')?.click();
+            fixture.detectChanges();
+            expect(component.menus.speedOpen()).toBe(true);
+
+            const preset = queryAll('.player-controls__track').find((item) =>
+                item.textContent?.includes('1.5×')
+            );
+            preset?.click();
+            fixture.detectChanges();
+
+            expect(fake.commands.setPlaybackSpeed).toHaveBeenCalledWith(1.5);
+            expect(component.menus.speedOpen()).toBe(false);
+        });
+
+        it('applies an aspect preset and closes the menu', () => {
+            setCapabilities({ aspectRatio: true });
+            fixture.detectChanges();
+
+            query('[aria-label="EMBEDDED_MPV.PLAYER.ASPECT_RATIO"]')?.click();
+            fixture.detectChanges();
+
+            const preset = queryAll('.player-controls__track').find((item) =>
+                item.textContent?.includes('16:9')
+            );
+            preset?.click();
+            fixture.detectChanges();
+
+            expect(fake.commands.setAspectRatio).toHaveBeenCalledWith('16:9');
+            expect(component.menus.aspectOpen()).toBe(false);
+        });
+
+        it('disables subtitles via the Off entry', () => {
+            setCapabilities({ subtitles: true });
+            setState({
+                subtitleTracks: [{ id: 1, label: 'English', selected: true }],
+                subtitlesEnabled: true,
+            });
+            fixture.detectChanges();
+
+            query('[aria-label="EMBEDDED_MPV.PLAYER.SUBTITLES"]')?.click();
+            fixture.detectChanges();
+
+            queryAll('.player-controls__track')[0]?.click();
+            expect(fake.commands.setSubtitleTrack).toHaveBeenCalledWith(-1);
+            expect(component.menus.subtitleOpen()).toBe(false);
+        });
+
+        it('opening one menu closes the others', () => {
+            setCapabilities({ playbackSpeed: true, aspectRatio: true });
+            fixture.detectChanges();
+
+            component.toggleMenu('speed');
+            component.toggleMenu('aspect');
+            expect(component.menus.speedOpen()).toBe(false);
+            expect(component.menus.aspectOpen()).toBe(true);
+            expect(component.anyMenuOpen()).toBe(true);
+        });
+    });
+
+    describe('recording', () => {
+        it('does nothing when recording is not available', () => {
+            component.toggleRecording();
+            expect(fake.commands.toggleRecording).not.toHaveBeenCalled();
+        });
+
+        it('toggles recording when capable and live', () => {
+            setCapabilities({ recording: true });
+            setState({ isLive: true });
+            fixture.detectChanges();
+
+            query('.player-controls__record-button')?.click();
+            expect(fake.commands.toggleRecording).toHaveBeenCalledTimes(1);
+        });
+
+        it('flashes feedback on recording start and stop transitions', () => {
+            const translate = TestBed.inject(TranslateService);
+            translate.setTranslation('de', {
+                EMBEDDED_MPV: {
+                    PLAYER: {
+                        RECORDING: 'Aufnahme',
+                        RECORDING_SAVED: 'Aufnahme gespeichert',
+                    },
+                },
+            });
+            translate.use('de');
+
+            setState({
+                isLive: true,
+                recording: { active: true, elapsedSeconds: 0, message: null },
+            });
+            fixture.detectChanges();
+            expect(component.feedback.current()?.label).toBe('Aufnahme');
+
+            setState({ isLive: true });
+            fixture.detectChanges();
+            expect(component.feedback.current()?.label).toBe(
+                'Aufnahme gespeichert'
+            );
+        });
+    });
+
+    describe('reveal/hide interplay', () => {
+        beforeEach(() => {
+            jest.useFakeTimers();
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+        });
+
+        afterEach(() => {
+            jest.runOnlyPendingTimers();
+            jest.useRealTimers();
+        });
+
+        it('keeps the controls visible while a menu is open, hides after close', () => {
+            setCapabilities({ playbackSpeed: true });
+            fixture.detectChanges();
+            component.toggleMenu('speed');
+            fixture.detectChanges();
+
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(component.controlsAreVisible()).toBe(true);
+
+            component.menuSelection.speed(1.25);
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(component.controlsAreVisible()).toBe(false);
+        });
+
+        it('stays visible while a status message is showing', () => {
+            setState({ status: 'playing', statusMessage: 'Buffering…' });
+            fixture.detectChanges();
+
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(component.controlsAreVisible()).toBe(true);
+        });
+
+        it('does not toggle playback from the surface while stalled', () => {
+            const surface = document.createElement('div');
+            fixture.componentRef.setInput('playerSurface', surface);
+            setState({ status: 'playing', stalled: true });
+            fixture.detectChanges();
+
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            jest.advanceTimersByTime(250);
+
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+
+        it('re-reveals hidden controls on reveal()', () => {
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(component.controlsAreVisible()).toBe(false);
+
+            component.reveal();
+            fixture.detectChanges();
+            expect(component.controlsAreVisible()).toBe(true);
+        });
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.media-title.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.media-title.spec.ts
new file mode 100644
index 000000000..6aa8ca3e4
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.media-title.spec.ts
@@ -0,0 +1,191 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities: WritableSignal<PlayerControlsCapabilities> = signal({
+        ...DEFAULT_PLAYER_CAPABILITIES,
+    });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = { capabilities, state, commands };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent fullscreen media title', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let component: PlayerControlsComponent;
+    let fake: ReturnType<typeof createFakeController>;
+    let surface: HTMLElement;
+    let fullscreenElement: Element | null;
+
+    const setState = (overrides: Partial<PlayerControlsState>) =>
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+
+    const enterFullscreen = () => {
+        fullscreenElement = surface;
+        document.dispatchEvent(new Event('fullscreenchange'));
+        fixture.detectChanges();
+    };
+
+    const queryTitle = (): HTMLElement | null =>
+        fixture.nativeElement.querySelector(
+            '[data-test-id="player-controls-media-title"]'
+        );
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        surface = document.createElement('div');
+        document.body.appendChild(surface);
+
+        fullscreenElement = null;
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput('controller', fake.controller);
+        fixture.componentRef.setInput('playerSurface', surface);
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+        surface.remove();
+        jest.useRealTimers();
+    });
+
+    it('stays hidden outside fullscreen even when a media title is set', () => {
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: 'Some Movie',
+            secondary: null,
+        });
+        fixture.detectChanges();
+
+        expect(queryTitle()).toBeNull();
+    });
+
+    it('shows both title lines in fullscreen and hides them again on exit', () => {
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: 'Breaking Code',
+            secondary: 'S01E02',
+        });
+        fixture.detectChanges();
+        enterFullscreen();
+
+        const title = queryTitle();
+        expect(title).not.toBeNull();
+        expect(
+            title?.querySelector('.player-controls__title-primary')?.textContent
+        ).toContain('Breaking Code');
+        expect(
+            title?.querySelector('.player-controls__title-secondary')
+                ?.textContent
+        ).toContain('S01E02');
+
+        fullscreenElement = null;
+        document.dispatchEvent(new Event('fullscreenchange'));
+        fixture.detectChanges();
+        expect(queryTitle()).toBeNull();
+    });
+
+    it('renders a single line when no secondary text is provided', () => {
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: 'Channel One',
+            secondary: null,
+        });
+        fixture.detectChanges();
+        enterFullscreen();
+
+        const title = queryTitle();
+        expect(title).not.toBeNull();
+        expect(
+            title?.querySelector('.player-controls__title-secondary')
+        ).toBeNull();
+    });
+
+    it('stays hidden for a blank primary title and when controls are disabled', () => {
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: '   ',
+            secondary: 'S01E02',
+        });
+        fixture.detectChanges();
+        enterFullscreen();
+        expect(queryTitle()).toBeNull();
+
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: 'Breaking Code',
+            secondary: null,
+        });
+        fixture.componentRef.setInput('showControls', false);
+        fixture.detectChanges();
+        expect(queryTitle()).toBeNull();
+    });
+
+    it('follows the auto-hide visibility of the controls bar', () => {
+        jest.useFakeTimers();
+        fixture.componentRef.setInput('mediaTitle', {
+            primary: 'Breaking Code',
+            secondary: 'S01E02',
+        });
+        fixture.detectChanges();
+        enterFullscreen();
+
+        expect(
+            queryTitle()?.classList.contains(
+                'player-controls__title--visible'
+            )
+        ).toBe(true);
+
+        setState({ status: 'playing' });
+        fixture.detectChanges();
+        jest.advanceTimersByTime(10000);
+        fixture.detectChanges();
+
+        expect(component.controlsAreVisible()).toBe(false);
+        expect(
+            queryTitle()?.classList.contains(
+                'player-controls__title--visible'
+            )
+        ).toBe(false);
+
+        surface.dispatchEvent(new MouseEvent('pointermove'));
+        fixture.detectChanges();
+        expect(
+            queryTitle()?.classList.contains(
+                'player-controls__title--visible'
+            )
+        ).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.picture-in-picture.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.picture-in-picture.spec.ts
new file mode 100644
index 000000000..732216745
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.picture-in-picture.spec.ts
@@ -0,0 +1,162 @@
+import { signal, type WritableSignal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerController,
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities: WritableSignal<PlayerControlsCapabilities> = signal({
+        ...DEFAULT_PLAYER_CAPABILITIES,
+    });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = { capabilities, state, commands };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent picture-in-picture action', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let component: PlayerControlsComponent;
+    let fake: ReturnType<typeof createFakeController>;
+
+    const setCapabilities = (
+        overrides: Partial<PlayerControlsCapabilities>
+    ) => {
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            ...overrides,
+        });
+    };
+
+    const setState = (overrides: Partial<PlayerControlsState>) => {
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+    };
+
+    const queryButton = (label: string) =>
+        fixture.nativeElement.querySelector(
+            `[aria-label="${label}"]`
+        ) as HTMLButtonElement | null;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        const translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', {
+            EMBEDDED_MPV: {
+                PLAYER: {
+                    ENTER_PICTURE_IN_PICTURE: 'Enter picture-in-picture',
+                    EXIT_PICTURE_IN_PICTURE: 'Exit picture-in-picture',
+                    ENTER_FULLSCREEN: 'Enter fullscreen',
+                },
+            },
+        });
+        translate.use('en');
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput('controller', fake.controller);
+        fixture.detectChanges();
+    });
+
+    it('omits the action when picture-in-picture is not supported', () => {
+        expect(queryButton('Enter picture-in-picture')).toBeNull();
+    });
+
+    it('renders a disabled inactive action when picture-in-picture is unavailable', () => {
+        setCapabilities({ pictureInPicture: true });
+        fixture.detectChanges();
+
+        const button = queryButton('Enter picture-in-picture');
+        expect(button).not.toBeNull();
+        expect(button?.disabled).toBe(true);
+        expect(button?.getAttribute('aria-pressed')).toBe('false');
+    });
+
+    it('renders the active state with its exit label and alternate icon', () => {
+        setCapabilities({ pictureInPicture: true });
+        setState({
+            canPictureInPicture: true,
+            pictureInPictureActive: true,
+        });
+        fixture.detectChanges();
+
+        const button = queryButton('Exit picture-in-picture');
+        expect(button).not.toBeNull();
+        expect(button?.disabled).toBe(false);
+        expect(button?.getAttribute('aria-pressed')).toBe('true');
+        expect(button?.querySelector('mat-icon')?.textContent?.trim()).toBe(
+            'picture_in_picture_alt'
+        );
+        button?.click();
+        expect(fake.commands.togglePictureInPicture).toHaveBeenCalledTimes(1);
+    });
+
+    it('dispatches one toggle command from an available inactive action', () => {
+        setCapabilities({ pictureInPicture: true });
+        setState({ canPictureInPicture: true });
+        fixture.detectChanges();
+        const reveal = jest.spyOn(component, 'reveal');
+
+        queryButton('Enter picture-in-picture')?.click();
+
+        expect(reveal).toHaveBeenCalledTimes(1);
+        expect(fake.commands.togglePictureInPicture).toHaveBeenCalledTimes(1);
+    });
+
+    it('guards the component command when the capability is absent', () => {
+        setState({ canPictureInPicture: true });
+        const reveal = jest.spyOn(component, 'reveal');
+
+        component.togglePictureInPicture();
+
+        expect(reveal).toHaveBeenCalledTimes(1);
+        expect(fake.commands.togglePictureInPicture).not.toHaveBeenCalled();
+    });
+
+    it('guards the component command when the action is unavailable', () => {
+        setCapabilities({ pictureInPicture: true });
+        const reveal = jest.spyOn(component, 'reveal');
+
+        component.togglePictureInPicture();
+
+        expect(reveal).toHaveBeenCalledTimes(1);
+        expect(fake.commands.togglePictureInPicture).not.toHaveBeenCalled();
+    });
+
+    it('places picture-in-picture immediately before fullscreen', () => {
+        setCapabilities({ pictureInPicture: true, fullscreen: true });
+        setState({ canPictureInPicture: true });
+        fixture.detectChanges();
+
+        const pictureInPicture = queryButton('Enter picture-in-picture');
+        const fullscreen = queryButton('Enter fullscreen');
+        expect(pictureInPicture).not.toBeNull();
+        expect(fullscreen).not.toBeNull();
+        expect(pictureInPicture?.nextElementSibling).toBe(fullscreen);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.scss b/libs/ui/playback/src/lib/player-controls/player-controls.component.scss
new file mode 100644
index 000000000..bd4de88fa
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.scss
@@ -0,0 +1,522 @@
+:host {
+    --pc-accent: #ffffff;
+    --pc-track: rgba(255, 255, 255, 0.3);
+    --pc-thumb-ring: rgba(255, 255, 255, 0.95);
+    --pc-panel-bg: rgba(18, 18, 20, 0.92);
+    --pc-panel-border: rgba(255, 255, 255, 0.16);
+    --pc-text: #ffffff;
+    --pc-text-dim: rgba(255, 255, 255, 0.82);
+
+    position: absolute;
+    inset: 0;
+    z-index: 2;
+    display: block;
+    // The control layer is transparent to the mouse so the video underneath
+    // stays interactive; only the bar/popovers opt back in to pointer events.
+    pointer-events: none;
+    color: var(--pc-text);
+    // Become a query container so popovers can size against the actual player
+    // box (the host fills the player via inset:0) instead of fixed pixels or
+    // the viewport — they grow to fit when there is room and shrink to scroll
+    // when the player is small, never spilling past its edges.
+    container-type: size;
+    container-name: player-controls;
+}
+
+:host(.player-controls-host--cursor-hidden) {
+    cursor: none;
+}
+
+.player-controls__feedback {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    display: inline-flex;
+    align-items: center;
+    gap: 10px;
+    padding: 10px 18px;
+    color: #ffffff;
+    background: rgba(0, 0, 0, 0.65);
+    border-radius: 999px;
+    font-size: 0.95rem;
+    font-variant-numeric: tabular-nums;
+    pointer-events: none;
+    z-index: 3;
+    animation: player-controls-feedback 700ms ease-out forwards;
+}
+
+.player-controls__feedback mat-icon {
+    font-size: 22px;
+    width: 22px;
+    height: 22px;
+    color: #ffffff;
+}
+
+@keyframes player-controls-feedback {
+    0% {
+        opacity: 0;
+        transform: translate(-50%, -50%) scale(0.92);
+    }
+    18% {
+        opacity: 1;
+        transform: translate(-50%, -50%) scale(1);
+    }
+    70% {
+        opacity: 1;
+        transform: translate(-50%, -50%) scale(1);
+    }
+    100% {
+        opacity: 0;
+        transform: translate(-50%, -50%) scale(1);
+    }
+}
+
+.player-controls__title {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    // Generous bottom padding lets the scrim fall below the text and fade out.
+    padding: 20px 24px 40px;
+    opacity: 0;
+    // Purely informative: never intercept clicks meant for the video surface.
+    pointer-events: none;
+    transform: translateY(-8px);
+    // Mirror of the bottom bar's scrim so the title reads over bright video.
+    background: linear-gradient(
+        to bottom,
+        rgba(0, 0, 0, 0.7) 0%,
+        rgba(0, 0, 0, 0.35) 55%,
+        transparent 100%
+    );
+    transition:
+        opacity 180ms ease-out,
+        transform 200ms ease-out;
+}
+
+.player-controls__title--visible {
+    opacity: 1;
+    transform: translateY(0);
+}
+
+.player-controls__title-primary {
+    overflow: hidden;
+    color: var(--pc-text);
+    font-size: 1.15rem;
+    font-weight: 600;
+    line-height: 1.3;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-shadow: 0 1px 4px rgba(0, 0, 0, 0.6);
+}
+
+.player-controls__title-secondary {
+    overflow: hidden;
+    color: var(--pc-text-dim);
+    font-size: 0.85rem;
+    line-height: 1.3;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-shadow: 0 1px 4px rgba(0, 0, 0, 0.6);
+}
+
+.player-controls__bar {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 2;
+    display: grid;
+    grid-template-columns: auto minmax(0, 1fr) auto;
+    gap: 16px;
+    align-items: center;
+    align-content: end;
+    min-height: 64px;
+    // Generous top padding lets the scrim rise above the controls and fade out.
+    padding: 48px 16px 12px;
+    opacity: 0;
+    pointer-events: none;
+    transform: translateY(8px);
+    // True-overlay scrim: opaque-ish black at the bottom fading to fully
+    // transparent at the top, so controls read clearly over full-bleed video.
+    background: linear-gradient(
+        to top,
+        rgba(0, 0, 0, 0.78) 0%,
+        rgba(0, 0, 0, 0.45) 45%,
+        transparent 100%
+    );
+    transition:
+        opacity 180ms ease-out,
+        transform 200ms ease-out;
+}
+
+.player-controls__bar--visible {
+    opacity: 1;
+    pointer-events: auto;
+    transform: translateY(0);
+}
+
+.player-controls__transport {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.player-controls__timeline {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    min-width: 0;
+}
+
+.player-controls__time {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 12px;
+    color: var(--pc-text-dim);
+    font-size: 0.78rem;
+    font-variant-numeric: tabular-nums;
+}
+
+.player-controls__recording-status {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
+    color: rgba(255, 255, 255, 0.78);
+    font-size: 0.72rem;
+    font-variant-numeric: tabular-nums;
+}
+
+.player-controls__recording-status mat-icon {
+    flex: 0 0 auto;
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    color: #ffffff;
+}
+
+.player-controls__recording-status span {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.player-controls__recording-status--active {
+    color: var(--mat-sys-error, #ff5252);
+    font-weight: 700;
+}
+
+.player-controls__recording-status--active mat-icon {
+    color: var(--mat-sys-error, #ff5252);
+}
+
+.player-controls__live-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 2px 8px;
+    border-radius: 4px;
+    color: #ffffff;
+    background: var(--mat-sys-error, #e53935);
+    font-size: 0.66rem;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+}
+
+.player-controls__live-dot {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: currentColor;
+    animation: player-controls-live-pulse 1.6s ease-in-out infinite;
+}
+
+@keyframes player-controls-live-pulse {
+    50% {
+        opacity: 0.35;
+    }
+}
+
+.player-controls__actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.player-controls__popover-anchor {
+    position: relative;
+    display: flex;
+}
+
+.player-controls__record-button--active {
+    color: var(--mat-sys-error, #ff5252) !important;
+}
+
+// Scope to :host — the controls render directly under the component host
+// (`.player-controls-host`); there is no `.player-controls` wrapper element, so
+// selectors prefixed with `.player-controls ` never matched (which is why the
+// icons were only white on :hover, the one rule scoped to `.player-controls__bar`).
+:host :is(button[mat-icon-button]) {
+    // Material drives the icon colour through MDC tokens, not plain `color`,
+    // so force both — otherwise the icons render in the dim theme colour.
+    color: #ffffff;
+    --mdc-icon-button-icon-color: #ffffff;
+    --mat-icon-button-icon-color: #ffffff;
+}
+
+:host :is(button[mat-icon-button]) mat-icon {
+    color: #ffffff;
+}
+
+:host :is(button[mat-icon-button][disabled]) {
+    // Keep disabled affordances visibly muted.
+    --mdc-icon-button-icon-color: rgba(255, 255, 255, 0.38);
+    color: rgba(255, 255, 255, 0.38);
+}
+
+:host :is(button[mat-icon-button][disabled]) mat-icon {
+    color: rgba(255, 255, 255, 0.38);
+}
+
+:host .player-controls__bar :is(button[mat-icon-button]:hover) {
+    color: #ffffff;
+    background: rgba(255, 255, 255, 0.16);
+}
+
+.player-controls__slider {
+    --slider-progress: 0%;
+    width: 100%;
+    height: 18px;
+    appearance: none;
+    -webkit-appearance: none;
+    background: transparent;
+    cursor: pointer;
+}
+
+.player-controls__slider:focus-visible {
+    outline: 2px solid var(--pc-accent);
+    outline-offset: 4px;
+    border-radius: 4px;
+}
+
+.player-controls__slider::-webkit-slider-runnable-track {
+    height: 4px;
+    border-radius: 999px;
+    background: linear-gradient(
+        to right,
+        var(--pc-accent) var(--slider-progress),
+        var(--pc-track) var(--slider-progress)
+    );
+}
+
+.player-controls__slider::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 14px;
+    height: 14px;
+    margin-top: -5px;
+    border: 2px solid var(--pc-thumb-ring);
+    border-radius: 50%;
+    background: var(--pc-accent);
+    box-shadow: 0 1px 6px rgba(0, 0, 0, 0.55);
+    transition: transform 120ms ease-out;
+}
+
+.player-controls__slider:hover::-webkit-slider-thumb,
+.player-controls__slider:focus-visible::-webkit-slider-thumb {
+    transform: scale(1.18);
+}
+
+.player-controls__slider:disabled::-webkit-slider-runnable-track {
+    background: var(--pc-track);
+}
+
+.player-controls__slider:disabled::-webkit-slider-thumb {
+    background: rgba(255, 255, 255, 0.45);
+    border-color: rgba(255, 255, 255, 0.6);
+    box-shadow: none;
+}
+
+.player-controls__slider::-moz-range-track {
+    height: 4px;
+    border-radius: 999px;
+    background: var(--pc-track);
+}
+
+.player-controls__slider::-moz-range-progress {
+    height: 4px;
+    border-radius: 999px;
+    background: var(--pc-accent);
+}
+
+.player-controls__slider::-moz-range-thumb {
+    width: 14px;
+    height: 14px;
+    border: 2px solid var(--pc-thumb-ring);
+    border-radius: 50%;
+    background: var(--pc-accent);
+    box-shadow: 0 1px 6px rgba(0, 0, 0, 0.55);
+    transition: transform 120ms ease-out;
+}
+
+.player-controls__slider:hover::-moz-range-thumb,
+.player-controls__slider:focus-visible::-moz-range-thumb {
+    transform: scale(1.18);
+}
+
+.player-controls__slider:disabled::-moz-range-thumb {
+    background: rgba(255, 255, 255, 0.45);
+    border-color: rgba(255, 255, 255, 0.6);
+    box-shadow: none;
+}
+
+.player-controls__panel {
+    min-width: 0;
+    color: var(--pc-text);
+    background: var(--pc-panel-bg);
+    border: 1px solid var(--pc-panel-border);
+    border-radius: 14px;
+    box-shadow: 0 12px 32px rgba(0, 0, 0, 0.45);
+    backdrop-filter: blur(18px);
+}
+
+.player-controls__volume-popover {
+    position: absolute;
+    bottom: calc(100% + 6px);
+    right: 0;
+    display: grid;
+    grid-template-columns: 1fr;
+    gap: 4px;
+    // Comfortable fixed width for the slider; only clamp on players too narrow
+    // to fit it so the popover never spills past the player's edges.
+    width: 168px;
+    max-width: calc(100cqw - 24px);
+    padding: 12px 14px 10px;
+    z-index: 3;
+}
+
+.player-controls__volume-popover::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: -8px;
+    height: 8px;
+}
+
+.player-controls__volume-popover .player-controls__slider--volume {
+    width: 100%;
+}
+
+.player-controls__volume-value {
+    color: var(--pc-text-dim);
+    font-size: 0.74rem;
+    font-variant-numeric: tabular-nums;
+    text-align: center;
+    white-space: nowrap;
+}
+
+.player-controls__track-popover {
+    position: absolute;
+    bottom: calc(100% + 6px);
+    right: 0;
+    display: flex;
+    flex-direction: column;
+    min-width: 220px;
+    // Cap to the player box (minus a small gutter) so the panel never spills
+    // past the player's edges on small windows; falls back to the viewport
+    // where container units are unavailable.
+    max-width: min(420px, calc(100cqw - 24px), 80vw);
+    // Height grows to fit the list; only when it would exceed the room above
+    // the controls bar does the inner list start scrolling. 96px ≈ the controls
+    // bar height plus the 6px gap and a little breathing room.
+    max-height: min(calc(100cqh - 96px), 70vh);
+    padding: 10px 12px;
+    z-index: 3;
+}
+
+.player-controls__menu-title {
+    flex: 0 0 auto;
+    padding: 0 2px 6px;
+    color: rgba(255, 255, 255, 0.7);
+    font-size: 0.7rem;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    white-space: nowrap;
+}
+
+.player-controls__track-list {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    // No fixed cap: the panel's max-height bounds the popover, and the title
+    // above stays pinned while this list takes the remaining space and scrolls
+    // only when the content genuinely exceeds it.
+    flex: 0 1 auto;
+    min-height: 0;
+    overflow-y: auto;
+    scrollbar-width: thin;
+}
+
+.player-controls__track {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 8px 10px;
+    color: var(--pc-text);
+    background: transparent;
+    border: 0;
+    border-radius: 10px;
+    cursor: pointer;
+    font: inherit;
+    text-align: left;
+}
+
+.player-controls__track span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.player-controls__track:hover,
+.player-controls__track:focus-visible,
+.player-controls__track--selected {
+    background: rgba(255, 255, 255, 0.16);
+}
+
+.player-controls__track mat-icon {
+    color: #ffffff;
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+}
+
+@media (max-width: 720px) {
+    // Keep the single-row layout when space is tight: the transport and action
+    // buttons hold their natural width while the middle timeline column
+    // (the seek slider) absorbs the shrink. Collapsing to a single column here
+    // is what used to push the transport buttons into a row above the slider.
+    .player-controls__bar {
+        gap: 8px;
+    }
+
+    .player-controls__actions {
+        min-width: 0;
+    }
+
+    .player-controls__volume-popover,
+    .player-controls__track-popover {
+        right: 0;
+        left: auto;
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.spec.ts
new file mode 100644
index 000000000..33d776090
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.spec.ts
@@ -0,0 +1,377 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { DEFAULT_PLAYER_CAPABILITIES } from './player-controls-defaults';
+import { createEmptyControlsState } from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities: WritableSignal<PlayerControlsCapabilities> = signal({
+        ...DEFAULT_PLAYER_CAPABILITIES,
+    });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = { capabilities, state, commands };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let fake: ReturnType<typeof createFakeController>;
+
+    const setCapabilities = (
+        overrides: Partial<PlayerControlsCapabilities>
+    ) => {
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            ...overrides,
+        });
+    };
+
+    const setState = (overrides: Partial<PlayerControlsState>) => {
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+    };
+
+    const query = (selector: string) =>
+        fixture.nativeElement.querySelector(selector) as HTMLElement | null;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        // Load the real English values so aria-labels resolve to the same text
+        // the capability/command specs assert against.
+        const translate = TestBed.inject(TranslateService);
+        translate.setTranslation('en', {
+            EMBEDDED_MPV: {
+                PLAYER: {
+                    PLAY: 'Play',
+                    PAUSE: 'Pause',
+                    PREVIOUS_EPISODE: 'Previous episode',
+                    NEXT_EPISODE: 'Next episode',
+                    BACK_10_SECONDS: 'Back 10 seconds',
+                    FORWARD_10_SECONDS: 'Forward 10 seconds',
+                    LIVE_STREAM: 'Live stream',
+                    PLAYBACK_POSITION: 'Playback position',
+                    MUTE: 'Mute',
+                    UNMUTE: 'Unmute',
+                    VOLUME: 'Volume',
+                    VOLUME_LABEL: 'Volume {{percent}}%',
+                    MUTED: 'Muted',
+                    AUDIO_TRACKS: 'Audio tracks',
+                    SUBTITLES: 'Subtitles',
+                    SUBTITLES_OFF: 'Off',
+                    PLAYBACK_SPEED: 'Playback speed',
+                    SPEED_TOOLTIP: 'Speed: {{speed}}',
+                    ASPECT_RATIO: 'Aspect ratio',
+                    ASPECT_DEFAULT: 'Default',
+                    START_RECORDING: 'Start recording',
+                    STOP_RECORDING: 'Stop recording',
+                    ENTER_FULLSCREEN: 'Enter fullscreen',
+                    EXIT_FULLSCREEN: 'Exit fullscreen',
+                },
+            },
+        });
+        translate.use('en');
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        fixture.componentRef.setInput('controller', fake.controller);
+        fixture.detectChanges();
+    });
+
+    describe('capability gating', () => {
+        it('hides every optional control when no capability is enabled', () => {
+            expect(query('[aria-label="Back 10 seconds"]')).toBeNull();
+            expect(query('[aria-label="Audio tracks"]')).toBeNull();
+            expect(query('[aria-label="Subtitles"]')).toBeNull();
+            expect(query('[aria-label="Playback speed"]')).toBeNull();
+            expect(query('[aria-label="Aspect ratio"]')).toBeNull();
+            expect(query('.player-controls__record-button')).toBeNull();
+            expect(query('[aria-label="Enter fullscreen"]')).toBeNull();
+            expect(query('[aria-label="Mute"]')).toBeNull();
+            expect(
+                query('[data-test-id="player-controls-previous-episode"]')
+            ).toBeNull();
+        });
+
+        it('shows seek controls only when the seek capability is on', () => {
+            setCapabilities({ seek: true });
+            fixture.detectChanges();
+            expect(query('[aria-label="Back 10 seconds"]')).not.toBeNull();
+            expect(query('[aria-label="Forward 10 seconds"]')).not.toBeNull();
+        });
+
+        it('shows the recording button only when recording is enabled and live', () => {
+            setCapabilities({ recording: true });
+            setState({ isLive: true });
+            fixture.detectChanges();
+            expect(query('.player-controls__record-button')).not.toBeNull();
+
+            setState({ isLive: false });
+            fixture.detectChanges();
+            expect(query('.player-controls__record-button')).toBeNull();
+        });
+
+        it('shows the audio menu only with the capability and more than one track', () => {
+            setCapabilities({ audioTracks: true });
+            setState({
+                audioTracks: [
+                    { id: 1, label: 'English', selected: true },
+                    { id: 2, label: 'German', selected: false },
+                ],
+            });
+            fixture.detectChanges();
+            expect(query('[aria-label="Audio tracks"]')).not.toBeNull();
+        });
+
+        it('shows speed and aspect controls per their capabilities', () => {
+            setCapabilities({ playbackSpeed: true, aspectRatio: true });
+            fixture.detectChanges();
+            expect(query('[aria-label="Playback speed"]')).not.toBeNull();
+            expect(query('[aria-label="Aspect ratio"]')).not.toBeNull();
+        });
+
+        it('shows the fullscreen button when supported', () => {
+            setCapabilities({ fullscreen: true });
+            fixture.detectChanges();
+            expect(query('[aria-label="Enter fullscreen"]')).not.toBeNull();
+        });
+    });
+
+    describe('command wiring', () => {
+        it('toggles play/pause', () => {
+            query('[aria-label="Play"]')?.click();
+            expect(fake.commands.togglePlay).toHaveBeenCalledTimes(1);
+        });
+
+        it('presents errors as non-playing and disables playback toggles', () => {
+            setState({ status: 'error' });
+            fixture.detectChanges();
+
+            const play = query('[aria-label="Play"]') as HTMLButtonElement;
+            expect(play.disabled).toBe(true);
+
+            fixture.componentInstance.togglePlay();
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+
+        it('seeks via the ±10s buttons when seeking is possible', () => {
+            setCapabilities({ seek: true });
+            setState({ canSeek: true, durationSeconds: 600 });
+            fixture.detectChanges();
+
+            query('[aria-label="Forward 10 seconds"]')?.click();
+            query('[aria-label="Back 10 seconds"]')?.click();
+            expect(fake.commands.seekBy).toHaveBeenCalledWith(10);
+            expect(fake.commands.seekBy).toHaveBeenCalledWith(-10);
+        });
+
+        it('selects an audio track', () => {
+            setCapabilities({ audioTracks: true });
+            setState({
+                audioTracks: [
+                    { id: 1, label: 'English', selected: true },
+                    { id: 2, label: 'German', selected: false },
+                ],
+            });
+            fixture.detectChanges();
+
+            query('[aria-label="Audio tracks"]')?.click();
+            fixture.detectChanges();
+            const items = fixture.nativeElement.querySelectorAll(
+                '.player-controls__track'
+            ) as NodeListOf<HTMLElement>;
+            items[1].click();
+            expect(fake.commands.setAudioTrack).toHaveBeenCalledWith(2);
+        });
+
+        it('disables the timeline when seeking is not possible', () => {
+            setCapabilities({ seek: true });
+            fixture.detectChanges();
+            const slider = query(
+                '.player-controls__slider'
+            ) as HTMLInputElement | null;
+            expect(slider?.disabled).toBe(true);
+
+            setState({ canSeek: true, durationSeconds: 600 });
+            fixture.detectChanges();
+            const seekable = query(
+                '.player-controls__slider'
+            ) as HTMLInputElement | null;
+            expect(seekable?.disabled).toBe(false);
+        });
+
+        it('gives the timeline slider an accessible name', () => {
+            setCapabilities({ seek: true });
+            fixture.detectChanges();
+            expect(query('[aria-label="Playback position"]')).not.toBeNull();
+        });
+
+        it('localizes mute feedback through the active locale', () => {
+            const translate = TestBed.inject(TranslateService);
+            translate.setTranslation('de', {
+                EMBEDDED_MPV: { PLAYER: { MUTED: 'Stumm' } },
+            });
+            translate.use('de');
+            setCapabilities({ volume: true });
+            fixture.detectChanges();
+
+            fixture.componentInstance.toggleMute();
+
+            expect(fixture.componentInstance.feedback.current()?.label).toBe(
+                'Stumm'
+            );
+        });
+    });
+
+    describe('auto-hide', () => {
+        const bar = () => query('.player-controls__bar') as HTMLElement | null;
+
+        beforeEach(() => {
+            jest.useFakeTimers();
+            // Auto-hide only runs while playing.
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+        });
+
+        afterEach(() => {
+            jest.runOnlyPendingTimers();
+            jest.useRealTimers();
+        });
+
+        it('does NOT hide while the bar is hovered, then hides after leave', () => {
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(true);
+
+            bar()?.dispatchEvent(new MouseEvent('pointerenter'));
+            fixture.detectChanges();
+
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            // Still visible: the pointer rests over the bar.
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(true);
+
+            bar()?.dispatchEvent(new MouseEvent('pointerleave'));
+            fixture.detectChanges();
+
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            // Now it auto-hides.
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(false);
+        });
+
+        it('reveals on focus, stays visible within the bar, and hides after focus leaves', () => {
+            setCapabilities({ seek: true });
+            setState({
+                status: 'playing',
+                canSeek: true,
+                durationSeconds: 600,
+            });
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(false);
+
+            const buttons = Array.from(
+                bar()?.querySelectorAll('button') ?? []
+            ) as HTMLButtonElement[];
+            buttons[0].focus();
+            fixture.detectChanges();
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(true);
+
+            jest.advanceTimersByTime(10000);
+            buttons[1].focus();
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(true);
+
+            const outside = document.createElement('button');
+            document.body.appendChild(outside);
+            outside.focus();
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(fixture.componentInstance.controlsAreVisible()).toBe(false);
+            outside.remove();
+        });
+    });
+
+    describe('bar-hover state', () => {
+        const bar = () => query('.player-controls__bar') as HTMLElement | null;
+
+        it('tracks barHovered on bar pointerenter / pointerleave', () => {
+            expect(fixture.componentInstance.barHovered()).toBe(false);
+
+            bar()?.dispatchEvent(new MouseEvent('pointerenter'));
+            expect(fixture.componentInstance.barHovered()).toBe(true);
+
+            bar()?.dispatchEvent(new MouseEvent('pointerleave'));
+            expect(fixture.componentInstance.barHovered()).toBe(false);
+        });
+    });
+
+    describe('keyboard shortcuts', () => {
+        const dispatchSpace = () =>
+            document.dispatchEvent(
+                new KeyboardEvent('keydown', {
+                    key: ' ',
+                    bubbles: true,
+                    cancelable: true,
+                })
+            );
+
+        it('toggles play on Space when controls are visible', () => {
+            dispatchSpace();
+            expect(fake.commands.togglePlay).toHaveBeenCalledTimes(1);
+        });
+
+        it('does not toggle play on Space when controls are hidden', () => {
+            fixture.componentRef.setInput('showControls', false);
+            fixture.detectChanges();
+
+            dispatchSpace();
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('episode navigation outputs', () => {
+        it('emits previous/next episode requests when navigable', () => {
+            const previous = jest.fn();
+            const next = jest.fn();
+            fixture.componentInstance.previousEpisodeRequested.subscribe(
+                previous
+            );
+            fixture.componentInstance.nextEpisodeRequested.subscribe(next);
+
+            setCapabilities({ seriesNavigation: true });
+            setState({ canPreviousEpisode: true, canNextEpisode: true });
+            fixture.detectChanges();
+
+            query('[data-test-id="player-controls-previous-episode"]')?.click();
+            query('[data-test-id="player-controls-next-episode"]')?.click();
+
+            expect(previous).toHaveBeenCalledTimes(1);
+            expect(next).toHaveBeenCalledTimes(1);
+        });
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.surface.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.surface.spec.ts
new file mode 100644
index 000000000..b461092fe
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.surface.spec.ts
@@ -0,0 +1,395 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities: WritableSignal<PlayerControlsCapabilities> = signal({
+        ...DEFAULT_PLAYER_CAPABILITIES,
+    });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = { capabilities, state, commands };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent surface, fullscreen and shortcuts', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let component: PlayerControlsComponent;
+    let fake: ReturnType<typeof createFakeController>;
+    let surface: HTMLElement;
+    let fullscreenElement: Element | null;
+    let requestFullscreen: jest.Mock;
+    let exitFullscreen: jest.Mock;
+
+    const setCapabilities = (overrides: Partial<PlayerControlsCapabilities>) =>
+        fake.capabilities.set({ ...DEFAULT_PLAYER_CAPABILITIES, ...overrides });
+
+    const setState = (overrides: Partial<PlayerControlsState>) =>
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+
+    const pressKey = (key: string) => {
+        const event = new KeyboardEvent('keydown', {
+            key,
+            cancelable: true,
+        });
+        document.dispatchEvent(event);
+        return event.defaultPrevented;
+    };
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        surface = document.createElement('div');
+        document.body.appendChild(surface);
+
+        fullscreenElement = null;
+        requestFullscreen = jest.fn(async () => {
+            fullscreenElement = surface;
+            document.dispatchEvent(new Event('fullscreenchange'));
+        });
+        exitFullscreen = jest.fn(async () => {
+            fullscreenElement = null;
+            document.dispatchEvent(new Event('fullscreenchange'));
+        });
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        (surface as HTMLElement & { requestFullscreen: jest.Mock })[
+            'requestFullscreen'
+        ] = requestFullscreen;
+        (document as Document & { exitFullscreen: jest.Mock })[
+            'exitFullscreen'
+        ] = exitFullscreen;
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput('controller', fake.controller);
+        fixture.componentRef.setInput('playerSurface', surface);
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+        surface.remove();
+        jest.useRealTimers();
+    });
+
+    describe('surface interactions', () => {
+        it('reveals hidden controls on pointer movement over the surface', () => {
+            jest.useFakeTimers();
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            expect(component.controlsAreVisible()).toBe(false);
+
+            surface.dispatchEvent(new MouseEvent('pointermove'));
+            expect(component.controlsAreVisible()).toBe(true);
+        });
+
+        it('toggles play after a short delay on a plain viewport click', () => {
+            jest.useFakeTimers();
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+
+            jest.advanceTimersByTime(250);
+            expect(fake.commands.togglePlay).toHaveBeenCalledTimes(1);
+        });
+
+        it('does not toggle playback from the surface while loading', () => {
+            jest.useFakeTimers();
+            setState({ status: 'loading' });
+            fixture.detectChanges();
+
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+            jest.advanceTimersByTime(250);
+
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+
+        it('does not toggle playback if loading starts during the click delay', () => {
+            jest.useFakeTimers();
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            setState({ status: 'loading' });
+            fixture.detectChanges();
+            jest.advanceTimersByTime(250);
+
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+
+        it('detaches surface interactions while controls are disabled', () => {
+            jest.useFakeTimers();
+            setCapabilities({ fullscreen: true });
+            const reveal = jest.spyOn(component, 'reveal');
+            fixture.componentRef.setInput('showControls', false);
+            fixture.detectChanges();
+
+            surface.dispatchEvent(new MouseEvent('pointermove'));
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            surface.dispatchEvent(
+                new MouseEvent('dblclick', { bubbles: true })
+            );
+            jest.advanceTimersByTime(1000);
+
+            expect(reveal).not.toHaveBeenCalled();
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+            expect(requestFullscreen).not.toHaveBeenCalled();
+        });
+
+        it('a double-click cancels the pending pause and toggles fullscreen', () => {
+            jest.useFakeTimers();
+            setCapabilities({ fullscreen: true });
+            fixture.detectChanges();
+
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            surface.dispatchEvent(
+                new MouseEvent('dblclick', { bubbles: true })
+            );
+            jest.advanceTimersByTime(1000);
+
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+            expect(requestFullscreen).toHaveBeenCalledTimes(1);
+        });
+
+        it('ignores clicks and double-clicks on interactive elements', () => {
+            jest.useFakeTimers();
+            setCapabilities({ fullscreen: true });
+            fixture.detectChanges();
+            const button = document.createElement('button');
+            surface.appendChild(button);
+
+            button.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            button.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
+            jest.advanceTimersByTime(1000);
+
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+            expect(requestFullscreen).not.toHaveBeenCalled();
+        });
+
+        it('a click while a menu is open dismisses it instead of pausing', () => {
+            jest.useFakeTimers();
+            component.toggleMenu('speed');
+            expect(component.anyMenuOpen()).toBe(true);
+
+            surface.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            jest.advanceTimersByTime(1000);
+
+            expect(component.anyMenuOpen()).toBe(false);
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+        });
+
+        it('an outside pointerdown closes open menus', () => {
+            component.toggleMenu('audio');
+            expect(component.anyMenuOpen()).toBe(true);
+
+            document.body.dispatchEvent(
+                new MouseEvent('pointerdown', { bubbles: true })
+            );
+            expect(component.anyMenuOpen()).toBe(false);
+        });
+
+        it('keeps menus open for pointerdown inside the sibling controls root', () => {
+            const controlsRoot = fixture.nativeElement as HTMLElement;
+            const popoverChild = document.createElement('button');
+            controlsRoot.appendChild(popoverChild);
+            document.body.appendChild(controlsRoot);
+            component.toggleMenu('audio');
+
+            popoverChild.dispatchEvent(
+                new MouseEvent('pointerdown', { bubbles: true })
+            );
+            expect(component.anyMenuOpen()).toBe(true);
+
+            document.body.dispatchEvent(
+                new MouseEvent('pointerdown', { bubbles: true })
+            );
+            expect(component.anyMenuOpen()).toBe(false);
+        });
+
+        it('an outside pointerdown with no open menus is a no-op', () => {
+            expect(component.anyMenuOpen()).toBe(false);
+            document.body.dispatchEvent(
+                new MouseEvent('pointerdown', { bubbles: true })
+            );
+            expect(component.anyMenuOpen()).toBe(false);
+        });
+    });
+
+    describe('fullscreen', () => {
+        beforeEach(() => {
+            setCapabilities({ fullscreen: true });
+            fixture.detectChanges();
+        });
+
+        it('enters fullscreen on the surface and tracks the change event', async () => {
+            await component.toggleFullscreen();
+            expect(requestFullscreen).toHaveBeenCalledTimes(1);
+            expect(component.isFullscreen()).toBe(true);
+        });
+
+        it('exits fullscreen when the surface is already fullscreen', async () => {
+            fullscreenElement = surface;
+            await component.toggleFullscreen();
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+            expect(requestFullscreen).not.toHaveBeenCalled();
+            expect(component.isFullscreen()).toBe(false);
+        });
+
+        it('does nothing when the engine does not support fullscreen', async () => {
+            setCapabilities({ fullscreen: false });
+            fixture.detectChanges();
+
+            await component.toggleFullscreen();
+            expect(requestFullscreen).not.toHaveBeenCalled();
+        });
+
+        it('restores the fullscreen cursor when controls are disabled', () => {
+            jest.useFakeTimers();
+            surface.style.cursor = 'crosshair';
+            fullscreenElement = surface;
+            document.dispatchEvent(new Event('fullscreenchange'));
+            setState({ status: 'playing' });
+            fixture.detectChanges();
+            jest.advanceTimersByTime(10000);
+            fixture.detectChanges();
+            expect(component.hideCursor()).toBe(true);
+            const host = fixture.nativeElement as HTMLElement;
+            expect(
+                host.classList.contains('player-controls-host--cursor-hidden')
+            ).toBe(true);
+            expect(surface.style.cursor).toBe('none');
+            fixture.componentRef.setInput('showControls', false);
+            fixture.detectChanges();
+            expect(component.hideCursor()).toBe(false);
+            expect(surface.style.cursor).toBe('crosshair');
+        });
+    });
+
+    describe('keyboard shortcuts', () => {
+        it.each(['loading', 'error'] as const)(
+            'does not consume or toggle playback while status is %s',
+            (status) => {
+                setState({ status });
+                fixture.detectChanges();
+
+                expect(pressKey(' ')).toBe(false);
+                expect(pressKey('k')).toBe(false);
+                expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+            }
+        );
+
+        it('Escape closes an open menu', () => {
+            component.toggleMenu('subtitle');
+            expect(component.anyMenuOpen()).toBe(true);
+
+            pressKey('Escape');
+            expect(component.anyMenuOpen()).toBe(false);
+        });
+
+        it('f toggles fullscreen', () => {
+            expect(pressKey('f')).toBe(false);
+            expect(requestFullscreen).not.toHaveBeenCalled();
+
+            setCapabilities({ fullscreen: true });
+            fixture.detectChanges();
+
+            expect(pressKey('f')).toBe(true);
+            expect(requestFullscreen).toHaveBeenCalledTimes(1);
+        });
+
+        it('arrow left/right seek by ±5 seconds', () => {
+            setCapabilities({ seek: true });
+            setState({ canSeek: true, durationSeconds: 600 });
+            fixture.detectChanges();
+
+            expect(pressKey('ArrowRight')).toBe(true);
+            expect(fake.commands.seekBy).toHaveBeenCalledWith(5);
+
+            expect(pressKey('ArrowLeft')).toBe(true);
+            expect(fake.commands.seekBy).toHaveBeenCalledWith(-5);
+        });
+
+        it('arrow down lowers the volume and flashes feedback', () => {
+            setCapabilities({ volume: true });
+            fixture.detectChanges();
+            expect(pressKey('ArrowDown')).toBe(true);
+
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0.95);
+            expect(component.feedback.current()?.label).toBe('95%');
+        });
+
+        it('m mutes the player', () => {
+            setCapabilities({ volume: true });
+            fixture.detectChanges();
+            expect(pressKey('m')).toBe(true);
+            expect(fake.commands.setVolume).toHaveBeenCalledWith(0);
+            expect(component.displayVolume()).toBe(0);
+        });
+
+        it('ignores playback shortcuts while shortcuts are disabled', () => {
+            setCapabilities({ volume: true });
+            fixture.componentRef.setInput('shortcutsEnabled', false);
+            fixture.detectChanges();
+
+            pressKey(' ');
+            pressKey('m');
+            expect(fake.commands.togglePlay).not.toHaveBeenCalled();
+            expect(fake.commands.setVolume).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('episode navigation', () => {
+        it('emits only when a previous/next episode exists', () => {
+            const previous = jest.fn();
+            const next = jest.fn();
+            component.previousEpisodeRequested.subscribe(previous);
+            component.nextEpisodeRequested.subscribe(next);
+
+            component.requestPreviousEpisode();
+            component.requestNextEpisode();
+            expect(previous).not.toHaveBeenCalled();
+            expect(next).not.toHaveBeenCalled();
+
+            setState({ canPreviousEpisode: true, canNextEpisode: true });
+            fixture.detectChanges();
+
+            component.requestPreviousEpisode();
+            component.requestNextEpisode();
+            expect(previous).toHaveBeenCalledTimes(1);
+            expect(next).toHaveBeenCalledTimes(1);
+        });
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.timeline.spec.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.timeline.spec.ts
new file mode 100644
index 000000000..ddb2f71be
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.timeline.spec.ts
@@ -0,0 +1,209 @@
+import { WritableSignal, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+    DEFAULT_PLAYER_CAPABILITIES,
+    createEmptyControlsState,
+} from './player-controls-defaults';
+import { PlayerControlsComponent } from './player-controls.component';
+import type {
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerController,
+} from './player-controls.model';
+
+function createFakeController() {
+    const capabilities = signal({ ...DEFAULT_PLAYER_CAPABILITIES });
+    const state: WritableSignal<PlayerControlsState> = signal(
+        createEmptyControlsState()
+    );
+    const commands: jest.Mocked<PlayerControlsCommands> = {
+        togglePlay: jest.fn(),
+        seekTo: jest.fn(),
+        seekBy: jest.fn(),
+        setVolume: jest.fn(),
+        setAudioTrack: jest.fn(),
+        setSubtitleTrack: jest.fn(),
+        setPlaybackSpeed: jest.fn(),
+        setAspectRatio: jest.fn(),
+        toggleRecording: jest.fn(),
+        togglePictureInPicture: jest.fn(),
+    };
+    const controller: PlayerController = {
+        capabilities,
+        state,
+        commands,
+    };
+    return { controller, capabilities, state, commands };
+}
+
+describe('PlayerControlsComponent timeline scrubbing', () => {
+    let fixture: ComponentFixture<PlayerControlsComponent>;
+    let fake: ReturnType<typeof createFakeController>;
+
+    const setState = (overrides: Partial<PlayerControlsState>) =>
+        fake.state.set({ ...createEmptyControlsState(), ...overrides });
+
+    const slider = () =>
+        fixture.nativeElement.querySelector(
+            '.player-controls__slider'
+        ) as HTMLInputElement;
+
+    const currentTimeText = () =>
+        (
+            fixture.nativeElement.querySelector(
+                '.player-controls__time > span:first-child'
+            ) as HTMLElement
+        ).textContent;
+
+    const dispatch = (
+        type: 'input' | 'change',
+        value: string,
+        rawValue = false
+    ) => {
+        const element = slider();
+        if (rawValue) {
+            Object.defineProperty(element, 'value', {
+                configurable: true,
+                value,
+                writable: true,
+            });
+        } else {
+            element.value = value;
+        }
+        element.dispatchEvent(new Event(type, { bubbles: true }));
+        fixture.detectChanges();
+        return element;
+    };
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        await TestBed.configureTestingModule({
+            imports: [PlayerControlsComponent, TranslateModule.forRoot()],
+        }).compileComponents();
+
+        fake = createFakeController();
+        fixture = TestBed.createComponent(PlayerControlsComponent);
+        fixture.componentRef.setInput('controller', fake.controller);
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            seek: true,
+        });
+        setState({
+            canSeek: true,
+            durationSeconds: 600,
+            positionSeconds: 30,
+        });
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    it('previews timeline input locally without seeking', () => {
+        const element = dispatch('input', '120');
+
+        expect(fake.commands.seekTo).not.toHaveBeenCalled();
+        expect(element.value).toBe('120');
+        expect(element.style.getPropertyValue('--slider-progress')).toBe('20%');
+        expect(element.getAttribute('aria-valuetext')).toBe('2:00');
+        expect(currentTimeText()).toBe('2:00');
+    });
+
+    it('keeps the local preview while controller position updates', () => {
+        dispatch('input', '60');
+
+        setState({
+            canSeek: true,
+            durationSeconds: 600,
+            positionSeconds: 45,
+        });
+        fixture.detectChanges();
+
+        expect(fake.commands.seekTo).not.toHaveBeenCalled();
+        expect(slider().value).toBe('60');
+        expect(slider().getAttribute('aria-valuetext')).toBe('1:00');
+        expect(currentTimeText()).toBe('1:00');
+    });
+
+    it('clears the local preview when controller state becomes non-seekable', () => {
+        dispatch('input', '120');
+
+        setState({
+            canSeek: false,
+            isLive: true,
+            positionSeconds: 5,
+        });
+        fixture.detectChanges();
+
+        expect(fixture.componentInstance.scrubPosition()).toBeNull();
+        expect(currentTimeText()).toBe('0:05');
+    });
+
+    it('does not resurrect a preview after seek capability is restored', () => {
+        dispatch('input', '120');
+
+        fake.capabilities.set({ ...DEFAULT_PLAYER_CAPABILITIES });
+        fixture.detectChanges();
+        expect(fixture.componentInstance.scrubPosition()).toBeNull();
+        expect(slider()).toBeNull();
+
+        fake.capabilities.set({
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            seek: true,
+        });
+        setState({
+            canSeek: true,
+            durationSeconds: 300,
+            positionSeconds: 15,
+        });
+        fixture.detectChanges();
+
+        expect(slider().value).toBe('15');
+        expect(currentTimeText()).toBe('0:15');
+    });
+
+    it('commits exactly one seek on change and clears the preview', () => {
+        dispatch('input', '55');
+        dispatch('input', '60');
+
+        expect(fake.commands.seekTo).not.toHaveBeenCalled();
+        expect(currentTimeText()).toBe('1:00');
+
+        const element = dispatch('change', '60');
+
+        expect(fake.commands.seekTo).toHaveBeenCalledTimes(1);
+        expect(fake.commands.seekTo).toHaveBeenCalledWith(60);
+        expect(element.value).toBe('30');
+        expect(element.style.getPropertyValue('--slider-progress')).toBe('5%');
+        expect(element.getAttribute('aria-valuetext')).toBe('0:30');
+        expect(currentTimeText()).toBe('0:30');
+    });
+
+    it.each([
+        ['below', '-10', 0, '0:00'],
+        ['above', '999', 600, '10:00'],
+    ])(
+        'clamps %s-range scrub values before commit',
+        (_boundary, raw, expected, expectedTime) => {
+            const element = dispatch('input', raw, true);
+
+            expect(fake.commands.seekTo).not.toHaveBeenCalled();
+            expect(element.getAttribute('aria-valuetext')).toBe(expectedTime);
+            expect(currentTimeText()).toBe(expectedTime);
+
+            dispatch('change', raw, true);
+            expect(fake.commands.seekTo).toHaveBeenCalledTimes(1);
+            expect(fake.commands.seekTo).toHaveBeenCalledWith(expected);
+        }
+    );
+
+    it('ignores invalid scrub values without seeking', () => {
+        dispatch('input', 'not-a-number', true);
+        dispatch('change', 'not-a-number', true);
+
+        expect(fake.commands.seekTo).not.toHaveBeenCalled();
+        expect(currentTimeText()).toBe('0:30');
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.component.ts b/libs/ui/playback/src/lib/player-controls/player-controls.component.ts
new file mode 100644
index 000000000..08fb2e1c9
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.component.ts
@@ -0,0 +1,382 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    ElementRef,
+    OnDestroy,
+    computed,
+    effect,
+    inject,
+    input,
+    output,
+    signal,
+    untracked,
+} from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { TranslatePipe, TranslateService } from '@ngx-translate/core';
+import { ControlsFeedback } from './controls-feedback';
+import { ControlsFullscreen } from './controls-fullscreen';
+import { ControlsMenuSelection } from './controls-menu-selection';
+import { ControlsMenuState } from './controls-menu-state';
+import { ControlsShortcuts } from './controls-shortcuts';
+import { ControlsSurface } from './controls-surface';
+import { ControlsTimeline } from './controls-timeline';
+import { ControlsVisibility } from './controls-visibility';
+import { createControlsViewModel } from './controls-view-model';
+import { ControlsVolume } from './controls-volume';
+import { formatTime, speedLabel } from './controls-format.utils';
+import type {
+    PlayerController,
+    PlayerMediaTitle,
+} from './player-controls.model';
+
+@Component({
+    selector: 'app-player-controls',
+    templateUrl: './player-controls.component.html',
+    styleUrl: './player-controls.component.scss',
+    imports: [MatButtonModule, MatIconModule, MatTooltipModule, TranslatePipe],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    host: {
+        class: 'player-controls-host',
+        '[class.player-controls-host--cursor-hidden]': 'hideCursor()',
+    },
+})
+export class PlayerControlsComponent implements OnDestroy {
+    private readonly host = inject(ElementRef<HTMLElement>).nativeElement;
+    private readonly translate = inject(TranslateService);
+    readonly controller = input.required<PlayerController>();
+    readonly playerSurface = input<HTMLElement | null>(null);
+    readonly showControls = input(true);
+    readonly shortcutsEnabled = input(true);
+    readonly mediaTitle = input<PlayerMediaTitle | null>(null);
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+    readonly barHovered = signal(false);
+    private readonly barFocused = signal(false);
+    readonly menus = new ControlsMenuState();
+    readonly feedback = new ControlsFeedback();
+    readonly anyMenuOpen = this.menus.anyOpen;
+    private readonly shortcuts = new ControlsShortcuts();
+    private readonly visibility = new ControlsVisibility(() => this.canHide());
+    private readonly fullscreen = new ControlsFullscreen(
+        () => this.playerSurface(),
+        () => this.reveal()
+    );
+    private readonly volume = new ControlsVolume({
+        apply: (value) => this.controller().commands.setVolume(value),
+        flash: (icon, label) => this.feedback.flash(icon, label),
+        mutedLabel: () => this.translate.instant('EMBEDDED_MPV.PLAYER.MUTED'),
+        openPopover: () => this.menus.open('volume'),
+        closePopover: () => this.menus.close('volume'),
+    });
+    private readonly surface = new ControlsSurface(
+        {
+            reveal: () => this.reveal(),
+            toggleFullscreen: () => void this.toggleFullscreen(),
+            closePopovers: () => this.closePopovers(),
+            togglePlay: () => this.togglePlay(),
+            canTogglePlay: () => this.canTogglePlay(),
+            isMenuOpen: () => this.menus.anyOpen(),
+        },
+        this.host
+    );
+    readonly menuSelection = new ControlsMenuSelection({
+        commands: () => this.controller().commands,
+        menus: this.menus,
+        visibility: this.visibility,
+        revealSticky: () => this.reveal({ scheduleHide: false }),
+    });
+
+    readonly state = computed(() => this.controller().state());
+    readonly capabilities = computed(() => this.controller().capabilities());
+    private readonly controllerVolume = computed(() => this.state().volume);
+    private readonly timeline = new ControlsTimeline(this.state);
+    readonly scrubPosition = this.timeline.scrubPosition;
+    readonly timelineDuration = this.timeline.duration;
+    readonly timelineValue = this.timeline.value;
+    readonly timelineProgress = this.timeline.progress;
+
+    readonly displayVolume = this.volume.value;
+    readonly isFullscreen = this.fullscreen.isFullscreen;
+
+    // The page around the player already names the content; the overlay only
+    // fills that gap in fullscreen, where no other chrome is visible.
+    readonly fullscreenMediaTitle = computed<PlayerMediaTitle | null>(() => {
+        if (!this.showControls() || !this.isFullscreen()) {
+            return null;
+        }
+        const mediaTitle = this.mediaTitle();
+        return mediaTitle?.primary?.trim() ? mediaTitle : null;
+    });
+
+    private readonly vm = createControlsViewModel({
+        state: this.state,
+        capabilities: this.capabilities,
+        volume: this.volume.value,
+        isFullscreen: this.isFullscreen,
+        canFullscreenNative: () => this.fullscreen.canFullscreen(),
+        showControls: this.showControls,
+        autoHideVisible: this.visibility.visible,
+        anyMenuOpen: this.menus.anyOpen,
+    });
+
+    readonly isLoading = this.vm.isLoading;
+    readonly isPaused = this.vm.isPaused;
+    readonly isPlaying = this.vm.isPlaying;
+    readonly canTogglePlay = this.vm.canTogglePlay;
+    readonly hasAudioTracks = this.vm.hasAudioTracks;
+    readonly hasSubtitleTracks = this.vm.hasSubtitleTracks;
+    readonly canRecord = this.vm.canRecord;
+    readonly isRecording = this.vm.isRecording;
+    readonly recordingStatusText = this.vm.recordingStatusText;
+    readonly volumeIcon = this.vm.volumeIcon;
+    readonly canFullscreen = this.vm.canFullscreen;
+    readonly volumePercent = computed(() =>
+        Math.round(this.displayVolume() * 100)
+    );
+    readonly controlsAreVisible = this.vm.controlsAreVisible;
+    readonly hideCursor = this.vm.hideCursor;
+    constructor() {
+        this.shortcuts.attach({
+            isAvailable: () => this.shortcutsEnabled() && this.showControls(),
+            canTogglePaused: () => this.canTogglePlay(),
+            canSeek: () => this.capabilities().seek && this.state().canSeek,
+            canAdjustVolume: () => this.capabilities().volume,
+            canToggleFullscreen: () => this.canFullscreen(),
+            onEscape: () => this.closePopovers(),
+            togglePaused: () => this.togglePlay(),
+            toggleFullscreen: () => void this.toggleFullscreen(),
+            seekBy: (delta) => this.seekBy(delta),
+            adjustVolume: (delta) => this.adjustVolume(delta),
+            toggleMute: () => this.toggleMute(),
+        });
+        effect((onCleanup) => {
+            const playerSurface = this.playerSurface();
+            const surface = this.showControls() ? playerSurface : null;
+            this.fullscreen.sync();
+            onCleanup(this.surface.attachSurface(surface));
+        });
+        effect(() => {
+            const controller = this.controller();
+            if (
+                !this.volume.beginCapabilityEpoch(
+                    controller,
+                    this.capabilities().volume
+                )
+            ) {
+                return;
+            }
+            const volume = this.controllerVolume();
+            untracked(() =>
+                this.volume.initializeController(controller, volume)
+            );
+        });
+        effect(() => {
+            const controller = this.controller();
+            const volume = this.controllerVolume();
+            untracked(() =>
+                this.volume.reconcileController(controller, volume)
+            );
+        });
+        effect((onCleanup) => {
+            const surface = this.playerSurface();
+            if (!surface || !this.hideCursor()) {
+                return;
+            }
+            const previousCursor = surface.style.cursor;
+            surface.style.cursor = 'none';
+            onCleanup(() => {
+                if (surface.style.cursor === 'none') {
+                    surface.style.cursor = previousCursor;
+                }
+            });
+        });
+        effect(() => {
+            const state = this.state();
+            const showControls = this.showControls();
+            const capabilities = this.capabilities();
+            untracked(() => {
+                if (!capabilities.seek || !state.canSeek) {
+                    this.scrubPosition.set(null);
+                }
+                this.menus.reconcileControllerAvailability(
+                    showControls,
+                    capabilities,
+                    state
+                );
+                this.visibility.scheduleHide();
+                this.feedback.flashRecordingState(state.recording, {
+                    active: this.translate.instant(
+                        'EMBEDDED_MPV.PLAYER.RECORDING'
+                    ),
+                    inactive: this.translate.instant(
+                        'EMBEDDED_MPV.PLAYER.RECORDING_SAVED'
+                    ),
+                });
+            });
+        });
+    }
+    ngOnDestroy(): void {
+        this.shortcuts.detach();
+        this.feedback.dispose();
+        this.visibility.dispose();
+        this.fullscreen.dispose();
+        this.volume.dispose();
+        this.surface.dispose();
+    }
+    formatTime = formatTime;
+    speedLabel = speedLabel;
+    togglePlay(): void {
+        this.reveal();
+        if (!this.canTogglePlay()) {
+            return;
+        }
+        this.controller().commands.togglePlay();
+    }
+    seekBy(deltaSeconds: number): void {
+        this.reveal();
+        if (!this.capabilities().seek || !this.state().canSeek) {
+            return;
+        }
+        this.controller().commands.seekBy(deltaSeconds);
+        this.feedback.flash(
+            deltaSeconds >= 0 ? 'forward_10' : 'replay_10',
+            `${deltaSeconds >= 0 ? '+' : ''}${Math.round(deltaSeconds)}s`
+        );
+    }
+    onTimelineInput(event: Event): void {
+        this.reveal();
+        this.scrubPosition.set(this.timeline.readEventValue(event));
+    }
+    onTimelineCommit(event: Event): void {
+        this.reveal();
+        const target = this.timeline.readEventValue(event);
+        this.scrubPosition.set(null);
+        if (
+            target === null ||
+            !this.capabilities().seek ||
+            !this.state().canSeek
+        ) {
+            return;
+        }
+        this.controller().commands.seekTo(target);
+    }
+    requestPreviousEpisode(): void {
+        this.reveal();
+        if (!this.state().canPreviousEpisode) {
+            return;
+        }
+        this.previousEpisodeRequested.emit();
+    }
+    requestNextEpisode(): void {
+        this.reveal();
+        if (!this.state().canNextEpisode) {
+            return;
+        }
+        this.nextEpisodeRequested.emit();
+    }
+    onVolumeInput(event: Event): void {
+        this.volume.set(Number((event.target as HTMLInputElement).value));
+        this.reveal({ scheduleHide: false });
+    }
+    onVolumeWheel(event: WheelEvent): void {
+        event.preventDefault();
+        this.adjustVolume(event.deltaY > 0 ? -0.05 : 0.05);
+    }
+    onVolumeHoverEnter(): void {
+        this.volume.hoverEnter();
+    }
+    onVolumeHoverLeave(): void {
+        this.volume.hoverLeave();
+    }
+
+    toggleMute(): void {
+        if (!this.capabilities().volume) {
+            return;
+        }
+        this.volume.toggleMute();
+        this.reveal();
+    }
+
+    toggleMenu(menu: 'audio' | 'subtitle' | 'speed' | 'aspect'): void {
+        this.menus.toggle(menu);
+        this.reveal();
+    }
+    toggleRecording(): void {
+        if (!this.canRecord()) {
+            return;
+        }
+        this.reveal({ scheduleHide: false });
+        this.controller().commands.toggleRecording();
+    }
+
+    togglePictureInPicture(): void {
+        this.reveal();
+        const state = this.state();
+        if (this.capabilities().pictureInPicture && state.canPictureInPicture) {
+            this.controller().commands.togglePictureInPicture();
+        }
+    }
+    async toggleFullscreen(): Promise<void> {
+        this.reveal();
+        if (!this.canFullscreen()) {
+            return;
+        }
+        await this.fullscreen.toggle();
+    }
+    private adjustVolume(delta: number): void {
+        if (!this.capabilities().volume) {
+            return;
+        }
+        this.volume.adjust(delta);
+        this.reveal();
+    }
+    private closePopovers(): void {
+        if (!this.menus.anyOpen()) {
+            return;
+        }
+        this.menus.closeAll();
+        this.visibility.scheduleHide();
+    }
+
+    reveal(options: { scheduleHide?: boolean } = {}): void {
+        this.shortcuts.activate();
+        this.visibility.reveal(options);
+    }
+
+    onBarPointerEnter(): void {
+        this.barHovered.set(true);
+        this.reveal({ scheduleHide: false });
+    }
+
+    onBarPointerLeave(): void {
+        this.barHovered.set(false);
+        this.visibility.scheduleHide();
+    }
+
+    onBarFocusIn(): void {
+        this.barFocused.set(true);
+        this.reveal({ scheduleHide: false });
+    }
+
+    onBarFocusOut(event: FocusEvent): void {
+        const bar = event.currentTarget as HTMLElement | null;
+        const next = event.relatedTarget;
+        if (bar && next instanceof Node && bar.contains(next)) {
+            return;
+        }
+        this.barFocused.set(false);
+        this.visibility.scheduleHide();
+    }
+
+    private canHide(): boolean {
+        return (
+            this.isPlaying() &&
+            !this.barHovered() &&
+            !this.barFocused() &&
+            !this.menus.anyOpen() &&
+            !this.state().statusMessage
+        );
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/player-controls.model.ts b/libs/ui/playback/src/lib/player-controls/player-controls.model.ts
new file mode 100644
index 000000000..bb486f0e0
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/player-controls.model.ts
@@ -0,0 +1,107 @@
+import type { Signal } from '@angular/core';
+
+export type PlayerStatus =
+    | 'idle'
+    | 'loading'
+    | 'playing'
+    | 'paused'
+    | 'ended'
+    | 'error';
+
+/** Which controls an engine supports. A control is only rendered when its flag is true. */
+export interface PlayerControlsCapabilities {
+    seek: boolean; // scrub bar / ±10s (VOD)
+    volume: boolean;
+    audioTracks: boolean;
+    subtitles: boolean;
+    playbackSpeed: boolean;
+    aspectRatio: boolean;
+    recording: boolean;
+    pictureInPicture: boolean;
+    fullscreen: boolean;
+    seriesNavigation: boolean;
+}
+
+export interface PlayerTrack {
+    id: number;
+    label: string; // adapter pre-computes the display label
+    selected: boolean;
+}
+
+/**
+ * Content title lines rendered over the player while the controls are visible
+ * in fullscreen. Hosts pass display-ready strings; the controls never derive
+ * them from playback data.
+ */
+export interface PlayerMediaTitle {
+    /** Movie title, channel name, or series name. */
+    primary: string;
+    /** Optional second line, e.g. the "S01E03" label for series episodes. */
+    secondary?: string | null;
+}
+
+export interface PlayerPreset<T> {
+    value: T;
+    label: string;
+}
+
+export interface PlayerRecordingState {
+    active: boolean;
+    /** Seconds since recording started; adapter computes via a 1s tick. */
+    elapsedSeconds: number;
+    /** Persistent status text (e.g. "Saved to …" / error). null when none. */
+    message: string | null;
+    /** Changes when recording ownership moves to another playback/session. */
+    transitionKey?: string | null;
+}
+
+export interface PlayerControlsState {
+    status: PlayerStatus;
+    /** Loading/error text for the player surface; '' when nothing to show. */
+    statusMessage: string;
+    stalled: boolean;
+    positionSeconds: number;
+    durationSeconds: number | null;
+    isLive: boolean;
+    canSeek: boolean;
+    volume: number; // 0..1
+    audioTracks: PlayerTrack[];
+    subtitleTracks: PlayerTrack[];
+    /** True when a subtitle track is active (selected id !== null/off). */
+    subtitlesEnabled: boolean;
+    playbackSpeed: number;
+    speedPresets: ReadonlyArray<PlayerPreset<number>>;
+    aspectRatio: string;
+    aspectPresets: ReadonlyArray<PlayerPreset<string>>;
+    recording: PlayerRecordingState;
+    pictureInPictureActive: boolean;
+    canPictureInPicture: boolean;
+    canPreviousEpisode: boolean;
+    canNextEpisode: boolean;
+}
+
+/** Imperative command surface. All fire-and-forget (void). */
+export interface PlayerControlsCommands {
+    togglePlay(): void;
+    seekTo(seconds: number): void;
+    seekBy(deltaSeconds: number): void;
+    setVolume(value: number): void; // 0..1
+    setAudioTrack(id: number): void;
+    setSubtitleTrack(id: number): void; // -1 = off
+    setPlaybackSpeed(speed: number): void;
+    setAspectRatio(value: string): void;
+    toggleRecording(): void;
+    togglePictureInPicture(): void;
+}
+
+/**
+ * What any engine implements to drive the shared controls. Intentionally has NO
+ * component-lifecycle assumptions — a controller may live above the router
+ * (background-playback readiness, subissue 04). Episode navigation and
+ * fullscreen are NOT here: they are controls-component outputs / DOM affordances.
+ */
+export interface PlayerController {
+    readonly capabilities: Signal<PlayerControlsCapabilities>;
+    readonly state: Signal<PlayerControlsState>;
+    readonly commands: PlayerControlsCommands;
+}
diff --git a/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.spec.ts b/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.spec.ts
new file mode 100644
index 000000000..1b695b71b
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.spec.ts
@@ -0,0 +1,29 @@
+import { TestBed } from '@angular/core/testing';
+import {
+    WEB_PLAYER_SHARED_CONTROLS,
+    WEB_PLAYER_SHARED_CONTROLS_ENABLED,
+} from './web-player-controls.flag';
+
+describe('WEB_PLAYER_SHARED_CONTROLS flag', () => {
+    afterEach(() => TestBed.resetTestingModule());
+
+    it('is rolled out OFF by default', () => {
+        expect(WEB_PLAYER_SHARED_CONTROLS_ENABLED).toBe(false);
+    });
+
+    it('resolves the constant through the root injection token', () => {
+        TestBed.configureTestingModule({});
+        expect(TestBed.inject(WEB_PLAYER_SHARED_CONTROLS)).toBe(
+            WEB_PLAYER_SHARED_CONTROLS_ENABLED
+        );
+    });
+
+    it('can be overridden via a TestBed provider', () => {
+        TestBed.configureTestingModule({
+            providers: [
+                { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true },
+            ],
+        });
+        expect(TestBed.inject(WEB_PLAYER_SHARED_CONTROLS)).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.ts b/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.ts
new file mode 100644
index 000000000..8a03bc33f
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-player-controls.flag.ts
@@ -0,0 +1,24 @@
+import { InjectionToken } from '@angular/core';
+
+/**
+ * Reserved rollout switch for shared `app-player-controls` chrome on the web
+ * video engines (HTML5+hls.js, Video.js, ArtPlayer).
+ *
+ * DEFAULT OFF. The built-in HTML5, Video.js, and ArtPlayer implementations
+ * consume the injectable {@link WEB_PLAYER_SHARED_CONTROLS} token and switch
+ * atomically between their existing chrome and shared controls.
+ */
+export const WEB_PLAYER_SHARED_CONTROLS_ENABLED = false;
+
+/**
+ * Injectable view of {@link WEB_PLAYER_SHARED_CONTROLS_ENABLED}. Components
+ * inject this token; specs override it via TestBed providers without mocking a
+ * module-level constant.
+ */
+export const WEB_PLAYER_SHARED_CONTROLS = new InjectionToken<boolean>(
+    'WEB_PLAYER_SHARED_CONTROLS',
+    {
+        providedIn: 'root',
+        factory: () => WEB_PLAYER_SHARED_CONTROLS_ENABLED,
+    }
+);
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.commands.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.commands.spec.ts
new file mode 100644
index 000000000..28195e49b
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.commands.spec.ts
@@ -0,0 +1,356 @@
+import { signal } from '@angular/core';
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+import {
+    createEmptyControlsState,
+    DEFAULT_PLAYER_CAPABILITIES,
+} from './player-controls-defaults';
+import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+
+/** jsdom `<video>` with overridable readonly media props (command-path spec). */
+function createVideo(
+    overrides: Partial<{
+        duration: number;
+        readyState: number;
+        networkState: number;
+        paused: boolean;
+        ended: boolean;
+        error: MediaError | null;
+        seekableLength: number;
+        muted: boolean;
+        volume: number;
+        currentTime: number;
+        playbackRate: number;
+        playRejects: boolean;
+    }> = {}
+): HTMLVideoElement {
+    const video = document.createElement('video');
+    const define = (prop: string, value: unknown) =>
+        Object.defineProperty(video, prop, {
+            configurable: true,
+            writable: true,
+            value,
+        });
+    define('duration', overrides.duration ?? NaN);
+    define('readyState', overrides.readyState ?? 4);
+    define('networkState', overrides.networkState ?? 1);
+    define('paused', overrides.paused ?? false);
+    define('ended', overrides.ended ?? false);
+    define('error', overrides.error ?? null);
+    define('seekable', { length: overrides.seekableLength ?? 0 });
+    define('muted', overrides.muted ?? false);
+    define('volume', overrides.volume ?? 1);
+    define('currentTime', overrides.currentTime ?? 0);
+    define('playbackRate', overrides.playbackRate ?? 1);
+    define(
+        'play',
+        overrides.playRejects
+            ? jest.fn().mockRejectedValue(new Error('blocked'))
+            : jest.fn().mockResolvedValue(undefined)
+    );
+    define('pause', jest.fn());
+    return video;
+}
+
+describe('WebVideoControlsAdapter (commands & edge branches)', () => {
+    let adapter: WebVideoControlsAdapter;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+    });
+
+    afterEach(() => adapter.detach());
+
+    it('pauses a playing video and resumes an ended one', () => {
+        const playing = createVideo({ paused: false });
+        adapter.attach(playing);
+        adapter.commands.togglePlay();
+        expect(playing.pause).toHaveBeenCalled();
+
+        const ended = createVideo({ paused: false, ended: true });
+        const endedAdapter = new WebVideoControlsAdapter();
+        endedAdapter.attach(ended);
+        endedAdapter.commands.togglePlay();
+        expect(ended.play).toHaveBeenCalled();
+        endedAdapter.detach();
+    });
+
+    it('swallows play() rejections (autoplay policies)', async () => {
+        const video = createVideo({ paused: true, playRejects: true });
+        adapter.attach(video);
+        expect(() => adapter.commands.togglePlay()).not.toThrow();
+        await Promise.resolve();
+        expect(video.play).toHaveBeenCalled();
+    });
+
+    it('ignores every command while no video is attached', () => {
+        expect(() => {
+            adapter.commands.togglePlay();
+            adapter.commands.seekTo(10);
+            adapter.commands.seekBy(5);
+            adapter.commands.setVolume(0.5);
+            adapter.commands.setPlaybackSpeed(2);
+            adapter.commands.setAudioTrack(1);
+            adapter.commands.setSubtitleTrack(-1);
+            adapter.commands.setAspectRatio('16:9');
+            adapter.commands.toggleRecording();
+        }).not.toThrow();
+    });
+
+    it('reports no capabilities before a video is attached', () => {
+        expect(adapter.capabilities()).toEqual(DEFAULT_PLAYER_CAPABILITIES);
+    });
+
+    it('disables seek capability for an infinite-duration live stream', () => {
+        adapter.attach(createVideo({ duration: Infinity }));
+
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.capabilities().seek).toBe(false);
+    });
+
+    it('disables seek capability for an explicitly classified live stream', () => {
+        adapter.attach(createVideo({ duration: 120, seekableLength: 1 }), {
+            isLive: () => true,
+        });
+
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.capabilities().seek).toBe(false);
+    });
+
+    it('keeps seek capability for VOD while seekable ranges warm up', () => {
+        adapter.attach(createVideo({ duration: 120, seekableLength: 0 }), {
+            isLive: () => false,
+        });
+
+        expect(adapter.state().isLive).toBe(false);
+        expect(adapter.state().canSeek).toBe(false);
+        expect(adapter.capabilities().seek).toBe(true);
+    });
+
+    it('ignores track selection when the engine exposes no accessors', () => {
+        adapter.attach(createVideo());
+        expect(() => {
+            adapter.commands.setAudioTrack(1);
+            adapter.commands.setSubtitleTrack(0);
+        }).not.toThrow();
+    });
+
+    it('rejects non-finite or non-positive playback speeds', () => {
+        const video = createVideo({ playbackRate: 1 });
+        adapter.attach(video);
+
+        adapter.commands.setPlaybackSpeed(NaN);
+        adapter.commands.setPlaybackSpeed(Infinity);
+        adapter.commands.setPlaybackSpeed(0);
+        adapter.commands.setPlaybackSpeed(-1);
+        expect(video.playbackRate).toBe(1);
+
+        adapter.commands.setPlaybackSpeed(1.25);
+        expect(video.playbackRate).toBe(1.25);
+    });
+
+    it('rejects non-finite seek and volume values', () => {
+        const video = createVideo({
+            duration: 100,
+            currentTime: 20,
+            volume: 0.5,
+        });
+        const getDuration = jest.fn(() => 100);
+        adapter.attach(video, { getDuration });
+        getDuration.mockClear();
+
+        adapter.commands.seekTo(NaN);
+        adapter.commands.seekTo(Infinity);
+        adapter.commands.seekBy(NaN);
+        adapter.commands.setVolume(NaN);
+        adapter.commands.setVolume(Infinity);
+
+        expect(video.currentTime).toBe(20);
+        expect(video.volume).toBe(0.5);
+        expect(getDuration).not.toHaveBeenCalled();
+    });
+
+    it('swallows native media setter exceptions', () => {
+        const seekVideo = createVideo({ duration: 100, currentTime: 20 });
+        Object.defineProperty(seekVideo, 'currentTime', {
+            configurable: true,
+            get: () => 20,
+            set: () => {
+                throw new Error('seek blocked');
+            },
+        });
+        adapter.attach(seekVideo);
+        expect(() => adapter.commands.seekTo(30)).not.toThrow();
+
+        const volumeVideo = createVideo({ volume: 0.5 });
+        Object.defineProperty(volumeVideo, 'volume', {
+            configurable: true,
+            get: () => 0.5,
+            set: () => {
+                throw new Error('volume blocked');
+            },
+        });
+        const volumeAdapter = new WebVideoControlsAdapter();
+        volumeAdapter.attach(volumeVideo);
+        expect(() => volumeAdapter.commands.setVolume(0.25)).not.toThrow();
+        volumeAdapter.detach();
+
+        const speedVideo = createVideo({ playbackRate: 1 });
+        Object.defineProperty(speedVideo, 'playbackRate', {
+            configurable: true,
+            get: () => 1,
+            set: () => {
+                throw new Error('speed blocked');
+            },
+        });
+        const speedAdapter = new WebVideoControlsAdapter();
+        speedAdapter.attach(speedVideo);
+        expect(() => speedAdapter.commands.setPlaybackSpeed(1.5)).not.toThrow();
+        speedAdapter.detach();
+    });
+
+    it('does not clamp seekTo when the duration is not finite', () => {
+        const video = createVideo({ duration: Infinity });
+        adapter.attach(video);
+        adapter.commands.seekTo(1234);
+        expect(video.currentTime).toBe(1234);
+    });
+
+    it('clamps setVolume into [0, 1] and mutes only at zero', () => {
+        const video = createVideo();
+        adapter.attach(video);
+
+        adapter.commands.setVolume(1.5);
+        expect(video.volume).toBe(1);
+        expect(video.muted).toBe(false);
+
+        adapter.commands.setVolume(-0.5);
+        expect(video.volume).toBe(0);
+        expect(video.muted).toBe(true);
+    });
+
+    it('detach is idempotent and re-attach rebinds listeners once', () => {
+        const first = createVideo();
+        const removeSpy = jest.spyOn(first, 'removeEventListener');
+        adapter.attach(first);
+        adapter.detach();
+        adapter.detach();
+        const callsAfterDoubleDetach = removeSpy.mock.calls.length;
+        adapter.detach();
+        expect(removeSpy.mock.calls.length).toBe(callsAfterDoubleDetach);
+
+        // Attaching a new element detaches the previous one.
+        const second = createVideo();
+        adapter.attach(first);
+        adapter.attach(second);
+        expect(
+            removeSpy.mock.calls.filter(([event]) => event === 'play').length
+        ).toBeGreaterThanOrEqual(2);
+    });
+
+    it('restores the canonical empty state and preserves series context', () => {
+        const seriesNavigation = signal<SeriesPlaybackNavigation | null>({
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        adapter.setContext({ seriesNavigation });
+        expect(adapter.state()).toEqual(createEmptyControlsState());
+
+        adapter.attach(createVideo({ duration: 120, volume: 0.4 }), {
+            isLive: () => false,
+        });
+        expect(adapter.state().status).toBe('playing');
+        expect(adapter.capabilities().seek).toBe(true);
+        expect(adapter.capabilities().seriesNavigation).toBe(true);
+
+        adapter.detach();
+
+        expect(adapter.state()).toEqual(createEmptyControlsState());
+        expect(adapter.capabilities()).toEqual(DEFAULT_PLAYER_CAPABILITIES);
+
+        adapter.attach(createVideo({ duration: 120 }), {
+            isLive: () => false,
+        });
+        expect(adapter.capabilities().seriesNavigation).toBe(true);
+    });
+
+    it('clears engine callbacks on detach', () => {
+        const setAudioTrack = jest.fn();
+        adapter.attach(createVideo(), { setAudioTrack });
+        adapter.detach();
+
+        adapter.commands.setAudioTrack(1);
+
+        expect(setAudioTrack).not.toHaveBeenCalled();
+    });
+
+    it('treats a throwing seekable getter as not seekable', () => {
+        const video = createVideo({ duration: 100 });
+        Object.defineProperty(video, 'seekable', {
+            configurable: true,
+            get() {
+                throw new Error('not supported');
+            },
+        });
+        adapter.attach(video, { isLive: () => false });
+        expect(adapter.state().canSeek).toBe(false);
+    });
+
+    it('keeps paused warmup playable but maps playing warmup to loading', () => {
+        const pausedWarmup = createVideo({ paused: true, readyState: 1 });
+        adapter.attach(pausedWarmup);
+        expect(adapter.state().status).toBe('paused');
+
+        const playingWarmup = createVideo({ paused: false, readyState: 2 });
+        const other = new WebVideoControlsAdapter();
+        other.attach(playingWarmup);
+        expect(other.state().status).toBe('loading');
+        other.detach();
+    });
+
+    it('falls back to finite element duration for liveness when isLive is omitted', () => {
+        adapter.attach(createVideo({ duration: 42, seekableLength: 1 }));
+        expect(adapter.state().isLive).toBe(false);
+        expect(adapter.state().durationSeconds).toBe(42);
+    });
+
+    it('preserves the options receiver when reading corrected duration', () => {
+        const options = {
+            correctedDuration: 84,
+            getDuration() {
+                return this.correctedDuration;
+            },
+        };
+
+        adapter.attach(
+            createVideo({ duration: Infinity, seekableLength: 1 }),
+            options
+        );
+
+        expect(adapter.state().durationSeconds).toBe(84);
+        expect(adapter.state().isLive).toBe(false);
+    });
+
+    it('preserves the options receiver when reading live classification', () => {
+        const options = {
+            live: true,
+            isLive() {
+                return this.live;
+            },
+        };
+
+        adapter.attach(
+            createVideo({ duration: 84, seekableLength: 1 }),
+            options
+        );
+
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.capabilities().seek).toBe(false);
+    });
+
+    it('normalizes a zero duration to null', () => {
+        adapter.attach(createVideo({ duration: 0 }), { isLive: () => false });
+        expect(adapter.state().durationSeconds).toBeNull();
+        expect(adapter.state().canSeek).toBe(false);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.contract.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.contract.spec.ts
new file mode 100644
index 000000000..2dd351854
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.contract.spec.ts
@@ -0,0 +1,154 @@
+import type { PlayerTrack } from './player-controls.model';
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+
+interface VideoOverrides {
+    duration: number;
+    readyState: number;
+    networkState: number;
+    paused: boolean;
+    ended: boolean;
+    error: MediaError | null;
+    seekableLength: number;
+}
+
+function createVideo(
+    overrides: Partial<VideoOverrides> = {}
+): HTMLVideoElement {
+    const video = document.createElement('video');
+    const define = (prop: string, value: unknown) =>
+        Object.defineProperty(video, prop, {
+            configurable: true,
+            writable: true,
+            value,
+        });
+
+    define('duration', overrides.duration ?? NaN);
+    define('readyState', overrides.readyState ?? 4);
+    define('networkState', overrides.networkState ?? 1);
+    define('paused', overrides.paused ?? false);
+    define('ended', overrides.ended ?? false);
+    define('error', overrides.error ?? null);
+    define('seekable', { length: overrides.seekableLength ?? 0 });
+    return video;
+}
+
+describe('WebVideoControlsAdapter contract', () => {
+    let adapter: WebVideoControlsAdapter;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+    });
+
+    afterEach(() => adapter.detach());
+
+    it('requires both selectable audio tracks and an audio setter', () => {
+        const single: PlayerTrack[] = [
+            { id: 0, label: 'English', selected: true },
+        ];
+        const multiple: PlayerTrack[] = [
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'German', selected: false },
+        ];
+
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => multiple,
+        });
+        expect(adapter.capabilities().audioTracks).toBe(false);
+
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => single,
+            setAudioTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().audioTracks).toBe(false);
+
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => multiple,
+            setAudioTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().audioTracks).toBe(true);
+    });
+
+    it('requires both subtitle tracks and a subtitle setter', () => {
+        const subtitles: PlayerTrack[] = [
+            { id: 0, label: 'English', selected: true },
+        ];
+
+        adapter.attach(createVideo(), {
+            getSubtitleTracks: () => subtitles,
+        });
+        expect(adapter.capabilities().subtitles).toBe(false);
+
+        adapter.attach(createVideo(), {
+            getSubtitleTracks: () => [],
+            setSubtitleTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().subtitles).toBe(false);
+
+        adapter.attach(createVideo(), {
+            getSubtitleTracks: () => subtitles,
+            setSubtitleTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().subtitles).toBe(true);
+    });
+
+    it.each([NaN, Number.NEGATIVE_INFINITY])(
+        'does not classify an unknown duration (%s) as live',
+        (duration) => {
+            adapter.attach(createVideo({ duration }));
+
+            expect(adapter.state().isLive).toBe(false);
+            expect(adapter.state().durationSeconds).toBeNull();
+            expect(adapter.capabilities().seek).toBe(true);
+        }
+    );
+
+    it('treats getDuration positive Infinity as authoritative', () => {
+        adapter.attach(
+            createVideo({
+                duration: 90,
+                seekableLength: 1,
+            }),
+            { getDuration: () => Number.POSITIVE_INFINITY }
+        );
+
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.state().durationSeconds).toBeNull();
+        expect(adapter.state().canSeek).toBe(false);
+    });
+
+    it('maps an attached element with an empty network to idle', () => {
+        adapter.attach(
+            createVideo({
+                networkState: 0,
+                readyState: 0,
+                paused: true,
+            })
+        );
+
+        expect(adapter.state().status).toBe('idle');
+    });
+
+    it('keeps a paused preload or warmup user-playable', () => {
+        adapter.attach(
+            createVideo({
+                networkState: 1,
+                readyState: 0,
+                paused: true,
+            })
+        );
+
+        expect(adapter.state().status).toBe('paused');
+    });
+
+    it('maps actively playing media with insufficient data to loading', () => {
+        adapter.attach(
+            createVideo({
+                networkState: 2,
+                readyState: 2,
+                paused: false,
+            })
+        );
+
+        expect(adapter.state().status).toBe('loading');
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.events.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.events.spec.ts
new file mode 100644
index 000000000..aa571da94
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.events.spec.ts
@@ -0,0 +1,139 @@
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+
+interface VideoOverrides {
+    duration: number;
+    readyState: number;
+    networkState: number;
+    paused: boolean;
+    currentTime: number;
+    seekableLength: number;
+}
+
+function createVideo(
+    overrides: Partial<VideoOverrides> = {}
+): HTMLVideoElement {
+    const video = document.createElement('video');
+    Object.defineProperties(video, {
+        duration: {
+            configurable: true,
+            writable: true,
+            value: overrides.duration ?? 120,
+        },
+        paused: {
+            configurable: true,
+            writable: true,
+            value: overrides.paused ?? true,
+        },
+        readyState: {
+            configurable: true,
+            writable: true,
+            value: overrides.readyState ?? 1,
+        },
+        networkState: {
+            configurable: true,
+            writable: true,
+            value: overrides.networkState ?? 1,
+        },
+        currentTime: {
+            configurable: true,
+            writable: true,
+            value: overrides.currentTime ?? 0,
+        },
+        seekable: {
+            configurable: true,
+            writable: true,
+            value: { length: overrides.seekableLength ?? 0 },
+        },
+    });
+    return video;
+}
+
+function setMediaProp(
+    video: HTMLVideoElement,
+    property: string,
+    value: unknown
+): void {
+    Object.defineProperty(video, property, {
+        configurable: true,
+        writable: true,
+        value,
+    });
+}
+
+describe('WebVideoControlsAdapter media events', () => {
+    let adapter: WebVideoControlsAdapter;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+    });
+
+    afterEach(() => adapter.detach());
+
+    it.each(['loadedmetadata', 'loadeddata', 'canplay'] as const)(
+        'retains readiness invalidation on %s',
+        (eventName) => {
+            const video = createVideo({ duration: NaN });
+            adapter.attach(video, { isLive: () => false });
+            expect(adapter.state().durationSeconds).toBeNull();
+
+            setMediaProp(video, 'duration', 120);
+            video.dispatchEvent(new Event(eventName));
+
+            expect(adapter.state().durationSeconds).toBe(120);
+        }
+    );
+
+    it('clears cached resource state when emptied fires', () => {
+        const video = createVideo({
+            duration: 120,
+            readyState: 4,
+            networkState: 1,
+            currentTime: 30,
+            seekableLength: 1,
+        });
+        adapter.attach(video, { isLive: () => false });
+        expect(adapter.state().durationSeconds).toBe(120);
+        expect(adapter.state().canSeek).toBe(true);
+
+        setMediaProp(video, 'duration', NaN);
+        setMediaProp(video, 'readyState', 0);
+        setMediaProp(video, 'networkState', 0);
+        setMediaProp(video, 'currentTime', 0);
+        setMediaProp(video, 'seekable', { length: 0 });
+        video.dispatchEvent(new Event('emptied'));
+
+        expect(adapter.state().status).toBe('idle');
+        expect(adapter.state().durationSeconds).toBeNull();
+        expect(adapter.state().positionSeconds).toBe(0);
+        expect(adapter.state().canSeek).toBe(false);
+    });
+
+    it('updates paused VOD seekability when progress fires', () => {
+        const video = createVideo({
+            duration: 120,
+            paused: true,
+            seekableLength: 0,
+        });
+        adapter.attach(video, { isLive: () => false });
+        expect(adapter.state().canSeek).toBe(false);
+
+        setMediaProp(video, 'seekable', { length: 1 });
+        video.dispatchEvent(new Event('progress'));
+
+        expect(adapter.state().canSeek).toBe(true);
+    });
+
+    it.each(['loadstart', 'stalled', 'seeking', 'seeked'] as const)(
+        'invalidates cached media state on %s',
+        (eventName) => {
+            const video = createVideo({ currentTime: 0 });
+            adapter.attach(video, { isLive: () => false });
+            expect(adapter.state().positionSeconds).toBe(0);
+
+            setMediaProp(video, 'currentTime', 15);
+            video.dispatchEvent(new Event(eventName));
+
+            expect(adapter.state().positionSeconds).toBe(15);
+        }
+    );
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.picture-in-picture.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.picture-in-picture.spec.ts
new file mode 100644
index 000000000..c62de8342
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.picture-in-picture.spec.ts
@@ -0,0 +1,384 @@
+import {
+    PictureInPictureTestEnvironment,
+    deferred,
+} from './picture-in-picture.spec-helpers';
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+
+const PICTURE_IN_PICTURE_WINDOW = {} as PictureInPictureWindow;
+
+describe('WebVideoControlsAdapter Picture-in-Picture', () => {
+    let adapter: WebVideoControlsAdapter;
+    let environment: PictureInPictureTestEnvironment;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+        environment = new PictureInPictureTestEnvironment();
+    });
+
+    afterEach(() => {
+        adapter.detach();
+        environment.restore();
+    });
+
+    it('is unavailable when the document disables PiP', () => {
+        environment.setEnabled(false);
+        const video = installVideo();
+
+        adapter.attach(video);
+
+        expectPiP(false, false);
+    });
+
+    it('is unavailable when the element disables PiP', () => {
+        const video = installVideo({ disablePictureInPicture: true });
+
+        adapter.attach(video);
+
+        expectPiP(false, false);
+    });
+
+    it('is unavailable without requestPictureInPicture', () => {
+        const video = installVideo({ request: null });
+
+        adapter.attach(video);
+
+        expectPiP(false, false);
+    });
+
+    it('is unavailable without exitPictureInPicture', () => {
+        environment.setExitAvailable(false);
+        const video = installVideo();
+
+        adapter.attach(video);
+
+        expectPiP(false, false);
+    });
+
+    it('advertises support before metadata and enables entry after metadata', () => {
+        const video = installVideo({ readyState: 0 });
+        adapter.attach(video);
+
+        expectPiP(true, false);
+
+        environment.setReadyState(video, 1);
+        video.dispatchEvent(new Event('loadedmetadata'));
+
+        expectPiP(true, true);
+    });
+
+    it('requests entry synchronously and serializes the pending request', async () => {
+        const pending = deferred<PictureInPictureWindow>();
+        const video = installVideo({ request: () => pending.promise });
+        const request = video.requestPictureInPicture as jest.MockedFunction<
+            () => Promise<PictureInPictureWindow>
+        >;
+        adapter.attach(video);
+
+        adapter.commands.togglePictureInPicture();
+        adapter.commands.togglePictureInPicture();
+
+        expect(request).toHaveBeenCalledTimes(1);
+        expect(request.mock.contexts[0]).toBe(video);
+        expect(adapter.state().canPictureInPicture).toBe(false);
+
+        pending.resolve(PICTURE_IN_PICTURE_WINDOW);
+        await flushPromises();
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('uses browser events, not command optimism, as active authority', async () => {
+        const pending = deferred<PictureInPictureWindow>();
+        const video = installVideo({ request: () => pending.promise });
+        adapter.attach(video);
+
+        adapter.commands.togglePictureInPicture();
+        expect(adapter.state().pictureInPictureActive).toBe(false);
+
+        environment.setActive(video);
+        expect(adapter.state().pictureInPictureActive).toBe(true);
+        environment.setActive(null);
+        expect(adapter.state().pictureInPictureActive).toBe(false);
+
+        pending.resolve(PICTURE_IN_PICTURE_WINDOW);
+        await flushPromises();
+    });
+
+    it('keeps owned exit available after entry support changes', () => {
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(video);
+        environment.setEnabled(false);
+        environment.installVideo(video, {
+            disablePictureInPicture: true,
+            request: null,
+        });
+        adapter.refresh();
+
+        expectPiP(true, true);
+        adapter.commands.togglePictureInPicture();
+
+        expect(environment.exit).toHaveBeenCalledTimes(1);
+    });
+
+    it('serializes a pending exit', async () => {
+        const pending = deferred<void>();
+        environment.exit.mockImplementation(() => pending.promise);
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(video);
+
+        adapter.commands.togglePictureInPicture();
+        adapter.commands.togglePictureInPicture();
+
+        expect(environment.exit).toHaveBeenCalledTimes(1);
+        expect(environment.exit.mock.contexts[0]).toBe(video.ownerDocument);
+        expect(adapter.state().canPictureInPicture).toBe(false);
+
+        pending.resolve(undefined);
+        await flushPromises();
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('fails closed when a PiP API property throws', () => {
+        const video = installVideo();
+        Object.defineProperty(video, 'disablePictureInPicture', {
+            configurable: true,
+            get: () => {
+                throw new Error('PiP state unavailable');
+            },
+        });
+
+        adapter.attach(video);
+
+        expectPiP(false, false);
+        expect(adapter.state().pictureInPictureActive).toBe(false);
+    });
+
+    it('contains a synchronous request throw and recovers the action', () => {
+        const video = installVideo({
+            request: () => {
+                throw new Error('request failed');
+            },
+        });
+        adapter.attach(video);
+
+        expect(() => adapter.commands.togglePictureInPicture()).not.toThrow();
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('contains a rejected request and recovers the action', async () => {
+        const video = installVideo({
+            request: () => Promise.reject(new Error('request failed')),
+        });
+        adapter.attach(video);
+
+        adapter.commands.togglePictureInPicture();
+        await flushPromises();
+
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('contains a synchronous exit throw and recovers the action', () => {
+        environment.exit.mockImplementation(() => {
+            throw new Error('exit failed');
+        });
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(video);
+
+        expect(() => adapter.commands.togglePictureInPicture()).not.toThrow();
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('contains a rejected exit and recovers the action', async () => {
+        environment.exit.mockImplementation(() =>
+            Promise.reject(new Error('exit failed'))
+        );
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(video);
+
+        adapter.commands.togglePictureInPicture();
+        await flushPromises();
+
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it.each(['loadstart', 'emptied', 'loadedmetadata', 'refresh'] as const)(
+        'preserves owned PiP across same-target %s invalidation',
+        (eventName) => {
+            const video = installVideo();
+            adapter.attach(video);
+            environment.setActive(video);
+
+            if (eventName === 'refresh') {
+                adapter.refresh();
+            } else {
+                video.dispatchEvent(new Event(eventName));
+            }
+
+            expect(environment.exit).not.toHaveBeenCalled();
+            expect(adapter.state().pictureInPictureActive).toBe(true);
+        }
+    );
+
+    it('exits exactly the owned old target once on replacement', () => {
+        const owners: Element[] = [];
+        environment.exit.mockImplementation(async () => {
+            const owner = document.pictureInPictureElement;
+            if (owner) {
+                owners.push(owner);
+            }
+            environment.setActive(null);
+        });
+        const oldVideo = installVideo();
+        const replacement = installVideo();
+        adapter.attach(oldVideo);
+        environment.setActive(oldVideo);
+
+        adapter.attach(replacement);
+
+        expect(environment.exit).toHaveBeenCalledTimes(1);
+        expect(owners).toEqual([oldVideo]);
+        expect(adapter.state().pictureInPictureActive).toBe(false);
+    });
+
+    it('never exits an unrelated PiP owner', () => {
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(document.createElement('video'));
+
+        adapter.detach();
+
+        expect(environment.exit).not.toHaveBeenCalled();
+    });
+
+    it('makes repeated detach idempotent for owned PiP cleanup', () => {
+        const video = installVideo();
+        adapter.attach(video);
+        environment.setActive(video);
+
+        adapter.detach();
+        adapter.detach();
+        adapter.detach();
+
+        expect(environment.exit).toHaveBeenCalledTimes(1);
+    });
+
+    it('ignores stale old-target events after replacement', () => {
+        const oldVideo = installVideo();
+        const replacement = installVideo();
+        const refresh = jest.spyOn(adapter, 'refresh');
+        adapter.attach(oldVideo);
+        adapter.attach(replacement);
+        refresh.mockClear();
+
+        oldVideo.dispatchEvent(new Event('enterpictureinpicture'));
+
+        expect(refresh).not.toHaveBeenCalled();
+        expect(adapter.state().pictureInPictureActive).toBe(false);
+    });
+
+    it('cleans up a stale successful enter only when the old target owns PiP', async () => {
+        const oldPending = deferred<PictureInPictureWindow>();
+        const replacementPending = deferred<PictureInPictureWindow>();
+        const owners: Element[] = [];
+        environment.exit.mockImplementation(async () => {
+            const owner = document.pictureInPictureElement;
+            if (owner) {
+                owners.push(owner);
+            }
+            environment.setActive(null);
+        });
+        const oldVideo = installVideo({ request: () => oldPending.promise });
+        const replacement = installVideo({
+            request: () => replacementPending.promise,
+        });
+        adapter.attach(oldVideo);
+        adapter.commands.togglePictureInPicture();
+        adapter.attach(replacement);
+        adapter.commands.togglePictureInPicture();
+
+        environment.setActive(oldVideo);
+        oldPending.resolve(PICTURE_IN_PICTURE_WINDOW);
+        await flushPromises();
+
+        expect(environment.exit).toHaveBeenCalledTimes(1);
+        expect(owners).toEqual([oldVideo]);
+        expect(adapter.state().canPictureInPicture).toBe(false);
+
+        replacementPending.resolve(PICTURE_IN_PICTURE_WINDOW);
+        await flushPromises();
+    });
+
+    it('does not let a stale failure clear a newer pending operation', async () => {
+        const oldPending = deferred<PictureInPictureWindow>();
+        const replacementPending = deferred<PictureInPictureWindow>();
+        const oldVideo = installVideo({ request: () => oldPending.promise });
+        const replacement = installVideo({
+            request: () => replacementPending.promise,
+        });
+        adapter.attach(oldVideo);
+        adapter.commands.togglePictureInPicture();
+        adapter.attach(replacement);
+        adapter.commands.togglePictureInPicture();
+
+        oldPending.reject(new Error('stale request failed'));
+        await flushPromises();
+
+        expect(environment.exit).not.toHaveBeenCalled();
+        expect(adapter.state().canPictureInPicture).toBe(false);
+
+        replacementPending.resolve(PICTURE_IN_PICTURE_WINDOW);
+        await flushPromises();
+        expect(adapter.state().canPictureInPicture).toBe(true);
+    });
+
+    it('reads PiP APIs from the video ownerDocument', () => {
+        environment.setEnabled(false);
+        const foreignDocument =
+            document.implementation.createHTMLDocument('PiP');
+        const foreignEnvironment = new PictureInPictureTestEnvironment(
+            foreignDocument
+        );
+        const video = foreignDocument.createElement('video');
+        foreignEnvironment.installVideo(video);
+
+        try {
+            adapter.attach(video);
+            expectPiP(true, true);
+            foreignEnvironment.setActive(video);
+
+            adapter.commands.togglePictureInPicture();
+
+            expect(foreignEnvironment.exit).toHaveBeenCalledTimes(1);
+            expect(foreignEnvironment.exit.mock.contexts[0]).toBe(
+                foreignDocument
+            );
+            expect(environment.exit).not.toHaveBeenCalled();
+        } finally {
+            adapter.detach();
+            foreignEnvironment.restore();
+        }
+    });
+
+    function installVideo(
+        options: Parameters<
+            PictureInPictureTestEnvironment['installVideo']
+        >[1] = {}
+    ): HTMLVideoElement {
+        const video = document.createElement('video');
+        environment.installVideo(video, options);
+        return video;
+    }
+
+    function expectPiP(supported: boolean, canToggle: boolean): void {
+        expect(adapter.capabilities().pictureInPicture).toBe(supported);
+        expect(adapter.state().canPictureInPicture).toBe(canToggle);
+    }
+});
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.spec.ts
new file mode 100644
index 000000000..c515e6201
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.spec.ts
@@ -0,0 +1,393 @@
+import { signal } from '@angular/core';
+import type { PlayerTrack } from './player-controls.model';
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+
+/**
+ * Builds a jsdom `<video>` whose readonly media props (duration, readyState,
+ * paused, ended, error, seekable) can be overridden per-test.
+ */
+function createVideo(
+    overrides: Partial<{
+        duration: number;
+        readyState: number;
+        networkState: number;
+        paused: boolean;
+        ended: boolean;
+        error: MediaError | null;
+        seekableLength: number;
+        muted: boolean;
+        volume: number;
+        currentTime: number;
+        playbackRate: number;
+    }> = {}
+): HTMLVideoElement {
+    const video = document.createElement('video');
+    const define = (prop: string, value: unknown) =>
+        Object.defineProperty(video, prop, {
+            configurable: true,
+            writable: true,
+            value,
+        });
+    define('duration', overrides.duration ?? NaN);
+    define('readyState', overrides.readyState ?? 4);
+    define('networkState', overrides.networkState ?? 1);
+    define('paused', overrides.paused ?? false);
+    define('ended', overrides.ended ?? false);
+    define('error', overrides.error ?? null);
+    define('seekable', { length: overrides.seekableLength ?? 0 });
+    define('muted', overrides.muted ?? false);
+    define('volume', overrides.volume ?? 1);
+    define('currentTime', overrides.currentTime ?? 0);
+    define('playbackRate', overrides.playbackRate ?? 1);
+    define('play', jest.fn().mockResolvedValue(undefined));
+    define('pause', jest.fn());
+    return video;
+}
+
+describe('WebVideoControlsAdapter', () => {
+    let adapter: WebVideoControlsAdapter;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+    });
+
+    afterEach(() => adapter.detach());
+
+    it('maps a playing VOD video to state with seek + finite duration', () => {
+        const video = createVideo({
+            duration: 120,
+            seekableLength: 1,
+            currentTime: 30,
+            volume: 0.6,
+        });
+        adapter.attach(video, { isLive: () => false });
+
+        const state = adapter.state();
+        expect(state.status).toBe('playing');
+        expect(state.positionSeconds).toBe(30);
+        expect(state.durationSeconds).toBe(120);
+        expect(state.isLive).toBe(false);
+        expect(state.canSeek).toBe(true);
+        expect(state.volume).toBe(0.6);
+    });
+
+    it('reports a paused video and a muted volume of 0', () => {
+        const video = createVideo({ paused: true, muted: true, volume: 0.8 });
+        adapter.attach(video, { isLive: () => false });
+
+        const state = adapter.state();
+        expect(state.status).toBe('paused');
+        expect(state.volume).toBe(0);
+    });
+
+    it('treats infinite-duration sources as live with no seek', () => {
+        const video = createVideo({ duration: Infinity });
+        adapter.attach(video);
+
+        const state = adapter.state();
+        expect(state.isLive).toBe(true);
+        expect(state.durationSeconds).toBeNull();
+        expect(state.canSeek).toBe(false);
+    });
+
+    it('prefers getDuration over the element duration (raw-TS VOD)', () => {
+        // mpegts VOD: <video>.duration stays Infinity, real duration on player.
+        const video = createVideo({ duration: Infinity, seekableLength: 1 });
+        adapter.attach(video, { getDuration: () => 164.072 });
+
+        const state = adapter.state();
+        expect(state.isLive).toBe(false);
+        expect(state.durationSeconds).toBe(164.072);
+        expect(state.canSeek).toBe(true);
+    });
+
+    it('falls back to the element duration when getDuration returns NaN', () => {
+        const video = createVideo({ duration: 90, seekableLength: 1 });
+        adapter.attach(video, { getDuration: () => NaN });
+
+        const state = adapter.state();
+        expect(state.isLive).toBe(false);
+        expect(state.durationSeconds).toBe(90);
+    });
+
+    it('is not stalled when paused with partial data, but stalls while buffering', () => {
+        const paused = createVideo({
+            paused: true,
+            readyState: 2,
+            duration: 120,
+        });
+        adapter.attach(paused, { isLive: () => false });
+        expect(adapter.state().stalled).toBe(false);
+
+        const buffering = createVideo({
+            paused: false,
+            ended: false,
+            readyState: 2,
+            duration: 120,
+        });
+        const bufferingAdapter = new WebVideoControlsAdapter();
+        bufferingAdapter.attach(buffering, { isLive: () => false });
+        expect(bufferingAdapter.state().stalled).toBe(true);
+        bufferingAdapter.detach();
+    });
+
+    it('maps error and ended status from the video element', () => {
+        const errorVideo = createVideo({
+            error: { code: 4 } as MediaError,
+        });
+        adapter.attach(errorVideo);
+        expect(adapter.state().status).toBe('error');
+
+        const endedAdapter = new WebVideoControlsAdapter();
+        endedAdapter.attach(createVideo({ ended: true }));
+        expect(endedAdapter.state().status).toBe('ended');
+        endedAdapter.detach();
+    });
+
+    it('recomputes state when media events fire', () => {
+        const video = createVideo({ paused: true });
+        adapter.attach(video, { isLive: () => false });
+        expect(adapter.state().status).toBe('paused');
+
+        Object.defineProperty(video, 'paused', {
+            configurable: true,
+            value: false,
+        });
+        video.dispatchEvent(new Event('play'));
+        expect(adapter.state().status).toBe('playing');
+    });
+
+    it('refreshes cached engine getter state only when explicitly invalidated', () => {
+        let audioTracks: PlayerTrack[] = [
+            { id: 0, label: 'English', selected: true },
+        ];
+        let subtitleTracks: PlayerTrack[] = [];
+        let duration = 90;
+        let live = false;
+        const video = createVideo({ duration: 90, seekableLength: 1 });
+        adapter.attach(video, {
+            getAudioTracks: () => audioTracks,
+            setAudioTrack: jest.fn(),
+            getSubtitleTracks: () => subtitleTracks,
+            setSubtitleTrack: jest.fn(),
+            getDuration: () => duration,
+            isLive: () => live,
+        });
+
+        expect(adapter.capabilities().audioTracks).toBe(false);
+        expect(adapter.capabilities().subtitles).toBe(false);
+        expect(adapter.state().durationSeconds).toBe(90);
+        expect(adapter.state().isLive).toBe(false);
+
+        audioTracks = [
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'German', selected: false },
+        ];
+        subtitleTracks = [{ id: 2, label: 'English', selected: true }];
+        duration = 180;
+        live = true;
+
+        expect(adapter.capabilities().audioTracks).toBe(false);
+        expect(adapter.capabilities().subtitles).toBe(false);
+        expect(adapter.state().durationSeconds).toBe(90);
+        expect(adapter.state().isLive).toBe(false);
+
+        adapter.refresh();
+
+        expect(adapter.capabilities().audioTracks).toBe(true);
+        expect(adapter.capabilities().subtitles).toBe(true);
+        expect(adapter.state().durationSeconds).toBeNull();
+        expect(adapter.state().isLive).toBe(true);
+        expect(adapter.state().audioTracks).toEqual(audioTracks);
+        expect(adapter.state().subtitleTracks).toEqual(subtitleTracks);
+    });
+
+    it('delegates play/pause/seek/volume/speed commands to the element', () => {
+        const video = createVideo({ duration: 100, paused: true });
+        adapter.attach(video, { isLive: () => false });
+
+        adapter.commands.togglePlay();
+        expect(video.play).toHaveBeenCalled();
+
+        adapter.commands.seekTo(42);
+        expect(video.currentTime).toBe(42);
+
+        adapter.commands.seekBy(10);
+        expect(video.currentTime).toBe(52);
+
+        adapter.commands.setVolume(0.25);
+        expect(video.volume).toBe(0.25);
+        expect(video.muted).toBe(false);
+
+        adapter.commands.setVolume(0);
+        expect(video.muted).toBe(true);
+
+        adapter.commands.setPlaybackSpeed(1.5);
+        expect(video.playbackRate).toBe(1.5);
+    });
+
+    it('clamps seekTo to the finite duration', () => {
+        const video = createVideo({ duration: 60 });
+        adapter.attach(video, { isLive: () => false });
+
+        adapter.commands.seekTo(999);
+        expect(video.currentTime).toBe(60);
+        adapter.commands.seekTo(-5);
+        expect(video.currentTime).toBe(0);
+    });
+
+    it('gates capabilities: recording always false, aspectRatio false', () => {
+        adapter.attach(createVideo({ duration: 100 }), {
+            isLive: () => false,
+        });
+        const caps = adapter.capabilities();
+        expect(caps.recording).toBe(false);
+        expect(caps.aspectRatio).toBe(false);
+        expect(caps.seek).toBe(true);
+        expect(caps.volume).toBe(true);
+        expect(caps.playbackSpeed).toBe(true);
+        expect(caps.fullscreen).toBe(true);
+    });
+
+    it('enables audioTracks only when more than one track is exposed', () => {
+        const single: PlayerTrack[] = [{ id: 0, label: 'EN', selected: true }];
+        const multi: PlayerTrack[] = [
+            { id: 0, label: 'EN', selected: true },
+            { id: 1, label: 'DE', selected: false },
+        ];
+
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => single,
+            setAudioTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().audioTracks).toBe(false);
+
+        const multiAdapter = new WebVideoControlsAdapter();
+        multiAdapter.attach(createVideo(), {
+            getAudioTracks: () => multi,
+            setAudioTrack: jest.fn(),
+        });
+        expect(multiAdapter.capabilities().audioTracks).toBe(true);
+        expect(multiAdapter.state().audioTracks).toEqual(multi);
+        multiAdapter.detach();
+    });
+
+    it('enables subtitles when any subtitle track is present', () => {
+        const subtitles: PlayerTrack[] = [
+            { id: 0, label: 'EN', selected: true },
+        ];
+        adapter.attach(createVideo(), {
+            getSubtitleTracks: () => subtitles,
+            setSubtitleTrack: jest.fn(),
+        });
+        expect(adapter.capabilities().subtitles).toBe(true);
+        expect(adapter.state().subtitlesEnabled).toBe(true);
+    });
+
+    it('refreshes track state after synchronous selection commands', () => {
+        let audioTracks: PlayerTrack[] = [
+            { id: 1, label: 'English', selected: true },
+            { id: 2, label: 'German', selected: false },
+        ];
+        let subtitleTracks: PlayerTrack[] = [
+            { id: 3, label: 'English', selected: false },
+        ];
+        const setAudioTrack = jest.fn((id: number) => {
+            audioTracks = audioTracks.map((track) => ({
+                ...track,
+                selected: track.id === id,
+            }));
+        });
+        const setSubtitleTrack = jest.fn((id: number) => {
+            subtitleTracks = subtitleTracks.map((track) => ({
+                ...track,
+                selected: track.id === id,
+            }));
+        });
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => audioTracks,
+            setAudioTrack,
+            getSubtitleTracks: () => subtitleTracks,
+            setSubtitleTrack,
+        });
+        expect(adapter.state().audioTracks[0].selected).toBe(true);
+        expect(adapter.state().subtitlesEnabled).toBe(false);
+
+        adapter.commands.setAudioTrack(2);
+        adapter.commands.setSubtitleTrack(3);
+
+        expect(setAudioTrack).toHaveBeenCalledWith(2);
+        expect(setSubtitleTrack).toHaveBeenCalledWith(3);
+        expect(adapter.state().audioTracks[1].selected).toBe(true);
+        expect(adapter.state().subtitlesEnabled).toBe(true);
+    });
+
+    it('gates series navigation on context + VOD', () => {
+        const nav = signal<SeriesPlaybackNavigation | null>({
+            canPrevious: true,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        const video = createVideo({ duration: 100 });
+        adapter.attach(video, { isLive: () => false });
+        adapter.setContext({ seriesNavigation: nav });
+
+        expect(adapter.capabilities().seriesNavigation).toBe(true);
+        expect(adapter.state().canPreviousEpisode).toBe(true);
+        expect(adapter.state().canNextEpisode).toBe(false);
+    });
+
+    it('reflects host series-navigation signal updates made AFTER setContext', () => {
+        const nav = signal<SeriesPlaybackNavigation | null>({
+            canPrevious: false,
+            canNext: false,
+            autoplayEnabled: true,
+        });
+        const video = createVideo({ duration: 100 });
+        adapter.attach(video, { isLive: () => false });
+        adapter.setContext({ seriesNavigation: nav });
+
+        expect(adapter.state().canPreviousEpisode).toBe(false);
+        expect(adapter.state().canNextEpisode).toBe(false);
+
+        // Host pushes an update to the SAME signal after setContext.
+        nav.set({ canPrevious: true, canNext: true, autoplayEnabled: true });
+
+        expect(adapter.capabilities().seriesNavigation).toBe(true);
+        expect(adapter.state().canPreviousEpisode).toBe(true);
+        expect(adapter.state().canNextEpisode).toBe(true);
+
+        // Clearing the navigation reactively disables the capability.
+        nav.set(null);
+        expect(adapter.capabilities().seriesNavigation).toBe(false);
+    });
+
+    it('disables series navigation for live streams', () => {
+        const nav = signal<SeriesPlaybackNavigation | null>({
+            canPrevious: true,
+            canNext: true,
+            autoplayEnabled: true,
+        });
+        adapter.attach(createVideo({ duration: Infinity }), {
+            isLive: () => true,
+        });
+        adapter.setContext({ seriesNavigation: nav });
+
+        expect(adapter.capabilities().seriesNavigation).toBe(false);
+        expect(adapter.state().canPreviousEpisode).toBe(false);
+        expect(adapter.state().canNextEpisode).toBe(false);
+    });
+
+    it('removes listeners on detach', () => {
+        const video = createVideo();
+        const removeSpy = jest.spyOn(video, 'removeEventListener');
+        adapter.attach(video);
+        adapter.detach();
+        expect(removeSpy).toHaveBeenCalledWith('play', expect.any(Function));
+        expect(removeSpy).toHaveBeenCalledWith(
+            'timeupdate',
+            expect.any(Function)
+        );
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.track-commands.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.track-commands.spec.ts
new file mode 100644
index 000000000..8bd5c3936
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.track-commands.spec.ts
@@ -0,0 +1,127 @@
+import type { PlayerTrack } from './player-controls.model';
+import { WebVideoControlsAdapter } from './web-video-controls.adapter';
+
+interface Deferred {
+    promise: Promise<void>;
+    resolve: () => void;
+    reject: (reason: unknown) => void;
+}
+
+function createDeferred(): Deferred {
+    let resolvePromise!: () => void;
+    let rejectPromise!: (reason: unknown) => void;
+    const promise = new Promise<void>((resolve, reject) => {
+        resolvePromise = resolve;
+        rejectPromise = reject;
+    });
+    return {
+        promise,
+        resolve: resolvePromise,
+        reject: rejectPromise,
+    };
+}
+
+function createVideo(): HTMLVideoElement {
+    const video = document.createElement('video');
+    Object.defineProperties(video, {
+        duration: {
+            configurable: true,
+            value: 120,
+        },
+        readyState: {
+            configurable: true,
+            value: 4,
+        },
+        networkState: {
+            configurable: true,
+            value: 1,
+        },
+        paused: {
+            configurable: true,
+            value: true,
+        },
+        seekable: {
+            configurable: true,
+            value: { length: 1 },
+        },
+    });
+    return video;
+}
+
+async function flushPromises(): Promise<void> {
+    await Promise.resolve();
+    await Promise.resolve();
+}
+
+describe('WebVideoControlsAdapter async track commands', () => {
+    let adapter: WebVideoControlsAdapter;
+
+    beforeEach(() => {
+        adapter = new WebVideoControlsAdapter();
+    });
+
+    afterEach(() => adapter.detach());
+
+    it('refreshes track state only after an async setter fulfills', async () => {
+        let tracks: PlayerTrack[] = [
+            { id: 1, label: 'English', selected: true },
+            { id: 2, label: 'German', selected: false },
+        ];
+        const deferred = createDeferred();
+        const setAudioTrack = jest.fn(() => deferred.promise);
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => tracks,
+            setAudioTrack,
+        });
+        expect(adapter.state().audioTracks[0].selected).toBe(true);
+
+        adapter.commands.setAudioTrack(2);
+        tracks = tracks.map((track) => ({
+            ...track,
+            selected: track.id === 2,
+        }));
+        expect(adapter.state().audioTracks[0].selected).toBe(true);
+
+        deferred.resolve();
+        await flushPromises();
+
+        expect(setAudioTrack).toHaveBeenCalledWith(2);
+        expect(adapter.state().audioTracks[1].selected).toBe(true);
+    });
+
+    it('swallows an async setter rejection without refreshing state', async () => {
+        const tracks: PlayerTrack[] = [
+            { id: 1, label: 'English', selected: true },
+            { id: 2, label: 'German', selected: false },
+        ];
+        const deferred = createDeferred();
+        const setAudioTrack = jest.fn(() => deferred.promise);
+        adapter.attach(createVideo(), {
+            getAudioTracks: () => tracks,
+            setAudioTrack,
+        });
+        const stateBefore = adapter.state();
+
+        adapter.commands.setAudioTrack(2);
+        deferred.reject(new Error('engine rejected selection'));
+        await flushPromises();
+
+        expect(setAudioTrack).toHaveBeenCalledWith(2);
+        expect(adapter.state()).toBe(stateBefore);
+    });
+
+    it('swallows a synchronous setter exception', () => {
+        const setSubtitleTrack = jest.fn(() => {
+            throw new Error('engine changing source');
+        });
+        adapter.attach(createVideo(), {
+            getSubtitleTracks: () => [
+                { id: 3, label: 'English', selected: false },
+            ],
+            setSubtitleTrack,
+        });
+
+        expect(() => adapter.commands.setSubtitleTrack(3)).not.toThrow();
+        expect(setSubtitleTrack).toHaveBeenCalledWith(3);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts
new file mode 100644
index 000000000..2966027a5
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.adapter.ts
@@ -0,0 +1,230 @@
+import { Injectable, type Signal, computed, signal } from '@angular/core';
+import {
+    createEmptyControlsState,
+    DEFAULT_ASPECT_PRESETS,
+    DEFAULT_PLAYER_CAPABILITIES,
+    DEFAULT_SPEED_PRESETS,
+} from './player-controls-defaults';
+import type {
+    PlayerController,
+    PlayerControlsCapabilities,
+    PlayerControlsCommands,
+    PlayerControlsState,
+    PlayerTrack,
+} from './player-controls.model';
+import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
+import {
+    applyTrackSelection,
+    applyVideoCurrentTime,
+    applyVideoSpeed,
+    applyVideoVolume,
+    hasSeekableRange,
+    isVideoStalled,
+    mapVideoStatus,
+    normalizeVideoDuration,
+    readVideoDuration,
+    readVideoIsLive,
+    readVideoVolume,
+    toggleVideoPlay,
+    type WebVideoMetadataOptions,
+    WEB_VIDEO_EVENTS,
+} from './web-video-controls.media-helpers';
+import { WebVideoPictureInPictureController } from './web-video-picture-in-picture.controller';
+
+/**
+ * Engine-agnostic accessors a web engine injects so the adapter can read/select
+ * audio & subtitle tracks without importing hls.js/videojs/artplayer.
+ */
+export interface WebVideoControlsOptions extends WebVideoMetadataOptions {
+    getAudioTracks?: () => PlayerTrack[];
+    setAudioTrack?: (id: number) => void | Promise<void>;
+    getSubtitleTracks?: () => PlayerTrack[];
+    setSubtitleTrack?: (id: number) => void | Promise<void>;
+}
+
+interface WebVideoControlsContext {
+    seriesNavigation: Signal<SeriesPlaybackNavigation | null>;
+}
+
+/**
+ * Can bridge any `<video>`-backed web engine onto the generic
+ * {@link PlayerController} contract using only DOM/video APIs.
+ */
+@Injectable()
+export class WebVideoControlsAdapter implements PlayerController {
+    private video: HTMLVideoElement | null = null;
+    private opts: WebVideoControlsOptions = {};
+    private detachFn: (() => void) | null = null;
+    private bindingGeneration = 0;
+
+    /** Bumped whenever DOM or engine-specific state must be re-read. */
+    private readonly tick = signal(0);
+    private readonly pictureInPicture = new WebVideoPictureInPictureController(
+        () => ({
+            generation: this.bindingGeneration,
+            video: this.video,
+        }),
+        () => this.refresh()
+    );
+    /**
+     * Holds the host-supplied series-navigation signal reactively. Storing the
+     * signal itself (rather than a one-time snapshot of its value) means updates
+     * the host pushes AFTER {@link setContext} are reflected here.
+     */
+    private readonly seriesNavigationSource = signal<
+        Signal<SeriesPlaybackNavigation | null>
+    >(signal(null));
+    private readonly seriesNavigation = computed(() =>
+        this.seriesNavigationSource()()
+    );
+
+    readonly capabilities = computed<PlayerControlsCapabilities>(() => {
+        this.tick();
+        if (!this.video) {
+            return DEFAULT_PLAYER_CAPABILITIES;
+        }
+
+        const hasAudioTracks =
+            typeof this.opts.setAudioTrack === 'function' &&
+            (this.opts.getAudioTracks?.().length ?? 0) > 1;
+        const hasSubtitles =
+            typeof this.opts.setSubtitleTrack === 'function' &&
+            (this.opts.getSubtitleTracks?.().length ?? 0) > 0;
+        const isLive = readVideoIsLive(this.video, this.opts);
+        const pictureInPicture = this.pictureInPicture.snapshot();
+        return {
+            ...DEFAULT_PLAYER_CAPABILITIES,
+            seek: !isLive,
+            volume: true,
+            playbackSpeed: true,
+            fullscreen: true,
+            audioTracks: hasAudioTracks,
+            subtitles: hasSubtitles,
+            aspectRatio: false,
+            recording: false,
+            pictureInPicture: pictureInPicture.supported,
+            seriesNavigation: !isLive && this.seriesNavigation() !== null,
+        };
+    });
+
+    readonly state = computed<PlayerControlsState>(() => {
+        this.tick();
+        const video = this.video;
+        if (!video) {
+            return createEmptyControlsState();
+        }
+
+        const isLive = readVideoIsLive(video, this.opts);
+        const duration = normalizeVideoDuration(
+            readVideoDuration(video, this.opts),
+            isLive
+        );
+        const seriesNav = this.seriesNavigation();
+        const seriesNavCapable = !isLive && seriesNav !== null;
+
+        const audioTracks = this.opts.getAudioTracks?.() ?? [];
+        const subtitleTracks = this.opts.getSubtitleTracks?.() ?? [];
+        const pictureInPicture = this.pictureInPicture.snapshot();
+
+        return {
+            status: mapVideoStatus(video),
+            statusMessage: '',
+            stalled: isVideoStalled(video),
+            positionSeconds: Math.max(0, video?.currentTime ?? 0),
+            durationSeconds: duration,
+            isLive,
+            canSeek: !isLive && (duration ?? 0) > 0 && hasSeekableRange(video),
+            volume: readVideoVolume(video),
+            audioTracks,
+            subtitleTracks,
+            subtitlesEnabled: subtitleTracks.some((track) => track.selected),
+            playbackSpeed: video?.playbackRate ?? 1,
+            speedPresets: DEFAULT_SPEED_PRESETS,
+            aspectRatio: 'no',
+            aspectPresets: DEFAULT_ASPECT_PRESETS,
+            recording: { active: false, elapsedSeconds: 0, message: null },
+            pictureInPictureActive: pictureInPicture.active,
+            canPictureInPicture: pictureInPicture.canToggle,
+            canPreviousEpisode:
+                seriesNavCapable && seriesNav?.canPrevious === true,
+            canNextEpisode: seriesNavCapable && seriesNav?.canNext === true,
+        };
+    });
+
+    readonly commands: PlayerControlsCommands = {
+        togglePlay: () => toggleVideoPlay(this.video),
+        seekTo: (seconds) =>
+            applyVideoCurrentTime(this.video, seconds, () =>
+                readVideoDuration(this.video, this.opts)
+            ),
+        seekBy: (delta) =>
+            applyVideoCurrentTime(
+                this.video,
+                (this.video?.currentTime ?? 0) + delta,
+                () => readVideoDuration(this.video, this.opts)
+            ),
+        setVolume: (value) => applyVideoVolume(this.video, value),
+        setAudioTrack: (id) =>
+            applyTrackSelection(this.opts.setAudioTrack, id, () =>
+                this.refresh()
+            ),
+        setSubtitleTrack: (id) =>
+            applyTrackSelection(this.opts.setSubtitleTrack, id, () =>
+                this.refresh()
+            ),
+        setPlaybackSpeed: (speed) => applyVideoSpeed(this.video, speed),
+        setAspectRatio: () => undefined,
+        toggleRecording: () => undefined,
+        togglePictureInPicture: () => this.pictureInPicture.toggle(),
+    };
+
+    /** Binds to a `<video>` element and starts maintaining the state signal. */
+    attach(video: HTMLVideoElement, opts: WebVideoControlsOptions = {}): void {
+        this.detach();
+        const generation = this.bindingGeneration;
+        this.video = video;
+        this.opts = opts;
+
+        const onEvent = () => {
+            if (this.video === video && this.bindingGeneration === generation) {
+                this.refresh();
+            }
+        };
+        for (const eventName of WEB_VIDEO_EVENTS) {
+            video.addEventListener(eventName, onEvent);
+        }
+        this.detachFn = () => {
+            for (const eventName of WEB_VIDEO_EVENTS) {
+                video.removeEventListener(eventName, onEvent);
+            }
+        };
+        // Prime the initial snapshot.
+        onEvent();
+    }
+
+    /**
+     * Invalidates cached state/capabilities after an engine-specific getter
+     * changes without emitting a native media event (for example tracks,
+     * corrected duration, or live/VOD classification).
+     */
+    refresh(): void {
+        this.tick.update((value) => value + 1);
+    }
+
+    /** Removes listeners and clears the bound element. Idempotent. */
+    detach(): void {
+        const previousVideo = this.video;
+        this.bindingGeneration += 1;
+        this.detachFn?.();
+        this.detachFn = null;
+        this.video = null;
+        this.opts = {};
+        this.pictureInPicture.release(previousVideo);
+        this.refresh();
+    }
+
+    /** Pushes reactive context (series navigation) used for capability gating. */
+    setContext(context: WebVideoControlsContext): void {
+        this.seriesNavigationSource.set(context.seriesNavigation);
+    }
+}
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.host.spec.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.host.spec.ts
new file mode 100644
index 000000000..4bdd13d58
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.host.spec.ts
@@ -0,0 +1,60 @@
+import type { WebVideoControlsAdapter } from './web-video-controls.adapter';
+import {
+    attachWebVideoControls,
+    toPlayerTracks,
+} from './web-video-controls.host';
+
+describe('attachWebVideoControls', () => {
+    it('attaches the adapter to the video with the supplied options', () => {
+        const adapter = { attach: jest.fn() } as unknown as jest.Mocked<
+            Pick<WebVideoControlsAdapter, 'attach'>
+        >;
+        const video = document.createElement('video');
+        const options = { isLive: () => true };
+
+        attachWebVideoControls({
+            video,
+            adapter: adapter as unknown as WebVideoControlsAdapter,
+            options,
+        });
+
+        expect(adapter.attach).toHaveBeenCalledWith(video, options);
+    });
+
+    it('defaults omitted options to an empty object', () => {
+        const adapter = { attach: jest.fn() } as unknown as jest.Mocked<
+            Pick<WebVideoControlsAdapter, 'attach'>
+        >;
+        const video = document.createElement('video');
+
+        attachWebVideoControls({
+            video,
+            adapter: adapter as unknown as WebVideoControlsAdapter,
+        });
+
+        expect(adapter.attach).toHaveBeenCalledWith(video, {});
+    });
+});
+
+describe('toPlayerTracks', () => {
+    it('projects entries onto plain PlayerTrack objects', () => {
+        const entries = [
+            { id: 0, label: 'English', selected: true, extra: 'ignored' },
+            { id: 1, label: 'German', selected: false },
+        ];
+
+        const tracks = toPlayerTracks(entries);
+
+        expect(tracks).toEqual([
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'German', selected: false },
+        ]);
+        // New objects, no engine-specific extras leaking through.
+        expect(tracks[0]).not.toBe(entries[0]);
+        expect('extra' in tracks[0]).toBe(false);
+    });
+
+    it('maps an empty list to an empty list', () => {
+        expect(toPlayerTracks([])).toEqual([]);
+    });
+});
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.host.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.host.ts
new file mode 100644
index 000000000..489c4dfee
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.host.ts
@@ -0,0 +1,44 @@
+import type { PlayerTrack } from './player-controls.model';
+import type {
+    WebVideoControlsAdapter,
+    WebVideoControlsOptions,
+} from './web-video-controls.adapter';
+
+/**
+ * Minimal glue a follow-up web-player integration can call to wire its `<video>`
+ * element and engine track accessors onto a {@link WebVideoControlsAdapter}.
+ * No existing player calls this helper in #1148.
+ */
+export interface WebVideoControlsHostConfig {
+    /** The `<video>` element the active engine is rendering into. */
+    video: HTMLVideoElement;
+    adapter: WebVideoControlsAdapter;
+    /** Engine-specific track accessors; omit what the engine does not expose. */
+    options?: WebVideoControlsOptions;
+}
+
+/** Attaches the adapter to the video element with the supplied accessors. */
+export function attachWebVideoControls(
+    config: WebVideoControlsHostConfig
+): void {
+    config.adapter.attach(config.video, config.options ?? {});
+}
+
+/**
+ * Maps a list of `{ id, label, selected }`-like entries to {@link PlayerTrack}.
+ * Engines that already expose plain track lists can reuse this to avoid
+ * duplicating the projection.
+ */
+export function toPlayerTracks(
+    entries: ReadonlyArray<{
+        id: number;
+        label: string;
+        selected: boolean;
+    }>
+): PlayerTrack[] {
+    return entries.map((entry) => ({
+        id: entry.id,
+        label: entry.label,
+        selected: entry.selected,
+    }));
+}
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-controls.media-helpers.ts b/libs/ui/playback/src/lib/player-controls/web-video-controls.media-helpers.ts
new file mode 100644
index 000000000..313578cdf
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-controls.media-helpers.ts
@@ -0,0 +1,190 @@
+import type { PlayerStatus } from './player-controls.model';
+
+const HAVE_FUTURE_DATA = 3;
+const NETWORK_EMPTY = 0;
+
+export interface WebVideoMetadataOptions {
+    isLive?: () => boolean;
+    /**
+     * Optional corrected duration source. Some engines (e.g. Video.js mpegts
+     * raw-TS VOD) report the real duration on the player, not on the `<video>`
+     * element — whose `duration` stays `Infinity` and would be misread as live.
+     * Every returned value except `NaN` is authoritative; `NaN` falls back to
+     * `video.duration`.
+     */
+    getDuration?: () => number;
+}
+
+export const WEB_VIDEO_EVENTS = [
+    'loadstart',
+    'emptied',
+    'progress',
+    'stalled',
+    'seeking',
+    'seeked',
+    'play',
+    'pause',
+    'timeupdate',
+    'durationchange',
+    'volumechange',
+    'ratechange',
+    'loadedmetadata',
+    'loadeddata',
+    'canplay',
+    'ended',
+    'waiting',
+    'playing',
+    'error',
+    'enterpictureinpicture',
+    'leavepictureinpicture',
+] as const;
+
+export function toggleVideoPlay(video: HTMLVideoElement | null): void {
+    if (!video) {
+        return;
+    }
+    if (video.paused || video.ended) {
+        void video.play().catch(() => undefined);
+    } else {
+        video.pause();
+    }
+}
+
+export function applyVideoCurrentTime(
+    video: HTMLVideoElement | null,
+    seconds: number,
+    getDuration: () => number
+): void {
+    if (!video || !Number.isFinite(seconds)) {
+        return;
+    }
+    const duration = getDuration();
+    const upperBound = Number.isFinite(duration) ? duration : seconds;
+    try {
+        video.currentTime = Math.max(0, Math.min(seconds, upperBound));
+    } catch {
+        // Some media implementations reject writes while changing source.
+    }
+}
+
+export function applyVideoVolume(
+    video: HTMLVideoElement | null,
+    value: number
+): void {
+    if (!video || !Number.isFinite(value)) {
+        return;
+    }
+    const clamped = Math.max(0, Math.min(1, value));
+    try {
+        video.volume = clamped;
+        video.muted = clamped <= 0;
+    } catch {
+        // Ignore transient native media setter failures.
+    }
+}
+
+export function applyVideoSpeed(
+    video: HTMLVideoElement | null,
+    speed: number
+): void {
+    if (video && Number.isFinite(speed) && speed > 0) {
+        try {
+            video.playbackRate = speed;
+        } catch {
+            // Ignore transient native media setter failures.
+        }
+    }
+}
+
+export function applyTrackSelection(
+    setter: ((id: number) => void | Promise<void>) | undefined,
+    id: number,
+    refresh: () => void
+): void {
+    if (!setter) {
+        return;
+    }
+    try {
+        const result = setter(id);
+        if (result) {
+            void result.then(refresh, () => undefined);
+            return;
+        }
+        refresh();
+    } catch {
+        // Engine adapters may reject selection while changing source.
+    }
+}
+
+export function isVideoStalled(video: HTMLVideoElement | null): boolean {
+    if (!video || video.readyState === undefined) {
+        return false;
+    }
+    return !video.paused && !video.ended && video.readyState < HAVE_FUTURE_DATA;
+}
+
+export function normalizeVideoDuration(
+    duration: number,
+    isLive: boolean
+): number | null {
+    if (isLive || !Number.isFinite(duration) || duration <= 0) {
+        return null;
+    }
+    return duration;
+}
+
+export function hasSeekableRange(video: HTMLVideoElement | null): boolean {
+    try {
+        return (video?.seekable?.length ?? 0) > 0;
+    } catch {
+        return false;
+    }
+}
+
+export function readVideoVolume(video: HTMLVideoElement | null): number {
+    if (!video) {
+        return 1;
+    }
+    return video.muted ? 0 : video.volume;
+}
+
+export function readVideoDuration(
+    video: HTMLVideoElement | null,
+    options: WebVideoMetadataOptions
+): number {
+    if (options.getDuration) {
+        const duration = options.getDuration();
+        if (!Number.isNaN(duration)) {
+            return duration;
+        }
+    }
+    return video?.duration ?? NaN;
+}
+
+export function readVideoIsLive(
+    video: HTMLVideoElement | null,
+    options: WebVideoMetadataOptions
+): boolean {
+    return options.isLive
+        ? options.isLive()
+        : readVideoDuration(video, options) === Number.POSITIVE_INFINITY;
+}
+
+export function mapVideoStatus(video: HTMLVideoElement | null): PlayerStatus {
+    if (!video) {
+        return 'idle';
+    }
+    if (video.error) {
+        return 'error';
+    }
+    if (video.ended) {
+        return 'ended';
+    }
+    if (video.networkState === NETWORK_EMPTY) {
+        return 'idle';
+    }
+    if (video.paused) {
+        return 'paused';
+    }
+    return video.readyState < HAVE_FUTURE_DATA ? 'loading' : 'playing';
+}
diff --git a/libs/ui/playback/src/lib/player-controls/web-video-picture-in-picture.controller.ts b/libs/ui/playback/src/lib/player-controls/web-video-picture-in-picture.controller.ts
new file mode 100644
index 000000000..1d8414caa
--- /dev/null
+++ b/libs/ui/playback/src/lib/player-controls/web-video-picture-in-picture.controller.ts
@@ -0,0 +1,180 @@
+const HAVE_METADATA = 1;
+const PICTURE_IN_PICTURE_ACTION = {
+    ENTER: 'enter',
+    EXIT: 'exit',
+} as const;
+
+type PictureInPictureAction =
+    (typeof PICTURE_IN_PICTURE_ACTION)[keyof typeof PICTURE_IN_PICTURE_ACTION];
+
+interface PictureInPictureOperation {
+    readonly action: PictureInPictureAction;
+    readonly generation: number;
+    readonly video: HTMLVideoElement;
+}
+
+export interface WebVideoPictureInPictureBinding {
+    readonly generation: number;
+    readonly video: HTMLVideoElement | null;
+}
+
+export interface WebVideoPictureInPictureSnapshot {
+    readonly active: boolean;
+    readonly canExit: boolean;
+    readonly canRequest: boolean;
+    readonly canToggle: boolean;
+    readonly supported: boolean;
+}
+
+const EMPTY_PICTURE_IN_PICTURE_SNAPSHOT: WebVideoPictureInPictureSnapshot = {
+    active: false,
+    canExit: false,
+    canRequest: false,
+    canToggle: false,
+    supported: false,
+};
+
+export class WebVideoPictureInPictureController {
+    private operation: PictureInPictureOperation | null = null;
+
+    constructor(
+        private readonly readBinding: () => WebVideoPictureInPictureBinding,
+        private readonly refresh: () => void
+    ) {}
+
+    release(previousVideo: HTMLVideoElement | null): void {
+        this.operation = null;
+        if (previousVideo) {
+            this.exitIfOwned(previousVideo);
+        }
+    }
+
+    snapshot(): WebVideoPictureInPictureSnapshot {
+        const video = this.readBinding().video;
+        if (!video) {
+            return EMPTY_PICTURE_IN_PICTURE_SNAPSHOT;
+        }
+
+        return this.readSnapshot(video);
+    }
+
+    toggle(): void {
+        const binding = this.readBinding();
+        const video = binding.video;
+        if (!video || this.operation) {
+            return;
+        }
+
+        const snapshot = this.readSnapshot(video);
+        if (!snapshot.canToggle) {
+            return;
+        }
+        if (snapshot.active && snapshot.canExit) {
+            this.startOperation(PICTURE_IN_PICTURE_ACTION.EXIT, binding, () =>
+                video.ownerDocument.exitPictureInPicture()
+            );
+            return;
+        }
+        if (snapshot.canRequest) {
+            this.startOperation(PICTURE_IN_PICTURE_ACTION.ENTER, binding, () =>
+                video.requestPictureInPicture()
+            );
+        }
+    }
+
+    private readSnapshot(
+        video: HTMLVideoElement
+    ): WebVideoPictureInPictureSnapshot {
+        try {
+            const ownerDocument = video.ownerDocument;
+            const active = ownerDocument.pictureInPictureElement === video;
+            const canExit =
+                typeof ownerDocument.exitPictureInPicture === 'function';
+            const canRequest =
+                ownerDocument.pictureInPictureEnabled === true &&
+                typeof video.requestPictureInPicture === 'function' &&
+                canExit &&
+                video.disablePictureInPicture !== true;
+            return {
+                active,
+                canExit,
+                canRequest,
+                canToggle:
+                    this.operation === null &&
+                    ((active && canExit) ||
+                        (canRequest && video.readyState >= HAVE_METADATA)),
+                supported: canRequest || (active && canExit),
+            };
+        } catch {
+            return EMPTY_PICTURE_IN_PICTURE_SNAPSHOT;
+        }
+    }
+
+    private startOperation(
+        action: PictureInPictureAction,
+        binding: WebVideoPictureInPictureBinding,
+        invoke: () => Promise<unknown>
+    ): void {
+        const video = binding.video;
+        if (!video) {
+            return;
+        }
+        const operation: PictureInPictureOperation = {
+            action,
+            generation: binding.generation,
+            video,
+        };
+        this.operation = operation;
+        this.refresh();
+
+        let result: Promise<unknown>;
+        try {
+            result = invoke();
+        } catch {
+            this.settleOperation(operation, false);
+            return;
+        }
+        void Promise.resolve(result).then(
+            () => this.settleOperation(operation, true),
+            () => this.settleOperation(operation, false)
+        );
+    }
+
+    private settleOperation(
+        operation: PictureInPictureOperation,
+        succeeded: boolean
+    ): void {
+        const binding = this.readBinding();
+        const isCurrent =
+            this.operation === operation &&
+            binding.generation === operation.generation &&
+            binding.video === operation.video;
+        if (isCurrent) {
+            this.operation = null;
+            this.refresh();
+            return;
+        }
+        if (succeeded && operation.action === PICTURE_IN_PICTURE_ACTION.ENTER) {
+            this.exitIfOwned(operation.video);
+        }
+    }
+
+    private exitIfOwned(video: HTMLVideoElement): void {
+        try {
+            const ownerDocument = video.ownerDocument;
+            if (
+                ownerDocument.pictureInPictureElement !== video ||
+                typeof ownerDocument.exitPictureInPicture !== 'function'
+            ) {
+                return;
+            }
+            const result = ownerDocument.exitPictureInPicture();
+            void Promise.resolve(result).then(
+                () => undefined,
+                () => undefined
+            );
+        } catch {
+            // PiP teardown is best-effort during target replacement.
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player-up-next.spec.ts b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player-up-next.spec.ts
new file mode 100644
index 000000000..b002bc430
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player-up-next.spec.ts
@@ -0,0 +1,235 @@
+import { Component, input, output, signal } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { SettingsStore } from '@iptvnator/services';
+import type { PortalInlinePlayerComponent as PortalInlinePlayerComponentInstance } from './portal-inline-player.component';
+
+jest.unstable_mockModule('video.js', () => ({
+    default: jest.fn(),
+}));
+
+jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
+jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
+jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
+
+@Component({
+    selector: 'app-web-player-view',
+    standalone: true,
+    template: '<div data-test-id="stub-web-player-view"></div>',
+})
+class StubWebPlayerViewComponent {
+    readonly streamUrl = input.required<string>();
+    readonly title = input('');
+    readonly mediaTitle = input<unknown>(null);
+    readonly playback = input<unknown>(null);
+    readonly startTime = input(0);
+    readonly seriesNavigation = input<unknown>(null);
+    readonly timeUpdate = output<{ currentTime: number; duration: number }>();
+    readonly externalFallbackRequested = output<unknown>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+}
+
+describe('PortalInlinePlayerComponent up next rail', () => {
+    let PortalInlinePlayerComponent: typeof import('./portal-inline-player.component').PortalInlinePlayerComponent;
+    let WebPlayerViewComponent: typeof import('../web-player-view/web-player-view.component').WebPlayerViewComponent;
+    let fixture: ComponentFixture<PortalInlinePlayerComponentInstance>;
+    let component: PortalInlinePlayerComponentInstance;
+
+    beforeAll(async () => {
+        ({ PortalInlinePlayerComponent } = await import(
+            './portal-inline-player.component'
+        ));
+        ({ WebPlayerViewComponent } = await import(
+            '../web-player-view/web-player-view.component'
+        ));
+    });
+
+    afterEach(() => {
+        fixture?.destroy();
+    });
+
+    async function setup(railEnabled: boolean, player = 'videojs') {
+        TestBed.resetTestingModule();
+        await TestBed.configureTestingModule({
+            imports: [PortalInlinePlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: SettingsStore,
+                    useValue: {
+                        player: signal(player),
+                        playerAmbientMode: signal(false),
+                        playerUpNextRail: signal(railEnabled),
+                        stripCountryPrefix: signal(false),
+                    },
+                },
+            ],
+        })
+            .overrideComponent(PortalInlinePlayerComponent, {
+                remove: { imports: [WebPlayerViewComponent] },
+                add: { imports: [StubWebPlayerViewComponent] },
+            })
+            .compileComponents();
+
+        fixture = TestBed.createComponent(PortalInlinePlayerComponent);
+        component = fixture.componentInstance;
+    }
+
+    const railEl = () => fixture.nativeElement.querySelector('app-up-next-rail');
+
+    const seriesPlayback = {
+        streamUrl: 'https://example.com/episode.mp4',
+        title: 'Some Show',
+        contentInfo: {
+            playlistId: 'playlist-1',
+            contentXtreamId: 12,
+            contentType: 'episode',
+        },
+    };
+
+    const upNextItems = [
+        {
+            id: 12,
+            label: 'S01E02',
+            title: 'Episode 2',
+            thumbnailUrl: null,
+            progressPercent: 40,
+            isPlaying: true,
+            episode: { id: '12' },
+        },
+        {
+            id: 13,
+            label: 'S01E03',
+            title: 'Episode 3',
+            thumbnailUrl: null,
+            progressPercent: null,
+            isPlaying: false,
+            episode: { id: '13' },
+        },
+    ];
+
+    /** Renders, then feeds a stage size as the ResizeObserver would. */
+    function renderWithStage(width: number, height: number): void {
+        fixture.detectChanges();
+        component.stageSize.set({ width, height });
+        fixture.detectChanges();
+    }
+
+    it('docks the rail for series playback on a wide stage', async () => {
+        await setup(true);
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        // 1600 - 500 * 16/9 = ~711px leftover — plenty for the rail.
+        renderWithStage(1600, 500);
+
+        expect(component.upNextRailVisible()).toBe(true);
+        expect(railEl()).toBeTruthy();
+        expect(
+            fixture.nativeElement.querySelectorAll(
+                '[data-testid="up-next-episode"]'
+            ).length
+        ).toBe(2);
+    });
+
+    it('gates on the width the rail actually gets, after padding and gap', async () => {
+        await setup(true);
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        // At 500px tall the docked layout spends 24px padding + 18px gap, so
+        // the rail clears 320px only above a ~1208px stage.
+        renderWithStage(1180, 500);
+        expect(component.upNextRailVisible()).toBe(false);
+        expect(railEl()).toBeNull();
+
+        renderWithStage(1230, 500);
+        expect(component.upNextRailVisible()).toBe(true);
+        expect(railEl()).toBeTruthy();
+    });
+
+    it('stays docked once shown — the modifier padding cannot flip the gate', async () => {
+        await setup(true);
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        renderWithStage(1600, 500);
+        expect(component.upNextRailVisible()).toBe(true);
+
+        // Border-box measurement: the observer reports the same size after
+        // the rail modifier adds its padding, so visibility does not oscillate.
+        component.stageSize.set({ width: 1600, height: 500 });
+        fixture.detectChanges();
+
+        expect(component.upNextRailVisible()).toBe(true);
+    });
+
+    it('keeps the centered theater layout when the stage is near 16:9', async () => {
+        await setup(true);
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        renderWithStage(1280, 720);
+
+        expect(component.upNextRailVisible()).toBe(false);
+        expect(railEl()).toBeNull();
+    });
+
+    it('never shows the rail for movies (no episode content info)', async () => {
+        await setup(true);
+        fixture.componentRef.setInput('playback', {
+            streamUrl: 'https://example.com/movie.mp4',
+            title: 'Some Movie',
+            contentInfo: {
+                playlistId: 'playlist-1',
+                contentXtreamId: 7,
+                contentType: 'movie',
+            },
+        });
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        renderWithStage(1600, 500);
+
+        expect(component.upNextRailVisible()).toBe(false);
+        expect(railEl()).toBeNull();
+    });
+
+    it('stays hidden when the setting is toggled off', async () => {
+        await setup(false);
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        renderWithStage(1600, 500);
+
+        expect(component.upNextRailVisible()).toBe(false);
+        expect(railEl()).toBeNull();
+    });
+
+    it('stays hidden for non-web engines like embedded MPV', async () => {
+        await setup(true, 'embedded-mpv');
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        renderWithStage(1600, 500);
+
+        expect(component.upNextRailVisible()).toBe(false);
+        expect(railEl()).toBeNull();
+    });
+
+    it('emits the selected episode but ignores clicks on the playing one', async () => {
+        await setup(true);
+        const selected: unknown[] = [];
+        fixture.componentRef.setInput('playback', seriesPlayback);
+        fixture.componentRef.setInput('upNextEpisodes', upNextItems);
+        (
+            component as unknown as {
+                upNextEpisodeSelected: {
+                    subscribe: (fn: (item: unknown) => void) => void;
+                };
+            }
+        ).upNextEpisodeSelected.subscribe((item) => selected.push(item));
+        renderWithStage(1600, 500);
+
+        const buttons = fixture.nativeElement.querySelectorAll(
+            '[data-testid="up-next-episode"]'
+        ) as NodeListOf<HTMLButtonElement>;
+        buttons[0].click();
+        expect(selected).toEqual([]);
+        buttons[1].click();
+        expect(selected).toEqual([upNextItems[1]]);
+    });
+});
diff --git a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.html b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.html
index 8b9c597ed..2cdd6ff4a 100644
--- a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.html
+++ b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.html
@@ -49,10 +49,22 @@
             </div>
         </header>
 
-        <div class="player-shell__viewport">
+        <div
+            class="player-shell__viewport"
+            #stageViewport
+            [class.player-shell__viewport--with-rail]="upNextRailVisible()"
+        >
+            @if (ambientEnabled()) {
+                <div
+                    class="player-shell__ambient"
+                    aria-hidden="true"
+                    [style.--ambient-image]="ambientImageStyle()"
+                ></div>
+            }
             <app-web-player-view
                 [streamUrl]="streamUrl()"
                 [title]="title()"
+                [mediaTitle]="playerMediaTitle()"
                 [playback]="playback()"
                 [startTime]="startTime()"
                 [seriesNavigation]="seriesNavigation()"
@@ -64,6 +76,13 @@
                     onExternalFallbackRequested($event)
                 "
             />
+            @if (upNextRailVisible()) {
+                <app-up-next-rail
+                    class="player-shell__rail"
+                    [items]="upNextRailItems()"
+                    (episodeSelected)="onUpNextEpisodeSelected($event)"
+                />
+            }
         </div>
     </section>
 }
diff --git a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.scss b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.scss
index 05ba6f8bf..56e7a7aab 100644
--- a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.scss
+++ b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.scss
@@ -77,8 +77,23 @@
     justify-content: flex-end;
 }
 
+// The viewport is the "theater stage": it spans the full content width and,
+// on wide-short windows, becomes wider than 16:9. The player is centered and
+// letterboxed inside it, so the leftover is always the black stage (or the
+// ambient fill) — never a stray strip of app background.
 .player-shell__viewport {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     overflow: hidden;
+    // Definite width is load-bearing: with `width: auto`, `max-height` would
+    // transfer through `aspect-ratio` into a max-width and re-clamp the stage
+    // to 16:9 — recreating the app-surface gap on wide-short windows.
+    width: 100%;
+    // There is no global border-box reset, so the rail modifier's padding
+    // would otherwise widen the stage past its container and get clipped.
+    box-sizing: border-box;
     min-height: 320px;
     max-height: min(70vh, 720px);
     aspect-ratio: 16 / 9;
@@ -86,10 +101,53 @@
     background: #000;
 }
 
+// Player: largest 16:9 box that fits the stage height, horizontally centered.
+// The stage is never narrower than 16:9, so height-driven sizing never overflows.
 .player-shell__viewport > app-web-player-view {
+    position: relative;
+    z-index: 1;
     display: block;
-    width: 100%;
+    flex: 0 0 auto;
     height: 100%;
+    width: auto;
+    max-width: 100%;
+    aspect-ratio: 16 / 9;
+}
+
+// "Up Next" rail: instead of centering, the player docks left and the
+// leftover column becomes the episode rail. The rail is an opaque panel on
+// top of the stage, so the ambient fill stays behind it (and shows in the
+// flexible gap between player and rail on very wide stages).
+.player-shell__viewport--with-rail {
+    justify-content: space-between;
+    gap: 18px;
+    // Insets the docked player and the rail from the stage edges; the player
+    // keeps sizing itself as the largest 16:9 box fitting the (now smaller)
+    // content height.
+    padding: 12px;
+}
+
+.player-shell__rail {
+    position: relative;
+    z-index: 1;
+    flex: 1 1 auto;
+    align-self: stretch;
+    min-width: 0;
+    max-width: 440px;
+}
+
+// "Ambient mode": a blurred, dimmed copy of the poster fills the whole stage
+// behind the player, turning the letterbox margins into atmosphere.
+.player-shell__ambient {
+    position: absolute;
+    inset: 0;
+    z-index: 0;
+    background-image: var(--ambient-image);
+    background-position: center;
+    background-size: cover;
+    filter: blur(34px) brightness(0.5) saturate(1.15);
+    transform: scale(1.18);
+    pointer-events: none;
 }
 
 :host-context(.dark-theme) .player-shell {
diff --git a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.spec.ts b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.spec.ts
index cd930d81e..0638cd275 100644
--- a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.spec.ts
+++ b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.spec.ts
@@ -1,7 +1,8 @@
-import { Component, input, output } from '@angular/core';
+import { Component, input, output, signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
+import { SettingsStore } from '@iptvnator/services';
 import type { PortalInlinePlayerComponent as PortalInlinePlayerComponentInstance } from './portal-inline-player.component';
 
 jest.unstable_mockModule('video.js', () => ({
@@ -20,6 +21,7 @@ jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
 class StubWebPlayerViewComponent {
     readonly streamUrl = input.required<string>();
     readonly title = input('');
+    readonly mediaTitle = input<unknown>(null);
     readonly playback = input<unknown>(null);
     readonly startTime = input(0);
     readonly seriesNavigation = input<unknown>(null);
@@ -122,6 +124,78 @@ describe('PortalInlinePlayerComponent', () => {
         expect(events).toEqual(['ended', 'previous', 'next']);
     });
 
+    describe('playerMediaTitle', () => {
+        it('uses the series title with the episode label for episode playback', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.test/series/1002.mp4',
+                title: 'Episode 2',
+            });
+            fixture.componentRef.setInput('episodeMetadata', {
+                label: 'S01E02',
+                title: 'Episode 2',
+                seasonNumber: 1,
+                episodeNumber: 2,
+            });
+            fixture.componentRef.setInput('seriesTitle', 'Breaking Code');
+            fixture.detectChanges();
+
+            expect(component.playerMediaTitle()).toEqual({
+                primary: 'Breaking Code',
+                secondary: 'S01E02',
+            });
+
+            const webPlayer = fixture.debugElement.query(
+                By.directive(StubWebPlayerViewComponent)
+            ).componentInstance as StubWebPlayerViewComponent;
+            expect(webPlayer.mediaTitle()).toEqual({
+                primary: 'Breaking Code',
+                secondary: 'S01E02',
+            });
+        });
+
+        it('falls back to the playback title when no series title is provided', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.test/series/1002.mp4',
+                title: 'Episode 2',
+            });
+            fixture.componentRef.setInput('episodeMetadata', {
+                label: 'S01E02',
+                seasonNumber: 1,
+                episodeNumber: 2,
+            });
+            fixture.detectChanges();
+
+            expect(component.playerMediaTitle()).toEqual({
+                primary: 'Episode 2',
+                secondary: 'S01E02',
+            });
+        });
+
+        it('is a single line for movie playback and ignores the series title', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.test/vod/1.mp4',
+                title: 'Some Movie',
+            });
+            fixture.componentRef.setInput('seriesTitle', 'Unrelated Series');
+            fixture.detectChanges();
+
+            expect(component.playerMediaTitle()).toEqual({
+                primary: 'Some Movie',
+                secondary: null,
+            });
+        });
+
+        it('is null without a playback title', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.test/vod/1.mp4',
+                title: '',
+            });
+            fixture.detectChanges();
+
+            expect(component.playerMediaTitle()).toBeNull();
+        });
+    });
+
     it('emits backClicked (not closed) from the back button in the now-playing bar', () => {
         let backCount = 0;
         let closedCount = 0;
@@ -150,4 +224,166 @@ describe('PortalInlinePlayerComponent', () => {
         expect(backCount).toBe(1);
         expect(closedCount).toBe(0);
     });
+
+    describe('with strip country prefix enabled', () => {
+        beforeEach(async () => {
+            TestBed.resetTestingModule();
+            await TestBed.configureTestingModule({
+                imports: [
+                    PortalInlinePlayerComponent,
+                    TranslateModule.forRoot(),
+                ],
+                providers: [
+                    {
+                        provide: SettingsStore,
+                        useValue: { stripCountryPrefix: signal(true) },
+                    },
+                ],
+            })
+                .overrideComponent(PortalInlinePlayerComponent, {
+                    remove: {
+                        imports: [WebPlayerViewComponent],
+                    },
+                    add: {
+                        imports: [StubWebPlayerViewComponent],
+                    },
+                })
+                .compileComponents();
+
+            fixture = TestBed.createComponent(PortalInlinePlayerComponent);
+            component = fixture.componentInstance;
+        });
+
+        it('strips the prefix from live playback titles', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/live.m3u8',
+                title: 'US | CNN',
+                isLive: true,
+            });
+            fixture.detectChanges();
+
+            expect(component.title()).toBe('CNN');
+        });
+
+        it('keeps VOD titles untouched', () => {
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'US | Some Movie',
+            });
+            fixture.detectChanges();
+
+            expect(component.title()).toBe('US | Some Movie');
+        });
+    });
+
+    describe('ambient background fill', () => {
+        async function setup(
+            ambientEnabled: boolean,
+            player = 'videojs'
+        ): Promise<void> {
+            TestBed.resetTestingModule();
+            await TestBed.configureTestingModule({
+                imports: [
+                    PortalInlinePlayerComponent,
+                    TranslateModule.forRoot(),
+                ],
+                providers: [
+                    {
+                        provide: SettingsStore,
+                        useValue: {
+                            player: signal(player),
+                            playerAmbientMode: signal(ambientEnabled),
+                            stripCountryPrefix: signal(false),
+                        },
+                    },
+                ],
+            })
+                .overrideComponent(PortalInlinePlayerComponent, {
+                    remove: { imports: [WebPlayerViewComponent] },
+                    add: { imports: [StubWebPlayerViewComponent] },
+                })
+                .compileComponents();
+
+            fixture = TestBed.createComponent(PortalInlinePlayerComponent);
+            component = fixture.componentInstance;
+        }
+
+        const ambientEl = () =>
+            fixture.nativeElement.querySelector('.player-shell__ambient');
+
+        it('renders a poster-backed ambient layer for VOD when enabled', async () => {
+            await setup(true);
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'Some Movie',
+                thumbnail: 'https://cdn.example.com/poster.jpg',
+            });
+            fixture.detectChanges();
+
+            const layer = ambientEl() as HTMLElement | null;
+            expect(component.ambientEnabled()).toBe(true);
+            expect(layer).toBeTruthy();
+            expect(layer?.style.getPropertyValue('--ambient-image')).toBe(
+                'url("https://cdn.example.com/poster.jpg")'
+            );
+        });
+
+        it('does not render the ambient layer when the setting is off', async () => {
+            await setup(false);
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'Some Movie',
+                thumbnail: 'https://cdn.example.com/poster.jpg',
+            });
+            fixture.detectChanges();
+
+            expect(component.ambientEnabled()).toBe(false);
+            expect(ambientEl()).toBeNull();
+        });
+
+        it('skips the ambient layer for live channels and without a poster', async () => {
+            await setup(true);
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/live.m3u8',
+                title: 'CNN',
+                thumbnail: 'https://cdn.example.com/logo.png',
+                isLive: true,
+            });
+            fixture.detectChanges();
+            expect(ambientEl()).toBeNull();
+
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'No Poster Movie',
+            });
+            fixture.detectChanges();
+            expect(ambientEl()).toBeNull();
+        });
+
+        it('keeps the ambient layer off for non-web engines like embedded MPV', async () => {
+            await setup(true, 'embedded-mpv');
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'Some Movie',
+                thumbnail: 'https://cdn.example.com/poster.jpg',
+            });
+            fixture.detectChanges();
+
+            expect(component.ambientEnabled()).toBe(false);
+            expect(ambientEl()).toBeNull();
+        });
+
+        it('rejects non-http(s) poster URLs to avoid CSS breakout', async () => {
+            await setup(true);
+            fixture.componentRef.setInput('playback', {
+                streamUrl: 'https://example.com/movie.mp4',
+                title: 'Sneaky',
+                thumbnail: 'javascript:alert(1)',
+            });
+            fixture.detectChanges();
+
+            expect(component.ambientImageStyle()).toBeNull();
+            expect(ambientEl()).toBeNull();
+        });
+    });
 });
diff --git a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.ts b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.ts
index bc4291a3e..2b9290056 100644
--- a/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.ts
+++ b/libs/ui/playback/src/lib/portal-inline-player/portal-inline-player.component.ts
@@ -3,8 +3,13 @@ import {
     ChangeDetectionStrategy,
     Component,
     computed,
+    effect,
+    ElementRef,
+    inject,
     input,
     output,
+    signal,
+    viewChild,
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
@@ -13,13 +18,25 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
     PlayerContentInfo,
     ResolvedPortalPlayback,
+    VideoPlayer,
 } from '@iptvnator/shared/interfaces';
 import type { PlaybackFallbackRequest } from '../playback-diagnostics/playback-diagnostics.util';
+import { SettingsStore } from '@iptvnator/services';
+import { applyChannelNameStrip } from '@iptvnator/shared/m3u-utils';
+import type { PlayerMediaTitle } from '../player-controls';
 import { WebPlayerViewComponent } from '../web-player-view/web-player-view.component';
 import type {
     SeriesEpisodeMetadata,
     SeriesPlaybackNavigation,
 } from './series-playback-navigation';
+import { UpNextRailComponent } from './up-next-rail.component';
+import type { UpNextRailItem } from './up-next-rail.util';
+
+/** Narrowest useful "Up Next" rail; below this the stage stays centered. */
+const UP_NEXT_RAIL_MIN_WIDTH = 320;
+/** Keep in sync with `.player-shell__viewport--with-rail` in the stylesheet. */
+const RAIL_STAGE_PADDING = 12;
+const RAIL_STAGE_GAP = 18;
 
 @Component({
     selector: 'app-portal-inline-player',
@@ -31,6 +48,7 @@ import type {
         MatIconModule,
         MatTooltipModule,
         TranslateModule,
+        UpNextRailComponent,
         WebPlayerViewComponent,
     ],
     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -43,9 +61,63 @@ export class PortalInlinePlayerComponent {
     readonly playback = input<ResolvedPortalPlayback | null>(null);
     readonly episodeMetadata = input<SeriesEpisodeMetadata | null>(null);
     readonly seriesNavigation = input<SeriesPlaybackNavigation | null>(null);
-    readonly title = computed(() => this.playback()?.title ?? '');
+    /** Series name for the fullscreen title overlay. Xtream episode playback
+     * carries the episode title, so the series name must come from the host. */
+    readonly seriesTitle = input<string | null>(null);
+    /** "Up Next" entries built by the series host; null for movies/live. */
+    readonly upNextEpisodes = input<UpNextRailItem[] | null>(null);
+    private readonly settingsStore = inject(SettingsStore);
+    // Strip only live-channel titles — VOD/series titles ("Mission:
+    // Impossible - Fallout") must never lose their leading segment.
+    readonly title = computed(() =>
+        applyChannelNameStrip(
+            this.playback()?.title,
+            this.playback()?.isLive &&
+                this.settingsStore.stripCountryPrefix?.()
+        )
+    );
     readonly streamUrl = computed(() => this.playback()?.streamUrl ?? '');
     readonly startTime = computed(() => this.playback()?.startTime ?? 0);
+    /**
+     * Poster used for the "Ambient mode" fill behind the player. Live channels
+     * carry logos rather than posters, so they are excluded.
+     */
+    private readonly ambientImageUrl = computed<string | null>(() => {
+        const playback = this.playback();
+        if (!playback || playback.isLive) {
+            return null;
+        }
+
+        return playback.thumbnail ?? null;
+    });
+    /** Safe `url(...)` value, or null when the poster URL is not a plain http/data URL. */
+    readonly ambientImageStyle = computed<string | null>(() => {
+        const url = this.ambientImageUrl();
+        if (!url || !/^(https?:|data:)/i.test(url)) {
+            return null;
+        }
+
+        const safe = url.replace(/"/g, '%22').replace(/\\/g, '%5C');
+        return `url("${safe}")`;
+    });
+    // Web players only — mirrors the settings UI, which offers the ambient
+    // and Up Next toggles for HTML5, Video.js, and ArtPlayer. Embedded MPV
+    // composites a native video layer, so extra DOM stays out of the mix.
+    private readonly isWebPlayerEngine = computed<boolean>(() => {
+        const player = this.settingsStore.player?.();
+        return (
+            player === VideoPlayer.VideoJs ||
+            player === VideoPlayer.Html5Player ||
+            player === VideoPlayer.ArtPlayer
+        );
+    });
+    readonly ambientEnabled = computed<boolean>(() => {
+        return (
+            this.isWebPlayerEngine() &&
+            this.settingsStore.playerAmbientMode?.() === true &&
+            !!this.ambientImageStyle()
+        );
+    });
     readonly contentInfo = computed<PlayerContentInfo | undefined>(
         () => this.playback()?.contentInfo
     );
@@ -60,6 +132,65 @@ export class PortalInlinePlayerComponent {
             ? `${metadata.label} - ${metadata.title}`
             : metadata.label;
     });
+    readonly playerMediaTitle = computed<PlayerMediaTitle | null>(() => {
+        const metadata = this.episodeMetadata();
+        const primary = (
+            (metadata ? this.seriesTitle() : null) || this.title()
+        )?.trim();
+        if (!primary) {
+            return null;
+        }
+
+        return { primary, secondary: metadata?.label ?? null };
+    });
+
+    private readonly stageViewport = viewChild<ElementRef<HTMLElement>>(
+        'stageViewport'
+    );
+    /**
+     * Border-box size of the theater stage, written by a ResizeObserver.
+     * Measuring the border box (not the content box) keeps the value stable
+     * when the rail modifier toggles the stage's own padding, so the gate
+     * below cannot oscillate around its threshold.
+     */
+    readonly stageSize = signal<{ width: number; height: number } | null>(
+        null
+    );
+    /**
+     * Width the rail would actually get: the stage minus its docked-mode
+     * padding, the 16:9 player sized to the remaining height, and the flex
+     * gap. Computed for the docked layout even while centered, so the gate
+     * answers "would the rail fit?" rather than "is there slack right now?".
+     */
+    private readonly upNextRailAvailableWidth = computed<number>(() => {
+        const size = this.stageSize();
+        if (!size || size.height <= 0) {
+            return 0;
+        }
+
+        const innerWidth = size.width - RAIL_STAGE_PADDING * 2;
+        const innerHeight = size.height - RAIL_STAGE_PADDING * 2;
+        return innerWidth - (innerHeight * 16) / 9 - RAIL_STAGE_GAP;
+    });
+    /**
+     * The rail docks in only for inline series playback on web engines, when
+     * the setting (default on) is enabled and the stage is wide enough; on
+     * near-16:9 or taller windows the theater/ambient centering remains.
+     */
+    readonly upNextRailVisible = computed<boolean>(() => {
+        const playback = this.playback();
+        return (
+            this.settingsStore.playerUpNextRail?.() !== false &&
+            this.isWebPlayerEngine() &&
+            !!this.upNextEpisodes()?.length &&
+            !playback?.isLive &&
+            playback?.contentInfo?.contentType === 'episode' &&
+            this.upNextRailAvailableWidth() >= UP_NEXT_RAIL_MIN_WIDTH
+        );
+    });
+    readonly upNextRailItems = computed<UpNextRailItem[]>(
+        () => this.upNextEpisodes() ?? []
+    );
 
     readonly closed = output<void>();
     /** Back arrow in the now-playing bar: route-level back, not just close. */
@@ -73,6 +204,41 @@ export class PortalInlinePlayerComponent {
     readonly playbackEnded = output<void>();
     readonly previousEpisodeRequested = output<void>();
     readonly nextEpisodeRequested = output<void>();
+    readonly upNextEpisodeSelected = output<UpNextRailItem>();
+
+    constructor() {
+        effect((onCleanup) => {
+            const element = this.stageViewport()?.nativeElement;
+            if (!element || typeof ResizeObserver === 'undefined') {
+                this.stageSize.set(null);
+                return;
+            }
+
+            const observer = new ResizeObserver((entries) => {
+                const entry = entries[0];
+                if (!entry) {
+                    return;
+                }
+
+                // `borderBoxSize` is the padding-independent measurement; the
+                // `contentRect` fallback covers engines that omit it.
+                const borderBox = entry.borderBoxSize?.[0];
+                this.stageSize.set(
+                    borderBox
+                        ? {
+                              width: borderBox.inlineSize,
+                              height: borderBox.blockSize,
+                          }
+                        : {
+                              width: entry.contentRect.width,
+                              height: entry.contentRect.height,
+                          }
+                );
+            });
+            observer.observe(element);
+            onCleanup(() => observer.disconnect());
+        });
+    }
 
     onClose(): void {
         this.closed.emit();
@@ -105,4 +271,8 @@ export class PortalInlinePlayerComponent {
     onNextEpisodeRequested(): void {
         this.nextEpisodeRequested.emit();
     }
+
+    onUpNextEpisodeSelected(item: UpNextRailItem): void {
+        this.upNextEpisodeSelected.emit(item);
+    }
 }
diff --git a/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.html b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.html
new file mode 100644
index 000000000..f50be373f
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.html
@@ -0,0 +1,57 @@
+<aside class="up-next" [attr.aria-label]="'PORTALS.UP_NEXT' | translate">
+    <h4 class="up-next__heading">{{ 'PORTALS.UP_NEXT' | translate }}</h4>
+    <div class="up-next__list" role="list">
+        @for (item of items(); track item.id) {
+            <button
+                type="button"
+                role="listitem"
+                class="up-next__item"
+                data-testid="up-next-episode"
+                [class.up-next__item--playing]="item.isPlaying"
+                [attr.aria-current]="item.isPlaying ? 'true' : null"
+                (click)="onSelect(item)"
+            >
+                <span class="up-next__thumb" aria-hidden="true">
+                    @if (item.thumbnailUrl) {
+                        <img
+                            class="up-next__thumb-image"
+                            [src]="item.thumbnailUrl"
+                            alt=""
+                            loading="lazy"
+                        />
+                    } @else {
+                        <mat-icon class="up-next__thumb-fallback"
+                            >smart_display</mat-icon
+                        >
+                    }
+                    @if (item.isPlaying) {
+                        <span class="up-next__playing-badge">
+                            <mat-icon>equalizer</mat-icon>
+                        </span>
+                    }
+                    @if (item.progressPercent !== null) {
+                        <span class="up-next__progress">
+                            <span
+                                class="up-next__progress-bar"
+                                [style.width.%]="item.progressPercent"
+                            ></span>
+                        </span>
+                    }
+                </span>
+                <span class="up-next__meta">
+                    <span class="up-next__label">
+                        {{ item.label }}
+                        @if (item.isPlaying) {
+                            <span class="up-next__now-playing">
+                                {{ 'PORTALS.NOW_PLAYING' | translate }}
+                            </span>
+                        }
+                    </span>
+                    @if (item.title) {
+                        <span class="up-next__title">{{ item.title }}</span>
+                    }
+                </span>
+            </button>
+        }
+    </div>
+</aside>
diff --git a/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.scss b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.scss
new file mode 100644
index 000000000..b6c695c58
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.scss
@@ -0,0 +1,151 @@
+// Opaque panel docked on the stage's right column — it sits on top of the
+// black stage (or the ambient fill), so its own dark surface works for both
+// app themes without :host-context branching.
+:host {
+    display: block;
+    height: 100%;
+    min-height: 0;
+}
+
+.up-next {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+    padding: 14px 6px 14px 14px;
+    border-radius: 12px;
+    background: rgba(16, 16, 18, 0.86);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    color: #fff;
+}
+
+.up-next__heading {
+    margin: 0 8px 10px 4px;
+    font-size: 0.72rem;
+    font-weight: 700;
+    letter-spacing: 0.18em;
+    text-transform: uppercase;
+    color: rgba(255, 255, 255, 0.62);
+}
+
+.up-next__list {
+    display: grid;
+    gap: 6px;
+    align-content: start;
+    overflow-y: auto;
+    min-height: 0;
+    padding-right: 8px;
+    scrollbar-width: thin;
+    scrollbar-color: rgba(255, 255, 255, 0.24) transparent;
+}
+
+.up-next__item {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+    padding: 6px;
+    border: 0;
+    border-radius: 10px;
+    background: transparent;
+    color: inherit;
+    font: inherit;
+    text-align: left;
+    cursor: pointer;
+    transition: background-color 120ms ease;
+
+    &:hover,
+    &:focus-visible {
+        background: rgba(255, 255, 255, 0.1);
+    }
+}
+
+.up-next__item--playing {
+    background: rgba(255, 255, 255, 0.14);
+    cursor: default;
+}
+
+.up-next__thumb {
+    position: relative;
+    flex: none;
+    width: 104px;
+    aspect-ratio: 16 / 9;
+    border-radius: 6px;
+    overflow: hidden;
+    background: rgba(255, 255, 255, 0.08);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.up-next__thumb-image {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.up-next__thumb-fallback {
+    color: rgba(255, 255, 255, 0.38);
+}
+
+.up-next__playing-badge {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(0, 0, 0, 0.45);
+
+    mat-icon {
+        color: #fff;
+    }
+}
+
+.up-next__progress {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    height: 3px;
+    background: rgba(255, 255, 255, 0.28);
+}
+
+.up-next__progress-bar {
+    display: block;
+    height: 100%;
+    background: #e50914;
+}
+
+.up-next__meta {
+    display: grid;
+    gap: 2px;
+    min-width: 0;
+}
+
+.up-next__label {
+    display: flex;
+    gap: 8px;
+    align-items: baseline;
+    font-size: 0.78rem;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    color: rgba(255, 255, 255, 0.72);
+}
+
+.up-next__now-playing {
+    font-size: 0.62rem;
+    font-weight: 700;
+    letter-spacing: 0.14em;
+    text-transform: uppercase;
+    color: #7dd87d;
+}
+
+.up-next__title {
+    font-size: 0.9rem;
+    font-weight: 600;
+    line-height: 1.25;
+    color: #fff;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+}
diff --git a/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.ts b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.ts
new file mode 100644
index 000000000..ed25a13ad
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.component.ts
@@ -0,0 +1,34 @@
+import {
+    ChangeDetectionStrategy,
+    Component,
+    input,
+    output,
+} from '@angular/core';
+import { MatIconModule } from '@angular/material/icon';
+import { TranslateModule } from '@ngx-translate/core';
+import type { UpNextRailItem } from './up-next-rail.util';
+
+/**
+ * "Up Next" side rail shown next to the inline series player when the
+ * theater stage is wider than 16:9 (Netflix/Plex pattern). Purely
+ * presentational: the host builds the items and handles selection.
+ */
+@Component({
+    selector: 'app-up-next-rail',
+    templateUrl: './up-next-rail.component.html',
+    styleUrl: './up-next-rail.component.scss',
+    imports: [MatIconModule, TranslateModule],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class UpNextRailComponent {
+    readonly items = input.required<UpNextRailItem[]>();
+
+    readonly episodeSelected = output<UpNextRailItem>();
+
+    onSelect(item: UpNextRailItem): void {
+        if (item.isPlaying) {
+            return;
+        }
+        this.episodeSelected.emit(item);
+    }
+}
diff --git a/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.spec.ts b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.spec.ts
new file mode 100644
index 000000000..a2ded7693
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.spec.ts
@@ -0,0 +1,155 @@
+import type { PlaybackPositionData } from '@iptvnator/shared/interfaces';
+import { buildUpNextRailItems } from './up-next-rail.util';
+
+interface TestEpisode {
+    id: string;
+    episode_num: number;
+    season: number;
+    title?: string;
+    info?: { movie_image?: string } | unknown[];
+}
+
+function episode(
+    id: number,
+    season: number,
+    episodeNum: number,
+    overrides: Partial<TestEpisode> = {}
+): TestEpisode {
+    return {
+        id: String(id),
+        episode_num: episodeNum,
+        season,
+        title: `Episode ${episodeNum}`,
+        ...overrides,
+    };
+}
+
+function position(
+    contentXtreamId: number,
+    positionSeconds: number,
+    durationSeconds: number
+): PlaybackPositionData {
+    return {
+        playlistId: 'playlist-1',
+        contentXtreamId,
+        contentType: 'episode',
+        positionSeconds,
+        durationSeconds,
+    };
+}
+
+const EPISODES_BY_SEASON = {
+    '1': [episode(11, 1, 1), episode(12, 1, 2), episode(13, 1, 3)],
+    '2': [episode(21, 2, 1), episode(22, 2, 2)],
+};
+
+describe('buildUpNextRailItems', () => {
+    it('starts at the playing episode and spills over into the next season', () => {
+        const items = buildUpNextRailItems({
+            episodesBySeason: EPISODES_BY_SEASON,
+            currentEpisodeId: 12,
+        });
+
+        expect(items.map((item) => item.id)).toEqual([12, 13, 21, 22]);
+        expect(items.map((item) => item.label)).toEqual([
+            'S01E02',
+            'S01E03',
+            'S02E01',
+            'S02E02',
+        ]);
+        expect(items[0].isPlaying).toBe(true);
+        expect(items.slice(1).every((item) => !item.isPlaying)).toBe(true);
+    });
+
+    it('orders numeric season keys numerically, not lexicographically', () => {
+        const items = buildUpNextRailItems({
+            episodesBySeason: {
+                '10': [episode(101, 10, 1)],
+                '2': [episode(21, 2, 1)],
+                '1': [episode(11, 1, 1)],
+            },
+            currentEpisodeId: 11,
+        });
+
+        expect(items.map((item) => item.id)).toEqual([11, 21, 101]);
+    });
+
+    it('returns an empty list when the playing episode is not in the seasons', () => {
+        expect(
+            buildUpNextRailItems({
+                episodesBySeason: EPISODES_BY_SEASON,
+                currentEpisodeId: 999,
+            })
+        ).toEqual([]);
+    });
+
+    it('returns an empty list without seasons or a current episode', () => {
+        expect(
+            buildUpNextRailItems({
+                episodesBySeason: null,
+                currentEpisodeId: 12,
+            })
+        ).toEqual([]);
+        expect(
+            buildUpNextRailItems({
+                episodesBySeason: EPISODES_BY_SEASON,
+                currentEpisodeId: null,
+            })
+        ).toEqual([]);
+    });
+
+    it('caps the list at the given limit', () => {
+        const items = buildUpNextRailItems({
+            episodesBySeason: EPISODES_BY_SEASON,
+            currentEpisodeId: 11,
+            limit: 2,
+        });
+
+        expect(items.map((item) => item.id)).toEqual([11, 12]);
+    });
+
+    it('maps watch progress from playback positions and null when unstarted', () => {
+        const positions = new Map<number, PlaybackPositionData>([
+            [12, position(12, 600, 1200)],
+        ]);
+
+        const items = buildUpNextRailItems({
+            episodesBySeason: EPISODES_BY_SEASON,
+            currentEpisodeId: 12,
+            playbackPositions: positions,
+        });
+
+        expect(items[0].progressPercent).toBe(50);
+        expect(items[1].progressPercent).toBeNull();
+    });
+
+    it('uses http(s) episode thumbnails and rejects other schemes', () => {
+        const items = buildUpNextRailItems({
+            episodesBySeason: {
+                '1': [
+                    episode(11, 1, 1, {
+                        info: { movie_image: 'https://cdn.example.com/a.jpg' },
+                    }),
+                    episode(12, 1, 2, {
+                        info: { movie_image: 'javascript:alert(1)' },
+                    }),
+                    episode(13, 1, 3, { info: [] }),
+                ],
+            },
+            currentEpisodeId: 11,
+        });
+
+        expect(items[0].thumbnailUrl).toBe('https://cdn.example.com/a.jpg');
+        expect(items[1].thumbnailUrl).toBeNull();
+        expect(items[2].thumbnailUrl).toBeNull();
+    });
+
+    it('carries the raw episode object through for host playback', () => {
+        const items = buildUpNextRailItems({
+            episodesBySeason: EPISODES_BY_SEASON,
+            currentEpisodeId: 13,
+        });
+
+        expect(items[1].episode).toBe(EPISODES_BY_SEASON['2'][0]);
+    });
+});
diff --git a/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.ts b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.ts
new file mode 100644
index 000000000..eb6581d9c
--- /dev/null
+++ b/libs/ui/playback/src/lib/portal-inline-player/up-next-rail.util.ts
@@ -0,0 +1,161 @@
+import { getPortalPlaybackProgressPercent } from '@iptvnator/portal/shared/util';
+import type { PlaybackPositionData } from '@iptvnator/shared/interfaces';
+import {
+    formatSeriesEpisodeLabel,
+    type SeriesPlaybackEpisodeLike,
+} from './series-playback-navigation';
+
+/**
+ * Episode entry rendered by the "Up Next" side rail next to the inline
+ * series player. Carries the host's raw episode object so selection can be
+ * routed back through the host's existing episode-play flow without an
+ * id lookup.
+ */
+export interface UpNextRailItem<TEpisode = unknown> {
+    id: number;
+    /** `SxxEyy` label. */
+    label: string;
+    title: string;
+    thumbnailUrl: string | null;
+    /** Watch progress in percent (0–100); null when never started. */
+    progressPercent: number | null;
+    isPlaying: boolean;
+    episode: TEpisode;
+}
+
+interface UpNextEpisodeLike extends SeriesPlaybackEpisodeLike {
+    info?: { movie_image?: string } | unknown[];
+}
+
+export interface BuildUpNextRailItemsOptions<
+    TEpisode extends UpNextEpisodeLike,
+> {
+    episodesBySeason: Record<string, readonly TEpisode[]> | null | undefined;
+    /** Id of the episode currently playing inline; no rail without one. */
+    currentEpisodeId: string | number | null | undefined;
+    playbackPositions?: ReadonlyMap<number, PlaybackPositionData> | null;
+    /** Max entries including the playing episode. */
+    limit?: number;
+}
+
+const DEFAULT_LIMIT = 12;
+
+/**
+ * Builds the "Up Next" list for the inline series player: the currently
+ * playing episode (highlighted) followed by the rest of its season and a
+ * spillover into the following seasons, with per-episode watch progress.
+ */
+export function buildUpNextRailItems<TEpisode extends UpNextEpisodeLike>({
+    episodesBySeason,
+    currentEpisodeId,
+    playbackPositions,
+    limit = DEFAULT_LIMIT,
+}: BuildUpNextRailItemsOptions<TEpisode>): UpNextRailItem<TEpisode>[] {
+    if (
+        !episodesBySeason ||
+        currentEpisodeId === null ||
+        currentEpisodeId === undefined
+    ) {
+        return [];
+    }
+
+    const flattened = flattenSeasons(episodesBySeason);
+    const currentIndex = flattened.findIndex(
+        ({ episode }) => Number(episode.id) === Number(currentEpisodeId)
+    );
+    if (currentIndex < 0) {
+        return [];
+    }
+
+    return flattened
+        .slice(currentIndex, currentIndex + limit)
+        .map(({ episode, seasonNumber, episodeNumber }, index) => ({
+            id: Number(episode.id),
+            label: formatSeriesEpisodeLabel(seasonNumber, episodeNumber),
+            title: episode.title ?? '',
+            thumbnailUrl: getEpisodeThumbnail(episode),
+            progressPercent: getProgressPercent(
+                playbackPositions?.get(Number(episode.id))
+            ),
+            isPlaying: index === 0,
+            episode,
+        }));
+}
+
+interface FlattenedEpisode<TEpisode> {
+    episode: TEpisode;
+    seasonNumber: number;
+    episodeNumber: number;
+}
+
+/**
+ * Flattens the season map into playback order. Season keys are sorted
+ * numerically when possible (object key order is not reliable for numeric
+ * strings mixed with names); non-numeric keys keep their insertion order
+ * after the numeric ones.
+ */
+function flattenSeasons<TEpisode extends UpNextEpisodeLike>(
+    episodesBySeason: Record<string, readonly TEpisode[]>
+): FlattenedEpisode<TEpisode>[] {
+    interface SeasonEntry {
+        seasonKey: string;
+        episodes: readonly TEpisode[];
+        entryIndex: number;
+    }
+
+    const entries: SeasonEntry[] = Object.entries(episodesBySeason).map(
+        ([seasonKey, episodes], entryIndex) => ({
+            seasonKey,
+            episodes,
+            entryIndex,
+        })
+    );
+
+    entries.sort((a, b) => {
+        const aNumber = Number(a.seasonKey);
+        const bNumber = Number(b.seasonKey);
+        const aNumeric = Number.isFinite(aNumber);
+        const bNumeric = Number.isFinite(bNumber);
+        if (aNumeric && bNumeric) {
+            return aNumber - bNumber;
+        }
+        if (aNumeric !== bNumeric) {
+            return aNumeric ? -1 : 1;
+        }
+        return a.entryIndex - b.entryIndex;
+    });
+
+    // No Array.flatMap: the e2e build config targets a lib without it.
+    const flattened: FlattenedEpisode<TEpisode>[] = [];
+    for (const { seasonKey, episodes } of entries) {
+        episodes.forEach((episode: TEpisode, episodeIndex: number) => {
+            flattened.push({
+                episode,
+                seasonNumber: Number(episode.season) || Number(seasonKey) || 0,
+                episodeNumber: Number(episode.episode_num) || episodeIndex + 1,
+            });
+        });
+    }
+    return flattened;
+}
+
+function getEpisodeThumbnail(episode: UpNextEpisodeLike): string | null {
+    const info = episode.info;
+    if (!info || Array.isArray(info)) {
+        return null;
+    }
+
+    const url = info.movie_image;
+    return url && /^https?:/i.test(url) ? url : null;
+}
+
+function getProgressPercent(
+    position: PlaybackPositionData | undefined
+): number | null {
+    if (!position || !position.positionSeconds) {
+        return null;
+    }
+
+    const percent = getPortalPlaybackProgressPercent(position);
+    return percent > 0 ? percent : null;
+}
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.spec.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.spec.ts
new file mode 100644
index 000000000..9dbe76aca
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.spec.ts
@@ -0,0 +1,101 @@
+import {
+    InlinePlaybackPlayer,
+    PlaybackDiagnosticCode,
+    PlaybackDiagnosticSource,
+} from '../playback-diagnostics/playback-diagnostics.model';
+import { createPlaybackSourceMetadata } from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    classifyShakaPlaybackIssue,
+    createUnsupportedDrmDiagnostic,
+} from './shaka-error-classifier';
+
+const metadata = createPlaybackSourceMetadata({
+    url: 'http://example.com/stream.mpd',
+    mimeType: 'application/dash+xml',
+    player: InlinePlaybackPlayer.Html5,
+});
+
+describe('classifyShakaPlaybackIssue', () => {
+    it.each([
+        ['DRM category', { category: 6, code: 6001 }],
+        ['restrictions-cannot-be-met', { category: 4, code: 4012 }],
+        [
+            'license keyword in message',
+            { category: 5, code: 5001, message: 'license request failed' },
+        ],
+    ])('maps %s to DrmOrEncryption', (_label, error) => {
+        const issue = classifyShakaPlaybackIssue(error, metadata);
+        expect(issue.code).toBe(PlaybackDiagnosticCode.DrmOrEncryption);
+        expect(issue.source).toBe(PlaybackDiagnosticSource.Shaka);
+    });
+
+    it('maps network category to NetworkError', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 1, code: 1001 },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.NetworkError);
+    });
+
+    it('maps CORS-flavored network failures to BrowserAccessError', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 1, code: 1002, message: 'Blocked by CORS policy' },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.BrowserAccessError);
+    });
+
+    it('maps media category to MediaDecodeError', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 3, code: 3016 },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.MediaDecodeError);
+    });
+
+    it('maps codec-flavored media failures to UnsupportedCodec', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 3, code: 3005, message: 'addCodec failed for hvc1' },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.UnsupportedCodec);
+    });
+
+    it('maps manifest category to UnsupportedContainer', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 4, code: 4001 },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.UnsupportedContainer);
+    });
+
+    it('falls back to UnknownPlaybackError and keeps details', () => {
+        const issue = classifyShakaPlaybackIssue(
+            { category: 7, code: 7002, message: 'boom' },
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.UnknownPlaybackError);
+        expect(issue.details).toContain('boom');
+        expect(issue.details).toContain('7002');
+    });
+
+    it('tolerates missing error objects', () => {
+        const issue = classifyShakaPlaybackIssue(null, metadata);
+        expect(issue.code).toBe(PlaybackDiagnosticCode.UnknownPlaybackError);
+    });
+});
+
+describe('createUnsupportedDrmDiagnostic', () => {
+    it('creates a DRM diagnostic without recommending unusable external fallbacks', () => {
+        const issue = createUnsupportedDrmDiagnostic(
+            'com.widevine.alpha',
+            metadata
+        );
+        expect(issue.code).toBe(PlaybackDiagnosticCode.DrmOrEncryption);
+        expect(issue.source).toBe(PlaybackDiagnosticSource.Shaka);
+        expect(issue.details).toContain('com.widevine.alpha');
+        // MPV/VLC cannot receive KODIPROP license config, so the diagnostic
+        // must not offer them as a fallback.
+        expect(issue.externalFallbackRecommended).toBe(false);
+    });
+});
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.ts
new file mode 100644
index 000000000..221384c31
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-error-classifier.ts
@@ -0,0 +1,173 @@
+import type {
+    PlaybackDiagnostic,
+    PlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.model';
+import {
+    PlaybackDiagnosticCode as DiagnosticCode,
+    PlaybackDiagnosticSource as DiagnosticSource,
+} from '../playback-diagnostics/playback-diagnostics.model';
+import { createPlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    isBrowserAccessFailure,
+    isCodecFailure,
+    isDrmOrEncryptionFailure,
+} from '../playback-diagnostics/playback-error-patterns.util';
+import type { ShakaErrorLike } from './shaka-module.types';
+
+/**
+ * Numeric `shaka.util.Error.Category` values (stable public Shaka API). Kept
+ * local so classification stays a pure function that does not need the lazily
+ * loaded module.
+ */
+const SHAKA_CATEGORY = {
+    Network: 1,
+    Text: 2,
+    Media: 3,
+    Manifest: 4,
+    Streaming: 5,
+    Drm: 6,
+} as const;
+
+/** `shaka.util.Error.Code.RESTRICTIONS_CANNOT_BE_MET` — in practice this fires
+ * when every variant is restricted by unusable decryption keys. */
+const RESTRICTIONS_CANNOT_BE_MET = 4012;
+
+export function classifyShakaPlaybackIssue(
+    error: Partial<ShakaErrorLike> | null | undefined,
+    metadata: PlaybackSourceMetadata
+): PlaybackDiagnostic {
+    const details = formatShakaErrorDetails(error);
+    const lowerDetails = details.toLowerCase();
+    const category = error?.category;
+
+    if (
+        category === SHAKA_CATEGORY.Drm ||
+        error?.code === RESTRICTIONS_CANNOT_BE_MET ||
+        isDrmOrEncryptionFailure(lowerDetails)
+    ) {
+        return createPlaybackDiagnostic({
+            code: DiagnosticCode.DrmOrEncryption,
+            source: DiagnosticSource.Shaka,
+            metadata,
+            details,
+        });
+    }
+
+    if (category === SHAKA_CATEGORY.Network) {
+        return createPlaybackDiagnostic({
+            code: isBrowserAccessFailure(lowerDetails)
+                ? DiagnosticCode.BrowserAccessError
+                : DiagnosticCode.NetworkError,
+            source: DiagnosticSource.Shaka,
+            metadata,
+            details,
+        });
+    }
+
+    if (
+        category === SHAKA_CATEGORY.Media ||
+        category === SHAKA_CATEGORY.Streaming
+    ) {
+        return createPlaybackDiagnostic({
+            code: isCodecFailure(lowerDetails)
+                ? DiagnosticCode.UnsupportedCodec
+                : DiagnosticCode.MediaDecodeError,
+            source: DiagnosticSource.Shaka,
+            metadata,
+            details,
+        });
+    }
+
+    if (category === SHAKA_CATEGORY.Manifest) {
+        return createPlaybackDiagnostic({
+            code: DiagnosticCode.UnsupportedContainer,
+            source: DiagnosticSource.Shaka,
+            metadata,
+            details,
+        });
+    }
+
+    return createPlaybackDiagnostic({
+        code: DiagnosticCode.UnknownPlaybackError,
+        source: DiagnosticSource.Shaka,
+        metadata,
+        details,
+    });
+}
+
+/**
+ * Diagnostic for `.mpd` channels that declare a DRM system the app cannot
+ * handle (Widevine, PlayReady, malformed ClearKey config, …). Emitted before
+ * any Shaka engine is started.
+ */
+export function createUnsupportedDrmDiagnostic(
+    licenseType: string,
+    metadata: PlaybackSourceMetadata
+): PlaybackDiagnostic {
+    return createPlaybackDiagnostic({
+        code: DiagnosticCode.DrmOrEncryption,
+        source: DiagnosticSource.Shaka,
+        metadata,
+        details: licenseType
+            ? `Unsupported DRM license configuration: ${licenseType}`
+            : 'Unsupported DRM license configuration',
+        // External MPV/VLC cannot receive the KODIPROP license config either,
+        // so offering them as a fallback would just fail differently.
+        externalFallbackRecommended: false,
+    });
+}
+
+/** Narrows an unknown rejection to a Shaka-error-like shape, if it is one. */
+export function asShakaError(
+    error: unknown
+): Partial<ShakaErrorLike> | null {
+    if (!error || typeof error !== 'object') {
+        return null;
+    }
+
+    const candidate = error as Partial<ShakaErrorLike>;
+    return typeof candidate.code === 'number' ||
+        typeof candidate.category === 'number'
+        ? candidate
+        : null;
+}
+
+export function toErrorMessage(error: unknown): string {
+    if (error instanceof Error) {
+        return error.message;
+    }
+
+    return typeof error === 'string' ? error : String(error);
+}
+
+function formatShakaErrorDetails(
+    error: Partial<ShakaErrorLike> | null | undefined
+): string {
+    if (!error) {
+        return '';
+    }
+
+    const parts = [
+        typeof error.category === 'number'
+            ? `Shaka category ${error.category}`
+            : '',
+        typeof error.code === 'number' ? `code ${error.code}` : '',
+        error.message ?? '',
+        stringifyErrorData(error.data),
+    ];
+
+    return parts.filter((part) => part.length > 0).join(' ');
+}
+
+function stringifyErrorData(data: unknown[] | undefined): string {
+    if (!data || data.length === 0) {
+        return '';
+    }
+
+    try {
+        const serialized = JSON.stringify(data);
+        return serialized === '[]' ? '' : serialized;
+    } catch {
+        return '';
+    }
+}
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-module.types.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-module.types.ts
new file mode 100644
index 000000000..50421098a
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-module.types.ts
@@ -0,0 +1,75 @@
+/**
+ * Minimal structural typings for the lazily imported `shaka-player` module.
+ *
+ * The vendor package ships clutz-generated global namespace typings that are
+ * awkward to consume from an ESM library. These interfaces cover exactly the
+ * surface the app uses and double as the seam for unit-test fakes: the session
+ * accepts any {@link ShakaModuleLoader}, so specs never touch the real module.
+ */
+
+export interface ShakaAudioTrackLike {
+    active: boolean;
+    language: string;
+    label: string | null;
+    roles: string[];
+}
+
+export interface ShakaTextTrackLike {
+    id: number;
+    active: boolean;
+    language: string;
+    label: string | null;
+    kind: string | null;
+}
+
+export interface ShakaErrorLike {
+    severity: number;
+    category: number;
+    code: number;
+    message?: string;
+    data?: unknown[];
+}
+
+export interface ShakaPlayerLike {
+    attach(mediaElement: HTMLMediaElement): Promise<unknown>;
+    configure(config: Record<string, unknown>): boolean;
+    load(assetUri: string): Promise<unknown>;
+    destroy(): Promise<unknown>;
+    addEventListener(type: string, listener: (event: Event) => void): void;
+    removeEventListener(type: string, listener: (event: Event) => void): void;
+    getAudioTracks(): ShakaAudioTrackLike[];
+    selectAudioTrack(track: ShakaAudioTrackLike): void;
+    getTextTracks(): ShakaTextTrackLike[];
+    /**
+     * Shaka 5 visibility model: selecting a track shows it, `null` unloads
+     * the active track (subtitles off). There is no separate visibility API.
+     */
+    selectTextTrack(track: ShakaTextTrackLike | null): void;
+    isLive(): boolean;
+}
+
+export interface ShakaModuleLike {
+    Player: {
+        new (): ShakaPlayerLike;
+        isBrowserSupported(): boolean;
+    };
+    polyfill: {
+        installAll(): void;
+    };
+}
+
+export type ShakaModuleLoader = () => Promise<ShakaModuleLike>;
+
+/**
+ * Default production loader. The dynamic import keeps shaka-player (~267 KB
+ * gzip) out of the main bundle until the first `.mpd` stream starts.
+ */
+export const loadShakaModule: ShakaModuleLoader = async () => {
+    const module = (await import('shaka-player')) as unknown as
+        | { default?: ShakaModuleLike }
+        | ShakaModuleLike;
+    return (
+        ((module as { default?: ShakaModuleLike }).default ??
+            module) as ShakaModuleLike
+    );
+};
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-player-test-double.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-player-test-double.ts
new file mode 100644
index 000000000..eb6aed50e
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-player-test-double.ts
@@ -0,0 +1,164 @@
+import type {
+    ShakaAudioTrackLike,
+    ShakaModuleLike,
+    ShakaModuleLoader,
+    ShakaPlayerLike,
+    ShakaTextTrackLike,
+} from './shaka-module.types';
+
+/**
+ * Jest-free Shaka test double shared by the shaka-engine and ArtPlayer specs.
+ * Mirrors the {@link ShakaPlayerLike} surface, including the real Shaka
+ * semantic that `destroy()` interrupts an in-flight `load()` with
+ * `LOAD_INTERRUPTED` (7000).
+ */
+
+type Listener = (event: Event) => void;
+
+const LOAD_INTERRUPTED_ERROR = {
+    severity: 2,
+    category: 7,
+    code: 7000,
+} as const;
+
+export class FakeShakaPlayer implements ShakaPlayerLike {
+    readonly configureCalls: Record<string, unknown>[] = [];
+    readonly selectTextTrackCalls: unknown[] = [];
+    readonly selectedAudioTracks: ShakaAudioTrackLike[] = [];
+    readonly listeners = new Map<string, Set<Listener>>();
+    attachedTo: HTMLMediaElement | null = null;
+    loadedUrls: string[] = [];
+    destroyCount = 0;
+    audioTracks: ShakaAudioTrackLike[] = [];
+    textTracks: ShakaTextTrackLike[] = [];
+    /** When true, the next `load()` stays pending until `destroy()`. */
+    stallNextLoad = false;
+    loadResult: Promise<unknown> = Promise.resolve();
+    private pendingLoadReject: ((error: unknown) => void) | null = null;
+
+    attach(mediaElement: HTMLMediaElement): Promise<unknown> {
+        this.attachedTo = mediaElement;
+        return Promise.resolve();
+    }
+
+    configure(config: Record<string, unknown>): boolean {
+        this.configureCalls.push(config);
+        return true;
+    }
+
+    load(assetUri: string): Promise<unknown> {
+        this.loadedUrls.push(assetUri);
+        if (this.stallNextLoad) {
+            this.stallNextLoad = false;
+            return new Promise((_resolve, reject) => {
+                this.pendingLoadReject = reject;
+            });
+        }
+        return this.loadResult;
+    }
+
+    destroy(): Promise<unknown> {
+        this.destroyCount += 1;
+        this.pendingLoadReject?.(LOAD_INTERRUPTED_ERROR);
+        this.pendingLoadReject = null;
+        return Promise.resolve();
+    }
+
+    addEventListener(type: string, listener: Listener): void {
+        const set = this.listeners.get(type) ?? new Set<Listener>();
+        set.add(listener);
+        this.listeners.set(type, set);
+    }
+
+    removeEventListener(type: string, listener: Listener): void {
+        this.listeners.get(type)?.delete(listener);
+    }
+
+    dispatch(type: string, detail?: unknown): void {
+        for (const listener of [...(this.listeners.get(type) ?? [])]) {
+            listener({ type, detail } as unknown as Event);
+        }
+    }
+
+    getAudioTracks(): ShakaAudioTrackLike[] {
+        return this.audioTracks;
+    }
+
+    selectAudioTrack(track: ShakaAudioTrackLike): void {
+        this.selectedAudioTracks.push(track);
+    }
+
+    getTextTracks(): ShakaTextTrackLike[] {
+        return this.textTracks;
+    }
+
+    selectTextTrack(track: ShakaTextTrackLike | null): void {
+        this.selectTextTrackCalls.push(track);
+        for (const candidate of this.textTracks) {
+            candidate.active = candidate === track;
+        }
+    }
+
+    isLive(): boolean {
+        return false;
+    }
+}
+
+export interface FakeShakaEnvironment {
+    /** Every player the fake module has constructed, in creation order. */
+    readonly instances: FakeShakaPlayer[];
+    readonly loader: ShakaModuleLoader;
+    readonly module: ShakaModuleLike;
+    loaderCalls: number;
+    installAllCalls: number;
+    browserSupported: boolean;
+}
+
+export function createFakeShakaEnvironment(options?: {
+    onCreate?: (player: FakeShakaPlayer, index: number) => void;
+}): FakeShakaEnvironment {
+    const instances: FakeShakaPlayer[] = [];
+
+    const environment: FakeShakaEnvironment = {
+        instances,
+        loaderCalls: 0,
+        installAllCalls: 0,
+        browserSupported: true,
+        module: undefined as unknown as ShakaModuleLike,
+        loader: undefined as unknown as ShakaModuleLoader,
+    };
+
+    const playerConstructor = function (this: unknown) {
+        const player = new FakeShakaPlayer();
+        options?.onCreate?.(player, instances.length);
+        instances.push(player);
+        return player;
+    } as unknown as ShakaModuleLike['Player'];
+    (
+        playerConstructor as unknown as { isBrowserSupported: () => boolean }
+    ).isBrowserSupported = () => environment.browserSupported;
+
+    const module: ShakaModuleLike = {
+        Player: playerConstructor,
+        polyfill: {
+            installAll: () => {
+                environment.installAllCalls += 1;
+            },
+        },
+    };
+
+    (environment as { module: ShakaModuleLike }).module = module;
+    (environment as { loader: ShakaModuleLoader }).loader = () => {
+        environment.loaderCalls += 1;
+        return Promise.resolve(module);
+    };
+
+    return environment;
+}
+
+/** Drains chained microtasks so queued session operations settle. */
+export async function flushShakaMicrotasks(): Promise<void> {
+    for (let index = 0; index < 10; index += 1) {
+        await Promise.resolve();
+    }
+}
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-text-track-suppression.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-text-track-suppression.ts
new file mode 100644
index 000000000..5d401819f
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-text-track-suppression.ts
@@ -0,0 +1,42 @@
+import type { ShakaPlayerLike } from './shaka-module.types';
+
+/**
+ * Remembers the text track hidden while the captions preference is off so it
+ * can be reselected when the preference turns back on — Shaka 5 has no
+ * separate visibility API (selecting a track shows it, `null` hides text).
+ */
+export class ShakaTextTrackSuppression {
+    private suppressedTrackId: number | null = null;
+
+    /** Hides the active text track, remembering it for {@link restore}. */
+    suppress(player: ShakaPlayerLike): void {
+        const active = player
+            .getTextTracks()
+            .find((candidate) => candidate.active);
+        if (!active) {
+            return;
+        }
+
+        this.suppressedTrackId = active.id;
+        player.selectTextTrack(null);
+    }
+
+    /** One-shot reselection of the previously suppressed track. */
+    restore(player: ShakaPlayerLike): void {
+        if (this.suppressedTrackId === null) {
+            return;
+        }
+
+        const track = player
+            .getTextTracks()
+            .find((candidate) => candidate.id === this.suppressedTrackId);
+        this.suppressedTrackId = null;
+        if (track && !track.active) {
+            player.selectTextTrack(track);
+        }
+    }
+
+    reset(): void {
+        this.suppressedTrackId = null;
+    }
+}
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.spec.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.spec.ts
new file mode 100644
index 000000000..a568e6f66
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.spec.ts
@@ -0,0 +1,294 @@
+import type { ChannelDrm } from '@iptvnator/shared/interfaces';
+import {
+    InlinePlaybackPlayer,
+    PlaybackDiagnostic,
+    PlaybackDiagnosticCode,
+    PlaybackDiagnosticSource,
+} from '../playback-diagnostics/playback-diagnostics.model';
+import {
+    FakeShakaPlayer,
+    createFakeShakaEnvironment,
+    flushShakaMicrotasks as flush,
+} from './shaka-player-test-double';
+import { ShakaVideoSession } from './shaka-video-session';
+
+describe('ShakaVideoSession', () => {
+    const video = {} as HTMLVideoElement;
+    let issues: PlaybackDiagnostic[];
+
+    const createSession = (
+        environment: ReturnType<typeof createFakeShakaEnvironment>
+    ) =>
+        new ShakaVideoSession({
+            player: InlinePlaybackPlayer.Html5,
+            emitPlaybackIssue: (issue) => issues.push(issue),
+            showCaptions: () => false,
+            loadShaka: environment.loader,
+        });
+
+    beforeEach(() => {
+        issues = [];
+    });
+
+    it('lazily loads the module once, installs polyfills and starts playback', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/a.mpd');
+        await flush();
+        session.start(video, 'http://example.com/b.mpd');
+        await flush();
+
+        expect(environment.loaderCalls).toBe(1);
+        expect(environment.installAllCalls).toBe(1);
+        const [first, second] = environment.instances;
+        expect(first.attachedTo).toBe(video);
+        expect(first.loadedUrls).toEqual(['http://example.com/a.mpd']);
+        expect(first.destroyCount).toBe(1);
+        expect(second.loadedUrls).toEqual(['http://example.com/b.mpd']);
+        expect(issues).toEqual([]);
+    });
+
+    it('configures ClearKey keys before load for supported DRM', async () => {
+        const environment = createFakeShakaEnvironment();
+        const drm: ChannelDrm = {
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { abc: 'def' },
+        };
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/enc.mpd', drm);
+        await flush();
+
+        const player = environment.instances[0];
+        expect(player.configureCalls).toEqual([
+            { drm: { clearKeys: { abc: 'def' } } },
+        ]);
+        expect(player.loadedUrls).toEqual(['http://example.com/enc.mpd']);
+    });
+
+    it('starts without DRM config for clear DASH channels', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/clear.mpd');
+        await flush();
+
+        expect(environment.instances[0].configureCalls).toEqual([]);
+        expect(issues).toEqual([]);
+    });
+
+    it('emits a DRM diagnostic and starts no engine for unsupported license types', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/wv.mpd', {
+            licenseType: 'com.widevine.alpha',
+            supported: false,
+        });
+        await flush();
+
+        expect(environment.loaderCalls).toBe(0);
+        expect(environment.instances).toHaveLength(0);
+        expect(issues).toHaveLength(1);
+        expect(issues[0].code).toBe(PlaybackDiagnosticCode.DrmOrEncryption);
+        expect(issues[0].source).toBe(PlaybackDiagnosticSource.Shaka);
+        expect(issues[0].details).toContain('com.widevine.alpha');
+    });
+
+    it('classifies critical shaka error events and ignores recoverable ones', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/a.mpd');
+        await flush();
+
+        const player = environment.instances[0];
+        player.dispatch('error', { severity: 1, category: 1, code: 1002 });
+        expect(issues).toEqual([]);
+        expect(session.getPlayer()).toBe(player);
+
+        player.dispatch('error', { severity: 2, category: 6, code: 6001 });
+        expect(issues).toHaveLength(1);
+        expect(issues[0].code).toBe(PlaybackDiagnosticCode.DrmOrEncryption);
+        // Without KODIPROP config the DRM hint may still help externally.
+        expect(issues[0].externalFallbackRecommended).toBe(true);
+        // Critical errors end playback: the dead engine must be torn down.
+        expect(player.destroyCount).toBe(1);
+        expect(session.getPlayer()).toBeNull();
+    });
+
+    it('drops the external-fallback hint for every failure on ClearKey channels', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/enc.mpd', {
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { abc: 'def' },
+        });
+        await flush();
+
+        environment.instances[0].dispatch('error', {
+            severity: 2,
+            category: 6,
+            code: 6001,
+        });
+
+        expect(issues).toHaveLength(1);
+        expect(issues[0].code).toBe(PlaybackDiagnosticCode.DrmOrEncryption);
+        // MPV/VLC never receive the KODIPROP license config, so they are not
+        // offered as a fallback for key failures on ClearKey channels.
+        expect(issues[0].externalFallbackRecommended).toBe(false);
+
+        // Non-DRM failures (media/codec/manifest/…) are equally unsolvable
+        // externally while the stream itself stays encrypted.
+        session.start(video, 'http://example.com/enc.mpd', {
+            licenseType: 'clearkey',
+            supported: true,
+            clearKeys: { abc: 'def' },
+        });
+        await flush();
+        environment.instances[1].dispatch('error', {
+            severity: 2,
+            category: 3,
+            code: 3016,
+        });
+
+        expect(issues).toHaveLength(2);
+        expect(issues[1].code).toBe(PlaybackDiagnosticCode.MediaDecodeError);
+        expect(issues[1].externalFallbackRecommended).toBe(false);
+    });
+
+    it('emits a diagnostic and tears the engine down when load rejects', async () => {
+        const loadError = { severity: 2, category: 4, code: 4001 };
+        const environment = createFakeShakaEnvironment({
+            onCreate: (player) => {
+                player.loadResult = Promise.reject(loadError);
+            },
+        });
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/bad.mpd');
+        await flush();
+
+        expect(issues).toHaveLength(1);
+        expect(issues[0].code).toBe(
+            PlaybackDiagnosticCode.UnsupportedContainer
+        );
+        expect(issues[0].sourceUrl).toBe('http://example.com/bad.mpd');
+        // The failed engine must not stay attached or exposed to controls.
+        expect(environment.instances[0].destroyCount).toBe(1);
+        expect(session.getPlayer()).toBeNull();
+    });
+
+    it('recovers from a stalled load: stop() interrupts it and the next start proceeds', async () => {
+        const environment = createFakeShakaEnvironment({
+            onCreate: (player, index) => {
+                if (index === 0) {
+                    player.stallNextLoad = true;
+                }
+            },
+        });
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/stalled.mpd');
+        await flush();
+        expect(environment.instances[0].loadedUrls).toEqual([
+            'http://example.com/stalled.mpd',
+        ]);
+
+        session.stop();
+        session.start(video, 'http://example.com/next.mpd');
+        await flush();
+
+        const [stalled, next] = environment.instances;
+        expect(stalled.destroyCount).toBe(1);
+        expect(next.loadedUrls).toEqual(['http://example.com/next.mpd']);
+        expect(session.getPlayer()).toBe(next);
+        expect(issues).toEqual([]);
+    });
+
+    it('suppresses interrupted loads and stale results after a channel switch', async () => {
+        let releaseFirstLoad: () => void = () => undefined;
+        const environment = createFakeShakaEnvironment({
+            onCreate: (player, index) => {
+                if (index === 0) {
+                    player.loadResult = new Promise<unknown>((resolve) => {
+                        releaseFirstLoad = () => resolve(undefined);
+                    });
+                }
+            },
+        });
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/slow.mpd');
+        await flush();
+        session.start(video, 'http://example.com/fast.mpd');
+        releaseFirstLoad();
+        await flush();
+
+        const [slow, fast] = environment.instances as [
+            FakeShakaPlayer,
+            FakeShakaPlayer,
+        ];
+        expect(slow.destroyCount).toBe(1);
+        expect(fast.loadedUrls).toEqual(['http://example.com/fast.mpd']);
+        // The slow player resolved after being superseded; nothing may have
+        // touched its text tracks afterwards.
+        expect(slow.selectTextTrackCalls).toEqual([]);
+        expect(issues).toEqual([]);
+    });
+
+    it('suppresses auto-selected captions on load and restores them on demand', async () => {
+        const environment = createFakeShakaEnvironment({
+            onCreate: (player) => {
+                player.textTracks = [
+                    {
+                        id: 7,
+                        active: true,
+                        language: 'en',
+                        label: 'English',
+                        kind: 'subtitles',
+                    },
+                ];
+            },
+        });
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        const player = environment.instances[0];
+        // showCaptions() is false: the auto-selected track is hidden…
+        expect(player.selectTextTrackCalls).toEqual([null]);
+        expect(player.textTracks[0].active).toBe(false);
+
+        // …and remembered, so re-enabling the preference restores it.
+        session.restoreSuppressedTextTrack();
+        expect(player.textTracks[0].active).toBe(true);
+
+        // The restore is one-shot.
+        session.restoreSuppressedTextTrack();
+        expect(player.selectTextTrackCalls).toHaveLength(2);
+    });
+
+    it('emits an unsupported-container diagnostic when the browser lacks MSE/EME', async () => {
+        const environment = createFakeShakaEnvironment();
+        environment.browserSupported = false;
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/a.mpd');
+        await flush();
+
+        expect(environment.instances).toHaveLength(0);
+        expect(issues).toHaveLength(1);
+        expect(issues[0].code).toBe(
+            PlaybackDiagnosticCode.UnsupportedContainer
+        );
+    });
+
+    it('destroy tears down the engine and blocks later starts', async () => {
+        const environment = createFakeShakaEnvironment();
+        const session = createSession(environment);
+        session.start(video, 'http://example.com/a.mpd');
+        await flush();
+        session.destroy();
+        await flush();
+        session.start(video, 'http://example.com/b.mpd');
+        await flush();
+
+        expect(environment.instances).toHaveLength(1);
+        expect(environment.instances[0].destroyCount).toBe(1);
+    });
+});
diff --git a/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.ts b/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.ts
new file mode 100644
index 000000000..6a25c597d
--- /dev/null
+++ b/libs/ui/playback/src/lib/shaka-engine/shaka-video-session.ts
@@ -0,0 +1,388 @@
+import type { ChannelDrm } from '@iptvnator/shared/interfaces';
+import type {
+    InlinePlaybackPlayer,
+    PlaybackDiagnostic,
+    PlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.model';
+import { PlaybackDiagnosticCode as DiagnosticCode } from '../playback-diagnostics/playback-diagnostics.model';
+import { PlaybackDiagnosticSource as DiagnosticSource } from '../playback-diagnostics/playback-diagnostics.model';
+import {
+    createPlaybackDiagnostic,
+    createPlaybackSourceMetadata,
+} from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    asShakaError,
+    classifyShakaPlaybackIssue,
+    createUnsupportedDrmDiagnostic,
+    toErrorMessage,
+} from './shaka-error-classifier';
+import { ShakaTextTrackSuppression } from './shaka-text-track-suppression';
+import {
+    loadShakaModule,
+    type ShakaErrorLike,
+    type ShakaModuleLike,
+    type ShakaModuleLoader,
+    type ShakaPlayerLike,
+} from './shaka-module.types';
+
+export interface ShakaVideoSessionConfig {
+    player: InlinePlaybackPlayer;
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void;
+    showCaptions?: () => boolean;
+    loadShaka?: ShakaModuleLoader;
+}
+
+const DASH_MIME_TYPE = 'application/dash+xml';
+/** `shaka.util.Error.Severity.RECOVERABLE` — Shaka retries these itself. */
+const SHAKA_SEVERITY_RECOVERABLE = 1;
+/** `shaka.util.Error.Code.LOAD_INTERRUPTED` — expected when a newer
+ * `load()`/`destroy()` supersedes an in-flight one. */
+const SHAKA_LOAD_INTERRUPTED = 7000;
+
+const PLAYER_REFRESH_EVENTS = [
+    'loaded',
+    'trackschanged',
+    'adaptation',
+    'variantchanged',
+    'textchanged',
+    'texttrackvisibility',
+] as const;
+
+/**
+ * Owns one Shaka Player engine for DASH (`.mpd`) playback, mirroring how
+ * hls.js/mpegts.js engines are owned by their player components.
+ *
+ * - `shaka-player` is loaded lazily on the first start; the module is cached.
+ * - `start()`/`stop()` are synchronous entry points; the async work is
+ *   serialized on an internal chain and guarded by a generation counter, so a
+ *   channel switch during an in-flight load can never resurrect a stale
+ *   engine.
+ * - ClearKey DRM comes from the channel's {@link ChannelDrm}; unsupported
+ *   license types emit a DRM diagnostic instead of starting an engine.
+ */
+export class ShakaVideoSession {
+    private module: ShakaModuleLike | null = null;
+    private player: ShakaPlayerLike | null = null;
+    private playerErrorListener: ((event: Event) => void) | null = null;
+    private playerRefreshListener: (() => void) | null = null;
+    private readonly refreshListeners = new Set<() => void>();
+    private operationChain: Promise<void> = Promise.resolve();
+    private pendingTeardown: Promise<void> = Promise.resolve();
+    private readonly textSuppression = new ShakaTextTrackSuppression();
+    private generation = 0;
+    private destroyed = false;
+
+    constructor(private readonly config: ShakaVideoSessionConfig) {}
+
+    /** Starts DASH playback of `url` on `video`. Synchronous entry point. */
+    start(video: HTMLVideoElement, url: string, drm?: ChannelDrm): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        if (drm && !drm.supported) {
+            this.stop();
+            this.config.emitPlaybackIssue(
+                createUnsupportedDrmDiagnostic(
+                    drm.licenseType,
+                    this.createMetadata(url)
+                )
+            );
+            return;
+        }
+
+        const generation = ++this.generation;
+        this.beginPlayerTeardown();
+        this.enqueue(async () => {
+            await this.pendingTeardown;
+            if (this.isStale(generation)) {
+                return;
+            }
+            await this.startPlayback(generation, video, url, drm);
+        });
+    }
+
+    /** Tears down the current engine (if any) without ending the session. */
+    stop(): void {
+        this.generation += 1;
+        this.beginPlayerTeardown();
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.destroyed = true;
+        this.generation += 1;
+        this.refreshListeners.clear();
+        this.beginPlayerTeardown();
+    }
+
+    /** Current engine, for the shared-controls track bridge. */
+    getPlayer(): ShakaPlayerLike | null {
+        return this.player;
+    }
+
+    /** Registers a callback fired whenever tracks/text state may have changed. */
+    subscribe(listener: () => void): () => void {
+        this.refreshListeners.add(listener);
+        return () => this.refreshListeners.delete(listener);
+    }
+
+    private async startPlayback(
+        generation: number,
+        video: HTMLVideoElement,
+        url: string,
+        drm: ChannelDrm | undefined
+    ): Promise<void> {
+        let module: ShakaModuleLike;
+        try {
+            module = await this.loadModule();
+        } catch (error: unknown) {
+            this.emitIfCurrent(
+                generation,
+                classifyShakaPlaybackIssue(
+                    { message: toErrorMessage(error) },
+                    this.createMetadata(url)
+                )
+            );
+            return;
+        }
+
+        if (this.isStale(generation)) {
+            return;
+        }
+
+        if (!module.Player.isBrowserSupported()) {
+            this.emitIfCurrent(
+                generation,
+                createPlaybackDiagnostic({
+                    code: DiagnosticCode.UnsupportedContainer,
+                    source: DiagnosticSource.Shaka,
+                    metadata: this.createMetadata(url),
+                    details: 'Shaka Player is not supported in this browser',
+                })
+            );
+            return;
+        }
+
+        const player = new module.Player();
+        this.player = player;
+        this.bindPlayerListeners(player, generation, url, drm !== undefined);
+
+        if (drm?.clearKeys) {
+            player.configure({ drm: { clearKeys: drm.clearKeys } });
+        }
+
+        try {
+            await player.attach(video);
+            await player.load(url);
+        } catch (error: unknown) {
+            this.handleLoadFailure(
+                generation,
+                player,
+                url,
+                error,
+                drm !== undefined
+            );
+            return;
+        }
+
+        if (this.isStale(generation)) {
+            return;
+        }
+
+        // Shaka 5 shows a text track by selecting it; keep captions off when
+        // the preference is disabled in case the manifest auto-selected one.
+        if (!(this.config.showCaptions?.() ?? false)) {
+            this.textSuppression.suppress(player);
+        }
+        this.notifyRefresh();
+    }
+
+    /** Hides the active text track, remembering it for a later restore. */
+    suppressTextTracks(): void {
+        const player = this.player;
+        if (player) {
+            this.textSuppression.suppress(player);
+        }
+    }
+
+    /** Reselects the text track hidden by {@link suppressTextTracks}. */
+    restoreSuppressedTextTrack(): void {
+        const player = this.player;
+        if (player) {
+            this.textSuppression.restore(player);
+        }
+    }
+
+    private handleLoadFailure(
+        generation: number,
+        player: ShakaPlayerLike,
+        url: string,
+        error: unknown,
+        drmProvided: boolean
+    ): void {
+        const shakaError = asShakaError(error);
+        if (
+            this.isStale(generation) ||
+            this.player !== player ||
+            shakaError?.code === SHAKA_LOAD_INTERRUPTED
+        ) {
+            return;
+        }
+
+        this.config.emitPlaybackIssue(
+            this.withoutUnusableDrmFallback(
+                classifyShakaPlaybackIssue(
+                    shakaError ?? { message: toErrorMessage(error) },
+                    this.createMetadata(url)
+                ),
+                drmProvided
+            )
+        );
+        // Never leave a non-functional engine attached to the media element
+        // or exposed to the shared-controls bridge.
+        this.beginPlayerTeardown();
+    }
+
+    /**
+     * Channels carrying KODIPROP ClearKey config cannot be handed to MPV/VLC
+     * at all — external players never receive the license config, so the
+     * encrypted stream fails there regardless of what broke inline (DRM,
+     * manifest, codec, network, …). Suppress the fallback hint entirely.
+     */
+    private withoutUnusableDrmFallback(
+        issue: PlaybackDiagnostic,
+        drmProvided: boolean
+    ): PlaybackDiagnostic {
+        if (!drmProvided || !issue.externalFallbackRecommended) {
+            return issue;
+        }
+        return { ...issue, externalFallbackRecommended: false };
+    }
+
+    private bindPlayerListeners(
+        player: ShakaPlayerLike,
+        generation: number,
+        url: string,
+        drmProvided: boolean
+    ): void {
+        const errorListener = (event: Event): void => {
+            if (this.isStale(generation) || this.player !== player) {
+                return;
+            }
+
+            const detail = (event as { detail?: Partial<ShakaErrorLike> })
+                .detail;
+            if (detail?.severity === SHAKA_SEVERITY_RECOVERABLE) {
+                return;
+            }
+
+            this.config.emitPlaybackIssue(
+                this.withoutUnusableDrmFallback(
+                    classifyShakaPlaybackIssue(
+                        detail,
+                        this.createMetadata(url)
+                    ),
+                    drmProvided
+                )
+            );
+            // Critical errors end playback; never leave the dead engine
+            // attached or exposed to the shared-controls bridge.
+            this.beginPlayerTeardown();
+        };
+        const refreshListener = (): void => {
+            if (!this.isStale(generation) && this.player === player) {
+                this.notifyRefresh();
+            }
+        };
+
+        this.playerErrorListener = errorListener;
+        this.playerRefreshListener = refreshListener;
+        player.addEventListener('error', errorListener);
+        for (const event of PLAYER_REFRESH_EVENTS) {
+            player.addEventListener(event, refreshListener);
+        }
+    }
+
+    /**
+     * Detaches and destroys the current engine immediately — never queued
+     * behind pending operations. `player.destroy()` interrupts an in-flight
+     * `load()` (it rejects with `LOAD_INTERRUPTED`), so a stalled manifest
+     * fetch cannot wedge the operation chain. New starts await
+     * {@link pendingTeardown} before attaching to the media element.
+     */
+    private beginPlayerTeardown(): void {
+        const player = this.player;
+        this.player = null;
+        this.textSuppression.reset();
+        if (!player) {
+            this.playerErrorListener = null;
+            this.playerRefreshListener = null;
+            return;
+        }
+
+        if (this.playerErrorListener) {
+            player.removeEventListener('error', this.playerErrorListener);
+        }
+        if (this.playerRefreshListener) {
+            for (const event of PLAYER_REFRESH_EVENTS) {
+                player.removeEventListener(event, this.playerRefreshListener);
+            }
+        }
+        this.playerErrorListener = null;
+        this.playerRefreshListener = null;
+        this.notifyRefresh();
+
+        const teardown = player.destroy().then(
+            () => undefined,
+            () => undefined
+        );
+        this.pendingTeardown = this.pendingTeardown.then(() => teardown);
+    }
+
+    private async loadModule(): Promise<ShakaModuleLike> {
+        if (this.module) {
+            return this.module;
+        }
+
+        const loader = this.config.loadShaka ?? loadShakaModule;
+        const module = await loader();
+        module.polyfill.installAll();
+        this.module = module;
+        return module;
+    }
+
+    private createMetadata(url: string): PlaybackSourceMetadata {
+        return createPlaybackSourceMetadata({
+            url,
+            mimeType: DASH_MIME_TYPE,
+            player: this.config.player,
+        });
+    }
+
+    private enqueue(operation: () => Promise<void>): void {
+        this.operationChain = this.operationChain.then(operation, operation);
+    }
+
+    private isStale(generation: number): boolean {
+        return this.destroyed || generation !== this.generation;
+    }
+
+    private emitIfCurrent(
+        generation: number,
+        issue: PlaybackDiagnostic
+    ): void {
+        if (!this.isStale(generation)) {
+            this.config.emitPlaybackIssue(issue);
+        }
+    }
+
+    private notifyRefresh(): void {
+        for (const listener of [...this.refreshListeners]) {
+            listener();
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.spec.ts
new file mode 100644
index 000000000..b26378419
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.spec.ts
@@ -0,0 +1,373 @@
+import {
+    VjsAudioTracks,
+    logVjsAudioTracks,
+    setupVjsAudioTrackMenu,
+    type VjsAudioTracksConfig,
+} from './vjs-audio-tracks';
+import type {
+    VideoJsAudioTrack,
+    VideoJsAudioTrackList,
+    VideoJsPlayer,
+} from './vjs-player.types';
+
+type AudioTrackPlayer = Pick<
+    VideoJsPlayer,
+    'audioTracks' | 'getChild' | 'tech'
+>;
+
+type TestAudioTrackList = VideoJsAudioTrackList & {
+    emit: (type: string) => void;
+};
+
+function createTrackList(tracks: VideoJsAudioTrack[]): TestAudioTrackList {
+    const listeners = new Map<
+        string,
+        Set<EventListenerOrEventListenerObject>
+    >();
+    const list = {
+        length: tracks.length,
+        addEventListener: jest.fn(
+            (type: string, listener: EventListenerOrEventListenerObject) => {
+                const eventListeners = listeners.get(type) ?? new Set();
+                eventListeners.add(listener);
+                listeners.set(type, eventListeners);
+            }
+        ),
+        removeEventListener: jest.fn(
+            (type: string, listener: EventListenerOrEventListenerObject) => {
+                listeners.get(type)?.delete(listener);
+            }
+        ),
+        emit: (type: string) => {
+            const event = { type } as Event;
+            for (const listener of listeners.get(type) ?? []) {
+                if (typeof listener === 'function') {
+                    listener(event);
+                } else {
+                    listener.handleEvent(event);
+                }
+            }
+        },
+    } as TestAudioTrackList;
+    tracks.forEach((track, index) => {
+        list[index] = track;
+    });
+    return list;
+}
+
+function createPlayer(
+    audioTracks: () => VideoJsAudioTrackList | null,
+    overrides: Partial<AudioTrackPlayer> = {}
+): AudioTrackPlayer {
+    return {
+        audioTracks,
+        getChild: jest.fn(() => null),
+        tech: jest.fn(() => null),
+        ...overrides,
+    };
+}
+
+function createAudioTracks(
+    player: AudioTrackPlayer,
+    refresh = jest.fn()
+): VjsAudioTracks {
+    const config: VjsAudioTracksConfig = { player, refresh };
+    return new VjsAudioTracks(config);
+}
+
+describe('VjsAudioTracks', () => {
+    it('projects labels and keeps track IDs stable when the list order changes', () => {
+        const english: VideoJsAudioTrack = {
+            label: 'English',
+            enabled: true,
+        };
+        const german: VideoJsAudioTrack = {
+            language: 'de',
+            enabled: false,
+        };
+        const unnamed: VideoJsAudioTrack = { enabled: false };
+        const list = createTrackList([english, german, unnamed]);
+        const audioTracks = createAudioTracks(createPlayer(() => list));
+
+        audioTracks.bind();
+
+        expect(audioTracks.getAudioTracks()).toEqual([
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Audio 3', selected: false },
+        ]);
+
+        list[0] = german;
+        list[1] = english;
+
+        expect(audioTracks.getAudioTracks()).toEqual([
+            { id: 1, label: 'de', selected: false },
+            { id: 0, label: 'English', selected: true },
+            { id: 2, label: 'Audio 3', selected: false },
+        ]);
+    });
+
+    it('selects exactly one valid projected track', () => {
+        const first: VideoJsAudioTrack = { enabled: true };
+        const second: VideoJsAudioTrack = { enabled: false };
+        const third: VideoJsAudioTrack = { enabled: false };
+        const list = createTrackList([first, second, third]);
+        const audioTracks = createAudioTracks(createPlayer(() => list));
+        audioTracks.bind();
+        const secondId = audioTracks.getAudioTracks()[1].id;
+
+        audioTracks.setAudioTrack(secondId);
+
+        expect([first.enabled, second.enabled, third.enabled]).toEqual([
+            false,
+            true,
+            false,
+        ]);
+    });
+
+    it('keeps selection unchanged for invalid and stale track IDs', () => {
+        const first: VideoJsAudioTrack = { enabled: true };
+        const removed: VideoJsAudioTrack = { enabled: false };
+        const list = createTrackList([first, removed]);
+        const audioTracks = createAudioTracks(createPlayer(() => list));
+        audioTracks.bind();
+        const staleId = audioTracks.getAudioTracks()[1].id;
+
+        list.length = 1;
+        delete list[1];
+
+        audioTracks.setAudioTrack(staleId);
+        audioTracks.setAudioTrack(99);
+        audioTracks.setAudioTrack(0.5);
+
+        expect(first.enabled).toBe(true);
+    });
+
+    it('binds stable add, remove, change, and label callbacks once per list', () => {
+        const list = createTrackList([
+            { label: 'English', enabled: true },
+            { label: 'German', enabled: false },
+        ]);
+        const refresh = jest.fn();
+        const audioTracks = createAudioTracks(
+            createPlayer(() => list),
+            refresh
+        );
+
+        audioTracks.bind();
+        audioTracks.bind();
+
+        expect(list.addEventListener).toHaveBeenCalledTimes(4);
+        expect(
+            (list.addEventListener as jest.Mock).mock.calls.map(
+                ([type]) => type
+            )
+        ).toEqual(['addtrack', 'removetrack', 'change', 'labelchange']);
+
+        list.emit('addtrack');
+        list.emit('removetrack');
+        list.emit('change');
+        list.emit('labelchange');
+
+        expect(refresh).toHaveBeenCalledTimes(4);
+    });
+
+    it('rebinds by list identity and removes the exact callbacks', () => {
+        const firstList = createTrackList([{ enabled: true }]);
+        const secondList = createTrackList([{ enabled: true }]);
+        let currentList: VideoJsAudioTrackList | null = firstList;
+        const audioTracks = createAudioTracks(createPlayer(() => currentList));
+
+        audioTracks.bind();
+        const firstListeners = new Map(
+            (firstList.addEventListener as jest.Mock).mock.calls.map(
+                ([type, listener]) => [type, listener]
+            )
+        );
+
+        currentList = secondList;
+        audioTracks.bind();
+
+        expect(firstList.removeEventListener).toHaveBeenCalledTimes(4);
+        for (const [type, listener] of firstListeners) {
+            expect(firstList.removeEventListener).toHaveBeenCalledWith(
+                type,
+                listener
+            );
+        }
+        expect(secondList.addEventListener).toHaveBeenCalledTimes(4);
+
+        const secondListeners = new Map(
+            (secondList.addEventListener as jest.Mock).mock.calls.map(
+                ([type, listener]) => [type, listener]
+            )
+        );
+        audioTracks.clear();
+        audioTracks.clear();
+
+        expect(secondList.removeEventListener).toHaveBeenCalledTimes(4);
+        for (const [type, listener] of secondListeners) {
+            expect(secondList.removeEventListener).toHaveBeenCalledWith(
+                type,
+                listener
+            );
+        }
+    });
+
+    it('resets the per-source ID allocation without replacing the list', () => {
+        const list = createTrackList([{ label: 'Old A' }, { label: 'Old B' }]);
+        const audioTracks = createAudioTracks(createPlayer(() => list));
+        audioTracks.bind();
+        expect(audioTracks.getAudioTracks().map(({ id }) => id)).toEqual([
+            0, 1,
+        ]);
+
+        list[0] = { label: 'New A' };
+        list[1] = { label: 'New B' };
+        audioTracks.resetSource();
+
+        expect(audioTracks.getAudioTracks()).toEqual([
+            { id: 0, label: 'New A', selected: false },
+            { id: 1, label: 'New B', selected: false },
+        ]);
+    });
+
+    it('keeps the legacy menu refreshed when tracks are added or removed', () => {
+        const list = createTrackList([
+            { label: 'English', enabled: true },
+            { label: 'German', enabled: false },
+        ]);
+        const audioButton = { show: jest.fn(), update: jest.fn() };
+        const controlBar = {
+            getChild: jest.fn(() => audioButton),
+            addChild: jest.fn(),
+        };
+        const player = createPlayer(() => list, {
+            getChild: jest.fn(() => controlBar),
+        });
+        const audioTracks = createAudioTracks(player);
+        audioTracks.bind();
+
+        list.emit('addtrack');
+        list.emit('removetrack');
+
+        expect(audioButton.show).toHaveBeenCalledTimes(2);
+        expect(audioButton.update).toHaveBeenCalledTimes(2);
+    });
+});
+
+describe('legacy Video.js audio-track helpers', () => {
+    it('skips the menu when fewer than two tracks are available', () => {
+        const getChild = jest.fn();
+
+        setupVjsAudioTrackMenu(
+            createPlayer(() => createTrackList([{ enabled: true }]), {
+                getChild,
+            })
+        );
+        setupVjsAudioTrackMenu(
+            createPlayer(() => null, {
+                getChild,
+            })
+        );
+
+        expect(getChild).not.toHaveBeenCalled();
+    });
+
+    it('reuses either supported audio button name', () => {
+        const lowerButton = { show: jest.fn(), update: jest.fn() };
+        const lowerControlBar = {
+            getChild: jest.fn((name: string) =>
+                name === 'audioTrackButton' ? lowerButton : null
+            ),
+            addChild: jest.fn(),
+        };
+        setupVjsAudioTrackMenu(
+            createPlayer(
+                () => createTrackList([{ enabled: true }, { enabled: false }]),
+                { getChild: jest.fn(() => lowerControlBar) }
+            )
+        );
+
+        const capitalButton = { show: jest.fn(), update: jest.fn() };
+        const capitalControlBar = {
+            getChild: jest.fn((name: string) =>
+                name === 'AudioTrackButton' ? capitalButton : null
+            ),
+            addChild: jest.fn(),
+        };
+        setupVjsAudioTrackMenu(
+            createPlayer(
+                () => createTrackList([{ enabled: true }, { enabled: false }]),
+                { getChild: jest.fn(() => capitalControlBar) }
+            )
+        );
+
+        expect(lowerControlBar.addChild).not.toHaveBeenCalled();
+        expect(lowerButton.show).toHaveBeenCalledTimes(1);
+        expect(lowerButton.update).toHaveBeenCalledTimes(1);
+        expect(capitalControlBar.addChild).not.toHaveBeenCalled();
+        expect(capitalButton.show).toHaveBeenCalledTimes(1);
+        expect(capitalButton.update).toHaveBeenCalledTimes(1);
+    });
+
+    it('adds the legacy audio button when the control bar lacks one', () => {
+        const audioButton = { show: jest.fn(), update: jest.fn() };
+        const controlBar = {
+            getChild: jest.fn(() => null),
+            addChild: jest.fn(() => audioButton),
+        };
+        setupVjsAudioTrackMenu(
+            createPlayer(
+                () => createTrackList([{ enabled: true }, { enabled: false }]),
+                { getChild: jest.fn(() => controlBar) }
+            )
+        );
+
+        expect(controlBar.addChild).toHaveBeenCalledWith(
+            'audioTrackButton',
+            {}
+        );
+        expect(audioButton.show).toHaveBeenCalledTimes(1);
+        expect(audioButton.update).toHaveBeenCalledTimes(1);
+    });
+
+    it('logs tracks and reads main or legacy master HLS audio groups', () => {
+        const list = createTrackList([
+            {
+                label: 'English',
+                language: 'en',
+                enabled: true,
+                kind: 'main',
+            },
+        ]);
+        const mainTech = jest.fn(() => ({
+            vhs: {
+                playlists: {
+                    main: { mediaGroups: { AUDIO: { english: {} } } },
+                },
+            },
+        }));
+        const masterTech = jest.fn(() => ({
+            vhs: {
+                playlists: {
+                    master: { mediaGroups: { AUDIO: { german: {} } } },
+                },
+            },
+        }));
+
+        expect(() =>
+            logVjsAudioTracks(createPlayer(() => list, { tech: mainTech }))
+        ).not.toThrow();
+        expect(() =>
+            logVjsAudioTracks(createPlayer(() => list, { tech: masterTech }))
+        ).not.toThrow();
+
+        expect(mainTech).toHaveBeenCalledWith({
+            IWillNotUseThisInPlugins: true,
+        });
+        expect(masterTech).toHaveBeenCalledWith({
+            IWillNotUseThisInPlugins: true,
+        });
+    });
+});
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.ts b/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.ts
new file mode 100644
index 000000000..94489761e
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-audio-tracks.ts
@@ -0,0 +1,247 @@
+import { createDevLogger } from '@iptvnator/shared/interfaces';
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+import type {
+    VideoJsAudioTrack,
+    VideoJsAudioTrackList,
+    VideoJsPlayer,
+} from './vjs-player.types';
+
+const AUDIO_TRACK_LISTENERS = {
+    addtrack: 'addtrack',
+    removetrack: 'removetrack',
+    change: 'change',
+    labelchange: 'labelchange',
+} as const;
+
+const debugVjsAudio = createDevLogger('VjsPlayer');
+
+export type VjsAudioTrackPlayer = Pick<
+    VideoJsPlayer,
+    'audioTracks' | 'getChild' | 'tech'
+>;
+
+export interface VjsAudioTracksConfig {
+    player: VjsAudioTrackPlayer;
+    refresh: () => void;
+}
+
+export function logVjsAudioTracks(player: VjsAudioTrackPlayer): void {
+    const audioTracks = player.audioTracks();
+    debugVjsAudio('[AudioTrack] Audio tracks count:', audioTracks?.length ?? 0);
+    if (!audioTracks) {
+        return;
+    }
+
+    for (let index = 0; index < audioTracks.length; index += 1) {
+        const track = audioTracks[index];
+        debugVjsAudio(
+            `[AudioTrack] Track ${index}: label="${track.label}", language="${track.language}", enabled=${track.enabled}, kind="${track.kind}"`
+        );
+    }
+
+    const tech =
+        typeof player.tech === 'function'
+            ? player.tech({ IWillNotUseThisInPlugins: true })
+            : null;
+    const audioMediaGroups =
+        tech?.vhs?.playlists?.main?.mediaGroups?.AUDIO ??
+        tech?.vhs?.playlists?.master?.mediaGroups?.AUDIO;
+
+    if (audioMediaGroups) {
+        debugVjsAudio(
+            '[AudioTrack] HLS AUDIO media groups:',
+            JSON.stringify(Object.keys(audioMediaGroups))
+        );
+    } else {
+        debugVjsAudio(
+            '[AudioTrack] HLS AUDIO media groups: none found in playlist metadata'
+        );
+    }
+}
+
+export function setupVjsAudioTrackMenu(player: VjsAudioTrackPlayer): void {
+    const audioTracks = player.audioTracks();
+    debugVjsAudio(
+        '[AudioTrack] setupAudioTrackMenu called, tracks:',
+        audioTracks?.length ?? 0
+    );
+    if (!audioTracks || audioTracks.length <= 1) {
+        debugVjsAudio(
+            '[AudioTrack] Skipping menu: need >1 tracks, have',
+            audioTracks?.length ?? 0
+        );
+        debugVjsAudio(
+            '[AudioTrack] If VLC/MPV show more tracks, the HLS manifest likely does not expose alternate audio via EXT-X-MEDIA'
+        );
+        return;
+    }
+
+    const controlBar = player.getChild('controlBar');
+    if (!controlBar) {
+        return;
+    }
+
+    let audioButton =
+        controlBar.getChild?.('audioTrackButton') ??
+        controlBar.getChild?.('AudioTrackButton');
+    if (!audioButton && controlBar.addChild) {
+        audioButton = controlBar.addChild('audioTrackButton', {});
+    }
+
+    if (audioButton) {
+        audioButton.show?.();
+        audioButton.update?.();
+    }
+}
+
+export class VjsAudioTracks {
+    private trackList: VideoJsAudioTrackList | null = null;
+    private trackIds = new WeakMap<VideoJsAudioTrack, number>();
+    private nextTrackId = 0;
+    private readonly handleAddTrack: EventListener = () => {
+        debugVjsAudio(
+            '[AudioTrack] addtrack event fired, total tracks:',
+            this.trackList?.length ?? 0
+        );
+        logVjsAudioTracks(this.config.player);
+        setupVjsAudioTrackMenu(this.config.player);
+        this.config.refresh();
+    };
+    private readonly handleRemoveTrack: EventListener = () => {
+        debugVjsAudio(
+            '[AudioTrack] removetrack event fired, total tracks:',
+            this.trackList?.length ?? 0
+        );
+        logVjsAudioTracks(this.config.player);
+        setupVjsAudioTrackMenu(this.config.player);
+        this.config.refresh();
+    };
+    private readonly handleChange: EventListener = () => {
+        logVjsAudioTracks(this.config.player);
+        this.config.refresh();
+    };
+    private readonly handleLabelChange: EventListener = () => {
+        logVjsAudioTracks(this.config.player);
+        this.config.refresh();
+    };
+
+    constructor(private readonly config: VjsAudioTracksConfig) {}
+
+    bind(): void {
+        const trackList = this.config.player.audioTracks();
+        if (trackList === this.trackList) {
+            return;
+        }
+
+        this.detachTrackList();
+        this.trackList = trackList;
+        if (typeof trackList?.addEventListener !== 'function') {
+            return;
+        }
+
+        trackList.addEventListener(
+            AUDIO_TRACK_LISTENERS.addtrack,
+            this.handleAddTrack
+        );
+        trackList.addEventListener(
+            AUDIO_TRACK_LISTENERS.removetrack,
+            this.handleRemoveTrack
+        );
+        trackList.addEventListener(
+            AUDIO_TRACK_LISTENERS.change,
+            this.handleChange
+        );
+        trackList.addEventListener(
+            AUDIO_TRACK_LISTENERS.labelchange,
+            this.handleLabelChange
+        );
+    }
+
+    clear(): void {
+        this.detachTrackList();
+        this.trackList = null;
+        this.resetSource();
+    }
+
+    resetSource(): void {
+        this.trackIds = new WeakMap<VideoJsAudioTrack, number>();
+        this.nextTrackId = 0;
+    }
+
+    getAudioTracks(): PlayerTrack[] {
+        const tracks = this.trackList;
+        if (!tracks) {
+            return [];
+        }
+
+        const result: PlayerTrack[] = [];
+        for (let index = 0; index < tracks.length; index += 1) {
+            const track = tracks[index];
+            if (!track) {
+                continue;
+            }
+            let id = this.trackIds.get(track);
+            if (id === undefined) {
+                id = this.nextTrackId;
+                this.nextTrackId += 1;
+                this.trackIds.set(track, id);
+            }
+            result.push({
+                id,
+                label: track.label || track.language || `Audio ${id + 1}`,
+                selected: track.enabled === true,
+            });
+        }
+        return result;
+    }
+
+    setAudioTrack(id: number): void {
+        if (!Number.isInteger(id) || !this.trackList) {
+            return;
+        }
+
+        const tracks = this.trackList;
+        let selectedTrack: VideoJsAudioTrack | null = null;
+        for (let index = 0; index < tracks.length; index += 1) {
+            const track = tracks[index];
+            if (track && this.trackIds.get(track) === id) {
+                selectedTrack = track;
+                break;
+            }
+        }
+        if (!selectedTrack) {
+            return;
+        }
+
+        for (let index = 0; index < tracks.length; index += 1) {
+            const track = tracks[index];
+            if (track) {
+                track.enabled = track === selectedTrack;
+            }
+        }
+    }
+
+    private detachTrackList(): void {
+        const trackList = this.trackList;
+        if (typeof trackList?.removeEventListener !== 'function') {
+            return;
+        }
+
+        trackList.removeEventListener(
+            AUDIO_TRACK_LISTENERS.addtrack,
+            this.handleAddTrack
+        );
+        trackList.removeEventListener(
+            AUDIO_TRACK_LISTENERS.removetrack,
+            this.handleRemoveTrack
+        );
+        trackList.removeEventListener(
+            AUDIO_TRACK_LISTENERS.change,
+            this.handleChange
+        );
+        trackList.removeEventListener(
+            AUDIO_TRACK_LISTENERS.labelchange,
+            this.handleLabelChange
+        );
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-legacy-tracks.ts b/libs/ui/playback/src/lib/vjs-player/vjs-legacy-tracks.ts
new file mode 100644
index 000000000..cb6a7cd0c
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-legacy-tracks.ts
@@ -0,0 +1,66 @@
+import { VjsAudioTracks } from './vjs-audio-tracks';
+import type { VideoJsPlayer } from './vjs-player.types';
+import { VjsTextTracks } from './vjs-text-tracks';
+
+export interface VjsLegacyTracksConfig {
+    player: VideoJsPlayer;
+    showCaptions: () => boolean;
+}
+
+/**
+ * Audio and text track ownership for the legacy Video.js chrome.
+ *
+ * Shared controls route the same helpers through `VjsPlayerControlsBridge`;
+ * without them nothing applied the `showCaptions` preference to the player's
+ * text tracks, so provider defaults stayed on screen (#1155).
+ *
+ * Here the preference is a per-source default rather than an authoritative
+ * state: Video.js still renders its own captions menu, so enforcing the
+ * preference for the whole session would make that menu inert. The preference
+ * is applied while the source starts up and released once playback begins.
+ * There is no controls UI to notify, hence the no-op refresh.
+ */
+export class VjsLegacyTracks {
+    private readonly audioTracks: VjsAudioTracks;
+    private readonly textTracks: VjsTextTracks;
+    private readonly handlePlaying = () => {
+        this.playbackStarted = true;
+    };
+    private playbackStarted = false;
+
+    constructor(private readonly config: VjsLegacyTracksConfig) {
+        const refresh = () => undefined;
+        this.audioTracks = new VjsAudioTracks({
+            player: config.player,
+            refresh,
+        });
+        this.textTracks = new VjsTextTracks({
+            player: config.player,
+            showCaptions: config.showCaptions,
+            refresh,
+            playbackStarted: () => this.playbackStarted,
+        });
+        config.player.on('playing', this.handlePlaying);
+    }
+
+    bind(): void {
+        this.audioTracks.bind();
+        this.textTracks.bind();
+    }
+
+    refreshInputs(): void {
+        this.textTracks.refreshInputs();
+    }
+
+    clear(): void {
+        // Every source starts unsettled so its own defaults are seeded again.
+        this.playbackStarted = false;
+        this.audioTracks.clear();
+        this.textTracks.clear();
+    }
+
+    destroy(): void {
+        this.clear();
+        this.config.player.off('playing', this.handlePlaying);
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.spec.ts
new file mode 100644
index 000000000..d472e0e80
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.spec.ts
@@ -0,0 +1,251 @@
+const createPlayerMock = jest.fn();
+const isSupportedMock = jest.fn(() => true);
+let VjsMpegTsSession: typeof import('./vjs-mpegts-session').VjsMpegTsSession;
+
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: createPlayerMock,
+        isSupported: isSupportedMock,
+    },
+}));
+
+describe('VjsMpegTsSession', () => {
+    beforeAll(async () => {
+        ({ VjsMpegTsSession } = await import('./vjs-mpegts-session'));
+    });
+
+    beforeEach(() => {
+        createPlayerMock.mockReset();
+        isSupportedMock.mockReset().mockReturnValue(true);
+    });
+
+    it('recognizes raw MPEG-TS sources without stealing declared HLS URLs', () => {
+        const session = createSession().session;
+
+        expect(
+            session.isSupportedSource(
+                'https://example.test/play?extension=m3u8&token=x'
+            )
+        ).toBe(false);
+        expect(
+            session.isSupportedSource(
+                'https://example.test/live.php?extension=ts'
+            )
+        ).toBe(true);
+        expect(
+            session.isSupportedSource(
+                'https://example.test/live.php?stream=123'
+            )
+        ).toBe(true);
+
+        isSupportedMock.mockReturnValue(false);
+        expect(
+            session.isSupportedSource('https://example.test/live/stream.ts')
+        ).toBe(false);
+        expect(session.isSupportedSource()).toBe(false);
+    });
+
+    it('attaches VOD playback to the explicit current Tech video', () => {
+        const mpegTsPlayer = createMpegTsPlayer();
+        createPlayerMock.mockReturnValue(mpegTsPlayer);
+        const video = document.createElement('video');
+        const { session } = createSession({ isLive: false });
+
+        session.start('https://example.test/archive/movie.ts', video);
+
+        expect(createPlayerMock).toHaveBeenCalledWith({
+            type: 'mpegts',
+            isLive: false,
+            url: 'https://example.test/archive/movie.ts',
+        });
+        expect(mpegTsPlayer.attachMediaElement).toHaveBeenCalledWith(video);
+        expect(mpegTsPlayer.load).toHaveBeenCalledTimes(1);
+        expect(mpegTsPlayer.play).toHaveBeenCalledTimes(1);
+    });
+
+    it('handles an asynchronous autoplay rejection', () => {
+        const catchRejection = jest.fn();
+        const mpegTsPlayer = createMpegTsPlayer();
+        mpegTsPlayer.play.mockReturnValue({
+            catch: catchRejection,
+        } as unknown as Promise<void>);
+        createPlayerMock.mockReturnValue(mpegTsPlayer);
+        const video = document.createElement('video');
+        const { session } = createSession();
+
+        session.start('https://example.test/live/stream.ts', video);
+
+        expect(catchRejection).toHaveBeenCalledWith(expect.any(Function));
+        expect(
+            catchRejection.mock.calls[0][0](new Error('autoplay blocked'))
+        ).toBeUndefined();
+    });
+
+    it('normalizes VOD duration from seekable and then buffered ranges', async () => {
+        const mpegTsPlayer = createMpegTsPlayer();
+        createPlayerMock.mockReturnValue(mpegTsPlayer);
+        const video = document.createElement('video');
+        Object.defineProperty(video, 'seekable', {
+            configurable: true,
+            value: createTimeRanges([[0, 164.072]]),
+        });
+        Object.defineProperty(video, 'buffered', {
+            configurable: true,
+            value: createTimeRanges([[0, 200]]),
+        });
+        const { session, duration } = createSession({ isLive: false });
+
+        session.start('https://example.test/archive/movie.ts', video);
+        video.dispatchEvent(new Event('progress'));
+        await Promise.resolve();
+
+        expect(duration).toHaveBeenCalledWith(164.072);
+
+        Object.defineProperty(video, 'seekable', {
+            configurable: true,
+            value: createTimeRanges([]),
+        });
+        video.dispatchEvent(new Event('durationchange'));
+
+        expect(duration).toHaveBeenCalledWith(200);
+    });
+
+    it('classifies engine errors with Video.js source metadata', () => {
+        const mpegTsPlayer = createMpegTsPlayer();
+        createPlayerMock.mockReturnValue(mpegTsPlayer);
+        const video = document.createElement('video');
+        const { session, emitPlaybackIssue } = createSession();
+
+        session.start('https://example.test/live/stream.ts', video);
+        mpegTsPlayer.emit(
+            'error',
+            'NetworkError',
+            'FetchError',
+            new Error('CORS blocked')
+        );
+
+        expect(emitPlaybackIssue).toHaveBeenCalledWith(
+            expect.objectContaining({
+                code: 'browser-access-error',
+                source: 'mpegts',
+                sourceUrl: 'https://example.test/live/stream.ts',
+                player: 'videojs',
+            })
+        );
+    });
+
+    it('replaces an active session and removes listeners from the old video', () => {
+        const firstPlayer = createMpegTsPlayer();
+        const secondPlayer = createMpegTsPlayer();
+        createPlayerMock
+            .mockReturnValueOnce(firstPlayer)
+            .mockReturnValueOnce(secondPlayer);
+        const firstVideo = document.createElement('video');
+        const secondVideo = document.createElement('video');
+        const removeEventListener = jest.spyOn(
+            firstVideo,
+            'removeEventListener'
+        );
+        const { session } = createSession({ isLive: false });
+
+        session.start('https://example.test/archive/one.ts', firstVideo);
+        session.start('https://example.test/archive/two.ts', secondVideo);
+
+        expect(removeEventListener).toHaveBeenCalledTimes(5);
+        expect(firstPlayer.off).toHaveBeenCalledWith(
+            'error',
+            expect.any(Function)
+        );
+        expect(firstPlayer.pause).toHaveBeenCalledTimes(1);
+        expect(firstPlayer.unload).toHaveBeenCalledTimes(1);
+        expect(firstPlayer.detachMediaElement).toHaveBeenCalledTimes(1);
+        expect(firstPlayer.destroy).toHaveBeenCalledTimes(1);
+        expect(secondPlayer.attachMediaElement).toHaveBeenCalledWith(
+            secondVideo
+        );
+    });
+
+    it('destroys idempotently and ignores events after teardown', () => {
+        const mpegTsPlayer = createMpegTsPlayer();
+        createPlayerMock.mockReturnValue(mpegTsPlayer);
+        const video = document.createElement('video');
+        const { session, duration, emitPlaybackIssue } = createSession({
+            isLive: false,
+        });
+
+        session.start('https://example.test/archive/movie.ts', video);
+        duration.mockClear();
+        session.destroy();
+        session.destroy();
+        video.dispatchEvent(new Event('progress'));
+        mpegTsPlayer.emit(
+            'error',
+            'NetworkError',
+            'FetchError',
+            new Error('failed')
+        );
+
+        expect(duration).not.toHaveBeenCalled();
+        expect(emitPlaybackIssue).not.toHaveBeenCalled();
+        expect(mpegTsPlayer.pause).toHaveBeenCalledTimes(1);
+        expect(mpegTsPlayer.unload).toHaveBeenCalledTimes(1);
+        expect(mpegTsPlayer.detachMediaElement).toHaveBeenCalledTimes(1);
+        expect(mpegTsPlayer.destroy).toHaveBeenCalledTimes(1);
+    });
+});
+
+function createSession(options: { isLive?: boolean } = {}) {
+    let currentDuration = Number.POSITIVE_INFINITY;
+    const duration = jest.fn((value?: number) => {
+        if (value !== undefined) {
+            currentDuration = value;
+        }
+        return currentDuration;
+    });
+    const emitPlaybackIssue = jest.fn();
+    const session = new VjsMpegTsSession({
+        player: () => ({ duration }),
+        isLive: () => options.isLive ?? true,
+        emitPlaybackIssue,
+    });
+
+    return { duration, emitPlaybackIssue, session };
+}
+
+function createMpegTsPlayer() {
+    const listeners = new Map<string, Set<(...args: unknown[]) => void>>();
+    return {
+        attachMediaElement: jest.fn(),
+        load: jest.fn(),
+        play: jest.fn(),
+        pause: jest.fn(),
+        unload: jest.fn(),
+        detachMediaElement: jest.fn(),
+        destroy: jest.fn(),
+        on: jest.fn((event: string, listener: (...args: unknown[]) => void) => {
+            const eventListeners =
+                listeners.get(event) ?? new Set<(...args: unknown[]) => void>();
+            eventListeners.add(listener);
+            listeners.set(event, eventListeners);
+        }),
+        off: jest.fn(
+            (event: string, listener: (...args: unknown[]) => void) => {
+                listeners.get(event)?.delete(listener);
+            }
+        ),
+        emit: (event: string, ...args: unknown[]) => {
+            for (const listener of listeners.get(event) ?? []) {
+                listener(...args);
+            }
+        },
+    };
+}
+
+function createTimeRanges(ranges: Array<[number, number]>): TimeRanges {
+    return {
+        length: ranges.length,
+        start: (index: number) => ranges[index][0],
+        end: (index: number) => ranges[index][1],
+    } as TimeRanges;
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.ts b/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.ts
new file mode 100644
index 000000000..6ee7e4fc0
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-mpegts-session.ts
@@ -0,0 +1,166 @@
+import mpegts from 'mpegts.js';
+import {
+    InlinePlaybackPlayer,
+    type PlaybackDiagnostic,
+    classifyMpegTsPlaybackIssue,
+    createPlaybackSourceMetadata,
+    getPlaybackMediaExtensionFromUrl,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+interface VjsDurationPlayer {
+    duration(value?: number): unknown;
+}
+
+export interface VjsMpegTsSessionConfig {
+    player: () => VjsDurationPlayer;
+    isLive: () => boolean;
+    emitPlaybackIssue: (issue: PlaybackDiagnostic) => void;
+}
+
+const VOD_DURATION_EVENTS = [
+    'durationchange',
+    'loadedmetadata',
+    'progress',
+    'timeupdate',
+    'error',
+] as const;
+
+export class VjsMpegTsSession {
+    private engine: mpegts.Player | null = null;
+    private video: HTMLVideoElement | null = null;
+    private errorListener: ((...args: unknown[]) => void) | null = null;
+
+    constructor(private readonly config: VjsMpegTsSessionConfig) {}
+
+    isSupportedSource(url?: string): boolean {
+        if (!url) {
+            return false;
+        }
+
+        const extension = getPlaybackMediaExtensionFromUrl(url);
+        return (extension === 'ts' || !extension) && mpegts.isSupported();
+    }
+
+    start(url: string, video: HTMLVideoElement): void {
+        this.destroy();
+        const isLive = this.config.isLive();
+        const engine = mpegts.createPlayer({
+            type: 'mpegts',
+            isLive,
+            url,
+        });
+        this.engine = engine;
+        this.video = video;
+        this.errorListener = (
+            type: unknown,
+            details: unknown,
+            info: unknown
+        ) => {
+            this.syncDuration();
+            this.config.emitPlaybackIssue(
+                classifyMpegTsPlaybackIssue(
+                    {
+                        type: typeof type === 'string' ? type : undefined,
+                        details:
+                            typeof details === 'string' ? details : undefined,
+                        info,
+                    },
+                    createPlaybackSourceMetadata({
+                        url,
+                        mimeType: 'video/mp2t',
+                        player: InlinePlaybackPlayer.VideoJs,
+                    })
+                )
+            );
+        };
+
+        engine.attachMediaElement(video);
+        if (!isLive) {
+            this.bindDurationEvents(video);
+        }
+        engine.on(mpegts.Events.ERROR, this.errorListener);
+        engine.load();
+        const playResult = engine.play();
+        if (playResult) {
+            void playResult.catch(() => undefined);
+        }
+    }
+
+    syncDuration(): void {
+        if (this.config.isLive() || !this.video) {
+            return;
+        }
+
+        const duration =
+            this.readLastFinitePositiveEnd(this.video.seekable) ??
+            this.readLastFinitePositiveEnd(this.video.buffered);
+        if (!duration) {
+            return;
+        }
+
+        const player = this.config.player();
+        if (player.duration() !== duration) {
+            player.duration(duration);
+        }
+    }
+
+    destroy(): void {
+        const video = this.video;
+        if (video) {
+            for (const eventName of VOD_DURATION_EVENTS) {
+                video.removeEventListener(eventName, this.scheduleDurationSync);
+            }
+        }
+        this.video = null;
+
+        const engine = this.engine;
+        if (!engine) {
+            this.errorListener = null;
+            return;
+        }
+
+        if (this.errorListener) {
+            engine.off(mpegts.Events.ERROR, this.errorListener);
+        }
+        this.errorListener = null;
+        engine.pause();
+        engine.unload();
+        engine.detachMediaElement();
+        engine.destroy();
+        this.engine = null;
+    }
+
+    private readonly scheduleDurationSync = () => {
+        this.syncDuration();
+        this.queueMicrotask(() => this.syncDuration());
+    };
+
+    private bindDurationEvents(video: HTMLVideoElement): void {
+        for (const eventName of VOD_DURATION_EVENTS) {
+            video.addEventListener(eventName, this.scheduleDurationSync);
+        }
+        this.syncDuration();
+    }
+
+    private readLastFinitePositiveEnd(ranges: TimeRanges): number | null {
+        for (let index = ranges.length - 1; index >= 0; index -= 1) {
+            try {
+                const end = ranges.end(index);
+                if (Number.isFinite(end) && end > 0) {
+                    return end;
+                }
+            } catch {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    private queueMicrotask(callback: () => void): void {
+        if (typeof queueMicrotask === 'function') {
+            queueMicrotask(callback);
+            return;
+        }
+        void Promise.resolve().then(callback);
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.spec.ts
new file mode 100644
index 000000000..023723bfd
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.spec.ts
@@ -0,0 +1,194 @@
+import type { WebVideoControlsOptions } from '../player-controls/web-video-controls.adapter';
+import type {
+    VideoJsAudioTrack,
+    VideoJsAudioTrackList,
+    VideoJsPlayer,
+    VideoJsTextTrack,
+    VideoJsTextTrackList,
+} from './vjs-player.types';
+import { VjsPlayerControlsBridge } from './vjs-player-controls.bridge';
+
+describe('VjsPlayerControlsBridge', () => {
+    it('attaches the current Tech video with live, duration, and track accessors', () => {
+        const audioTracks = createTrackList<VideoJsAudioTrack>([
+            { label: 'English', enabled: true },
+            { label: 'Deutsch', enabled: false },
+        ]);
+        const textTracks = createTrackList<VideoJsTextTrack>([
+            { label: 'English CC', kind: 'captions', mode: 'showing' },
+        ]);
+        const player = createPlayer(audioTracks, textTracks, 91);
+        const adapter = createAdapter();
+        const bridge = new VjsPlayerControlsBridge({
+            player,
+            adapter: adapter.value,
+            isLive: () => false,
+            showCaptions: () => true,
+        });
+        const video = document.createElement('video');
+
+        bridge.attach(video);
+        bridge.setSource();
+
+        expect(adapter.attach).toHaveBeenCalledWith(
+            video,
+            expect.objectContaining({
+                isLive: expect.any(Function),
+                getDuration: expect.any(Function),
+                getAudioTracks: expect.any(Function),
+                setAudioTrack: expect.any(Function),
+                getSubtitleTracks: expect.any(Function),
+                setSubtitleTrack: expect.any(Function),
+            })
+        );
+        expect(adapter.options?.isLive?.()).toBe(false);
+        expect(adapter.options?.getDuration?.()).toBe(91);
+        expect(adapter.options?.getAudioTracks?.()).toEqual([
+            { id: 0, label: 'English', selected: true },
+            { id: 1, label: 'Deutsch', selected: false },
+        ]);
+        expect(adapter.options?.getSubtitleTracks?.()).toEqual([
+            { id: 0, label: 'English CC', selected: true },
+        ]);
+
+        adapter.options?.setAudioTrack?.(1);
+        adapter.options?.setSubtitleTrack?.(-1);
+
+        expect(audioTracks[0].enabled).toBe(false);
+        expect(audioTracks[1].enabled).toBe(true);
+        expect(textTracks[0].mode).toBe('disabled');
+    });
+
+    it('reattaches only when Video.js replaces the Tech video', () => {
+        const adapter = createAdapter();
+        const bridge = new VjsPlayerControlsBridge({
+            player: createPlayer(),
+            adapter: adapter.value,
+            isLive: () => true,
+            showCaptions: () => false,
+        });
+        const firstVideo = document.createElement('video');
+        const secondVideo = document.createElement('video');
+
+        bridge.attach(firstVideo);
+        bridge.rebind(firstVideo);
+        bridge.rebind(secondVideo);
+
+        expect(adapter.attach).toHaveBeenCalledTimes(2);
+        expect(adapter.attach).toHaveBeenNthCalledWith(
+            1,
+            firstVideo,
+            expect.any(Object)
+        );
+        expect(adapter.attach).toHaveBeenNthCalledWith(
+            2,
+            secondVideo,
+            expect.any(Object)
+        );
+    });
+
+    it('suppresses and restores the engine-selected subtitle from input changes', () => {
+        let showCaptions = false;
+        const textTracks = createTrackList<VideoJsTextTrack>([
+            { label: 'English CC', kind: 'captions', mode: 'showing' },
+        ]);
+        const adapter = createAdapter();
+        const bridge = new VjsPlayerControlsBridge({
+            player: createPlayer(undefined, textTracks),
+            adapter: adapter.value,
+            isLive: () => false,
+            showCaptions: () => showCaptions,
+        });
+
+        bridge.attach(document.createElement('video'));
+        bridge.setSource();
+        expect(textTracks[0].mode).toBe('disabled');
+
+        showCaptions = true;
+        bridge.refreshInputs();
+
+        expect(textTracks[0].mode).toBe('showing');
+        expect(adapter.refresh).toHaveBeenCalled();
+    });
+
+    it('clears source-owned tracks and tears down idempotently', () => {
+        const audioTracks = createTrackList<VideoJsAudioTrack>([
+            { label: 'English', enabled: true },
+            { label: 'Deutsch', enabled: false },
+        ]);
+        const adapter = createAdapter();
+        const bridge = new VjsPlayerControlsBridge({
+            player: createPlayer(audioTracks),
+            adapter: adapter.value,
+            isLive: () => true,
+            showCaptions: () => false,
+        });
+
+        bridge.attach(document.createElement('video'));
+        bridge.setSource();
+        expect(adapter.options?.getAudioTracks?.()).toHaveLength(2);
+
+        bridge.clearSource();
+        expect(adapter.options?.getAudioTracks?.()).toEqual([]);
+
+        bridge.destroy();
+        bridge.destroy();
+        bridge.attach(document.createElement('video'));
+
+        expect(adapter.detach).toHaveBeenCalledTimes(1);
+        expect(adapter.attach).toHaveBeenCalledTimes(1);
+    });
+});
+
+function createAdapter() {
+    const adapter: {
+        options?: WebVideoControlsOptions;
+        attach: jest.Mock;
+        detach: jest.Mock;
+        refresh: jest.Mock;
+    } = {
+        attach: jest.fn((_video, options: WebVideoControlsOptions) => {
+            adapter.options = options;
+        }),
+        detach: jest.fn(),
+        refresh: jest.fn(),
+    };
+    return {
+        get options() {
+            return adapter.options;
+        },
+        attach: adapter.attach,
+        detach: adapter.detach,
+        refresh: adapter.refresh,
+        value: adapter as unknown as import('../player-controls/web-video-controls.adapter').WebVideoControlsAdapter,
+    };
+}
+
+function createPlayer(
+    audioTracks = createTrackList<VideoJsAudioTrack>([]),
+    textTracks = createTrackList<VideoJsTextTrack>([]),
+    duration = 0
+): VideoJsPlayer {
+    return {
+        audioTracks: jest.fn(() => audioTracks),
+        textTracks: jest.fn(() => textTracks),
+        duration: jest.fn(() => duration),
+        getChild: jest.fn(() => null),
+        tech: jest.fn(() => null),
+    } as unknown as VideoJsPlayer;
+}
+
+function createTrackList<TTrack extends object>(
+    tracks: TTrack[]
+): (TTrack[] & {
+    addEventListener: jest.Mock;
+    removeEventListener: jest.Mock;
+}) &
+    (TTrack extends VideoJsAudioTrack
+        ? VideoJsAudioTrackList
+        : VideoJsTextTrackList) {
+    return Object.assign(tracks, {
+        addEventListener: jest.fn(),
+        removeEventListener: jest.fn(),
+    }) as never;
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.ts
new file mode 100644
index 000000000..b2398bfaf
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-controls.bridge.ts
@@ -0,0 +1,122 @@
+import type { WebVideoControlsOptions } from '../player-controls/web-video-controls.adapter';
+import type { WebVideoControlsAdapter } from '../player-controls/web-video-controls.adapter';
+import { VjsAudioTracks } from './vjs-audio-tracks';
+import type { VideoJsPlayer } from './vjs-player.types';
+import { VjsTextTracks } from './vjs-text-tracks';
+
+export interface VjsPlayerControlsBridgeConfig {
+    player: VideoJsPlayer;
+    adapter: WebVideoControlsAdapter;
+    isLive: () => boolean;
+    showCaptions: () => boolean;
+}
+
+export class VjsPlayerControlsBridge {
+    private readonly audioTracks: VjsAudioTracks;
+    private readonly textTracks: VjsTextTracks;
+    private video: HTMLVideoElement | null = null;
+    private sourceActive = false;
+    private destroyed = false;
+
+    private readonly adapterOptions: WebVideoControlsOptions = {
+        isLive: () => this.config.isLive(),
+        getDuration: () => this.readDuration(),
+        getAudioTracks: () => this.audioTracks.getAudioTracks(),
+        setAudioTrack: (id) => this.audioTracks.setAudioTrack(id),
+        getSubtitleTracks: () => this.textTracks.getSubtitleTracks(),
+        setSubtitleTrack: (id) => this.textTracks.setSubtitleTrack(id),
+    };
+
+    constructor(private readonly config: VjsPlayerControlsBridgeConfig) {
+        const refresh = () => this.config.adapter.refresh();
+        this.audioTracks = new VjsAudioTracks({
+            player: config.player,
+            refresh,
+        });
+        this.textTracks = new VjsTextTracks({
+            player: config.player,
+            showCaptions: config.showCaptions,
+            refresh,
+        });
+    }
+
+    attach(video: HTMLVideoElement): void {
+        if (this.destroyed || this.video === video) {
+            return;
+        }
+
+        this.video = video;
+        this.config.adapter.attach(video, this.adapterOptions);
+        if (this.sourceActive) {
+            this.bindTrackLists();
+        }
+    }
+
+    rebind(video: HTMLVideoElement): void {
+        this.attach(video);
+    }
+
+    setSource(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.audioTracks.resetSource();
+        this.textTracks.resetSource();
+        this.sourceActive = true;
+        this.bindTrackLists();
+        this.config.adapter.refresh();
+    }
+
+    refreshInputs(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        if (this.sourceActive) {
+            this.bindTrackLists();
+            this.textTracks.refreshInputs();
+        }
+        this.config.adapter.refresh();
+    }
+
+    clearSource(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.audioTracks.clear();
+        this.textTracks.clear();
+        this.sourceActive = false;
+        this.config.adapter.refresh();
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.audioTracks.clear();
+        this.textTracks.clear();
+        if (this.video) {
+            this.config.adapter.detach();
+        }
+        this.video = null;
+        this.sourceActive = false;
+        this.destroyed = true;
+    }
+
+    private bindTrackLists(): void {
+        this.audioTracks.bind();
+        this.textTracks.bind();
+    }
+
+    private readDuration(): number {
+        try {
+            const duration = this.config.player.duration();
+            return typeof duration === 'number' ? duration : NaN;
+        } catch {
+            return NaN;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.spec.ts
new file mode 100644
index 000000000..893f58b29
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.spec.ts
@@ -0,0 +1,110 @@
+import { VjsPlayerResetCoordinator } from './vjs-player-reset-coordinator';
+import type { VideoJsPlayer } from './vjs-player.types';
+
+describe('VjsPlayerResetCoordinator', () => {
+    it('waits for pause before reset and coalesces later requests', () => {
+        const harness = createHarness(false);
+        const coordinator = createCoordinator(harness);
+
+        coordinator.requestReset();
+        coordinator.requestReset();
+
+        expect(harness.pause).toHaveBeenCalledTimes(1);
+        expect(harness.reset).not.toHaveBeenCalled();
+
+        harness.paused = true;
+        coordinator.handlePause();
+
+        expect(harness.reset).toHaveBeenCalledTimes(1);
+
+        coordinator.requestReset();
+        expect(harness.reset).toHaveBeenCalledTimes(1);
+    });
+
+    it('captures the latest engine volume after an asynchronous pause', () => {
+        const harness = createHarness(false, 0.3);
+        const coordinator = createCoordinator(harness);
+
+        coordinator.requestReset();
+        harness.player.volume(0.8);
+        harness.paused = true;
+        coordinator.handlePause();
+
+        expect(coordinator.handlePlayerReset()).toBe(0.8);
+    });
+
+    it('snapshots actual engine volume and suppresses reset-generated changes', () => {
+        const harness = createHarness(true, 0.3);
+        const coordinator = createCoordinator(harness, 0.8);
+
+        coordinator.requestReset();
+
+        expect(coordinator.shouldSuppressVolumeChange()).toBe(true);
+        expect(coordinator.handlePlayerReset()).toBe(0.3);
+        expect(coordinator.shouldSuppressVolumeChange()).toBe(false);
+    });
+
+    it('cancels a pending reset but reports an in-flight reset to the caller', () => {
+        const waitingHarness = createHarness(false);
+        const waiting = createCoordinator(waitingHarness);
+        waiting.requestReset();
+
+        expect(waiting.cancelPendingReset()).toBe(false);
+        waitingHarness.paused = true;
+        waiting.handlePause();
+        expect(waitingHarness.reset).not.toHaveBeenCalled();
+
+        const activeHarness = createHarness(true);
+        const active = createCoordinator(activeHarness);
+        active.requestReset();
+
+        expect(active.cancelPendingReset()).toBe(true);
+    });
+
+    it('tracks whether the current Tech already has its desired source', () => {
+        const coordinator = createCoordinator(createHarness(true));
+
+        expect(coordinator.canApplyReadySource()).toBe(true);
+        coordinator.markSourceApplied();
+        expect(coordinator.canApplyReadySource()).toBe(false);
+
+        coordinator.handlePlayerReset();
+        expect(coordinator.canApplyReadySource()).toBe(true);
+    });
+});
+
+function createCoordinator(
+    harness: ReturnType<typeof createHarness>,
+    fallbackVolume = 1
+): VjsPlayerResetCoordinator {
+    return new VjsPlayerResetCoordinator({
+        player: () => harness.player,
+        fallbackVolume: () => fallbackVolume,
+        queueTask: (callback) => harness.tasks.push(callback),
+        reportError: harness.reportError,
+    });
+}
+
+function createHarness(paused: boolean, initialVolume = 0.5) {
+    let volume = initialVolume;
+    const harness = {
+        paused,
+        tasks: [] as Array<() => void>,
+        pause: jest.fn(),
+        reset: jest.fn(),
+        reportError: jest.fn(),
+        player: null as unknown as VideoJsPlayer,
+    };
+    harness.player = {
+        pause: harness.pause,
+        paused: jest.fn(() => harness.paused),
+        reset: harness.reset,
+        volume: jest.fn((value?: number) => {
+            if (value !== undefined) {
+                volume = value;
+            }
+            return volume;
+        }),
+    } as unknown as VideoJsPlayer;
+    return harness;
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.ts
new file mode 100644
index 000000000..40245ca74
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-reset-coordinator.ts
@@ -0,0 +1,141 @@
+import type { VideoJsPlayer } from './vjs-player.types';
+
+type ResetPlayer = Pick<VideoJsPlayer, 'pause' | 'paused' | 'reset' | 'volume'>;
+
+export interface VjsPlayerResetCoordinatorConfig {
+    player: () => ResetPlayer;
+    fallbackVolume: () => number;
+    queueTask: (callback: () => void) => void;
+    reportError: (error: unknown) => void;
+}
+
+export class VjsPlayerResetCoordinator {
+    private requested = false;
+    private inFlight = false;
+    private sourceApplied = false;
+    private volumeSnapshot: number | null = null;
+    private destroyed = false;
+
+    constructor(private readonly config: VjsPlayerResetCoordinatorConfig) {}
+
+    requestReset(): void {
+        if (this.destroyed || this.requested || this.inFlight) {
+            return;
+        }
+        this.requested = true;
+
+        try {
+            this.config.player().pause();
+        } catch {
+            // The pause event/current paused state below remains authoritative.
+        }
+        if (this.isPlayerPaused()) {
+            this.performReset();
+            return;
+        }
+
+        this.config.queueTask(() => {
+            if (this.requested && !this.inFlight && this.isPlayerPaused()) {
+                this.performReset();
+            }
+        });
+    }
+
+    handlePause(): void {
+        if (this.requested && !this.inFlight) {
+            this.performReset();
+        }
+    }
+
+    cancelPendingReset(): boolean {
+        this.requested = false;
+        if (!this.inFlight) {
+            this.volumeSnapshot = null;
+        }
+        return this.inFlight;
+    }
+
+    handlePlayerReset(): number {
+        this.requested = false;
+        this.inFlight = false;
+        this.sourceApplied = false;
+        const volume = this.volumeSnapshot ?? this.readFallbackVolume();
+        this.volumeSnapshot = null;
+        return volume;
+    }
+
+    shouldSuppressVolumeChange(): boolean {
+        return this.inFlight;
+    }
+
+    canApplyReadySource(): boolean {
+        return !this.requested && !this.inFlight && !this.sourceApplied;
+    }
+
+    clearSourceApplied(): void {
+        this.sourceApplied = false;
+    }
+
+    markSourceApplied(): void {
+        this.sourceApplied = true;
+    }
+
+    destroy(): void {
+        this.destroyed = true;
+        this.requested = false;
+        this.inFlight = false;
+        this.sourceApplied = false;
+        this.volumeSnapshot = null;
+    }
+
+    private performReset(): void {
+        if (
+            this.destroyed ||
+            !this.requested ||
+            this.inFlight ||
+            !this.isPlayerPaused()
+        ) {
+            return;
+        }
+
+        this.captureVolume();
+        this.requested = false;
+        this.inFlight = true;
+        try {
+            this.config.player().reset();
+        } catch (error: unknown) {
+            this.inFlight = false;
+            this.volumeSnapshot = null;
+            this.config.reportError(error);
+        }
+    }
+
+    private captureVolume(): void {
+        if (this.volumeSnapshot !== null) {
+            return;
+        }
+        try {
+            const volume = this.config.player().volume();
+            if (typeof volume === 'number' && Number.isFinite(volume)) {
+                this.volumeSnapshot = Math.max(0, Math.min(1, volume));
+                return;
+            }
+        } catch {
+            // Fall through to the validated parent fallback.
+        }
+        this.volumeSnapshot = this.readFallbackVolume();
+    }
+
+    private readFallbackVolume(): number {
+        const volume = this.config.fallbackVolume();
+        return Number.isFinite(volume) ? Math.max(0, Math.min(1, volume)) : 1;
+    }
+
+    private isPlayerPaused(): boolean {
+        try {
+            return this.config.player().paused() !== false;
+        } catch {
+            return false;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.spec.ts
new file mode 100644
index 000000000..6bdb12587
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.spec.ts
@@ -0,0 +1,199 @@
+import {
+    createVjsPlayerOptions,
+    exitOwnedVjsFullscreen,
+    hasVjsMpegTsModeChanged,
+    hasVjsPlaybackInputChanged,
+    initializeVjsPlugins,
+    shouldChangeVjsSource,
+} from './vjs-player-setup';
+import type { VideoJsPlayer } from './vjs-player.types';
+
+describe('Video.js player setup', () => {
+    it('preserves legacy options when shared controls are disabled', () => {
+        const options = {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+            userActions: { hotkeys: true },
+            spatialNavigation: { enabled: true },
+        };
+
+        expect(createVjsPlayerOptions(options, false, false)).toEqual({
+            ...options,
+            autoplay: true,
+        });
+    });
+
+    it('removes duplicate Video.js interaction ownership for shared controls', () => {
+        expect(
+            createVjsPlayerOptions(
+                {
+                    sources: [{ src: 'https://example.test/live.ts' }],
+                    userActions: { custom: true, hotkeys: true },
+                    spatialNavigation: { custom: true, enabled: true },
+                },
+                true,
+                true
+            )
+        ).toEqual(
+            expect.objectContaining({
+                sources: [],
+                autoplay: false,
+                controls: false,
+                userActions: {
+                    custom: true,
+                    click: false,
+                    doubleClick: false,
+                    hotkeys: false,
+                },
+                spatialNavigation: {
+                    custom: true,
+                    enabled: false,
+                },
+            })
+        );
+    });
+
+    it('detects source identity and explicit reload changes', () => {
+        const source = {
+            src: 'https://example.test/movie.mp4',
+            type: 'video/mp4',
+        };
+
+        expect(
+            hasVjsPlaybackInputChanged(
+                { reloadToken: 1 },
+                { reloadToken: 1 },
+                source,
+                { ...source }
+            )
+        ).toBe(false);
+        expect(
+            hasVjsPlaybackInputChanged(
+                { reloadToken: 1 },
+                { reloadToken: 2 },
+                source,
+                source
+            )
+        ).toBe(true);
+        expect(
+            hasVjsPlaybackInputChanged({}, {}, source, {
+                ...source,
+                type: 'application/octet-stream',
+            })
+        ).toBe(true);
+    });
+
+    it('detects only semantic live-mode changes for raw MPEG-TS', () => {
+        expect(
+            hasVjsMpegTsModeChanged(
+                { isLive: undefined },
+                { isLive: true },
+                true
+            )
+        ).toBe(false);
+        expect(
+            hasVjsMpegTsModeChanged({ isLive: true }, { isLive: false }, true)
+        ).toBe(true);
+        expect(
+            hasVjsMpegTsModeChanged({ isLive: true }, { isLive: false }, false)
+        ).toBe(false);
+    });
+
+    it('combines source identity and raw MPEG-TS live-mode changes', () => {
+        const isMpegTsSource = jest.fn(() => true);
+
+        expect(
+            shouldChangeVjsSource(
+                {
+                    isLive: true,
+                    sources: [{ src: 'https://example.test/live.ts' }],
+                },
+                {
+                    isLive: false,
+                    sources: [{ src: 'https://example.test/live.ts' }],
+                },
+                isMpegTsSource
+            )
+        ).toBe(true);
+        expect(isMpegTsSource).toHaveBeenCalledWith(
+            'https://example.test/live.ts'
+        );
+    });
+
+    it('initializes optional plugins independently', () => {
+        const qualitySelectorHls = jest.fn(() => {
+            throw new Error('quality failed');
+        });
+        const aspectRatioPanel = jest.fn();
+        const warn = jest.spyOn(console, 'warn').mockImplementation();
+
+        initializeVjsPlugins({
+            qualitySelectorHls,
+            aspectRatioPanel,
+        } as unknown as VideoJsPlayer);
+
+        expect(qualitySelectorHls).toHaveBeenCalledWith({
+            displayCurrentQuality: true,
+        });
+        expect(aspectRatioPanel).toHaveBeenCalledTimes(1);
+        expect(warn).toHaveBeenCalledWith(
+            'qualitySelectorHls plugin failed to initialize:',
+            expect.any(Error)
+        );
+        warn.mockRestore();
+    });
+
+    it('exits fullscreen only when the shared Video.js shell owns it', () => {
+        const fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        const exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        const surface = document.createElement('div');
+        let fullscreenElement: Element | null = document.createElement('div');
+        const exitFullscreen = jest.fn().mockResolvedValue(undefined);
+        const reportError = jest.fn();
+
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            value: exitFullscreen,
+        });
+
+        try {
+            exitOwnedVjsFullscreen(true, surface, reportError);
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            fullscreenElement = surface;
+            exitOwnedVjsFullscreen(false, surface, reportError);
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            exitOwnedVjsFullscreen(true, surface, reportError);
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+            expect(reportError).not.toHaveBeenCalled();
+        } finally {
+            restoreDocumentProperty(
+                'fullscreenElement',
+                fullscreenElementDescriptor
+            );
+            restoreDocumentProperty('exitFullscreen', exitFullscreenDescriptor);
+        }
+    });
+});
+
+function restoreDocumentProperty(
+    property: 'exitFullscreen' | 'fullscreenElement',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+
+    delete (document as unknown as Record<string, unknown>)[property];
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.ts
new file mode 100644
index 000000000..2cc656c0a
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player-setup.ts
@@ -0,0 +1,118 @@
+import type {
+    VideoJsPlayer,
+    VideoPlayerOptions,
+    VideoPlayerSource,
+} from './vjs-player.types';
+
+export function createVjsPlayerOptions(
+    options: VideoPlayerOptions,
+    isMpegTs: boolean,
+    sharedControls: boolean
+): VideoPlayerOptions {
+    const baseOptions = isMpegTs
+        ? { ...options, sources: [], autoplay: false }
+        : { ...options, autoplay: true };
+    if (!sharedControls) {
+        return baseOptions;
+    }
+    return {
+        ...baseOptions,
+        controls: false,
+        userActions: {
+            ...options.userActions,
+            click: false,
+            doubleClick: false,
+            hotkeys: false,
+        },
+        spatialNavigation: {
+            ...options.spatialNavigation,
+            enabled: false,
+        },
+    };
+}
+
+export function hasVjsPlaybackInputChanged(
+    previousOptions: VideoPlayerOptions,
+    currentOptions: VideoPlayerOptions,
+    previousSource: VideoPlayerSource | undefined,
+    currentSource: VideoPlayerSource | undefined
+): boolean {
+    return (
+        previousOptions.reloadToken !== currentOptions.reloadToken ||
+        previousSource?.src !== currentSource?.src ||
+        previousSource?.type !== currentSource?.type
+    );
+}
+
+export function hasVjsMpegTsModeChanged(
+    previousOptions: VideoPlayerOptions,
+    currentOptions: VideoPlayerOptions,
+    isMpegTsSource: boolean
+): boolean {
+    return (
+        isMpegTsSource &&
+        (previousOptions.isLive !== false) !== (currentOptions.isLive !== false)
+    );
+}
+
+export function shouldChangeVjsSource(
+    previousOptions: VideoPlayerOptions,
+    currentOptions: VideoPlayerOptions,
+    isMpegTsSource: (url?: string) => boolean
+): boolean {
+    const previousSource = previousOptions.sources?.[0];
+    const currentSource = currentOptions.sources?.[0];
+    return (
+        hasVjsPlaybackInputChanged(
+            previousOptions,
+            currentOptions,
+            previousSource,
+            currentSource
+        ) ||
+        hasVjsMpegTsModeChanged(
+            previousOptions,
+            currentOptions,
+            isMpegTsSource(currentSource?.src)
+        )
+    );
+}
+
+export function initializeVjsPlugins(player: VideoJsPlayer): void {
+    try {
+        player.qualitySelectorHls?.({ displayCurrentQuality: true });
+    } catch (error) {
+        console.warn('qualitySelectorHls plugin failed to initialize:', error);
+    }
+    try {
+        player.aspectRatioPanel?.();
+    } catch (error) {
+        console.warn('aspectRatioPanel plugin failed to initialize:', error);
+    }
+}
+
+export function exitOwnedVjsFullscreen(
+    sharedControls: boolean,
+    surface: HTMLElement | undefined,
+    reportError: (error: unknown) => void
+): void {
+    if (
+        !sharedControls ||
+        document.fullscreenElement !== surface ||
+        typeof document.exitFullscreen !== 'function'
+    ) {
+        return;
+    }
+    try {
+        void Promise.resolve(document.exitFullscreen()).catch(reportError);
+    } catch (error: unknown) {
+        reportError(error);
+    }
+}
+
+export function queueVjsTask(callback: () => void): void {
+    if (typeof queueMicrotask === 'function') {
+        queueMicrotask(callback);
+    } else {
+        void Promise.resolve().then(callback);
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.captions.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.captions.spec.ts
new file mode 100644
index 000000000..6d8266f6c
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.captions.spec.ts
@@ -0,0 +1,264 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import type { VjsPlayerComponent as VjsPlayerComponentInstance } from './vjs-player.component';
+import type {
+    VideoJsPlayer,
+    VideoJsTextTrack,
+    VideoJsTextTrackList,
+} from './vjs-player.types';
+
+const videoJsMock = jest.fn();
+
+jest.unstable_mockModule('video.js', () => ({ default: videoJsMock }));
+jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
+jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
+jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: jest.fn(),
+        isSupported: jest.fn(() => false),
+    },
+}));
+
+/**
+ * Regression coverage for #1155: with Video.js' own control bar (shared
+ * controls off, the shipping default) the `showCaptions` preference was never
+ * read, so a VHS rendition flagged DEFAULT kept subtitles on screen.
+ */
+describe('VjsPlayerComponent caption preference without shared controls', () => {
+    let VjsPlayerComponent: typeof import('./vjs-player.component').VjsPlayerComponent;
+    let fixture: ComponentFixture<VjsPlayerComponentInstance>;
+    let harness: ReturnType<typeof createHarness>;
+
+    beforeAll(async () => {
+        ({ VjsPlayerComponent } = await import('./vjs-player.component'));
+    });
+
+    beforeEach(async () => {
+        harness = createHarness();
+        videoJsMock
+            .mockReset()
+            .mockImplementation(
+                (_target: Element, _options: unknown, ready: () => void) => {
+                    harness.ready = ready;
+                    return harness.player;
+                }
+            );
+        await TestBed.configureTestingModule({
+            imports: [VjsPlayerComponent],
+        }).compileComponents();
+        fixture = TestBed.createComponent(VjsPlayerComponent);
+    });
+
+    afterEach(() => {
+        if (!fixture.componentRef.hostView.destroyed) {
+            fixture.destroy();
+        }
+        localStorage.removeItem('volume');
+    });
+
+    it('suppresses initial and late default captions while the preference is off', () => {
+        const initial = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        harness.tracks.replaceSilently([initial]);
+        render(false);
+
+        expect(initial.mode).toBe('disabled');
+
+        const late = createTextTrack({ kind: 'subtitles', mode: 'showing' });
+        harness.tracks.add(late);
+
+        expect(late.mode).toBe('disabled');
+    });
+
+    it('keeps captions displayed while the preference is on', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        harness.tracks.replaceSilently([track]);
+        render(true);
+
+        expect(track.mode).toBe('showing');
+    });
+
+    // The Video.js control bar stays visible in this mode, so the preference
+    // must seed the source and then get out of the user's way.
+    it('keeps a caption the user enables after playback started', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        harness.tracks.replaceSilently([track]);
+        render(false);
+        expect(track.mode).toBe('disabled');
+
+        harness.emit('playing');
+        track.mode = 'showing';
+        harness.tracks.emit('change');
+
+        expect(track.mode).toBe('showing');
+    });
+
+    it('restores the suppressed track when the preference is turned on', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        harness.tracks.replaceSilently([track]);
+        render(false);
+        expect(track.mode).toBe('disabled');
+
+        fixture.componentRef.setInput('showCaptions', true);
+        fixture.detectChanges();
+
+        expect(track.mode).toBe('showing');
+    });
+
+    it('re-applies the preference to the text tracks of a new source', () => {
+        render(false);
+
+        const replacement = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        harness.tracks.replaceSilently([replacement]);
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/second.mp4' }],
+        });
+        fixture.detectChanges();
+        harness.emit('loadedmetadata');
+
+        expect(replacement.mode).toBe('disabled');
+    });
+
+    it('stops managing text tracks once the component is destroyed', () => {
+        const track = createTextTrack({ kind: 'captions', mode: 'showing' });
+        harness.tracks.replaceSilently([track]);
+        render(false);
+
+        fixture.destroy();
+        track.mode = 'showing';
+        harness.tracks.emit('change');
+
+        expect(track.mode).toBe('showing');
+    });
+
+    function render(showCaptions: boolean): void {
+        fixture.componentRef.setInput('showCaptions', showCaptions);
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/first.mp4' }],
+        });
+        fixture.detectChanges();
+        harness.ready();
+        fixture.detectChanges();
+    }
+});
+
+function createTextTrack(
+    overrides: Partial<VideoJsTextTrack> = {}
+): VideoJsTextTrack {
+    return { kind: 'subtitles', mode: 'disabled', ...overrides };
+}
+
+class FakeTextTrackList {
+    private tracks: VideoJsTextTrack[] = [];
+    private indexedLength = 0;
+    private readonly listeners = new Map<
+        string,
+        Set<EventListenerOrEventListenerObject>
+    >();
+
+    readonly addEventListener = jest.fn(
+        (event: string, listener: EventListenerOrEventListenerObject): void => {
+            const registered = this.listeners.get(event) ?? new Set();
+            registered.add(listener);
+            this.listeners.set(event, registered);
+        }
+    );
+
+    readonly removeEventListener = jest.fn(
+        (event: string, listener: EventListenerOrEventListenerObject): void => {
+            this.listeners.get(event)?.delete(listener);
+        }
+    );
+
+    get length(): number {
+        return this.tracks.length;
+    }
+
+    replaceSilently(tracks: VideoJsTextTrack[]): void {
+        this.tracks = [...tracks];
+        this.syncIndexedTracks();
+    }
+
+    add(track: VideoJsTextTrack): void {
+        this.tracks.push(track);
+        this.syncIndexedTracks();
+        this.emit('addtrack');
+    }
+
+    emit(eventName: 'addtrack' | 'removetrack' | 'change'): void {
+        const event = new Event(eventName);
+        for (const listener of this.listeners.get(eventName) ?? []) {
+            if (typeof listener === 'function') {
+                listener.call(this, event);
+            } else {
+                listener.handleEvent(event);
+            }
+        }
+    }
+
+    asTextTrackList(): VideoJsTextTrackList {
+        return this as unknown as VideoJsTextTrackList;
+    }
+
+    private syncIndexedTracks(): void {
+        for (let index = 0; index < this.indexedLength; index += 1) {
+            Reflect.deleteProperty(this, index);
+        }
+        this.tracks.forEach((track, index) => {
+            Object.defineProperty(this, index, {
+                configurable: true,
+                enumerable: true,
+                value: track,
+            });
+        });
+        this.indexedLength = this.tracks.length;
+    }
+}
+
+function createHarness() {
+    const listeners = new Map<string, Set<() => void>>();
+    const tracks = new FakeTextTrackList();
+    const harness = {
+        tracks,
+        currentVideo: document.createElement('video'),
+        ready: () => undefined,
+        emit(event: string) {
+            for (const listener of listeners.get(event) ?? []) {
+                listener();
+            }
+        },
+        player: null as unknown as VideoJsPlayer,
+    };
+    harness.player = {
+        audioTracks: jest.fn(() => null),
+        textTracks: jest.fn(() => tracks.asTextTrackList()),
+        currentTime: jest.fn(() => 0),
+        duration: jest.fn(() => 0),
+        error: jest.fn(() => null),
+        getChild: jest.fn(() => null),
+        on: jest.fn((event: string, listener: () => void) => {
+            const registered = listeners.get(event) ?? new Set<() => void>();
+            registered.add(listener);
+            listeners.set(event, registered);
+        }),
+        off: jest.fn((event: string, listener: () => void) => {
+            listeners.get(event)?.delete(listener);
+        }),
+        pause: jest.fn(),
+        paused: jest.fn(() => true),
+        reset: jest.fn(),
+        src: jest.fn(),
+        tech: jest.fn(() => ({ el: () => harness.currentVideo })),
+        volume: jest.fn(() => 1),
+        dispose: jest.fn(),
+        qualitySelectorHls: jest.fn(),
+        aspectRatioPanel: jest.fn(),
+    } as unknown as VideoJsPlayer;
+    return harness;
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.html b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.html
index fd7707d0e..269f42e2b 100644
--- a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.html
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.html
@@ -1,17 +1,29 @@
-<div class="vjs-player-shell">
+<div #playerRoot class="vjs-player-shell">
     <video
         #target
         class="video-js"
-        controls
+        [controls]="!sharedControls"
         muted
         playsinline
         preload="none"
         data-setup='{"liveui": true, "muted": false}'
     ></video>
 
-    <app-series-playback-navigation-controls
-        [navigation]="seriesNavigation()"
-        (previousEpisodeRequested)="previousEpisodeRequested.emit()"
-        (nextEpisodeRequested)="nextEpisodeRequested.emit()"
-    />
+    @if (sharedControls) {
+        <app-player-controls
+            [controller]="controlsAdapter"
+            [playerSurface]="playerRoot"
+            [mediaTitle]="mediaTitle()"
+            [showControls]="interactionEnabled()"
+            [shortcutsEnabled]="interactionEnabled()"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    } @else {
+        <app-series-playback-navigation-controls
+            [navigation]="seriesNavigation()"
+            (previousEpisodeRequested)="previousEpisodeRequested.emit()"
+            (nextEpisodeRequested)="nextEpisodeRequested.emit()"
+        />
+    }
 </div>
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.reset.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.reset.spec.ts
new file mode 100644
index 000000000..a8db23702
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.reset.spec.ts
@@ -0,0 +1,391 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { PictureInPictureTestEnvironment } from '../player-controls/picture-in-picture.spec-helpers';
+import { WEB_PLAYER_SHARED_CONTROLS } from '../player-controls/web-player-controls.flag';
+import type { VjsPlayerComponent as VjsPlayerComponentInstance } from './vjs-player.component';
+import type { VideoJsPlayer } from './vjs-player.types';
+
+const videoJsMock = jest.fn();
+const mpegTsCreatePlayerMock = jest.fn();
+const mpegTsIsSupportedMock = jest.fn(() => true);
+
+jest.unstable_mockModule('video.js', () => ({
+    default: videoJsMock,
+}));
+jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
+jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
+jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: mpegTsCreatePlayerMock,
+        isSupported: mpegTsIsSupportedMock,
+    },
+}));
+
+describe('VjsPlayerComponent reset lifecycle', () => {
+    let VjsPlayerComponent: typeof import('./vjs-player.component').VjsPlayerComponent;
+    let fixture: ComponentFixture<VjsPlayerComponentInstance>;
+    let playerHarness: ReturnType<typeof createVideoJsPlayerHarness>;
+
+    beforeAll(async () => {
+        ({ VjsPlayerComponent } = await import('./vjs-player.component'));
+    });
+
+    beforeEach(async () => {
+        localStorage.removeItem('volume');
+        playerHarness = createVideoJsPlayerHarness();
+        videoJsMock
+            .mockReset()
+            .mockImplementation(
+                (_target: Element, _options: unknown, ready: () => void) => {
+                    playerHarness.ready = ready;
+                    return playerHarness.player;
+                }
+            );
+        mpegTsCreatePlayerMock.mockReset().mockImplementation(() => {
+            const engine = createMpegTsPlayer();
+            playerHarness.mpegTsPlayers.push(engine);
+            return engine;
+        });
+        mpegTsIsSupportedMock.mockReset().mockReturnValue(true);
+
+        await TestBed.configureTestingModule({
+            imports: [VjsPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true },
+            ],
+        }).compileComponents();
+        fixture = TestBed.createComponent(VjsPlayerComponent);
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    it('coalesces reset-required changes and attaches only the latest MPEG-TS source', () => {
+        const initialVideo = document.createElement('video');
+        playerHarness.currentVideo = initialVideo;
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/one.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+        playerHarness.ready();
+
+        expect(playerHarness.mpegTsPlayers).toHaveLength(1);
+        expect(
+            playerHarness.mpegTsPlayers[0].attachMediaElement
+        ).toHaveBeenCalledWith(initialVideo);
+
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/two.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/three.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+
+        expect(playerHarness.reset).toHaveBeenCalledTimes(1);
+        expect(playerHarness.mpegTsPlayers).toHaveLength(1);
+        expect(playerHarness.mpegTsPlayers[0].destroy).toHaveBeenCalledTimes(1);
+
+        const latestVideo = document.createElement('video');
+        playerHarness.currentVideo = latestVideo;
+        playerHarness.emit('playerreset');
+
+        expect(playerHarness.mpegTsPlayers).toHaveLength(2);
+        expect(mpegTsCreatePlayerMock).toHaveBeenLastCalledWith({
+            type: 'mpegts',
+            isLive: true,
+            url: 'https://example.test/live/three.ts',
+        });
+        expect(
+            playerHarness.mpegTsPlayers[1].attachMediaElement
+        ).toHaveBeenCalledWith(latestVideo);
+    });
+
+    it('exits owned PiP when playerreset replaces the Tech video', () => {
+        const environment = new PictureInPictureTestEnvironment();
+        try {
+            const initialVideo = playerHarness.currentVideo;
+            environment.installVideo(initialVideo);
+            fixture.componentRef.setInput('options', {
+                sources: [{ src: 'https://example.test/movie.mp4' }],
+            });
+            fixture.detectChanges();
+            playerHarness.ready();
+            environment.setActive(initialVideo);
+
+            const replacementVideo = document.createElement('video');
+            environment.installVideo(replacementVideo);
+            playerHarness.currentVideo = replacementVideo;
+            playerHarness.emit('playerreset');
+
+            expect(environment.exit).toHaveBeenCalledTimes(1);
+            expect(
+                fixture.componentInstance.controlsAdapter.state()
+                    .pictureInPictureActive
+            ).toBe(false);
+            expect(
+                fixture.componentInstance.controlsAdapter.capabilities()
+                    .pictureInPicture
+            ).toBe(true);
+        } finally {
+            environment.restore();
+        }
+    });
+
+    it('never calls Video.js reset until active playback has paused', () => {
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+        });
+        fixture.detectChanges();
+        playerHarness.ready();
+        playerHarness.paused = false;
+        playerHarness.pauseCompletesImmediately = false;
+
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/stream.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+
+        expect(playerHarness.pause).toHaveBeenCalledTimes(1);
+        expect(playerHarness.reset).not.toHaveBeenCalled();
+
+        playerHarness.paused = true;
+        playerHarness.emit('pause');
+
+        expect(playerHarness.reset).toHaveBeenCalledTimes(1);
+    });
+
+    it('restores a volume input that changes while reset waits for pause', () => {
+        localStorage.setItem('volume', '0.3');
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+        });
+        fixture.componentRef.setInput('volume', 0.3);
+        fixture.detectChanges();
+        playerHarness.ready();
+        playerHarness.paused = false;
+        playerHarness.pauseCompletesImmediately = false;
+
+        fixture.componentRef.setInput('options', { sources: [] });
+        fixture.detectChanges();
+        fixture.componentRef.setInput('volume', 0.8);
+        fixture.detectChanges();
+        playerHarness.emit('volumechange');
+
+        playerHarness.paused = true;
+        playerHarness.emit('pause');
+        playerHarness.volume(1);
+        playerHarness.emit('volumechange');
+        playerHarness.currentVideo = document.createElement('video');
+        playerHarness.emit('playerreset');
+
+        expect(localStorage.getItem('volume')).toBe('0.8');
+        expect(playerHarness.volume).toHaveBeenLastCalledWith(0.8);
+    });
+
+    it('restores the latest normal source after an already-started reset', () => {
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+        });
+        fixture.detectChanges();
+        playerHarness.ready();
+
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/stream.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+
+        const latestSource = {
+            src: 'https://example.test/latest.mp4',
+            type: 'video/mp4',
+        };
+        fixture.componentRef.setInput('options', {
+            isLive: false,
+            sources: [latestSource],
+        });
+        fixture.detectChanges();
+
+        expect(playerHarness.src).not.toHaveBeenCalledWith(latestSource);
+
+        playerHarness.currentVideo = document.createElement('video');
+        playerHarness.emit('playerreset');
+
+        expect(playerHarness.src).toHaveBeenLastCalledWith(latestSource);
+        expect(playerHarness.mpegTsPlayers).toHaveLength(0);
+    });
+
+    it('does not start MPEG-TS twice when playerreset precedes Video.js ready', () => {
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/one.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [
+                {
+                    src: 'https://example.test/live/two.ts',
+                    type: 'video/mp2t',
+                },
+            ],
+        });
+        fixture.detectChanges();
+        playerHarness.currentVideo = document.createElement('video');
+        playerHarness.emit('playerreset');
+
+        expect(playerHarness.mpegTsPlayers).toHaveLength(1);
+
+        playerHarness.ready();
+
+        expect(playerHarness.mpegTsPlayers).toHaveLength(1);
+        expect(mpegTsCreatePlayerMock).toHaveBeenLastCalledWith({
+            type: 'mpegts',
+            isLive: true,
+            url: 'https://example.test/live/two.ts',
+        });
+    });
+
+    it('restarts active MPEG-TS when authoritative live metadata changes', () => {
+        const source = {
+            src: 'https://example.test/live/stream.ts',
+            type: 'video/mp2t',
+        };
+        fixture.componentRef.setInput('options', {
+            isLive: true,
+            sources: [source],
+        });
+        fixture.detectChanges();
+        playerHarness.ready();
+
+        fixture.componentRef.setInput('options', {
+            isLive: false,
+            sources: [{ ...source }],
+        });
+        fixture.detectChanges();
+
+        expect(playerHarness.reset).toHaveBeenCalledTimes(1);
+        expect(playerHarness.mpegTsPlayers[0].destroy).toHaveBeenCalledTimes(1);
+
+        playerHarness.currentVideo = document.createElement('video');
+        playerHarness.emit('playerreset');
+
+        expect(mpegTsCreatePlayerMock).toHaveBeenLastCalledWith({
+            type: 'mpegts',
+            isLive: false,
+            url: source.src,
+        });
+        expect(playerHarness.mpegTsPlayers).toHaveLength(2);
+    });
+});
+
+function createVideoJsPlayerHarness() {
+    const listeners = new Map<string, Set<() => void>>();
+    let volume = 0.5;
+    const harness = {
+        currentVideo: document.createElement('video'),
+        paused: true,
+        pauseCompletesImmediately: true,
+        ready: () => undefined,
+        mpegTsPlayers: [] as ReturnType<typeof createMpegTsPlayer>[],
+        pause: jest.fn(() => {
+            if (harness.pauseCompletesImmediately) {
+                harness.paused = true;
+            }
+        }),
+        reset: jest.fn(),
+        src: jest.fn(),
+        volume: jest.fn((value?: number) => {
+            if (value !== undefined) {
+                volume = value;
+            }
+            return volume;
+        }),
+        emit(event: string) {
+            for (const listener of listeners.get(event) ?? []) {
+                listener();
+            }
+        },
+        player: null as unknown as VideoJsPlayer,
+    };
+    harness.player = {
+        audioTracks: jest.fn(() => null),
+        textTracks: jest.fn(() => null),
+        currentTime: jest.fn(() => 0),
+        duration: jest.fn(() => 0),
+        error: jest.fn(() => null),
+        getChild: jest.fn(() => null),
+        on: jest.fn((event: string, listener: () => void) => {
+            const eventListeners =
+                listeners.get(event) ?? new Set<() => void>();
+            eventListeners.add(listener);
+            listeners.set(event, eventListeners);
+        }),
+        off: jest.fn((event: string, listener: () => void) => {
+            listeners.get(event)?.delete(listener);
+        }),
+        pause: harness.pause,
+        paused: jest.fn(() => harness.paused),
+        reset: harness.reset,
+        src: harness.src,
+        tech: jest.fn(() => ({ el: () => harness.currentVideo })),
+        volume: harness.volume,
+        dispose: jest.fn(),
+        qualitySelectorHls: jest.fn(),
+        aspectRatioPanel: jest.fn(),
+    } as unknown as VideoJsPlayer;
+    return harness;
+}
+
+function createMpegTsPlayer() {
+    return {
+        attachMediaElement: jest.fn(),
+        load: jest.fn(),
+        play: jest.fn(),
+        pause: jest.fn(),
+        unload: jest.fn(),
+        detachMediaElement: jest.fn(),
+        destroy: jest.fn(),
+        on: jest.fn(),
+        off: jest.fn(),
+    };
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.shared-controls.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.shared-controls.spec.ts
new file mode 100644
index 000000000..f3c5e46c1
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.shared-controls.spec.ts
@@ -0,0 +1,258 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { PlayerControlsComponent } from '../player-controls/player-controls.component';
+import { WEB_PLAYER_SHARED_CONTROLS } from '../player-controls/web-player-controls.flag';
+import type { VjsPlayerComponent as VjsPlayerComponentInstance } from './vjs-player.component';
+import type { VideoJsPlayer } from './vjs-player.types';
+
+const videoJsMock = jest.fn();
+const mpegTsCreatePlayerMock = jest.fn();
+const mpegTsIsSupportedMock = jest.fn(() => true);
+
+jest.unstable_mockModule('video.js', () => ({
+    default: videoJsMock,
+}));
+jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
+jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
+jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
+jest.unstable_mockModule('mpegts.js', () => ({
+    default: {
+        Events: { ERROR: 'error' },
+        createPlayer: mpegTsCreatePlayerMock,
+        isSupported: mpegTsIsSupportedMock,
+    },
+}));
+
+describe('VjsPlayerComponent shared controls', () => {
+    let VjsPlayerComponent: typeof import('./vjs-player.component').VjsPlayerComponent;
+    let fixture: ComponentFixture<VjsPlayerComponentInstance>;
+    let playerHarness: ReturnType<typeof createVideoJsPlayerHarness>;
+
+    beforeAll(async () => {
+        ({ VjsPlayerComponent } = await import('./vjs-player.component'));
+    });
+
+    beforeEach(async () => {
+        playerHarness = createVideoJsPlayerHarness();
+        videoJsMock
+            .mockReset()
+            .mockImplementation(
+                (_target: Element, _options: unknown, ready: () => void) => {
+                    playerHarness.ready = ready;
+                    return playerHarness.player;
+                }
+            );
+        mpegTsCreatePlayerMock.mockReset().mockImplementation(() => {
+            const engine = createMpegTsPlayer();
+            playerHarness.mpegTsPlayers.push(engine);
+            return engine;
+        });
+        mpegTsIsSupportedMock.mockReset().mockReturnValue(true);
+
+        await TestBed.configureTestingModule({
+            imports: [VjsPlayerComponent, TranslateModule.forRoot()],
+            providers: [
+                { provide: WEB_PLAYER_SHARED_CONTROLS, useValue: true },
+            ],
+        }).compileComponents();
+        fixture = TestBed.createComponent(VjsPlayerComponent);
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    it('disables every Video.js interaction surface and renders shared controls', () => {
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+            userActions: { custom: true, hotkeys: true },
+            spatialNavigation: { custom: true, enabled: true },
+        });
+
+        fixture.detectChanges();
+        playerHarness.ready();
+        fixture.detectChanges();
+
+        expect(videoJsMock).toHaveBeenCalledWith(
+            expect.any(Element),
+            expect.objectContaining({
+                controls: false,
+                userActions: {
+                    custom: true,
+                    click: false,
+                    doubleClick: false,
+                    hotkeys: false,
+                },
+                spatialNavigation: {
+                    custom: true,
+                    enabled: false,
+                },
+            }),
+            expect.any(Function)
+        );
+        expect(
+            fixture.debugElement.query(By.directive(PlayerControlsComponent))
+        ).not.toBeNull();
+        expect(
+            fixture.nativeElement.querySelector(
+                '[data-test-id="series-playback-previous-episode"]'
+            )
+        ).toBeNull();
+        expect(fixture.nativeElement.querySelector('video').controls).toBe(
+            false
+        );
+    });
+
+    it('gates the shared surface and shortcuts with interaction availability', () => {
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+        });
+        fixture.componentRef.setInput('interactionEnabled', false);
+
+        fixture.detectChanges();
+        playerHarness.ready();
+        fixture.detectChanges();
+
+        const controls = fixture.debugElement.query(
+            By.directive(PlayerControlsComponent)
+        ).componentInstance as PlayerControlsComponent;
+        expect(controls.showControls()).toBe(false);
+        expect(controls.shortcutsEnabled()).toBe(false);
+
+        fixture.componentRef.setInput('interactionEnabled', true);
+        fixture.detectChanges();
+
+        expect(controls.showControls()).toBe(true);
+        expect(controls.shortcutsEnabled()).toBe(true);
+    });
+
+    it('exits only its own fullscreen shell when interactions become unavailable', () => {
+        fixture.componentRef.setInput('options', {
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+        });
+        fixture.detectChanges();
+        playerHarness.ready();
+        fixture.detectChanges();
+
+        const shell = fixture.debugElement.query(By.css('.vjs-player-shell'))
+            .nativeElement as HTMLElement;
+        const unrelatedSurface = document.createElement('div');
+        const fullscreenElementDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'fullscreenElement'
+        );
+        const exitFullscreenDescriptor = Object.getOwnPropertyDescriptor(
+            document,
+            'exitFullscreen'
+        );
+        let fullscreenElement: Element | null = unrelatedSurface;
+        const exitFullscreen = jest.fn().mockResolvedValue(undefined);
+
+        Object.defineProperty(document, 'fullscreenElement', {
+            configurable: true,
+            get: () => fullscreenElement,
+        });
+        Object.defineProperty(document, 'exitFullscreen', {
+            configurable: true,
+            value: exitFullscreen,
+        });
+
+        try {
+            fixture.componentRef.setInput('interactionEnabled', false);
+            fixture.detectChanges();
+            expect(exitFullscreen).not.toHaveBeenCalled();
+
+            fixture.componentRef.setInput('interactionEnabled', true);
+            fixture.detectChanges();
+            fullscreenElement = shell;
+            fixture.componentRef.setInput('interactionEnabled', false);
+            fixture.detectChanges();
+
+            expect(exitFullscreen).toHaveBeenCalledTimes(1);
+        } finally {
+            restoreDocumentProperty(
+                'fullscreenElement',
+                fullscreenElementDescriptor
+            );
+            restoreDocumentProperty('exitFullscreen', exitFullscreenDescriptor);
+        }
+    });
+});
+
+function restoreDocumentProperty(
+    property: 'exitFullscreen' | 'fullscreenElement',
+    descriptor: PropertyDescriptor | undefined
+): void {
+    if (descriptor) {
+        Object.defineProperty(document, property, descriptor);
+        return;
+    }
+
+    delete (document as unknown as Record<string, unknown>)[property];
+}
+
+function createVideoJsPlayerHarness() {
+    const listeners = new Map<string, Set<() => void>>();
+    const harness = {
+        currentVideo: document.createElement('video'),
+        paused: true,
+        pauseCompletesImmediately: true,
+        ready: () => undefined,
+        mpegTsPlayers: [] as ReturnType<typeof createMpegTsPlayer>[],
+        pause: jest.fn(() => {
+            if (harness.pauseCompletesImmediately) {
+                harness.paused = true;
+            }
+        }),
+        reset: jest.fn(),
+        src: jest.fn(),
+        emit(event: string) {
+            for (const listener of listeners.get(event) ?? []) {
+                listener();
+            }
+        },
+        player: null as unknown as VideoJsPlayer,
+    };
+    harness.player = {
+        audioTracks: jest.fn(() => null),
+        textTracks: jest.fn(() => null),
+        currentTime: jest.fn(() => 0),
+        duration: jest.fn(() => 0),
+        error: jest.fn(() => null),
+        getChild: jest.fn(() => null),
+        on: jest.fn((event: string, listener: () => void) => {
+            const eventListeners =
+                listeners.get(event) ?? new Set<() => void>();
+            eventListeners.add(listener);
+            listeners.set(event, eventListeners);
+        }),
+        off: jest.fn((event: string, listener: () => void) => {
+            listeners.get(event)?.delete(listener);
+        }),
+        pause: harness.pause,
+        paused: jest.fn(() => harness.paused),
+        reset: harness.reset,
+        src: harness.src,
+        tech: jest.fn(() => ({ el: () => harness.currentVideo })),
+        volume: jest.fn(() => 0.5),
+        dispose: jest.fn(),
+        qualitySelectorHls: jest.fn(),
+        aspectRatioPanel: jest.fn(),
+    } as unknown as VideoJsPlayer;
+    return harness;
+}
+
+function createMpegTsPlayer() {
+    return {
+        attachMediaElement: jest.fn(),
+        load: jest.fn(),
+        play: jest.fn(),
+        pause: jest.fn(),
+        unload: jest.fn(),
+        detachMediaElement: jest.fn(),
+        destroy: jest.fn(),
+        on: jest.fn(),
+        off: jest.fn(),
+    };
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.spec.ts
index 3316b1db0..c05fc65b2 100644
--- a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.spec.ts
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.spec.ts
@@ -1,27 +1,23 @@
-import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import type { PlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
 import type { VjsPlayerComponent as VjsPlayerComponentInstance } from './vjs-player.component';
+import type { VideoJsPlayer } from './vjs-player.types';
 
 const videoJsMock = jest.fn();
-const mpegTsCreatePlayerMock = jest.fn();
 const mpegTsIsSupportedMock = jest.fn(() => false);
 
 jest.unstable_mockModule('video.js', () => ({
     default: videoJsMock,
 }));
-
 jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
 jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
 jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
-
 jest.unstable_mockModule('mpegts.js', () => ({
     default: {
-        createPlayer: mpegTsCreatePlayerMock,
+        Events: { ERROR: 'error' },
+        createPlayer: jest.fn(),
         isSupported: mpegTsIsSupportedMock,
-        Events: {
-            ERROR: 'error',
-        },
     },
 }));
 
@@ -29,375 +25,205 @@ describe('VjsPlayerComponent', () => {
     let VjsPlayerComponent: typeof import('./vjs-player.component').VjsPlayerComponent;
     let fixture: ComponentFixture<VjsPlayerComponentInstance>;
     let component: VjsPlayerComponentInstance;
-    let player: VjsPlayerComponentInstance['player'];
-
-    type SignalApiShape = {
-        options: () => unknown;
-        volume: () => number;
-        startTime: () => number;
-        timeUpdate: { emit: (event: unknown) => void };
-        playbackIssue: {
-            emit: (event: unknown) => void;
-            subscribe: (callback: (event: unknown) => void) => {
-                unsubscribe: () => void;
-            };
-        };
-    };
+    let harness: ReturnType<typeof createPlayerHarness>;
 
     beforeAll(async () => {
         ({ VjsPlayerComponent } = await import('./vjs-player.component'));
     });
 
     beforeEach(async () => {
-        mpegTsCreatePlayerMock.mockReset();
-        mpegTsCreatePlayerMock.mockReturnValue({
-            attachMediaElement: jest.fn(),
-            pause: jest.fn(),
-            unload: jest.fn(),
-            detachMediaElement: jest.fn(),
-            destroy: jest.fn(),
-            on: jest.fn(),
-            load: jest.fn(),
-            play: jest.fn(),
-        });
-        videoJsMock.mockReset();
+        harness = createPlayerHarness();
+        videoJsMock
+            .mockReset()
+            .mockImplementation(
+                (_target: Element, _options: unknown, ready: () => void) => {
+                    harness.ready = ready;
+                    return harness.player;
+                }
+            );
+        mpegTsIsSupportedMock.mockReset().mockReturnValue(false);
         await TestBed.configureTestingModule({
             imports: [VjsPlayerComponent],
         }).compileComponents();
-
         fixture = TestBed.createComponent(VjsPlayerComponent);
         component = fixture.componentInstance;
-        player = {
-            error: jest.fn(),
-            src: jest.fn(),
-            reset: jest.fn(),
-            volume: jest.fn(),
-            dispose: jest.fn(),
-        } as unknown as VjsPlayerComponentInstance['player'];
-        component.player = player;
     });
 
     afterEach(() => {
-        fixture.destroy();
+        if (!fixture.componentRef.hostView.destroyed) {
+            fixture.destroy();
+        }
+        localStorage.removeItem('volume');
     });
 
     it('uses signal-based inputs and outputs', () => {
-        const signalComponent = component as unknown as SignalApiShape;
-
-        expect(typeof signalComponent.options).toBe('function');
-        expect(signalComponent.volume()).toBe(1);
-        expect(signalComponent.startTime()).toBe(0);
-        expect(typeof signalComponent.timeUpdate.emit).toBe('function');
-        expect(typeof signalComponent.playbackIssue.emit).toBe('function');
+        expect(typeof component.options).toBe('function');
+        expect(component.volume()).toBe(1);
+        expect(component.startTime()).toBe(0);
+        expect(component.interactionEnabled()).toBe(true);
+        expect(component.showCaptions()).toBe(false);
+        expect(typeof component.timeUpdate.emit).toBe('function');
+        expect(typeof component.playbackIssue.emit).toBe('function');
     });
 
-    it('does not reset VideoJS when options change without changing the source', () => {
-        const previousOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-        const currentOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-
-        component.ngOnChanges({
-            options: new SimpleChange(previousOptions, currentOptions, false),
+    it('preserves legacy Video.js options and controls while the flag is off', () => {
+        render({
+            sources: [{ src: 'https://example.test/movie.mp4' }],
+            userActions: { hotkeys: true },
+            spatialNavigation: { enabled: true },
         });
 
-        expect(player.src).not.toHaveBeenCalled();
-    });
-
-    it('updates VideoJS when options change to a different source', () => {
-        const previousOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-        const currentOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/other-playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-
-        component.ngOnChanges({
-            options: new SimpleChange(previousOptions, currentOptions, false),
-        });
-
-        expect(player.src).toHaveBeenCalledWith(currentOptions.sources[0]);
-    });
-
-    it('updates volume when options change without changing the source', () => {
-        const previousOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-        const currentOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/playlist.m3u8',
-                    type: 'application/x-mpegURL',
-                },
-            ],
-        };
-
-        component.ngOnChanges({
-            options: new SimpleChange(previousOptions, currentOptions, false),
-            volume: new SimpleChange(0.5, 0.75, false),
-        });
-
-        expect(player.src).not.toHaveBeenCalled();
-        expect(player.volume).toHaveBeenCalledWith(0.75);
-    });
-
-    it('does not treat query-declared HLS streams as MPEG-TS sources', () => {
-        mpegTsIsSupportedMock.mockReturnValue(true);
-        const isMpegTsSource = (
-            component as unknown as {
-                isMpegTsSource: (url?: string) => boolean;
-            }
-        ).isMpegTsSource.bind(component);
-
-        expect(
-            isMpegTsSource('https://example.com/play?extension=m3u8&token=x')
-        ).toBe(false);
-        expect(
-            isMpegTsSource('https://example.com/live.php?extension=ts')
-        ).toBe(true);
-        expect(isMpegTsSource('https://example.com/live.php?stream=123')).toBe(
+        expect(videoJsMock).toHaveBeenCalledWith(
+            expect.any(Element),
+            expect.objectContaining({
+                autoplay: true,
+                userActions: { hotkeys: true },
+                spatialNavigation: { enabled: true },
+            }),
+            expect.any(Function)
+        );
+        expect(fixture.nativeElement.querySelector('video').controls).toBe(
             true
         );
+        expect(
+            fixture.nativeElement.querySelector('app-player-controls')
+        ).toBeNull();
     });
 
-    it('emits a playback issue when VideoJS reports an unsupported source', () => {
-        const issues: unknown[] = [];
-        const videoElement = document.createElement('video');
-        const testComponent = component as unknown as SignalApiShape & {
-            options: () => {
-                sources: Array<{ src: string; type: string }>;
-            };
-            target: () => { nativeElement: HTMLVideoElement };
-            handleVideoJsPlaybackError: () => void;
+    it('does not reload Video.js when options keep the same source', () => {
+        const source = {
+            src: 'https://example.test/live/playlist.m3u8',
+            type: 'application/x-mpegURL',
         };
-        testComponent.options = () => ({
+        render({ sources: [source] });
+        harness.src.mockClear();
+
+        fixture.componentRef.setInput('options', {
+            sources: [{ ...source }],
+        });
+        fixture.detectChanges();
+
+        expect(harness.src).not.toHaveBeenCalled();
+        expect(harness.reset).not.toHaveBeenCalled();
+    });
+
+    it('updates Video.js directly for a different normal source', () => {
+        render({
+            sources: [{ src: 'https://example.test/live/one.m3u8' }],
+        });
+
+        const nextSource = {
+            src: 'https://example.test/live/two.m3u8',
+            type: 'application/x-mpegURL',
+        };
+        fixture.componentRef.setInput('options', {
+            sources: [nextSource],
+        });
+        fixture.detectChanges();
+
+        expect(harness.src).toHaveBeenCalledWith(nextSource);
+        expect(harness.reset).not.toHaveBeenCalled();
+    });
+
+    it('resets Video.js when the source is cleared', () => {
+        render({
+            sources: [{ src: 'https://example.test/live/one.m3u8' }],
+        });
+
+        fixture.componentRef.setInput('options', { sources: [] });
+        fixture.detectChanges();
+
+        expect(harness.reset).toHaveBeenCalledTimes(1);
+        expect(harness.src).not.toHaveBeenCalled();
+    });
+
+    it('updates volume without reloading an unchanged source', () => {
+        render({
+            sources: [{ src: 'https://example.test/live/playlist.m3u8' }],
+        });
+        harness.volume.mockClear();
+        harness.src.mockClear();
+
+        fixture.componentRef.setInput('volume', 0.75);
+        fixture.detectChanges();
+
+        expect(harness.volume).toHaveBeenCalledWith(0.75);
+        expect(harness.src).not.toHaveBeenCalled();
+    });
+
+    it('does not persist reset volume and restores the current engine volume', () => {
+        localStorage.setItem('volume', '0.35');
+        render({
+            sources: [{ src: 'https://example.test/live/playlist.m3u8' }],
+        });
+        harness.volume(0.35);
+        harness.volume.mockClear();
+
+        fixture.componentRef.setInput('options', { sources: [] });
+        fixture.detectChanges();
+        harness.volume(1);
+        harness.emit('volumechange');
+
+        expect(localStorage.getItem('volume')).toBe('0.35');
+
+        harness.currentVideo = document.createElement('video');
+        harness.emit('playerreset');
+
+        expect(harness.volume).toHaveBeenLastCalledWith(0.35);
+    });
+
+    it('emits a diagnostic for a Video.js unsupported-source error', () => {
+        const issues: Array<PlaybackDiagnostic | null> = [];
+        component.playbackIssue.subscribe((issue) => issues.push(issue));
+        render({
             sources: [
                 {
-                    src: 'https://example.com/archive/movie.mkv',
+                    src: 'https://example.test/archive/movie.mkv',
                     type: 'video/matroska',
                 },
             ],
         });
-        testComponent.target = () => ({ nativeElement: videoElement });
-        jest.mocked(player.error).mockReturnValue({
+        harness.currentError = {
             code: 4,
             message: 'No compatible source was found',
-        });
+        };
 
-        const subscription = component.playbackIssue.subscribe((issue) =>
-            issues.push(issue)
-        );
-        testComponent.handleVideoJsPlaybackError();
-        subscription.unsubscribe();
+        harness.emit('error');
 
-        expect(issues).toEqual([
+        expect(issues.at(-1)).toEqual(
             expect.objectContaining({
                 code: 'unsupported-container',
                 source: 'native',
-                sourceUrl: 'https://example.com/archive/movie.mkv',
+                sourceUrl: 'https://example.test/archive/movie.mkv',
                 externalFallbackRecommended: true,
-            }),
-        ]);
+            })
+        );
     });
 
-    it('tears down mpegts playback when options clear the source', () => {
-        const mpegtsPlayer = {
-            pause: jest.fn(),
-            unload: jest.fn(),
-            detachMediaElement: jest.fn(),
-            destroy: jest.fn(),
-        };
-        const componentInternals = component as unknown as {
-            mpegtsPlayer: typeof mpegtsPlayer | null;
-        };
-        componentInternals.mpegtsPlayer = mpegtsPlayer;
-        const previousOptions = {
-            sources: [
-                {
-                    src: 'https://example.com/live/stream.ts',
-                    type: 'video/mp2t',
-                },
-            ],
-        };
-
-        component.ngOnChanges({
-            options: new SimpleChange(previousOptions, { sources: [] }, false),
-        });
-
-        expect(mpegtsPlayer.pause).toHaveBeenCalled();
-        expect(mpegtsPlayer.unload).toHaveBeenCalled();
-        expect(mpegtsPlayer.detachMediaElement).toHaveBeenCalled();
-        expect(mpegtsPlayer.destroy).toHaveBeenCalled();
-        expect(componentInternals.mpegtsPlayer).toBeNull();
-        expect(player.reset).toHaveBeenCalled();
-        expect(player.src).not.toHaveBeenCalled();
-    });
-
-    it('passes the non-live option to mpegts.js for VOD MPEG-TS playback', () => {
-        const videoElement = document.createElement('video');
-        const testComponent = component as unknown as {
-            options: () => {
-                isLive: boolean;
-                sources: Array<{ src: string; type: string }>;
-            };
-            player: {
-                tech: () => { el: () => HTMLVideoElement };
-                dispose: () => void;
-            };
-            initMpegTs: (url: string) => void;
-        };
-        testComponent.options = () => ({
-            isLive: false,
-            sources: [
-                {
-                    src: 'https://example.com/movie/123.ts',
-                    type: 'video/mp2t',
-                },
-            ],
-        });
-        testComponent.player = {
-            tech: () => ({ el: () => videoElement }),
-            dispose: jest.fn(),
-        };
-
-        testComponent.initMpegTs('https://example.com/movie/123.ts');
-
-        expect(mpegTsCreatePlayerMock).toHaveBeenCalledWith({
-            type: 'mpegts',
-            isLive: false,
-            url: 'https://example.com/movie/123.ts',
-        });
-    });
-
-    it('normalizes VideoJS duration for non-live MPEG-TS VOD when MSE reports infinity', () => {
-        const videoElement = document.createElement('video');
-        Object.defineProperty(videoElement, 'seekable', {
-            value: createTimeRanges([[0, 164.072]]),
-        });
-        Object.defineProperty(videoElement, 'buffered', {
-            value: createTimeRanges([]),
-        });
-        const testComponent = component as unknown as {
-            options: () => {
-                isLive: boolean;
-                sources: Array<{ src: string; type: string }>;
-            };
-            player: {
-                duration: (duration: number) => void;
-                dispose: () => void;
-            };
-            mpegTsVodDurationTarget: HTMLVideoElement;
-            syncMpegTsVodDuration: () => void;
-        };
-        testComponent.options = () => ({
-            isLive: false,
-            sources: [
-                {
-                    src: 'https://example.com/movie/123.ts',
-                    type: 'video/mp2t',
-                },
-            ],
-        });
-        testComponent.player = {
-            duration: jest.fn(),
-            dispose: jest.fn(),
-        };
-        testComponent.mpegTsVodDurationTarget = videoElement;
-
-        testComponent.syncMpegTsVodDuration();
-
-        expect(testComponent.player.duration).toHaveBeenCalledWith(164.072);
-    });
-
-    it('emits playbackEnded exactly once for a native ended event and not during reload or destroy', () => {
+    it('rebinds native ended handling after playerreset', () => {
         const events: string[] = [];
-        videoJsMock.mockReturnValue(createVideoJsPlayerMock());
-        fixture.componentRef.setInput('options', {
-            sources: [
-                {
-                    src: 'https://example.com/series/s01e02.mp4',
-                    type: 'video/mp4',
-                },
-            ],
+        component.playbackEnded.subscribe(() => events.push('ended'));
+        render({
+            sources: [{ src: 'https://example.test/series/one.mp4' }],
         });
-        (
-            component as unknown as {
-                playbackEnded: {
-                    subscribe: (fn: () => void) => { unsubscribe: () => void };
-                };
-            }
-        ).playbackEnded.subscribe(() => events.push('ended'));
+        const oldVideo = harness.currentVideo;
 
+        fixture.componentRef.setInput('options', { sources: [] });
         fixture.detectChanges();
-        fixture.nativeElement
-            .querySelector('video')
-            .dispatchEvent(new Event('ended'));
-        component.ngOnChanges({
-            options: new SimpleChange(
-                {
-                    sources: [
-                        {
-                            src: 'https://example.com/series/s01e02.mp4',
-                            type: 'video/mp4',
-                        },
-                    ],
-                },
-                {
-                    sources: [
-                        {
-                            src: 'https://example.com/series/s01e03.mp4',
-                            type: 'video/mp4',
-                        },
-                    ],
-                },
-                false
-            ),
-        });
-        fixture.destroy();
+        const replacementVideo = document.createElement('video');
+        harness.currentVideo = replacementVideo;
+        harness.emit('playerreset');
+        oldVideo.dispatchEvent(new Event('ended'));
+        replacementVideo.dispatchEvent(new Event('ended'));
 
         expect(events).toEqual(['ended']);
     });
 
-    it('hides series navigation controls when series navigation is absent', () => {
-        videoJsMock.mockReturnValue(createVideoJsPlayerMock());
-        fixture.componentRef.setInput('options', {
-            sources: [
-                {
-                    src: 'https://example.com/movie.mp4',
-                    type: 'video/mp4',
-                },
-            ],
+    it('hides legacy series navigation when metadata is absent', () => {
+        render({
+            sources: [{ src: 'https://example.test/movie.mp4' }],
         });
 
-        fixture.detectChanges();
-
         expect(
             fixture.debugElement.query(
                 By.css('[data-test-id="series-playback-previous-episode"]')
@@ -410,82 +236,97 @@ describe('VjsPlayerComponent', () => {
         ).toBeNull();
     });
 
-    it('renders series navigation controls with boundary disabled state', () => {
+    it('renders legacy series navigation with boundary state and outputs', () => {
         const events: string[] = [];
-        videoJsMock.mockReturnValue(createVideoJsPlayerMock());
-        fixture.componentRef.setInput('options', {
-            sources: [
-                {
-                    src: 'https://example.com/series/s01e01.mp4',
-                    type: 'video/mp4',
-                },
-            ],
-        });
+        component.previousEpisodeRequested.subscribe(() =>
+            events.push('previous')
+        );
+        component.nextEpisodeRequested.subscribe(() => events.push('next'));
         fixture.componentRef.setInput('seriesNavigation', {
             canPrevious: false,
             canNext: true,
             autoplayEnabled: true,
         });
-        (
-            component as unknown as {
-                previousEpisodeRequested: {
-                    subscribe: (fn: () => void) => { unsubscribe: () => void };
-                };
-                nextEpisodeRequested: {
-                    subscribe: (fn: () => void) => { unsubscribe: () => void };
-                };
-            }
-        ).previousEpisodeRequested.subscribe(() => events.push('previous'));
-        (
-            component as unknown as {
-                nextEpisodeRequested: {
-                    subscribe: (fn: () => void) => { unsubscribe: () => void };
-                };
-            }
-        ).nextEpisodeRequested.subscribe(() => events.push('next'));
+        render({
+            sources: [{ src: 'https://example.test/series/one.mp4' }],
+        });
 
-        fixture.detectChanges();
-
-        const previousButton = fixture.debugElement.query(
+        const previous = fixture.debugElement.query(
             By.css('[data-test-id="series-playback-previous-episode"]')
         );
-        const nextButton = fixture.debugElement.query(
+        const next = fixture.debugElement.query(
             By.css('[data-test-id="series-playback-next-episode"]')
         );
-        expect(previousButton).not.toBeNull();
-        expect(previousButton.nativeElement.disabled).toBe(true);
-        expect(nextButton).not.toBeNull();
-        expect(nextButton.nativeElement.disabled).toBe(false);
-
-        previousButton.nativeElement.click();
-        nextButton.nativeElement.click();
+        expect(previous.nativeElement.disabled).toBe(true);
+        expect(next.nativeElement.disabled).toBe(false);
 
+        previous.nativeElement.click();
+        next.nativeElement.click();
         expect(events).toEqual(['next']);
     });
+
+    function render(options: Record<string, unknown>): void {
+        fixture.componentRef.setInput('options', options);
+        fixture.detectChanges();
+        harness.ready();
+        fixture.detectChanges();
+    }
 });
 
-function createVideoJsPlayerMock(): VjsPlayerComponentInstance['player'] {
-    return {
-        audioTracks: jest.fn(() => null),
-        currentTime: jest.fn(() => 0),
-        duration: jest.fn(() => 0),
-        error: jest.fn(() => null),
-        getChild: jest.fn(() => null),
-        on: jest.fn(),
+function createPlayerHarness() {
+    const listeners = new Map<string, Set<() => void>>();
+    let volumeValue = 0.5;
+    const harness = {
+        currentVideo: document.createElement('video'),
+        currentError: null as { code?: number; message?: string } | null,
+        paused: true,
+        pauseCompletesImmediately: true,
+        ready: () => undefined,
+        pause: jest.fn(() => {
+            if (harness.pauseCompletesImmediately) {
+                harness.paused = true;
+            }
+        }),
         reset: jest.fn(),
         src: jest.fn(),
-        tech: jest.fn(() => ({ el: () => null })),
-        volume: jest.fn(),
+        volume: jest.fn((value?: number) => {
+            if (value !== undefined) {
+                volumeValue = value;
+            }
+            return volumeValue;
+        }),
+        emit(event: string) {
+            for (const listener of listeners.get(event) ?? []) {
+                listener();
+            }
+        },
+        player: null as unknown as VideoJsPlayer,
+    };
+    harness.player = {
+        audioTracks: jest.fn(() => null),
+        textTracks: jest.fn(() => null),
+        currentTime: jest.fn(() => 0),
+        duration: jest.fn(() => 0),
+        error: jest.fn(() => harness.currentError),
+        getChild: jest.fn(() => null),
+        on: jest.fn((event: string, listener: () => void) => {
+            const eventListeners =
+                listeners.get(event) ?? new Set<() => void>();
+            eventListeners.add(listener);
+            listeners.set(event, eventListeners);
+        }),
+        off: jest.fn((event: string, listener: () => void) => {
+            listeners.get(event)?.delete(listener);
+        }),
+        pause: harness.pause,
+        paused: jest.fn(() => harness.paused),
+        reset: harness.reset,
+        src: harness.src,
+        tech: jest.fn(() => ({ el: () => harness.currentVideo })),
+        volume: harness.volume,
         dispose: jest.fn(),
         qualitySelectorHls: jest.fn(),
         aspectRatioPanel: jest.fn(),
-    } as unknown as VjsPlayerComponentInstance['player'];
-}
-
-function createTimeRanges(ranges: Array<[number, number]>): TimeRanges {
-    return {
-        length: ranges.length,
-        start: (index: number) => ranges[index][0],
-        end: (index: number) => ranges[index][1],
-    } as TimeRanges;
+    } as unknown as VideoJsPlayer;
+    return harness;
 }
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.ts
index c2c0ce799..9911dd61a 100644
--- a/libs/ui/playback/src/lib/vjs-player/vjs-player.component.ts
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.component.ts
@@ -6,92 +6,50 @@ import {
     OnInit,
     SimpleChanges,
     ViewEncapsulation,
+    inject,
     input,
     output,
+    signal,
     viewChild,
 } from '@angular/core';
 import '@yangkghjh/videojs-aspect-ratio-panel';
-import mpegts from 'mpegts.js';
 import { createDevLogger } from '@iptvnator/shared/interfaces';
 import videoJs from 'video.js';
 import 'videojs-contrib-quality-levels';
 import 'videojs-quality-selector-hls';
 import {
     InlinePlaybackPlayer,
-    PlaybackDiagnostic,
-    classifyMpegTsPlaybackIssue,
+    type PlaybackDiagnostic,
     classifyNativePlaybackIssue,
     createPlaybackSourceMetadata,
-    getPlaybackMediaExtensionFromUrl,
 } from '../playback-diagnostics/playback-diagnostics.util';
+import {
+    PlayerControlsComponent,
+    type PlayerMediaTitle,
+    WEB_PLAYER_SHARED_CONTROLS,
+    WebVideoControlsAdapter,
+} from '../player-controls';
 import { SeriesPlaybackNavigationControlsComponent } from '../portal-inline-player/series-playback-navigation-controls.component';
 import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
-
-/**
- * This component contains the implementation of video player that is based on video.js library
- */
-
-type VideoPlayerSource = {
-    src: string;
-    type?: string;
-};
-
-type VideoPlayerOptions = Record<string, unknown> & {
-    autoplay?: boolean;
-    isLive?: boolean;
-    reloadToken?: number;
-    sources?: VideoPlayerSource[];
-};
-
-type VideoJsAudioTrack = {
-    label?: string;
-    language?: string;
-    enabled?: boolean;
-    kind?: string;
-};
-
-type VideoJsAudioTrackList = {
-    length: number;
-    [index: number]: VideoJsAudioTrack;
-    addEventListener: (
-        type: string,
-        listener: EventListenerOrEventListenerObject
-    ) => void;
-};
-
-type VideoJsTech = {
-    el?: () => Element | null;
-    vhs?: {
-        playlists?: {
-            main?: { mediaGroups?: { AUDIO?: Record<string, unknown> } };
-            master?: { mediaGroups?: { AUDIO?: Record<string, unknown> } };
-        };
-    };
-};
-
-type VideoJsControlChild = {
-    getChild?: (name: string) => VideoJsControlChild | null;
-    addChild?: (
-        name: string,
-        options?: Record<string, unknown>
-    ) => VideoJsControlChild | null;
-    show?: () => void;
-    update?: () => void;
-};
-
-type VideoJsPlayer = Omit<
-    ReturnType<typeof videoJs>,
-    'audioTracks' | 'tech' | 'getChild'
-> & {
-    qualitySelectorHls?: (options?: {
-        displayCurrentQuality?: boolean;
-    }) => void;
-    aspectRatioPanel?: () => void;
-    audioTracks: () => VideoJsAudioTrackList | null;
-    tech: (options?: unknown) => VideoJsTech | null;
-    getChild: (name: string) => VideoJsControlChild | null;
-    error: () => { code?: number; message?: string } | null;
-};
+import { logVjsAudioTracks, setupVjsAudioTrackMenu } from './vjs-audio-tracks';
+import { VjsLegacyTracks } from './vjs-legacy-tracks';
+import { VjsMpegTsSession } from './vjs-mpegts-session';
+import { VjsPlayerControlsBridge } from './vjs-player-controls.bridge';
+import {
+    createVjsPlayerOptions,
+    exitOwnedVjsFullscreen,
+    initializeVjsPlugins,
+    queueVjsTask,
+    shouldChangeVjsSource,
+} from './vjs-player-setup';
+import { VjsPlayerResetCoordinator } from './vjs-player-reset-coordinator';
+import {
+    type VideoJsPlayer,
+    type VideoPlayerOptions,
+    type VideoPlayerSource,
+    getVideoJsTechVideo,
+} from './vjs-player.types';
+import { VjsVideoElementSession } from './vjs-video-element-session';
 
 const debugVjsPlayer = createDevLogger('VjsPlayer');
 
@@ -100,29 +58,25 @@ const debugVjsPlayer = createDevLogger('VjsPlayer');
     templateUrl: './vjs-player.component.html',
     styleUrls: ['./vjs-player.component.scss'],
     encapsulation: ViewEncapsulation.None,
-    imports: [SeriesPlaybackNavigationControlsComponent],
+    imports: [
+        PlayerControlsComponent,
+        SeriesPlaybackNavigationControlsComponent,
+    ],
+    providers: [WebVideoControlsAdapter],
     standalone: true,
 })
 export class VjsPlayerComponent implements OnInit, OnChanges, OnDestroy {
-    /** DOM-element reference */
-    readonly target = viewChild.required<ElementRef<Element>>('target');
-    /** Options of VideoJs player */
+    readonly target =
+        viewChild.required<ElementRef<HTMLVideoElement>>('target');
+    readonly playerRoot = viewChild<ElementRef<HTMLElement>>('playerRoot');
     readonly options = input.required<VideoPlayerOptions>();
-    /** VideoJs object */
-    player!: VideoJsPlayer;
-    /** mpegts.js player for raw MPEG-TS streams */
-    private mpegtsPlayer: mpegts.Player | null = null;
-    private mpegTsVodDurationTarget: HTMLVideoElement | null = null;
-    private readonly mpegTsVodDurationEvents = [
-        'durationchange',
-        'loadedmetadata',
-        'progress',
-        'timeupdate',
-        'error',
-    ] as const;
     readonly volume = input(1);
     readonly startTime = input(0);
     readonly seriesNavigation = input<SeriesPlaybackNavigation | null>(null);
+    readonly interactionEnabled = input(true);
+    readonly showCaptions = input(false);
+    readonly mediaTitle = input<PlayerMediaTitle | null>(null);
+
     readonly timeUpdate = output<{
         currentTime: number;
         duration: number;
@@ -132,141 +86,92 @@ export class VjsPlayerComponent implements OnInit, OnChanges, OnDestroy {
     readonly previousEpisodeRequested = output<void>();
     readonly nextEpisodeRequested = output<void>();
 
-    private readonly clearPlaybackIssue = () => {
-        this.playbackIssue.emit(null);
-    };
-    private readonly handlePlaybackEnded = () => {
-        this.playbackEnded.emit();
-    };
-    private readonly scheduleMpegTsVodDurationSync = () => {
-        this.syncMpegTsVodDuration();
-        this.queueDurationSync(() => this.syncMpegTsVodDuration());
-    };
+    readonly sharedControls = inject(WEB_PLAYER_SHARED_CONTROLS);
+    readonly controlsAdapter = inject(WebVideoControlsAdapter);
+    player!: VideoJsPlayer;
+
+    private readonly seriesNavigationSignal =
+        signal<SeriesPlaybackNavigation | null>(null);
+    private readonly videoSession = new VjsVideoElementSession({
+        clearPlaybackIssue: () => this.playbackIssue.emit(null),
+        emitPlaybackEnded: () => this.playbackEnded.emit(),
+    });
+    private readonly mpegTsSession = new VjsMpegTsSession({
+        player: () => this.player,
+        isLive: () => this.options().isLive !== false,
+        emitPlaybackIssue: (issue) => this.playbackIssue.emit(issue),
+    });
+    private readonly resetCoordinator = new VjsPlayerResetCoordinator({
+        player: () => this.player,
+        fallbackVolume: () => this.volume(),
+        queueTask: queueVjsTask,
+        reportError: (error) =>
+            debugVjsPlayer('Failed to reset Video.js player:', error),
+    });
+    private controlsBridge: VjsPlayerControlsBridge | null = null;
+    /** Track ownership for the legacy chrome; null with shared controls. */
+    private legacyTracks: VjsLegacyTracks | null = null;
+    private desiredSource: VideoPlayerSource | null = null;
+    private readyHandled = false;
+    private destroyed = false;
 
-    /**
-     * Instantiate Video.js on component init
-     */
     ngOnInit(): void {
-        const source = this.options().sources?.[0];
-        const isMpegTs = this.isMpegTsSource(source?.src);
-        const targetVideo = this.target().nativeElement as HTMLVideoElement;
-        targetVideo.addEventListener('loadeddata', this.clearPlaybackIssue);
-        targetVideo.addEventListener('playing', this.clearPlaybackIssue);
-        targetVideo.addEventListener('ended', this.handlePlaybackEnded);
-
-        // For raw MPEG-TS streams, init Video.js without a source (UI/controls only)
-        const vjsOptions = isMpegTs
-            ? { ...this.options(), sources: [], autoplay: false }
-            : { ...this.options(), autoplay: true };
-
-        this.player = videoJs(this.target().nativeElement, vjsOptions, () => {
-            debugVjsPlayer(
-                'Setting VideoJS player initial volume to:',
-                this.volume()
-            );
-            this.player.volume(this.volume());
-
-            this.player.on('loadedmetadata', () => {
-                if (this.startTime() > 0) {
-                    this.player.currentTime(this.startTime());
-                }
-                this.playbackIssue.emit(null);
-                this.logAudioTracks();
-                this.setupAudioTrackMenu();
+        this.desiredSource = this.options().sources?.[0] ?? null;
+        this.seriesNavigationSignal.set(this.seriesNavigation());
+        if (this.sharedControls) {
+            this.controlsAdapter.setContext({
+                seriesNavigation: this.seriesNavigationSignal,
             });
-
-            this.player.on('error', () => {
-                this.handleVideoJsPlaybackError();
-            });
-
-            // Audio tracks may be added after loadedmetadata (e.g. HLS alternate audio)
-            const audioTracks = this.player.audioTracks();
-            if (audioTracks) {
-                audioTracks.addEventListener('addtrack', () => {
-                    debugVjsPlayer(
-                        '[AudioTrack] addtrack event fired, total tracks:',
-                        audioTracks.length
-                    );
-                    this.logAudioTracks();
-                    this.setupAudioTrackMenu();
-                });
-                audioTracks.addEventListener('removetrack', () => {
-                    debugVjsPlayer(
-                        '[AudioTrack] removetrack event fired, total tracks:',
-                        audioTracks.length
-                    );
-                    this.logAudioTracks();
-                    this.setupAudioTrackMenu();
-                });
-                audioTracks.addEventListener('change', () => {
-                    this.logAudioTracks();
-                });
-            }
-
-            this.player.on('volumechange', () => {
-                const currentVolume = this.player.volume() ?? this.volume();
-                localStorage.setItem('volume', currentVolume.toString());
-            });
-
-            this.player.on('timeupdate', () => {
-                this.timeUpdate.emit({
-                    currentTime: this.player.currentTime() ?? 0,
-                    duration: this.player.duration() ?? 0,
-                });
-            });
-
-            // Attach mpegts.js after Video.js is ready
-            if (isMpegTs && source) {
-                this.initMpegTs(source.src);
-            }
-        }) as unknown as VideoJsPlayer;
-        try {
-            if (typeof this.player.qualitySelectorHls === 'function') {
-                this.player.qualitySelectorHls({
-                    displayCurrentQuality: true,
-                });
-            }
-        } catch (e) {
-            console.warn('qualitySelectorHls plugin failed to initialize:', e);
-        }
-        try {
-            if (typeof this.player.aspectRatioPanel === 'function') {
-                this.player.aspectRatioPanel();
-            }
-        } catch (e) {
-            console.warn('aspectRatioPanel plugin failed to initialize:', e);
         }
+
+        const vjsOptions = createVjsPlayerOptions(
+            this.options(),
+            this.mpegTsSession.isSupportedSource(this.desiredSource?.src),
+            this.sharedControls
+        );
+        this.player = videoJs(
+            this.target().nativeElement,
+            vjsOptions,
+            this.handlePlayerReady
+        ) as unknown as VideoJsPlayer;
+        this.bindPlayerEvents();
+        initializeVjsPlugins(this.player);
     }
 
-    /**
-     * Replaces the url source of the player with the changed source url
-     * @param changes contains changed channel object
-     */
     ngOnChanges(changes: SimpleChanges): void {
-        if (changes['options']?.previousValue) {
-            const previousSource =
-                changes['options'].previousValue.sources?.[0];
-            const newSource = changes['options'].currentValue.sources?.[0];
+        if (changes['seriesNavigation']) {
+            this.seriesNavigationSignal.set(this.seriesNavigation());
+        }
+        if (changes['options']?.previousValue && this.player) {
+            const previousOptions = changes['options']
+                .previousValue as VideoPlayerOptions;
+            const currentOptions = changes['options']
+                .currentValue as VideoPlayerOptions;
             if (
-                this.hasPlaybackInputChanged(
-                    changes['options'].previousValue,
-                    changes['options'].currentValue,
-                    previousSource,
-                    newSource
+                shouldChangeVjsSource(previousOptions, currentOptions, (url) =>
+                    this.mpegTsSession.isSupportedSource(url)
                 )
             ) {
-                this.playbackIssue.emit(null);
-                this.destroyMpegTs();
-                if (!newSource) {
-                    this.player.reset();
-                } else if (this.isMpegTsSource(newSource.src)) {
-                    this.player.reset();
-                    this.initMpegTs(newSource.src);
-                } else {
-                    this.player.src(newSource);
-                }
+                this.changeSource(currentOptions.sources?.[0] ?? null);
+            } else {
+                this.controlsBridge?.refreshInputs();
             }
         }
+        if (changes['showCaptions']) {
+            this.controlsBridge?.refreshInputs();
+            this.legacyTracks?.refreshInputs();
+        }
+        if (changes['interactionEnabled']?.currentValue === false) {
+            exitOwnedVjsFullscreen(
+                this.sharedControls,
+                this.playerRoot()?.nativeElement,
+                (error) =>
+                    debugVjsPlayer(
+                        'Failed to exit Video.js player fullscreen:',
+                        error
+                    )
+            );
+        }
         if (changes['volume']?.currentValue !== undefined && this.player) {
             debugVjsPlayer(
                 'Setting VideoJS player volume to:',
@@ -276,284 +181,218 @@ export class VjsPlayerComponent implements OnInit, OnChanges, OnDestroy {
         }
     }
 
-    /**
-     * Removes the players HTML reference on destroy
-     */
     ngOnDestroy(): void {
-        this.destroyMpegTs();
-        this.removeNativePlaybackListeners();
+        this.destroyed = true;
+        this.resetCoordinator.destroy();
+        this.controlsBridge?.destroy();
+        this.controlsBridge = null;
+        this.legacyTracks?.destroy();
+        this.legacyTracks = null;
+        this.mpegTsSession.destroy();
+        this.videoSession.destroy();
         if (this.player) {
+            this.unbindPlayerEvents();
             this.player.dispose();
         }
     }
 
-    private isMpegTsSource(url?: string): boolean {
-        if (!url) return false;
-        const extension = getPlaybackMediaExtensionFromUrl(url);
-        return (extension === 'ts' || !extension) && mpegts.isSupported();
-    }
-
-    private hasPlaybackInputChanged(
-        previousOptions: VideoPlayerOptions,
-        newOptions: VideoPlayerOptions,
-        previousSource: VideoPlayerSource | undefined,
-        newSource: VideoPlayerSource | undefined
-    ): boolean {
-        return (
-            previousOptions.reloadToken !== newOptions.reloadToken ||
-            previousSource?.src !== newSource?.src ||
-            previousSource?.type !== newSource?.type
-        );
-    }
-
-    private removeNativePlaybackListeners(): void {
-        try {
-            const targetVideo = this.target().nativeElement as HTMLVideoElement;
-            targetVideo.removeEventListener(
-                'loadeddata',
-                this.clearPlaybackIssue
-            );
-            targetVideo.removeEventListener('playing', this.clearPlaybackIssue);
-            targetVideo.removeEventListener('ended', this.handlePlaybackEnded);
-        } catch {
-            // Required viewChild can be unavailable when a shallow unit test destroys an unrendered component.
+    private readonly handlePlayerReady = () => {
+        if (this.destroyed || this.readyHandled) {
+            return;
         }
-    }
-
-    private initMpegTs(url: string): void {
-        const videoEl = this.player
-            .tech({ IWillNotUseThisInPlugins: true })
-            ?.el?.();
-        if (!videoEl) return;
-
-        debugVjsPlayer('Using mpegts.js for TS stream:', url);
-        const isLive = this.options().isLive !== false;
-        this.mpegtsPlayer = mpegts.createPlayer({
-            type: 'mpegts',
-            isLive,
-            url: url,
-        });
-        this.mpegtsPlayer.attachMediaElement(videoEl as HTMLVideoElement);
-        if (!isLive) {
-            this.attachMpegTsVodDurationNormalization(
-                videoEl as HTMLVideoElement
-            );
+        if (!this.player) {
+            queueVjsTask(this.handlePlayerReady);
+            return;
         }
-        this.mpegtsPlayer.on(
-            mpegts.Events.ERROR,
-            (type: string, details: string, info: unknown): void => {
-                this.syncMpegTsVodDuration();
-                this.playbackIssue.emit(
-                    classifyMpegTsPlaybackIssue(
-                        {
-                            type,
-                            details,
-                            info,
-                        },
-                        this.createSourceMetadata(url, 'video/mp2t')
-                    )
-                );
-            }
+        this.readyHandled = true;
+        debugVjsPlayer(
+            'Setting VideoJS player initial volume to:',
+            this.volume()
         );
-        this.mpegtsPlayer.load();
-        this.mpegtsPlayer.play();
-    }
+        this.player.volume(this.volume());
+        this.initializeLegacyTracks();
+        const video = this.bindCurrentTechVideo();
+        if (video && this.resetCoordinator.canApplyReadySource()) {
+            this.activateSource(this.desiredSource, video);
+        }
+    };
 
-    private handleVideoJsPlaybackError(): void {
-        const source = this.options().sources?.[0];
-        const targetVideo = this.target().nativeElement as HTMLVideoElement;
-        const videoJsError =
-            typeof this.player?.error === 'function'
+    private readonly handleLoadedMetadata = () => {
+        this.bindCurrentTechVideo();
+        if (this.startTime() > 0) {
+            this.player.currentTime(this.startTime());
+        }
+        this.playbackIssue.emit(null);
+        this.legacyTracks?.bind();
+        logVjsAudioTracks(this.player);
+        setupVjsAudioTrackMenu(this.player);
+        this.controlsBridge?.refreshInputs();
+    };
+
+    private readonly handleVideoJsError = () => {
+        const source = this.desiredSource;
+        const video =
+            this.videoSession.video() ??
+            getVideoJsTechVideo(this.player) ??
+            this.target().nativeElement;
+        const playerError =
+            typeof this.player.error === 'function'
                 ? this.player.error()
                 : null;
-        const nativeError = targetVideo?.error ?? null;
-
-        this.syncMpegTsVodDuration();
+        this.mpegTsSession.syncDuration();
         this.playbackIssue.emit(
             classifyNativePlaybackIssue(
-                videoJsError ?? nativeError,
-                this.createSourceMetadata(
-                    source?.src ?? targetVideo?.currentSrc ?? '',
-                    source?.type
-                )
+                playerError ?? video.error,
+                createPlaybackSourceMetadata({
+                    url: source?.src ?? video.currentSrc ?? '',
+                    mimeType: source?.type,
+                    player: InlinePlaybackPlayer.VideoJs,
+                })
             )
         );
+    };
+
+    private readonly handleVolumeChange = () => {
+        if (this.resetCoordinator.shouldSuppressVolumeChange()) {
+            return;
+        }
+        const currentVolume = this.player.volume() ?? this.volume();
+        localStorage.setItem('volume', currentVolume.toString());
+    };
+
+    private readonly handleTimeUpdate = () => {
+        this.timeUpdate.emit({
+            currentTime: this.player.currentTime() ?? 0,
+            duration: this.player.duration() ?? 0,
+        });
+    };
+
+    private readonly handlePlayerReset = () => {
+        this.player.volume(this.resetCoordinator.handlePlayerReset());
+        this.controlsBridge?.clearSource();
+        this.legacyTracks?.clear();
+        this.mpegTsSession.destroy();
+        this.restoreDesiredSourceAfterReset(true);
+    };
+
+    private readonly handlePauseForReset = () => {
+        this.resetCoordinator.handlePause();
+    };
+
+    private changeSource(source: VideoPlayerSource | null): void {
+        this.playbackIssue.emit(null);
+        this.controlsBridge?.clearSource();
+        this.legacyTracks?.clear();
+        this.mpegTsSession.destroy();
+        this.desiredSource = source;
+        this.resetCoordinator.clearSourceApplied();
+
+        if (!source || this.mpegTsSession.isSupportedSource(source.src)) {
+            this.resetCoordinator.requestReset();
+            return;
+        }
+
+        if (this.resetCoordinator.cancelPendingReset()) {
+            return;
+        }
+        this.player.src(source);
+        this.controlsBridge?.setSource();
+        this.resetCoordinator.markSourceApplied();
     }
 
-    private attachMpegTsVodDurationNormalization(
-        videoEl: HTMLVideoElement
+    private restoreDesiredSourceAfterReset(allowRetry: boolean): void {
+        if (this.destroyed) {
+            return;
+        }
+        const video = this.bindCurrentTechVideo();
+        if (!video) {
+            if (allowRetry) {
+                queueVjsTask(() => this.restoreDesiredSourceAfterReset(false));
+            }
+            return;
+        }
+
+        const source = this.desiredSource;
+        if (!source) {
+            this.resetCoordinator.markSourceApplied();
+            return;
+        }
+        if (this.mpegTsSession.isSupportedSource(source.src)) {
+            this.activateSource(source, video);
+            return;
+        }
+
+        this.player.src(source);
+        this.controlsBridge?.setSource();
+        this.legacyTracks?.bind();
+        this.resetCoordinator.markSourceApplied();
+    }
+
+    private activateSource(
+        source: VideoPlayerSource | null,
+        video: HTMLVideoElement
     ): void {
-        this.detachMpegTsVodDurationNormalization();
-        this.mpegTsVodDurationTarget = videoEl;
-        for (const eventName of this.mpegTsVodDurationEvents) {
-            videoEl.addEventListener(
-                eventName,
-                this.scheduleMpegTsVodDurationSync
-            );
-        }
-        this.syncMpegTsVodDuration();
-    }
-
-    private detachMpegTsVodDurationNormalization(): void {
-        if (!this.mpegTsVodDurationTarget) {
+        if (!source) {
+            this.resetCoordinator.markSourceApplied();
             return;
         }
-
-        for (const eventName of this.mpegTsVodDurationEvents) {
-            this.mpegTsVodDurationTarget.removeEventListener(
-                eventName,
-                this.scheduleMpegTsVodDurationSync
-            );
+        this.controlsBridge?.setSource();
+        this.legacyTracks?.bind();
+        if (this.mpegTsSession.isSupportedSource(source.src)) {
+            debugVjsPlayer('Using mpegts.js for TS stream:', source.src);
+            this.mpegTsSession.start(source.src, video);
         }
-        this.mpegTsVodDurationTarget = null;
+        this.resetCoordinator.markSourceApplied();
     }
 
-    private syncMpegTsVodDuration(): void {
-        if (this.options().isLive !== false || !this.mpegTsVodDurationTarget) {
-            return;
+    private bindCurrentTechVideo(): HTMLVideoElement | null {
+        const video = getVideoJsTechVideo(this.player);
+        if (!video) {
+            return null;
         }
-
-        const duration = this.getFiniteMpegTsVodDuration(
-            this.mpegTsVodDurationTarget
-        );
-        if (!duration) {
-            return;
-        }
-
-        if (this.player.duration() !== duration) {
-            this.player.duration(duration);
-        }
-    }
-
-    private getFiniteMpegTsVodDuration(videoEl: HTMLVideoElement): number {
-        return (
-            this.getFiniteTimeRangeEnd(videoEl.seekable) ??
-            this.getFiniteTimeRangeEnd(videoEl.buffered) ??
-            0
-        );
-    }
-
-    private getFiniteTimeRangeEnd(ranges: TimeRanges): number | null {
-        for (let index = ranges.length - 1; index >= 0; index--) {
-            try {
-                const end = ranges.end(index);
-                if (Number.isFinite(end) && end > 0) {
-                    return end;
-                }
-            } catch {
-                continue;
+        this.videoSession.bind(video);
+        if (this.sharedControls) {
+            if (!this.controlsBridge) {
+                this.controlsBridge = new VjsPlayerControlsBridge({
+                    player: this.player,
+                    adapter: this.controlsAdapter,
+                    isLive: () => this.options().isLive !== false,
+                    showCaptions: () => this.showCaptions(),
+                });
+                this.controlsBridge.attach(video);
+            } else {
+                this.controlsBridge.rebind(video);
             }
         }
-
-        return null;
+        return video;
     }
 
-    private queueDurationSync(callback: () => void): void {
-        if (typeof queueMicrotask === 'function') {
-            queueMicrotask(callback);
+    private initializeLegacyTracks(): void {
+        if (this.sharedControls || this.legacyTracks) {
             return;
         }
-
-        void Promise.resolve().then(callback);
-    }
-
-    private createSourceMetadata(url: string, mimeType?: string) {
-        return createPlaybackSourceMetadata({
-            url,
-            mimeType,
-            player: InlinePlaybackPlayer.VideoJs,
+        this.legacyTracks = new VjsLegacyTracks({
+            player: this.player,
+            showCaptions: () => this.showCaptions(),
         });
+        this.legacyTracks.bind();
     }
 
-    private destroyMpegTs(): void {
-        this.detachMpegTsVodDurationNormalization();
-        if (this.mpegtsPlayer) {
-            this.mpegtsPlayer.pause();
-            this.mpegtsPlayer.unload();
-            this.mpegtsPlayer.detachMediaElement();
-            this.mpegtsPlayer.destroy();
-            this.mpegtsPlayer = null;
-        }
+    private bindPlayerEvents(): void {
+        this.player.on('loadedmetadata', this.handleLoadedMetadata);
+        this.player.on('error', this.handleVideoJsError);
+        this.player.on('volumechange', this.handleVolumeChange);
+        this.player.on('timeupdate', this.handleTimeUpdate);
+        this.player.on('pause', this.handlePauseForReset);
+        this.player.on('playerreset', this.handlePlayerReset);
     }
 
-    /**
-     * Logs all available audio tracks for debugging.
-     */
-    private logAudioTracks(): void {
-        const audioTracks = this.player.audioTracks();
-        debugVjsPlayer(
-            '[AudioTrack] Audio tracks count:',
-            audioTracks?.length ?? 0
-        );
-        if (!audioTracks) {
-            return;
-        }
-
-        for (let i = 0; i < audioTracks.length; i++) {
-            const t = audioTracks[i];
-            debugVjsPlayer(
-                `[AudioTrack] Track ${i}: label="${t.label}", language="${t.language}", enabled=${t.enabled}, kind="${t.kind}"`
-            );
-        }
-
-        // Also check the underlying tech for HLS audio tracks
-        const tech =
-            typeof this.player?.tech === 'function'
-                ? this.player.tech({ IWillNotUseThisInPlugins: true })
-                : null;
-        const audioMediaGroups =
-            tech?.vhs?.playlists?.main?.mediaGroups?.AUDIO ??
-            tech?.vhs?.playlists?.master?.mediaGroups?.AUDIO;
-
-        if (audioMediaGroups) {
-            debugVjsPlayer(
-                '[AudioTrack] HLS AUDIO media groups:',
-                JSON.stringify(Object.keys(audioMediaGroups))
-            );
-        } else {
-            debugVjsPlayer(
-                '[AudioTrack] HLS AUDIO media groups: none found in playlist metadata'
-            );
-        }
-    }
-
-    /**
-     * Sets up the audio track selection menu in the control bar.
-     * Uses the Video.js audioTracks() API which works with both
-     * native multi-audio streams and HLS.js alternate audio tracks.
-     */
-    private setupAudioTrackMenu(): void {
-        const audioTracks = this.player.audioTracks();
-        debugVjsPlayer(
-            '[AudioTrack] setupAudioTrackMenu called, tracks:',
-            audioTracks?.length ?? 0
-        );
-        if (!audioTracks || audioTracks.length <= 1) {
-            debugVjsPlayer(
-                '[AudioTrack] Skipping menu: need >1 tracks, have',
-                audioTracks?.length ?? 0
-            );
-            debugVjsPlayer(
-                '[AudioTrack] If VLC/MPV show more tracks, the HLS manifest likely does not expose alternate audio via EXT-X-MEDIA'
-            );
-            return;
-        }
-
-        const controlBar = this.player.getChild('controlBar');
-        if (!controlBar) {
-            return;
-        }
-
-        let audioButton =
-            controlBar.getChild?.('audioTrackButton') ??
-            controlBar.getChild?.('AudioTrackButton');
-        if (!audioButton && controlBar.addChild) {
-            audioButton = controlBar.addChild('audioTrackButton', {});
-        }
-
-        if (audioButton) {
-            audioButton.show?.();
-            audioButton.update?.();
-        }
+    private unbindPlayerEvents(): void {
+        this.player.off('loadedmetadata', this.handleLoadedMetadata);
+        this.player.off('error', this.handleVideoJsError);
+        this.player.off('volumechange', this.handleVolumeChange);
+        this.player.off('timeupdate', this.handleTimeUpdate);
+        this.player.off('pause', this.handlePauseForReset);
+        this.player.off('playerreset', this.handlePlayerReset);
     }
 }
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.types.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.types.spec.ts
new file mode 100644
index 000000000..9bfa1600e
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.types.spec.ts
@@ -0,0 +1,30 @@
+import { type VideoJsPlayer, getVideoJsTechVideo } from './vjs-player.types';
+
+describe('getVideoJsTechVideo', () => {
+    it('returns the current Video.js Tech video element', () => {
+        const video = document.createElement('video');
+        const tech = jest.fn(() => ({ el: () => video }));
+
+        expect(getVideoJsTechVideo({ tech } as unknown as VideoJsPlayer)).toBe(
+            video
+        );
+        expect(tech).toHaveBeenCalledWith({
+            IWillNotUseThisInPlugins: true,
+        });
+    });
+
+    it('rejects non-video Tech elements and transient access failures', () => {
+        expect(
+            getVideoJsTechVideo({
+                tech: () => ({ el: () => document.createElement('div') }),
+            } as unknown as VideoJsPlayer)
+        ).toBeNull();
+        expect(
+            getVideoJsTechVideo({
+                tech: () => {
+                    throw new Error('Tech unavailable');
+                },
+            } as unknown as VideoJsPlayer)
+        ).toBeNull();
+    });
+});
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-player.types.ts b/libs/ui/playback/src/lib/vjs-player/vjs-player.types.ts
new file mode 100644
index 000000000..5c4b64149
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-player.types.ts
@@ -0,0 +1,98 @@
+import type videoJs from 'video.js';
+
+export type VideoPlayerSource = {
+    src: string;
+    type?: string;
+};
+
+export type VideoPlayerOptions = Record<string, unknown> & {
+    autoplay?: boolean;
+    controls?: boolean;
+    isLive?: boolean;
+    reloadToken?: number;
+    sources?: VideoPlayerSource[];
+    spatialNavigation?: Record<string, unknown> & {
+        enabled?: boolean;
+    };
+    userActions?: Record<string, unknown> & {
+        click?: boolean;
+        doubleClick?: boolean;
+        hotkeys?: boolean;
+    };
+};
+
+export type VideoJsAudioTrack = {
+    label?: string;
+    language?: string;
+    enabled?: boolean;
+    kind?: string;
+};
+
+export type VideoJsTextTrack = {
+    label?: string;
+    language?: string;
+    kind?: string;
+    mode: TextTrackMode;
+};
+
+export type VideoJsTrackList<TTrack> = {
+    length: number;
+    [index: number]: TTrack;
+    addEventListener?: (
+        type: string,
+        listener: EventListenerOrEventListenerObject
+    ) => void;
+    removeEventListener?: (
+        type: string,
+        listener: EventListenerOrEventListenerObject
+    ) => void;
+};
+
+export type VideoJsAudioTrackList = VideoJsTrackList<VideoJsAudioTrack>;
+export type VideoJsTextTrackList = VideoJsTrackList<VideoJsTextTrack>;
+
+export type VideoJsTech = {
+    el?: () => Element | null;
+    vhs?: {
+        playlists?: {
+            main?: { mediaGroups?: { AUDIO?: Record<string, unknown> } };
+            master?: { mediaGroups?: { AUDIO?: Record<string, unknown> } };
+        };
+    };
+};
+
+export type VideoJsControlChild = {
+    getChild?: (name: string) => VideoJsControlChild | null;
+    addChild?: (
+        name: string,
+        options?: Record<string, unknown>
+    ) => VideoJsControlChild | null;
+    show?: () => void;
+    update?: () => void;
+};
+
+export type VideoJsPlayer = Omit<
+    ReturnType<typeof videoJs>,
+    'audioTracks' | 'textTracks' | 'tech' | 'getChild' | 'error'
+> & {
+    qualitySelectorHls?: (options?: {
+        displayCurrentQuality?: boolean;
+    }) => void;
+    aspectRatioPanel?: () => void;
+    audioTracks: () => VideoJsAudioTrackList | null;
+    textTracks: () => VideoJsTextTrackList | null;
+    tech: (options?: unknown) => VideoJsTech | null;
+    getChild: (name: string) => VideoJsControlChild | null;
+    error: () => { code?: number; message?: string } | null;
+};
+
+export function getVideoJsTechVideo(
+    player: Pick<VideoJsPlayer, 'tech'>
+): HTMLVideoElement | null {
+    try {
+        const element = player.tech({ IWillNotUseThisInPlugins: true })?.el?.();
+        return element instanceof HTMLVideoElement ? element : null;
+    } catch {
+        return null;
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.spec.ts
new file mode 100644
index 000000000..a969508bf
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.spec.ts
@@ -0,0 +1,400 @@
+import type {
+    VideoJsPlayer,
+    VideoJsTextTrack,
+    VideoJsTextTrackList,
+} from './vjs-player.types';
+import { VjsTextTracks } from './vjs-text-tracks';
+
+const TEXT_TRACK_EVENTS = [
+    'addtrack',
+    'removetrack',
+    'change',
+    'labelchange',
+] as const;
+
+describe('VjsTextTracks', () => {
+    it('projects only captions and subtitles with stable per-source IDs', () => {
+        const english = createTextTrack({
+            kind: 'captions',
+            label: 'English CC',
+            mode: 'showing',
+        });
+        const metadata = createTextTrack({
+            kind: 'metadata',
+            mode: 'showing',
+        });
+        const german = createTextTrack({ kind: 'subtitles', language: 'de' });
+        const fallback = createTextTrack({ kind: 'captions' });
+        const { helper, tracks } = createBoundHelper([
+            english,
+            metadata,
+            german,
+            fallback,
+        ]);
+
+        expect(helper.getSubtitleTracks()).toEqual([
+            { id: 0, label: 'English CC', selected: true },
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+        ]);
+
+        tracks.remove(english);
+
+        expect(helper.getSubtitleTracks()).toEqual([
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+        ]);
+
+        tracks.add(english);
+
+        expect(helper.getSubtitleTracks()).toEqual([
+            { id: 1, label: 'de', selected: false },
+            { id: 2, label: 'Subtitle 3', selected: false },
+            { id: 0, label: 'English CC', selected: true },
+        ]);
+    });
+
+    it('selects one valid track and disables every other VHS text track', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'hidden',
+        });
+        const third = createTextTrack({
+            kind: 'captions',
+            mode: 'disabled',
+        });
+        const metadata = createTextTrack({
+            kind: 'metadata',
+            mode: 'showing',
+        });
+        const { helper, tracks } = createBoundHelper([
+            first,
+            second,
+            third,
+            metadata,
+        ]);
+
+        helper.setSubtitleTrack(1);
+
+        expect(first.mode).toBe('disabled');
+        expect(second.mode).toBe('showing');
+        expect(third.mode).toBe('disabled');
+        expect(metadata.mode).toBe('showing');
+
+        first.mode = 'showing';
+        second.mode = 'hidden';
+        tracks.emit('change');
+
+        expect(first.mode).toBe('disabled');
+        expect(second.mode).toBe('showing');
+        expect(third.mode).toBe('disabled');
+    });
+
+    it('treats -1 as explicit off and preserves it through later events and preferences', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'hidden',
+        });
+        const { helper, tracks, captionPreference } = createBoundHelper([
+            first,
+            second,
+        ]);
+
+        helper.setSubtitleTrack(-1);
+        first.mode = 'showing';
+        second.mode = 'showing';
+        tracks.emit('labelchange');
+        captionPreference.value = false;
+        helper.refreshInputs();
+        captionPreference.value = true;
+        helper.refreshInputs();
+
+        expect(first.mode).toBe('disabled');
+        expect(second.mode).toBe('disabled');
+        const subtitles = helper.getSubtitleTracks();
+        expect(subtitles.every((track) => !track.selected)).toBe(true);
+    });
+
+    it('ignores invalid, non-integer, and stale track IDs', () => {
+        const removed = createTextTrack({
+            kind: 'captions',
+            mode: 'disabled',
+        });
+        const remaining = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        const { helper, tracks } = createBoundHelper([removed, remaining]);
+        tracks.remove(removed);
+
+        for (const id of [0, 0.5, -2, 8, Number.NaN]) {
+            helper.setSubtitleTrack(id);
+        }
+
+        expect(remaining.mode).toBe('showing');
+    });
+
+    it('suppresses and restores the engine-selected default with the global preference', () => {
+        const selected = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const hidden = createTextTrack({
+            kind: 'subtitles',
+            mode: 'hidden',
+        });
+        const { helper, captionPreference } = createBoundHelper(
+            [selected, hidden],
+            false
+        );
+
+        expect(selected.mode).toBe('disabled');
+        expect(hidden.mode).toBe('disabled');
+
+        captionPreference.value = true;
+        helper.refreshInputs();
+
+        expect(selected.mode).toBe('showing');
+        expect(hidden.mode).toBe('disabled');
+    });
+
+    it('retains a late engine default while global captions remain suppressed', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const { helper, tracks, captionPreference } = createBoundHelper(
+            [first],
+            false
+        );
+        const late = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+
+        tracks.add(late);
+        captionPreference.value = true;
+        helper.refreshInputs();
+
+        expect(first.mode).toBe('disabled');
+        expect(late.mode).toBe('showing');
+    });
+
+    it('keeps an explicit selection active through preference and track-list events', () => {
+        const first = createTextTrack({
+            kind: 'captions',
+            mode: 'showing',
+        });
+        const second = createTextTrack({
+            kind: 'subtitles',
+            mode: 'disabled',
+        });
+        const { helper, tracks, captionPreference } = createBoundHelper([
+            first,
+            second,
+        ]);
+
+        helper.setSubtitleTrack(1);
+        captionPreference.value = false;
+        helper.refreshInputs();
+        first.mode = 'showing';
+        second.mode = 'hidden';
+        tracks.emit('addtrack');
+        captionPreference.value = true;
+        helper.refreshInputs();
+
+        expect(first.mode).toBe('disabled');
+        expect(second.mode).toBe('showing');
+    });
+
+    it('resets IDs, suppression, and explicit override at a source boundary', () => {
+        const first = createTextTrack({ kind: 'captions' });
+        const second = createTextTrack({ kind: 'subtitles' });
+        const { helper, tracks, captionPreference } = createBoundHelper([
+            first,
+            second,
+        ]);
+        helper.setSubtitleTrack(-1);
+        captionPreference.value = false;
+        const replacement = createTextTrack({
+            kind: 'subtitles',
+            mode: 'showing',
+        });
+        tracks.replaceSilently([replacement]);
+
+        helper.resetSource();
+
+        expect(helper.getSubtitleTracks()).toEqual([
+            { id: 0, label: 'Subtitle 1', selected: false },
+        ]);
+        expect(replacement.mode).toBe('disabled');
+
+        captionPreference.value = true;
+        helper.refreshInputs();
+
+        expect(replacement.mode).toBe('showing');
+    });
+
+    it('refreshes on all Video.js text-track events through one stable callback', () => {
+        const { helper, tracks, refresh } = createBoundHelper([]);
+        const registrations = [...tracks.addEventListener.mock.calls];
+
+        for (const event of TEXT_TRACK_EVENTS) {
+            tracks.emit(event);
+        }
+
+        expect(refresh).toHaveBeenCalledTimes(4);
+        expect(registrations.map(([event]) => event)).toEqual(
+            TEXT_TRACK_EVENTS
+        );
+        const listener = registrations[0][1];
+        expect(registrations.every(([, entry]) => entry === listener)).toBe(
+            true
+        );
+        helper.clear();
+    });
+
+    it('binds by list identity and removes the exact listeners once', () => {
+        const firstList = new FakeTextTrackList([]);
+        const secondList = new FakeTextTrackList([]);
+        let currentList: VideoJsTextTrackList | null = firstList;
+        const player = {
+            textTracks: jest.fn(() => currentList),
+        } as Pick<VideoJsPlayer, 'textTracks'>;
+        const helper = new VjsTextTracks({
+            player,
+            showCaptions: () => true,
+            refresh: jest.fn(),
+        });
+
+        helper.bind();
+        const firstRegistrations = [...firstList.addEventListener.mock.calls];
+        helper.bind();
+
+        expect(firstList.addEventListener).toHaveBeenCalledTimes(4);
+        expect(firstList.removeEventListener).not.toHaveBeenCalled();
+
+        currentList = secondList;
+        helper.bind();
+
+        expect(firstList.removeEventListener).toHaveBeenCalledTimes(4);
+        for (const [event, listener] of firstRegistrations) {
+            expect(firstList.removeEventListener).toHaveBeenCalledWith(
+                event,
+                listener
+            );
+        }
+        expect(
+            firstList.removeEventListener.mock.calls.every(
+                (call) => call.length === 2
+            )
+        ).toBe(true);
+
+        const secondRegistrations = [...secondList.addEventListener.mock.calls];
+        helper.clear();
+        helper.clear();
+
+        expect(secondList.removeEventListener).toHaveBeenCalledTimes(4);
+        for (const [event, listener] of secondRegistrations) {
+            expect(secondList.removeEventListener).toHaveBeenCalledWith(
+                event,
+                listener
+            );
+        }
+    });
+});
+
+function createBoundHelper(
+    initialTracks: VideoJsTextTrack[],
+    showCaptions = true
+) {
+    const tracks = new FakeTextTrackList(initialTracks);
+    const player = {
+        textTracks: jest.fn(() => tracks),
+    } as Pick<VideoJsPlayer, 'textTracks'>;
+    const captionPreference = { value: showCaptions };
+    const refresh = jest.fn();
+    const helper = new VjsTextTracks({
+        player,
+        showCaptions: () => captionPreference.value,
+        refresh,
+    });
+    helper.bind();
+    refresh.mockClear();
+    return { captionPreference, helper, refresh, tracks };
+}
+
+function createTextTrack(
+    overrides: Partial<VideoJsTextTrack> = {}
+): VideoJsTextTrack {
+    return { kind: 'subtitles', mode: 'disabled', ...overrides };
+}
+
+class FakeTextTrackList implements VideoJsTextTrackList {
+    [index: number]: VideoJsTextTrack;
+
+    length = 0;
+    private tracks: VideoJsTextTrack[] = [];
+    private readonly listeners = new Map<
+        string,
+        Set<EventListenerOrEventListenerObject>
+    >();
+
+    readonly addEventListener = jest.fn(
+        (type: string, listener: EventListenerOrEventListenerObject) => {
+            const eventListeners = this.listeners.get(type) ?? new Set();
+            eventListeners.add(listener);
+            this.listeners.set(type, eventListeners);
+        }
+    );
+
+    readonly removeEventListener = jest.fn(
+        (type: string, listener: EventListenerOrEventListenerObject) => {
+            this.listeners.get(type)?.delete(listener);
+        }
+    );
+
+    constructor(initialTracks: VideoJsTextTrack[]) {
+        this.replaceSilently(initialTracks);
+    }
+
+    add(track: VideoJsTextTrack): void {
+        this.replaceSilently([...this.tracks, track]);
+        this.emit('addtrack');
+    }
+
+    remove(track: VideoJsTextTrack): void {
+        this.replaceSilently(this.tracks.filter((entry) => entry !== track));
+        this.emit('removetrack');
+    }
+
+    replaceSilently(tracks: VideoJsTextTrack[]): void {
+        for (let index = 0; index < this.length; index += 1) {
+            delete this[index];
+        }
+        this.tracks = [...tracks];
+        this.length = tracks.length;
+        tracks.forEach((track, index) => {
+            this[index] = track;
+        });
+    }
+
+    emit(type: string): void {
+        const event = new Event(type);
+        for (const listener of this.listeners.get(type) ?? []) {
+            if (typeof listener === 'function') {
+                listener(event);
+            } else {
+                listener.handleEvent(event);
+            }
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.ts b/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.ts
new file mode 100644
index 000000000..608e2740a
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-text-tracks.ts
@@ -0,0 +1,247 @@
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+import type {
+    VideoJsPlayer,
+    VideoJsTextTrack,
+    VideoJsTextTrackList,
+} from './vjs-player.types';
+
+const TEXT_TRACK_EVENTS = [
+    'addtrack',
+    'removetrack',
+    'change',
+    'labelchange',
+] as const;
+
+interface VjsSubtitleTrack {
+    id: number;
+    track: VideoJsTextTrack;
+}
+
+export interface VjsTextTracksConfig {
+    player: Pick<VideoJsPlayer, 'textTracks'>;
+    showCaptions: () => boolean;
+    refresh: () => void;
+    /**
+     * Vendor-chrome hosts pass a "playback started" probe. Its presence
+     * switches the caption preference from authoritative (shared controls, the
+     * default) to source-default: the preference seeds each new source and
+     * stops being enforced once the probe returns true, so the Video.js
+     * captions menu keeps working. Shared controls omit it.
+     */
+    playbackStarted?: () => boolean;
+}
+
+export class VjsTextTracks {
+    private trackList: VideoJsTextTrackList | null = null;
+    private refreshListener: EventListener | null = null;
+    private trackIds = new WeakMap<VideoJsTextTrack, number>();
+    private nextTrackId = 0;
+    private subtitleOverride: number | null = null;
+    private suppressedTrack: VideoJsTextTrack | null = null;
+
+    constructor(private readonly config: VjsTextTracksConfig) {}
+
+    bind(): void {
+        const trackList = this.readTrackList();
+        if (trackList === this.trackList) {
+            this.applyCaptionState();
+            return;
+        }
+
+        this.detachTrackList();
+        this.resetSourceState();
+        this.trackList = trackList;
+        if (trackList && typeof trackList.addEventListener === 'function') {
+            const refresh: EventListener = () => {
+                this.applyCaptionState();
+                this.config.refresh();
+            };
+            this.refreshListener = refresh;
+            for (const event of TEXT_TRACK_EVENTS) {
+                trackList.addEventListener(event, refresh);
+            }
+        }
+        this.applyCaptionState();
+    }
+
+    clear(): void {
+        this.detachTrackList();
+        this.resetSourceState();
+    }
+
+    resetSource(): void {
+        this.resetSourceState();
+        this.applyCaptionState();
+    }
+
+    refreshInputs(): void {
+        this.applyCaptionState();
+    }
+
+    getSubtitleTracks(): PlayerTrack[] {
+        return this.readSubtitleTracks().map(({ id, track }) => ({
+            id,
+            label: track.label || track.language || `Subtitle ${id + 1}`,
+            selected: track.mode === 'showing',
+        }));
+    }
+
+    setSubtitleTrack(id: number): void {
+        if (!Number.isInteger(id)) {
+            return;
+        }
+
+        const tracks = this.readSubtitleTracks();
+        if (id === -1) {
+            this.subtitleOverride = -1;
+            this.suppressedTrack = null;
+            this.applyOverride(tracks);
+            return;
+        }
+        if (id < 0 || !tracks.some((entry) => entry.id === id)) {
+            return;
+        }
+
+        this.subtitleOverride = id;
+        this.suppressedTrack = null;
+        this.applyOverride(tracks);
+    }
+
+    private readTrackList(): VideoJsTextTrackList | null {
+        try {
+            return this.config.player.textTracks();
+        } catch {
+            return null;
+        }
+    }
+
+    private detachTrackList(): void {
+        const trackList = this.trackList;
+        const refresh = this.refreshListener;
+        if (
+            trackList &&
+            refresh &&
+            typeof trackList.removeEventListener === 'function'
+        ) {
+            for (const event of TEXT_TRACK_EVENTS) {
+                trackList.removeEventListener(event, refresh);
+            }
+        }
+        this.trackList = null;
+        this.refreshListener = null;
+    }
+
+    private resetSourceState(): void {
+        this.trackIds = new WeakMap<VideoJsTextTrack, number>();
+        this.nextTrackId = 0;
+        this.subtitleOverride = null;
+        this.suppressedTrack = null;
+    }
+
+    private readSubtitleTracks(): VjsSubtitleTrack[] {
+        const tracks = this.trackList;
+        if (!tracks) {
+            return [];
+        }
+
+        const result: VjsSubtitleTrack[] = [];
+        try {
+            for (let index = 0; index < tracks.length; index += 1) {
+                const track = tracks[index];
+                if (
+                    !track ||
+                    (track.kind !== 'captions' && track.kind !== 'subtitles')
+                ) {
+                    continue;
+                }
+
+                let id = this.trackIds.get(track);
+                if (id === undefined) {
+                    id = this.nextTrackId;
+                    this.nextTrackId += 1;
+                    this.trackIds.set(track, id);
+                }
+                result.push({ id, track });
+            }
+        } catch {
+            return [];
+        }
+        return result;
+    }
+
+    private applyCaptionState(): void {
+        const tracks = this.readSubtitleTracks();
+        if (this.subtitleOverride !== null) {
+            this.applyOverride(tracks);
+            return;
+        }
+
+        if (!this.config.showCaptions()) {
+            if (this.config.playbackStarted?.()) {
+                // Source-default mode: the Video.js captions menu owns the
+                // selection once playback is running.
+                return;
+            }
+            const selectedTrack = tracks.find(
+                ({ track }) => track.mode === 'showing'
+            )?.track;
+            if (selectedTrack) {
+                this.suppressedTrack = selectedTrack;
+            } else if (
+                this.suppressedTrack &&
+                !tracks.some(({ track }) => track === this.suppressedTrack)
+            ) {
+                this.suppressedTrack = null;
+            }
+            this.disableAll(tracks);
+            return;
+        }
+
+        const suppressedTrack = this.suppressedTrack;
+        this.suppressedTrack = null;
+        const selectedTrack =
+            suppressedTrack &&
+            tracks.some(({ track }) => track === suppressedTrack)
+                ? suppressedTrack
+                : (tracks.find(({ track }) => track.mode === 'showing')
+                      ?.track ?? null);
+        this.applySelectedTrack(tracks, selectedTrack);
+    }
+
+    private applyOverride(tracks: VjsSubtitleTrack[]): void {
+        const selectedId =
+            this.subtitleOverride === -1 ? null : this.subtitleOverride;
+        for (const { id, track } of tracks) {
+            this.setMode(
+                track,
+                selectedId !== null && id === selectedId
+                    ? 'showing'
+                    : 'disabled'
+            );
+        }
+    }
+
+    private applySelectedTrack(
+        tracks: VjsSubtitleTrack[],
+        selectedTrack: VideoJsTextTrack | null
+    ): void {
+        for (const { track } of tracks) {
+            this.setMode(
+                track,
+                track === selectedTrack ? 'showing' : 'disabled'
+            );
+        }
+    }
+
+    private disableAll(tracks: VjsSubtitleTrack[]): void {
+        for (const { track } of tracks) {
+            this.setMode(track, 'disabled');
+        }
+    }
+
+    private setMode(track: VideoJsTextTrack, mode: TextTrackMode): void {
+        if (track.mode !== mode) {
+            track.mode = mode;
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.spec.ts b/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.spec.ts
new file mode 100644
index 000000000..cd9230bd1
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.spec.ts
@@ -0,0 +1,71 @@
+import { VjsVideoElementSession } from './vjs-video-element-session';
+
+describe('VjsVideoElementSession', () => {
+    it('binds native playback events once and forwards them', () => {
+        const clearPlaybackIssue = jest.fn();
+        const emitPlaybackEnded = jest.fn();
+        const video = document.createElement('video');
+        const addEventListener = jest.spyOn(video, 'addEventListener');
+        const session = new VjsVideoElementSession({
+            clearPlaybackIssue,
+            emitPlaybackEnded,
+        });
+
+        session.bind(video);
+        session.bind(video);
+        video.dispatchEvent(new Event('loadeddata'));
+        video.dispatchEvent(new Event('playing'));
+        video.dispatchEvent(new Event('ended'));
+
+        expect(addEventListener).toHaveBeenCalledTimes(3);
+        expect(clearPlaybackIssue).toHaveBeenCalledTimes(2);
+        expect(emitPlaybackEnded).toHaveBeenCalledTimes(1);
+        expect(session.video()).toBe(video);
+    });
+
+    it('detaches the old Tech video before binding its replacement', () => {
+        const clearPlaybackIssue = jest.fn();
+        const emitPlaybackEnded = jest.fn();
+        const firstVideo = document.createElement('video');
+        const secondVideo = document.createElement('video');
+        const firstRemoveEventListener = jest.spyOn(
+            firstVideo,
+            'removeEventListener'
+        );
+        const session = new VjsVideoElementSession({
+            clearPlaybackIssue,
+            emitPlaybackEnded,
+        });
+
+        session.bind(firstVideo);
+        session.bind(secondVideo);
+        firstVideo.dispatchEvent(new Event('ended'));
+        secondVideo.dispatchEvent(new Event('ended'));
+
+        expect(firstRemoveEventListener).toHaveBeenCalledTimes(3);
+        expect(emitPlaybackEnded).toHaveBeenCalledTimes(1);
+        expect(session.video()).toBe(secondVideo);
+    });
+
+    it('destroys idempotently and ignores events from the detached video', () => {
+        const clearPlaybackIssue = jest.fn();
+        const emitPlaybackEnded = jest.fn();
+        const video = document.createElement('video');
+        const removeEventListener = jest.spyOn(video, 'removeEventListener');
+        const session = new VjsVideoElementSession({
+            clearPlaybackIssue,
+            emitPlaybackEnded,
+        });
+
+        session.bind(video);
+        session.destroy();
+        session.destroy();
+        video.dispatchEvent(new Event('loadeddata'));
+        video.dispatchEvent(new Event('ended'));
+
+        expect(removeEventListener).toHaveBeenCalledTimes(3);
+        expect(clearPlaybackIssue).not.toHaveBeenCalled();
+        expect(emitPlaybackEnded).not.toHaveBeenCalled();
+        expect(session.video()).toBeNull();
+    });
+});
diff --git a/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.ts b/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.ts
new file mode 100644
index 000000000..049deac9f
--- /dev/null
+++ b/libs/ui/playback/src/lib/vjs-player/vjs-video-element-session.ts
@@ -0,0 +1,61 @@
+export interface VjsVideoElementSessionConfig {
+    clearPlaybackIssue: () => void;
+    emitPlaybackEnded: () => void;
+}
+
+export class VjsVideoElementSession {
+    private currentVideo: HTMLVideoElement | null = null;
+    private destroyed = false;
+
+    private readonly clearPlaybackIssue = () => {
+        this.config.clearPlaybackIssue();
+    };
+
+    private readonly emitPlaybackEnded = () => {
+        this.config.emitPlaybackEnded();
+    };
+
+    constructor(private readonly config: VjsVideoElementSessionConfig) {}
+
+    bind(video: HTMLVideoElement): void {
+        if (this.destroyed || this.currentVideo === video) {
+            return;
+        }
+
+        this.detach();
+        this.currentVideo = video;
+        video.addEventListener('loadeddata', this.clearPlaybackIssue);
+        video.addEventListener('playing', this.clearPlaybackIssue);
+        video.addEventListener('ended', this.emitPlaybackEnded);
+    }
+
+    video(): HTMLVideoElement | null {
+        return this.currentVideo;
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.detach();
+        this.destroyed = true;
+    }
+
+    private detach(): void {
+        if (!this.currentVideo) {
+            return;
+        }
+
+        this.currentVideo.removeEventListener(
+            'loadeddata',
+            this.clearPlaybackIssue
+        );
+        this.currentVideo.removeEventListener(
+            'playing',
+            this.clearPlaybackIssue
+        );
+        this.currentVideo.removeEventListener('ended', this.emitPlaybackEnded);
+        this.currentVideo = null;
+    }
+}
diff --git a/libs/ui/playback/src/lib/vod-details/vod-details.component.html b/libs/ui/playback/src/lib/vod-details/vod-details.component.html
index 59730c10b..c44277711 100644
--- a/libs/ui/playback/src/lib/vod-details/vod-details.component.html
+++ b/libs/ui/playback/src/lib/vod-details/vod-details.component.html
@@ -37,7 +37,7 @@
                 <span class="label">{{ 'XTREAM.ACTORS' | translate }}</span>
                 @if (meta.tmdbCast?.length) {
                     <div class="details__cast-strip">
-                        @for (member of meta.tmdbCast; track member.name) {
+                        @for (member of meta.tmdbCast; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
                             <span
                                 class="details__cast-chip"
                                 [class.details__cast-chip--clickable]="
@@ -75,10 +75,43 @@
                 }
             </div>
         }
-        @if (meta.director) {
+        @if (meta.director || meta.tmdbDirectors?.length) {
             <div class="details__meta-item">
                 <span class="label">{{ 'XTREAM.DIRECTOR' | translate }}</span>
-                <span class="value">{{ meta.director }}</span>
+                @if (meta.tmdbDirectors?.length) {
+                    <div class="details__cast-strip">
+                        @for (member of meta.tmdbDirectors; track member.tmdbPersonId ? 'p' + member.tmdbPersonId : 'i' + $index) {
+                            <span
+                                class="details__cast-chip"
+                                [class.details__cast-chip--clickable]="
+                                    !!member.tmdbPersonId
+                                "
+                                (click)="openActor(member)"
+                                [title]="member.name"
+                            >
+                                @if (member.profileUrl) {
+                                    <img
+                                        class="details__cast-avatar"
+                                        [src]="member.profileUrl"
+                                        [alt]="member.name"
+                                        loading="lazy"
+                                    />
+                                } @else {
+                                    <span
+                                        class="details__cast-avatar details__cast-avatar--fallback"
+                                    >
+                                        {{ member.name.charAt(0) }}
+                                    </span>
+                                }
+                                <span class="details__cast-name">{{
+                                    member.name
+                                }}</span>
+                            </span>
+                        }
+                    </div>
+                } @else {
+                    <span class="value">{{ meta.director }}</span>
+                }
             </div>
         }
         @if (meta.ratingKinopoisk) {
@@ -161,6 +194,14 @@
                     <mat-icon>play_circle</mat-icon>
                     {{ 'DOWNLOADS.PLAY_LOCAL' | translate }}
                 </button>
+            } @else if (isPausedDownload()) {
+                <button
+                    class="download-btn download-btn--paused"
+                    (click)="resumePausedDownload()"
+                >
+                    <mat-icon>play_arrow</mat-icon>
+                    {{ 'DOWNLOADS.RESUME' | translate }}
+                </button>
             } @else if (isDownloading()) {
                 <button class="download-btn download-btn--downloading" disabled>
                     <mat-icon>downloading</mat-icon>
diff --git a/libs/ui/playback/src/lib/vod-details/vod-details.component.ts b/libs/ui/playback/src/lib/vod-details/vod-details.component.ts
index 27d151643..030f7a666 100644
--- a/libs/ui/playback/src/lib/vod-details/vod-details.component.ts
+++ b/libs/ui/playback/src/lib/vod-details/vod-details.component.ts
@@ -26,6 +26,7 @@ import {
 } from '@iptvnator/services';
 import type { PlaybackFallbackRequest } from '../playback-diagnostics/playback-diagnostics.util';
 import { PortalInlinePlayerComponent } from '../portal-inline-player/portal-inline-player.component';
+import { createVodDownloadState } from './vod-download-state.util';
 
 /**
  * Unified VOD details component for both Xtream and Stalker portals.
@@ -189,23 +190,13 @@ export class VodDetailsComponent {
         return `${minutes}:${seconds.toString().padStart(2, '0')}`;
     });
 
-    /** Whether VOD is already downloaded */
-    readonly isDownloaded = computed(() => {
-        const item = this.item();
-        // Access signal to create reactive dependency
-        this.downloadsService.downloads();
-        const vodId = getVodNumericId(item);
-        return this.downloadsService.isDownloaded(vodId, item.playlistId, 'vod');
-    });
-
-    /** Whether VOD is currently downloading */
-    readonly isDownloading = computed(() => {
-        const item = this.item();
-        // Access signal to create reactive dependency
-        this.downloadsService.downloads();
-        const vodId = getVodNumericId(item);
-        return this.downloadsService.isDownloading(vodId, item.playlistId, 'vod');
-    });
+    private readonly downloadState = createVodDownloadState(
+        this.downloadsService,
+        this.item
+    );
+    readonly isDownloaded = this.downloadState.isDownloaded;
+    readonly isDownloading = this.downloadState.isDownloading;
+    readonly isPausedDownload = this.downloadState.isPausedDownload;
 
     readonly matchedExternalPlayback = computed(() => {
         const session = this.externalPlayback();
@@ -343,6 +334,16 @@ export class VodDetailsComponent {
         this.downloadRequested.emit(this.item());
     }
 
+    /** Resume the paused download of this VOD */
+    async resumePausedDownload(): Promise<void> {
+        const item = this.item();
+        await this.downloadsService.resumeDownloadByContent(
+            getVodNumericId(item),
+            item.playlistId,
+            'vod'
+        );
+    }
+
     onInlineTimeUpdate(event: {
         currentTime: number;
         duration: number;
diff --git a/libs/ui/playback/src/lib/vod-details/vod-download-state.util.ts b/libs/ui/playback/src/lib/vod-details/vod-download-state.util.ts
new file mode 100644
index 000000000..7adf76ba5
--- /dev/null
+++ b/libs/ui/playback/src/lib/vod-details/vod-download-state.util.ts
@@ -0,0 +1,34 @@
+import { computed, Signal } from '@angular/core';
+import { DownloadsService } from '@iptvnator/services';
+import { getVodNumericId, VodDetailsItem } from '@iptvnator/shared/interfaces';
+
+/**
+ * Download-state signals for a VOD detail view. Reading
+ * `downloadsService.downloads()` inside each computed creates the reactive
+ * dependency on the download list.
+ */
+export function createVodDownloadState(
+    downloadsService: DownloadsService,
+    item: Signal<VodDetailsItem>
+) {
+    const query = (
+        check: (vodId: number, playlistId: string) => boolean
+    ): Signal<boolean> =>
+        computed(() => {
+            const currentItem = item();
+            downloadsService.downloads();
+            return check(getVodNumericId(currentItem), currentItem.playlistId);
+        });
+
+    return {
+        isDownloaded: query((vodId, playlistId) =>
+            downloadsService.isDownloaded(vodId, playlistId, 'vod')
+        ),
+        isDownloading: query((vodId, playlistId) =>
+            downloadsService.isDownloading(vodId, playlistId, 'vod')
+        ),
+        isPausedDownload: query((vodId, playlistId) =>
+            downloadsService.isPaused(vodId, playlistId, 'vod')
+        ),
+    };
+}
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view-diagnostics.utils.ts b/libs/ui/playback/src/lib/web-player-view/web-player-view-diagnostics.utils.ts
new file mode 100644
index 000000000..d852115a0
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view-diagnostics.utils.ts
@@ -0,0 +1,138 @@
+import {
+    type PlaybackDiagnostic,
+    PlaybackDiagnosticCode,
+    getLikelyBrowserUnsupportedCodecLabels,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+export type PlaybackDiagnosticDetail = {
+    readonly labelKey: string;
+    readonly value: string;
+};
+
+export function getDiagnosticTitleKey(issue: PlaybackDiagnostic): string {
+    return `${getDiagnosticTranslationBase(issue)}.TITLE`;
+}
+
+export function getDiagnosticDescriptionKey(
+    issue: PlaybackDiagnostic,
+    supportsManagedExternalPlayers: boolean
+): string {
+    if (
+        issue.code === PlaybackDiagnosticCode.BrowserAccessError &&
+        !supportsManagedExternalPlayers
+    ) {
+        return 'PLAYBACK_DIAGNOSTICS.BROWSER_ACCESS_ERROR.PWA_DESCRIPTION';
+    }
+
+    return `${getDiagnosticTranslationBase(issue)}.DESCRIPTION`;
+}
+
+export function getDiagnosticMeta(issue: PlaybackDiagnostic): string {
+    const codecs = [...issue.videoCodecs, ...issue.audioCodecs].join(', ');
+    if (codecs) {
+        return codecs;
+    }
+
+    return issue.container || issue.mimeType || '';
+}
+
+export function getDiagnosticCodecHint(issue: PlaybackDiagnostic): string {
+    return getLikelyBrowserUnsupportedCodecLabels(issue).join(', ');
+}
+
+export function getDiagnosticDetails(
+    issue: PlaybackDiagnostic
+): readonly PlaybackDiagnosticDetail[] {
+    return [
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_CODE',
+            value: issue.code,
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_PLAYER',
+            value: formatPlayer(issue.player),
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_SOURCE',
+            value: formatDiagnosticSource(issue.source),
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_CONTAINER',
+            value: issue.container,
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_MIME_TYPE',
+            value: issue.mimeType ?? '',
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_VIDEO_CODECS',
+            value: issue.videoCodecs.join(', '),
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_AUDIO_CODECS',
+            value: issue.audioCodecs.join(', '),
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_NATIVE_ERROR_CODE',
+            value: issue.nativeErrorCode?.toString() ?? '',
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_NATIVE_ERROR_MESSAGE',
+            value: issue.nativeErrorMessage ?? '',
+        },
+        {
+            labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_ERROR_DETAILS',
+            value: issue.details ?? '',
+        },
+    ].filter(({ value }) => value.trim().length > 0);
+}
+
+function getDiagnosticTranslationBase(issue: PlaybackDiagnostic): string {
+    switch (issue.code) {
+        case PlaybackDiagnosticCode.UnsupportedContainer:
+            return 'PLAYBACK_DIAGNOSTICS.UNSUPPORTED_CONTAINER';
+        case PlaybackDiagnosticCode.UnsupportedCodec:
+            return 'PLAYBACK_DIAGNOSTICS.UNSUPPORTED_CODEC';
+        case PlaybackDiagnosticCode.MediaDecodeError:
+            return 'PLAYBACK_DIAGNOSTICS.MEDIA_DECODE_ERROR';
+        case PlaybackDiagnosticCode.NetworkError:
+            return 'PLAYBACK_DIAGNOSTICS.NETWORK_ERROR';
+        case PlaybackDiagnosticCode.BrowserAccessError:
+            return 'PLAYBACK_DIAGNOSTICS.BROWSER_ACCESS_ERROR';
+        case PlaybackDiagnosticCode.DrmOrEncryption:
+            return 'PLAYBACK_DIAGNOSTICS.DRM_OR_ENCRYPTION';
+        case PlaybackDiagnosticCode.UnknownPlaybackError:
+        default:
+            return 'PLAYBACK_DIAGNOSTICS.UNKNOWN_PLAYBACK_ERROR';
+    }
+}
+
+function formatPlayer(player: PlaybackDiagnostic['player']): string {
+    switch (player) {
+        case 'videojs':
+            return 'Video.js';
+        case 'html5':
+            return 'HTML5';
+        case 'artplayer':
+            return 'ArtPlayer';
+        default:
+            return '';
+    }
+}
+
+function formatDiagnosticSource(source: PlaybackDiagnostic['source']): string {
+    switch (source) {
+        case 'hls':
+            return 'HLS.js';
+        case 'mpegts':
+            return 'mpegts.js';
+        case 'native':
+            return 'Native media element';
+        case 'shaka':
+            return 'Shaka Player';
+        case 'source':
+            return 'Stream metadata';
+        default:
+            return source;
+    }
+}
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.html b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.html
index c0d97fd3a..77546f72b 100644
--- a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.html
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.html
@@ -2,7 +2,10 @@
     @defer (on immediate) {
         <app-vjs-player
             [options]="vjsOptions"
+            [mediaTitle]="resolvedMediaTitle()"
             [volume]="volume()"
+            [showCaptions]="showCaptions()"
+            [interactionEnabled]="playbackInteractionEnabled()"
             [startTime]="startTime()"
             [seriesNavigation]="seriesNavigation()"
             (timeUpdate)="timeUpdate.emit($event)"
@@ -18,8 +21,11 @@
     @defer (on immediate) {
         <app-html-video-player
             [channel]="$any(channel)"
+            [mediaTitle]="resolvedMediaTitle()"
             [volume]="volume()"
             [showCaptions]="showCaptions()"
+            [isLive]="resolvedIsLive()"
+            [interactionEnabled]="playbackInteractionEnabled()"
             [startTime]="startTime()"
             [seriesNavigation]="seriesNavigation()"
             (timeUpdate)="timeUpdate.emit($event)"
@@ -35,8 +41,11 @@
     @defer (on immediate) {
         <app-art-player
             [channel]="$any(channel)"
+            [mediaTitle]="resolvedMediaTitle()"
             [volume]="volume()"
             [showCaptions]="showCaptions()"
+            [isLive]="resolvedIsLive()"
+            [interactionEnabled]="playbackInteractionEnabled()"
             [startTime]="startTime()"
             [seriesNavigation]="seriesNavigation()"
             (timeUpdate)="timeUpdate.emit($event)"
@@ -51,6 +60,7 @@
 } @else if (selectedPlayer() === 'embedded-mpv') {
     <app-embedded-mpv-player
         [playback]="resolvedPlayback()"
+        [mediaTitle]="resolvedMediaTitle()"
         [recordingFolder]="recordingFolder()"
         [seriesNavigation]="seriesNavigation()"
         (timeUpdate)="timeUpdate.emit($event)"
@@ -62,7 +72,10 @@
     @defer (on immediate) {
         <app-vjs-player
             [options]="vjsOptions"
+            [mediaTitle]="resolvedMediaTitle()"
             [volume]="volume()"
+            [showCaptions]="showCaptions()"
+            [interactionEnabled]="playbackInteractionEnabled()"
             [startTime]="startTime()"
             [seriesNavigation]="seriesNavigation()"
             (timeUpdate)="timeUpdate.emit($event)"
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts
new file mode 100644
index 000000000..71b8b09b3
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.shared-controls.spec.ts
@@ -0,0 +1,361 @@
+import { ClipboardModule } from '@angular/cdk/clipboard';
+import { signal } from '@angular/core';
+import {
+    ComponentFixture,
+    DeferBlockBehavior,
+    TestBed,
+} from '@angular/core/testing';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { By } from '@angular/platform-browser';
+import { StorageMap } from '@ngx-pwa/local-storage';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import {
+    type ResolvedPortalPlayback,
+    VideoPlayer,
+} from '@iptvnator/shared/interfaces';
+import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
+import type { WebPlayerViewComponent as WebPlayerViewComponentInstance } from './web-player-view.component';
+import { WEB_PLAYER_SHARED_CONTROLS } from '../player-controls';
+import {
+    StubArtPlayerComponent,
+    StubEmbeddedMpvPlayerComponent,
+    StubHtmlVideoPlayerComponent,
+    StubVjsPlayerComponent,
+} from './web-player-view.spec-stubs';
+import {
+    type PlaybackDiagnostic,
+    PlaybackDiagnosticCode,
+    PlaybackDiagnosticSource,
+} from '../playback-diagnostics/playback-diagnostics.util';
+
+jest.unstable_mockModule('video.js', () => ({
+    default: jest.fn(),
+}));
+jest.unstable_mockModule('@yangkghjh/videojs-aspect-ratio-panel', () => ({}));
+jest.unstable_mockModule('videojs-contrib-quality-levels', () => ({}));
+jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
+
+const webPlayerSharedControls = signal(false);
+const showCaptionsSetting = signal(false);
+
+describe('WebPlayerViewComponent shared web controls metadata', () => {
+    let WebPlayerViewComponent: typeof import('./web-player-view.component').WebPlayerViewComponent;
+    let fixture: ComponentFixture<WebPlayerViewComponentInstance>;
+    let component: WebPlayerViewComponentInstance;
+
+    beforeAll(async () => {
+        ({ WebPlayerViewComponent } =
+            await import('./web-player-view.component'));
+    });
+
+    beforeEach(async () => {
+        webPlayerSharedControls.set(false);
+        showCaptionsSetting.set(false);
+
+        await TestBed.configureTestingModule({
+            deferBlockBehavior: DeferBlockBehavior.Playthrough,
+            imports: [WebPlayerViewComponent, TranslateModule.forRoot()],
+            providers: [
+                {
+                    provide: StorageMap,
+                    useValue: {
+                        get: jest.fn(() => of({ player: VideoPlayer.VideoJs })),
+                    },
+                },
+                {
+                    provide: RuntimeCapabilitiesService,
+                    useValue: { supportsManagedExternalPlayers: false },
+                },
+                {
+                    provide: SettingsStore,
+                    useValue: {
+                        webPlayerSharedControls,
+                        showCaptions: showCaptionsSetting,
+                    },
+                },
+            ],
+        })
+            .overrideComponent(WebPlayerViewComponent, {
+                set: {
+                    imports: [
+                        StubArtPlayerComponent,
+                        StubEmbeddedMpvPlayerComponent,
+                        StubHtmlVideoPlayerComponent,
+                        StubVjsPlayerComponent,
+                        ClipboardModule,
+                        MatButtonModule,
+                        MatIconModule,
+                        MatTooltipModule,
+                        TranslateModule,
+                    ],
+                },
+            })
+            .compileComponents();
+
+        fixture = TestBed.createComponent(WebPlayerViewComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput(
+            'streamUrl',
+            'https://example.com/default.ts'
+        );
+        fixture.componentRef.setInput('title', 'Default stream');
+    });
+
+    afterEach(() => {
+        fixture.destroy();
+    });
+
+    it('snapshots the shared controls setting for each player host', () => {
+        webPlayerSharedControls.set(true);
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)
+        ).toBe(true);
+
+        webPlayerSharedControls.set(false);
+
+        expect(
+            fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)
+        ).toBe(true);
+
+        fixture.destroy();
+        fixture = TestBed.createComponent(WebPlayerViewComponent);
+        component = fixture.componentInstance;
+        fixture.componentRef.setInput(
+            'streamUrl',
+            'https://example.com/next.ts'
+        );
+        fixture.detectChanges();
+
+        expect(
+            fixture.debugElement.injector.get(WEB_PLAYER_SHARED_CONTROLS)
+        ).toBe(false);
+    });
+
+    it.each([
+        ['an explicit VOD value', { isLive: false }, false],
+        [
+            'an explicit live value with VOD content metadata',
+            { isLive: true, contentInfo: createVodContentInfo() },
+            true,
+        ],
+        [
+            'VOD content metadata without an explicit value',
+            { contentInfo: createVodContentInfo() },
+            false,
+        ],
+        ['missing content metadata and explicit value', {}, true],
+    ])('resolves %s', (_label, metadata, expected) => {
+        setPlayback(metadata);
+
+        expect(component.resolvedIsLive()).toBe(expected);
+    });
+
+    it('passes the resolved live value to the HTML5 player', async () => {
+        const htmlPlayer = await renderHtmlPlayer({ isLive: false });
+
+        expect(htmlPlayer.isLive()).toBe(false);
+    });
+
+    // Regression for #1155: portal hosts never bound a showCaptions input, so
+    // the preference has to come from the settings store instead.
+    it('reads the caption preference from settings without a host binding', async () => {
+        showCaptionsSetting.set(true);
+
+        const htmlPlayer = await renderHtmlPlayer();
+
+        expect(htmlPlayer.showCaptions()).toBe(true);
+
+        showCaptionsSetting.set(false);
+        fixture.detectChanges();
+
+        expect(htmlPlayer.showCaptions()).toBe(false);
+    });
+
+    it('passes resolved playback metadata and caption preference to Video.js', async () => {
+        showCaptionsSetting.set(true);
+
+        const vjsPlayer = await renderVjsPlayer({ isLive: false });
+
+        expect(vjsPlayer.options()).toEqual(
+            expect.objectContaining({ isLive: false })
+        );
+        expect(vjsPlayer.showCaptions()).toBe(true);
+        expect(vjsPlayer.interactionEnabled()).toBe(true);
+    });
+
+    it('passes resolved playback metadata and diagnostic interaction state to ArtPlayer', async () => {
+        showCaptionsSetting.set(true);
+
+        const artPlayer = await renderArtPlayer({ isLive: false });
+
+        expect(artPlayer.isLive()).toBe(false);
+        expect(artPlayer.showCaptions()).toBe(true);
+        expect(artPlayer.interactionEnabled()).toBe(true);
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+        expect(artPlayer.interactionEnabled()).toBe(false);
+
+        component.handlePlaybackIssue(null);
+        fixture.detectChanges();
+        expect(artPlayer.interactionEnabled()).toBe(true);
+    });
+
+    it('disables HTML5 surface interaction while a diagnostic is visible', async () => {
+        const htmlPlayer = await renderHtmlPlayer();
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+
+        expect(component.playbackInteractionEnabled()).toBe(false);
+        expect(htmlPlayer.interactionEnabled()).toBe(false);
+    });
+
+    it('re-enables HTML5 interaction after retrying or clearing the issue', async () => {
+        const htmlPlayer = await renderHtmlPlayer();
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+        expect(htmlPlayer.interactionEnabled()).toBe(false);
+
+        component.retryPlayback();
+        fixture.detectChanges();
+        expect(component.playbackInteractionEnabled()).toBe(true);
+        expect(htmlPlayer.interactionEnabled()).toBe(true);
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+        expect(htmlPlayer.interactionEnabled()).toBe(false);
+
+        component.handlePlaybackIssue(null);
+        fixture.detectChanges();
+        expect(component.playbackInteractionEnabled()).toBe(true);
+        expect(htmlPlayer.interactionEnabled()).toBe(true);
+    });
+
+    it('disables and restores Video.js interaction around diagnostics', async () => {
+        const vjsPlayer = await renderVjsPlayer();
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+        expect(vjsPlayer.interactionEnabled()).toBe(false);
+
+        component.retryPlayback();
+        fixture.detectChanges();
+        expect(vjsPlayer.interactionEnabled()).toBe(true);
+
+        component.handlePlaybackIssue(createNetworkDiagnostic());
+        fixture.detectChanges();
+        expect(vjsPlayer.interactionEnabled()).toBe(false);
+
+        component.handlePlaybackIssue(null);
+        fixture.detectChanges();
+        expect(vjsPlayer.interactionEnabled()).toBe(true);
+    });
+
+    it.each([
+        ['inferred VOD', { contentInfo: createVodContentInfo() }, false],
+        [
+            'explicit live VOD content',
+            { isLive: true, contentInfo: createVodContentInfo() },
+            true,
+        ],
+    ])(
+        'uses the resolved value for Video.js effect and retry: %s',
+        (_label, metadata, expected) => {
+            const streamUrl = 'https://example.com/video.ts';
+            const setVjsOptions = jest.spyOn(component, 'setVjsOptions');
+            setPlayback(metadata, streamUrl);
+
+            fixture.detectChanges();
+
+            expect(setVjsOptions).toHaveBeenCalledWith(streamUrl, expected);
+
+            setVjsOptions.mockClear();
+            component.retryPlayback();
+
+            expect(setVjsOptions).toHaveBeenCalledWith(streamUrl, expected);
+        }
+    );
+
+    function setPlayback(
+        metadata: Partial<ResolvedPortalPlayback>,
+        streamUrl = 'https://example.com/playback.ts'
+    ): void {
+        fixture.componentRef.setInput('playback', {
+            streamUrl,
+            title: 'Playback',
+            ...metadata,
+        });
+    }
+
+    async function renderHtmlPlayer(
+        metadata: Partial<ResolvedPortalPlayback> = {}
+    ): Promise<StubHtmlVideoPlayerComponent> {
+        fixture.componentRef.setInput(
+            'playerOverride',
+            VideoPlayer.Html5Player
+        );
+        setPlayback(metadata);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        return fixture.debugElement.query(
+            By.directive(StubHtmlVideoPlayerComponent)
+        ).componentInstance as StubHtmlVideoPlayerComponent;
+    }
+
+    async function renderVjsPlayer(
+        metadata: Partial<ResolvedPortalPlayback> = {}
+    ): Promise<StubVjsPlayerComponent> {
+        fixture.componentRef.setInput('playerOverride', VideoPlayer.VideoJs);
+        setPlayback(metadata);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        return fixture.debugElement.query(By.directive(StubVjsPlayerComponent))
+            .componentInstance as StubVjsPlayerComponent;
+    }
+
+    async function renderArtPlayer(
+        metadata: Partial<ResolvedPortalPlayback> = {}
+    ): Promise<StubArtPlayerComponent> {
+        fixture.componentRef.setInput('playerOverride', VideoPlayer.ArtPlayer);
+        setPlayback(metadata);
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        return fixture.debugElement.query(By.directive(StubArtPlayerComponent))
+            .componentInstance as StubArtPlayerComponent;
+    }
+});
+
+function createVodContentInfo() {
+    return {
+        playlistId: 'playlist-1',
+        contentXtreamId: 123,
+        contentType: 'vod' as const,
+    };
+}
+
+function createNetworkDiagnostic(): PlaybackDiagnostic {
+    return {
+        code: PlaybackDiagnosticCode.NetworkError,
+        source: PlaybackDiagnosticSource.MpegTs,
+        sourceUrl: 'https://example.com/playback.ts',
+        container: 'ts',
+        mimeType: 'video/mp2t',
+        player: 'html5',
+        audioCodecs: [],
+        videoCodecs: [],
+        externalFallbackRecommended: false,
+    };
+}
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts
index 9974ce522..9b9d19e63 100644
--- a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts
@@ -35,7 +35,10 @@ jest.unstable_mockModule('videojs-quality-selector-hls', () => ({}));
 })
 class StubVjsPlayerComponent {
     readonly options = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
     readonly volume = input(1);
+    readonly showCaptions = input(false);
+    readonly interactionEnabled = input(true);
     readonly startTime = input(0);
     readonly seriesNavigation = input<unknown>(null);
     readonly timeUpdate = output<{ currentTime: number; duration: number }>();
@@ -51,8 +54,11 @@ class StubVjsPlayerComponent {
 })
 class StubHtmlVideoPlayerComponent {
     readonly channel = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
     readonly volume = input(1);
     readonly showCaptions = input(false);
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
     readonly startTime = input(0);
     readonly seriesNavigation = input<unknown>(null);
     readonly timeUpdate = output<{ currentTime: number; duration: number }>();
@@ -68,8 +74,11 @@ class StubHtmlVideoPlayerComponent {
 })
 class StubArtPlayerComponent {
     readonly channel = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
     readonly volume = input(1);
     readonly showCaptions = input(false);
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
     readonly startTime = input(0);
     readonly seriesNavigation = input<unknown>(null);
     readonly timeUpdate = output<{ currentTime: number; duration: number }>();
@@ -85,6 +94,7 @@ class StubArtPlayerComponent {
 })
 class StubEmbeddedMpvPlayerComponent {
     readonly playback = input.required<unknown>();
+    readonly mediaTitle = input<unknown>(null);
     readonly recordingFolder = input('');
     readonly seriesNavigation = input<unknown>(null);
     readonly timeUpdate = output<{ currentTime: number; duration: number }>();
@@ -159,6 +169,47 @@ describe('WebPlayerViewComponent', () => {
         expect(fixture.nativeElement.classList).toContain('web-player-view');
     });
 
+    describe('resolvedMediaTitle', () => {
+        it('prefers an explicit media title over the playback title', async () => {
+            fixture.componentRef.setInput('mediaTitle', {
+                primary: 'Breaking Code',
+                secondary: 'S01E02',
+            });
+            fixture.detectChanges();
+            await fixture.whenStable();
+            fixture.detectChanges();
+
+            expect(component.resolvedMediaTitle()).toEqual({
+                primary: 'Breaking Code',
+                secondary: 'S01E02',
+            });
+
+            const player = fixture.debugElement.query(
+                By.directive(StubVjsPlayerComponent)
+            ).componentInstance as StubVjsPlayerComponent;
+            expect(player.mediaTitle()).toEqual({
+                primary: 'Breaking Code',
+                secondary: 'S01E02',
+            });
+        });
+
+        it('falls back to the playback title as a single line', () => {
+            fixture.detectChanges();
+
+            expect(component.resolvedMediaTitle()).toEqual({
+                primary: 'Example Movie',
+                secondary: null,
+            });
+        });
+
+        it('is null when the title falls back to the raw stream URL', () => {
+            fixture.componentRef.setInput('title', '');
+            fixture.detectChanges();
+
+            expect(component.resolvedMediaTitle()).toBeNull();
+        });
+    });
+
     it('renders diagnostics and emits MPV fallback requests when managed external players are available', () => {
         const requests: unknown[] = [];
         runtimeCapabilities.supportsManagedExternalPlayers = true;
@@ -213,6 +264,33 @@ describe('WebPlayerViewComponent', () => {
         ]);
     });
 
+    it('uses the Matroska mime type for MKV paths', () => {
+        const streamUrl = 'https://example.com/archive/movie.mkv';
+
+        component.setVjsOptions(streamUrl);
+
+        expect(component.vjsOptions.sources).toEqual([
+            {
+                src: streamUrl,
+                type: 'video/matroska',
+            },
+        ]);
+    });
+
+    it('uses the Matroska mime type for query-declared MKV streams', () => {
+        const streamUrl =
+            'https://example.com/play?container=mkv&token=signed';
+
+        component.setVjsOptions(streamUrl);
+
+        expect(component.vjsOptions.sources).toEqual([
+            {
+                src: streamUrl,
+                type: 'video/matroska',
+            },
+        ]);
+    });
+
     it('treats web script playback URLs without declared media extension as MPEG-TS', () => {
         const streamUrl = 'https://example.com/live.php?stream=123&token=x';
 
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts
index 2b9d7c5f4..e1c8a0c34 100644
--- a/libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view.component.ts
@@ -25,24 +25,36 @@ import {
     VideoPlayer,
 } from '@iptvnator/shared/interfaces';
 import type { ExternalPlayerName } from '@iptvnator/shared/interfaces';
-import { RuntimeCapabilitiesService } from '@iptvnator/services';
+import { RuntimeCapabilitiesService, SettingsStore } from '@iptvnator/services';
 import { ArtPlayerComponent } from '../art-player/art-player.component';
 import { EmbeddedMpvPlayerComponent } from '../embedded-mpv-player/embedded-mpv-player.component';
 import { HtmlVideoPlayerComponent } from '../html-video-player/html-video-player.component';
+import {
+    type PlayerMediaTitle,
+    WEB_PLAYER_SHARED_CONTROLS,
+    WEB_PLAYER_SHARED_CONTROLS_ENABLED,
+} from '../player-controls';
 import {
     type PlaybackDiagnostic,
-    PlaybackDiagnosticCode,
     type PlaybackFallbackRequest,
-    getLikelyBrowserUnsupportedCodecLabels,
     getPlaybackMediaExtensionFromUrl,
 } from '../playback-diagnostics/playback-diagnostics.util';
 import type { SeriesPlaybackNavigation } from '../portal-inline-player/series-playback-navigation';
 import { VjsPlayerComponent } from '../vjs-player/vjs-player.component';
+import {
+    getDiagnosticCodecHint,
+    getDiagnosticDescriptionKey,
+    getDiagnosticDetails,
+    getDiagnosticMeta,
+    getDiagnosticTitleKey,
+} from './web-player-view-diagnostics.utils';
 
-type PlaybackDiagnosticDetail = {
-    readonly labelKey: string;
-    readonly value: string;
-};
+function resolveWebPlayerSharedControls(): boolean {
+    const storedValue = inject(SettingsStore).webPlayerSharedControls?.();
+    return typeof storedValue === 'boolean'
+        ? storedValue
+        : WEB_PLAYER_SHARED_CONTROLS_ENABLED;
+}
 
 @Component({
     selector: 'app-web-player-view',
@@ -62,20 +74,29 @@ type PlaybackDiagnosticDetail = {
         TranslatePipe,
         VjsPlayerComponent,
     ],
+    providers: [
+        {
+            provide: WEB_PLAYER_SHARED_CONTROLS,
+            useFactory: resolveWebPlayerSharedControls,
+        },
+    ],
     encapsulation: ViewEncapsulation.None,
 })
 export class WebPlayerViewComponent {
     storage = inject(StorageMap);
     private readonly runtime = inject(RuntimeCapabilitiesService);
+    private readonly settingsStore = inject(SettingsStore);
 
     streamUrl = input.required<string>();
     title = input('');
     playback = input<ResolvedPortalPlayback | null>(null);
     startTime = input<number>(0);
     volume = input<number>(1);
-    showCaptions = input<boolean>(false);
     playerOverride = input<VideoPlayer | null>(null);
     seriesNavigation = input<SeriesPlaybackNavigation | null>(null);
+    /** Display-ready title lines for the fullscreen overlay; hosts with richer
+     * context (e.g. series name + episode label) pass it explicitly. */
+    mediaTitle = input<PlayerMediaTitle | null>(null);
     readonly timeUpdate = output<{
         currentTime: number;
         duration: number;
@@ -89,6 +110,16 @@ export class WebPlayerViewComponent {
         Settings | undefined
     >;
 
+    /**
+     * Subtitle preference for the built-in web players. Read from the settings
+     * store instead of an input so every host (M3U, Xtream, Stalker, portal
+     * detail pages) gets it without having to wire it through — the missing
+     * bindings were why the setting looked like a no-op (#1155).
+     */
+    readonly showCaptions = computed(
+        () => this.settingsStore.showCaptions?.() ?? false
+    );
+
     channel!: Channel;
     vjsOptions!: {
         isLive: boolean;
@@ -102,6 +133,9 @@ export class WebPlayerViewComponent {
             ? null
             : this.playbackDiagnostic()
     );
+    readonly playbackInteractionEnabled = computed(
+        () => this.visiblePlaybackDiagnostic() === null
+    );
     readonly canShowExternalFallbackActions = computed(
         () =>
             this.runtime.supportsManagedExternalPlayers &&
@@ -125,15 +159,33 @@ export class WebPlayerViewComponent {
             startTime: this.startTime(),
         };
     });
+    readonly resolvedIsLive = computed(() => {
+        const playback = this.resolvedPlayback();
+        return typeof playback.isLive === 'boolean'
+            ? playback.isLive
+            : !playback.contentInfo;
+    });
     readonly selectedPlayer = computed(
         () =>
             this.playerOverride() ??
             this.settings()?.player ??
             VideoPlayer.VideoJs
     );
-    readonly recordingFolder = computed(
-        () => this.settings()?.recordingFolder ?? ''
-    );
+    readonly resolvedMediaTitle = computed<PlayerMediaTitle | null>(() => {
+        const explicit = this.mediaTitle();
+        if (explicit?.primary?.trim()) {
+            return explicit;
+        }
+        const playback = this.resolvedPlayback();
+        const title = playback.title?.trim();
+        // resolvedPlayback() falls back to the stream URL as title; a raw URL
+        // is not a watchable overlay title.
+        if (!title || title === playback.streamUrl) {
+            return null;
+        }
+        return { primary: title, secondary: null };
+    });
+    readonly recordingFolder = computed(() => this.settings()?.recordingFolder ?? '');
 
     constructor() {
         effect(() => {
@@ -143,10 +195,7 @@ export class WebPlayerViewComponent {
             const playback = this.resolvedPlayback();
             this.playbackDiagnostic.set(null);
             this.setChannel(playback);
-            this.setVjsOptions(
-                playback.streamUrl,
-                this.isLivePlayback(playback)
-            );
+            this.setVjsOptions(playback.streamUrl, this.resolvedIsLive());
         });
     }
 
@@ -157,7 +206,9 @@ export class WebPlayerViewComponent {
                 ? 'application/x-mpegURL'
                 : extension === 'ts' || !extension
                   ? 'video/mp2t'
-                  : 'video/mp4';
+                  : extension === 'mkv'
+                    ? 'video/matroska'
+                    : 'video/mp4';
 
         this.vjsOptions = {
             isLive,
@@ -202,6 +253,7 @@ export class WebPlayerViewComponent {
                     '',
             },
             radio: 'false',
+            drm: playback.drm,
         };
     }
 
@@ -233,110 +285,19 @@ export class WebPlayerViewComponent {
         this.playbackDiagnostic.set(null);
         this.reloadToken.update((value) => value + 1);
         this.setChannel(playback);
-        this.setVjsOptions(playback.streamUrl, this.isLivePlayback(playback));
+        this.setVjsOptions(playback.streamUrl, this.resolvedIsLive());
     }
 
-    getDiagnosticTitleKey(issue: PlaybackDiagnostic): string {
-        return `${this.getDiagnosticTranslationBase(issue)}.TITLE`;
-    }
+    readonly getDiagnosticTitleKey = getDiagnosticTitleKey;
+    readonly getDiagnosticMeta = getDiagnosticMeta;
+    readonly getDiagnosticCodecHint = getDiagnosticCodecHint;
+    readonly getDiagnosticDetails = getDiagnosticDetails;
 
     getDiagnosticDescriptionKey(issue: PlaybackDiagnostic): string {
-        if (
-            issue.code === PlaybackDiagnosticCode.BrowserAccessError &&
-            !this.runtime.supportsManagedExternalPlayers
-        ) {
-            return 'PLAYBACK_DIAGNOSTICS.BROWSER_ACCESS_ERROR.PWA_DESCRIPTION';
-        }
-
-        return `${this.getDiagnosticTranslationBase(issue)}.DESCRIPTION`;
-    }
-
-    getDiagnosticMeta(issue: PlaybackDiagnostic): string {
-        const codecs = [...issue.videoCodecs, ...issue.audioCodecs].join(', ');
-        if (codecs) {
-            return codecs;
-        }
-
-        return issue.container || issue.mimeType || '';
-    }
-
-    getDiagnosticCodecHint(issue: PlaybackDiagnostic): string {
-        return getLikelyBrowserUnsupportedCodecLabels(issue).join(', ');
-    }
-
-    getDiagnosticDetails(
-        issue: PlaybackDiagnostic
-    ): readonly PlaybackDiagnosticDetail[] {
-        return [
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_CODE',
-                value: issue.code,
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_PLAYER',
-                value: this.formatPlayer(issue.player),
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_SOURCE',
-                value: this.formatDiagnosticSource(issue.source),
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_CONTAINER',
-                value: issue.container,
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_MIME_TYPE',
-                value: issue.mimeType ?? '',
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_VIDEO_CODECS',
-                value: issue.videoCodecs.join(', '),
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_AUDIO_CODECS',
-                value: issue.audioCodecs.join(', '),
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_NATIVE_ERROR_CODE',
-                value: issue.nativeErrorCode?.toString() ?? '',
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_NATIVE_ERROR_MESSAGE',
-                value: issue.nativeErrorMessage ?? '',
-            },
-            {
-                labelKey: 'PLAYBACK_DIAGNOSTICS.DETAIL_ERROR_DETAILS',
-                value: issue.details ?? '',
-            },
-        ].filter(({ value }) => value.trim().length > 0);
-    }
-
-    private getDiagnosticTranslationBase(issue: PlaybackDiagnostic): string {
-        switch (issue.code) {
-            case PlaybackDiagnosticCode.UnsupportedContainer:
-                return 'PLAYBACK_DIAGNOSTICS.UNSUPPORTED_CONTAINER';
-            case PlaybackDiagnosticCode.UnsupportedCodec:
-                return 'PLAYBACK_DIAGNOSTICS.UNSUPPORTED_CODEC';
-            case PlaybackDiagnosticCode.MediaDecodeError:
-                return 'PLAYBACK_DIAGNOSTICS.MEDIA_DECODE_ERROR';
-            case PlaybackDiagnosticCode.NetworkError:
-                return 'PLAYBACK_DIAGNOSTICS.NETWORK_ERROR';
-            case PlaybackDiagnosticCode.BrowserAccessError:
-                return 'PLAYBACK_DIAGNOSTICS.BROWSER_ACCESS_ERROR';
-            case PlaybackDiagnosticCode.DrmOrEncryption:
-                return 'PLAYBACK_DIAGNOSTICS.DRM_OR_ENCRYPTION';
-            case PlaybackDiagnosticCode.UnknownPlaybackError:
-            default:
-                return 'PLAYBACK_DIAGNOSTICS.UNKNOWN_PLAYBACK_ERROR';
-        }
-    }
-
-    private isLivePlayback(playback: ResolvedPortalPlayback): boolean {
-        if (typeof playback.isLive === 'boolean') {
-            return playback.isLive;
-        }
-
-        return !playback.contentInfo;
+        return getDiagnosticDescriptionKey(
+            issue,
+            this.runtime.supportsManagedExternalPlayers
+        );
     }
 
     private getHeaderValue(
@@ -352,34 +313,4 @@ export class WebPlayerViewComponent {
         );
         return matchingKey ? headers[matchingKey] : undefined;
     }
-
-    private formatPlayer(player: PlaybackDiagnostic['player']): string {
-        switch (player) {
-            case 'videojs':
-                return 'Video.js';
-            case 'html5':
-                return 'HTML5';
-            case 'artplayer':
-                return 'ArtPlayer';
-            default:
-                return '';
-        }
-    }
-
-    private formatDiagnosticSource(
-        source: PlaybackDiagnostic['source']
-    ): string {
-        switch (source) {
-            case 'hls':
-                return 'HLS.js';
-            case 'mpegts':
-                return 'mpegts.js';
-            case 'native':
-                return 'Native media element';
-            case 'source':
-                return 'Stream metadata';
-            default:
-                return source;
-        }
-    }
 }
diff --git a/libs/ui/playback/src/lib/web-player-view/web-player-view.spec-stubs.ts b/libs/ui/playback/src/lib/web-player-view/web-player-view.spec-stubs.ts
new file mode 100644
index 000000000..553ad2646
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-player-view/web-player-view.spec-stubs.ts
@@ -0,0 +1,70 @@
+import { Component, input, output } from '@angular/core';
+import type { PlaybackDiagnostic } from '../playback-diagnostics/playback-diagnostics.util';
+
+/**
+ * Player stand-ins for WebPlayerViewComponent specs. They mirror the real
+ * component inputs so a spec can assert what the host hands each engine
+ * without pulling in video.js, ArtPlayer or the Electron bridge.
+ */
+
+@Component({ selector: 'app-vjs-player', template: '' })
+export class StubVjsPlayerComponent {
+    readonly options = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
+    readonly volume = input(1);
+    readonly showCaptions = input(false);
+    readonly interactionEnabled = input(true);
+    readonly startTime = input(0);
+    readonly seriesNavigation = input<unknown>(null);
+    readonly timeUpdate = output<{ currentTime: number; duration: number }>();
+    readonly playbackIssue = output<PlaybackDiagnostic | null>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+}
+
+@Component({ selector: 'app-html-video-player', template: '' })
+export class StubHtmlVideoPlayerComponent {
+    readonly channel = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
+    readonly volume = input(1);
+    readonly showCaptions = input(false);
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
+    readonly startTime = input(0);
+    readonly seriesNavigation = input<unknown>(null);
+    readonly timeUpdate = output<{ currentTime: number; duration: number }>();
+    readonly playbackIssue = output<PlaybackDiagnostic | null>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+}
+
+@Component({ selector: 'app-art-player', template: '' })
+export class StubArtPlayerComponent {
+    readonly channel = input<unknown>();
+    readonly mediaTitle = input<unknown>(null);
+    readonly volume = input(1);
+    readonly showCaptions = input(false);
+    readonly isLive = input(true);
+    readonly interactionEnabled = input(true);
+    readonly startTime = input(0);
+    readonly seriesNavigation = input<unknown>(null);
+    readonly timeUpdate = output<{ currentTime: number; duration: number }>();
+    readonly playbackIssue = output<PlaybackDiagnostic | null>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+}
+
+@Component({ selector: 'app-embedded-mpv-player', template: '' })
+export class StubEmbeddedMpvPlayerComponent {
+    readonly playback = input.required<unknown>();
+    readonly mediaTitle = input<unknown>(null);
+    readonly recordingFolder = input('');
+    readonly seriesNavigation = input<unknown>(null);
+    readonly timeUpdate = output<{ currentTime: number; duration: number }>();
+    readonly playbackEnded = output<void>();
+    readonly previousEpisodeRequested = output<void>();
+    readonly nextEpisodeRequested = output<void>();
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/exit-owned-fullscreen.util.ts b/libs/ui/playback/src/lib/web-video-support/exit-owned-fullscreen.util.ts
new file mode 100644
index 000000000..52d4ba2cd
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/exit-owned-fullscreen.util.ts
@@ -0,0 +1,23 @@
+/**
+ * Exits document fullscreen only when the given surface owns it. Shared by
+ * player components whose shared-controls mode uses DOM-based fullscreen.
+ */
+export function exitOwnedFullscreen(
+    sharedControls: boolean,
+    surface: HTMLElement | undefined,
+    reportError: (error: unknown) => void
+): void {
+    if (
+        !sharedControls ||
+        document.fullscreenElement !== surface ||
+        typeof document.exitFullscreen !== 'function'
+    ) {
+        return;
+    }
+
+    try {
+        void Promise.resolve(document.exitFullscreen()).catch(reportError);
+    } catch (error: unknown) {
+        reportError(error);
+    }
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-hls-controls.ts b/libs/ui/playback/src/lib/web-video-support/web-video-hls-controls.ts
new file mode 100644
index 000000000..30fe1862c
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-hls-controls.ts
@@ -0,0 +1,208 @@
+import Hls from 'hls.js';
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+
+export interface WebVideoHlsControlsConfig {
+    showCaptions: () => boolean;
+    refresh: () => void;
+    /**
+     * Vendor-chrome hosts pass a "playback started" probe. Its presence
+     * switches the caption preference from authoritative (shared controls, the
+     * default) to source-default: the preference seeds each new source and
+     * stops being enforced once the probe returns true, so the engine's own
+     * caption menu keeps working. Shared controls omit it — they own the
+     * caption UI themselves and route user intent through `setSubtitleTrack`.
+     */
+    playbackStarted?: () => boolean;
+}
+
+export class WebVideoHlsControls {
+    private hls: Hls | null = null;
+    private refreshListener: (() => void) | null = null;
+    private subtitleOverride: number | null = null;
+    private suppressedSubtitleTrack: number | null = null;
+
+    constructor(private readonly config: WebVideoHlsControlsConfig) {}
+
+    bind(hls: Hls): void {
+        this.clear();
+        this.hls = hls;
+        const refresh = () => {
+            this.applyCaptionState();
+            this.config.refresh();
+        };
+        this.refreshListener = refresh;
+        for (const event of getHlsRefreshEvents()) {
+            hls.on(event, refresh);
+        }
+        this.applyCaptionState();
+    }
+
+    clear(): void {
+        if (this.hls && this.refreshListener) {
+            for (const event of getHlsRefreshEvents()) {
+                this.hls.off(event, this.refreshListener);
+            }
+        }
+        this.hls = null;
+        this.refreshListener = null;
+        this.subtitleOverride = null;
+        this.suppressedSubtitleTrack = null;
+    }
+
+    refreshInputs(): void {
+        this.applyCaptionState();
+    }
+
+    getAudioTracks(): PlayerTrack[] {
+        if (!this.hls) {
+            return [];
+        }
+
+        const hls = this.hls;
+        return hls.audioTracks.map((track, index) => ({
+            id: index,
+            label: track.name || track.lang || `Audio ${index + 1}`,
+            selected: index === hls.audioTrack,
+        }));
+    }
+
+    setAudioTrack(id: number): void {
+        if (
+            this.hls &&
+            Number.isInteger(id) &&
+            id >= 0 &&
+            id < this.hls.audioTracks.length
+        ) {
+            this.hls.audioTrack = id;
+        }
+    }
+
+    getSubtitleTracks(): PlayerTrack[] {
+        if (!this.hls) {
+            return [];
+        }
+
+        const hls = this.hls;
+        return hls.subtitleTracks.map((track, index) => ({
+            id: index,
+            label: track.name || track.lang || `Subtitle ${index + 1}`,
+            selected:
+                hls.subtitleDisplay === true && index === hls.subtitleTrack,
+        }));
+    }
+
+    setSubtitleTrack(id: number): void {
+        if (!this.hls || !Number.isInteger(id)) {
+            return;
+        }
+
+        if (id === -1) {
+            this.subtitleOverride = -1;
+            this.suppressedSubtitleTrack = null;
+            this.setSubtitleTrackValue(-1);
+            this.setSubtitleDisplay(false);
+            return;
+        }
+        if (id < 0 || id >= this.hls.subtitleTracks.length) {
+            return;
+        }
+
+        this.subtitleOverride = id;
+        this.suppressedSubtitleTrack = null;
+        this.setSubtitleDisplay(true);
+        this.setSubtitleTrackValue(id);
+    }
+
+    private applyCaptionState(): void {
+        if (!this.hls) {
+            return;
+        }
+
+        if (this.subtitleOverride !== null) {
+            if (this.subtitleOverride === -1) {
+                this.setSubtitleTrackValue(-1);
+                this.setSubtitleDisplay(false);
+                return;
+            }
+            if (this.subtitleOverride < this.hls.subtitleTracks.length) {
+                this.setSubtitleDisplay(true);
+                this.setSubtitleTrackValue(this.subtitleOverride);
+            } else {
+                this.setSubtitleDisplay(false);
+            }
+            return;
+        }
+
+        if (!this.config.showCaptions()) {
+            const selectedTrack = this.readSelectedSubtitleTrack();
+            if (this.config.playbackStarted) {
+                if (this.config.playbackStarted() || selectedTrack === null) {
+                    return;
+                }
+                // Deselect instead of hiding: hls.js keeps `subtitleDisplay`
+                // authoritative over the track the vendor caption menu picks,
+                // so suppressing display would make that menu inert. A `-1`
+                // assignment also clears hls.js' own default-track selection,
+                // so it will not reselect one behind the user's back.
+                this.suppressedSubtitleTrack = selectedTrack;
+                this.setSubtitleTrackValue(-1);
+                return;
+            }
+
+            // HLS may choose its default track while display is suppressed.
+            // Explicit user-off remains owned by subtitleOverride === -1 above.
+            if (selectedTrack !== null) {
+                this.suppressedSubtitleTrack = selectedTrack;
+            }
+            this.setSubtitleDisplay(false);
+            return;
+        }
+
+        const suppressedTrack = this.suppressedSubtitleTrack;
+        if (
+            suppressedTrack !== null &&
+            suppressedTrack < this.hls.subtitleTracks.length
+        ) {
+            this.suppressedSubtitleTrack = null;
+            this.setSubtitleDisplay(true);
+            this.setSubtitleTrackValue(suppressedTrack);
+        }
+    }
+
+    /** Current subtitle index, or null when nothing valid is selected. */
+    private readSelectedSubtitleTrack(): number | null {
+        const hls = this.hls;
+        if (!hls) {
+            return null;
+        }
+        return Number.isInteger(hls.subtitleTrack) &&
+            hls.subtitleTrack >= 0 &&
+            hls.subtitleTrack < hls.subtitleTracks.length
+            ? hls.subtitleTrack
+            : null;
+    }
+
+    private setSubtitleTrackValue(id: number): void {
+        if (this.hls && this.hls.subtitleTrack !== id) {
+            this.hls.subtitleTrack = id;
+        }
+    }
+
+    private setSubtitleDisplay(display: boolean): void {
+        if (this.hls && this.hls.subtitleDisplay !== display) {
+            this.hls.subtitleDisplay = display;
+        }
+    }
+}
+
+function getHlsRefreshEvents() {
+    return [
+        Hls.Events.AUDIO_TRACKS_UPDATED,
+        Hls.Events.AUDIO_TRACK_SWITCHING,
+        Hls.Events.AUDIO_TRACK_SWITCHED,
+        Hls.Events.SUBTITLE_TRACKS_UPDATED,
+        Hls.Events.SUBTITLE_TRACKS_CLEARED,
+        Hls.Events.SUBTITLE_TRACK_SWITCH,
+        Hls.Events.MANIFEST_LOADING,
+    ] as const;
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-native-source.util.ts b/libs/ui/playback/src/lib/web-video-support/web-video-native-source.util.ts
new file mode 100644
index 000000000..df2c31d16
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-native-source.util.ts
@@ -0,0 +1,22 @@
+/** Helpers for driving the native `<video>` element source list. */
+
+export function clearNativeVideoSources(element: HTMLVideoElement): void {
+    element.removeAttribute('src');
+    element.replaceChildren();
+}
+
+/**
+ * Replaces the element's sources with a single `<source>` without loading it;
+ * callers bind their controls source first, then call `element.load()`.
+ */
+export function setNativeVideoSource(
+    element: HTMLVideoElement,
+    url: string,
+    type: string
+): void {
+    clearNativeVideoSources(element);
+    const source = document.createElement('source');
+    source.src = url;
+    source.type = type;
+    element.appendChild(source);
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-native-text-tracks.ts b/libs/ui/playback/src/lib/web-video-support/web-video-native-text-tracks.ts
new file mode 100644
index 000000000..2da4d985c
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-native-text-tracks.ts
@@ -0,0 +1,184 @@
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+
+const NATIVE_TRACK_EVENTS = ['addtrack', 'removetrack', 'change'] as const;
+
+interface NativeSubtitleTrack {
+    id: number;
+    track: TextTrack;
+}
+
+export interface WebVideoNativeTextTracksConfig {
+    video: HTMLVideoElement;
+    showCaptions: () => boolean;
+    refresh: () => void;
+    /**
+     * Vendor-chrome hosts pass a "playback started" probe. Its presence
+     * switches the caption preference from authoritative (shared controls, the
+     * default) to source-default: the preference seeds each new source and
+     * stops being enforced once the probe returns true, so the native caption
+     * menu keeps working. Shared controls omit it.
+     */
+    playbackStarted?: () => boolean;
+}
+
+export class WebVideoNativeTextTracks {
+    private textTrackList: TextTrackList | null = null;
+    private refreshListener: EventListener | null = null;
+    private trackIds = new WeakMap<TextTrack, number>();
+    private suppressedModes = new WeakMap<TextTrack, TextTrackMode>();
+    private nextTrackId = 0;
+    private subtitleOverride: number | null = null;
+    private active = false;
+
+    constructor(private readonly config: WebVideoNativeTextTracksConfig) {}
+
+    bind(): void {
+        this.clear();
+        this.active = true;
+        const textTracks = this.config.video.textTracks;
+        if (typeof textTracks.addEventListener === 'function') {
+            const refresh: EventListener = () => {
+                this.applyCaptionState();
+                this.config.refresh();
+            };
+            this.textTrackList = textTracks;
+            this.refreshListener = refresh;
+            for (const event of NATIVE_TRACK_EVENTS) {
+                textTracks.addEventListener(event, refresh);
+            }
+        }
+        this.applyCaptionState();
+    }
+
+    clear(): void {
+        if (
+            this.textTrackList &&
+            this.refreshListener &&
+            typeof this.textTrackList.removeEventListener === 'function'
+        ) {
+            for (const event of NATIVE_TRACK_EVENTS) {
+                this.textTrackList.removeEventListener(
+                    event,
+                    this.refreshListener
+                );
+            }
+        }
+        this.textTrackList = null;
+        this.refreshListener = null;
+        this.trackIds = new WeakMap<TextTrack, number>();
+        this.suppressedModes = new WeakMap<TextTrack, TextTrackMode>();
+        this.nextTrackId = 0;
+        this.subtitleOverride = null;
+        this.active = false;
+    }
+
+    refreshInputs(): void {
+        this.applyCaptionState();
+    }
+
+    getSubtitleTracks(): PlayerTrack[] {
+        return this.readSubtitleTracks().map(({ id, track }) => ({
+            id,
+            label: track.label || track.language || `Subtitle ${id + 1}`,
+            selected: track.mode === 'showing',
+        }));
+    }
+
+    setSubtitleTrack(id: number): void {
+        if (!Number.isInteger(id)) {
+            return;
+        }
+
+        const tracks = this.readSubtitleTracks();
+        if (id === -1) {
+            this.subtitleOverride = -1;
+            this.applyOverride(tracks);
+            return;
+        }
+        if (!tracks.some((entry) => entry.id === id)) {
+            return;
+        }
+
+        this.subtitleOverride = id;
+        this.applyOverride(tracks);
+    }
+
+    private readSubtitleTracks(): NativeSubtitleTrack[] {
+        if (!this.active) {
+            return [];
+        }
+
+        const result: NativeSubtitleTrack[] = [];
+        try {
+            const tracks = this.config.video.textTracks;
+            for (let index = 0; index < tracks.length; index += 1) {
+                const track = tracks[index];
+                if (
+                    !track ||
+                    (track.kind !== 'captions' && track.kind !== 'subtitles')
+                ) {
+                    continue;
+                }
+
+                let id = this.trackIds.get(track);
+                if (id === undefined) {
+                    id = this.nextTrackId;
+                    this.nextTrackId += 1;
+                    this.trackIds.set(track, id);
+                }
+                result.push({ id, track });
+            }
+        } catch {
+            return [];
+        }
+        return result;
+    }
+
+    private applyCaptionState(): void {
+        if (!this.active) {
+            return;
+        }
+
+        const tracks = this.readSubtitleTracks();
+        if (this.subtitleOverride !== null) {
+            this.applyOverride(tracks);
+            return;
+        }
+
+        if (!this.config.showCaptions()) {
+            if (this.config.playbackStarted?.()) {
+                // Source-default mode: the native caption menu owns the
+                // selection once playback is running.
+                return;
+            }
+            for (const { track } of tracks) {
+                if (track.mode !== 'showing') {
+                    continue;
+                }
+                if (!this.suppressedModes.has(track)) {
+                    this.suppressedModes.set(track, track.mode);
+                }
+                track.mode = 'hidden';
+            }
+            return;
+        }
+
+        for (const { track } of tracks) {
+            const suppressedMode = this.suppressedModes.get(track);
+            if (suppressedMode === undefined) {
+                continue;
+            }
+            track.mode = suppressedMode;
+            this.suppressedModes.delete(track);
+        }
+    }
+
+    private applyOverride(tracks: NativeSubtitleTrack[]): void {
+        for (const { id, track } of tracks) {
+            track.mode =
+                this.subtitleOverride !== -1 && id === this.subtitleOverride
+                    ? 'showing'
+                    : 'hidden';
+        }
+    }
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.spec.ts b/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.spec.ts
new file mode 100644
index 000000000..6dcd6c642
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.spec.ts
@@ -0,0 +1,116 @@
+import { InlinePlaybackPlayer } from '../playback-diagnostics/playback-diagnostics.model';
+import {
+    createFakeShakaEnvironment,
+    flushShakaMicrotasks as flush,
+} from '../shaka-engine/shaka-player-test-double';
+import { ShakaVideoSession } from '../shaka-engine/shaka-video-session';
+import { WebVideoShakaControls } from './web-video-shaka-controls';
+
+describe('WebVideoShakaControls', () => {
+    const video = {} as HTMLVideoElement;
+
+    function createHarness(playbackStarted?: () => boolean) {
+        const environment = createFakeShakaEnvironment({
+            onCreate: (player) => {
+                player.textTracks = [
+                    {
+                        id: 3,
+                        active: true,
+                        language: 'en',
+                        label: 'English',
+                        kind: 'subtitles',
+                    },
+                ];
+            },
+        });
+        const state = { showCaptions: false };
+        const session = new ShakaVideoSession({
+            player: InlinePlaybackPlayer.Html5,
+            emitPlaybackIssue: () => undefined,
+            showCaptions: () => state.showCaptions,
+            loadShaka: environment.loader,
+        });
+        const controls = new WebVideoShakaControls({
+            showCaptions: () => state.showCaptions,
+            refresh: () => undefined,
+            playbackStarted,
+        });
+        return { environment, session, controls, state };
+    }
+
+    // Vendor-chrome hosts seed the source through ShakaVideoSession.start()
+    // and then stop enforcing, mirroring the HLS and native helpers.
+    it('stops re-suppressing text once playback started in source-default mode', async () => {
+        const settled = { value: false };
+        const { environment, session, controls } = createHarness(
+            () => settled.value
+        );
+        controls.bind(session);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        const player = environment.instances[0];
+        expect(player.textTracks[0].active).toBe(false);
+
+        settled.value = true;
+        player.selectTextTrack(player.textTracks[0]);
+        controls.refreshInputs();
+
+        expect(player.textTracks[0].active).toBe(true);
+    });
+
+    it('still seeds the source before playback started', async () => {
+        const { environment, session, controls } = createHarness(() => false);
+        controls.bind(session);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        const player = environment.instances[0];
+        player.selectTextTrack(player.textTracks[0]);
+        controls.refreshInputs();
+
+        expect(player.textTracks[0].active).toBe(false);
+    });
+
+    it('restores the suppressed caption track when the preference turns on', async () => {
+        const { environment, session, controls, state } = createHarness();
+        controls.bind(session);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        const player = environment.instances[0];
+        expect(player.textTracks[0].active).toBe(false);
+
+        state.showCaptions = true;
+        controls.refreshInputs();
+
+        expect(player.textTracks[0].active).toBe(true);
+    });
+
+    it('keeps an explicit user subtitle-off choice over the preference', async () => {
+        const { environment, session, controls, state } = createHarness();
+        controls.bind(session);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        controls.setSubtitleTrack(-1);
+        state.showCaptions = true;
+        controls.refreshInputs();
+
+        const player = environment.instances[0];
+        expect(player.textTracks[0].active).toBe(false);
+    });
+
+    it('lists subtitle tracks with the active flag as selection state', async () => {
+        const { environment, session, controls, state } = createHarness();
+        state.showCaptions = true;
+        controls.bind(session);
+        session.start(video, 'http://example.com/subs.mpd');
+        await flush();
+
+        expect(controls.getSubtitleTracks()).toEqual([
+            { id: 0, label: 'English', selected: true },
+        ]);
+        expect(environment.instances[0].textTracks[0].active).toBe(true);
+    });
+});
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.ts b/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.ts
new file mode 100644
index 000000000..78292aa70
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-shaka-controls.ts
@@ -0,0 +1,148 @@
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+import type {
+    ShakaPlayerLike,
+    ShakaTextTrackLike,
+} from '../shaka-engine/shaka-module.types';
+import type { ShakaVideoSession } from '../shaka-engine/shaka-video-session';
+
+export interface WebVideoShakaControlsConfig {
+    showCaptions: () => boolean;
+    refresh: () => void;
+    /**
+     * Vendor-chrome hosts pass a "playback started" probe, mirroring the HLS
+     * and native helpers. `ShakaVideoSession` already seeds the preference once
+     * the manifest is loaded, so re-suppressing on every later Shaka event
+     * would only override selections the host cannot see. Shared controls own
+     * the caption UI and omit it, staying authoritative.
+     */
+    playbackStarted?: () => boolean;
+}
+
+const SUBTITLES_OFF = -1;
+
+/**
+ * Maps a {@link ShakaVideoSession} onto the shared-controls track contract,
+ * mirroring {@link WebVideoHlsControls}. Track ids are indexes into the
+ * player's current track arrays; `-1` means subtitles explicitly off.
+ */
+export class WebVideoShakaControls {
+    private session: ShakaVideoSession | null = null;
+    private unsubscribe: (() => void) | null = null;
+    private subtitleOverride: number | null = null;
+
+    constructor(private readonly config: WebVideoShakaControlsConfig) {}
+
+    bind(session: ShakaVideoSession): void {
+        this.clear();
+        this.session = session;
+        this.unsubscribe = session.subscribe(() => {
+            this.applyCaptionState();
+            this.config.refresh();
+        });
+        this.applyCaptionState();
+    }
+
+    clear(): void {
+        this.unsubscribe?.();
+        this.unsubscribe = null;
+        this.session = null;
+        this.subtitleOverride = null;
+    }
+
+    refreshInputs(): void {
+        this.applyCaptionState();
+    }
+
+    getAudioTracks(): PlayerTrack[] {
+        return (this.getPlayer()?.getAudioTracks() ?? []).map(
+            (track, index) => ({
+                id: index,
+                label:
+                    track.label ||
+                    track.language ||
+                    `Audio ${index + 1}`,
+                selected: track.active,
+            })
+        );
+    }
+
+    setAudioTrack(id: number): void {
+        const player = this.getPlayer();
+        if (!player || !Number.isInteger(id)) {
+            return;
+        }
+
+        const track = player.getAudioTracks()[id];
+        if (track) {
+            player.selectAudioTrack(track);
+        }
+    }
+
+    getSubtitleTracks(): PlayerTrack[] {
+        const player = this.getPlayer();
+        if (!player) {
+            return [];
+        }
+
+        return player.getTextTracks().map((track, index) => ({
+            id: index,
+            label: formatTextTrackLabel(track, index),
+            selected: track.active,
+        }));
+    }
+
+    setSubtitleTrack(id: number): void {
+        const player = this.getPlayer();
+        if (!player || !Number.isInteger(id)) {
+            return;
+        }
+
+        // Shaka 5 model: selecting a track shows it, null turns text off.
+        if (id === SUBTITLES_OFF) {
+            this.subtitleOverride = SUBTITLES_OFF;
+            player.selectTextTrack(null);
+            return;
+        }
+
+        const track = player.getTextTracks()[id];
+        if (!track) {
+            return;
+        }
+
+        this.subtitleOverride = id;
+        player.selectTextTrack(track);
+    }
+
+    private applyCaptionState(): void {
+        const session = this.session;
+        if (!session || this.subtitleOverride !== null) {
+            // A user selection (subtitleOverride) always wins.
+            return;
+        }
+
+        // Without an explicit user choice, mirror the HLS bridge: keep
+        // manifest-auto-selected text hidden while the captions preference is
+        // off, and reselect the suppressed track when it turns back on.
+        if (this.config.showCaptions()) {
+            session.restoreSuppressedTextTrack();
+            return;
+        }
+        if (this.config.playbackStarted?.()) {
+            // Source-default mode: the session already seeded this source at
+            // load time, so leave the running selection alone.
+            return;
+        }
+        session.suppressTextTracks();
+    }
+
+    private getPlayer(): ShakaPlayerLike | null {
+        return this.session?.getPlayer() ?? null;
+    }
+}
+
+function formatTextTrackLabel(
+    track: ShakaTextTrackLike,
+    index: number
+): string {
+    return track.label || track.language || `Subtitle ${index + 1}`;
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-source-controls.bridge.ts b/libs/ui/playback/src/lib/web-video-support/web-video-source-controls.bridge.ts
new file mode 100644
index 000000000..a1a92cc3a
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-source-controls.bridge.ts
@@ -0,0 +1,152 @@
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+import type { WebVideoControlsAdapter } from '../player-controls/web-video-controls.adapter';
+import {
+    type WebVideoControlsSource,
+    WebVideoSourceTracks,
+} from './web-video-source-tracks';
+
+export type { WebVideoControlsSource };
+
+export interface WebVideoSourceControlsBridgeConfig {
+    video: HTMLVideoElement;
+    adapter: WebVideoControlsAdapter;
+    isLive: () => boolean;
+    showCaptions: () => boolean;
+}
+
+export class WebVideoSourceControlsBridge {
+    private readonly config: WebVideoSourceControlsBridgeConfig;
+    private readonly tracks: WebVideoSourceTracks;
+    private attached = false;
+    private destroyed = false;
+
+    constructor(config: WebVideoSourceControlsBridgeConfig) {
+        this.config = config;
+        this.tracks = new WebVideoSourceTracks({
+            video: config.video,
+            showCaptions: config.showCaptions,
+            refresh: () => this.config.adapter.refresh(),
+        });
+    }
+
+    attach(): void {
+        if (this.attached || this.destroyed) {
+            return;
+        }
+
+        this.config.adapter.attach(this.config.video, {
+            isLive: this.config.isLive,
+            getDuration: () => this.readDuration(),
+            getAudioTracks: () => this.getAudioTracks(),
+            setAudioTrack: (id) => this.setAudioTrack(id),
+            getSubtitleTracks: () => this.getSubtitleTracks(),
+            setSubtitleTrack: (id) => this.setSubtitleTrack(id),
+        });
+        this.attached = true;
+    }
+
+    setSource(source: WebVideoControlsSource): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.tracks.setSource(source);
+        this.config.adapter.refresh();
+    }
+
+    refreshInputs(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.tracks.refreshInputs();
+        this.config.adapter.refresh();
+    }
+
+    clearSource(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.tracks.clearSource();
+        this.config.adapter.refresh();
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.clearSource();
+        this.tracks.destroy();
+        if (this.attached) {
+            this.config.adapter.detach();
+            this.attached = false;
+        }
+        this.destroyed = true;
+    }
+
+    readDuration(): number {
+        if (this.tracks.sourceKind !== 'mpegts' || this.config.isLive()) {
+            return NaN;
+        }
+
+        const videoDuration = this.readFinitePositive(() => {
+            return this.config.video.duration;
+        });
+        if (!Number.isNaN(videoDuration)) {
+            return videoDuration;
+        }
+
+        const seekableEnd = this.readLastFinitePositiveEnd(() => {
+            return this.config.video.seekable;
+        });
+        if (!Number.isNaN(seekableEnd)) {
+            return seekableEnd;
+        }
+
+        return this.readLastFinitePositiveEnd(() => {
+            return this.config.video.buffered;
+        });
+    }
+
+    private getAudioTracks(): PlayerTrack[] {
+        return this.tracks.getAudioTracks();
+    }
+
+    private setAudioTrack(id: number): void {
+        this.tracks.setAudioTrack(id);
+    }
+
+    private getSubtitleTracks(): PlayerTrack[] {
+        return this.tracks.getSubtitleTracks();
+    }
+
+    private setSubtitleTrack(id: number): void {
+        this.tracks.setSubtitleTrack(id);
+    }
+
+    private readFinitePositive(read: () => number): number {
+        try {
+            const value = read();
+            return Number.isFinite(value) && value > 0 ? value : NaN;
+        } catch {
+            return NaN;
+        }
+    }
+
+    private readLastFinitePositiveEnd(read: () => TimeRanges): number {
+        try {
+            const ranges = read();
+            for (let index = ranges.length - 1; index >= 0; index -= 1) {
+                const end = ranges.end(index);
+                if (Number.isFinite(end) && end > 0) {
+                    return end;
+                }
+            }
+        } catch {
+            return NaN;
+        }
+        return NaN;
+    }
+}
diff --git a/libs/ui/playback/src/lib/web-video-support/web-video-source-tracks.ts b/libs/ui/playback/src/lib/web-video-support/web-video-source-tracks.ts
new file mode 100644
index 000000000..105703cf2
--- /dev/null
+++ b/libs/ui/playback/src/lib/web-video-support/web-video-source-tracks.ts
@@ -0,0 +1,188 @@
+import type Hls from 'hls.js';
+import type { PlayerTrack } from '../player-controls/player-controls.model';
+import type { ShakaVideoSession } from '../shaka-engine/shaka-video-session';
+import { WebVideoHlsControls } from './web-video-hls-controls';
+import { WebVideoNativeTextTracks } from './web-video-native-text-tracks';
+import { WebVideoShakaControls } from './web-video-shaka-controls';
+
+export type WebVideoControlsSource =
+    | { kind: 'native' }
+    | { kind: 'mpegts' }
+    | { kind: 'hls'; hls: Hls }
+    | { kind: 'shaka'; session: ShakaVideoSession };
+
+export interface WebVideoSourceTracksConfig {
+    video: HTMLVideoElement;
+    showCaptions: () => boolean;
+    /**
+     * Notifies the owning controls UI that track state changed. Legacy players
+     * have no shared controls to refresh and leave it unset — they use this
+     * class purely to apply the caption preference.
+     */
+    refresh?: () => void;
+    /**
+     * Set by hosts that keep the engine's own caption UI (the preference-off
+     * players). The caption preference then seeds each new source instead of
+     * staying authoritative, so the vendor caption menu keeps working once
+     * playback is running. Shared controls own the caption UI and omit it.
+     */
+    vendorCaptionControls?: boolean;
+}
+
+/**
+ * Owns the per-source audio/subtitle track controllers of a web video engine.
+ *
+ * It is deliberately free of any controls-UI dependency so both the shared
+ * controls bridge and the legacy (vendor-chrome) players apply the
+ * `showCaptions` preference through the exact same code path.
+ */
+export class WebVideoSourceTracks {
+    private readonly config: WebVideoSourceTracksConfig;
+    private readonly hlsControls: WebVideoHlsControls;
+    private readonly shakaControls: WebVideoShakaControls;
+    private readonly nativeTextTracks: WebVideoNativeTextTracks;
+    private source: WebVideoControlsSource | null = null;
+    private playbackStarted = false;
+    private playingListener: (() => void) | null = null;
+    private destroyed = false;
+
+    constructor(config: WebVideoSourceTracksConfig) {
+        this.config = config;
+        const refresh = () => config.refresh?.();
+        const playbackStarted = config.vendorCaptionControls
+            ? () => this.playbackStarted
+            : undefined;
+        this.hlsControls = new WebVideoHlsControls({
+            showCaptions: config.showCaptions,
+            refresh,
+            playbackStarted,
+        });
+        this.shakaControls = new WebVideoShakaControls({
+            showCaptions: config.showCaptions,
+            refresh,
+            playbackStarted,
+        });
+        this.nativeTextTracks = new WebVideoNativeTextTracks({
+            video: config.video,
+            showCaptions: config.showCaptions,
+            refresh,
+            playbackStarted,
+        });
+        if (config.vendorCaptionControls) {
+            const listener = () => {
+                this.playbackStarted = true;
+            };
+            this.playingListener = listener;
+            config.video.addEventListener('playing', listener);
+        }
+    }
+
+    get sourceKind(): WebVideoControlsSource['kind'] | null {
+        return this.source?.kind ?? null;
+    }
+
+    setSource(source: WebVideoControlsSource): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.clearActiveSource();
+        this.source = source;
+        // A new source starts unsettled so its own defaults are seeded again.
+        this.playbackStarted = false;
+        if (source.kind === 'hls') {
+            this.hlsControls.bind(source.hls);
+        } else if (source.kind === 'shaka') {
+            this.shakaControls.bind(source.session);
+        } else {
+            this.nativeTextTracks.bind();
+        }
+    }
+
+    refreshInputs(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        if (this.source?.kind === 'hls') {
+            this.hlsControls.refreshInputs();
+        } else if (this.source?.kind === 'shaka') {
+            this.shakaControls.refreshInputs();
+        } else if (this.source) {
+            this.nativeTextTracks.refreshInputs();
+        }
+    }
+
+    clearSource(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.clearActiveSource();
+        this.source = null;
+    }
+
+    destroy(): void {
+        if (this.destroyed) {
+            return;
+        }
+
+        this.clearSource();
+        if (this.playingListener) {
+            this.config.video.removeEventListener(
+                'playing',
+                this.playingListener
+            );
+            this.playingListener = null;
+        }
+        this.destroyed = true;
+    }
+
+    getAudioTracks(): PlayerTrack[] {
+        if (this.source?.kind === 'hls') {
+            return this.hlsControls.getAudioTracks();
+        }
+        if (this.source?.kind === 'shaka') {
+            return this.shakaControls.getAudioTracks();
+        }
+        return [];
+    }
+
+    setAudioTrack(id: number): void {
+        if (this.source?.kind === 'hls') {
+            this.hlsControls.setAudioTrack(id);
+        } else if (this.source?.kind === 'shaka') {
+            this.shakaControls.setAudioTrack(id);
+        }
+    }
+
+    getSubtitleTracks(): PlayerTrack[] {
+        if (this.source?.kind === 'hls') {
+            return this.hlsControls.getSubtitleTracks();
+        }
+        if (this.source?.kind === 'shaka') {
+            return this.shakaControls.getSubtitleTracks();
+        }
+        return this.source ? this.nativeTextTracks.getSubtitleTracks() : [];
+    }
+
+    setSubtitleTrack(id: number): void {
+        if (this.source?.kind === 'hls') {
+            this.hlsControls.setSubtitleTrack(id);
+        } else if (this.source?.kind === 'shaka') {
+            this.shakaControls.setSubtitleTrack(id);
+        } else if (this.source) {
+            this.nativeTextTracks.setSubtitleTrack(id);
+        }
+    }
+
+    private clearActiveSource(): void {
+        if (this.source?.kind === 'hls') {
+            this.hlsControls.clear();
+        } else if (this.source?.kind === 'shaka') {
+            this.shakaControls.clear();
+        } else if (this.source) {
+            this.nativeTextTracks.clear();
+        }
+    }
+}
diff --git a/libs/ui/playback/tsconfig.lib.json b/libs/ui/playback/tsconfig.lib.json
index 03dbd1884..59c155355 100644
--- a/libs/ui/playback/tsconfig.lib.json
+++ b/libs/ui/playback/tsconfig.lib.json
@@ -8,5 +8,10 @@
         "types": []
     },
     "include": ["src/**/*.ts"],
-    "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
+    "exclude": [
+        "src/**/*.spec.ts",
+        "src/**/*.test.ts",
+        "src/**/*.spec-fixtures.ts",
+        "src/**/*.spec-helpers.ts"
+    ]
 }
diff --git a/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.html b/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.html
index 69bfefd90..92bed9a46 100644
--- a/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.html
+++ b/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.html
@@ -27,10 +27,19 @@
             }
             <div class="actor-view__meta">
                 <h1>{{ person.name }}</h1>
-                @if (person.birthday) {
+                @if (person.birthday || person.deathday) {
                     <p class="actor-view__born">
-                        {{ 'XTREAM.ACTOR_BORN' | translate }}
-                        {{ person.birthday }}
+                        @if (person.birthday) {
+                            {{ 'XTREAM.ACTOR_BORN' | translate }}
+                            {{ person.birthday }}
+                        }
+                        @if (person.deathday) {
+                            @if (person.birthday) {
+                                ·
+                            }
+                            {{ 'XTREAM.ACTOR_DIED' | translate }}
+                            {{ person.deathday }}
+                        }
                         @if (person.placeOfBirth) {
                             · {{ person.placeOfBirth }}
                         }
@@ -165,6 +174,8 @@
                             }
                             @if (item.character) {
                                 · {{ item.character }}
+                            } @else if (item.crewJob) {
+                                · {{ crewJobKey(item.crewJob) | translate }}
                             }
                         </span>
                     </button>
diff --git a/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.ts b/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.ts
index 0d55cb647..0c6b993b7 100644
--- a/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.ts
+++ b/libs/ui/shared-portals/src/lib/actor-view/actor-view.component.ts
@@ -52,6 +52,13 @@ export class ActorViewComponent {
 
     readonly filterMode = signal<'all' | 'available'>('all');
 
+    /** Translated label key for a crew-only credit ("Director"/"Creator") */
+    crewJobKey(job: 'Director' | 'Creator'): string {
+        return job === 'Creator'
+            ? 'XTREAM.CREW_JOB_CREATOR'
+            : 'XTREAM.CREW_JOB_DIRECTOR';
+    }
+
     readonly visibleItems = computed(() =>
         this.showAvailabilityFilter() && this.filterMode() === 'available'
             ? this.items().filter((item) => item.available)
diff --git a/libs/ui/styles/_detail-view-actions.scss b/libs/ui/styles/_detail-view-actions.scss
index 46cfe6e58..890768c31 100644
--- a/libs/ui/styles/_detail-view-actions.scss
+++ b/libs/ui/styles/_detail-view-actions.scss
@@ -95,6 +95,16 @@
             background: rgba(255, 255, 255, 0.04);
         }
     }
+
+    &--paused {
+        background: rgba(251, 191, 36, 0.14);
+        border-color: rgba(251, 191, 36, 0.4);
+        color: #fbbf24;
+
+        &:hover {
+            background: rgba(251, 191, 36, 0.22);
+        }
+    }
 }
 
 @mixin mobile-action-buttons {
diff --git a/libs/ui/styles/_detail-view.scss b/libs/ui/styles/_detail-view.scss
index 49f8c0f50..891b2af8a 100644
--- a/libs/ui/styles/_detail-view.scss
+++ b/libs/ui/styles/_detail-view.scss
@@ -135,6 +135,14 @@
                 color: #ffd700;
                 border-color: rgba(255, 215, 0, 0.3);
             }
+
+            // Series production status — a state, not a fact about the
+            // title, so it reads quieter than the other tags
+            &--status {
+                text-transform: uppercase;
+                font-size: 0.6875rem;
+                letter-spacing: 0.06em;
+            }
         }
 
         &__meta-item {
@@ -223,6 +231,12 @@
             overflow-x: auto;
             padding-bottom: 8px;
             scrollbar-width: thin;
+            scrollbar-color: color-mix(
+                    in srgb,
+                    var(--app-muted-color) 55%,
+                    transparent
+                )
+                transparent;
         }
 
         &__similar-card {
diff --git a/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts b/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts
index 7db523906..acbd1ed89 100644
--- a/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts
+++ b/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts
@@ -148,7 +148,7 @@ describe('DashboardDataService', () => {
     const playlistsServiceMock = {
         getM3uFavoriteChannels: jest.fn().mockReturnValue(of(null)),
         getPlaylistById: jest.fn().mockReturnValue(of(playlistMock)),
-        setFavorites: jest.fn().mockReturnValue(of(undefined)),
+        transformPlaylistFavorites: jest.fn().mockReturnValue(of(playlistMock)),
         removeFromM3uRecentlyViewed: jest.fn().mockReturnValue(
             of({
                 ...playlistMock,
@@ -193,8 +193,10 @@ describe('DashboardDataService', () => {
         playlistsServiceMock.getM3uFavoriteChannels.mockReturnValue(of(null));
         playlistsServiceMock.getPlaylistById.mockClear();
         playlistsServiceMock.getPlaylistById.mockReturnValue(of(playlistMock));
-        playlistsServiceMock.setFavorites.mockClear();
-        playlistsServiceMock.setFavorites.mockReturnValue(of(undefined));
+        playlistsServiceMock.transformPlaylistFavorites.mockClear();
+        playlistsServiceMock.transformPlaylistFavorites.mockReturnValue(
+            of(playlistMock)
+        );
         playlistsServiceMock.removeFromM3uRecentlyViewed.mockClear();
         playlistsServiceMock.removeFromM3uRecentlyViewed.mockReturnValue(
             of({
@@ -751,10 +753,14 @@ describe('DashboardDataService', () => {
 
         await service.removeGlobalFavorite(m3uItem!);
 
-        expect(playlistsServiceMock.setFavorites).toHaveBeenCalledWith(
-            'm3u-1',
-            ['https://example.com/stream-2.m3u8']
-        );
+        expect(
+            playlistsServiceMock.transformPlaylistFavorites
+        ).toHaveBeenCalledWith('m3u-1', expect.any(Function));
+        const [, transform] =
+            playlistsServiceMock.transformPlaylistFavorites.mock.calls[0];
+        expect(
+            transform(['channel-1', 'https://example.com/stream-2.m3u8'])
+        ).toEqual(['https://example.com/stream-2.m3u8']);
     });
 
     it('removes PWA Xtream favorites through the active data source', async () => {
@@ -969,6 +975,9 @@ describe('DashboardDataService', () => {
         const series = vodItems.find(
             (item) => item.title === 'Color Orchard S02E04'
         );
+        if (!series) {
+            throw new Error('expected the series recent item');
+        }
 
         // Movie: vod position with 60% watched.
         const moviePos = service.getPlaybackPositionForItem(movie!);
@@ -977,13 +986,148 @@ describe('DashboardDataService', () => {
 
         // Series: episode position keyed by the recent item's xtream_id (the
         // episode id, not the series id).
-        const seriesPos = service.getPlaybackPositionForItem(series!);
+        const seriesPos = service.getPlaybackPositionForItem(series);
         expect(seriesPos?.contentType).toBe('episode');
         expect(seriesPos?.positionSeconds).toBe(720);
         // Season/episode metadata travels with the position so cards can
         // render an "S2 · E5" badge without an extra round-trip.
         expect(seriesPos?.seasonNumber).toBe(2);
         expect(seriesPos?.episodeNumber).toBe(4);
+        expect(service.getRecentItemNavigationState(series)).toEqual({
+            openCollectionDetailItem: {
+                item: expect.objectContaining({
+                    contentType: 'series',
+                    xtreamId: 900,
+                }),
+                seriesResume: {
+                    seriesXtreamId: 900,
+                    contentXtreamId: 909,
+                    seasonNumber: 2,
+                    episodeNumber: 4,
+                },
+            },
+        });
+    });
+
+    it('resolves episode metadata for a Stalker VOD is_series recent item', async () => {
+        playlistsSignal.set([
+            ...createDefaultPlaylists(),
+            {
+                _id: 'stalker-series',
+                title: 'Ministra Portal',
+                count: 1,
+                importDate: '2026-01-01T00:00:00.000Z',
+                autoRefresh: false,
+                macAddress: '00:11:22:33:44:55',
+                recentlyViewed: [
+                    {
+                        id: '50001',
+                        title: 'VOD Flagged Series',
+                        category_id: 'vod',
+                        is_series: '1',
+                        added_at: '2026-07-20T12:00:00.000Z',
+                    },
+                ],
+            },
+        ]);
+        playbackPositionsMock.getAllPlaybackPositions.mockImplementation(
+            async (playlistId: string) =>
+                playlistId === 'stalker-series'
+                    ? [
+                          {
+                              playlistId,
+                              contentXtreamId: 5000101,
+                              contentType: 'episode',
+                              seriesXtreamId: 50001,
+                              seasonNumber: 1,
+                              episodeNumber: 1,
+                              positionSeconds: 120,
+                              durationSeconds: 1800,
+                          },
+                      ]
+                    : []
+        );
+
+        await service.reloadPlaybackPositions();
+
+        const item = service
+            .globalRecentItems()
+            .find((recent) => recent.playlist_id === 'stalker-series');
+        if (!item) {
+            throw new Error('expected the Stalker is_series recent item');
+        }
+
+        expect(item.type).toBe('series');
+        expect(service.getPlaybackPositionForItem(item)).toEqual(
+            expect.objectContaining({
+                seasonNumber: 1,
+                episodeNumber: 1,
+            })
+        );
+    });
+
+    it('keeps legacy episode-keyed recents detail-only when the position row lacks the parent series id', async () => {
+        dbServiceMock.getGlobalRecentlyViewed.mockResolvedValue([
+            {
+                id: 103,
+                category_id: 19,
+                title: 'Legacy Orchard S02E04',
+                rating: '8.1',
+                viewed_at: '2026-04-22T10:00:00.000Z',
+                poster_url: 'https://example.com/legacy-orchard.png',
+                xtream_id: 909,
+                type: 'series',
+                playlist_id: 'xtream-L',
+                playlist_name: 'Xtream Legacy',
+            },
+        ]);
+
+        playlistsSignal.set([
+            ...playlistsSignal(),
+            {
+                _id: 'xtream-L',
+                title: 'Xtream Legacy',
+                count: 1,
+                importDate: '2026-01-01T00:00:00.000Z',
+                autoRefresh: false,
+                serverUrl: 'https://legacy.example.com',
+            },
+        ]);
+
+        // Rows saved before seriesXtreamId existed: keyed by the episode id
+        // with no pointer back to the parent series.
+        playbackPositionsMock.getAllPlaybackPositions.mockResolvedValue([
+            {
+                contentXtreamId: 909,
+                contentType: 'episode',
+                seasonNumber: 2,
+                episodeNumber: 4,
+                positionSeconds: 720,
+                durationSeconds: 1800,
+                playlistId: 'xtream-L',
+            } as PlaybackPositionData,
+        ]);
+
+        await service.reloadGlobalRecentItems();
+        await service.reloadPlaybackPositions();
+
+        const series = service
+            .globalRecentVodItems()
+            .find((item) => item.title === 'Legacy Orchard S02E04');
+        if (!series) {
+            throw new Error('expected the series recent item');
+        }
+
+        // The episode id must not be promoted to a series id: no resume
+        // target, and the detail item keeps its original identifier.
+        expect(service.getRecentItemNavigationState(series)).toEqual({
+            openCollectionDetailItem: {
+                item: expect.objectContaining({
+                    contentType: 'series',
+                    xtreamId: 909,
+                }),
+            },
+        });
     });
 
     it('resolves the latest episode position for series whose recent_items row carries the series id', async () => {
@@ -1077,6 +1221,21 @@ describe('DashboardDataService', () => {
         expect(position?.contentType).toBe('episode');
         expect(position?.seasonNumber).toBe(3);
         expect(position?.episodeNumber).toBe(7);
+        expect(service.getRecentItemNavigationState(series)).toEqual({
+            openCollectionDetailItem: {
+                item: expect.objectContaining({
+                    contentType: 'series',
+                    sourceType: 'xtream',
+                    xtreamId: 4000,
+                }),
+                seriesResume: {
+                    seriesXtreamId: 4000,
+                    contentXtreamId: 4007,
+                    seasonNumber: 3,
+                    episodeNumber: 7,
+                },
+            },
+        });
         expect(failOnLinearScan).not.toHaveBeenCalled();
     });
 
@@ -1135,9 +1294,7 @@ describe('DashboardDataService', () => {
 
         // Crucially, the movie favorite is excluded — the rail source must
         // never leak VOD posters into the channel layout.
-        expect(liveOnly.map((it) => it.title)).not.toContain(
-            'Favorite Movie'
-        );
+        expect(liveOnly.map((it) => it.title)).not.toContain('Favorite Movie');
         expect(
             service.globalFavoriteLiveItems().every((it) => it.type === 'live')
         ).toBe(true);
diff --git a/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.ts b/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.ts
index 989c839cd..71cb19fe5 100644
--- a/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.ts
+++ b/libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.ts
@@ -893,7 +893,10 @@ export class DashboardDataService {
     getRecentItemNavigationState(
         item: GlobalRecentItem
     ): WorkspaceNavigationTarget['state'] {
-        return getRecentItemNavigationStateUtil(item);
+        return getRecentItemNavigationStateUtil(
+            item,
+            this.getPlaybackPositionForItem(item)
+        );
     }
 
     async removeGlobalRecentItem(item: GlobalRecentItem): Promise<void> {
@@ -1062,23 +1065,15 @@ export class DashboardDataService {
         }
 
         if (item.source === 'm3u') {
-            const playlist = await firstValueFrom(
-                this.playlistsService.getPlaylistById(item.playlist_id)
-            );
-            const currentFavorites = Array.isArray(playlist?.favorites)
-                ? playlist.favorites.filter(
-                      (favorite): favorite is string =>
-                          typeof favorite === 'string'
-                  )
-                : [];
-            const filteredFavorites = currentFavorites.filter(
-                (favorite) => favorite !== String(item.id)
-            );
-
             await firstValueFrom(
-                this.playlistsService.setFavorites(
+                this.playlistsService.transformPlaylistFavorites(
                     item.playlist_id,
-                    filteredFavorites
+                    (current) =>
+                        current.filter(
+                            (favorite) =>
+                                typeof favorite !== 'string' ||
+                                favorite !== String(item.id)
+                        )
                 )
             );
             await this.reloadGlobalFavorites();
@@ -1218,14 +1213,16 @@ export class DashboardDataService {
         const fallbackTimestamp =
             this.getM3uFavoriteTimestamp(playlistMeta) ??
             new Date(0).toISOString();
-        const items = resolvedChannels.slice().map((favorite) =>
-            this.createM3uFavoriteItem(
-                playlistMeta,
-                favorite.favoriteId,
-                favorite.channel,
-                fallbackTimestamp
-            )
-        );
+        const items = resolvedChannels
+            .slice()
+            .map((favorite) =>
+                this.createM3uFavoriteItem(
+                    playlistMeta,
+                    favorite.favoriteId,
+                    favorite.channel,
+                    fallbackTimestamp
+                )
+            );
 
         this.m3uFavoritesCache.set(playlistMeta._id, {
             fingerprint,
diff --git a/libs/workspace/dashboard/data-access/src/lib/dashboard-navigation.util.ts b/libs/workspace/dashboard/data-access/src/lib/dashboard-navigation.util.ts
index 6b8993d1b..eb0ea59af 100644
--- a/libs/workspace/dashboard/data-access/src/lib/dashboard-navigation.util.ts
+++ b/libs/workspace/dashboard/data-access/src/lib/dashboard-navigation.util.ts
@@ -1,5 +1,6 @@
 import {
     PlaylistMeta,
+    PlaybackPositionData,
     PortalActivityType,
     PortalAddedItem,
     PortalFavoriteItem,
@@ -12,6 +13,7 @@ import {
     getGlobalFavoriteNavigation,
     getRecentItemNavigation,
     WorkspaceNavigationTarget,
+    type SeriesResumeTarget,
 } from '@iptvnator/portal/shared/util';
 
 /**
@@ -58,9 +60,54 @@ export function getRecentItemLink(item: PortalRecentItem): string[] {
 }
 
 export function getRecentItemNavigationState(
-    item: PortalRecentItem
+    item: PortalRecentItem,
+    playbackPosition?: PlaybackPositionData | null
 ): WorkspaceNavigationTarget['state'] {
-    return getRecentItemNavigation(item).state;
+    return getRecentItemNavigation(
+        item,
+        buildRecentSeriesResumeTarget(item, playbackPosition)
+    ).state;
+}
+
+function buildRecentSeriesResumeTarget(
+    item: PortalRecentItem,
+    playbackPosition?: PlaybackPositionData | null
+): SeriesResumeTarget | null {
+    if (
+        item.type !== 'series' ||
+        item.source !== 'xtream' ||
+        playbackPosition?.contentType !== 'episode'
+    ) {
+        return null;
+    }
+
+    // Episode-keyed recent rows make item.xtream_id an episode id, so only a
+    // position row that names its parent series can produce a resume target;
+    // legacy rows without seriesXtreamId stay detail-only.
+    const seriesXtreamId = Number(playbackPosition.seriesXtreamId);
+    const contentXtreamId = Number(playbackPosition.contentXtreamId);
+    const seasonNumber = Number(playbackPosition.seasonNumber);
+    const episodeNumber = Number(playbackPosition.episodeNumber);
+
+    if (
+        !Number.isInteger(seriesXtreamId) ||
+        seriesXtreamId <= 0 ||
+        !Number.isInteger(contentXtreamId) ||
+        contentXtreamId <= 0 ||
+        !Number.isInteger(seasonNumber) ||
+        seasonNumber < 0 ||
+        !Number.isInteger(episodeNumber) ||
+        episodeNumber < 0
+    ) {
+        return null;
+    }
+
+    return {
+        seriesXtreamId,
+        contentXtreamId,
+        seasonNumber,
+        episodeNumber,
+    };
 }
 
 export function getGlobalFavoriteLink(item: PortalFavoriteItem): string[] {
diff --git a/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.html b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.html
index a61bc5506..632dfa7e8 100644
--- a/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.html
+++ b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.html
@@ -58,7 +58,7 @@
                     <div
                         class="rail__card rail__card--channel"
                         role="listitem"
-                        [attr.title]="card.title"
+                        [attr.title]="cardTitle(card)"
                         [attr.data-test-id]="
                             testId() ? testId() + '-card' : null
                         "
@@ -83,7 +83,7 @@
                                     ) {
                                         <img
                                             [src]="card.imageUrl"
-                                            [alt]="card.title"
+                                            [alt]="cardTitle(card)"
                                             loading="lazy"
                                             decoding="async"
                                             (error)="markFailed(card.id)"
@@ -94,7 +94,7 @@
                                 </div>
                                 <div class="rail__channel-meta">
                                     <span class="rail__channel-name">{{
-                                        card.title
+                                        cardTitle(card)
                                     }}</span>
                                     <span class="rail__channel-now">
                                         @if (card.nowPlayingTitle) {
@@ -134,7 +134,7 @@
                     <div
                         class="rail__card"
                         role="listitem"
-                        [attr.title]="card.title"
+                        [attr.title]="cardTitle(card)"
                         [attr.data-test-id]="
                             testId() ? testId() + '-card' : null
                         "
@@ -166,7 +166,7 @@
                                     }
                                     <img
                                         [src]="card.imageUrl"
-                                        [alt]="card.title"
+                                        [alt]="cardTitle(card)"
                                         loading="lazy"
                                         decoding="async"
                                         (error)="markFailed(card.id)"
@@ -191,7 +191,7 @@
 
                             <div class="rail__meta">
                                 <span class="rail__card-title">{{
-                                    card.title
+                                    cardTitle(card)
                                 }}</span>
                                 <span class="rail__card-meta-row">
                                     @if (card.episodeBadge) {
diff --git a/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.spec.ts b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.spec.ts
new file mode 100644
index 000000000..6e6f39a7b
--- /dev/null
+++ b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.spec.ts
@@ -0,0 +1,72 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { SettingsStore } from '@iptvnator/services';
+import {
+    DashboardRailCard,
+    DashboardRailComponent,
+} from './dashboard-rail.component';
+
+describe('DashboardRailComponent', () => {
+    const createComponent = async (stripCountryPrefix: boolean) => {
+        await TestBed.configureTestingModule({
+            imports: [DashboardRailComponent],
+            providers: [
+                {
+                    provide: SettingsStore,
+                    useValue: {
+                        stripCountryPrefix: signal(stripCountryPrefix),
+                    },
+                },
+            ],
+        }).compileComponents();
+
+        const fixture = TestBed.createComponent(DashboardRailComponent);
+        fixture.componentRef.setInput('label', 'Rail');
+        fixture.componentRef.setInput('items', []);
+        return fixture.componentInstance as unknown as {
+            cardTitle(card: DashboardRailCard): string;
+        };
+    };
+
+    const card = (overrides: Partial<DashboardRailCard>): DashboardRailCard =>
+        ({
+            id: 'card-1',
+            title: 'US | CNN',
+            icon: 'live_tv',
+            link: ['/workspace'],
+            ...overrides,
+        }) as DashboardRailCard;
+
+    afterEach(() => {
+        TestBed.resetTestingModule();
+    });
+
+    it('strips the prefix from live card titles when the setting is enabled', async () => {
+        const component = await createComponent(true);
+
+        expect(component.cardTitle(card({ contentType: 'live' }))).toBe('CNN');
+    });
+
+    it('keeps movie and series card titles untouched', async () => {
+        const component = await createComponent(true);
+
+        expect(
+            component.cardTitle(
+                card({ title: 'US | Some Movie', contentType: 'movie' })
+            )
+        ).toBe('US | Some Movie');
+        expect(
+            component.cardTitle(
+                card({ title: 'US | Some Show', contentType: 'series' })
+            )
+        ).toBe('US | Some Show');
+    });
+
+    it('keeps live card titles untouched while the setting is disabled', async () => {
+        const component = await createComponent(false);
+
+        expect(component.cardTitle(card({ contentType: 'live' }))).toBe(
+            'US | CNN'
+        );
+    });
+});
diff --git a/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.ts b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.ts
index a9f5e2d16..9a3cbaa9f 100644
--- a/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.ts
+++ b/libs/workspace/dashboard/feature/src/lib/rails/dashboard-rail.component.ts
@@ -5,6 +5,7 @@ import {
     ElementRef,
     OnDestroy,
     effect,
+    inject,
     input,
     output,
     signal,
@@ -15,6 +16,8 @@ import { MatIcon } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { RouterLink } from '@angular/router';
 import { TranslatePipe } from '@ngx-translate/core';
+import { SettingsStore } from '@iptvnator/services';
+import { applyChannelNameStrip } from '@iptvnator/shared/m3u-utils';
 
 export interface DashboardRailAction {
     id: string;
@@ -94,6 +97,8 @@ export interface DashboardRailActionSelection {
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DashboardRailComponent implements AfterViewInit, OnDestroy {
+    private readonly settingsStore = inject(SettingsStore);
+
     readonly label = input.required<string>();
     readonly items = input.required<DashboardRailCard[]>();
     readonly seeAllLink = input<string[] | null>(null);
@@ -164,6 +169,15 @@ export class DashboardRailComponent implements AfterViewInit, OnDestroy {
         event.stopPropagation();
     }
 
+    /** Prefix stripping applies to live-channel cards only, never VOD/series. */
+    protected cardTitle(card: DashboardRailCard): string {
+        return applyChannelNameStrip(
+            card.title,
+            card.contentType === 'live' &&
+                this.settingsStore.stripCountryPrefix?.()
+        );
+    }
+
     selectAction(
         card: DashboardRailCard,
         action: DashboardRailAction,
diff --git a/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.spec.ts b/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.spec.ts
new file mode 100644
index 000000000..34ae1087e
--- /dev/null
+++ b/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.spec.ts
@@ -0,0 +1,116 @@
+import { TestBed } from '@angular/core/testing';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { DatabaseService, PlaylistsService } from '@iptvnator/services';
+import { UnifiedFavoriteChannel } from '@iptvnator/portal/shared/util';
+import { GlobalFavoritesService } from './global-favorites.service';
+
+describe('GlobalFavoritesService', () => {
+    let service: GlobalFavoritesService;
+    let electronApi: {
+        dbReorderGlobalFavorites: jest.Mock;
+        dbSetAppState: jest.Mock;
+    };
+
+    const makeChannel = (
+        overrides: Partial<UnifiedFavoriteChannel> &
+            Pick<UnifiedFavoriteChannel, 'uid' | 'sourceType' | 'playlistId'>
+    ): UnifiedFavoriteChannel => ({
+        name: 'Channel',
+        logo: null,
+        playlistName: 'Playlist',
+        addedAt: new Date(0).toISOString(),
+        position: 0,
+        ...overrides,
+    });
+
+    beforeEach(() => {
+        electronApi = {
+            dbReorderGlobalFavorites: jest
+                .fn()
+                .mockResolvedValue({ success: true }),
+            dbSetAppState: jest.fn().mockResolvedValue({ success: true }),
+        };
+        Object.defineProperty(window, 'electron', {
+            value: electronApi as unknown as Window['electron'],
+            configurable: true,
+        });
+
+        TestBed.configureTestingModule({
+            providers: [
+                GlobalFavoritesService,
+                { provide: Store, useValue: { select: jest.fn() } },
+                { provide: DatabaseService, useValue: {} },
+                { provide: PlaylistsService, useValue: {} },
+                {
+                    provide: TranslateService,
+                    useValue: { instant: (key: string) => key },
+                },
+            ],
+        });
+        service = TestBed.inject(GlobalFavoritesService);
+    });
+
+    afterEach(() => {
+        Object.defineProperty(window, 'electron', {
+            value: undefined,
+            configurable: true,
+        });
+    });
+
+    describe('reorder', () => {
+        it('sends playlist-scoped position updates for Xtream favorites', async () => {
+            // The backend UPDATE filters by (contentId, playlistId); a payload
+            // without playlist_id silently matches no rows (PR #1143 review).
+            const channels: UnifiedFavoriteChannel[] = [
+                makeChannel({
+                    uid: 'xtream::playlist-b::20',
+                    sourceType: 'xtream',
+                    playlistId: 'playlist-b',
+                    contentId: 202,
+                }),
+                makeChannel({
+                    uid: 'm3u::playlist-m::url',
+                    sourceType: 'm3u',
+                    playlistId: 'playlist-m',
+                }),
+                makeChannel({
+                    uid: 'xtream::playlist-a::10',
+                    sourceType: 'xtream',
+                    playlistId: 'playlist-a',
+                    contentId: 101,
+                }),
+            ];
+
+            await service.reorder(channels);
+
+            expect(electronApi.dbReorderGlobalFavorites).toHaveBeenCalledWith([
+                { content_id: 202, playlist_id: 'playlist-b', position: 0 },
+                { content_id: 101, playlist_id: 'playlist-a', position: 1 },
+            ]);
+        });
+
+        it('persists the full uid order and skips the DB write without Xtream items', async () => {
+            const channels: UnifiedFavoriteChannel[] = [
+                makeChannel({
+                    uid: 'm3u::playlist-m::url',
+                    sourceType: 'm3u',
+                    playlistId: 'playlist-m',
+                }),
+                makeChannel({
+                    uid: 'stalker::playlist-s::5',
+                    sourceType: 'stalker',
+                    playlistId: 'playlist-s',
+                }),
+            ];
+
+            await service.reorder(channels);
+
+            expect(electronApi.dbReorderGlobalFavorites).not.toHaveBeenCalled();
+            expect(electronApi.dbSetAppState).toHaveBeenCalledWith(
+                'global-favorites-channel-order-v1',
+                JSON.stringify(['m3u::playlist-m::url', 'stalker::playlist-s::5'])
+            );
+        });
+    });
+});
diff --git a/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.ts b/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.ts
index bfea67259..47a390da1 100644
--- a/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.ts
+++ b/libs/workspace/shell/feature/src/lib/global-favorites/global-favorites.service.ts
@@ -86,17 +86,11 @@ export class GlobalFavoritesService {
     async removeFavorite(channel: UnifiedFavoriteChannel): Promise<void> {
         switch (channel.sourceType) {
             case 'm3u': {
-                const playlist = await firstValueFrom(
-                    this.playlistsService.getPlaylistById(channel.playlistId)
-                );
-                const currentFavs = (playlist.favorites as string[]) ?? [];
-                const filtered = currentFavs.filter(
-                    (f) => f !== channel.streamUrl
-                );
                 await firstValueFrom(
-                    this.playlistsService.setFavorites(
+                    this.playlistsService.transformPlaylistFavorites(
                         channel.playlistId,
-                        filtered
+                        (current) =>
+                            current.filter((f) => f !== channel.streamUrl)
                     )
                 );
                 break;
@@ -134,13 +128,14 @@ export class GlobalFavoritesService {
         // Persist xtream positions to DB
         const xtreamUpdates = channels
             .filter(
-                (
-                    ch
-                ): ch is UnifiedFavoriteChannel & { contentId: number } =>
+                (ch): ch is UnifiedFavoriteChannel & { contentId: number } =>
                     ch.sourceType === 'xtream' && ch.contentId != null
             )
             .map((ch, index) => ({
                 content_id: ch.contentId,
+                // The backend UPDATE is scoped by (contentId, playlistId) —
+                // without the playlist id the write matches no rows.
+                playlist_id: ch.playlistId,
                 position: index,
             }));
 
diff --git a/libs/workspace/shell/feature/src/lib/workspace-command-palette/workspace-command-palette.component.scss b/libs/workspace/shell/feature/src/lib/workspace-command-palette/workspace-command-palette.component.scss
index d1ac130d1..1fe3199f0 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-command-palette/workspace-command-palette.component.scss
+++ b/libs/workspace/shell/feature/src/lib/workspace-command-palette/workspace-command-palette.component.scss
@@ -89,7 +89,8 @@
     overflow-x: hidden;
     padding: 6px;
     scrollbar-width: thin;
-    scrollbar-color: var(--mat-sys-outline-variant) transparent;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
 }
 
 // ─── Group ───────────────────────────────────────────────────────────────────
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.html b/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.html
index 64a70da92..7dde143f2 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.html
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.html
@@ -33,7 +33,7 @@
                             class="item-count item-count--loading"
                             aria-hidden="true"
                         ></div>
-                    } @else {
+                    } @else if (hasItemCount(item)) {
                         <div class="item-count app-count-badge">
                             {{ getItemCount(item) }}
                         </div>
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.ts b/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.ts
index 61fe42a58..676e399d0 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/components/workspace-context-category-view.component.ts
@@ -32,6 +32,12 @@ export class WorkspaceContextCategoryViewComponent {
     readonly itemCounts = input<Map<number, number>>(new Map());
     readonly showCounts = input(false);
     readonly countDisplayMode = input<'loading' | 'ready'>('ready');
+    /**
+     * When true, items without an entry in `itemCounts` render no badge at
+     * all instead of "0" — used for Stalker censored (adult) genres whose
+     * real channel count is unknown to the full-list cache.
+     */
+    readonly omitMissingCounts = input(false);
     readonly interactionEnabled = input(true);
     readonly statusText = input('');
 
@@ -93,6 +99,15 @@ export class WorkspaceContextCategoryViewComponent {
         return this.itemCounts().get(itemId) ?? 0;
     }
 
+    hasItemCount(item: WorkspaceCategoryViewItem): boolean {
+        if (!this.omitMissingCounts()) {
+            return true;
+        }
+
+        // NaN (from the "*" all-category id) is a valid Map key here.
+        return this.itemCounts().has(Number(item.id ?? item.category_id));
+    }
+
     onCategoryClick(item: WorkspaceCategoryViewItem): void {
         if (!this.interactionEnabled()) {
             return;
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.html b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.html
index c812c82d5..39eefd3e7 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.html
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.html
@@ -166,6 +166,10 @@
             <app-workspace-context-category-view
                 [items]="filteredStalkerCategories()"
                 [selectedCategoryId]="$any(stalkerSelectedCategoryId())"
+                [itemCounts]="stalkerCategoryItemCounts()"
+                [showCounts]="stalkerShowCounts()"
+                [countDisplayMode]="stalkerCountDisplayMode()"
+                [omitMissingCounts]="true"
                 (categoryClicked)="onStalkerCategoryClicked($any($event))"
             />
         }
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.scss b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.scss
index e2e03a3f5..084577aca 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.scss
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.scss
@@ -177,7 +177,8 @@ app-workspace-context-category-view {
     overflow-x: hidden;
     overscroll-behavior: contain;
     scrollbar-width: thin;
-    scrollbar-color: var(--mat-sys-outline-variant) transparent;
+    scrollbar-color: color-mix(in srgb, var(--app-muted-color) 55%, transparent)
+        transparent;
 }
 
 .context-skeleton {
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.spec.ts b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.spec.ts
index 86bde639c..0aa9e3457 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.spec.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.spec.ts
@@ -94,6 +94,9 @@ describe('WorkspaceContextPanelComponent', () => {
         selectedCategoryId: signal<string | null>(null),
         isCategoryResourceLoading: signal(false),
         isCategoryResourceFailed: signal(false),
+        itvFullListActive: signal(false),
+        itvFullListLoading: signal(false),
+        itvCategoryItemCounts: signal<Map<number, number>>(new Map()),
         setSelectedCategory: jest.fn(),
         setPage: jest.fn(),
         clearSelectedItem: jest.fn(),
@@ -398,6 +401,88 @@ describe('WorkspaceContextPanelComponent', () => {
         ]);
     });
 
+    it('shows per-genre count badges on stalker Live TV categories when the full list is cached', () => {
+        fixture.componentRef.setInput('context', {
+            provider: 'stalker',
+            playlistId: 'stalker-1',
+        });
+        fixture.componentRef.setInput('section', 'itv');
+        stalkerStore.getCategoryResource.set([
+            { category_id: '*', category_name: 'All' },
+            { category_id: '1', category_name: 'Documentary' },
+            { category_id: '2', category_name: 'Sports' },
+        ]);
+        stalkerStore.itvFullListActive.set(true);
+        stalkerStore.itvCategoryItemCounts.set(
+            new Map<number, number>([
+                [1, 190],
+                [2, 38],
+                [Number.NaN, 228],
+            ])
+        );
+        fixture.detectChanges();
+
+        const counts = Array.from(
+            fixture.nativeElement.querySelectorAll('.category-item .item-count')
+        ).map((el) => (el as HTMLElement).textContent?.trim());
+        // "All" (NaN key → total), Documentary, Sports.
+        expect(counts).toEqual(['228', '190', '38']);
+    });
+
+    it('omits the badge for censored stalker genres missing from the count map', () => {
+        fixture.componentRef.setInput('context', {
+            provider: 'stalker',
+            playlistId: 'stalker-1',
+        });
+        fixture.componentRef.setInput('section', 'itv');
+        stalkerStore.getCategoryResource.set([
+            { category_id: '1', category_name: 'Documentary' },
+            {
+                category_id: '19',
+                category_name: 'For adults',
+                censored: true,
+            } as never,
+        ]);
+        stalkerStore.itvFullListActive.set(true);
+        // Censored genre 19 has no entry — its real count is unknown.
+        stalkerStore.itvCategoryItemCounts.set(
+            new Map<number, number>([[1, 190]])
+        );
+        fixture.detectChanges();
+
+        const categoryButtons = Array.from(
+            fixture.nativeElement.querySelectorAll('.category-item')
+        ) as HTMLElement[];
+        const documentary = categoryButtons.find((el) =>
+            el.textContent?.includes('Documentary')
+        );
+        const adults = categoryButtons.find((el) =>
+            el.textContent?.includes('For adults')
+        );
+
+        expect(documentary?.querySelector('.item-count')?.textContent).toContain(
+            '190'
+        );
+        expect(adults?.querySelector('.item-count')).toBeNull();
+    });
+
+    it('hides count badges for stalker categories without a cached full list (e.g. VOD)', () => {
+        fixture.componentRef.setInput('context', {
+            provider: 'stalker',
+            playlistId: 'stalker-1',
+        });
+        fixture.componentRef.setInput('section', 'vod');
+        stalkerStore.getCategoryResource.set([
+            { category_id: '1', category_name: 'Action' },
+        ]);
+        stalkerStore.itvFullListActive.set(false);
+        fixture.detectChanges();
+
+        expect(
+            fixture.nativeElement.querySelector('.category-item .item-count')
+        ).toBeNull();
+    });
+
     it('preserves the active xtream live item when switching live categories', () => {
         fixture.componentRef.setInput('section', 'live');
         xtreamSelectedTypeContentState.set('ready');
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.ts b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.ts
index 0ff997510..5ac3d3035 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-context-panel.component.ts
@@ -144,6 +144,21 @@ export class WorkspaceContextPanelComponent {
         this.stalkerStore.isCategoryResourceLoading;
     readonly isStalkerCategoryFailed =
         this.stalkerStore.isCategoryResourceFailed;
+    // Category count badges are only available for Stalker Live TV, where the
+    // full channel list is cached — VOD/series/radio still page lazily, so
+    // their per-category totals are unknown.
+    readonly stalkerCategoryItemCounts =
+        this.stalkerStore.itvCategoryItemCounts;
+    readonly stalkerShowCounts = computed(
+        () =>
+            this.isStalkerCategories() &&
+            this.section() === 'itv' &&
+            (this.stalkerStore.itvFullListActive() ||
+                this.stalkerStore.itvFullListLoading())
+    );
+    readonly stalkerCountDisplayMode = computed<'loading' | 'ready'>(() =>
+        this.stalkerStore.itvFullListActive() ? 'ready' : 'loading'
+    );
     readonly skeletonRows = Array.from({ length: 14 }, (_, index) => index);
     readonly skeletonLabelWidths = [
         78, 66, 74, 59, 83, 69, 76, 62, 81, 64, 72, 67, 79, 61,
diff --git a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-settings-context-panel.component.ts b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-settings-context-panel.component.ts
index b4d59da5b..50e1e1e23 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-settings-context-panel.component.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-context-panel/workspace-settings-context-panel.component.ts
@@ -17,6 +17,7 @@ import { SettingsContextService } from '@iptvnator/workspace/shell/util';
                         type="button"
                         class="nav-item settings-section-item"
                         [class.active]="ctx.activeSection() === section.id"
+                        [attr.data-test-id]="'settings-section-' + section.id"
                         (click)="ctx.navigateToSection(section.id)"
                     >
                         <mat-icon>{{ section.icon }}</mat-icon>
diff --git a/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell-search.service.ts b/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell-search.service.ts
index a45a1ed3c..5d374dc15 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell-search.service.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell-search.service.ts
@@ -123,11 +123,15 @@ export class WorkspaceShellSearchService {
             };
         }
 
-        const isDegradedStalkerItv =
+        // Stalker live search is "loaded only" (limited to fetched pages)
+        // unless the full ITV channel list is cached. ITV with the full list
+        // active covers everything; radio always pages, so it stays degraded.
+        const isDegradedStalkerLive =
             context?.provider === 'stalker' &&
-            section === 'itv' &&
-            appliedQuery.length > 0;
-        const behavior = isDegradedStalkerItv
+            appliedQuery.length > 0 &&
+            ((section === 'itv' && !this.stalkerStore.itvFullListActive()) ||
+                section === 'radio');
+        const behavior = isDegradedStalkerLive
             ? 'degraded-loaded-only'
             : route.searchMode;
 
@@ -151,7 +155,7 @@ export class WorkspaceShellSearchService {
                 stalkerCategoryName:
                     this.stalkerStore.getSelectedCategoryName(),
             }),
-            statusLabel: isDegradedStalkerItv
+            statusLabel: isDegradedStalkerLive
                 ? this.translateText(SEARCH_LOADED_ONLY_STATUS)
                 : '',
             minLength: route.searchMode === 'remote-search' ? 3 : 1,
diff --git a/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell.facade.spec.ts b/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell.facade.spec.ts
index 32aad8089..06585d642 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell.facade.spec.ts
+++ b/libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell.facade.spec.ts
@@ -72,6 +72,7 @@ class MockXtreamStore {
 class MockStalkerStore {
     readonly searchPhrase = signal('');
     readonly getSelectedCategoryName = signal('All Items');
+    readonly itvFullListActive = signal(false);
 
     setSearchPhrase = jest.fn((term: string) => this.searchPhrase.set(term));
 }
@@ -594,7 +595,17 @@ describe('WorkspaceShellFacade', () => {
         );
     });
 
-    it('treats stalker radio search as a remote section search', () => {
+    it('drops the loaded-only status once the full ITV channel list is cached', () => {
+        stalkerStore.itvFullListActive.set(true);
+        facade.currentUrl.set('/workspace/stalker/pl-1/itv?q=cnn');
+        searchSync.syncSearchFromRoute();
+        TestBed.flushEffects();
+
+        expect(facade.canUseSearch()).toBe(true);
+        expect(facade.searchStatusLabel()).toBe('');
+    });
+
+    it('marks stalker radio search as loaded-only (radio always pages)', () => {
         facade.currentUrl.set('/workspace/stalker/pl-1/radio?q=jazz');
         searchSync.syncSearchFromRoute();
         TestBed.flushEffects();
@@ -604,7 +615,11 @@ describe('WorkspaceShellFacade', () => {
         expect(facade.searchScopeLabel()).toBe(
             'WORKSPACE.SHELL.RAIL_RADIO / All Items'
         );
-        expect(facade.searchStatusLabel()).toBe('');
+        // Radio has no full-list cache, so its local search only covers loaded
+        // stations — surface the same "loaded only" hint as degraded ITV.
+        expect(facade.searchStatusLabel()).toBe(
+            'WORKSPACE.SHELL.SEARCH_STATUS_LOADED_ONLY'
+        );
     });
 
     it('applies q to Xtream category search on vod routes', () => {
diff --git a/nx.json b/nx.json
index 26d293fe9..808b047e9 100644
--- a/nx.json
+++ b/nx.json
@@ -28,7 +28,19 @@
                 "{workspaceRoot}/.eslintrc.json",
                 "{workspaceRoot}/.eslintignore",
                 "{workspaceRoot}/eslint.config.mjs",
-                "{workspaceRoot}/tools/eslint-rules/**/*"
+                "{workspaceRoot}/tools/eslint-rules/**/*",
+                "{workspaceRoot}/tools/eslint/**/*"
+            ]
+        },
+        "lint": {
+            "cache": true,
+            "inputs": [
+                "default",
+                "{workspaceRoot}/.eslintrc.json",
+                "{workspaceRoot}/.eslintignore",
+                "{workspaceRoot}/eslint.config.mjs",
+                "{workspaceRoot}/tools/eslint-rules/**/*",
+                "{workspaceRoot}/tools/eslint/**/*"
             ]
         },
         "@nx/jest:jest": {
diff --git a/package.json b/package.json
index f5286fbe4..23215675c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iptvnator",
-    "version": "0.22.0",
+    "version": "0.23.0",
     "license": "MIT",
     "description": "IPTV player application.",
     "homepage": "https://github.com/4gray/iptvnator",
@@ -33,11 +33,12 @@
         "test:backend": "nx test electron-backend",
         "test:unit:all": "nx run-many --target=test --all --parallel=3",
         "test:unit:ci": "nx run-many --target=test --all --parallel=3 --output-style=static",
+        "coverage:tools:test": "node --test tools/coverage/coverage-integrity.test.mjs",
         "coverage:unit:ci": "node tools/coverage/run-tier-a-coverage.mjs",
         "coverage:merge": "node tools/coverage/merge-coverage.mjs",
         "coverage:health": "node tools/coverage/coverage-health.mjs",
         "coverage:policy:check": "node tools/coverage/check-coverage-policy.mjs",
-        "coverage:ci": "pnpm run coverage:policy:check && pnpm run coverage:unit:ci && pnpm run coverage:merge && node tools/coverage/coverage-health.mjs --require-report",
+        "coverage:ci": "pnpm run coverage:tools:test && pnpm run coverage:policy:check && pnpm run coverage:unit:ci && pnpm run coverage:merge && node tools/coverage/coverage-health.mjs --require-report",
         "coverage:e2e:summary": "node tools/coverage/e2e-semantic-summary.mjs",
         "coverage:e2e:v8:web": "node tools/coverage/e2e-v8-web.mjs",
         "typecheck:web": "tsc -p apps/web/tsconfig.app.json --noEmit",
@@ -46,6 +47,7 @@
         "verify:package-layout": "node tools/packaging/verify-electron-package-layout.mjs",
         "embedded-mpv:build-native:homebrew": "IPTVNATOR_EMBEDDED_MPV_ALLOW_HOMEBREW=1 nx run electron-backend:build-embedded-mpv",
         "embedded-mpv:build-runtime": "node tools/embedded-mpv/build-macos-runtime.mjs",
+        "embedded-mpv:build-runtime:linux": "node tools/embedded-mpv/build-linux-runtime.mjs",
         "embedded-mpv:stage-runtime": "node tools/embedded-mpv/stage-runtime.mjs",
         "embedded-mpv:stage-runtime:macos": "node tools/embedded-mpv/stage-macos-runtime.mjs",
         "embedded-mpv:stage-runtime:windows-archive": "node tools/embedded-mpv/stage-windows-runtime-archive.mjs",
@@ -56,10 +58,15 @@
         "serve:website": "nx serve website",
         "build:website": "nx build website",
         "i18n:check": "node tools/i18n/check-drift.mjs",
-        "release:artwork:dry-run": "tsx tools/release/generate-marketing-artwork.ts --dry-run",
-        "release:artwork:manifest": "tsx tools/release/generate-marketing-artwork.ts --manifest",
-        "release:artwork:generate": "tsx tools/release/generate-marketing-artwork.ts --generate",
-        "release:artwork:validate": "tsx tools/release/generate-marketing-artwork.ts --validate",
+        "release:artwork:dry-run": "tsx --tsconfig tsconfig.base.json tools/release/generate-marketing-artwork.ts --dry-run",
+        "release:artwork:manifest": "tsx --tsconfig tsconfig.base.json tools/release/generate-marketing-artwork.ts --manifest",
+        "release:artwork:generate": "tsx --tsconfig tsconfig.base.json tools/release/generate-marketing-artwork.ts --generate",
+        "release:artwork:validate": "tsx --tsconfig tsconfig.base.json tools/release/generate-marketing-artwork.ts --validate",
+        "release:notes:validate": "node tools/release/build-release-notes.mjs --validate",
+        "release:notes:github": "node tools/release/build-release-notes.mjs --format github",
+        "release:notes:changelog": "node tools/release/build-release-notes.mjs --format changelog",
+        "release:notes:blog": "node tools/release/build-release-notes.mjs --format blog",
+        "release:screenshots": "tsx tools/release/capture-release-screenshots.ts",
         "lint": "nx run-many --target=lint --all",
         "build": "nx build electron-backend"
     },
@@ -76,39 +83,38 @@
         "@angular/platform-browser": "21.2.17",
         "@angular/platform-browser-dynamic": "21.2.17",
         "@angular/router": "21.2.17",
-        "@ngrx/effects": "21.0.1",
-        "@ngrx/entity": "21.0.1",
-        "@ngrx/router-store": "21.0.1",
-        "@ngrx/signals": "21.0.1",
-        "@ngrx/store": "21.0.1",
-        "@ngrx/store-devtools": "21.0.1",
+        "@ngrx/effects": "21.1.1",
+        "@ngrx/entity": "21.1.1",
+        "@ngrx/router-store": "21.1.1",
+        "@ngrx/signals": "21.1.1",
+        "@ngrx/store": "21.1.1",
+        "@ngrx/store-devtools": "21.1.1",
         "@ngx-pwa/local-storage": "21.0.0",
         "@yangkghjh/videojs-aspect-ratio-panel": "0.0.1",
         "angularx-qrcode": "21.0.4",
-        "artplayer": "5.3.0",
-        "axios": "1.16.0",
+        "artplayer": "5.4.0",
+        "axios": "1.18.1",
         "better-sqlite3": "12.9.0",
-        "date-fns": "4.1.0",
+        "date-fns": "4.4.0",
         "drizzle-orm": "0.45.2",
         "electron-conf": "1.3.0",
-        "electron-dl": "4.0.0",
         "electron-updater": "6.8.9",
         "epg-parser": "^0.1.6",
         "fix-path": "5.0.0",
-        "hls.js": "1.6.13",
-        "iptv-playlist-parser": "github:4gray/iptv-playlist-parser",
-        "marked": "18.0.5",
+        "hls.js": "1.6.16",
+        "iptv-playlist-parser": "github:4gray/iptv-playlist-parser#v0.15.2-iptvnator.2",
+        "marked": "18.0.7",
         "mpegts.js": "1.8.0",
         "ms": "2.1.3",
         "ngx-indexed-db": "21.0.0",
         "ngx-skeleton-loader": "11.3.0",
         "rxjs": "7.8.2",
         "saxes": "6.0.0",
-        "uuid": "9.0.0",
-        "video.js": "8.23.4",
+        "shaka-player": "5.2.2",
+        "video.js": "8.23.9",
         "videojs-contrib-quality-levels": "4.1.0",
         "videojs-quality-selector-hls": "1.1.1",
-        "zone.js": "~0.15.1"
+        "zone.js": "~0.16.2"
     },
     "devDependencies": {
         "@angular-devkit/core": "21.2.17",
@@ -131,17 +137,17 @@
         "@angular/router": "21.2.17",
         "@angular/service-worker": "21.2.17",
         "@astrojs/mdx": "4.3.13",
-        "@astrojs/sitemap": "3.7.0",
+        "@astrojs/sitemap": "3.7.3",
         "@astrojs/tailwind": "6.0.2",
         "@electron/asar": "3.4.1",
-        "@eslint/eslintrc": "3.3.1",
+        "@eslint/eslintrc": "3.3.6",
         "@eslint/js": "^9.38.0",
-        "@faker-js/faker": "10.3.0",
-        "@fontsource/crimson-pro": "5.2.8",
-        "@fontsource/dm-sans": "5.2.8",
-        "@fontsource/jetbrains-mono": "5.2.8",
-        "@fontsource/roboto": "5.2.10",
-        "@ngrx/eslint-plugin": "^21.0.1",
+        "@faker-js/faker": "10.5.0",
+        "@fontsource/crimson-pro": "5.3.0",
+        "@fontsource/dm-sans": "5.3.0",
+        "@fontsource/jetbrains-mono": "5.3.0",
+        "@fontsource/roboto": "5.3.0",
+        "@ngrx/eslint-plugin": "^21.1.1",
         "@ngx-translate/core": "16.0.4",
         "@ngx-translate/http-loader": "16.0.1",
         "@nx/angular": "22.7.1",
@@ -154,31 +160,26 @@
         "@nx/playwright": "22.7.1",
         "@nx/web": "22.7.1",
         "@nx/workspace": "22.7.1",
-        "@playwright/test": "^1.36.0",
+        "@playwright/test": "^1.62.0",
         "@schematics/angular": "21.2.9",
-        "@semantic-release/changelog": "6.0.3",
-        "@semantic-release/git": "10.0.1",
-        "@semantic-release/npm": "12.0.1",
-        "@swc-node/register": "1.11.1",
-        "@swc/core": "1.15.8",
-        "@swc/helpers": "0.5.18",
-        "@tailwindcss/typography": "0.5.19",
+        "@swc-node/register": "1.12.1",
+        "@swc/core": "1.15.46",
+        "@swc/helpers": "0.5.23",
+        "@tailwindcss/typography": "0.5.20",
         "@types/better-sqlite3": "^7.6.12",
         "@types/cors": "2.8.19",
         "@types/express": "5.0.6",
         "@types/jest": "^30.0.0",
         "@types/mocha": "9.0.0",
         "@types/node": "20.19.9",
-        "@types/uuid": "^10.0.0",
-        "@types/video.js": "7.3.29",
-        "@typescript-eslint/eslint-plugin": "^8.46.2",
-        "@typescript-eslint/parser": "^8.46.2",
-        "@typescript-eslint/utils": "^8.46.2",
+        "@types/video.js": "7.3.58",
+        "@typescript-eslint/eslint-plugin": "^8.65.0",
+        "@typescript-eslint/parser": "^8.65.0",
+        "@typescript-eslint/utils": "^8.65.0",
         "angular-eslint": "21.3.1",
         "astro": "5.18.1",
-        "conventional-changelog-cli": "5.0.0",
         "cors": "2.8.6",
-        "drizzle-kit": "0.31.5",
+        "drizzle-kit": "0.31.10",
         "electron": "^41.7.2",
         "electron-builder": "^26.0.12",
         "electron-playwright-helpers": "1.8.2",
@@ -192,40 +193,45 @@
         "istanbul-lib-coverage": "3.2.2",
         "istanbul-lib-report": "3.0.1",
         "istanbul-reports": "3.2.0",
-        "jest": "^30.0.2",
-        "jest-environment-jsdom": "^30.0.2",
-        "jest-environment-node": "^30.0.2",
+        "jest": "^30.4.2",
+        "jest-environment-jsdom": "^30.4.1",
+        "jest-environment-node": "^30.4.1",
         "jest-preset-angular": "~15.0.0",
-        "jest-util": "^30.0.2",
+        "jest-util": "^30.4.1",
         "jsonc-eslint-parser": "^2.1.0",
         "material-design-icons-iconfont": "6.7.0",
-        "ng-mocks": "14.15.1",
+        "ng-mocks": "14.15.3",
         "nx": "22.7.1",
         "nx-electron": "22.0.0",
-        "prettier": "^3.8.1",
-        "semantic-release": "24.2.9",
-        "sharp": "0.34.5",
+        "prettier": "^3.9.6",
+        "sharp": "0.35.3",
         "tailwindcss": "^3.4.19",
-        "ts-jest": "^29.4.5",
+        "ts-jest": "^29.4.12",
         "ts-node": "10.9.2",
         "tslib": "^2.8.1",
-        "tsx": "4.21.0",
+        "tsx": "4.23.1",
         "typescript": "5.9.3",
-        "typescript-eslint": "^8.46.2"
+        "typescript-eslint": "^8.65.0",
+        "yaml": "2.9.0"
     },
     "pnpm": {
         "overrides": {
             "@hono/node-server@1.19.9": "1.19.14",
+            "@xmldom/xmldom@0.8.11": "0.8.13",
             "ajv@6.12.6": "6.14.0",
+            "ajv@8.17.1": "8.18.0",
             "brace-expansion@1.1.12": "1.1.13",
             "defu@6.1.4": "6.1.6",
             "devalue@5.6.2": "5.6.4",
             "express-rate-limit@8.2.1": "8.3.0",
+            "fast-uri@3.1.0": "3.1.4",
             "flatted@3.3.3": "3.4.2",
             "follow-redirects@1.15.11": "1.16.0",
+            "form-data@4.0.5": "4.0.6",
             "h3@1.15.5": "1.15.10",
             "hono@4.12.0": "4.12.14",
             "immutable@5.1.4": "5.1.5",
+            "js-yaml@4.1.1": "4.3.0",
             "lodash-es@4.17.22": "4.18.1",
             "node-abi@3.85.0": "3.92.0",
             "node-forge@1.3.3": "1.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c1e5b8aa..619e3b961 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,16 +6,21 @@ settings:
 
 overrides:
   '@hono/node-server@1.19.9': 1.19.14
+  '@xmldom/xmldom@0.8.11': 0.8.13
   ajv@6.12.6: 6.14.0
+  ajv@8.17.1: 8.18.0
   brace-expansion@1.1.12: 1.1.13
   defu@6.1.4: 6.1.6
   devalue@5.6.2: 5.6.4
   express-rate-limit@8.2.1: 8.3.0
+  fast-uri@3.1.0: 3.1.4
   flatted@3.3.3: 3.4.2
   follow-redirects@1.15.11: 1.16.0
+  form-data@4.0.5: 4.0.6
   h3@1.15.5: 1.15.10
   hono@4.12.0: 4.12.14
   immutable@5.1.4: 5.1.5
+  js-yaml@4.1.1: 4.3.0
   lodash-es@4.17.22: 4.18.1
   node-abi@3.85.0: 3.92.0
   node-forge@1.3.3: 1.4.0
@@ -37,82 +42,79 @@ importers:
     dependencies:
       '@angular/animations':
         specifier: 21.2.17
-        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       '@angular/cdk':
         specifier: 21.2.14
-        version: 21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
+        version: 21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@angular/common':
         specifier: 21.2.17
-        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@angular/compiler':
         specifier: 21.2.17
         version: 21.2.17
       '@angular/core':
         specifier: 21.2.17
-        version: 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+        version: 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       '@angular/forms':
         specifier: 21.2.17
-        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
+        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@angular/material':
         specifier: 21.2.14
-        version: 21.2.14(7ae818e999981ce767bfae94a8b1de8f)
+        version: 21.2.14(43172ba04e47f305707a39eaf8cab87a)
       '@angular/platform-browser':
         specifier: 21.2.17
-        version: 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       '@angular/platform-browser-dynamic':
         specifier: 21.2.17
-        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))
+        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))
       '@angular/router':
         specifier: 21.2.17
-        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
+        version: 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@ngrx/effects':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)
       '@ngrx/entity':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)
       '@ngrx/router-store':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)
       '@ngrx/signals':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@ngrx/store':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@ngrx/store-devtools':
-        specifier: 21.0.1
-        version: 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)
+        specifier: 21.1.1
+        version: 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)
       '@ngx-pwa/local-storage':
         specifier: 21.0.0
-        version: 21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+        version: 21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@yangkghjh/videojs-aspect-ratio-panel':
         specifier: 0.0.1
         version: 0.0.1
       angularx-qrcode:
         specifier: 21.0.4
-        version: 21.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 21.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       artplayer:
-        specifier: 5.3.0
-        version: 5.3.0
+        specifier: 5.4.0
+        version: 5.4.0
       axios:
-        specifier: 1.16.0
-        version: 1.16.0
+        specifier: 1.18.1
+        version: 1.18.1
       better-sqlite3:
         specifier: 12.9.0
         version: 12.9.0
       date-fns:
-        specifier: 4.1.0
-        version: 4.1.0
+        specifier: 4.4.0
+        version: 4.4.0
       drizzle-orm:
         specifier: 0.45.2
         version: 0.45.2(@types/better-sqlite3@7.6.13)(better-sqlite3@12.9.0)
       electron-conf:
         specifier: 1.3.0
         version: 1.3.0(electron@41.7.2)
-      electron-dl:
-        specifier: 4.0.0
-        version: 4.0.0
       electron-updater:
         specifier: 6.8.9
         version: 6.8.9
@@ -123,14 +125,14 @@ importers:
         specifier: 5.0.0
         version: 5.0.0
       hls.js:
-        specifier: 1.6.13
-        version: 1.6.13
+        specifier: 1.6.16
+        version: 1.6.16
       iptv-playlist-parser:
-        specifier: github:4gray/iptv-playlist-parser
-        version: https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/38a62d0b7c98f442bfa102ee8e1fe14169ae9386
+        specifier: github:4gray/iptv-playlist-parser#v0.15.2-iptvnator.2
+        version: https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/d547b6be8a44431c85fbcbcdefb41f28c0dadf6d
       marked:
-        specifier: 18.0.5
-        version: 18.0.5
+        specifier: 18.0.7
+        version: 18.0.7
       mpegts.js:
         specifier: 1.8.0
         version: 1.8.0
@@ -139,31 +141,31 @@ importers:
         version: 2.1.3
       ngx-indexed-db:
         specifier: 21.0.0
-        version: 21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       ngx-skeleton-loader:
         specifier: 11.3.0
-        version: 11.3.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 11.3.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       rxjs:
         specifier: 7.8.2
         version: 7.8.2
       saxes:
         specifier: 6.0.0
         version: 6.0.0
-      uuid:
-        specifier: 9.0.0
-        version: 9.0.0
+      shaka-player:
+        specifier: 5.2.2
+        version: 5.2.2
       video.js:
-        specifier: 8.23.4
-        version: 8.23.4
+        specifier: 8.23.9
+        version: 8.23.9
       videojs-contrib-quality-levels:
         specifier: 4.1.0
-        version: 4.1.0(video.js@8.23.4)
+        version: 4.1.0(video.js@8.23.9)
       videojs-quality-selector-hls:
         specifier: 1.1.1
         version: 1.1.1
       zone.js:
-        specifier: ~0.15.1
-        version: 0.15.1
+        specifier: ~0.16.2
+        version: 0.16.2
     devDependencies:
       '@angular-devkit/core':
         specifier: 21.2.17
@@ -176,19 +178,19 @@ importers:
         version: 21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular-eslint/eslint-plugin':
         specifier: 21.3.1
-        version: 21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        version: 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular-eslint/eslint-plugin-template':
         specifier: 21.3.1
-        version: 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        version: 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular-eslint/schematics':
         specifier: 21.3.1
-        version: 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        version: 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular-eslint/template-parser':
         specifier: 21.3.1
         version: 21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular/build':
         specifier: 21.2.17
-        version: 21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))(terser@5.44.1)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+        version: 21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))(terser@5.44.1)(tslib@2.8.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)
       '@angular/cli':
         specifier: 21.2.17
         version: 21.2.17(@types/node@20.19.9)(chokidar@5.0.0)
@@ -200,106 +202,97 @@ importers:
         version: 21.2.17
       '@angular/service-worker':
         specifier: 21.2.17
-        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+        version: 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@astrojs/mdx':
         specifier: 4.3.13
-        version: 4.3.13(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))
+        version: 4.3.13(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0))
       '@astrojs/sitemap':
-        specifier: 3.7.0
-        version: 3.7.0
+        specifier: 3.7.3
+        version: 3.7.3
       '@astrojs/tailwind':
         specifier: 6.0.2
-        version: 6.0.2(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
+        version: 6.0.2(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0))(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
       '@electron/asar':
         specifier: 3.4.1
         version: 3.4.1
       '@eslint/eslintrc':
-        specifier: 3.3.1
-        version: 3.3.1
+        specifier: 3.3.6
+        version: 3.3.6
       '@eslint/js':
         specifier: ^9.38.0
         version: 9.39.2
       '@faker-js/faker':
-        specifier: 10.3.0
-        version: 10.3.0
+        specifier: 10.5.0
+        version: 10.5.0
       '@fontsource/crimson-pro':
-        specifier: 5.2.8
-        version: 5.2.8
+        specifier: 5.3.0
+        version: 5.3.0
       '@fontsource/dm-sans':
-        specifier: 5.2.8
-        version: 5.2.8
+        specifier: 5.3.0
+        version: 5.3.0
       '@fontsource/jetbrains-mono':
-        specifier: 5.2.8
-        version: 5.2.8
+        specifier: 5.3.0
+        version: 5.3.0
       '@fontsource/roboto':
-        specifier: 5.2.10
-        version: 5.2.10
+        specifier: 5.3.0
+        version: 5.3.0
       '@ngrx/eslint-plugin':
-        specifier: ^21.0.1
-        version: 21.0.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)
+        specifier: ^21.1.1
+        version: 21.1.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)
       '@ngx-translate/core':
         specifier: 16.0.4
-        version: 16.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 16.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       '@ngx-translate/http-loader':
         specifier: 16.0.1
-        version: 16.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+        version: 16.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       '@nx/angular':
         specifier: 22.7.1
-        version: 22.7.1(3fcdae4966e6f655e54cd885e10979aa)
+        version: 22.7.1(c2f36107352a552af1b8d4017d026f40)
       '@nx/devkit':
         specifier: 22.7.1
-        version: 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+        version: 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@nx/esbuild':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@nx/eslint':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+        version: 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@nx/eslint-plugin':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-config-prettier@10.1.8(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(typescript@5.9.3)
+        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-config-prettier@10.1.8(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(typescript@5.9.3)
       '@nx/jest':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
+        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
       '@nx/js':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+        version: 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@nx/playwright':
         specifier: 22.7.1
-        version: 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.57.0)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+        version: 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.62.0)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@nx/web':
         specifier: 22.7.1
-        version: 22.7.1(4b628920197e2640a94b2a773363406b)
+        version: 22.7.1(5f4f264ec7c07d507acd7660d73c4398)
       '@nx/workspace':
         specifier: 22.7.1
-        version: 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+        version: 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       '@playwright/test':
-        specifier: ^1.36.0
-        version: 1.57.0
+        specifier: ^1.62.0
+        version: 1.62.0
       '@schematics/angular':
         specifier: 21.2.9
         version: 21.2.9(chokidar@5.0.0)
-      '@semantic-release/changelog':
-        specifier: 6.0.3
-        version: 6.0.3(semantic-release@24.2.9(typescript@5.9.3))
-      '@semantic-release/git':
-        specifier: 10.0.1
-        version: 10.0.1(semantic-release@24.2.9(typescript@5.9.3))
-      '@semantic-release/npm':
-        specifier: 12.0.1
-        version: 12.0.1(semantic-release@24.2.9(typescript@5.9.3))
       '@swc-node/register':
-        specifier: 1.11.1
-        version: 1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3)
+        specifier: 1.12.1
+        version: 1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3)
       '@swc/core':
-        specifier: 1.15.8
-        version: 1.15.8(@swc/helpers@0.5.18)
+        specifier: 1.15.46
+        version: 1.15.46(@swc/helpers@0.5.23)
       '@swc/helpers':
-        specifier: 0.5.18
-        version: 0.5.18
+        specifier: 0.5.23
+        version: 0.5.23
       '@tailwindcss/typography':
-        specifier: 0.5.19
-        version: 0.5.19(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))
+        specifier: 0.5.20
+        version: 0.5.20(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))
       '@types/better-sqlite3':
         specifier: ^7.6.12
         version: 7.6.13
@@ -318,36 +311,30 @@ importers:
       '@types/node':
         specifier: 20.19.9
         version: 20.19.9
-      '@types/uuid':
-        specifier: ^10.0.0
-        version: 10.0.0
       '@types/video.js':
-        specifier: 7.3.29
-        version: 7.3.29
+        specifier: 7.3.58
+        version: 7.3.58
       '@typescript-eslint/eslint-plugin':
-        specifier: ^8.46.2
-        version: 8.51.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.65.0
+        version: 8.65.0(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@typescript-eslint/parser':
-        specifier: ^8.46.2
-        version: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.65.0
+        version: 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@typescript-eslint/utils':
-        specifier: ^8.46.2
-        version: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.65.0
+        version: 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       angular-eslint:
         specifier: 21.3.1
-        version: 21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)
+        version: 21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)
       astro:
         specifier: 5.18.1
-        version: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
-      conventional-changelog-cli:
-        specifier: 5.0.0
-        version: 5.0.0(conventional-commits-filter@5.0.0)
+        version: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)
       cors:
         specifier: 2.8.6
         version: 2.8.6
       drizzle-kit:
-        specifier: 0.31.5
-        version: 0.31.5
+        specifier: 0.31.10
+        version: 0.31.10
       electron:
         specifier: ^41.7.2
         version: 41.7.2
@@ -368,7 +355,7 @@ importers:
         version: 10.1.8(eslint@9.39.2(jiti@1.21.7))
       eslint-plugin-import:
         specifier: 2.32.0
-        version: 2.32.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))
+        version: 2.32.0(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))
       eslint-plugin-playwright:
         specifier: ^1.6.2
         version: 1.8.3(eslint@9.39.2(jiti@1.21.7))
@@ -388,20 +375,20 @@ importers:
         specifier: 3.2.0
         version: 3.2.0
       jest:
-        specifier: ^30.0.2
-        version: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
+        specifier: ^30.4.2
+        version: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
       jest-environment-jsdom:
-        specifier: ^30.0.2
-        version: 30.2.0
+        specifier: ^30.4.1
+        version: 30.4.1
       jest-environment-node:
-        specifier: ^30.0.2
-        version: 30.2.0
+        specifier: ^30.4.1
+        version: 30.4.1
       jest-preset-angular:
         specifier: ~15.0.0
-        version: 15.0.3(75c2f4d3e02d43367177c3c83cdeef78)
+        version: 15.0.3(c4e4d73a3616691068af99860e93e092)
       jest-util:
-        specifier: ^30.0.2
-        version: 30.2.0
+        specifier: ^30.4.1
+        version: 30.4.1
       jsonc-eslint-parser:
         specifier: ^2.1.0
         version: 2.4.2
@@ -409,44 +396,44 @@ importers:
         specifier: 6.7.0
         version: 6.7.0
       ng-mocks:
-        specifier: 14.15.1
-        version: 14.15.1(3bd9032d10655768ae17cd8d4331ec90)
+        specifier: 14.15.3
+        version: 14.15.3(1918f1ef5f9f83bc2aab38921c00c721)
       nx:
         specifier: 22.7.1
-        version: 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+        version: 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       nx-electron:
         specifier: 22.0.0
-        version: 22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@41.7.2)(esbuild@0.28.1)(rxjs@7.8.2)(typescript@5.9.3)
+        version: 22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))))(@nx/workspace@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(@swc/core@1.15.46(@swc/helpers@0.5.23))(electron-builder-squirrel-windows@26.0.12)(electron@41.7.2)(esbuild@0.28.1)(rxjs@7.8.2)(typescript@5.9.3)
       prettier:
-        specifier: ^3.8.1
-        version: 3.8.1
-      semantic-release:
-        specifier: 24.2.9
-        version: 24.2.9(typescript@5.9.3)
+        specifier: ^3.9.6
+        version: 3.9.6
       sharp:
-        specifier: 0.34.5
-        version: 0.34.5
+        specifier: 0.35.3
+        version: 0.35.3(@types/node@20.19.9)
       tailwindcss:
         specifier: ^3.4.19
-        version: 3.4.19(tsx@4.21.0)(yaml@2.8.2)
+        version: 3.4.19(tsx@4.23.1)(yaml@2.9.0)
       ts-jest:
-        specifier: ^29.4.5
-        version: 29.4.6(@babel/core@7.29.0)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.29.0))(esbuild@0.28.1)(jest-util@30.2.0)(jest@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3)
+        specifier: ^29.4.12
+        version: 29.4.12(@babel/core@7.29.7)(@jest/transform@30.4.1)(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7))(esbuild@0.28.1)(jest-util@30.4.1)(jest@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3)
       ts-node:
         specifier: 10.9.2
-        version: 10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)
+        version: 10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)
       tslib:
         specifier: ^2.8.1
         version: 2.8.1
       tsx:
-        specifier: 4.21.0
-        version: 4.21.0
+        specifier: 4.23.1
+        version: 4.23.1
       typescript:
         specifier: 5.9.3
         version: 5.9.3
       typescript-eslint:
-        specifier: ^8.46.2
-        version: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+        specifier: ^8.65.0
+        version: 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      yaml:
+        specifier: 2.9.0
+        version: 2.9.0
 
 packages:
 
@@ -796,8 +783,8 @@ packages:
     resolution: {integrity: sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ==}
     engines: {node: 18.20.8 || ^20.3.0 || >=22.0.0}
 
-  '@astrojs/sitemap@3.7.0':
-    resolution: {integrity: sha512-+qxjUrz6Jcgh+D5VE1gKUJTA3pSthuPHe6Ao5JCxok794Lewx8hBFaWHtOnN0ntb2lfOf7gvOi9TefUswQ/ZVA==}
+  '@astrojs/sitemap@3.7.3':
+    resolution: {integrity: sha512-f8euLVsyeAmAkSm/1M2Kb8sL8byQmfgbvBNaHFItCheTj/IpiJYSEWVcqDHZ/yEHxiS7+w87mQkzwZaPHmk5GA==}
 
   '@astrojs/tailwind@6.0.2':
     resolution: {integrity: sha512-j3mhLNeugZq6A8dMNXVarUa8K6X9AW+QHU9u3lKNrPLMHhOQ0S7VeWhHwEeJFpEK1BTKEUY1U78VQv2gN6hNGg==}
@@ -1554,22 +1541,6 @@ packages:
   '@colordx/core@5.4.3':
     resolution: {integrity: sha512-kIxYSfA5T8HXjav55UaaH/o/cKivF6jCCGIb8eqtcsfI46wsvlSiT8jMDyrl779qLec3c2c2oHBZo4oAhvbjrQ==}
 
-  '@colors/colors@1.5.0':
-    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
-    engines: {node: '>=0.1.90'}
-
-  '@conventional-changelog/git-client@1.0.1':
-    resolution: {integrity: sha512-PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      conventional-commits-filter: ^5.0.0
-      conventional-commits-parser: ^6.0.0
-    peerDependenciesMeta:
-      conventional-commits-filter:
-        optional: true
-      conventional-commits-parser:
-        optional: true
-
   '@cspotcode/source-map-support@0.8.1':
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -1666,6 +1637,9 @@ packages:
   '@emnapi/core@1.8.1':
     resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
 
+  '@emnapi/runtime@1.11.3':
+    resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==}
+
   '@emnapi/runtime@1.4.5':
     resolution: {integrity: sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==}
 
@@ -1680,11 +1654,11 @@ packages:
 
   '@esbuild-kit/core-utils@3.3.2':
     resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild-kit/esm-loader@2.6.5':
     resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild/aix-ppc64@0.25.12':
     resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
@@ -2308,8 +2282,8 @@ packages:
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/eslintrc@3.3.1':
-    resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
+  '@eslint/eslintrc@3.3.6':
+    resolution: {integrity: sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/js@9.39.2':
@@ -2324,21 +2298,21 @@ packages:
     resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@faker-js/faker@10.3.0':
-    resolution: {integrity: sha512-It0Sne6P3szg7JIi6CgKbvTZoMjxBZhcv91ZrqrNuaZQfB5WoqYYbzCUOq89YR+VY8juY9M1vDWmDDa2TzfXCw==}
+  '@faker-js/faker@10.5.0':
+    resolution: {integrity: sha512-bsxD8WLS5lIj7aaoCx1YJkktqYj5vlBUE6HWzu2Q51ksrGJ0H737ECCKlFU7Yf8Br45z9t99frBp/J7kzbMPAg==}
     engines: {node: ^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0, npm: '>=10'}
 
-  '@fontsource/crimson-pro@5.2.8':
-    resolution: {integrity: sha512-t+cAoAswUKEReDPqDNWWSyAp7baZkKrtF6Ry0KrDZQHJCldS9pIbRH0n2hm1u4+SbIUI7c+nUS9yfK6rEhycTw==}
+  '@fontsource/crimson-pro@5.3.0':
+    resolution: {integrity: sha512-PXQH0NGma2wwskZAySBH+s/ezAYBwyDH0I4oRURBu9u81nNUCm5DcNCJaUS9H0UR1y8qlslLfVRU6mnDBpffrA==}
 
-  '@fontsource/dm-sans@5.2.8':
-    resolution: {integrity: sha512-tlovG42m9ESG28WiHpLq3F5umAlm64rv0RkqTbYowRn70e9OlRr5a3yTJhrhrY+k5lftR/OFJjPzOLQzk8EfCA==}
+  '@fontsource/dm-sans@5.3.0':
+    resolution: {integrity: sha512-lYJtMXXO28q1z+yz+z8XKd0s4hXaa9QdkETzkyD760sidCv5heI86weYA0sx0Nc4pAMAQTUuyf4gO44cYKKS9g==}
 
-  '@fontsource/jetbrains-mono@5.2.8':
-    resolution: {integrity: sha512-6w8/SG4kqvIMu7xd7wt6x3idn1Qux3p9N62s6G3rfldOUYHpWcc2FKrqf+Vo44jRvqWj2oAtTHrZXEP23oSKwQ==}
+  '@fontsource/jetbrains-mono@5.3.0':
+    resolution: {integrity: sha512-fqDfB5I9f1p1TV486aUgB9t8zP84P0O1FtQR5Ol9vjwPy+S+EIGlVYm1cvj2W5shcZMTg2nZFdVMoH5wFu8a1A==}
 
-  '@fontsource/roboto@5.2.10':
-    resolution: {integrity: sha512-8HlA5FtSfz//oFSr2eL7GFXAiE7eIkcGOtx7tjsLKq+as702x9+GU7K95iDeWFapHC4M2hv9RrpXKRTGGBI8Zg==}
+  '@fontsource/roboto@5.3.0':
+    resolution: {integrity: sha512-BapRJOWYP+LZ21zp+wBQjfpPYKRoxc4LspJ/RLuI+HSMBD5u/X4O+ESDrSvEqDSy0rAl7GwBJ+09mdc16cVQ1Q==}
 
   '@gar/promise-retry@1.0.3':
     resolution: {integrity: sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==}
@@ -2372,84 +2346,159 @@ packages:
     resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
     engines: {node: '>=18.18'}
 
-  '@hutson/parse-repository-url@5.0.0':
-    resolution: {integrity: sha512-e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg==}
-    engines: {node: '>=10.13.0'}
-
   '@img/colour@1.0.0':
     resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
     engines: {node: '>=18'}
 
+  '@img/colour@1.1.0':
+    resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+    engines: {node: '>=18'}
+
   '@img/sharp-darwin-arm64@0.34.5':
     resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [darwin]
 
+  '@img/sharp-darwin-arm64@0.35.3':
+    resolution: {integrity: sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@img/sharp-darwin-x64@0.34.5':
     resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [darwin]
 
+  '@img/sharp-darwin-x64@0.35.3':
+    resolution: {integrity: sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-freebsd-wasm32@0.35.3':
+    resolution: {integrity: sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==}
+    engines: {node: '>=20.9.0'}
+    os: [freebsd]
+
   '@img/sharp-libvips-darwin-arm64@1.2.4':
     resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
     cpu: [arm64]
     os: [darwin]
 
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
+    resolution: {integrity: sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==}
+    cpu: [arm64]
+    os: [darwin]
+
   '@img/sharp-libvips-darwin-x64@1.2.4':
     resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
     cpu: [x64]
     os: [darwin]
 
+  '@img/sharp-libvips-darwin-x64@1.3.2':
+    resolution: {integrity: sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==}
+    cpu: [x64]
+    os: [darwin]
+
   '@img/sharp-libvips-linux-arm64@1.2.4':
     resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-arm64@1.3.2':
+    resolution: {integrity: sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-arm@1.2.4':
     resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-arm@1.3.2':
+    resolution: {integrity: sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-ppc64@1.2.4':
     resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
+    resolution: {integrity: sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-riscv64@1.2.4':
     resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
+    resolution: {integrity: sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-s390x@1.2.4':
     resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-s390x@1.3.2':
+    resolution: {integrity: sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linux-x64@1.2.4':
     resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-libvips-linux-x64@1.3.2':
+    resolution: {integrity: sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
+    resolution: {integrity: sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-libvips-linuxmusl-x64@1.2.4':
     resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
+    resolution: {integrity: sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-linux-arm64@0.34.5':
     resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2457,6 +2506,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-arm64@0.35.3':
+    resolution: {integrity: sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-arm@0.34.5':
     resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2464,6 +2520,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-arm@0.35.3':
+    resolution: {integrity: sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-ppc64@0.34.5':
     resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2471,6 +2534,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-ppc64@0.35.3':
+    resolution: {integrity: sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-riscv64@0.34.5':
     resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2478,6 +2548,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-riscv64@0.35.3':
+    resolution: {integrity: sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==}
+    engines: {node: '>=20.9.0'}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-s390x@0.34.5':
     resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2485,6 +2562,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-s390x@0.35.3':
+    resolution: {integrity: sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==}
+    engines: {node: '>=20.9.0'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linux-x64@0.34.5':
     resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2492,6 +2576,13 @@ packages:
     os: [linux]
     libc: [glibc]
 
+  '@img/sharp-linux-x64@0.35.3':
+    resolution: {integrity: sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
   '@img/sharp-linuxmusl-arm64@0.34.5':
     resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2499,6 +2590,13 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-linuxmusl-arm64@0.35.3':
+    resolution: {integrity: sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-linuxmusl-x64@0.34.5':
     resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -2506,29 +2604,63 @@ packages:
     os: [linux]
     libc: [musl]
 
+  '@img/sharp-linuxmusl-x64@0.35.3':
+    resolution: {integrity: sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
   '@img/sharp-wasm32@0.34.5':
     resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
+  '@img/sharp-wasm32@0.35.3':
+    resolution: {integrity: sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==}
+    engines: {node: '>=20.9.0'}
+
+  '@img/sharp-webcontainers-wasm32@0.35.3':
+    resolution: {integrity: sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==}
+    engines: {node: '>=20.9.0'}
+    cpu: [wasm32]
+
   '@img/sharp-win32-arm64@0.34.5':
     resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [win32]
 
+  '@img/sharp-win32-arm64@0.35.3':
+    resolution: {integrity: sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==}
+    engines: {node: '>=20.9.0'}
+    cpu: [arm64]
+    os: [win32]
+
   '@img/sharp-win32-ia32@0.34.5':
     resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ia32]
     os: [win32]
 
+  '@img/sharp-win32-ia32@0.35.3':
+    resolution: {integrity: sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==}
+    engines: {node: ^20.9.0}
+    cpu: [ia32]
+    os: [win32]
+
   '@img/sharp-win32-x64@0.34.5':
     resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [win32]
 
+  '@img/sharp-win32-x64@0.35.3':
+    resolution: {integrity: sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==}
+    engines: {node: '>=20.9.0'}
+    cpu: [x64]
+    os: [win32]
+
   '@inquirer/ansi@1.0.2':
     resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==}
     engines: {node: '>=18'}
@@ -2691,8 +2823,12 @@ packages:
     resolution: {integrity: sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  '@jest/core@30.2.0':
-    resolution: {integrity: sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==}
+  '@jest/console@30.4.1':
+    resolution: {integrity: sha512-v3bhyxUh9Hgmo5p6hAOXe14/R3ZxZDOsvHleh4B07z3m/x4/ngPUXEm9XwK4sF4u+f+P2ORb0Ge+MgpaqRMVDA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
+  '@jest/core@30.4.2':
+    resolution: {integrity: sha512-TZJA6cPJUFxoWhxaLo8t0VX/MZX2wPWr0uIDvLSHIvN4gu9h02vSzqI2kBADG1ExqQlC+cY09xKMSreivvrChQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -2704,6 +2840,10 @@ packages:
     resolution: {integrity: sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/diff-sequences@30.4.0':
+    resolution: {integrity: sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/environment-jsdom-abstract@30.2.0':
     resolution: {integrity: sha512-kazxw2L9IPuZpQ0mEt9lu9Z98SqR74xcagANmMBU16X0lS23yPc0+S6hGLUz8kVRlomZEs/5S/Zlpqwf5yu6OQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -2714,22 +2854,48 @@ packages:
       canvas:
         optional: true
 
+  '@jest/environment-jsdom-abstract@30.4.1':
+    resolution: {integrity: sha512-dSlKrqug3siYNHVnjwIldShY12wAH3spwRltO/+8VOjg0X+xEq7vOs3DbBs4LRKsu7OH+NUb9kuZUNBF9Ho3TA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+    peerDependencies:
+      canvas: ^3.0.0
+      jsdom: '*'
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   '@jest/environment@30.2.0':
     resolution: {integrity: sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/environment@30.4.1':
+    resolution: {integrity: sha512-AK9yNRqgKxiabqMoe4oW+3/TSSeV8vkdC7BGaxZdU0AFXfOpofTLqdru2GXKZghP3sdgwE9XXpnVwfZ8JnFV4w==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/expect-utils@30.2.0':
     resolution: {integrity: sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/expect-utils@30.4.1':
+    resolution: {integrity: sha512-ZBn5CglH8fBsQsvs4VWNzD4aWfUYks+IdOOQU3MEK71ol/BcVm+P+rtb1KpiFBpSWSCE27uOahyyf1vfqOVbcQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/expect@30.2.0':
     resolution: {integrity: sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/expect@30.4.1':
+    resolution: {integrity: sha512-ginrj6TMgh2GshLUGCjO94Ptx9HhdZA/I6A9iUfyeLKFtdAjnKzHDgzgP9HYQgbxM1lbXScQ2eUBz2lGeVDPWA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/fake-timers@30.2.0':
     resolution: {integrity: sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/fake-timers@30.4.1':
+    resolution: {integrity: sha512-iW5umdmfPeWzehrVhugFQZqCchSCud5S1l2YT0O9ZhjRR0ExclANDZkiSBwzqtnlOn0J1JXvO+HZ6rkuyOVOgQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/get-type@30.1.0':
     resolution: {integrity: sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -2738,10 +2904,18 @@ packages:
     resolution: {integrity: sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/globals@30.4.1':
+    resolution: {integrity: sha512-ZbuY4cmXC8DkxYjfvT2DbcHWL2T6vmsMhXCDcmTB2T0y0gaezBI77ufq5ZAIdcRkYZ7NEQEDg1xFeKbxUJ5v5Q==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/pattern@30.0.1':
     resolution: {integrity: sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/pattern@30.4.0':
+    resolution: {integrity: sha512-RAWn3+f9u8BsHijKJ71uHcFp6vmyEt6VvoWXkl6hKF3qVIuWNmudVjg12DlBPGup/frIl5UcUlH5HfEuvHpEXg==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/reporters@30.2.0':
     resolution: {integrity: sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -2751,14 +2925,31 @@ packages:
       node-notifier:
         optional: true
 
+  '@jest/reporters@30.4.1':
+    resolution: {integrity: sha512-/SnkPCzEQpUaBH81kjdEdDdo2WZl5hxw+BmLDGWjRkm8o7XlhjwsU36cqwe5PGBE5WYpBvDzRSdXx9rbGuJtNA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
   '@jest/schemas@30.0.5':
     resolution: {integrity: sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/schemas@30.4.1':
+    resolution: {integrity: sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/snapshot-utils@30.2.0':
     resolution: {integrity: sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/snapshot-utils@30.4.1':
+    resolution: {integrity: sha512-ObY4ljvQ95mt6iwKtVLetR/4yXiAgl3H4nJxhztr0MTjrN97TwDYrnCp/kF60Ec9HdhkWTHSu+Hg05aXfngpOA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/source-map@30.0.1':
     resolution: {integrity: sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -2767,18 +2958,34 @@ packages:
     resolution: {integrity: sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/test-result@30.4.1':
+    resolution: {integrity: sha512-/ZG7pgEiOmmWkN9TplKbOu4id2N5lh7FHwRwlkgBVAzGdRH+OkkQ8wX/kIxg4zmd3ZQvAL1RwL2yWsvNYYECTw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/test-sequencer@30.2.0':
     resolution: {integrity: sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/test-sequencer@30.4.1':
+    resolution: {integrity: sha512-PeYE+4td5rKjoRPxztObrXU+H8hsjZfxKMXOcmrr34JerSyB/ROOxbbicz8B7A5j9R9VayDnVPvBmedqCsFCdw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/transform@30.2.0':
     resolution: {integrity: sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/transform@30.4.1':
+    resolution: {integrity: sha512-Wz0LyktlTvRefoymh+n64hQ84KNXsRGcwdoZ8CSa0Ea+fgYcHZlnk+hDP7v2MS7il2bQ5uTEIxf4/NNfhMN4KQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jest/types@30.2.0':
     resolution: {integrity: sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  '@jest/types@30.4.1':
+    resolution: {integrity: sha512-f1x/vJXIfjOlEmejYpbkbgw1gOqpPECwMvMEtBqe47j7H2Hg8h8w3o3ikhSXq3MI15kg+oQ0exWO0uCtTNJLoQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   '@jridgewell/gen-mapping@0.3.13':
     resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
@@ -3254,39 +3461,39 @@ packages:
   '@napi-rs/wasm-runtime@1.1.1':
     resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
 
-  '@ngrx/effects@21.0.1':
-    resolution: {integrity: sha512-hSdpToAiSYa5FJ/CAygQHpnCaF2S1HO7q/57ob3XvNTWmkofa0VqI/IIe4W57bojh2YOWCJ91SCn3kAjymaV3g==}
+  '@ngrx/effects@21.1.1':
+    resolution: {integrity: sha512-JQUv2tYyjkbdsE40WYtJDsiI+3qtn4V5m0Ybr2CYw9zKpVQshDV5MLLAni+SuijlHAWJkw8x4wwnYmNyG/Rmng==}
     peerDependencies:
       '@angular/core': ^21.0.0
-      '@ngrx/store': 21.0.1
+      '@ngrx/store': 21.1.1
       rxjs: ^6.5.3 || ^7.5.0
 
-  '@ngrx/entity@21.0.1':
-    resolution: {integrity: sha512-h7PjW8WzkPwSYDlicWcEw6EJ9yBfa+fbf5tmIty4cZ8yH6+Ld3aHuGAMAu8xbnV79oj0TGa/PSynu5LZq4jXdA==}
+  '@ngrx/entity@21.1.1':
+    resolution: {integrity: sha512-yDHjjw63XjKWRXimIAloxo+Ws5AK2IPUIankRJZGw+IRCinZCO6gzhHmNamfqfS2vlcUgCS1r/7ZphRunK3WAg==}
     peerDependencies:
       '@angular/core': ^21.0.0
-      '@ngrx/store': 21.0.1
+      '@ngrx/store': 21.1.1
       rxjs: ^6.5.3 || ^7.5.0
 
-  '@ngrx/eslint-plugin@21.0.1':
-    resolution: {integrity: sha512-ZFFb7UFiTF4UzXYaMRmK6hEHFOiFtoJ+Euus4O7i0A+0na+zaYVxS42cdylG/IKe3sfAoLKZWkly/idNnMSaWQ==}
+  '@ngrx/eslint-plugin@21.1.1':
+    resolution: {integrity: sha512-I2RzaBmEPuSDOE/TCwG8m0mMi7ETKo1j+1GRZ8JuhNDj+sEpzj5hQMnbLoVcRjcz2ctGJF6rFI9qADztzvg5wg==}
     peerDependencies:
       '@typescript-eslint/utils': ^8.0.0
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '*'
       typescript-eslint: ^8.0.0
 
-  '@ngrx/router-store@21.0.1':
-    resolution: {integrity: sha512-hacH8ciwCRMLg7p7bThslYn564GOyS5LPf9c8cX4FTyOH+iJM32eJd2Lt64cA62vN6ruofV/IM2vB09nCkxHzg==}
+  '@ngrx/router-store@21.1.1':
+    resolution: {integrity: sha512-niO2J0aYgMcplHRgg3Nf1DPjHpg4ehZjqnA282DtLOXlYtHWoP2ePZcvnPxhK1K77Am5hSGOLa7U2DjjgwlSdQ==}
     peerDependencies:
       '@angular/common': ^21.0.0
       '@angular/core': ^21.0.0
       '@angular/router': ^21.0.0
-      '@ngrx/store': 21.0.1
+      '@ngrx/store': 21.1.1
       rxjs: ^6.5.3 || ^7.5.0
 
-  '@ngrx/signals@21.0.1':
-    resolution: {integrity: sha512-krmZDhgHrnmZrxfEJ41bp/aM8Mc55k5B2N7oCLT5w4M3YbOkbnWPkP6bBWMv4XPI+2rqVgkLRW6DaWLwoESaBw==}
+  '@ngrx/signals@21.1.1':
+    resolution: {integrity: sha512-AXxsvO39cJ4gu2GMvLyUHwx+3qHi35Bn7OUqyIfJW0fffi/Af7ML6h0MPMWDHVROo55FBgxzJrYRswwzdew9VA==}
     peerDependencies:
       '@angular/core': ^21.0.0
       rxjs: ^6.5.3 || ^7.4.0
@@ -3294,15 +3501,15 @@ packages:
       rxjs:
         optional: true
 
-  '@ngrx/store-devtools@21.0.1':
-    resolution: {integrity: sha512-G9fO7CFwYUpz8+JZ9uny+lVJ7iv6PcFJDg+jae5CCrAUIiflnR8gbwD8exAd2AODpxPCpmnSojuLNpLDAcwGzQ==}
+  '@ngrx/store-devtools@21.1.1':
+    resolution: {integrity: sha512-gNRDPCZZCO2uzdamco6xJ7292cZdVumHqOIAqmJsYaHkRQ4sZIKBjwFyYXAtPvS6a+Y9bnkGkHetxkF1iZzDvA==}
     peerDependencies:
       '@angular/core': ^21.0.0
-      '@ngrx/store': 21.0.1
+      '@ngrx/store': 21.1.1
       rxjs: ^6.5.3 || ^7.5.0
 
-  '@ngrx/store@21.0.1':
-    resolution: {integrity: sha512-2hGnw/c5o8nmKzyx7TrUUM7FXjE2zqjX0EF+wLbw9Oy/L+VdCmx+ZI1BFjuAR4B8PKEWHG2KSbOM13SMNkpZiA==}
+  '@ngrx/store@21.1.1':
+    resolution: {integrity: sha512-B0/IyBTqBExmwPAmrpcJrhlrn+FeeitvOW8ltf7O3kJb2vRKduV5Oi34GLiwYQ8eAukTbKyWQv/VV02gxLeEMg==}
     peerDependencies:
       '@angular/core': ^21.0.0
       rxjs: ^6.5.3 || ^7.5.0
@@ -3326,6 +3533,97 @@ packages:
       '@angular/common': '>=16'
       '@angular/core': '>=16'
 
+  '@node-rs/xxhash-android-arm-eabi@1.7.6':
+    resolution: {integrity: sha512-ptmfpFZ8SgTef58Us+0HsZ9BKhyX/gZYbhLkuzPt7qUoMqMSJK85NC7LEgzDgjUiG+S5GahEEQ9/tfh9BVvKhw==}
+    engines: {node: '>= 12'}
+    cpu: [arm]
+    os: [android]
+
+  '@node-rs/xxhash-android-arm64@1.7.6':
+    resolution: {integrity: sha512-n4MyZvqifuoARfBvrZ2IBqmsGzwlVI3kb2mB0gVvoHtMsPbl/q94zoDBZ7WgeP3t4Wtli+QS3zgeTCOWUbqqUQ==}
+    engines: {node: '>= 12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@node-rs/xxhash-darwin-arm64@1.7.6':
+    resolution: {integrity: sha512-6xGuE07CiCIry/KT3IiwQd/kykTOmjKzO/ZnHlE5ibGMx64NFE0qDuwJbxQ4rGyUzgJ0KuN9ZdOhUDJmepnpcw==}
+    engines: {node: '>= 12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@node-rs/xxhash-darwin-x64@1.7.6':
+    resolution: {integrity: sha512-Z4oNnhyznDvHhxv+s0ka+5KG8mdfLVucZMZMejj9BL+CPmamClygPiHIRiifRcPAoX9uPZykaCsULngIfLeF3Q==}
+    engines: {node: '>= 12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@node-rs/xxhash-freebsd-x64@1.7.6':
+    resolution: {integrity: sha512-arCDOf3xZ5NfBL5fk5J52sNPjXL2cVWN6nXNB3nrtRFFdPBLsr6YXtshAc6wMVxnIW4VGaEv/5K6IpTA8AFyWw==}
+    engines: {node: '>= 12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@node-rs/xxhash-linux-arm-gnueabihf@1.7.6':
+    resolution: {integrity: sha512-ndLLEW+MwLH3lFS0ahlHCcmkf2ykOv/pbP8OBBeAOlz/Xc3jKztg5IJ9HpkjKOkHk470yYxgHVaw1QMoMzU00A==}
+    engines: {node: '>= 12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@node-rs/xxhash-linux-arm64-gnu@1.7.6':
+    resolution: {integrity: sha512-VX7VkTG87mAdrF2vw4aroiRpFIIN8Lj6NgtGHF+IUVbzQxPudl4kG+FPEjsNH8y04yQxRbPE7naQNgHcTKMrNw==}
+    engines: {node: '>= 12'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@node-rs/xxhash-linux-arm64-musl@1.7.6':
+    resolution: {integrity: sha512-AB5m6crGYSllM9F/xZNOQSPImotR5lOa9e4arW99Bv82S+gcpphI8fGMDOVTTCXY/RLRhvvhwzLDxmLB2O8VDg==}
+    engines: {node: '>= 12'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@node-rs/xxhash-linux-x64-gnu@1.7.6':
+    resolution: {integrity: sha512-a2A6M+5tc0PVlJlE/nl0XsLEzMpKkwg7Y1lR5urFUbW9uVQnKjJYQDrUojhlXk0Uv3VnYQPa6ThmwlacZA5mvQ==}
+    engines: {node: '>= 12'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@node-rs/xxhash-linux-x64-musl@1.7.6':
+    resolution: {integrity: sha512-WioGJSC1GoxQpmdQrG5l/uddSBAS4XCWczHNwXe895J5xadGQzyvmr0r17BNfihvbBUDH1H9jwouNYzDDeA6+A==}
+    engines: {node: '>= 12'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@node-rs/xxhash-wasm32-wasi@1.7.6':
+    resolution: {integrity: sha512-WDXXKMMFMrez+esm2DzMPHFNPFYf+wQUtaXrXwtxXeQMFEzleOLwEaqV0+bbXGJTwhPouL3zY1Qo2xmIH4kkTg==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@node-rs/xxhash-win32-arm64-msvc@1.7.6':
+    resolution: {integrity: sha512-qjDFUZJT/Zq0yFS+0TApkD86p0NBdPXlOoHur9yNeO9YX2/9/b1sC2P7N27PgOu13h61TUOvTUC00e/82jAZRQ==}
+    engines: {node: '>= 12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@node-rs/xxhash-win32-ia32-msvc@1.7.6':
+    resolution: {integrity: sha512-s7a+mQWOTnU4NiiypRq/vbNGot/il0HheXuy9oxJ0SW2q/e4BJ8j0pnP6UBlAjsk+005A76vOwsEj01qbQw8+A==}
+    engines: {node: '>= 12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@node-rs/xxhash-win32-x64-msvc@1.7.6':
+    resolution: {integrity: sha512-zHOHm2UaIahRhgRPJll+4Xy4Z18aAT/7KNeQW+QJupGvFz+GzOFXMGs3R/3B1Ktob/F5ui3i1MrW9GEob3CWTg==}
+    engines: {node: '>= 12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@node-rs/xxhash@1.7.6':
+    resolution: {integrity: sha512-XMisO+aQHsVpxRp/85EszTtOQTOlhPbd149P/Xa9F55wafA6UM3h2UhOgOs7aAzItnHU/Aw1WQ1FVTEg7WB43Q==}
+    engines: {node: '>= 12'}
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -3547,60 +3845,6 @@ packages:
   '@nx/workspace@22.7.1':
     resolution: {integrity: sha512-wnBMgeogdGaRdxDDzZspSt1U87PMeYJhz1ygr42L9Lot9E5nCf17E85iyHl3YxcMSNslHxnHyTkq7MyQ8hHjdQ==}
 
-  '@octokit/auth-token@6.0.0':
-    resolution: {integrity: sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==}
-    engines: {node: '>= 20'}
-
-  '@octokit/core@7.0.6':
-    resolution: {integrity: sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==}
-    engines: {node: '>= 20'}
-
-  '@octokit/endpoint@11.0.2':
-    resolution: {integrity: sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==}
-    engines: {node: '>= 20'}
-
-  '@octokit/graphql@9.0.3':
-    resolution: {integrity: sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==}
-    engines: {node: '>= 20'}
-
-  '@octokit/openapi-types@26.0.0':
-    resolution: {integrity: sha512-7AtcfKtpo77j7Ts73b4OWhOZHTKo/gGY8bB3bNBQz4H+GRSWqx2yvj8TXRsbdTE0eRmYmXOEY66jM7mJ7LzfsA==}
-
-  '@octokit/openapi-types@27.0.0':
-    resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==}
-
-  '@octokit/plugin-paginate-rest@13.2.1':
-    resolution: {integrity: sha512-Tj4PkZyIL6eBMYcG/76QGsedF0+dWVeLhYprTmuFVVxzDW7PQh23tM0TP0z+1MvSkxB29YFZwnUX+cXfTiSdyw==}
-    engines: {node: '>= 20'}
-    peerDependencies:
-      '@octokit/core': '>=6'
-
-  '@octokit/plugin-retry@8.0.3':
-    resolution: {integrity: sha512-vKGx1i3MC0za53IzYBSBXcrhmd+daQDzuZfYDd52X5S0M2otf3kVZTVP8bLA3EkU0lTvd1WEC2OlNNa4G+dohA==}
-    engines: {node: '>= 20'}
-    peerDependencies:
-      '@octokit/core': '>=7'
-
-  '@octokit/plugin-throttling@11.0.3':
-    resolution: {integrity: sha512-34eE0RkFCKycLl2D2kq7W+LovheM/ex3AwZCYN8udpi6bxsyjZidb2McXs69hZhLmJlDqTSP8cH+jSRpiaijBg==}
-    engines: {node: '>= 20'}
-    peerDependencies:
-      '@octokit/core': ^7.0.0
-
-  '@octokit/request-error@7.1.0':
-    resolution: {integrity: sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==}
-    engines: {node: '>= 20'}
-
-  '@octokit/request@10.0.7':
-    resolution: {integrity: sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==}
-    engines: {node: '>= 20'}
-
-  '@octokit/types@15.0.2':
-    resolution: {integrity: sha512-rR+5VRjhYSer7sC51krfCctQhVTmjyUMAaShfPB8mscVa8tSoLyon3coxQmXu0ahJoLVWl8dSGD/3OGZlFV44Q==}
-
-  '@octokit/types@16.0.0':
-    resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==}
-
   '@oslojs/encoding@1.1.0':
     resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
 
@@ -3816,23 +4060,11 @@ packages:
     resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@playwright/test@1.57.0':
-    resolution: {integrity: sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==}
-    engines: {node: '>=18'}
+  '@playwright/test@1.62.0':
+    resolution: {integrity: sha512-9zOJ6ZQRAena31MpOH9VSzIz8Ou3YJ/wtY/eQm5T2uhfhG7/U3COrMS8xOtUrZrp9OgdmzEnIYODye3nY1VqzA==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  '@pnpm/config.env-replace@1.1.0':
-    resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
-    engines: {node: '>=12.22.0'}
-
-  '@pnpm/network.ca-file@1.0.2':
-    resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==}
-    engines: {node: '>=12.22.0'}
-
-  '@pnpm/npm-conf@2.3.1':
-    resolution: {integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==}
-    engines: {node: '>=12'}
-
   '@rolldown/binding-android-arm64@1.0.0-rc.4':
     resolution: {integrity: sha512-vRq9f4NzvbdZavhQbjkJBx7rRebDKYR9zHfO/Wg486+I7bSecdUapzCm5cyXoK+LHokTxgSq7A5baAXUZkIz0w==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -4158,59 +4390,6 @@ packages:
     resolution: {integrity: sha512-1renEbBZz9Yw3A0GUOJ6x6E1jd2Vu/fX5tEGiFNbIoWaNwa71SlFTvKKqaYxiYQkrpc7oexVJ2ymuvOfgTbI1w==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@sec-ant/readable-stream@0.4.1':
-    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
-
-  '@semantic-release/changelog@6.0.3':
-    resolution: {integrity: sha512-dZuR5qByyfe3Y03TpmCvAxCyTnp7r5XwtHRf/8vD9EAn4ZWbavUX8adMtXYzE86EVh0gyLA7lm5yW4IV30XUag==}
-    engines: {node: '>=14.17'}
-    peerDependencies:
-      semantic-release: '>=18.0.0'
-
-  '@semantic-release/commit-analyzer@13.0.1':
-    resolution: {integrity: sha512-wdnBPHKkr9HhNhXOhZD5a2LNl91+hs8CC2vsAVYxtZH3y0dV3wKn+uZSN61rdJQZ8EGxzWB3inWocBHV9+u/CQ==}
-    engines: {node: '>=20.8.1'}
-    peerDependencies:
-      semantic-release: '>=20.1.0'
-
-  '@semantic-release/error@3.0.0':
-    resolution: {integrity: sha512-5hiM4Un+tpl4cKw3lV4UgzJj+SmfNIDCLLw0TepzQxz9ZGV5ixnqkzIVF+3tp0ZHgcMKE+VNGHJjEeyFG2dcSw==}
-    engines: {node: '>=14.17'}
-
-  '@semantic-release/error@4.0.0':
-    resolution: {integrity: sha512-mgdxrHTLOjOddRVYIYDo0fR3/v61GNN1YGkfbrjuIKg/uMgCd+Qzo3UAXJ+woLQQpos4pl5Esuw5A7AoNlzjUQ==}
-    engines: {node: '>=18'}
-
-  '@semantic-release/git@10.0.1':
-    resolution: {integrity: sha512-eWrx5KguUcU2wUPaO6sfvZI0wPafUKAMNC18aXY4EnNcrZL86dEmpNVnC9uMpGZkmZJ9EfCVJBQx4pV4EMGT1w==}
-    engines: {node: '>=14.17'}
-    peerDependencies:
-      semantic-release: '>=18.0.0'
-
-  '@semantic-release/github@11.0.6':
-    resolution: {integrity: sha512-ctDzdSMrT3H+pwKBPdyCPty6Y47X8dSrjd3aPZ5KKIKKWTwZBE9De8GtsH3TyAlw3Uyo2stegMx6rJMXKpJwJA==}
-    engines: {node: '>=20.8.1'}
-    peerDependencies:
-      semantic-release: '>=24.1.0'
-
-  '@semantic-release/npm@12.0.1':
-    resolution: {integrity: sha512-/6nntGSUGK2aTOI0rHPwY3ZjgY9FkXmEHbW9Kr+62NVOsyqpKKeP0lrCH+tphv+EsNdJNmqqwijTEnVWUMQ2Nw==}
-    engines: {node: '>=20.8.1'}
-    peerDependencies:
-      semantic-release: '>=20.1.0'
-
-  '@semantic-release/npm@12.0.2':
-    resolution: {integrity: sha512-+M9/Lb35IgnlUO6OSJ40Ie+hUsZLuph2fqXC/qrKn0fMvUU/jiCjpoL6zEm69vzcmaZJ8yNKtMBEKHWN49WBbQ==}
-    engines: {node: '>=20.8.1'}
-    peerDependencies:
-      semantic-release: '>=20.1.0'
-
-  '@semantic-release/release-notes-generator@14.1.0':
-    resolution: {integrity: sha512-CcyDRk7xq+ON/20YNR+1I/jP7BYKICr1uKd1HHpROSnnTdGqOTburi4jcRiTYz0cpfhxSloQO3cGhnoot7IEkA==}
-    engines: {node: '>=20.8.1'}
-    peerDependencies:
-      semantic-release: '>=20.1.0'
-
   '@shikijs/core@3.22.0':
     resolution: {integrity: sha512-iAlTtSDDbJiRpvgL5ugKEATDtHdUVkqgHDm/gbD2ZS9c88mx7G1zSYjjOxp5Qa0eaW0MAQosFRmJSk354PRoQA==}
 
@@ -4267,101 +4446,114 @@ packages:
     resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
     engines: {node: '>=18'}
 
-  '@sindresorhus/merge-streams@4.0.0':
-    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
-    engines: {node: '>=18'}
-
   '@sinonjs/commons@3.0.1':
     resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
 
   '@sinonjs/fake-timers@13.0.5':
     resolution: {integrity: sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==}
 
+  '@sinonjs/fake-timers@15.4.0':
+    resolution: {integrity: sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==}
+
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@swc-node/core@1.14.1':
-    resolution: {integrity: sha512-jrt5GUaZUU6cmMS+WTJEvGvaB6j1YNKPHPzC2PUi2BjaFbtxURHj6641Az6xN7b665hNniAIdvjxWcRml5yCnw==}
+  '@swc-node/core@1.15.0':
+    resolution: {integrity: sha512-WAerrrl087WgenB92XG4Th2t0NQFfMNLYSe0sW2cEMMqM/LQmP4rozsDJl0vuzTrbewjpKQryxFXI+aYig/dBg==}
     engines: {node: '>= 10'}
     peerDependencies:
       '@swc/core': '>= 1.13.3'
       '@swc/types': '>= 0.1'
 
-  '@swc-node/register@1.11.1':
-    resolution: {integrity: sha512-VQ0hJ5jX31TVv/fhZx4xJRzd8pwn6VvzYd2tGOHHr2TfXGCBixZoqdPDXTiEoJLCTS2MmvBf6zyQZZ0M8aGQCQ==}
+  '@swc-node/register@1.12.1':
+    resolution: {integrity: sha512-t6t+0bDos+bj0+jcSqKl7+ys/i1an5cEViC0LuIskJFSHONX871nXN8j+gxdKVOgCCpjs0buXUPNnp/0DaV4EQ==}
     peerDependencies:
       '@swc/core': '>= 1.4.13'
-      typescript: '>= 4.3'
+      typescript: '>= 4.3 < 7'
 
   '@swc-node/sourcemap-support@0.6.1':
     resolution: {integrity: sha512-ovltDVH5QpdHXZkW138vG4+dgcNsxfwxHVoV6BtmTbz2KKl1A8ZSlbdtxzzfNjCjbpayda8Us9eMtcHobm38dA==}
 
-  '@swc/core-darwin-arm64@1.15.8':
-    resolution: {integrity: sha512-M9cK5GwyWWRkRGwwCbREuj6r8jKdES/haCZ3Xckgkl8MUQJZA3XB7IXXK1IXRNeLjg6m7cnoMICpXv1v1hlJOg==}
+  '@swc/core-darwin-arm64@1.15.46':
+    resolution: {integrity: sha512-IsISIT22EfktVJrlvIpnAxG2u/A9aob9l99HMlx80x72WlFmFPk1V3UhkEzx86eJP8hw049KTFv/RISho2cq2Q==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@swc/core-darwin-x64@1.15.8':
-    resolution: {integrity: sha512-j47DasuOvXl80sKJHSi2X25l44CMc3VDhlJwA7oewC1nV1VsSzwX+KOwE5tLnfORvVJJyeiXgJORNYg4jeIjYQ==}
+  '@swc/core-darwin-x64@1.15.46':
+    resolution: {integrity: sha512-4Tj4ppVIPCmUMpmGFiGtyEriwLyJ+yi/US4WfBrP/ok8COGddDZXLEzQETnKyK46mjvr1v0jevrS23zjoff7vA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
 
-  '@swc/core-linux-arm-gnueabihf@1.15.8':
-    resolution: {integrity: sha512-siAzDENu2rUbwr9+fayWa26r5A9fol1iORG53HWxQL1J8ym4k7xt9eME0dMPXlYZDytK5r9sW8zEA10F2U3Xwg==}
+  '@swc/core-linux-arm-gnueabihf@1.15.46':
+    resolution: {integrity: sha512-i8tUGnNjyOgMmfmgFSg4aeJLQoFyfpIHK5FjpQAwpRyQIqEUB2w1e8zIDQzY1WhOxx8NoS1S5iUL813Un4Sf5A==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
 
-  '@swc/core-linux-arm64-gnu@1.15.8':
-    resolution: {integrity: sha512-o+1y5u6k2FfPYbTRUPvurwzNt5qd0NTumCTFscCNuBksycloXY16J8L+SMW5QRX59n4Hp9EmFa3vpvNHRVv1+Q==}
+  '@swc/core-linux-arm64-gnu@1.15.46':
+    resolution: {integrity: sha512-c0OnhqzdhfOvv6qhNCcByepB+sNYOGZyhtr2Qa6ZCHvAWTYhSRw4j/u92Stue9PbZ/6q74b9nHzi76+kVzqQHQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@swc/core-linux-arm64-musl@1.15.8':
-    resolution: {integrity: sha512-koiCqL09EwOP1S2RShCI7NbsQuG6r2brTqUYE7pV7kZm9O17wZ0LSz22m6gVibpwEnw8jI3IE1yYsQTVpluALw==}
+  '@swc/core-linux-arm64-musl@1.15.46':
+    resolution: {integrity: sha512-imyRpNEcUzFQFV2LE4jL68ErvmKEuZCbvZru77iQREunJ+bR4i658cupTgtG1mLYM3F1Tzy3Sb9xYb02KghWTg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@swc/core-linux-x64-gnu@1.15.8':
-    resolution: {integrity: sha512-4p6lOMU3bC+Vd5ARtKJ/FxpIC5G8v3XLoPEZ5s7mLR8h7411HWC/LmTXDHcrSXRC55zvAVia1eldy6zDLz8iFQ==}
+  '@swc/core-linux-ppc64-gnu@1.15.46':
+    resolution: {integrity: sha512-ctEfcl/HcUeomK33cbySiHZm98GEDIxTm1EkpBsYCiHxElYBzvTXVeuQT2YwbUXn9XCrjiw4ipyUNk33k26qRg==}
+    engines: {node: '>=10'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-s390x-gnu@1.15.46':
+    resolution: {integrity: sha512-DxlMdnt84TtRVTv7WL/thWyz9+QU8QZNNoAP9rrk0P68LziuhfePp8MjQ44zIprpTHTsEwyziIuGUUN5iSC1bQ==}
+    engines: {node: '>=10'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-x64-gnu@1.15.46':
+    resolution: {integrity: sha512-SKxI7J6t90XPl8hRUqtJi9NfGdunN/E/vZMc7Bc0figeRdOPDBT+Tm8g7cx9xM0T0mewh2l+8dewa3Am27/P+A==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@swc/core-linux-x64-musl@1.15.8':
-    resolution: {integrity: sha512-z3XBnbrZAL+6xDGAhJoN4lOueIxC/8rGrJ9tg+fEaeqLEuAtHSW2QHDHxDwkxZMjuF/pZ6MUTjHjbp8wLbuRLA==}
+  '@swc/core-linux-x64-musl@1.15.46':
+    resolution: {integrity: sha512-qj9T6B7bosI0VEsrWOVXZN1OXxS8Tp63ywyrLxNdOycnUtLdkgYcoBsN5y8ImnDDsnwrEWZOy1e+J4xSe7mA3Q==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@swc/core-win32-arm64-msvc@1.15.8':
-    resolution: {integrity: sha512-djQPJ9Rh9vP8GTS/Df3hcc6XP6xnG5c8qsngWId/BLA9oX6C7UzCPAn74BG/wGb9a6j4w3RINuoaieJB3t+7iQ==}
+  '@swc/core-win32-arm64-msvc@1.15.46':
+    resolution: {integrity: sha512-8p7l4c3LU+eA5g9Et1JPhNeMC1oQwXTGU+uah8DPIBX7YXzqswvaBtyKVmXefVGi/DJU1x3YJsc3mbAp9aWzSQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
 
-  '@swc/core-win32-ia32-msvc@1.15.8':
-    resolution: {integrity: sha512-/wfAgxORg2VBaUoFdytcVBVCgf1isWZIEXB9MZEUty4wwK93M/PxAkjifOho9RN3WrM3inPLabICRCEgdHpKKQ==}
+  '@swc/core-win32-ia32-msvc@1.15.46':
+    resolution: {integrity: sha512-tUEnfr3Bn9u6FOjUb3PN9p+09qZC2j+wNDLKHzXXZn22rqGcUqR/ohCRSS+nG9B9+X+U+3FewNEHJkTmdIvMjQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
 
-  '@swc/core-win32-x64-msvc@1.15.8':
-    resolution: {integrity: sha512-GpMePrh9Sl4d61o4KAHOOv5is5+zt6BEXCOCgs/H0FLGeii7j9bWDE8ExvKFy2GRRZVNR1ugsnzaGWHKM6kuzA==}
+  '@swc/core-win32-x64-msvc@1.15.46':
+    resolution: {integrity: sha512-Vux7UDzBJYQggSuPfcl2w9iu+IJpgpRCxHzgCaVkELnAXAE4XZMOTX9HNcaNiwfeIDqdu2rkr69RuDm6wY8neA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
 
-  '@swc/core@1.15.8':
-    resolution: {integrity: sha512-T8keoJjXaSUoVBCIjgL6wAnhADIb09GOELzKg10CjNg+vLX48P93SME6jTfte9MZIm5m+Il57H3rTSk/0kzDUw==}
+  '@swc/core@1.15.46':
+    resolution: {integrity: sha512-Ri3em2mBpq3h2zSPliCYl63otDGqek8PPEfv2nWgRQEbZ/VBCNyypVTVQ6cEbTCXBhy+WE2T3fQb08moIyuYaw==}
     engines: {node: '>=10'}
     peerDependencies:
       '@swc/helpers': '>=0.5.17'
@@ -4372,20 +4564,20 @@ packages:
   '@swc/counter@0.1.3':
     resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
 
-  '@swc/helpers@0.5.18':
-    resolution: {integrity: sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==}
+  '@swc/helpers@0.5.23':
+    resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==}
 
-  '@swc/types@0.1.25':
-    resolution: {integrity: sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==}
+  '@swc/types@0.1.27':
+    resolution: {integrity: sha512-K6h3iUlqeM946U4sXFYeahefR1YBbXJvko+hv8WS8/0BNJ4OHiHRywMnQUJCqkR7Y9+hqQ1TvEpiKqUhz7NEFg==}
 
   '@szmarczak/http-timer@4.0.6':
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
 
-  '@tailwindcss/typography@0.5.19':
-    resolution: {integrity: sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==}
+  '@tailwindcss/typography@0.5.20':
+    resolution: {integrity: sha512-hwbzQuNUfcPvbegQFatVPl/MY/tcM9KLl963hQ5laJKPh81TEZ1+dNG9PirGvcaDBkp+BCshExAyKVPW91dozw==}
     peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
+      tailwindcss: '>=3.0.0 || >=4.0.0 || insiders'
 
   '@tootallnate/once@2.0.1':
     resolution: {integrity: sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==}
@@ -4543,18 +4735,12 @@ packages:
   '@types/node-forge@1.3.14':
     resolution: {integrity: sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==}
 
-  '@types/node@17.0.45':
-    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
-
   '@types/node@20.19.9':
     resolution: {integrity: sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==}
 
   '@types/node@24.13.1':
     resolution: {integrity: sha512-RSpUJGmvsJ1ZeBehQZFhIdpsz+bIpES0nIQXko4Ybq+N+kX6XvOq3Jo+iJ82FWLdblFq85AsMikd3m35jgezYg==}
 
-  '@types/normalize-package-data@2.4.4':
-    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
-
   '@types/parse-json@4.0.2':
     resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
@@ -4579,9 +4765,6 @@ packages:
   '@types/semver@7.5.8':
     resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
 
-  '@types/semver@7.7.1':
-    resolution: {integrity: sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==}
-
   '@types/send@0.17.6':
     resolution: {integrity: sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==}
 
@@ -4612,14 +4795,11 @@ packages:
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
 
-  '@types/uuid@10.0.0':
-    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
-
   '@types/verror@1.10.11':
     resolution: {integrity: sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==}
 
-  '@types/video.js@7.3.29':
-    resolution: {integrity: sha512-7xP5O3tQC6dm5xljwwvDvMKTumlu/cag4k5FwezMUazoCAbni0t3NB5ToavQlNAH5OKLLP3/ZEJbPqP6ShocIA==}
+  '@types/video.js@7.3.58':
+    resolution: {integrity: sha512-1CQjuSrgbv1/dhmcfQ83eVyYbvGyqhTvb2Opxr0QCV+iJ4J6/J+XWQ3Om59WiwCd1MN3rDUHasx5XRrpUtewYQ==}
 
   '@types/ws@8.18.1':
     resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
@@ -4630,20 +4810,20 @@ packages:
   '@types/yargs@17.0.35':
     resolution: {integrity: sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==}
 
-  '@typescript-eslint/eslint-plugin@8.51.0':
-    resolution: {integrity: sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==}
+  '@typescript-eslint/eslint-plugin@8.65.0':
+    resolution: {integrity: sha512-IEgob78X12rHpUmtcwFsXhZdVGJtwTVP8FiCLZkR6GlYVrl2PcuB+KhCE5BlVC/eQpQnu8WXRtkHZuPar+gCRA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.51.0
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      '@typescript-eslint/parser': ^8.65.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/parser@8.51.0':
-    resolution: {integrity: sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==}
+  '@typescript-eslint/parser@8.65.0':
+    resolution: {integrity: sha512-CZ4nMxWwgu1HEEFNkeaCptra9QCtkmKdgf3sWh1rl1trIhmxLilgTV4cwcbQ4wemnT4sWQN8CaKOmdYx+g2gMA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
   '@typescript-eslint/project-service@8.51.0':
     resolution: {integrity: sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==}
@@ -4651,16 +4831,32 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/project-service@8.65.0':
+    resolution: {integrity: sha512-SxnPhbTsGahizDgbu7oqFH/xVtzIqMd/s+WtnSxNxJZJpLbdT5IPdzg8EZxO3+PoKahXmwJLeNQOpKJb3/bi7Q==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/scope-manager@8.51.0':
     resolution: {integrity: sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/scope-manager@8.65.0':
+    resolution: {integrity: sha512-Esbl8OSYiVxBokYgWPf7VVWg/BE798wXhimnn9ML9Pt5qoDf8bfQlgjlKXR/k98+AcNzlLKYrpCcrcuZ9DZLgg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/tsconfig-utils@8.51.0':
     resolution: {integrity: sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/tsconfig-utils@8.65.0':
+    resolution: {integrity: sha512-j6GzGqCiRdA7Qhur2VVmKZAkBLfnHFQfx4TaJGL9RMveZqCo48jSHHO0DTgizEnGhtWnqmbtCUSrqSkdiY/0Hg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/type-utils@8.51.0':
     resolution: {integrity: sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4668,16 +4864,33 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/type-utils@8.65.0':
+    resolution: {integrity: sha512-YjaZ7PRI5qY7ax2L3PbvX0rRyGtipAReCWs0mhhDBHjH/vl0g0BonaGXrKdKpMbIIsMIwDgbk/xzkBTyAltS5g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/types@8.51.0':
     resolution: {integrity: sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/types@8.65.0':
+    resolution: {integrity: sha512-JSSwWNy+H0E/01jJEM+hrX6N0OFDzFzeIhHFSAS01tlVaevpG8cFyYRPhS5yjGOvBUx3sqQHVMjCL1CAZZMxBg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@typescript-eslint/typescript-estree@8.51.0':
     resolution: {integrity: sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/typescript-estree@8.65.0':
+    resolution: {integrity: sha512-JboAE2swaYt4tb1fHhHTABE2K+OLy09XfcTbhnk4Pw96f9dd2e9iYsJ28gBggHlo5z5x1rkyWvcPoTuNTd4oGg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/utils@8.51.0':
     resolution: {integrity: sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4685,10 +4898,21 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
+  '@typescript-eslint/utils@8.65.0':
+    resolution: {integrity: sha512-gXiwIHsYreboxeJucHKPvgwl7dXt50mF8s1/c00cP/WoVTyWKFdtfhRWwZiXYFU5H2O8vVoSLNrexFZjYS/SGA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
   '@typescript-eslint/visitor-keys@8.51.0':
     resolution: {integrity: sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@typescript-eslint/visitor-keys@8.65.0':
+    resolution: {integrity: sha512-8C71BQkGjiMmXtop7pHVJu1l2NNShFdkCyD6a2ezzs5vU/L3LRtb69EtcteFwz0mYMPzIgOw0n6OV4VBUWZd7A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
     deprecated: Potential CWE-502 - Update to 1.3.1 or higher
@@ -4802,8 +5026,8 @@ packages:
     peerDependencies:
       video.js: ^6 || ^7
 
-  '@videojs/http-streaming@3.17.2':
-    resolution: {integrity: sha512-VBQ3W4wnKnVKb/limLdtSD2rAd5cmHN70xoMf4OmuDd0t2kfJX04G+sfw6u2j8oOm2BXYM9E1f4acHruqKnM1g==}
+  '@videojs/http-streaming@3.17.5':
+    resolution: {integrity: sha512-PRRQVu0hYW5h0XvRWpIyIpEatpMZzZtf7L1avV89Hnu+69f+0c7oLsSL9jwpg2nbvzGkdX5rQxQkz5Vc7tFR9w==}
     engines: {node: '>=8', npm: '>=5'}
     peerDependencies:
       video.js: ^8.19.0
@@ -4812,8 +5036,8 @@ packages:
     resolution: {integrity: sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==}
     engines: {node: '>=8', npm: '>=5'}
 
-  '@videojs/vhs-utils@4.1.1':
-    resolution: {integrity: sha512-5iLX6sR2ownbv4Mtejw6Ax+naosGvoT9kY+gcuHzANyUZZ+4NpeNdKMUhb6ag0acYej1Y7cmr/F2+4PrggMiVA==}
+  '@videojs/vhs-utils@4.1.2':
+    resolution: {integrity: sha512-1Dsv5dtWOq0LP1G37O46FQFA2tKAZON5UMe6dFPxT7JvPhEx8QIXcFQxan8+hHI3fX6aomFRFrUBJNgRYQDSXA==}
     engines: {node: '>=8', npm: '>=5'}
 
   '@videojs/xhr@2.6.0':
@@ -4873,10 +5097,9 @@ packages:
   '@webassemblyjs/wast-printer@1.14.1':
     resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
 
-  '@xmldom/xmldom@0.8.11':
-    resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
+  '@xmldom/xmldom@0.8.13':
+    resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==}
     engines: {node: '>=10.0.0'}
-    deprecated: this version has critical issues, please update to the latest version
 
   '@xtuc/ieee754@1.2.0':
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@@ -4930,9 +5153,6 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  add-stream@1.0.0:
-    resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
-
   address@1.2.2:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
@@ -4967,14 +5187,10 @@ packages:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
 
-  aggregate-error@5.0.0:
-    resolution: {integrity: sha512-gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw==}
-    engines: {node: '>=18'}
-
   ajv-formats@2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependencies:
-      ajv: ^8.0.0
+      ajv: 8.18.0
     peerDependenciesMeta:
       ajv:
         optional: true
@@ -4982,7 +5198,7 @@ packages:
   ajv-formats@3.0.1:
     resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
     peerDependencies:
-      ajv: ^8.0.0
+      ajv: 8.18.0
     peerDependenciesMeta:
       ajv:
         optional: true
@@ -4995,14 +5211,11 @@ packages:
   ajv-keywords@5.1.0:
     resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
     peerDependencies:
-      ajv: ^8.8.2
+      ajv: 8.18.0
 
   ajv@6.14.0:
     resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
-
   ajv@8.18.0:
     resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
 
@@ -5052,10 +5265,6 @@ packages:
     resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
     engines: {node: '>=12'}
 
-  ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-
   ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
@@ -5097,9 +5306,6 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  argv-formatter@1.0.0:
-    resolution: {integrity: sha512-F2+Hkm9xFaRg+GkaNnbwXNDV5O6pnCFEmqyhvfC/Ic5LbgOWjJh3L+mN/s91rxVL3znE7DYVpW0GJFT+4YBgWw==}
-
   aria-query@5.3.2:
     resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
     engines: {node: '>= 0.4'}
@@ -5111,9 +5317,6 @@ packages:
   array-flatten@1.1.1:
     resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
-  array-ify@1.0.0:
-    resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
-
   array-includes@3.1.9:
     resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
     engines: {node: '>= 0.4'}
@@ -5137,8 +5340,8 @@ packages:
     resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
     engines: {node: '>= 0.4'}
 
-  artplayer@5.3.0:
-    resolution: {integrity: sha512-yExO39MpEg4P+bxgChxx1eJfiUPE4q1QQRLCmqGhlsj+ANuaoEkR8hF93LdI5ZyrAcIbJkuEndxEiUoKobifDw==}
+  artplayer@5.4.0:
+    resolution: {integrity: sha512-2B+plbx8N2yNsjK4nJU3+EOG8TULm1LRZk/QPkWRAMEX2Ee/MSnZG/WJYz8kcoZxZuLKcQ3uXifqLuPxZOH29A==}
 
   assert-plus@1.0.0:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
@@ -5189,8 +5392,8 @@ packages:
   axios@1.15.0:
     resolution: {integrity: sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==}
 
-  axios@1.16.0:
-    resolution: {integrity: sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==}
+  axios@1.18.1:
+    resolution: {integrity: sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==}
 
   axobject-query@4.1.0:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
@@ -5202,6 +5405,12 @@ packages:
     peerDependencies:
       '@babel/core': ^7.11.0 || ^8.0.0-0
 
+  babel-jest@30.4.1:
+    resolution: {integrity: sha512-fATAbM8piYxkiXQp3RBXmZHxZVNJZAVXXfyeyCN2Tida3+qJ8ea9UxhiJ2y4fLO90ZImKt6k9FlcH2+rLkJGhw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+    peerDependencies:
+      '@babel/core': ^7.11.0 || ^8.0.0-0
+
   babel-loader@9.2.1:
     resolution: {integrity: sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==}
     engines: {node: '>= 14.15.0'}
@@ -5222,6 +5431,10 @@ packages:
     resolution: {integrity: sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  babel-plugin-jest-hoist@30.4.0:
+    resolution: {integrity: sha512-9EdtWM/sSfXLOGLwSn+GS6pIXyBnL07/8gyJlwFXjWy4DxMOyItqyUT29d4lQiS380EZwYlX7/At4PgBS+m2aA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   babel-plugin-macros@3.1.0:
     resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
@@ -5261,6 +5474,12 @@ packages:
     peerDependencies:
       '@babel/core': ^7.11.0 || ^8.0.0-beta.1
 
+  babel-preset-jest@30.4.0:
+    resolution: {integrity: sha512-lBY4jxsNmCnSiu7kquw8ZC9F4+XLMOKypT3RnNHPvU2Kpd4W0xaPuLr5ZkRyOsvLYAY4yaW1ZwTW4xB7NIiZzg==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+    peerDependencies:
+      '@babel/core': ^7.11.0 || ^8.0.0-beta.1
+
   bail@2.0.2:
     resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
 
@@ -5297,9 +5516,6 @@ packages:
     resolution: {integrity: sha512-2Imdcw3LznDuxAbJM26RHniOLAzE6WgrK8OuvVXCQtNBS8rsnD9zsSEa3fHl4hHpUY7BYTlrpvtPVbvu9G6neg==}
     engines: {node: '>=18.0.0'}
 
-  before-after-hook@4.0.0:
-    resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==}
-
   better-sqlite3@12.9.0:
     resolution: {integrity: sha512-wqUv4Gm3toFpHDQmaKD4QhZm3g1DjUBI0yzS4UBl6lElUmXFYdTQmmEDpAFa5o8FiFiymURypEnfVHzILKaxqQ==}
     engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
@@ -5331,9 +5547,6 @@ packages:
   boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
-  bottleneck@2.19.5:
-    resolution: {integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==}
-
   boxen@8.0.1:
     resolution: {integrity: sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==}
     engines: {node: '>=18'}
@@ -5462,10 +5675,6 @@ packages:
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
-  chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-
   chalk@3.0.0:
     resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
     engines: {node: '>=8'}
@@ -5542,10 +5751,6 @@ packages:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
 
-  clean-stack@5.3.0:
-    resolution: {integrity: sha512-9ngPTOhYGQqNVSfeJkYXHmF7AGWp4/nN5D/QqNQs3Dvxd1Kk/WpjHfNujKHYUQ/5CoGyOyFNoWSPk5afzP0QVg==}
-    engines: {node: '>=14.16'}
-
   cli-boxes@3.0.0:
     resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==}
     engines: {node: '>=10'}
@@ -5558,11 +5763,6 @@ packages:
     resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
     engines: {node: '>=18'}
 
-  cli-highlight@2.1.11:
-    resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
-    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
-    hasBin: true
-
   cli-spinners@2.6.1:
     resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==}
     engines: {node: '>=6'}
@@ -5575,10 +5775,6 @@ packages:
     resolution: {integrity: sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw==}
     engines: {node: '>=18.20'}
 
-  cli-table3@0.6.5:
-    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
-    engines: {node: 10.* || >= 12.*}
-
   cli-truncate@2.1.0:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
     engines: {node: '>=8'}
@@ -5594,9 +5790,6 @@ packages:
   cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
 
-  cliui@7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
-
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -5630,16 +5823,10 @@ packages:
   collect-v8-coverage@1.0.3:
     resolution: {integrity: sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==}
 
-  color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-
   color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
 
-  color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-
   color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
@@ -5685,9 +5872,6 @@ packages:
   common-path-prefix@3.0.0:
     resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==}
 
-  compare-func@2.0.0:
-    resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
-
   compare-version@0.1.2:
     resolution: {integrity: sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==}
     engines: {node: '>=0.10.0'}
@@ -5703,9 +5887,6 @@ packages:
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  config-chain@1.1.13:
-    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
-
   config-file-ts@0.2.8-rc1:
     resolution: {integrity: sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==}
 
@@ -5728,78 +5909,6 @@ packages:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
 
-  conventional-changelog-angular@8.1.0:
-    resolution: {integrity: sha512-GGf2Nipn1RUCAktxuVauVr1e3r8QrLP/B0lEUsFktmGqc3ddbQkhoJZHJctVU829U1c6mTSWftrVOCHaL85Q3w==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-atom@5.0.0:
-    resolution: {integrity: sha512-WfzCaAvSCFPkznnLgLnfacRAzjgqjLUjvf3MftfsJzQdDICqkOOpcMtdJF3wTerxSpv2IAAjX8doM3Vozqle3g==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-cli@5.0.0:
-    resolution: {integrity: sha512-9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ==}
-    engines: {node: '>=18'}
-    deprecated: This package is no longer maintained. Please use the conventional-changelog package instead.
-    hasBin: true
-
-  conventional-changelog-codemirror@5.0.0:
-    resolution: {integrity: sha512-8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-conventionalcommits@8.0.0:
-    resolution: {integrity: sha512-eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-core@8.0.0:
-    resolution: {integrity: sha512-EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-ember@5.0.0:
-    resolution: {integrity: sha512-RPflVfm5s4cSO33GH/Ey26oxhiC67akcxSKL8CLRT3kQX2W3dbE19sSOM56iFqUJYEwv9mD9r6k79weWe1urfg==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-eslint@6.0.0:
-    resolution: {integrity: sha512-eiUyULWjzq+ybPjXwU6NNRflApDWlPEQEHvI8UAItYW/h22RKkMnOAtfCZxMmrcMO1OKUWtcf2MxKYMWe9zJuw==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-express@5.0.0:
-    resolution: {integrity: sha512-D8Q6WctPkQpvr2HNCCmwU5GkX22BVHM0r4EW8vN0230TSyS/d6VQJDAxGb84lbg0dFjpO22MwmsikKL++Oo/oQ==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-jquery@6.0.0:
-    resolution: {integrity: sha512-2kxmVakyehgyrho2ZHBi90v4AHswkGzHuTaoH40bmeNqUt20yEkDOSpw8HlPBfvEQBwGtbE+5HpRwzj6ac2UfA==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-jshint@5.0.0:
-    resolution: {integrity: sha512-gGNphSb/opc76n2eWaO6ma4/Wqu3tpa2w7i9WYqI6Cs2fncDSI2/ihOfMvXveeTTeld0oFvwMVNV+IYQIk3F3g==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-preset-loader@5.0.0:
-    resolution: {integrity: sha512-SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA==}
-    engines: {node: '>=18'}
-
-  conventional-changelog-writer@8.2.0:
-    resolution: {integrity: sha512-Y2aW4596l9AEvFJRwFGJGiQjt2sBYTjPD18DdvxX9Vpz0Z7HQ+g1Z+6iYDAm1vR3QOJrDBkRHixHK/+FhkR6Pw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  conventional-changelog@6.0.0:
-    resolution: {integrity: sha512-tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w==}
-    engines: {node: '>=18'}
-
-  conventional-commits-filter@5.0.0:
-    resolution: {integrity: sha512-tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q==}
-    engines: {node: '>=18'}
-
-  conventional-commits-parser@6.2.1:
-    resolution: {integrity: sha512-20pyHgnO40rvfI0NGF/xiEoFMkXDtkF8FwHvk5BokoFoCuTQRI8vrNCNFWUOfuolKJMm1tPCHc8GgYEtr1XRNA==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  convert-hrtime@5.0.0:
-    resolution: {integrity: sha512-lOETlkIeYSJWcbbcvjRKGxVMXJR+8+OQb/mTPbA4ObPMytYIsUbuOE0Jzy60hjARYszq1id0j8KgVhC+WGZVTg==}
-    engines: {node: '>=12'}
-
   convert-source-map@1.9.0:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
 
@@ -5902,10 +6011,6 @@ packages:
   crossws@0.3.5:
     resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==}
 
-  crypto-random-string@4.0.0:
-    resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
-    engines: {node: '>=12'}
-
   css-declaration-sorter@7.3.1:
     resolution: {integrity: sha512-gz6x+KkgNCjxq3Var03pRYLhyNfwhkKF1g/yoLgDNtFvVu0/fOLV9C8fFEZRjACp/XQLumjAYo7JVjzH3wLbxA==}
     engines: {node: ^14 || ^16 || >=18}
@@ -6018,8 +6123,8 @@ packages:
     resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
     engines: {node: '>= 0.4'}
 
-  date-fns@4.1.0:
-    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+  date-fns@4.4.0:
+    resolution: {integrity: sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==}
 
   date-format@4.0.14:
     resolution: {integrity: sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==}
@@ -6198,10 +6303,6 @@ packages:
   dir-compare@4.2.0:
     resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
 
-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-
   dlv@1.1.3:
     resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
 
@@ -6238,10 +6339,6 @@ packages:
   domutils@3.2.2:
     resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
 
-  dot-prop@5.3.0:
-    resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
-    engines: {node: '>=8'}
-
   dotenv-expand@11.0.7:
     resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==}
     engines: {node: '>=12'}
@@ -6258,8 +6355,8 @@ packages:
     resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
     engines: {node: '>=12'}
 
-  drizzle-kit@0.31.5:
-    resolution: {integrity: sha512-+CHgPFzuoTQTt7cOYCV6MOw2w8vqEn/ap1yv4bpZOWL03u7rlVRQhUY0WYT3rHsgVTXwYQDZaSUJSQrMBUKuWg==}
+  drizzle-kit@0.31.10:
+    resolution: {integrity: sha512-7OZcmQUrdGI+DUNNsKBn1aW8qSoKuTH7d0mYgSP8bAzdFzKoovxEFnoGQp2dVs82EOJeYycqRtciopszwUf8bw==}
     hasBin: true
 
   drizzle-orm@0.45.2:
@@ -6362,9 +6459,6 @@ packages:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
 
-  duplexer2@0.1.4:
-    resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
-
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -6394,10 +6488,6 @@ packages:
     peerDependencies:
       electron: '>=15.0.0'
 
-  electron-dl@4.0.0:
-    resolution: {integrity: sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong==}
-    engines: {node: '>=18'}
-
   electron-playwright-helpers@1.8.2:
     resolution: {integrity: sha512-sM9fDSEFDOptKDa8oiNphiXdR1KR1uFe8yHnlrnvyQE1ScnHizca/SoYvUdtn+5IuVNTkT8MesKWJ6seS4/zuA==}
 
@@ -6435,9 +6525,6 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
-  emojilib@2.4.0:
-    resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==}
-
   emojis-list@3.0.0:
     resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
     engines: {node: '>= 4'}
@@ -6468,10 +6555,6 @@ packages:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
 
-  env-ci@11.2.0:
-    resolution: {integrity: sha512-D5kWfzkmaOQDioPmiviWAVtKmpPT4/iJmMVQxWxMPJTFyTkdc5JQUfc5iXEeWxcOdsYTKSAiA/Age4NUOqKsRA==}
-    engines: {node: ^18.17 || >=20.6.1}
-
   env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
@@ -6577,10 +6660,6 @@ packages:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
 
-  escape-goat@4.0.0:
-    resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==}
-    engines: {node: '>=12'}
-
   escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
@@ -6670,6 +6749,10 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@9.39.2:
     resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6763,14 +6846,6 @@ packages:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
 
-  execa@8.0.1:
-    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
-    engines: {node: '>=16.17'}
-
-  execa@9.6.1:
-    resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
-    engines: {node: ^18.19.0 || >=20.5.0}
-
   exit-x@0.2.2:
     resolution: {integrity: sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==}
     engines: {node: '>= 0.8.0'}
@@ -6787,6 +6862,10 @@ packages:
     resolution: {integrity: sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  expect@30.4.1:
+    resolution: {integrity: sha512-PMARsyh/JtqC20HoGqlFcIlQAyqUtW4PlI1rup1uhYJtKuwAjbvWi3GQMAn+STdHum/dk8xrKfUM1+5SAwpolA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   exponential-backoff@3.1.3:
     resolution: {integrity: sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==}
 
@@ -6804,14 +6883,6 @@ packages:
     resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
     engines: {node: '>= 18'}
 
-  ext-list@2.2.2:
-    resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==}
-    engines: {node: '>=0.10.0'}
-
-  ext-name@5.0.0:
-    resolution: {integrity: sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==}
-    engines: {node: '>=4'}
-
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
@@ -6819,9 +6890,6 @@ packages:
     resolution: {integrity: sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==}
     engines: {'0': node >=0.6.0}
 
-  fast-content-type-parse@3.0.0:
-    resolution: {integrity: sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==}
-
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -6835,8 +6903,8 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-uri@3.1.0:
-    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+  fast-uri@3.1.4:
+    resolution: {integrity: sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==}
 
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
@@ -6857,18 +6925,10 @@ packages:
       picomatch:
         optional: true
 
-  figures@2.0.0:
-    resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==}
-    engines: {node: '>=4'}
-
   figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
 
-  figures@6.1.0:
-    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
-    engines: {node: '>=18'}
-
   file-entry-cache@8.0.0:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
     engines: {node: '>=16.0.0'}
@@ -6903,14 +6963,6 @@ packages:
     resolution: {integrity: sha512-WgZ+nKbELDa6N3i/9nrHeNznm+lY3z4YfhDDWgW+5P0pdmMj26bxaxU11ookgY3NyP9GC7HvZ9etp0jRFqGEeQ==}
     engines: {node: '>=8'}
 
-  find-up-simple@1.0.1:
-    resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==}
-    engines: {node: '>=18'}
-
-  find-up@2.1.0:
-    resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
-    engines: {node: '>=4'}
-
   find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
     engines: {node: '>=8'}
@@ -6923,10 +6975,6 @@ packages:
     resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  find-versions@6.0.0:
-    resolution: {integrity: sha512-2kCCtc+JvcZ86IGAz3Z2Y0A1baIz9fL31pH/0S1IqZr9Iwnjq8izfPtrCyQKO6TLMPELLsQMre7VDqeIKCsHkA==}
-    engines: {node: '>=18'}
-
   fix-path@5.0.0:
     resolution: {integrity: sha512-erEWGGCN7RIu1bXTCfNVpVBdm0f5mwcbeja+4QXiEZzIQukP401sbpu8gd3Ny1vS34YNeswyMO0TdT2tP5OlHA==}
     engines: {node: '>=20'}
@@ -6977,8 +7025,8 @@ packages:
       typescript: '>3.6.0'
       webpack: ^5.11.0
 
-  form-data@4.0.5:
-    resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
+  form-data@4.0.6:
+    resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==}
     engines: {node: '>= 6'}
 
   forwarded@0.2.0:
@@ -6996,9 +7044,6 @@ packages:
     resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
     engines: {node: '>= 0.8'}
 
-  from2@2.3.0:
-    resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==}
-
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
@@ -7006,10 +7051,6 @@ packages:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
 
-  fs-extra@11.3.3:
-    resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==}
-    engines: {node: '>=14.14'}
-
   fs-extra@11.3.5:
     resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==}
     engines: {node: '>=14.14'}
@@ -7053,10 +7094,6 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  function-timeout@1.0.2:
-    resolution: {integrity: sha512-939eZS4gJ3htTHAldmyyuzlrD58P03fHG49v2JfFXbV6OhvZKRC9j2yAtdHw/zrp2zXHuv05zMIy40F0ge7spA==}
-    engines: {node: '>=18'}
-
   function.prototype.name@1.1.8:
     resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==}
     engines: {node: '>= 0.4'}
@@ -7104,18 +7141,6 @@ packages:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  get-stream@7.0.1:
-    resolution: {integrity: sha512-3M8C1EOFN6r8AMUhwUAACIoXZJEOufDU5+0gFFN5uNs6XYOralD2Pqkl7m046va6x77FwposWXbAhPPIOus7mQ==}
-    engines: {node: '>=16'}
-
-  get-stream@8.0.1:
-    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
-    engines: {node: '>=16'}
-
-  get-stream@9.0.1:
-    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
-    engines: {node: '>=18'}
-
   get-symbol-description@1.1.0:
     resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
     engines: {node: '>= 0.4'}
@@ -7123,21 +7148,6 @@ packages:
   get-tsconfig@4.13.0:
     resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==}
 
-  git-log-parser@1.2.1:
-    resolution: {integrity: sha512-PI+sPDvHXNPl5WNOErAK05s3j0lgwUzMN6o8cyQrDaKfT3qd7TmNJKeXX+SknI5I0QhG5fVPAEwSY4tRGDtYoQ==}
-
-  git-raw-commits@5.0.0:
-    resolution: {integrity: sha512-I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg==}
-    engines: {node: '>=18'}
-    deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.
-    hasBin: true
-
-  git-semver-tags@8.0.0:
-    resolution: {integrity: sha512-N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg==}
-    engines: {node: '>=18'}
-    deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.
-    hasBin: true
-
   github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
 
@@ -7218,9 +7228,6 @@ packages:
     resolution: {integrity: sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==}
     engines: {node: '>=10.19.0'}
 
-  graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -7230,8 +7237,8 @@ packages:
   handle-thing@2.0.1:
     resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==}
 
-  handlebars@4.7.8:
-    resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}
+  handlebars@4.7.9:
+    resolution: {integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==}
     engines: {node: '>=0.4.7'}
     hasBin: true
 
@@ -7242,10 +7249,6 @@ packages:
     resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
     engines: {node: '>= 0.4'}
 
-  has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-
   has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
@@ -7273,6 +7276,10 @@ packages:
     resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}
     engines: {node: '>= 0.4'}
 
+  hasown@2.0.4:
+    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
+    engines: {node: '>= 0.4'}
+
   hast-util-from-html@2.0.3:
     resolution: {integrity: sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==}
 
@@ -7313,11 +7320,8 @@ packages:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
 
-  highlight.js@10.7.3:
-    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
-
-  hls.js@1.6.13:
-    resolution: {integrity: sha512-hNEzjZNHf5bFrUNvdS4/1RjIanuJ6szpWNfTaX5I6WfGynWXGT7K/YQLYtemSvFExzeMdgdE4SsyVLJbd5PcZA==}
+  hls.js@1.6.16:
+    resolution: {integrity: sha512-VSIRpLfRwlAAdGL4wiTucx2ScRipo0ed1FBatWkyt832jC4CReKstga6yIhYVwGu9LOBjuX9wzmRMeQdBJtzEA==}
 
   homedir-polyfill@1.0.3:
     resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
@@ -7327,22 +7331,10 @@ packages:
     resolution: {integrity: sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==}
     engines: {node: '>=16.9.0'}
 
-  hook-std@4.0.0:
-    resolution: {integrity: sha512-IHI4bEVOt3vRUDJ+bFA9VUJlo7SzvFARPNLw75pqSmAOP2HmTWfFJtPvLBrDrlgjEYXY9zs7SFdHPQaJShkSCQ==}
-    engines: {node: '>=20'}
-
   hosted-git-info@4.1.0:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
 
-  hosted-git-info@7.0.2:
-    resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-
-  hosted-git-info@8.1.0:
-    resolution: {integrity: sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   hosted-git-info@9.0.2:
     resolution: {integrity: sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==}
     engines: {node: ^20.17.0 || >=22.9.0}
@@ -7444,14 +7436,6 @@ packages:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
 
-  human-signals@5.0.0:
-    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
-    engines: {node: '>=16.17.0'}
-
-  human-signals@8.0.1:
-    resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==}
-    engines: {node: '>=18.18.0'}
-
   humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
 
@@ -7513,10 +7497,6 @@ packages:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
-  import-from-esm@2.0.0:
-    resolution: {integrity: sha512-YVt14UZCgsX1vZQ3gKjkWVdBdHQ6eu3MPU1TBgL1H5orXe2+jWD006WCPPtOuwlQm10NuzOW5WawiF1Q9veW8g==}
-    engines: {node: '>=18.20'}
-
   import-local@3.2.0:
     resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
     engines: {node: '>=8'}
@@ -7533,14 +7513,6 @@ packages:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
-  indent-string@5.0.0:
-    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
-    engines: {node: '>=12'}
-
-  index-to-position@1.2.0:
-    resolution: {integrity: sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==}
-    engines: {node: '>=18'}
-
   individual@2.0.0:
     resolution: {integrity: sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==}
 
@@ -7571,10 +7543,6 @@ packages:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
-  into-stream@7.0.0:
-    resolution: {integrity: sha512-2dYz766i9HprMBasCMvHMuazJ7u4WzhJwo5kb3iPSiW/iRYV6uPari3zHoqZlnuaR7V1bEiNMxikhp37rdBXbw==}
-    engines: {node: '>=12'}
-
   ip-address@10.1.0:
     resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==}
     engines: {node: '>= 12'}
@@ -7591,9 +7559,10 @@ packages:
     resolution: {integrity: sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==}
     engines: {node: '>= 10'}
 
-  iptv-playlist-parser@https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/38a62d0b7c98f442bfa102ee8e1fe14169ae9386:
-    resolution: {tarball: https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/38a62d0b7c98f442bfa102ee8e1fe14169ae9386}
-    version: 0.12.2
+  iptv-playlist-parser@https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/d547b6be8a44431c85fbcbcdefb41f28c0dadf6d:
+    resolution: {tarball: https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/d547b6be8a44431c85fbcbcdefb41f28c0dadf6d}
+    version: 0.15.2-iptvnator.2
+    engines: {node: '>=18'}
 
   iron-webcrypto@1.2.1:
     resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==}
@@ -7660,10 +7629,6 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
 
-  is-extglob@1.0.0:
-    resolution: {integrity: sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==}
-    engines: {node: '>=0.10.0'}
-
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -7691,10 +7656,6 @@ packages:
     resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
     engines: {node: '>= 0.4'}
 
-  is-glob@2.0.1:
-    resolution: {integrity: sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==}
-    engines: {node: '>=0.10.0'}
-
   is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -7715,10 +7676,6 @@ packages:
     resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
     engines: {node: '>=12'}
 
-  is-invalid-path@0.1.0:
-    resolution: {integrity: sha512-aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ==}
-    engines: {node: '>=0.10.0'}
-
   is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
 
@@ -7742,14 +7699,6 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  is-obj@2.0.0:
-    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
-    engines: {node: '>=8'}
-
-  is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-
   is-plain-obj@3.0.0:
     resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
     engines: {node: '>=10'}
@@ -7788,14 +7737,6 @@ packages:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
 
-  is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  is-stream@4.0.1:
-    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
-    engines: {node: '>=18'}
-
   is-string@1.1.1:
     resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
     engines: {node: '>= 0.4'}
@@ -7816,10 +7757,6 @@ packages:
     resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
     engines: {node: '>=18'}
 
-  is-valid-path@0.1.1:
-    resolution: {integrity: sha512-+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A==}
-    engines: {node: '>=0.10.0'}
-
   is-weakmap@2.0.2:
     resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
     engines: {node: '>= 0.4'}
@@ -7877,10 +7814,6 @@ packages:
     peerDependencies:
       ws: '*'
 
-  issue-parser@7.0.1:
-    resolution: {integrity: sha512-3YZcUUR2Wt1WsapF+S/WiA2WmlW0cWAoPccMqne7AxEBhCdFeTPjfv/Axb8V2gyCgY3nRw+ksZ3xSUX+R47iAg==}
-    engines: {node: ^18.17 || >=20.6.1}
-
   istanbul-lib-coverage@3.2.2:
     resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
     engines: {node: '>=8'}
@@ -7909,20 +7842,20 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  java-properties@1.0.2:
-    resolution: {integrity: sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==}
-    engines: {node: '>= 0.6.0'}
-
-  jest-changed-files@30.2.0:
-    resolution: {integrity: sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==}
+  jest-changed-files@30.4.1:
+    resolution: {integrity: sha512-IuctmYrxi21iOSOaIXpJWalHyPAsVv0GeBHKDn8C1CA4W5htHn7INL+wdnL4Bo0+olEndvAFkmb++tIQJG+vvg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
   jest-circus@30.2.0:
     resolution: {integrity: sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  jest-cli@30.2.0:
-    resolution: {integrity: sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==}
+  jest-circus@30.4.2:
+    resolution: {integrity: sha512-rvHH7VlY6LgbJXJTQ87GW62g1FntOtbhh0zT+v04kC+pgL6aBKyYINXxWukCpj3dcIBMw5/XUbtDS9dU9JTXeQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
+  jest-cli@30.4.2:
+    resolution: {integrity: sha512-jfA2ocvVHMXS2QijrJ0d31ektP+d/W0T5RpcTX2Pq+3sVqHlsXVCM2+FmwpL+bdY8OfHpIg9xMxLF17Zg0U49Q==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
@@ -7946,20 +7879,47 @@ packages:
       ts-node:
         optional: true
 
+  jest-config@30.4.2:
+    resolution: {integrity: sha512-rNHAShJQqQwFNoL0hbf3BphSBOWnpOUAKvidLS/AjNVLPfoj5mSf4jQMfW3cYOs6hXeZC7nF7mDHaBnbxELOzg==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      esbuild-register: '>=3.4.0'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      esbuild-register:
+        optional: true
+      ts-node:
+        optional: true
+
   jest-diff@30.2.0:
     resolution: {integrity: sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-diff@30.4.1:
+    resolution: {integrity: sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-docblock@30.2.0:
     resolution: {integrity: sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-docblock@30.4.0:
+    resolution: {integrity: sha512-ZPMabUZCx5MpbZ2eBYSvZ0J8fvo3dR9oM+eeUpb3aKNQFuS2tu3Duw1TNlMoP8k3WQgKGJuhcMFvwcVuq6T7oA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-each@30.2.0:
     resolution: {integrity: sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  jest-environment-jsdom@30.2.0:
-    resolution: {integrity: sha512-zbBTiqr2Vl78pKp/laGBREYzbZx9ZtqPjOK4++lL4BNDhxRnahg51HtoDrk9/VjIy9IthNEWdKVd7H5bqBhiWQ==}
+  jest-each@30.4.1:
+    resolution: {integrity: sha512-/8MJbH6fuj48TstjrMf+u/pd06Qezz5xOXvZA6442heNOWr8bdeoGZX2d9fCn028CoMgYmroH9//zky5GfyYmA==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
+  jest-environment-jsdom@30.4.1:
+    resolution: {integrity: sha512-o3nfaN4zej7qgk2X0j8Jhq/S9nAVKs2xK3QeQxeHVvpkEPxaA1yxDGydR+iVI7zPy7Cp62Aq2h3Ja46QvfWHGA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
     peerDependencies:
       canvas: ^3.0.0
@@ -7971,26 +7931,50 @@ packages:
     resolution: {integrity: sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-environment-node@30.4.1:
+    resolution: {integrity: sha512-4FZYVOk85hz2AyT6BbarKy9u37g6DbrDyCdFhsnDdXqyrueYQvB+0zO4f/kqLCRD0BsPRXPMNJeQwihKZV8naw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-haste-map@30.2.0:
     resolution: {integrity: sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-haste-map@30.4.1:
+    resolution: {integrity: sha512-rFrcONd8jeFsyw+Z9CrScJgglRf2+NFmNam8dKu7n+SoHqNYT47mn0DdEcVUZJpvh7Iz6/si7f7yUH7GJHVgnw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-leak-detector@30.2.0:
     resolution: {integrity: sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-leak-detector@30.4.1:
+    resolution: {integrity: sha512-IpmyiioeHxiWDhesHnUFmOxcTzwCwKpgACgWajtAP+nYQXiY7DakTxB6Bx9JFiRMljr0AX1PvnQdaU1KFoz6NQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-matcher-utils@30.2.0:
     resolution: {integrity: sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-matcher-utils@30.4.1:
+    resolution: {integrity: sha512-zvYfX5CaeEkFrrLS9suWe9rvJrm9J1Iv3ua8kIBv9GEPzcnsfBf0bob37la7s67fs0nlBC3EuvkOLnXQKxtx4A==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-message-util@30.2.0:
     resolution: {integrity: sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-message-util@30.4.1:
+    resolution: {integrity: sha512-kwCKIvq0MCW1HzLoGola9Te6JUdzgV0loyKJ3Qghrkz9i5/RRIHsL95BMQc2HBBhlBKC4j22K9p11TGHH8RBpQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-mock@30.2.0:
     resolution: {integrity: sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-mock@30.4.1:
+    resolution: {integrity: sha512-/i8SVb8/NSB7RfNi8gfqu8gxLV23KaL5EpAttyb9iz8qWRIqXRLflycz/32wXsYkOnaUlx8NAKnJYtpsmXUmfw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-pnp-resolver@1.2.3:
     resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
     engines: {node: '>=6'}
@@ -8016,38 +8000,70 @@ packages:
     resolution: {integrity: sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  jest-resolve-dependencies@30.2.0:
-    resolution: {integrity: sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==}
+  jest-regex-util@30.4.0:
+    resolution: {integrity: sha512-mWlvLviKIgIQ8VCuM1xRdD0TWp3zlzionlmDBjuXVBs+VkmXq6FgW9T4Emr7oGz/Rk6feDCGyiugolcQEyp3mg==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
+  jest-resolve-dependencies@30.4.2:
+    resolution: {integrity: sha512-gDiVh1I+GxYzz9oXlyw+1wv6VOYX1WYxMOfjsA3iGKePV2oxmbHhwxfkALxNxYy1ciw6APWwkW2zZONwP97aEQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
   jest-resolve@30.2.0:
     resolution: {integrity: sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-resolve@30.4.1:
+    resolution: {integrity: sha512-Zry8Yq/yJcNAZ7dJ5F2heic8AheXvbFZ7XI5V+h28nrYZ7Qoyy4dItq8OodjnYD270mvX+ZudmrNV9cysqhW5Q==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-runner@30.2.0:
     resolution: {integrity: sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-runner@30.4.2:
+    resolution: {integrity: sha512-2dw0PslVYXxffXGpLo+Ejad+KcI1Qkjn7f4X4619gf21oCUmL+SPfjqIa/losUem3yEOvfNZe/F1HWUcNpODcg==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-runtime@30.2.0:
     resolution: {integrity: sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-runtime@30.4.2:
+    resolution: {integrity: sha512-3/5e8iPz2k/VLqlr8DgTftYyLUv8Su3FkCAO2/Od81UsUTpSxOrS6O5x5KkoQwyUjmpYyDJKeyAvg2T2nvpNkQ==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-snapshot@30.2.0:
     resolution: {integrity: sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-snapshot@30.4.1:
+    resolution: {integrity: sha512-tEOkkfOMppUyeiHwjZswOQ3lcnoTnws/q5FnGIaeIh/jmoU0ZlgMYRR8sTlTj+nNGCoJ0RDq6SfxGxCsyMTPmw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-util@30.2.0:
     resolution: {integrity: sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-util@30.4.1:
+    resolution: {integrity: sha512-vjQb1sACEiv13DKJMDToJpzVW0joCsIQrmbg0fi7CyOOt+g9jTuQl2A216pWRBYhOVt53XbL/2LbMKg1BECWOw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-validate@30.2.0:
     resolution: {integrity: sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-validate@30.4.1:
+    resolution: {integrity: sha512-PDWi4SOwLnwqNDfHZjOcsEFyZ4fc/2W2gVL3DEoyqnB6jCQMLRtfBong8s6omIw3lI0HWOus12xfnFmQtjW3fw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-watcher@30.2.0:
     resolution: {integrity: sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
+  jest-watcher@30.4.1:
+    resolution: {integrity: sha512-/l9UonmvCwjHH7d2h3iAwIloLc1H0S8mJZ/LNK3i86hqwPAz8otUJjP9MfYtz9Tt77Su5FD2xGjZn8d31IZHlw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
   jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
@@ -8056,8 +8072,12 @@ packages:
     resolution: {integrity: sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  jest@30.2.0:
-    resolution: {integrity: sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==}
+  jest-worker@30.4.1:
+    resolution: {integrity: sha512-SHynN/q/QD++iNyvMdy+WMmbCGk8jIsNcRxycXbWubSOhvo6T+j2afcfUSl+3hYsiBebOTo0cT7c2H7CXugu1g==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
+
+  jest@30.4.2:
+    resolution: {integrity: sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
@@ -8088,8 +8108,8 @@ packages:
     resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
     hasBin: true
 
-  js-yaml@4.1.1:
-    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
+  js-yaml@4.3.0:
+    resolution: {integrity: sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==}
     hasBin: true
 
   jsdom@26.1.0:
@@ -8109,9 +8129,6 @@ packages:
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
-  json-parse-better-errors@1.0.2:
-    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
-
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
@@ -8244,10 +8261,6 @@ packages:
     resolution: {integrity: sha512-NYHA0MRPjvNX+vSw8Xxg6FLKxzAG+e7Pt8RqAQA/EehzHVXq9SxDqJIN3JL1hK0dweb884y8kIh6rkWvPyg9Wg==}
     hasBin: true
 
-  load-json-file@4.0.0:
-    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
-    engines: {node: '>=4'}
-
   loader-runner@4.3.1:
     resolution: {integrity: sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==}
     engines: {node: '>=6.11.5'}
@@ -8256,10 +8269,6 @@ packages:
     resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
     engines: {node: '>=8.9.0'}
 
-  locate-path@2.0.0:
-    resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
-    engines: {node: '>=4'}
-
   locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
@@ -8272,12 +8281,6 @@ packages:
     resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  lodash-es@4.18.1:
-    resolution: {integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==}
-
-  lodash.capitalize@4.2.1:
-    resolution: {integrity: sha512-kZzYOKspf8XVX5AvmQF94gQW0lejFVgb80G85bU4ZWzoJ6C03PQg3coYAUpSTpQWelrZELd3XWgHzw4Ck5kaIw==}
-
   lodash.clonedeepwith@4.5.0:
     resolution: {integrity: sha512-QRBRSxhbtsX1nc0baxSkkK5WlVTTm/s48DSukcGcWZwIyI8Zz+lB+kFiELJXtzfH4Aj6kMWQ1VWW4U5uUDgZMA==}
 
@@ -8291,12 +8294,6 @@ packages:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     deprecated: This package is deprecated. Use require('node:util').isDeepStrictEqual instead.
 
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
-  lodash.isstring@4.0.1:
-    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
-
   lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
 
@@ -8306,9 +8303,6 @@ packages:
   lodash.uniq@4.5.0:
     resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
 
-  lodash.uniqby@4.7.0:
-    resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==}
-
   lodash@4.18.1:
     resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==}
 
@@ -8372,10 +8366,6 @@ packages:
   magicast@0.5.2:
     resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==}
 
-  make-asynchronous@1.0.1:
-    resolution: {integrity: sha512-T9BPOmEOhp6SmV25SwLVcHK4E6JyG/coH3C6F1NjNXSziv/fd4GmsqMk8YR6qpPOswfaOCApSNkZv6fxoaYFcQ==}
-    engines: {node: '>=18'}
-
   make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
@@ -8405,19 +8395,8 @@ packages:
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
 
-  marked-terminal@7.3.0:
-    resolution: {integrity: sha512-t4rBvPsHc57uE/2nJOLmMbZCQ4tgAccAED3ngXQqW6g+TxA488JzJ+FK3lQkzBQOI1mRV/r/Kq+1ZlJ4D0owQw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      marked: '>=1 <16'
-
-  marked@15.0.12:
-    resolution: {integrity: sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==}
-    engines: {node: '>= 18'}
-    hasBin: true
-
-  marked@18.0.5:
-    resolution: {integrity: sha512-S6GcvALHg6K4ohtu4E7x0a1AqhAjp6cV8KhLSyN9qVapnzJkusVBxZRcIU9AeYsbe6P1hKDusSbEOzGyyuce6w==}
+  marked@18.0.7:
+    resolution: {integrity: sha512-iDVQ5ldaiKXn6b2JroX5kgRfmwgqolW7NpaEzTl1k/2Zh1njIEN9yniyLV/mOvWwtsE8OGgkjsCYvijuPk1dtA==}
     engines: {node: '>= 20'}
     hasBin: true
 
@@ -8500,10 +8479,6 @@ packages:
   memfs@4.51.1:
     resolution: {integrity: sha512-Eyt3XrufitN2ZL9c/uIRMyDwXanLI88h/L3MoWqNY747ha3dMR9dWqp8cRT5ntjZ0U1TNuq4U91ZXK0sMBjYOQ==}
 
-  meow@13.2.0:
-    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
-    engines: {node: '>=18'}
-
   merge-descriptors@1.0.3:
     resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
@@ -8657,19 +8632,10 @@ packages:
     engines: {node: '>=4.0.0'}
     hasBin: true
 
-  mime@4.1.0:
-    resolution: {integrity: sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==}
-    engines: {node: '>=16'}
-    hasBin: true
-
   mimic-fn@2.1.0:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
 
-  mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-
   mimic-function@5.0.1:
     resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
     engines: {node: '>=18'}
@@ -8705,6 +8671,9 @@ packages:
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
+  minimatch@3.1.5:
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
+
   minimatch@5.1.9:
     resolution: {integrity: sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==}
     engines: {node: '>=10'}
@@ -8784,8 +8753,8 @@ packages:
     resolution: {integrity: sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==}
     hasBin: true
 
-  mpd-parser@1.3.1:
-    resolution: {integrity: sha512-1FuyEWI5k2HcmhS1HkKnUAQV7yFPfXPht2DnRRGtoiiAAW+ESTbtEXIDpRkwdU+XyrQuwrIym7UkoPKsZ0SyFw==}
+  mpd-parser@1.4.0:
+    resolution: {integrity: sha512-blbA7XpAaOdC/PR0Tu8GiUxlx6CpBuRowQPYV7lhi9Yr9G9+dkPXIUjqjzc/NCn/uZZPopluaJlIYntIEI/VLw==}
     hasBin: true
 
   mpegts.js@1.8.0:
@@ -8869,16 +8838,13 @@ packages:
     resolution: {integrity: sha512-Z4SmBUweYa09+o6pG+eASabEpP6QkQ70yHj351pQoEXIs8uHbaU2DWVmzBANKgflPa47A50PtB2+NgRpQvr7vA==}
     engines: {node: '>= 10'}
 
-  nerf-dart@1.0.0:
-    resolution: {integrity: sha512-EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g==}
-
-  ng-mocks@14.15.1:
-    resolution: {integrity: sha512-qytFlHgR8YkyH2Hsc6ssGHf817pku6UvV1vpKelh9K07+2IYxfgZJrAyTAGmwH0+9i9hjtdoTrZSP5A4KdQu4Q==}
+  ng-mocks@14.15.3:
+    resolution: {integrity: sha512-J0UafeI2K5kc5oDhIinGu+VqT990b0sP2dlKV3JxXYTlaQxQ7Mm0LLrxGz10hsGGJVtn9JEKkhjnpb6oijLT3w==}
     peerDependencies:
-      '@angular/common': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20
-      '@angular/core': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20
-      '@angular/forms': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20
-      '@angular/platform-browser': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20
+      '@angular/common': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20 || 21.0.0-alpha - 21 || 22.0.0-alpha - 22
+      '@angular/core': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20 || 21.0.0-alpha - 21 || 22.0.0-alpha - 22
+      '@angular/forms': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20 || 21.0.0-alpha - 21 || 22.0.0-alpha - 22
+      '@angular/platform-browser': 5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19 || 20.0.0-alpha - 20 || 21.0.0-alpha - 21 || 22.0.0-alpha - 22
 
   ngx-indexed-db@21.0.0:
     resolution: {integrity: sha512-781n0P4ZWt0CegInpvQ7WB2Z9Z9A4Pi3GKOUuAfsKFof4ZSv85g05+IXkSx+h3jBIibCuNWcQd77VLj84xLBQA==}
@@ -8914,10 +8880,6 @@ packages:
   node-api-version@0.2.1:
     resolution: {integrity: sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==}
 
-  node-emoji@2.2.0:
-    resolution: {integrity: sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==}
-    engines: {node: '>=18'}
-
   node-fetch-native@1.6.7:
     resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==}
 
@@ -8969,10 +8931,6 @@ packages:
     engines: {node: ^20.17.0 || >=22.9.0}
     hasBin: true
 
-  normalize-package-data@6.0.2:
-    resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -8981,10 +8939,6 @@ packages:
     resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
     engines: {node: '>=10'}
 
-  normalize-url@8.1.1:
-    resolution: {integrity: sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==}
-    engines: {node: '>=14.16'}
-
   npm-bundled@5.0.0:
     resolution: {integrity: sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw==}
     engines: {node: ^20.17.0 || >=22.9.0}
@@ -9017,88 +8971,6 @@ packages:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
 
-  npm-run-path@5.3.0:
-    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  npm-run-path@6.0.0:
-    resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
-    engines: {node: '>=18'}
-
-  npm@10.9.4:
-    resolution: {integrity: sha512-OnUG836FwboQIbqtefDNlyR0gTHzIfwRfE3DuiNewBvnMnWEpB0VEXwBlFVgqpNzIgYo/MHh3d2Hel/pszapAA==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-    hasBin: true
-    bundledDependencies:
-      - '@isaacs/string-locale-compare'
-      - '@npmcli/arborist'
-      - '@npmcli/config'
-      - '@npmcli/fs'
-      - '@npmcli/map-workspaces'
-      - '@npmcli/package-json'
-      - '@npmcli/promise-spawn'
-      - '@npmcli/redact'
-      - '@npmcli/run-script'
-      - '@sigstore/tuf'
-      - abbrev
-      - archy
-      - cacache
-      - chalk
-      - ci-info
-      - cli-columns
-      - fastest-levenshtein
-      - fs-minipass
-      - glob
-      - graceful-fs
-      - hosted-git-info
-      - ini
-      - init-package-json
-      - is-cidr
-      - json-parse-even-better-errors
-      - libnpmaccess
-      - libnpmdiff
-      - libnpmexec
-      - libnpmfund
-      - libnpmhook
-      - libnpmorg
-      - libnpmpack
-      - libnpmpublish
-      - libnpmsearch
-      - libnpmteam
-      - libnpmversion
-      - make-fetch-happen
-      - minimatch
-      - minipass
-      - minipass-pipeline
-      - ms
-      - node-gyp
-      - nopt
-      - normalize-package-data
-      - npm-audit-report
-      - npm-install-checks
-      - npm-package-arg
-      - npm-pick-manifest
-      - npm-profile
-      - npm-registry-fetch
-      - npm-user-validate
-      - p-map
-      - pacote
-      - parse-conflict-json
-      - proc-log
-      - qrcode-terminal
-      - read
-      - semver
-      - spdx-expression-parse
-      - ssri
-      - supports-color
-      - tar
-      - text-table
-      - tiny-relative-date
-      - treeverse
-      - validate-npm-package-name
-      - which
-      - write-file-atomic
-
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
@@ -9180,10 +9052,6 @@ packages:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
     engines: {node: '>=6'}
 
-  onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
-
   onetime@7.0.0:
     resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
     engines: {node: '>=18'}
@@ -9239,26 +9107,6 @@ packages:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
 
-  p-each-series@3.0.0:
-    resolution: {integrity: sha512-lastgtAdoH9YaLyDa5i5z64q+kzOcQHsQ5SsZJD3q0VEyI8mq872S3geuNbRUQLVAE9siMfgKrpj7MloKFHruw==}
-    engines: {node: '>=12'}
-
-  p-event@6.0.1:
-    resolution: {integrity: sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==}
-    engines: {node: '>=16.17'}
-
-  p-filter@4.1.0:
-    resolution: {integrity: sha512-37/tPdZ3oJwHaS3gNJdenCDB3Tz26i9sjhnguBtvN0vYlRIiDNnvTWkuh+0hETV9rLPdJ3rlL3yVOYPIAnM8rw==}
-    engines: {node: '>=18'}
-
-  p-is-promise@3.0.0:
-    resolution: {integrity: sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==}
-    engines: {node: '>=8'}
-
-  p-limit@1.3.0:
-    resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
-    engines: {node: '>=4'}
-
   p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
@@ -9275,10 +9123,6 @@ packages:
     resolution: {integrity: sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==}
     engines: {node: '>=18'}
 
-  p-locate@2.0.0:
-    resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
-    engines: {node: '>=4'}
-
   p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
@@ -9303,14 +9147,6 @@ packages:
     resolution: {integrity: sha512-aNZ+VfjobsWryoiPnEApGGmf5WmNsCo9xu8dfaYamG5qaLP7ClhLN6NgsFe6SwJ2UbLEBK5dv9x8Mn5+RVhMWQ==}
     engines: {node: '>=18'}
 
-  p-reduce@2.1.0:
-    resolution: {integrity: sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==}
-    engines: {node: '>=8'}
-
-  p-reduce@3.0.0:
-    resolution: {integrity: sha512-xsrIUgI0Kn6iyDYm9StOpOeK29XM1aboGji26+QEortiFST1hGZaUQOLhtEbqHErPpGW/aSz6allwK2qcptp0Q==}
-    engines: {node: '>=12'}
-
   p-retry@6.2.1:
     resolution: {integrity: sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==}
     engines: {node: '>=16.17'}
@@ -9319,10 +9155,6 @@ packages:
     resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==}
     engines: {node: '>=14.16'}
 
-  p-try@1.0.0:
-    resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
-    engines: {node: '>=4'}
-
   p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
@@ -9345,25 +9177,13 @@ packages:
   parse-entities@4.0.2:
     resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
 
-  parse-json@4.0.0:
-    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: '>=4'}
-
   parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
-  parse-json@8.3.0:
-    resolution: {integrity: sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==}
-    engines: {node: '>=18'}
-
   parse-latin@7.0.0:
     resolution: {integrity: sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ==}
 
-  parse-ms@4.0.0:
-    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
-    engines: {node: '>=18'}
-
   parse-node-version@1.0.1:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
@@ -9375,21 +9195,12 @@ packages:
   parse5-html-rewriting-stream@8.0.0:
     resolution: {integrity: sha512-wzh11mj8KKkno1pZEu+l2EVeWsuKDfR5KNWZOTsslfUX8lPDZx77m9T0kIoAVkFtD1nx6YF8oh4BnPHvxMtNMw==}
 
-  parse5-htmlparser2-tree-adapter@6.0.1:
-    resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
-
   parse5-sax-parser@8.0.0:
     resolution: {integrity: sha512-/dQ8UzHZwnrzs3EvDj6IkKrD/jIZyTlB+8XrHJvcjNgRdmWruNdN9i9RK/JtxakmlUdPwKubKPTCqvbTgzGhrw==}
 
   parse5@4.0.0:
     resolution: {integrity: sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==}
 
-  parse5@5.1.1:
-    resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
-
-  parse5@6.0.1:
-    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
-
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
@@ -9400,10 +9211,6 @@ packages:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
 
-  path-exists@3.0.0:
-    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
-    engines: {node: '>=4'}
-
   path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
@@ -9420,10 +9227,6 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
@@ -9475,10 +9278,6 @@ packages:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
 
-  pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-
   pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -9499,10 +9298,6 @@ packages:
     resolution: {integrity: sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==}
     hasBin: true
 
-  pkg-conf@2.1.0:
-    resolution: {integrity: sha512-C+VUP+8jis7EsQZIhDYmS5qlNtjv2yP4SNtjXK9AP1ZcTRlnSfuumaTnRfYZnYgUUYVIKqL0fRvmUGDV2fmp6g==}
-    engines: {node: '>=4'}
-
   pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -9511,14 +9306,14 @@ packages:
     resolution: {integrity: sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==}
     engines: {node: '>=14.16'}
 
-  playwright-core@1.57.0:
-    resolution: {integrity: sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==}
-    engines: {node: '>=18'}
+  playwright-core@1.62.0:
+    resolution: {integrity: sha512-nsNRyq0r2zsG8AcRHWknc9QRA5XCueC7gWMrs+Gx2tlZn9hcl8zudfh00lhJPY1DE7NmZ6bDsT9g2yey8mXljA==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.57.0:
-    resolution: {integrity: sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==}
-    engines: {node: '>=18'}
+  playwright@1.62.0:
+    resolution: {integrity: sha512-Z14dG305dgaLu6foB1TXQagFiW8JfSUIUaUuPaKQ6NtBPKF1P/qXcqfh6c6K/icPqdy37JmjbiBXf6JNg6Sylw==}
+    engines: {node: '>=20'}
     hasBin: true
 
   plist@3.1.0:
@@ -9846,8 +9641,8 @@ packages:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
 
-  prettier@3.8.1:
-    resolution: {integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==}
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -9855,9 +9650,9 @@ packages:
     resolution: {integrity: sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
-  pretty-ms@9.3.0:
-    resolution: {integrity: sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ==}
-    engines: {node: '>=18'}
+  pretty-format@30.4.1:
+    resolution: {integrity: sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==}
+    engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
 
   prismjs@1.30.0:
     resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
@@ -9901,9 +9696,6 @@ packages:
   property-information@7.1.0:
     resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
 
-  proto-list@1.2.4:
-    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
-
   proxy-addr@2.0.7:
     resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
     engines: {node: '>= 0.10'}
@@ -9922,10 +9714,6 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
-  pupa@3.3.0:
-    resolution: {integrity: sha512-LjgDO2zPtoXP2wJpDjZrGdojii1uqO0cnwKoIoUzkfS98HDmbeiGmYiXo3lXeFlq2xvne1QFQhwYXSUCLKtEuA==}
-    engines: {node: '>=12.20'}
-
   pure-rand@7.0.1:
     resolution: {integrity: sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==}
 
@@ -9978,6 +9766,9 @@ packages:
   react-is@18.3.1:
     resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
 
+  react-is@19.2.8:
+    resolution: {integrity: sha512-s5un28nYxKJw5gvUHyW5PCC28CvBqLu9r3cWgzHT4Vo/5fqqkFcdRYsGcKf50WMPpjjFZS5d76fn3YCo2njKwQ==}
+
   react-refresh@0.18.0:
     resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
     engines: {node: '>=0.10.0'}
@@ -9993,14 +9784,6 @@ packages:
   read-cache@1.0.0:
     resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
-  read-package-up@11.0.0:
-    resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==}
-    engines: {node: '>=18'}
-
-  read-pkg@9.0.1:
-    resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==}
-    engines: {node: '>=18'}
-
   readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
 
@@ -10065,10 +9848,6 @@ packages:
     resolution: {integrity: sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==}
     engines: {node: '>=4'}
 
-  registry-auth-token@5.1.0:
-    resolution: {integrity: sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==}
-    engines: {node: '>=14'}
-
   regjsgen@0.8.0:
     resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
 
@@ -10457,20 +10236,6 @@ packages:
     resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==}
     engines: {node: '>=10'}
 
-  semantic-release@24.2.9:
-    resolution: {integrity: sha512-phCkJ6pjDi9ANdhuF5ElS10GGdAKY6R1Pvt9lT3SFhOwM4T7QZE7MLpBDbNruUx/Q3gFD92/UOFringGipRqZA==}
-    engines: {node: '>=20.8.1'}
-    hasBin: true
-
-  semver-diff@5.0.0:
-    resolution: {integrity: sha512-0HbGtOm+S7T6NGQ/pxJSJipJvc4DK3FcRVMRkhsIwJDJ4Jcz5DQC1cPPzB5GhzyHjwttW878HaWQq46CkL3cqg==}
-    engines: {node: '>=12'}
-    deprecated: Deprecated as the semver package now supports this built-in.
-
-  semver-regex@4.0.5:
-    resolution: {integrity: sha512-hunMQrEy1T6Jr2uEVjrAIqjwWcQTgOAcIM52C8MY1EZSD3DDNft04XzvYKPqjED65bNVVko0YI38nYeEHCX3yw==}
-    engines: {node: '>=12'}
-
   semver@5.7.2:
     resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
     hasBin: true
@@ -10494,6 +10259,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.19.2:
     resolution: {integrity: sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==}
     engines: {node: '>= 0.8.0'}
@@ -10542,6 +10312,9 @@ packages:
   setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
+  shaka-player@5.2.2:
+    resolution: {integrity: sha512-1Z5Sxqz7nEAtvp4zlZKAHQSEq6cUlw5CKAdUxqmuMNeZgu23090VXMcEDdiSLU5qtMn1skFOzq+KKCVX71bHqw==}
+
   shallow-clone@3.0.1:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
     engines: {node: '>=8'}
@@ -10550,6 +10323,15 @@ packages:
     resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
+  sharp@0.35.3:
+    resolution: {integrity: sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==}
+    engines: {node: '>=20.9.0'}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -10596,10 +10378,6 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  signale@1.4.0:
-    resolution: {integrity: sha512-iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w==}
-    engines: {node: '>=6'}
-
   sigstore@4.1.0:
     resolution: {integrity: sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==}
     engines: {node: ^20.17.0 || >=22.9.0}
@@ -10617,15 +10395,11 @@ packages:
   sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
 
-  sitemap@8.0.2:
-    resolution: {integrity: sha512-LwktpJcyZDoa0IL6KT++lQ53pbSrx2c9ge41/SeLTyqy2XUNA6uR4+P9u5IVo5lPeL2arAcOKn1aZAxoYbCKlQ==}
-    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+  sitemap@9.0.1:
+    resolution: {integrity: sha512-S6hzjGJSG3d6if0YoF5kTyeRJvia6FSTBroE5fQ0bu1QNxyJqhhinfUsXi9fH3MgtXODWvwo2BDyQSnhPQ88uQ==}
+    engines: {node: '>=20.19.5', npm: '>=10.8.2'}
     hasBin: true
 
-  skin-tone@2.0.0:
-    resolution: {integrity: sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==}
-    engines: {node: '>=8'}
-
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -10665,14 +10439,6 @@ packages:
     resolution: {integrity: sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==}
     engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
-  sort-keys-length@1.0.1:
-    resolution: {integrity: sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==}
-    engines: {node: '>=0.10.0'}
-
-  sort-keys@1.1.2:
-    resolution: {integrity: sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==}
-    engines: {node: '>=0.10.0'}
-
   sorted-array-functions@1.3.0:
     resolution: {integrity: sha512-2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==}
 
@@ -10706,18 +10472,9 @@ packages:
   space-separated-tokens@2.0.2:
     resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
 
-  spawn-error-forwarder@1.0.0:
-    resolution: {integrity: sha512-gRjMgK5uFjbCvdibeGJuy3I5OYz6VLoVdsOJdA6wV0WlfQVLFueoqMxwwYD9RODdgb6oUIvlRlsyFSiQkMKu0g==}
-
-  spdx-correct@3.2.0:
-    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
-
   spdx-exceptions@2.5.0:
     resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
 
-  spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
-
   spdx-expression-parse@4.0.0:
     resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==}
 
@@ -10731,9 +10488,6 @@ packages:
     resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==}
     engines: {node: '>=6.0.0'}
 
-  split2@1.0.0:
-    resolution: {integrity: sha512-NKywug4u4pX/AZBB1FCPzZ6/7O+Xhz1qMVbzTvvKvikjO99oPN87SkK08mEY9P63/5lWjK+wgOOgApnTg5r6qg==}
-
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
@@ -10772,9 +10526,6 @@ packages:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
 
-  stream-combiner2@1.1.1:
-    resolution: {integrity: sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==}
-
   stream-replace-string@2.0.0:
     resolution: {integrity: sha512-TlnjJ1C0QrmxRNrON00JvaFFlNh5TTG00APw23j74ET7gkQpTASi6/L2fuiav8pzK715HXtUeClpBTw2NPSn6w==}
 
@@ -10843,14 +10594,6 @@ packages:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
 
-  strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-
-  strip-final-newline@4.0.0:
-    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
-    engines: {node: '>=18'}
-
   strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
@@ -10886,14 +10629,6 @@ packages:
     resolution: {integrity: sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==}
     engines: {node: '>= 8.0'}
 
-  super-regex@1.1.0:
-    resolution: {integrity: sha512-WHkws2ZflZe41zj6AolvvmaTrWds/VuyeYr9iPVv/oQeaIoVxMKaushfFWpOGDT+GuBrM/sVqF8KUCYQlSSTdQ==}
-    engines: {node: '>=18'}
-
-  supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-
   supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
@@ -10902,10 +10637,6 @@ packages:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
 
-  supports-hyperlinks@3.2.0:
-    resolution: {integrity: sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==}
-    engines: {node: '>=14.18'}
-
   supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -10960,10 +10691,6 @@ packages:
     resolution: {integrity: sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==}
     engines: {node: '>=18'}
 
-  temp-dir@3.0.0:
-    resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
-    engines: {node: '>=14.16'}
-
   temp-file@3.4.0:
     resolution: {integrity: sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==}
 
@@ -10971,14 +10698,6 @@ packages:
     resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
     engines: {node: '>=6.0.0'}
 
-  tempfile@5.0.0:
-    resolution: {integrity: sha512-bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q==}
-    engines: {node: '>=14.18'}
-
-  tempy@3.1.0:
-    resolution: {integrity: sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==}
-    engines: {node: '>=14.16'}
-
   terser-webpack-plugin@5.3.16:
     resolution: {integrity: sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==}
     engines: {node: '>= 10.13.0'}
@@ -11017,16 +10736,9 @@ packages:
     peerDependencies:
       tslib: ^2
 
-  through2@2.0.5:
-    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
-
   thunky@1.1.0:
     resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==}
 
-  time-span@5.1.0:
-    resolution: {integrity: sha512-75voc/9G4rDIJleOo4jPvN4/YC4GRZrY8yy1uU4lwrB3XEQbWve8zXoO5No4eFrGcTAMYyoY67p8jRQdtA1HbA==}
-    engines: {node: '>=12'}
-
   tiny-async-pool@1.3.0:
     resolution: {integrity: sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==}
 
@@ -11084,10 +10796,6 @@ packages:
     resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
     engines: {node: '>=18'}
 
-  traverse@0.6.8:
-    resolution: {integrity: sha512-aXJDbk6SnumuaZSANd21XAo15ucCDE38H4fkqiGsc3MhCK+wOlZvLP9cB/TvpHT0mOyWgC4Z8EwRlzqYSUzdsA==}
-    engines: {node: '>= 0.4'}
-
   tree-dump@1.1.0:
     resolution: {integrity: sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==}
     engines: {node: '>=10.0'}
@@ -11113,6 +10821,12 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-checker-rspack-plugin@1.2.3:
     resolution: {integrity: sha512-Fq2+/sSILEJKWrqoj/H+ytnBbYrudPfRLxaULA/MuL+/3jswXuiR4MOfL30R9XzVUD2km0pSx6bj8yk95IEOaA==}
     peerDependencies:
@@ -11125,8 +10839,8 @@ packages:
   ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  ts-jest@29.4.6:
-    resolution: {integrity: sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==}
+  ts-jest@29.4.12:
+    resolution: {integrity: sha512-Ov6ClY53Fflh6BGAnY2DlTq1hYDrTycz2PVTXBWFW2CU+9zrEqAp9fWdGXl42EXO5RLSFAcAZ2JFKbP+zBTFfw==}
     engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -11137,7 +10851,7 @@ packages:
       esbuild: '*'
       jest: ^29.0.0 || ^30.0.0
       jest-util: ^29.0.0 || ^30.0.0
-      typescript: '>=4.3 <6'
+      typescript: '>=4.3 <7'
     peerDependenciesMeta:
       '@babel/core':
         optional: true
@@ -11201,8 +10915,8 @@ packages:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
 
-  tsx@4.21.0:
-    resolution: {integrity: sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==}
+  tsx@4.23.1:
+    resolution: {integrity: sha512-GQHnkIfxyx1wYCOS/wonik5MVRZU9hi1TEZmzGZSCJB1y9YgoZ8H6itNE/u4suE+yLmOzuE4E5S4TZ/ZX2wcWQ==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -11229,14 +10943,6 @@ packages:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
-  type-fest@1.4.0:
-    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
-    engines: {node: '>=10'}
-
-  type-fest@2.19.0:
-    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
-    engines: {node: '>=12.20'}
-
   type-fest@4.41.0:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
@@ -11268,12 +10974,12 @@ packages:
   typed-assert@1.0.9:
     resolution: {integrity: sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==}
 
-  typescript-eslint@8.51.0:
-    resolution: {integrity: sha512-jh8ZuM5oEh2PSdyQG9YAEM1TCGuWenLSuSUhf/irbVUNW9O5FhbFVONviN2TgMTBnUmyHv7E56rYnfLZK6TkiA==}
+  typescript-eslint@8.65.0:
+    resolution: {integrity: sha512-/ggrHAwyjENDusvyxbuqxAC2dTnZg/Z8F+fgQtYIz+L6n/9HfSlEZcFGV/NsMNa6CkGk0xUjUAFwC0vHOflvIA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <6.0.0'
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
 
   typescript@5.9.3:
     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
@@ -11316,10 +11022,6 @@ packages:
     resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
     engines: {node: '>=4'}
 
-  unicode-emoji-modifier-base@1.0.0:
-    resolution: {integrity: sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==}
-    engines: {node: '>=4'}
-
   unicode-match-property-ecmascript@2.0.0:
     resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
     engines: {node: '>=4'}
@@ -11332,10 +11034,6 @@ packages:
     resolution: {integrity: sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==}
     engines: {node: '>=4'}
 
-  unicorn-magic@0.1.0:
-    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
-    engines: {node: '>=18'}
-
   unicorn-magic@0.3.0:
     resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
     engines: {node: '>=18'}
@@ -11366,10 +11064,6 @@ packages:
     resolution: {integrity: sha512-4Lup7Ezn8W3d52/xBhZBVdx323ckxa7DEvd9kPQHppTkLoJXw6ltrBCyj5pnrxj0qKDxYMJ56CoxNuFCscdTiw==}
     engines: {node: ^20.17.0 || >=22.9.0}
 
-  unique-string@3.0.0:
-    resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==}
-    engines: {node: '>=12'}
-
   unist-util-find-after@5.0.0:
     resolution: {integrity: sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==}
 
@@ -11400,9 +11094,6 @@ packages:
   unist-util-visit@5.1.0:
     resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
 
-  universal-user-agent@7.0.3:
-    resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
-
   universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
@@ -11480,10 +11171,6 @@ packages:
       uploadthing:
         optional: true
 
-  unused-filename@4.0.1:
-    resolution: {integrity: sha512-ZX6U1J04K1FoSUeoX1OicAhw4d0aro2qo+L8RhJkiGTNtBNkd/Fi1Wxoc9HzcVu6HfOzm0si/N15JjxFmD1z6A==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   upath@2.0.1:
     resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
     engines: {node: '>=4'}
@@ -11500,10 +11187,6 @@ packages:
   url-join@4.0.1:
     resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==}
 
-  url-join@5.0.0:
-    resolution: {integrity: sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   url-toolkit@2.2.5:
     resolution: {integrity: sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==}
 
@@ -11522,11 +11205,6 @@ packages:
     deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
-  uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
-    hasBin: true
-
   v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
@@ -11534,17 +11212,10 @@ packages:
     resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
     engines: {node: '>=10.12.0'}
 
-  validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
-
   validate-npm-package-name@7.0.2:
     resolution: {integrity: sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A==}
     engines: {node: ^20.17.0 || >=22.9.0}
 
-  validator@13.15.26:
-    resolution: {integrity: sha512-spH26xU080ydGggxRyR1Yhcbgx+j3y5jbNXk/8L+iRvdIEQ4uTRH2Sgf2dokud6Q4oAtsbNvJ1Ft+9xmm6IZcA==}
-    engines: {node: '>= 0.10'}
-
   varint@6.0.0:
     resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==}
 
@@ -11568,8 +11239,8 @@ packages:
   video.js@7.21.7:
     resolution: {integrity: sha512-T2s3WFAht7Zjr2OSJamND9x9Dn2O+Z5WuHGdh8jI5SYh5mkMdVTQ7vSRmA5PYpjXJ2ycch6jpMjkJEIEU2xxqw==}
 
-  video.js@8.23.4:
-    resolution: {integrity: sha512-qI0VTlYmKzEqRsz1Nppdfcaww4RSxZAq77z2oNSl3cNg2h6do5C8Ffl0KqWQ1OpD8desWXsCrde7tKJ9gGTEyQ==}
+  video.js@8.23.9:
+    resolution: {integrity: sha512-3UCqyFW4wIusQu4TuhgRUxqtbzbj0WPT9hps0XIEXST43QBD11zb+bG7tBPrinrZztwVYdXCiOBo2pcGj9L05w==}
 
   videojs-contrib-quality-levels@4.1.0:
     resolution: {integrity: sha512-TfrXJJg1Bv4t6TOCMEVMwF/CoS8iENYsWNKip8zfhB5kTcegiFYezEA0eHAJPU64ZC8NQbxQgOwAsYU8VXbOWA==}
@@ -11705,9 +11376,6 @@ packages:
   web-namespaces@2.0.1:
     resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
 
-  web-worker@1.2.0:
-    resolution: {integrity: sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==}
-
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -11919,10 +11587,6 @@ packages:
   xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
 
-  xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-
   xxhash-wasm@1.1.0:
     resolution: {integrity: sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA==}
 
@@ -11952,8 +11616,8 @@ packages:
     engines: {node: '>= 14.6'}
     hasBin: true
 
-  yaml@2.8.2:
-    resolution: {integrity: sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==}
+  yaml@2.9.0:
+    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
     engines: {node: '>= 14.6'}
     hasBin: true
 
@@ -11961,10 +11625,6 @@ packages:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
 
-  yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
-
   yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
@@ -11977,10 +11637,6 @@ packages:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
 
-  yargs@16.2.0:
-    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: '>=10'}
-
   yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
@@ -12030,8 +11686,8 @@ packages:
   zod@4.3.6:
     resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
 
-  zone.js@0.15.1:
-    resolution: {integrity: sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==}
+  zone.js@0.16.2:
+    resolution: {integrity: sha512-Eky7p2Z1Ig3NnbfodSPoARCjKBSTFMnE/ACsP1L/XJEfY4SdOFce19BsUCWVwL6K5ABZFy5J3bjcMWffX+YM3Q==}
 
   zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
@@ -12147,8 +11803,8 @@ snapshots:
 
   '@angular-devkit/core@21.1.4(chokidar@5.0.0)':
     dependencies:
-      ajv: 8.17.1
-      ajv-formats: 3.0.1(ajv@8.17.1)
+      ajv: 8.18.0
+      ajv-formats: 3.0.1(ajv@8.18.0)
       jsonc-parser: 3.3.1
       picomatch: 4.0.3
       rxjs: 7.8.2
@@ -12210,33 +11866,63 @@ snapshots:
 
   '@angular-eslint/bundled-angular-compiler@21.3.1': {}
 
-  '@angular-eslint/eslint-plugin-template@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@angular-eslint/eslint-plugin-template@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@angular-eslint/bundled-angular-compiler': 21.3.1
       '@angular-eslint/template-parser': 21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@angular-eslint/utils': 21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/utils': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       aria-query: 5.3.2
       axobject-query: 4.1.0
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
 
-  '@angular-eslint/eslint-plugin@21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@angular-eslint/eslint-plugin-template@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@angular-eslint/bundled-angular-compiler': 21.3.1
-      '@angular-eslint/utils': 21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/template-parser': 21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/utils': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      aria-query: 5.3.2
+      axobject-query: 4.1.0
+      eslint: 9.39.2(jiti@1.21.7)
+      typescript: 5.9.3
+
+  '@angular-eslint/eslint-plugin@21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@angular-eslint/bundled-angular-compiler': 21.3.1
+      '@angular-eslint/utils': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
 
-  '@angular-eslint/schematics@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@angular-eslint/schematics@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@angular-devkit/core': 21.2.17(chokidar@5.0.0)
       '@angular-devkit/schematics': 21.2.17(chokidar@5.0.0)
-      '@angular-eslint/eslint-plugin': 21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@angular-eslint/eslint-plugin-template': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin-template': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular/cli': 21.2.17(@types/node@20.19.9)(chokidar@5.0.0)
+      ignore: 7.0.5
+      semver: 7.7.4
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - '@angular-eslint/template-parser'
+      - '@typescript-eslint/types'
+      - '@typescript-eslint/utils'
+      - chokidar
+      - eslint
+      - typescript
+
+  '@angular-eslint/schematics@21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@angular-devkit/core': 21.2.17(chokidar@5.0.0)
+      '@angular-devkit/schematics': 21.2.17(chokidar@5.0.0)
+      '@angular-eslint/eslint-plugin': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin-template': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.65.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular/cli': 21.2.17(@types/node@20.19.9)(chokidar@5.0.0)
       ignore: 7.0.5
       semver: 7.7.4
@@ -12256,19 +11942,19 @@ snapshots:
       eslint-scope: 9.1.2
       typescript: 5.9.3
 
-  '@angular-eslint/utils@21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@angular-eslint/utils@21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@angular-eslint/bundled-angular-compiler': 21.3.1
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
 
-  '@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))':
+  '@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
 
-  '@angular/build@21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))(terser@5.44.1)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)':
+  '@angular/build@21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))(terser@5.44.1)(tslib@2.8.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@angular-devkit/architect': 0.2102.17(chokidar@5.0.0)
@@ -12278,7 +11964,7 @@ snapshots:
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-split-export-declaration': 7.24.7
       '@inquirer/confirm': 5.1.21(@types/node@20.19.9)
-      '@vitejs/plugin-basic-ssl': 2.1.4(vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitejs/plugin-basic-ssl': 2.1.4(vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0))
       beasties: 0.4.1
       browserslist: 4.28.2
       esbuild: 0.28.1
@@ -12299,16 +11985,16 @@ snapshots:
       tslib: 2.8.1
       typescript: 5.9.3
       undici: 7.24.4
-      vite: 7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0)
       watchpack: 2.5.1
     optionalDependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
-      '@angular/service-worker': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
+      '@angular/service-worker': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       less: 4.5.1
       lmdb: 3.5.1
       postcss: 8.5.6
-      tailwindcss: 3.4.19(tsx@4.21.0)(yaml@2.8.2)
+      tailwindcss: 3.4.19(tsx@4.23.1)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@types/node'
       - chokidar
@@ -12322,11 +12008,11 @@ snapshots:
       - tsx
       - yaml
 
-  '@angular/cdk@21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)':
+  '@angular/cdk@21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       parse5: 8.0.0
       rxjs: 7.8.2
       tslib: 2.8.1
@@ -12357,9 +12043,9 @@ snapshots:
       - chokidar
       - supports-color
 
-  '@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)':
+  '@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
@@ -12383,62 +12069,62 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)':
+  '@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)':
     dependencies:
       rxjs: 7.8.2
       tslib: 2.8.1
     optionalDependencies:
       '@angular/compiler': 21.2.17
-      zone.js: 0.15.1
+      zone.js: 0.16.2
 
-  '@angular/forms@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)':
+  '@angular/forms@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       '@standard-schema/spec': 1.1.0
       rxjs: 7.8.2
       tslib: 2.8.1
 
   '@angular/language-service@21.2.17': {}
 
-  '@angular/material@21.2.14(7ae818e999981ce767bfae94a8b1de8f)':
+  '@angular/material@21.2.14(43172ba04e47f305707a39eaf8cab87a)':
     dependencies:
-      '@angular/cdk': 21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/forms': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/cdk': 21.2.14(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/forms': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/platform-browser-dynamic@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))':
+  '@angular/platform-browser-dynamic@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@angular/compiler': 21.2.17
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       tslib: 2.8.1
 
-  '@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))':
+  '@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
     optionalDependencies:
-      '@angular/animations': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/animations': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
 
-  '@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)':
+  '@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)':
+  '@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
@@ -12464,7 +12150,7 @@ snapshots:
       hast-util-from-html: 2.0.3
       hast-util-to-text: 4.0.2
       import-meta-resolve: 4.2.0
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       mdast-util-definitions: 6.0.0
       rehype-raw: 7.0.0
       rehype-stringify: 10.0.1
@@ -12490,7 +12176,7 @@ snapshots:
       hast-util-from-html: 2.0.3
       hast-util-to-text: 4.0.2
       import-meta-resolve: 4.2.0
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       mdast-util-definitions: 6.0.0
       rehype-raw: 7.0.0
       rehype-stringify: 10.0.1
@@ -12508,12 +12194,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@astrojs/mdx@4.3.13(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))':
+  '@astrojs/mdx@4.3.13(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0))':
     dependencies:
       '@astrojs/markdown-remark': 6.3.10
       '@mdx-js/mdx': 3.1.1
       acorn: 8.15.0
-      astro: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      astro: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)
       es-module-lexer: 1.7.0
       estree-util-visit: 2.0.0
       hast-util-to-html: 9.0.5
@@ -12531,19 +12217,19 @@ snapshots:
     dependencies:
       prismjs: 1.30.0
 
-  '@astrojs/sitemap@3.7.0':
+  '@astrojs/sitemap@3.7.3':
     dependencies:
-      sitemap: 8.0.2
+      sitemap: 9.0.1
       stream-replace-string: 2.0.0
-      zod: 3.25.76
+      zod: 4.3.6
 
-  '@astrojs/tailwind@6.0.2(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2))(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))':
+  '@astrojs/tailwind@6.0.2(astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0))(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))':
     dependencies:
-      astro: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      astro: 5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)
       autoprefixer: 10.4.23(postcss@8.5.6)
       postcss: 8.5.6
-      postcss-load-config: 4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      tailwindcss: 3.4.19(tsx@4.21.0)(yaml@2.8.2)
+      postcss-load-config: 4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      tailwindcss: 3.4.19(tsx@4.23.1)(yaml@2.9.0)
     transitivePeerDependencies:
       - ts-node
 
@@ -12925,6 +12611,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12935,6 +12626,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12945,6 +12641,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12955,6 +12656,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-decorators@7.27.1(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12975,6 +12681,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-import-attributes@7.27.1(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12985,6 +12696,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -12995,6 +12711,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13005,6 +12726,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13015,6 +12741,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13025,6 +12756,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13035,6 +12771,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13045,6 +12786,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13055,6 +12801,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13065,6 +12816,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13075,6 +12831,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13085,6 +12846,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13095,6 +12861,11 @@ snapshots:
       '@babel/core': 7.29.0
       '@babel/helper-plugin-utils': 7.27.1
 
+  '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.27.1
+
   '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.28.5)':
     dependencies:
       '@babel/core': 7.28.5
@@ -13632,17 +13403,6 @@ snapshots:
 
   '@colordx/core@5.4.3': {}
 
-  '@colors/colors@1.5.0':
-    optional: true
-
-  '@conventional-changelog/git-client@1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1)':
-    dependencies:
-      '@types/semver': 7.7.1
-      semver: 7.7.4
-    optionalDependencies:
-      conventional-commits-filter: 5.0.0
-      conventional-commits-parser: 6.2.1
-
   '@cspotcode/source-map-support@0.8.1':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
@@ -13716,7 +13476,7 @@ snapshots:
       make-fetch-happen: 10.2.1
       nopt: 6.0.0
       proc-log: 2.0.1
-      semver: 7.7.4
+      semver: 7.8.5
       tar: 6.2.1
       which: 2.0.2
     transitivePeerDependencies:
@@ -13795,6 +13555,11 @@ snapshots:
       '@emnapi/wasi-threads': 1.1.0
       tslib: 2.8.1
 
+  '@emnapi/runtime@1.11.3':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@emnapi/runtime@1.4.5':
     dependencies:
       tslib: 2.8.1
@@ -14144,7 +13909,7 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/eslintrc@3.3.1':
+  '@eslint/eslintrc@3.3.6':
     dependencies:
       ajv: 6.14.0
       debug: 4.4.3
@@ -14152,8 +13917,8 @@ snapshots:
       globals: 14.0.0
       ignore: 5.3.2
       import-fresh: 3.3.1
-      js-yaml: 4.1.1
-      minimatch: 3.1.2
+      js-yaml: 4.3.0
+      minimatch: 3.1.5
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
@@ -14167,15 +13932,15 @@ snapshots:
       '@eslint/core': 0.17.0
       levn: 0.4.1
 
-  '@faker-js/faker@10.3.0': {}
+  '@faker-js/faker@10.5.0': {}
 
-  '@fontsource/crimson-pro@5.2.8': {}
+  '@fontsource/crimson-pro@5.3.0': {}
 
-  '@fontsource/dm-sans@5.2.8': {}
+  '@fontsource/dm-sans@5.3.0': {}
 
-  '@fontsource/jetbrains-mono@5.2.8': {}
+  '@fontsource/jetbrains-mono@5.3.0': {}
 
-  '@fontsource/roboto@5.2.10': {}
+  '@fontsource/roboto@5.3.0': {}
 
   '@gar/promise-retry@1.0.3': {}
 
@@ -14199,104 +13964,209 @@ snapshots:
 
   '@humanwhocodes/retry@0.4.3': {}
 
-  '@hutson/parse-repository-url@5.0.0': {}
+  '@img/colour@1.0.0':
+    optional: true
 
-  '@img/colour@1.0.0': {}
+  '@img/colour@1.1.0': {}
 
   '@img/sharp-darwin-arm64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-darwin-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
+    optional: true
+
   '@img/sharp-darwin-x64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.2.4
     optional: true
 
+  '@img/sharp-darwin-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.3.2
+    optional: true
+
+  '@img/sharp-freebsd-wasm32@0.35.3':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.3
+    optional: true
+
   '@img/sharp-libvips-darwin-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-darwin-arm64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-darwin-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-darwin-x64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-arm64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-arm@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-arm@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-ppc64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-ppc64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-riscv64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-riscv64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-s390x@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-s390x@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linux-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linux-x64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linuxmusl-arm64@1.3.2':
+    optional: true
+
   '@img/sharp-libvips-linuxmusl-x64@1.2.4':
     optional: true
 
+  '@img/sharp-libvips-linuxmusl-x64@1.3.2':
+    optional: true
+
   '@img/sharp-linux-arm64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.3.2
+    optional: true
+
   '@img/sharp-linux-arm@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.2.4
     optional: true
 
+  '@img/sharp-linux-arm@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.3.2
+    optional: true
+
   '@img/sharp-linux-ppc64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-ppc64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-ppc64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
+    optional: true
+
   '@img/sharp-linux-riscv64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-riscv64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-riscv64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
+    optional: true
+
   '@img/sharp-linux-s390x@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.2.4
     optional: true
 
+  '@img/sharp-linux-s390x@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.3.2
+    optional: true
+
   '@img/sharp-linux-x64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.2.4
     optional: true
 
+  '@img/sharp-linux-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.3.2
+    optional: true
+
   '@img/sharp-linuxmusl-arm64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
     optional: true
 
+  '@img/sharp-linuxmusl-arm64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
+    optional: true
+
   '@img/sharp-linuxmusl-x64@0.34.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.2.4
     optional: true
 
+  '@img/sharp-linuxmusl-x64@0.35.3':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
+    optional: true
+
   '@img/sharp-wasm32@0.34.5':
     dependencies:
       '@emnapi/runtime': 1.8.1
     optional: true
 
+  '@img/sharp-wasm32@0.35.3':
+    dependencies:
+      '@emnapi/runtime': 1.11.3
+    optional: true
+
+  '@img/sharp-webcontainers-wasm32@0.35.3':
+    dependencies:
+      '@img/sharp-wasm32': 0.35.3
+    optional: true
+
   '@img/sharp-win32-arm64@0.34.5':
     optional: true
 
+  '@img/sharp-win32-arm64@0.35.3':
+    optional: true
+
   '@img/sharp-win32-ia32@0.34.5':
     optional: true
 
+  '@img/sharp-win32-ia32@0.35.3':
+    optional: true
+
   '@img/sharp-win32-x64@0.34.5':
     optional: true
 
+  '@img/sharp-win32-x64@0.35.3':
+    optional: true
+
   '@inquirer/ansi@1.0.2': {}
 
   '@inquirer/checkbox@4.3.2(@types/node@20.19.9)':
@@ -14460,35 +14330,44 @@ snapshots:
       jest-util: 30.2.0
       slash: 3.0.0
 
-  '@jest/core@30.2.0(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))':
+  '@jest/console@30.4.1':
     dependencies:
-      '@jest/console': 30.2.0
-      '@jest/pattern': 30.0.1
-      '@jest/reporters': 30.2.0
-      '@jest/test-result': 30.2.0
-      '@jest/transform': 30.2.0
-      '@jest/types': 30.2.0
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      jest-message-util: 30.4.1
+      jest-util: 30.4.1
+      slash: 3.0.0
+
+  '@jest/core@30.4.2(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))':
+    dependencies:
+      '@jest/console': 30.4.1
+      '@jest/pattern': 30.4.0
+      '@jest/reporters': 30.4.1
+      '@jest/test-result': 30.4.1
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
       '@types/node': 20.19.9
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 4.3.1
       exit-x: 0.2.2
+      fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.11
-      jest-changed-files: 30.2.0
-      jest-config: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      jest-haste-map: 30.2.0
-      jest-message-util: 30.2.0
-      jest-regex-util: 30.0.1
-      jest-resolve: 30.2.0
-      jest-resolve-dependencies: 30.2.0
-      jest-runner: 30.2.0
-      jest-runtime: 30.2.0
-      jest-snapshot: 30.2.0
-      jest-util: 30.2.0
-      jest-validate: 30.2.0
-      jest-watcher: 30.2.0
-      micromatch: 4.0.8
-      pretty-format: 30.2.0
+      jest-changed-files: 30.4.1
+      jest-config: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      jest-haste-map: 30.4.1
+      jest-message-util: 30.4.1
+      jest-regex-util: 30.4.0
+      jest-resolve: 30.4.1
+      jest-resolve-dependencies: 30.4.2
+      jest-runner: 30.4.2
+      jest-runtime: 30.4.2
+      jest-snapshot: 30.4.1
+      jest-util: 30.4.1
+      jest-validate: 30.4.1
+      jest-watcher: 30.4.1
+      pretty-format: 30.4.1
       slash: 3.0.0
     transitivePeerDependencies:
       - babel-plugin-macros
@@ -14498,6 +14377,8 @@ snapshots:
 
   '@jest/diff-sequences@30.0.1': {}
 
+  '@jest/diff-sequences@30.4.0': {}
+
   '@jest/environment-jsdom-abstract@30.2.0(jsdom@26.1.0)':
     dependencies:
       '@jest/environment': 30.2.0
@@ -14509,6 +14390,17 @@ snapshots:
       jest-util: 30.2.0
       jsdom: 26.1.0
 
+  '@jest/environment-jsdom-abstract@30.4.1(jsdom@26.1.0)':
+    dependencies:
+      '@jest/environment': 30.4.1
+      '@jest/fake-timers': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/jsdom': 21.1.7
+      '@types/node': 20.19.9
+      jest-mock: 30.4.1
+      jest-util: 30.4.1
+      jsdom: 26.1.0
+
   '@jest/environment@30.2.0':
     dependencies:
       '@jest/fake-timers': 30.2.0
@@ -14516,10 +14408,21 @@ snapshots:
       '@types/node': 20.19.9
       jest-mock: 30.2.0
 
+  '@jest/environment@30.4.1':
+    dependencies:
+      '@jest/fake-timers': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      jest-mock: 30.4.1
+
   '@jest/expect-utils@30.2.0':
     dependencies:
       '@jest/get-type': 30.1.0
 
+  '@jest/expect-utils@30.4.1':
+    dependencies:
+      '@jest/get-type': 30.1.0
+
   '@jest/expect@30.2.0':
     dependencies:
       expect: 30.2.0
@@ -14527,6 +14430,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@jest/expect@30.4.1':
+    dependencies:
+      expect: 30.4.1
+      jest-snapshot: 30.4.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@jest/fake-timers@30.2.0':
     dependencies:
       '@jest/types': 30.2.0
@@ -14536,6 +14446,15 @@ snapshots:
       jest-mock: 30.2.0
       jest-util: 30.2.0
 
+  '@jest/fake-timers@30.4.1':
+    dependencies:
+      '@jest/types': 30.4.1
+      '@sinonjs/fake-timers': 15.4.0
+      '@types/node': 20.19.9
+      jest-message-util: 30.4.1
+      jest-mock: 30.4.1
+      jest-util: 30.4.1
+
   '@jest/get-type@30.1.0': {}
 
   '@jest/globals@30.2.0':
@@ -14547,11 +14466,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@jest/globals@30.4.1':
+    dependencies:
+      '@jest/environment': 30.4.1
+      '@jest/expect': 30.4.1
+      '@jest/types': 30.4.1
+      jest-mock: 30.4.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@jest/pattern@30.0.1':
     dependencies:
       '@types/node': 20.19.9
       jest-regex-util: 30.0.1
 
+  '@jest/pattern@30.4.0':
+    dependencies:
+      '@types/node': 20.19.9
+      jest-regex-util: 30.4.0
+
   '@jest/reporters@30.2.0':
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
@@ -14580,10 +14513,42 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@jest/reporters@30.4.1':
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 30.4.1
+      '@jest/test-result': 30.4.1
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
+      '@jridgewell/trace-mapping': 0.3.31
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.3
+      exit-x: 0.2.2
+      glob: 10.5.0
+      graceful-fs: 4.2.11
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 6.0.3
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 5.0.6
+      istanbul-reports: 3.2.0
+      jest-message-util: 30.4.1
+      jest-util: 30.4.1
+      jest-worker: 30.4.1
+      slash: 3.0.0
+      string-length: 4.0.2
+      v8-to-istanbul: 9.3.0
+    transitivePeerDependencies:
+      - supports-color
+
   '@jest/schemas@30.0.5':
     dependencies:
       '@sinclair/typebox': 0.34.46
 
+  '@jest/schemas@30.4.1':
+    dependencies:
+      '@sinclair/typebox': 0.34.46
+
   '@jest/snapshot-utils@30.2.0':
     dependencies:
       '@jest/types': 30.2.0
@@ -14591,6 +14556,13 @@ snapshots:
       graceful-fs: 4.2.11
       natural-compare: 1.4.0
 
+  '@jest/snapshot-utils@30.4.1':
+    dependencies:
+      '@jest/types': 30.4.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      natural-compare: 1.4.0
+
   '@jest/source-map@30.0.1':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
@@ -14604,6 +14576,13 @@ snapshots:
       '@types/istanbul-lib-coverage': 2.0.6
       collect-v8-coverage: 1.0.3
 
+  '@jest/test-result@30.4.1':
+    dependencies:
+      '@jest/console': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/istanbul-lib-coverage': 2.0.6
+      collect-v8-coverage: 1.0.3
+
   '@jest/test-sequencer@30.2.0':
     dependencies:
       '@jest/test-result': 30.2.0
@@ -14611,6 +14590,13 @@ snapshots:
       jest-haste-map: 30.2.0
       slash: 3.0.0
 
+  '@jest/test-sequencer@30.4.1':
+    dependencies:
+      '@jest/test-result': 30.4.1
+      graceful-fs: 4.2.11
+      jest-haste-map: 30.4.1
+      slash: 3.0.0
+
   '@jest/transform@30.2.0':
     dependencies:
       '@babel/core': 7.29.0
@@ -14631,6 +14617,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@jest/transform@30.4.1':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@jest/types': 30.4.1
+      '@jridgewell/trace-mapping': 0.3.31
+      babel-plugin-istanbul: 7.0.1
+      chalk: 4.1.2
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 30.4.1
+      jest-regex-util: 30.4.0
+      jest-util: 30.4.1
+      pirates: 4.0.7
+      slash: 3.0.0
+      write-file-atomic: 5.0.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@jest/types@30.2.0':
     dependencies:
       '@jest/pattern': 30.0.1
@@ -14641,6 +14646,16 @@ snapshots:
       '@types/yargs': 17.0.35
       chalk: 4.1.2
 
+  '@jest/types@30.4.1':
+    dependencies:
+      '@jest/pattern': 30.4.0
+      '@jest/schemas': 30.4.1
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 20.19.9
+      '@types/yargs': 17.0.35
+      chalk: 4.1.2
+
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -14860,7 +14875,7 @@ snapshots:
       '@module-federation/third-party-dts-extractor': 0.22.0
       adm-zip: 0.5.16
       ansi-colors: 4.1.3
-      axios: 1.16.0
+      axios: 1.18.1
       chalk: 3.0.0
       fs-extra: 9.1.0
       isomorphic-ws: 5.0.0(ws@8.18.0)
@@ -14895,7 +14910,7 @@ snapshots:
       - node-fetch
       - utf-8-validate
 
-  '@module-federation/enhanced@0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))':
+  '@module-federation/enhanced@0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))':
     dependencies:
       '@module-federation/bridge-react-webpack-plugin': 0.22.0
       '@module-federation/cli': 0.22.0(typescript@5.9.3)
@@ -14905,7 +14920,7 @@ snapshots:
       '@module-federation/inject-external-runtime-core-plugin': 0.22.0(@module-federation/runtime-tools@0.22.0)
       '@module-federation/managers': 0.22.0
       '@module-federation/manifest': 0.22.0(typescript@5.9.3)
-      '@module-federation/rspack': 0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(typescript@5.9.3)
+      '@module-federation/rspack': 0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(typescript@5.9.3)
       '@module-federation/runtime-tools': 0.22.0
       '@module-federation/sdk': 0.22.0
       btoa: 1.2.1
@@ -14913,7 +14928,7 @@ snapshots:
       upath: 2.0.1
     optionalDependencies:
       typescript: 5.9.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - '@rspack/core'
       - bufferutil
@@ -14923,7 +14938,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@module-federation/enhanced@2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))':
+  '@module-federation/enhanced@2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))':
     dependencies:
       '@module-federation/bridge-react-webpack-plugin': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/cli': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
@@ -14932,7 +14947,7 @@ snapshots:
       '@module-federation/inject-external-runtime-core-plugin': 2.4.0(@module-federation/runtime-tools@2.4.0(node-fetch@2.7.0(encoding@0.1.13)))
       '@module-federation/managers': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/manifest': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
-      '@module-federation/rspack': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
+      '@module-federation/rspack': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
       '@module-federation/runtime-tools': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/sdk': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/webpack-bundler-runtime': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
@@ -14941,7 +14956,7 @@ snapshots:
       upath: 2.0.1
     optionalDependencies:
       typescript: 5.9.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - '@rspack/core'
       - bufferutil
@@ -15003,15 +15018,15 @@ snapshots:
       - utf-8-validate
       - vue-tsc
 
-  '@module-federation/node@2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.18))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))':
+  '@module-federation/node@2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))':
     dependencies:
-      '@module-federation/enhanced': 0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      '@module-federation/enhanced': 0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       '@module-federation/runtime': 0.22.0
       '@module-federation/sdk': 0.22.0
       btoa: 1.2.1
       encoding: 0.1.13
       node-fetch: 2.7.0(encoding@0.1.13)
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     optionalDependencies:
       react: 19.2.3
       react-dom: 19.2.3(react@19.2.3)
@@ -15024,7 +15039,7 @@ snapshots:
       - utf-8-validate
       - vue-tsc
 
-  '@module-federation/rspack@0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(typescript@5.9.3)':
+  '@module-federation/rspack@0.22.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(typescript@5.9.3)':
     dependencies:
       '@module-federation/bridge-react-webpack-plugin': 0.22.0
       '@module-federation/dts-plugin': 0.22.0(typescript@5.9.3)
@@ -15033,7 +15048,7 @@ snapshots:
       '@module-federation/manifest': 0.22.0(typescript@5.9.3)
       '@module-federation/runtime-tools': 0.22.0
       '@module-federation/sdk': 0.22.0
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
       btoa: 1.2.1
     optionalDependencies:
       typescript: 5.9.3
@@ -15043,7 +15058,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@module-federation/rspack@2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)':
+  '@module-federation/rspack@2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)':
     dependencies:
       '@module-federation/bridge-react-webpack-plugin': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/dts-plugin': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
@@ -15052,7 +15067,7 @@ snapshots:
       '@module-federation/manifest': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)
       '@module-federation/runtime-tools': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
       '@module-federation/sdk': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
     optionalDependencies:
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -15268,76 +15283,137 @@ snapshots:
       '@tybys/wasm-util': 0.10.1
     optional: true
 
-  '@ngrx/effects@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)':
+  '@ngrx/effects@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@ngrx/store': 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@ngrx/store': 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngrx/entity@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)':
+  '@ngrx/entity@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@ngrx/store': 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@ngrx/store': 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngrx/eslint-plugin@21.0.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)':
+  '@ngrx/eslint-plugin@21.1.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       strip-json-comments: 3.1.1
       typescript: 5.9.3
-      typescript-eslint: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      typescript-eslint: 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
 
-  '@ngrx/router-store@21.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)':
+  '@ngrx/router-store@21.1.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/router@21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/router': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
-      '@ngrx/store': 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/router': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+      '@ngrx/store': 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngrx/signals@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)':
+  '@ngrx/signals@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
     optionalDependencies:
       rxjs: 7.8.2
 
-  '@ngrx/store-devtools@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(rxjs@7.8.2)':
+  '@ngrx/store-devtools@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@ngrx/store': 21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@ngrx/store': 21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngrx/store@21.0.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)':
+  '@ngrx/store@21.1.1(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngx-pwa/local-storage@21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)':
+  '@ngx-pwa/local-storage@21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@ngx-translate/core@16.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))':
+  '@ngx-translate/core@16.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
 
-  '@ngx-translate/http-loader@16.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))':
+  '@ngx-translate/http-loader@16.0.1(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))':
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
 
+  '@node-rs/xxhash-android-arm-eabi@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-android-arm64@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-darwin-arm64@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-darwin-x64@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-freebsd-x64@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-linux-arm-gnueabihf@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-linux-arm64-gnu@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-linux-arm64-musl@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-linux-x64-gnu@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-linux-x64-musl@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-wasm32-wasi@1.7.6':
+    dependencies:
+      '@napi-rs/wasm-runtime': 0.2.12
+    optional: true
+
+  '@node-rs/xxhash-win32-arm64-msvc@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-win32-ia32-msvc@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash-win32-x64-msvc@1.7.6':
+    optional: true
+
+  '@node-rs/xxhash@1.7.6':
+    optionalDependencies:
+      '@node-rs/xxhash-android-arm-eabi': 1.7.6
+      '@node-rs/xxhash-android-arm64': 1.7.6
+      '@node-rs/xxhash-darwin-arm64': 1.7.6
+      '@node-rs/xxhash-darwin-x64': 1.7.6
+      '@node-rs/xxhash-freebsd-x64': 1.7.6
+      '@node-rs/xxhash-linux-arm-gnueabihf': 1.7.6
+      '@node-rs/xxhash-linux-arm64-gnu': 1.7.6
+      '@node-rs/xxhash-linux-arm64-musl': 1.7.6
+      '@node-rs/xxhash-linux-x64-gnu': 1.7.6
+      '@node-rs/xxhash-linux-x64-musl': 1.7.6
+      '@node-rs/xxhash-wasm32-wasi': 1.7.6
+      '@node-rs/xxhash-win32-arm64-msvc': 1.7.6
+      '@node-rs/xxhash-win32-ia32-msvc': 1.7.6
+      '@node-rs/xxhash-win32-x64-msvc': 1.7.6
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -15363,7 +15439,7 @@ snapshots:
   '@npmcli/fs@2.1.2':
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.7.4
+      semver: 7.8.5
 
   '@npmcli/fs@5.0.0':
     dependencies:
@@ -15419,18 +15495,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@nx/angular@22.7.1(3fcdae4966e6f655e54cd885e10979aa)':
+  '@nx/angular@22.7.1(c2f36107352a552af1b8d4017d026f40)':
     dependencies:
       '@angular-devkit/core': 21.2.17(chokidar@5.0.0)
       '@angular-devkit/schematics': 21.2.17(chokidar@5.0.0)
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/module-federation': 22.7.1(a3b68b84e3ec98d537bf640c6b57f01e)
-      '@nx/rspack': 22.7.1(22cfd6d26d5a2f461eef5bdbba0e2aae)
-      '@nx/web': 22.7.1(4b628920197e2640a94b2a773363406b)
-      '@nx/webpack': 22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.18))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(typescript@5.9.3)
-      '@nx/workspace': 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/module-federation': 22.7.1(446c49c3ccd268c7cef2adece6c1473f)
+      '@nx/rspack': 22.7.1(432b21b72e752ad5b0d4ba19aa7267cb)
+      '@nx/web': 22.7.1(5f4f264ec7c07d507acd7660d73c4398)
+      '@nx/webpack': 22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.23))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(typescript@5.9.3)
+      '@nx/workspace': 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       '@schematics/angular': 21.2.9(chokidar@5.0.0)
       '@typescript-eslint/type-utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
@@ -15443,7 +15519,7 @@ snapshots:
       tslib: 2.8.1
       webpack-merge: 5.10.0
     optionalDependencies:
-      '@angular/build': 21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))(terser@5.44.1)(tslib@2.8.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      '@angular/build': 21.2.17(@angular/compiler-cli@21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/service-worker@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@types/node@20.19.9)(chokidar@5.0.0)(jiti@1.21.7)(less@4.5.1)(postcss@8.5.6)(sass-embedded@1.97.1)(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))(terser@5.44.1)(tslib@2.8.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@module-federation/enhanced'
@@ -15485,21 +15561,21 @@ snapshots:
       - webpack-cli
       - webpack-hot-middleware
 
-  '@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))':
+  '@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))':
     dependencies:
       '@zkochan/js-yaml': 0.0.7
       ejs: 5.0.1
       enquirer: 2.3.6
       minimatch: 10.2.4
-      nx: 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+      nx: 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       semver: 7.7.3
       tslib: 2.8.1
       yargs-parser: 21.1.1
 
-  '@nx/esbuild@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))':
+  '@nx/esbuild@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       picocolors: 1.1.1
       tinyglobby: 0.2.15
       tsconfig-paths: 4.2.0
@@ -15515,14 +15591,14 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/eslint-plugin@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-config-prettier@10.1.8(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(typescript@5.9.3)':
+  '@nx/eslint-plugin@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-config-prettier@10.1.8(eslint@9.39.2(jiti@1.21.7)))(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(typescript@5.9.3)':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@typescript-eslint/type-utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       chalk: 4.1.2
       confusing-browser-globals: 1.0.11
       globals: 15.9.0
@@ -15542,16 +15618,16 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/eslint@22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))':
+  '@nx/eslint@22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       eslint: 9.39.2(jiti@1.21.7)
       semver: 7.7.3
       tslib: 2.8.1
       typescript: 5.9.3
     optionalDependencies:
-      '@nx/jest': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
+      '@nx/jest': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
       '@zkochan/js-yaml': 0.0.7
     transitivePeerDependencies:
       - '@babel/traverse'
@@ -15562,17 +15638,17 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)':
+  '@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)':
     dependencies:
       '@jest/reporters': 30.2.0
       '@jest/test-result': 30.2.0
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       identity-obj-proxy: 3.0.0
-      jest-config: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
+      jest-config: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
       jest-resolve: 30.2.0
-      jest-util: 30.2.0
+      jest-util: 30.4.1
       minimatch: 10.2.4
       picocolors: 1.1.1
       resolve.exports: 2.0.3
@@ -15594,7 +15670,7 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/js@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))':
+  '@nx/js@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))':
     dependencies:
       '@babel/core': 7.28.5
       '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
@@ -15603,8 +15679,8 @@ snapshots:
       '@babel/preset-env': 7.28.5(@babel/core@7.28.5)
       '@babel/preset-typescript': 7.28.5(@babel/core@7.28.5)
       '@babel/runtime': 7.28.4
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/workspace': 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/workspace': 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       '@zkochan/js-yaml': 0.0.7
       babel-plugin-const-enum: 1.2.0(@babel/core@7.28.5)
       babel-plugin-macros: 3.1.0
@@ -15630,20 +15706,20 @@ snapshots:
       - nx
       - supports-color
 
-  '@nx/module-federation@22.7.1(a3b68b84e3ec98d537bf640c6b57f01e)':
+  '@nx/module-federation@22.7.1(446c49c3ccd268c7cef2adece6c1473f)':
     dependencies:
-      '@module-federation/enhanced': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      '@module-federation/node': 2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.18))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      '@module-federation/enhanced': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      '@module-federation/node': 2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       '@module-federation/sdk': 2.4.0(node-fetch@2.7.0(encoding@0.1.13))
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/web': 22.7.1(4b628920197e2640a94b2a773363406b)
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/web': 22.7.1(5f4f264ec7c07d507acd7660d73c4398)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
       express: 4.22.1
       http-proxy-middleware: 3.0.5
       picocolors: 1.1.1
       tslib: 2.8.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@nx/cypress'
@@ -15701,15 +15777,15 @@ snapshots:
   '@nx/nx-win32-x64-msvc@22.7.1':
     optional: true
 
-  '@nx/playwright@22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.57.0)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))':
+  '@nx/playwright@22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.62.0)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       minimatch: 10.2.4
       tslib: 2.8.1
     optionalDependencies:
-      '@playwright/test': 1.57.0
+      '@playwright/test': 1.62.0
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@nx/jest'
@@ -15722,40 +15798,40 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/rspack@22.7.1(22cfd6d26d5a2f461eef5bdbba0e2aae)':
+  '@nx/rspack@22.7.1(432b21b72e752ad5b0d4ba19aa7267cb)':
     dependencies:
-      '@module-federation/enhanced': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      '@module-federation/node': 2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.18))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/module-federation': 22.7.1(a3b68b84e3ec98d537bf640c6b57f01e)
-      '@nx/web': 22.7.1(4b628920197e2640a94b2a773363406b)
+      '@module-federation/enhanced': 2.4.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      '@module-federation/node': 2.7.26(@rspack/core@1.6.8(@swc/helpers@0.5.23))(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/module-federation': 22.7.1(446c49c3ccd268c7cef2adece6c1473f)
+      '@nx/web': 22.7.1(5f4f264ec7c07d507acd7660d73c4398)
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
-      '@rspack/dev-server': 1.1.5(@rspack/core@1.6.8(@swc/helpers@0.5.18))(@types/express@5.0.6)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
+      '@rspack/dev-server': 1.1.5(@rspack/core@1.6.8(@swc/helpers@0.5.23))(@types/express@5.0.6)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       '@rspack/plugin-react-refresh': 1.5.3(react-refresh@0.18.0)
       autoprefixer: 10.4.23(postcss@8.5.6)
       browserslist: 4.28.1
-      css-loader: 6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      css-loader: 6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       enquirer: 2.3.6
       express: 4.22.1
       http-proxy-middleware: 3.0.5
-      less-loader: 12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.18))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      less-loader: 12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.23))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       loader-utils: 2.0.4
       parse5: 4.0.0
       picocolors: 1.1.1
       postcss: 8.5.6
       postcss-import: 14.1.0(postcss@8.5.6)
-      postcss-loader: 8.2.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      postcss-loader: 8.2.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       sass: 1.97.1
       sass-embedded: 1.97.1
-      sass-loader: 16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.18))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      source-map-loader: 5.0.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      style-loader: 3.3.4(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      ts-checker-rspack-plugin: 1.2.3(@rspack/core@1.6.8(@swc/helpers@0.5.18))(typescript@5.9.3)
+      sass-loader: 16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.23))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      source-map-loader: 5.0.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      style-loader: 3.3.4(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      ts-checker-rspack-plugin: 1.2.3(@rspack/core@1.6.8(@swc/helpers@0.5.23))(typescript@5.9.3)
       tslib: 2.8.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
       webpack-node-externals: 3.0.0
     transitivePeerDependencies:
       - '@babel/traverse'
@@ -15789,19 +15865,19 @@ snapshots:
       - webpack-cli
       - webpack-hot-middleware
 
-  '@nx/web@22.7.1(4b628920197e2640a94b2a773363406b)':
+  '@nx/web@22.7.1(5f4f264ec7c07d507acd7660d73c4398)':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       detect-port: 1.6.1
       http-server: 14.1.1
       picocolors: 1.1.1
       tslib: 2.8.1
     optionalDependencies:
-      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/jest': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
-      '@nx/playwright': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.57.0)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/webpack': 22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.18))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(typescript@5.9.3)
+      '@nx/eslint': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/jest': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3)
+      '@nx/playwright': 22.7.1(@babel/traverse@7.29.7)(@nx/jest@22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))(typescript@5.9.3))(@playwright/test@1.62.0)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(@zkochan/js-yaml@0.0.7)(eslint@9.39.2(jiti@1.21.7))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/webpack': 22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.23))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(typescript@5.9.3)
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@swc-node/register'
@@ -15811,44 +15887,44 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/webpack@22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.18))(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(typescript@5.9.3)':
+  '@nx/webpack@22.7.1(@babel/traverse@7.29.7)(@rspack/core@1.6.8(@swc/helpers@0.5.23))(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(typescript@5.9.3)':
     dependencies:
       '@babel/core': 7.28.5
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/js': 22.7.1(@babel/traverse@7.29.7)(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       ajv: 8.18.0
       autoprefixer: 10.4.23(postcss@8.5.6)
-      babel-loader: 9.2.1(@babel/core@7.28.5)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      babel-loader: 9.2.1(@babel/core@7.28.5)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       browserslist: 4.28.1
-      copy-webpack-plugin: 14.0.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      css-loader: 6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      css-minimizer-webpack-plugin: 8.0.0(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      copy-webpack-plugin: 14.0.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      css-loader: 6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      css-minimizer-webpack-plugin: 8.0.0(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       less: 4.5.1
-      less-loader: 12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.18))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      less-loader: 12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.23))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       loader-utils: 2.0.4
-      mini-css-extract-plugin: 2.4.7(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      mini-css-extract-plugin: 2.4.7(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       parse5: 4.0.0
       picocolors: 1.1.1
       postcss: 8.5.6
       postcss-import: 14.1.0(postcss@8.5.6)
-      postcss-loader: 8.2.1(@rspack/core@1.6.8(@swc/helpers@0.5.18))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      postcss-loader: 8.2.1(@rspack/core@1.6.8(@swc/helpers@0.5.23))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       rxjs: 7.8.2
       sass: 1.97.1
       sass-embedded: 1.97.1
-      sass-loader: 16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.18))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      source-map-loader: 5.0.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      style-loader: 3.3.4(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      terser-webpack-plugin: 5.3.16(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      ts-loader: 9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      sass-loader: 16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.23))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      source-map-loader: 5.0.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      style-loader: 3.3.4(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      terser-webpack-plugin: 5.3.16(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      ts-loader: 9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       tsconfig-paths-webpack-plugin: 4.2.0
       tslib: 2.8.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
-      webpack-dev-server: 5.2.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
+      webpack-dev-server: 5.2.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       webpack-node-externals: 3.0.0
-      webpack-subresource-integrity: 5.1.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      webpack-subresource-integrity: 5.1.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@parcel/css'
@@ -15872,13 +15948,13 @@ snapshots:
       - verdaccio
       - webpack-cli
 
-  '@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))':
+  '@nx/workspace@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))':
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
       '@zkochan/js-yaml': 0.0.7
       chalk: 4.1.2
       enquirer: 2.3.6
-      nx: 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
+      nx: 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
       picomatch: 4.0.4
       semver: 7.7.3
       tslib: 2.8.1
@@ -15888,71 +15964,6 @@ snapshots:
       - '@swc/core'
       - debug
 
-  '@octokit/auth-token@6.0.0': {}
-
-  '@octokit/core@7.0.6':
-    dependencies:
-      '@octokit/auth-token': 6.0.0
-      '@octokit/graphql': 9.0.3
-      '@octokit/request': 10.0.7
-      '@octokit/request-error': 7.1.0
-      '@octokit/types': 16.0.0
-      before-after-hook: 4.0.0
-      universal-user-agent: 7.0.3
-
-  '@octokit/endpoint@11.0.2':
-    dependencies:
-      '@octokit/types': 16.0.0
-      universal-user-agent: 7.0.3
-
-  '@octokit/graphql@9.0.3':
-    dependencies:
-      '@octokit/request': 10.0.7
-      '@octokit/types': 16.0.0
-      universal-user-agent: 7.0.3
-
-  '@octokit/openapi-types@26.0.0': {}
-
-  '@octokit/openapi-types@27.0.0': {}
-
-  '@octokit/plugin-paginate-rest@13.2.1(@octokit/core@7.0.6)':
-    dependencies:
-      '@octokit/core': 7.0.6
-      '@octokit/types': 15.0.2
-
-  '@octokit/plugin-retry@8.0.3(@octokit/core@7.0.6)':
-    dependencies:
-      '@octokit/core': 7.0.6
-      '@octokit/request-error': 7.1.0
-      '@octokit/types': 16.0.0
-      bottleneck: 2.19.5
-
-  '@octokit/plugin-throttling@11.0.3(@octokit/core@7.0.6)':
-    dependencies:
-      '@octokit/core': 7.0.6
-      '@octokit/types': 16.0.0
-      bottleneck: 2.19.5
-
-  '@octokit/request-error@7.1.0':
-    dependencies:
-      '@octokit/types': 16.0.0
-
-  '@octokit/request@10.0.7':
-    dependencies:
-      '@octokit/endpoint': 11.0.2
-      '@octokit/request-error': 7.1.0
-      '@octokit/types': 16.0.0
-      fast-content-type-parse: 3.0.0
-      universal-user-agent: 7.0.3
-
-  '@octokit/types@15.0.2':
-    dependencies:
-      '@octokit/openapi-types': 26.0.0
-
-  '@octokit/types@16.0.0':
-    dependencies:
-      '@octokit/openapi-types': 27.0.0
-
   '@oslojs/encoding@1.1.0': {}
 
   '@oxc-project/types@0.113.0': {}
@@ -16091,21 +16102,9 @@ snapshots:
 
   '@pkgr/core@0.2.9': {}
 
-  '@playwright/test@1.57.0':
+  '@playwright/test@1.62.0':
     dependencies:
-      playwright: 1.57.0
-
-  '@pnpm/config.env-replace@1.1.0': {}
-
-  '@pnpm/network.ca-file@1.0.2':
-    dependencies:
-      graceful-fs: 4.2.10
-
-  '@pnpm/npm-conf@2.3.1':
-    dependencies:
-      '@pnpm/config.env-replace': 1.1.0
-      '@pnpm/network.ca-file': 1.0.2
-      config-chain: 1.1.13
+      playwright: 1.62.0
 
   '@rolldown/binding-android-arm64@1.0.0-rc.4':
     optional: true
@@ -16278,21 +16277,21 @@ snapshots:
       '@rspack/binding-win32-ia32-msvc': 1.6.8
       '@rspack/binding-win32-x64-msvc': 1.6.8
 
-  '@rspack/core@1.6.8(@swc/helpers@0.5.18)':
+  '@rspack/core@1.6.8(@swc/helpers@0.5.23)':
     dependencies:
       '@module-federation/runtime-tools': 0.21.6
       '@rspack/binding': 1.6.8
       '@rspack/lite-tapable': 1.1.0
     optionalDependencies:
-      '@swc/helpers': 0.5.18
+      '@swc/helpers': 0.5.23
 
-  '@rspack/dev-server@1.1.5(@rspack/core@1.6.8(@swc/helpers@0.5.18))(@types/express@5.0.6)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))':
+  '@rspack/dev-server@1.1.5(@rspack/core@1.6.8(@swc/helpers@0.5.23))(@types/express@5.0.6)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))':
     dependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
       chokidar: 3.6.0
       http-proxy-middleware: 2.0.9(@types/express@5.0.6)
       p-retry: 6.2.1
-      webpack-dev-server: 5.2.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      webpack-dev-server: 5.2.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       ws: 8.18.3
     transitivePeerDependencies:
       - '@types/express'
@@ -16329,120 +16328,6 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@sec-ant/readable-stream@0.4.1': {}
-
-  '@semantic-release/changelog@6.0.3(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      '@semantic-release/error': 3.0.0
-      aggregate-error: 3.1.0
-      fs-extra: 11.3.3
-      lodash: 4.18.1
-      semantic-release: 24.2.9(typescript@5.9.3)
-
-  '@semantic-release/commit-analyzer@13.0.1(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      conventional-changelog-angular: 8.1.0
-      conventional-changelog-writer: 8.2.0
-      conventional-commits-filter: 5.0.0
-      conventional-commits-parser: 6.2.1
-      debug: 4.4.3
-      import-from-esm: 2.0.0
-      lodash-es: 4.18.1
-      micromatch: 4.0.8
-      semantic-release: 24.2.9(typescript@5.9.3)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@semantic-release/error@3.0.0': {}
-
-  '@semantic-release/error@4.0.0': {}
-
-  '@semantic-release/git@10.0.1(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      '@semantic-release/error': 3.0.0
-      aggregate-error: 3.1.0
-      debug: 4.4.3
-      dir-glob: 3.0.1
-      execa: 5.1.1
-      lodash: 4.18.1
-      micromatch: 4.0.8
-      p-reduce: 2.1.0
-      semantic-release: 24.2.9(typescript@5.9.3)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@semantic-release/github@11.0.6(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      '@octokit/core': 7.0.6
-      '@octokit/plugin-paginate-rest': 13.2.1(@octokit/core@7.0.6)
-      '@octokit/plugin-retry': 8.0.3(@octokit/core@7.0.6)
-      '@octokit/plugin-throttling': 11.0.3(@octokit/core@7.0.6)
-      '@semantic-release/error': 4.0.0
-      aggregate-error: 5.0.0
-      debug: 4.4.3
-      dir-glob: 3.0.1
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
-      issue-parser: 7.0.1
-      lodash-es: 4.18.1
-      mime: 4.1.0
-      p-filter: 4.1.0
-      semantic-release: 24.2.9(typescript@5.9.3)
-      tinyglobby: 0.2.15
-      url-join: 5.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@semantic-release/npm@12.0.1(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      '@semantic-release/error': 4.0.0
-      aggregate-error: 5.0.0
-      execa: 9.6.1
-      fs-extra: 11.3.3
-      lodash-es: 4.18.1
-      nerf-dart: 1.0.0
-      normalize-url: 8.1.1
-      npm: 10.9.4
-      rc: 1.2.8
-      read-pkg: 9.0.1
-      registry-auth-token: 5.1.0
-      semantic-release: 24.2.9(typescript@5.9.3)
-      semver: 7.7.3
-      tempy: 3.1.0
-
-  '@semantic-release/npm@12.0.2(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      '@semantic-release/error': 4.0.0
-      aggregate-error: 5.0.0
-      execa: 9.6.1
-      fs-extra: 11.3.3
-      lodash-es: 4.18.1
-      nerf-dart: 1.0.0
-      normalize-url: 8.1.1
-      npm: 10.9.4
-      rc: 1.2.8
-      read-pkg: 9.0.1
-      registry-auth-token: 5.1.0
-      semantic-release: 24.2.9(typescript@5.9.3)
-      semver: 7.7.4
-      tempy: 3.1.0
-
-  '@semantic-release/release-notes-generator@14.1.0(semantic-release@24.2.9(typescript@5.9.3))':
-    dependencies:
-      conventional-changelog-angular: 8.1.0
-      conventional-changelog-writer: 8.2.0
-      conventional-commits-filter: 5.0.0
-      conventional-commits-parser: 6.2.1
-      debug: 4.4.3
-      get-stream: 7.0.1
-      import-from-esm: 2.0.0
-      into-stream: 7.0.0
-      lodash-es: 4.18.1
-      read-package-up: 11.0.0
-      semantic-release: 24.2.9(typescript@5.9.3)
-    transitivePeerDependencies:
-      - supports-color
-
   '@shikijs/core@3.22.0':
     dependencies:
       '@shikijs/types': 3.22.0
@@ -16514,8 +16399,6 @@ snapshots:
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
-  '@sindresorhus/merge-streams@4.0.0': {}
-
   '@sinonjs/commons@3.0.1':
     dependencies:
       type-detect: 4.0.8
@@ -16524,20 +16407,26 @@ snapshots:
     dependencies:
       '@sinonjs/commons': 3.0.1
 
+  '@sinonjs/fake-timers@15.4.0':
+    dependencies:
+      '@sinonjs/commons': 3.0.1
+
   '@standard-schema/spec@1.1.0': {}
 
-  '@swc-node/core@1.14.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)':
+  '@swc-node/core@1.15.0(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)':
     dependencies:
-      '@swc/core': 1.15.8(@swc/helpers@0.5.18)
-      '@swc/types': 0.1.25
+      '@swc/core': 1.15.46(@swc/helpers@0.5.23)
+      '@swc/types': 0.1.27
 
-  '@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3)':
+  '@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3)':
     dependencies:
-      '@swc-node/core': 1.14.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)
+      '@node-rs/xxhash': 1.7.6
+      '@swc-node/core': 1.15.0(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)
       '@swc-node/sourcemap-support': 0.6.1
-      '@swc/core': 1.15.8(@swc/helpers@0.5.18)
+      '@swc/core': 1.15.46(@swc/helpers@0.5.23)
       colorette: 2.0.20
       debug: 4.4.3
+      fast-json-stable-stringify: 2.1.0
       oxc-resolver: 11.17.1
       pirates: 4.0.7
       tslib: 2.8.1
@@ -16551,60 +16440,68 @@ snapshots:
       source-map-support: 0.5.21
       tslib: 2.8.1
 
-  '@swc/core-darwin-arm64@1.15.8':
+  '@swc/core-darwin-arm64@1.15.46':
     optional: true
 
-  '@swc/core-darwin-x64@1.15.8':
+  '@swc/core-darwin-x64@1.15.46':
     optional: true
 
-  '@swc/core-linux-arm-gnueabihf@1.15.8':
+  '@swc/core-linux-arm-gnueabihf@1.15.46':
     optional: true
 
-  '@swc/core-linux-arm64-gnu@1.15.8':
+  '@swc/core-linux-arm64-gnu@1.15.46':
     optional: true
 
-  '@swc/core-linux-arm64-musl@1.15.8':
+  '@swc/core-linux-arm64-musl@1.15.46':
     optional: true
 
-  '@swc/core-linux-x64-gnu@1.15.8':
+  '@swc/core-linux-ppc64-gnu@1.15.46':
     optional: true
 
-  '@swc/core-linux-x64-musl@1.15.8':
+  '@swc/core-linux-s390x-gnu@1.15.46':
     optional: true
 
-  '@swc/core-win32-arm64-msvc@1.15.8':
+  '@swc/core-linux-x64-gnu@1.15.46':
     optional: true
 
-  '@swc/core-win32-ia32-msvc@1.15.8':
+  '@swc/core-linux-x64-musl@1.15.46':
     optional: true
 
-  '@swc/core-win32-x64-msvc@1.15.8':
+  '@swc/core-win32-arm64-msvc@1.15.46':
     optional: true
 
-  '@swc/core@1.15.8(@swc/helpers@0.5.18)':
+  '@swc/core-win32-ia32-msvc@1.15.46':
+    optional: true
+
+  '@swc/core-win32-x64-msvc@1.15.46':
+    optional: true
+
+  '@swc/core@1.15.46(@swc/helpers@0.5.23)':
     dependencies:
       '@swc/counter': 0.1.3
-      '@swc/types': 0.1.25
+      '@swc/types': 0.1.27
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.15.8
-      '@swc/core-darwin-x64': 1.15.8
-      '@swc/core-linux-arm-gnueabihf': 1.15.8
-      '@swc/core-linux-arm64-gnu': 1.15.8
-      '@swc/core-linux-arm64-musl': 1.15.8
-      '@swc/core-linux-x64-gnu': 1.15.8
-      '@swc/core-linux-x64-musl': 1.15.8
-      '@swc/core-win32-arm64-msvc': 1.15.8
-      '@swc/core-win32-ia32-msvc': 1.15.8
-      '@swc/core-win32-x64-msvc': 1.15.8
-      '@swc/helpers': 0.5.18
+      '@swc/core-darwin-arm64': 1.15.46
+      '@swc/core-darwin-x64': 1.15.46
+      '@swc/core-linux-arm-gnueabihf': 1.15.46
+      '@swc/core-linux-arm64-gnu': 1.15.46
+      '@swc/core-linux-arm64-musl': 1.15.46
+      '@swc/core-linux-ppc64-gnu': 1.15.46
+      '@swc/core-linux-s390x-gnu': 1.15.46
+      '@swc/core-linux-x64-gnu': 1.15.46
+      '@swc/core-linux-x64-musl': 1.15.46
+      '@swc/core-win32-arm64-msvc': 1.15.46
+      '@swc/core-win32-ia32-msvc': 1.15.46
+      '@swc/core-win32-x64-msvc': 1.15.46
+      '@swc/helpers': 0.5.23
 
   '@swc/counter@0.1.3': {}
 
-  '@swc/helpers@0.5.18':
+  '@swc/helpers@0.5.23':
     dependencies:
       tslib: 2.8.1
 
-  '@swc/types@0.1.25':
+  '@swc/types@0.1.27':
     dependencies:
       '@swc/counter': 0.1.3
 
@@ -16612,10 +16509,10 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@tailwindcss/typography@0.5.19(tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2))':
+  '@tailwindcss/typography@0.5.20(tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0))':
     dependencies:
       postcss-selector-parser: 6.0.10
-      tailwindcss: 3.4.19(tsx@4.21.0)(yaml@2.8.2)
+      tailwindcss: 3.4.19(tsx@4.23.1)(yaml@2.9.0)
 
   '@tootallnate/once@2.0.1': {}
 
@@ -16815,8 +16712,6 @@ snapshots:
     dependencies:
       '@types/node': 20.19.9
 
-  '@types/node@17.0.45': {}
-
   '@types/node@20.19.9':
     dependencies:
       undici-types: 6.21.0
@@ -16825,8 +16720,6 @@ snapshots:
     dependencies:
       undici-types: 7.18.2
 
-  '@types/normalize-package-data@2.4.4': {}
-
   '@types/parse-json@4.0.2': {}
 
   '@types/plist@3.0.5':
@@ -16851,8 +16744,6 @@ snapshots:
 
   '@types/semver@7.5.8': {}
 
-  '@types/semver@7.7.1': {}
-
   '@types/send@0.17.6':
     dependencies:
       '@types/mime': 1.3.5
@@ -16889,12 +16780,10 @@ snapshots:
 
   '@types/unist@3.0.3': {}
 
-  '@types/uuid@10.0.0': {}
-
   '@types/verror@1.10.11':
     optional: true
 
-  '@types/video.js@7.3.29': {}
+  '@types/video.js@7.3.58': {}
 
   '@types/ws@8.18.1':
     dependencies:
@@ -16906,28 +16795,28 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  '@typescript-eslint/eslint-plugin@8.51.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.65.0(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.51.0
-      '@typescript-eslint/type-utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/parser': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/type-utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.65.0
       eslint: 9.39.2(jiti@1.21.7)
       ignore: 7.0.5
       natural-compare: 1.4.0
-      ts-api-utils: 2.4.0(typescript@5.9.3)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.51.0
-      '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.51.0
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.65.0
       debug: 4.4.3
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
@@ -16943,15 +16832,33 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.65.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.65.0
+      debug: 4.4.3
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.51.0':
     dependencies:
       '@typescript-eslint/types': 8.51.0
       '@typescript-eslint/visitor-keys': 8.51.0
 
+  '@typescript-eslint/scope-manager@8.65.0':
+    dependencies:
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/visitor-keys': 8.65.0
+
   '@typescript-eslint/tsconfig-utils@8.51.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
+  '@typescript-eslint/tsconfig-utils@8.65.0(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
   '@typescript-eslint/type-utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 8.51.0
@@ -16964,8 +16871,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/type-utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      debug: 4.4.3
+      eslint: 9.39.2(jiti@1.21.7)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/types@8.51.0': {}
 
+  '@typescript-eslint/types@8.65.0': {}
+
   '@typescript-eslint/typescript-estree@8.51.0(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/project-service': 8.51.0(typescript@5.9.3)
@@ -16974,13 +16895,28 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.51.0
       debug: 4.4.3
       minimatch: 9.0.5
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
       ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/typescript-estree@8.65.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/visitor-keys': 8.65.0
+      debug: 4.4.3
+      minimatch: 10.2.4
+      semver: 7.7.4
+      tinyglobby: 0.2.15
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
@@ -16992,11 +16928,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
+      '@typescript-eslint/scope-manager': 8.65.0
+      '@typescript-eslint/types': 8.65.0
+      '@typescript-eslint/typescript-estree': 8.65.0(typescript@5.9.3)
+      eslint: 9.39.2(jiti@1.21.7)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/visitor-keys@8.51.0':
     dependencies:
       '@typescript-eslint/types': 8.51.0
       eslint-visitor-keys: 4.2.1
 
+  '@typescript-eslint/visitor-keys@8.65.0':
+    dependencies:
+      '@typescript-eslint/types': 8.65.0
+      eslint-visitor-keys: 5.0.1
+
   '@ungap/structured-clone@1.3.0': {}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
@@ -17069,16 +17021,16 @@ snapshots:
       mux.js: 6.0.1
       video.js: 7.21.7
 
-  '@videojs/http-streaming@3.17.2(video.js@8.23.4)':
+  '@videojs/http-streaming@3.17.5(video.js@8.23.9)':
     dependencies:
       '@babel/runtime': 7.28.4
-      '@videojs/vhs-utils': 4.1.1
+      '@videojs/vhs-utils': 4.1.2
       aes-decrypter: 4.0.2
       global: 4.4.0
       m3u8-parser: 7.2.0
-      mpd-parser: 1.3.1
+      mpd-parser: 1.4.0
       mux.js: 7.1.0
-      video.js: 8.23.4
+      video.js: 8.23.9
 
   '@videojs/vhs-utils@3.0.5':
     dependencies:
@@ -17086,7 +17038,7 @@ snapshots:
       global: 4.4.0
       url-toolkit: 2.2.5
 
-  '@videojs/vhs-utils@4.1.1':
+  '@videojs/vhs-utils@4.1.2':
     dependencies:
       '@babel/runtime': 7.28.4
       global: 4.4.0
@@ -17103,9 +17055,9 @@ snapshots:
       global: 4.4.0
       is-function: 1.0.2
 
-  '@vitejs/plugin-basic-ssl@2.1.4(vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitejs/plugin-basic-ssl@2.1.4(vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0))':
     dependencies:
-      vite: 7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0)
 
   '@webassemblyjs/ast@1.14.1':
     dependencies:
@@ -17183,7 +17135,7 @@ snapshots:
       '@webassemblyjs/ast': 1.14.1
       '@xtuc/long': 4.2.2
 
-  '@xmldom/xmldom@0.8.11': {}
+  '@xmldom/xmldom@0.8.13': {}
 
   '@xtuc/ieee754@1.2.0': {}
 
@@ -17228,8 +17180,6 @@ snapshots:
 
   acorn@8.15.0: {}
 
-  add-stream@1.0.0: {}
-
   address@1.2.2: {}
 
   adm-zip@0.5.10: {}
@@ -17246,7 +17196,7 @@ snapshots:
   aes-decrypter@4.0.2:
     dependencies:
       '@babel/runtime': 7.28.4
-      '@videojs/vhs-utils': 4.1.1
+      '@videojs/vhs-utils': 4.1.2
       global: 4.4.0
       pkcs7: 1.0.4
 
@@ -17267,19 +17217,10 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  aggregate-error@5.0.0:
-    dependencies:
-      clean-stack: 5.3.0
-      indent-string: 5.0.0
-
   ajv-formats@2.1.1(ajv@8.18.0):
     optionalDependencies:
       ajv: 8.18.0
 
-  ajv-formats@3.0.1(ajv@8.17.1):
-    optionalDependencies:
-      ajv: 8.17.1
-
   ajv-formats@3.0.1(ajv@8.18.0):
     optionalDependencies:
       ajv: 8.18.0
@@ -17300,17 +17241,10 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.17.1:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-uri: 3.1.0
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-
   ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.1.0
+      fast-uri: 3.1.4
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -17331,29 +17265,29 @@ snapshots:
       '@algolia/requester-fetch': 5.48.1
       '@algolia/requester-node-http': 5.48.1
 
-  angular-eslint@21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3):
+  angular-eslint@21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript-eslint@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(typescript@5.9.3):
     dependencies:
       '@angular-devkit/core': 21.2.17(chokidar@5.0.0)
       '@angular-devkit/schematics': 21.2.17(chokidar@5.0.0)
       '@angular-eslint/builder': 21.3.1(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@angular-eslint/eslint-plugin': 21.3.1(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@angular-eslint/eslint-plugin-template': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@angular-eslint/schematics': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin': 21.3.1(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/eslint-plugin-template': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@angular-eslint/schematics': 21.3.1(@angular-eslint/template-parser@21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(@angular/cli@21.2.17(@types/node@20.19.9)(chokidar@5.0.0))(@typescript-eslint/types@8.51.0)(@typescript-eslint/utils@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(chokidar@5.0.0)(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular-eslint/template-parser': 21.3.1(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       '@angular/cli': 21.2.17(@types/node@20.19.9)(chokidar@5.0.0)
       '@typescript-eslint/types': 8.51.0
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
-      typescript-eslint: 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      typescript-eslint: 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
     transitivePeerDependencies:
       - chokidar
       - supports-color
 
-  angularx-qrcode@21.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)):
+  angularx-qrcode@21.0.4(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)):
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       qrcode: 1.5.4
       tslib: 2.8.1
 
@@ -17377,10 +17311,6 @@ snapshots:
 
   ansi-regex@6.2.2: {}
 
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
   ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
@@ -17425,7 +17355,7 @@ snapshots:
       hosted-git-info: 4.1.0
       is-ci: 3.0.1
       isbinaryfile: 5.0.7
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       json5: 2.2.3
       lazy-val: 1.0.5
       minimatch: 10.1.1
@@ -17449,8 +17379,6 @@ snapshots:
 
   argparse@2.0.1: {}
 
-  argv-formatter@1.0.0: {}
-
   aria-query@5.3.2: {}
 
   array-buffer-byte-length@1.0.2:
@@ -17460,8 +17388,6 @@ snapshots:
 
   array-flatten@1.1.1: {}
 
-  array-ify@1.0.0: {}
-
   array-includes@3.1.9:
     dependencies:
       call-bind: 1.0.8
@@ -17509,7 +17435,7 @@ snapshots:
       get-intrinsic: 1.3.0
       is-array-buffer: 3.0.5
 
-  artplayer@5.3.0:
+  artplayer@5.4.0:
     dependencies:
       option-validator: 2.0.6
 
@@ -17521,7 +17447,7 @@ snapshots:
 
   astring@1.9.0: {}
 
-  astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2):
+  astro@5.18.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(rollup@4.59.0)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(typescript@5.9.3)(yaml@2.9.0):
     dependencies:
       '@astrojs/compiler': 2.13.1
       '@astrojs/internal-helpers': 0.7.6
@@ -17554,7 +17480,7 @@ snapshots:
       html-escaper: 3.0.3
       http-cache-semantics: 4.2.0
       import-meta-resolve: 4.2.0
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       magic-string: 0.30.21
       magicast: 0.5.2
       mrmime: 2.0.1
@@ -17578,8 +17504,8 @@ snapshots:
       unist-util-visit: 5.1.0
       unstorage: 1.17.4
       vfile: 6.0.3
-      vite: 6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
-      vitefu: 1.1.1(vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2))
+      vite: 6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0)
+      vitefu: 1.1.1(vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0))
       xxhash-wasm: 1.1.0
       yargs-parser: 21.1.1
       yocto-spinner: 0.2.3
@@ -17649,18 +17575,20 @@ snapshots:
   axios@1.15.0:
     dependencies:
       follow-redirects: 1.16.0(debug@4.4.3)
-      form-data: 4.0.5
+      form-data: 4.0.6
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
 
-  axios@1.16.0:
+  axios@1.18.1:
     dependencies:
       follow-redirects: 1.16.0(debug@4.4.3)
-      form-data: 4.0.5
+      form-data: 4.0.6
+      https-proxy-agent: 5.0.1
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
+      - supports-color
 
   axobject-query@4.1.0: {}
 
@@ -17677,26 +17605,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  babel-jest@30.2.0(@babel/core@7.29.0):
+  babel-jest@30.4.1(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
-      '@jest/transform': 30.2.0
+      '@babel/core': 7.29.7
+      '@jest/transform': 30.4.1
       '@types/babel__core': 7.20.5
       babel-plugin-istanbul: 7.0.1
-      babel-preset-jest: 30.2.0(@babel/core@7.29.0)
+      babel-preset-jest: 30.4.0(@babel/core@7.29.7)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
-    optional: true
 
-  babel-loader@9.2.1(@babel/core@7.28.5)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  babel-loader@9.2.1(@babel/core@7.28.5)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       '@babel/core': 7.28.5
       find-cache-dir: 4.0.0
       schema-utils: 4.3.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   babel-plugin-const-enum@1.2.0(@babel/core@7.28.5):
     dependencies:
@@ -17721,6 +17648,10 @@ snapshots:
     dependencies:
       '@types/babel__core': 7.20.5
 
+  babel-plugin-jest-hoist@30.4.0:
+    dependencies:
+      '@types/babel__core': 7.20.5
+
   babel-plugin-macros@3.1.0:
     dependencies:
       '@babel/runtime': 7.28.4
@@ -17796,18 +17727,36 @@ snapshots:
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.0)
       '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.0)
 
+  babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.7):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.29.7)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.29.7)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.29.7)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.29.7)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.29.7)
+
   babel-preset-jest@30.2.0(@babel/core@7.28.5):
     dependencies:
       '@babel/core': 7.28.5
       babel-plugin-jest-hoist: 30.2.0
       babel-preset-current-node-syntax: 1.2.0(@babel/core@7.28.5)
 
-  babel-preset-jest@30.2.0(@babel/core@7.29.0):
+  babel-preset-jest@30.4.0(@babel/core@7.29.7):
     dependencies:
-      '@babel/core': 7.29.0
-      babel-plugin-jest-hoist: 30.2.0
-      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.0)
-    optional: true
+      '@babel/core': 7.29.7
+      babel-plugin-jest-hoist: 30.4.0
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
 
   bail@2.0.2: {}
 
@@ -17841,8 +17790,6 @@ snapshots:
       postcss-media-query-parser: 0.2.3
       postcss-safe-parser: 7.0.1(postcss@8.5.6)
 
-  before-after-hook@4.0.0: {}
-
   better-sqlite3@12.9.0:
     dependencies:
       bindings: 1.5.0
@@ -17900,8 +17847,6 @@ snapshots:
 
   boolbase@1.0.0: {}
 
-  bottleneck@2.19.5: {}
-
   boxen@8.0.1:
     dependencies:
       ansi-align: 3.0.1
@@ -17992,7 +17937,7 @@ snapshots:
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       is-ci: 3.0.1
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       sanitize-filename: 1.6.3
       source-map-support: 0.5.21
       stat-mode: 1.0.0
@@ -18096,12 +18041,6 @@ snapshots:
 
   ccount@2.0.1: {}
 
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
   chalk@3.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -18164,10 +18103,6 @@ snapshots:
 
   clean-stack@2.2.0: {}
 
-  clean-stack@5.3.0:
-    dependencies:
-      escape-string-regexp: 5.0.0
-
   cli-boxes@3.0.0: {}
 
   cli-cursor@3.1.0:
@@ -18178,27 +18113,12 @@ snapshots:
     dependencies:
       restore-cursor: 5.1.0
 
-  cli-highlight@2.1.11:
-    dependencies:
-      chalk: 4.1.2
-      highlight.js: 10.7.3
-      mz: 2.7.0
-      parse5: 5.1.1
-      parse5-htmlparser2-tree-adapter: 6.0.1
-      yargs: 16.2.0
-
   cli-spinners@2.6.1: {}
 
   cli-spinners@2.9.2: {}
 
   cli-spinners@3.4.0: {}
 
-  cli-table3@0.6.5:
-    dependencies:
-      string-width: 4.2.3
-    optionalDependencies:
-      '@colors/colors': 1.5.0
-
   cli-truncate@2.1.0:
     dependencies:
       slice-ansi: 3.0.0
@@ -18218,12 +18138,6 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 6.2.0
 
-  cliui@7.0.4:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -18256,16 +18170,10 @@ snapshots:
 
   collect-v8-coverage@1.0.3: {}
 
-  color-convert@1.9.3:
-    dependencies:
-      color-name: 1.1.3
-
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
 
-  color-name@1.1.3: {}
-
   color-name@1.1.4: {}
 
   colorette@2.0.20: {}
@@ -18298,11 +18206,6 @@ snapshots:
 
   common-path-prefix@3.0.0: {}
 
-  compare-func@2.0.0:
-    dependencies:
-      array-ify: 1.0.0
-      dot-prop: 5.3.0
-
   compare-version@0.1.2: {}
 
   compressible@2.0.18:
@@ -18323,11 +18226,6 @@ snapshots:
 
   concat-map@0.0.1: {}
 
-  config-chain@1.1.13:
-    dependencies:
-      ini: 1.3.8
-      proto-list: 1.2.4
-
   config-file-ts@0.2.8-rc1:
     dependencies:
       glob: 10.5.0
@@ -18345,87 +18243,6 @@ snapshots:
 
   content-type@1.0.5: {}
 
-  conventional-changelog-angular@8.1.0:
-    dependencies:
-      compare-func: 2.0.0
-
-  conventional-changelog-atom@5.0.0: {}
-
-  conventional-changelog-cli@5.0.0(conventional-commits-filter@5.0.0):
-    dependencies:
-      add-stream: 1.0.0
-      conventional-changelog: 6.0.0(conventional-commits-filter@5.0.0)
-      meow: 13.2.0
-      tempfile: 5.0.0
-    transitivePeerDependencies:
-      - conventional-commits-filter
-
-  conventional-changelog-codemirror@5.0.0: {}
-
-  conventional-changelog-conventionalcommits@8.0.0:
-    dependencies:
-      compare-func: 2.0.0
-
-  conventional-changelog-core@8.0.0(conventional-commits-filter@5.0.0):
-    dependencies:
-      '@hutson/parse-repository-url': 5.0.0
-      add-stream: 1.0.0
-      conventional-changelog-writer: 8.2.0
-      conventional-commits-parser: 6.2.1
-      git-raw-commits: 5.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1)
-      git-semver-tags: 8.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1)
-      hosted-git-info: 7.0.2
-      normalize-package-data: 6.0.2
-      read-package-up: 11.0.0
-      read-pkg: 9.0.1
-    transitivePeerDependencies:
-      - conventional-commits-filter
-
-  conventional-changelog-ember@5.0.0: {}
-
-  conventional-changelog-eslint@6.0.0: {}
-
-  conventional-changelog-express@5.0.0: {}
-
-  conventional-changelog-jquery@6.0.0: {}
-
-  conventional-changelog-jshint@5.0.0:
-    dependencies:
-      compare-func: 2.0.0
-
-  conventional-changelog-preset-loader@5.0.0: {}
-
-  conventional-changelog-writer@8.2.0:
-    dependencies:
-      conventional-commits-filter: 5.0.0
-      handlebars: 4.7.8
-      meow: 13.2.0
-      semver: 7.7.4
-
-  conventional-changelog@6.0.0(conventional-commits-filter@5.0.0):
-    dependencies:
-      conventional-changelog-angular: 8.1.0
-      conventional-changelog-atom: 5.0.0
-      conventional-changelog-codemirror: 5.0.0
-      conventional-changelog-conventionalcommits: 8.0.0
-      conventional-changelog-core: 8.0.0(conventional-commits-filter@5.0.0)
-      conventional-changelog-ember: 5.0.0
-      conventional-changelog-eslint: 6.0.0
-      conventional-changelog-express: 5.0.0
-      conventional-changelog-jquery: 6.0.0
-      conventional-changelog-jshint: 5.0.0
-      conventional-changelog-preset-loader: 5.0.0
-    transitivePeerDependencies:
-      - conventional-commits-filter
-
-  conventional-commits-filter@5.0.0: {}
-
-  conventional-commits-parser@6.2.1:
-    dependencies:
-      meow: 13.2.0
-
-  convert-hrtime@5.0.0: {}
-
   convert-source-map@1.9.0: {}
 
   convert-source-map@2.0.0: {}
@@ -18449,7 +18266,7 @@ snapshots:
     dependencies:
       is-what: 3.14.1
 
-  copy-webpack-plugin@12.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  copy-webpack-plugin@12.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       fast-glob: 3.3.3
       glob-parent: 6.0.2
@@ -18457,16 +18274,16 @@ snapshots:
       normalize-path: 3.0.0
       schema-utils: 4.3.3
       serialize-javascript: 6.0.2
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  copy-webpack-plugin@14.0.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  copy-webpack-plugin@14.0.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       glob-parent: 6.0.2
       normalize-path: 3.0.0
       schema-utils: 4.3.3
       serialize-javascript: 7.0.5
       tinyglobby: 0.2.15
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   core-js-compat@3.47.0:
     dependencies:
@@ -18495,7 +18312,7 @@ snapshots:
   cosmiconfig@8.3.6(typescript@5.9.3):
     dependencies:
       import-fresh: 3.3.1
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       parse-json: 5.2.0
       path-type: 4.0.0
     optionalDependencies:
@@ -18505,7 +18322,7 @@ snapshots:
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.1
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       parse-json: 5.2.0
     optionalDependencies:
       typescript: 5.9.3
@@ -18534,15 +18351,11 @@ snapshots:
     dependencies:
       uncrypto: 0.1.3
 
-  crypto-random-string@4.0.0:
-    dependencies:
-      type-fest: 1.4.0
-
   css-declaration-sorter@7.3.1(postcss@8.5.6):
     dependencies:
       postcss: 8.5.6
 
-  css-loader@6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  css-loader@6.11.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.5.6)
       postcss: 8.5.6
@@ -18553,10 +18366,10 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.7.4
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  css-minimizer-webpack-plugin@8.0.0(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  css-minimizer-webpack-plugin@8.0.0(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       cssnano: 7.1.9(postcss@8.5.6)
@@ -18564,7 +18377,7 @@ snapshots:
       postcss: 8.5.6
       schema-utils: 4.3.3
       serialize-javascript: 7.0.5
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     optionalDependencies:
       esbuild: 0.28.1
 
@@ -18676,7 +18489,7 @@ snapshots:
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
-  date-fns@4.1.0: {}
+  date-fns@4.4.0: {}
 
   date-format@4.0.14: {}
 
@@ -18802,10 +18615,6 @@ snapshots:
       minimatch: 3.1.2
       p-limit: 3.1.0
 
-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
-
   dlv@1.1.3: {}
 
   dmg-builder@26.0.12(electron-builder-squirrel-windows@26.0.12):
@@ -18815,7 +18624,7 @@ snapshots:
       builder-util-runtime: 9.3.1
       fs-extra: 10.1.0
       iconv-lite: 0.6.3
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
     optionalDependencies:
       dmg-license: 1.0.11
     transitivePeerDependencies:
@@ -18863,10 +18672,6 @@ snapshots:
       domelementtype: 2.3.0
       domhandler: 5.0.3
 
-  dot-prop@5.3.0:
-    dependencies:
-      is-obj: 2.0.0
-
   dotenv-expand@11.0.7:
     dependencies:
       dotenv: 16.6.1
@@ -18879,14 +18684,12 @@ snapshots:
 
   dotenv@16.6.1: {}
 
-  drizzle-kit@0.31.5:
+  drizzle-kit@0.31.10:
     dependencies:
       '@drizzle-team/brocli': 0.10.2
       '@esbuild-kit/esm-loader': 2.6.5
       esbuild: 0.25.12
-      esbuild-register: 3.6.0(esbuild@0.25.12)
-    transitivePeerDependencies:
-      - supports-color
+      tsx: 4.23.1
 
   drizzle-orm@0.45.2(@types/better-sqlite3@7.6.13)(better-sqlite3@12.9.0):
     optionalDependencies:
@@ -18901,10 +18704,6 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  duplexer2@0.1.4:
-    dependencies:
-      readable-stream: 2.3.8
-
   eastasianwidth@0.2.0: {}
 
   ee-first@1.1.1: {}
@@ -18944,15 +18743,9 @@ snapshots:
 
   electron-conf@1.3.0(electron@41.7.2):
     dependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
       electron: 41.7.2
 
-  electron-dl@4.0.0:
-    dependencies:
-      ext-name: 5.0.0
-      pupa: 3.3.0
-      unused-filename: 4.0.1
-
   electron-playwright-helpers@1.8.2:
     dependencies:
       '@electron/asar': 3.4.1
@@ -18963,7 +18756,7 @@ snapshots:
       builder-util: 26.0.11
       builder-util-runtime: 9.3.1
       chalk: 4.1.2
-      form-data: 4.0.5
+      form-data: 4.0.6
       fs-extra: 10.1.0
       lazy-val: 1.0.5
       mime: 2.6.0
@@ -18978,7 +18771,7 @@ snapshots:
     dependencies:
       builder-util-runtime: 9.7.0
       fs-extra: 10.1.0
-      js-yaml: 4.1.1
+      js-yaml: 4.3.0
       lazy-val: 1.0.5
       lodash.escaperegexp: 4.1.2
       lodash.isequal: 4.5.0
@@ -19015,8 +18808,6 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
-  emojilib@2.4.0: {}
-
   emojis-list@3.0.0: {}
 
   encodeurl@2.0.0: {}
@@ -19042,11 +18833,6 @@ snapshots:
 
   entities@6.0.1: {}
 
-  env-ci@11.2.0:
-    dependencies:
-      execa: 8.0.1
-      java-properties: 1.0.2
-
   env-paths@2.2.1: {}
 
   env-paths@3.0.0: {}
@@ -19174,13 +18960,6 @@ snapshots:
       esast-util-from-estree: 2.0.0
       vfile-message: 4.0.3
 
-  esbuild-register@3.6.0(esbuild@0.25.12):
-    dependencies:
-      debug: 4.4.3
-      esbuild: 0.25.12
-    transitivePeerDependencies:
-      - supports-color
-
   esbuild-register@3.6.0(esbuild@0.28.1):
     dependencies:
       debug: 4.4.3
@@ -19305,8 +19084,6 @@ snapshots:
 
   escalade@3.2.0: {}
 
-  escape-goat@4.0.0: {}
-
   escape-html@1.0.3: {}
 
   escape-string-regexp@1.0.5: {}
@@ -19329,17 +19106,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@1.21.7)):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@1.21.7)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7)):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -19350,7 +19127,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.39.2(jiti@1.21.7)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@1.21.7))
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@1.21.7))
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -19362,7 +19139,7 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -19394,6 +19171,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@9.39.2(jiti@1.21.7):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@1.21.7))
@@ -19401,7 +19180,7 @@ snapshots:
       '@eslint/config-array': 0.21.1
       '@eslint/config-helpers': 0.4.2
       '@eslint/core': 0.17.0
-      '@eslint/eslintrc': 3.3.1
+      '@eslint/eslintrc': 3.3.6
       '@eslint/js': 9.39.2
       '@eslint/plugin-kit': 0.4.1
       '@humanfs/node': 0.16.7
@@ -19524,33 +19303,6 @@ snapshots:
       signal-exit: 3.0.7
       strip-final-newline: 2.0.0
 
-  execa@8.0.1:
-    dependencies:
-      cross-spawn: 7.0.6
-      get-stream: 8.0.1
-      human-signals: 5.0.0
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.3.0
-      onetime: 6.0.0
-      signal-exit: 4.1.0
-      strip-final-newline: 3.0.0
-
-  execa@9.6.1:
-    dependencies:
-      '@sindresorhus/merge-streams': 4.0.0
-      cross-spawn: 7.0.6
-      figures: 6.1.0
-      get-stream: 9.0.1
-      human-signals: 8.0.1
-      is-plain-obj: 4.1.0
-      is-stream: 4.0.1
-      npm-run-path: 6.0.0
-      pretty-ms: 9.3.0
-      signal-exit: 4.1.0
-      strip-final-newline: 4.0.0
-      yoctocolors: 2.1.2
-
   exit-x@0.2.2: {}
 
   expand-template@2.0.3: {}
@@ -19568,6 +19320,15 @@ snapshots:
       jest-mock: 30.2.0
       jest-util: 30.2.0
 
+  expect@30.4.1:
+    dependencies:
+      '@jest/expect-utils': 30.4.1
+      '@jest/get-type': 30.1.0
+      jest-matcher-utils: 30.4.1
+      jest-message-util: 30.4.1
+      jest-mock: 30.4.1
+      jest-util: 30.4.1
+
   exponential-backoff@3.1.3: {}
 
   express-rate-limit@8.3.0(express@5.2.1):
@@ -19644,22 +19405,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ext-list@2.2.2:
-    dependencies:
-      mime-db: 1.54.0
-
-  ext-name@5.0.0:
-    dependencies:
-      ext-list: 2.2.2
-      sort-keys-length: 1.0.1
-
   extend@3.0.2: {}
 
   extsprintf@1.4.1:
     optional: true
 
-  fast-content-type-parse@3.0.0: {}
-
   fast-deep-equal@3.1.3: {}
 
   fast-glob@3.3.3:
@@ -19674,7 +19424,7 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-uri@3.1.0: {}
+  fast-uri@3.1.4: {}
 
   fastq@1.20.1:
     dependencies:
@@ -19692,18 +19442,10 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.4
 
-  figures@2.0.0:
-    dependencies:
-      escape-string-regexp: 1.0.5
-
   figures@3.2.0:
     dependencies:
       escape-string-regexp: 1.0.5
 
-  figures@6.1.0:
-    dependencies:
-      is-unicode-supported: 2.1.0
-
   file-entry-cache@8.0.0:
     dependencies:
       flat-cache: 4.0.1
@@ -19754,12 +19496,6 @@ snapshots:
     dependencies:
       find-file-up: 2.0.1
 
-  find-up-simple@1.0.1: {}
-
-  find-up@2.1.0:
-    dependencies:
-      locate-path: 2.0.0
-
   find-up@4.1.0:
     dependencies:
       locate-path: 5.0.0
@@ -19775,11 +19511,6 @@ snapshots:
       locate-path: 7.2.0
       path-exists: 5.0.0
 
-  find-versions@6.0.0:
-    dependencies:
-      semver-regex: 4.0.5
-      super-regex: 1.1.0
-
   fix-path@5.0.0:
     dependencies:
       shell-path: 3.1.0
@@ -19817,7 +19548,7 @@ snapshots:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  fork-ts-checker-webpack-plugin@9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  fork-ts-checker-webpack-plugin@9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       '@babel/code-frame': 7.27.1
       chalk: 4.1.2
@@ -19832,14 +19563,14 @@ snapshots:
       semver: 7.7.4
       tapable: 2.3.0
       typescript: 5.9.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  form-data@4.0.5:
+  form-data@4.0.6:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       es-set-tostringtag: 2.1.0
-      hasown: 2.0.3
+      hasown: 2.0.4
       mime-types: 2.1.35
 
   forwarded@0.2.0: {}
@@ -19850,11 +19581,6 @@ snapshots:
 
   fresh@2.0.0: {}
 
-  from2@2.3.0:
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.8
-
   fs-constants@1.0.0: {}
 
   fs-extra@10.1.0:
@@ -19863,12 +19589,6 @@ snapshots:
       jsonfile: 6.2.0
       universalify: 2.0.1
 
-  fs-extra@11.3.3:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.2.0
-      universalify: 2.0.1
-
   fs-extra@11.3.5:
     dependencies:
       graceful-fs: 4.2.11
@@ -19914,8 +19634,6 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  function-timeout@1.0.2: {}
-
   function.prototype.name@1.1.8:
     dependencies:
       call-bind: 1.0.8
@@ -19963,15 +19681,6 @@ snapshots:
 
   get-stream@6.0.1: {}
 
-  get-stream@7.0.1: {}
-
-  get-stream@8.0.1: {}
-
-  get-stream@9.0.1:
-    dependencies:
-      '@sec-ant/readable-stream': 0.4.1
-      is-stream: 4.0.1
-
   get-symbol-description@1.1.0:
     dependencies:
       call-bound: 1.0.4
@@ -19982,31 +19691,6 @@ snapshots:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
-  git-log-parser@1.2.1:
-    dependencies:
-      argv-formatter: 1.0.0
-      spawn-error-forwarder: 1.0.0
-      split2: 1.0.0
-      stream-combiner2: 1.1.1
-      through2: 2.0.5
-      traverse: 0.6.8
-
-  git-raw-commits@5.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1):
-    dependencies:
-      '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1)
-      meow: 13.2.0
-    transitivePeerDependencies:
-      - conventional-commits-filter
-      - conventional-commits-parser
-
-  git-semver-tags@8.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1):
-    dependencies:
-      '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.2.1)
-      meow: 13.2.0
-    transitivePeerDependencies:
-      - conventional-commits-filter
-      - conventional-commits-parser
-
   github-from-package@0.0.0: {}
 
   github-slugger@2.0.0: {}
@@ -20114,8 +19798,6 @@ snapshots:
       p-cancelable: 2.1.1
       responselike: 2.0.1
 
-  graceful-fs@4.2.10: {}
-
   graceful-fs@4.2.11: {}
 
   h3@1.15.10:
@@ -20132,7 +19814,7 @@ snapshots:
 
   handle-thing@2.0.1: {}
 
-  handlebars@4.7.8:
+  handlebars@4.7.9:
     dependencies:
       minimist: 1.2.8
       neo-async: 2.6.2
@@ -20145,8 +19827,6 @@ snapshots:
 
   has-bigints@1.1.0: {}
 
-  has-flag@3.0.0: {}
-
   has-flag@4.0.0: {}
 
   has-property-descriptors@1.0.2:
@@ -20171,6 +19851,10 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  hasown@2.0.4:
+    dependencies:
+      function-bind: 1.1.2
+
   hast-util-from-html@2.0.3:
     dependencies:
       '@types/hast': 3.0.4
@@ -20301,9 +19985,7 @@ snapshots:
 
   he@1.2.0: {}
 
-  highlight.js@10.7.3: {}
-
-  hls.js@1.6.13: {}
+  hls.js@1.6.16: {}
 
   homedir-polyfill@1.0.3:
     dependencies:
@@ -20311,20 +19993,10 @@ snapshots:
 
   hono@4.12.14: {}
 
-  hook-std@4.0.0: {}
-
   hosted-git-info@4.1.0:
     dependencies:
       lru-cache: 6.0.0
 
-  hosted-git-info@7.0.2:
-    dependencies:
-      lru-cache: 10.4.3
-
-  hosted-git-info@8.1.0:
-    dependencies:
-      lru-cache: 10.4.3
-
   hosted-git-info@9.0.2:
     dependencies:
       lru-cache: 11.2.4
@@ -20491,10 +20163,6 @@ snapshots:
 
   human-signals@2.1.0: {}
 
-  human-signals@5.0.0: {}
-
-  human-signals@8.0.1: {}
-
   humanize-ms@1.2.1:
     dependencies:
       ms: 2.1.3
@@ -20547,13 +20215,6 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  import-from-esm@2.0.0:
-    dependencies:
-      debug: 4.4.3
-      import-meta-resolve: 4.2.0
-    transitivePeerDependencies:
-      - supports-color
-
   import-local@3.2.0:
     dependencies:
       pkg-dir: 4.2.0
@@ -20565,10 +20226,6 @@ snapshots:
 
   indent-string@4.0.0: {}
 
-  indent-string@5.0.0: {}
-
-  index-to-position@1.2.0: {}
-
   individual@2.0.0: {}
 
   infer-owner@1.0.4: {}
@@ -20594,11 +20251,6 @@ snapshots:
       hasown: 2.0.3
       side-channel: 1.1.0
 
-  into-stream@7.0.0:
-    dependencies:
-      from2: 2.3.0
-      p-is-promise: 3.0.0
-
   ip-address@10.1.0: {}
 
   ip-address@10.2.0: {}
@@ -20607,10 +20259,7 @@ snapshots:
 
   ipaddr.js@2.3.0: {}
 
-  iptv-playlist-parser@https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/38a62d0b7c98f442bfa102ee8e1fe14169ae9386:
-    dependencies:
-      is-valid-path: 0.1.1
-      validator: 13.15.26
+  iptv-playlist-parser@https://codeload.github.com/4gray/iptv-playlist-parser/tar.gz/d547b6be8a44431c85fbcbcdefb41f28c0dadf6d: {}
 
   iron-webcrypto@1.2.1: {}
 
@@ -20677,8 +20326,6 @@ snapshots:
 
   is-docker@3.0.0: {}
 
-  is-extglob@1.0.0: {}
-
   is-extglob@2.1.1: {}
 
   is-finalizationregistry@1.1.1:
@@ -20703,10 +20350,6 @@ snapshots:
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
 
-  is-glob@2.0.1:
-    dependencies:
-      is-extglob: 1.0.0
-
   is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
@@ -20721,10 +20364,6 @@ snapshots:
 
   is-interactive@2.0.0: {}
 
-  is-invalid-path@0.1.0:
-    dependencies:
-      is-glob: 2.0.1
-
   is-lambda@1.0.1: {}
 
   is-map@2.0.3: {}
@@ -20740,10 +20379,6 @@ snapshots:
 
   is-number@7.0.0: {}
 
-  is-obj@2.0.0: {}
-
-  is-plain-obj@1.1.0: {}
-
   is-plain-obj@3.0.0: {}
 
   is-plain-obj@4.1.0: {}
@@ -20773,10 +20408,6 @@ snapshots:
 
   is-stream@2.0.1: {}
 
-  is-stream@3.0.0: {}
-
-  is-stream@4.0.1: {}
-
   is-string@1.1.1:
     dependencies:
       call-bound: 1.0.4
@@ -20796,10 +20427,6 @@ snapshots:
 
   is-unicode-supported@2.1.0: {}
 
-  is-valid-path@0.1.1:
-    dependencies:
-      is-invalid-path: 0.1.0
-
   is-weakmap@2.0.2: {}
 
   is-weakref@1.1.1:
@@ -20841,14 +20468,6 @@ snapshots:
     dependencies:
       ws: 8.18.0
 
-  issue-parser@7.0.1:
-    dependencies:
-      lodash.capitalize: 4.2.1
-      lodash.escaperegexp: 4.1.2
-      lodash.isplainobject: 4.0.6
-      lodash.isstring: 4.0.1
-      lodash.uniqby: 4.7.0
-
   istanbul-lib-coverage@3.2.2: {}
 
   istanbul-lib-instrument@6.0.3:
@@ -20892,12 +20511,10 @@ snapshots:
       filelist: 1.0.4
       picocolors: 1.1.1
 
-  java-properties@1.0.2: {}
-
-  jest-changed-files@30.2.0:
+  jest-changed-files@30.4.1:
     dependencies:
       execa: 5.1.1
-      jest-util: 30.2.0
+      jest-util: 30.4.1
       p-limit: 3.1.0
 
   jest-circus@30.2.0(babel-plugin-macros@3.1.0):
@@ -20926,17 +20543,43 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)):
+  jest-circus@30.4.2(babel-plugin-macros@3.1.0):
     dependencies:
-      '@jest/core': 30.2.0(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      '@jest/test-result': 30.2.0
-      '@jest/types': 30.2.0
+      '@jest/environment': 30.4.1
+      '@jest/expect': 30.4.1
+      '@jest/test-result': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 1.7.1(babel-plugin-macros@3.1.0)
+      is-generator-fn: 2.1.0
+      jest-each: 30.4.1
+      jest-matcher-utils: 30.4.1
+      jest-message-util: 30.4.1
+      jest-runtime: 30.4.2
+      jest-snapshot: 30.4.1
+      jest-util: 30.4.1
+      p-limit: 3.1.0
+      pretty-format: 30.4.1
+      pure-rand: 7.0.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-cli@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)):
+    dependencies:
+      '@jest/core': 30.4.2(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      '@jest/test-result': 30.4.1
+      '@jest/types': 30.4.1
       chalk: 4.1.2
       exit-x: 0.2.2
       import-local: 3.2.0
-      jest-config: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      jest-util: 30.2.0
-      jest-validate: 30.2.0
+      jest-config: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      jest-util: 30.4.1
+      jest-validate: 30.4.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
@@ -20945,7 +20588,7 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)):
+  jest-config@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)):
     dependencies:
       '@babel/core': 7.28.5
       '@jest/get-type': 30.1.0
@@ -20974,7 +20617,40 @@ snapshots:
     optionalDependencies:
       '@types/node': 20.19.9
       esbuild-register: 3.6.0(esbuild@0.28.1)
-      ts-node: 10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)
+      ts-node: 10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-config@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@jest/get-type': 30.1.0
+      '@jest/pattern': 30.4.0
+      '@jest/test-sequencer': 30.4.1
+      '@jest/types': 30.4.1
+      babel-jest: 30.4.1(@babel/core@7.29.7)
+      chalk: 4.1.2
+      ci-info: 4.3.1
+      deepmerge: 4.3.1
+      glob: 10.5.0
+      graceful-fs: 4.2.11
+      jest-circus: 30.4.2(babel-plugin-macros@3.1.0)
+      jest-docblock: 30.4.0
+      jest-environment-node: 30.4.1
+      jest-regex-util: 30.4.0
+      jest-resolve: 30.4.1
+      jest-runner: 30.4.2
+      jest-util: 30.4.1
+      jest-validate: 30.4.1
+      parse-json: 5.2.0
+      pretty-format: 30.4.1
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.19.9
+      esbuild-register: 3.6.0(esbuild@0.28.1)
+      ts-node: 10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -20986,10 +20662,21 @@ snapshots:
       chalk: 4.1.2
       pretty-format: 30.2.0
 
+  jest-diff@30.4.1:
+    dependencies:
+      '@jest/diff-sequences': 30.4.0
+      '@jest/get-type': 30.1.0
+      chalk: 4.1.2
+      pretty-format: 30.4.1
+
   jest-docblock@30.2.0:
     dependencies:
       detect-newline: 3.1.0
 
+  jest-docblock@30.4.0:
+    dependencies:
+      detect-newline: 3.1.0
+
   jest-each@30.2.0:
     dependencies:
       '@jest/get-type': 30.1.0
@@ -20998,12 +20685,18 @@ snapshots:
       jest-util: 30.2.0
       pretty-format: 30.2.0
 
-  jest-environment-jsdom@30.2.0:
+  jest-each@30.4.1:
     dependencies:
-      '@jest/environment': 30.2.0
-      '@jest/environment-jsdom-abstract': 30.2.0(jsdom@26.1.0)
-      '@types/jsdom': 21.1.7
-      '@types/node': 20.19.9
+      '@jest/get-type': 30.1.0
+      '@jest/types': 30.4.1
+      chalk: 4.1.2
+      jest-util: 30.4.1
+      pretty-format: 30.4.1
+
+  jest-environment-jsdom@30.4.1:
+    dependencies:
+      '@jest/environment': 30.4.1
+      '@jest/environment-jsdom-abstract': 30.4.1(jsdom@26.1.0)
       jsdom: 26.1.0
     transitivePeerDependencies:
       - bufferutil
@@ -21020,6 +20713,16 @@ snapshots:
       jest-util: 30.2.0
       jest-validate: 30.2.0
 
+  jest-environment-node@30.4.1:
+    dependencies:
+      '@jest/environment': 30.4.1
+      '@jest/fake-timers': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      jest-mock: 30.4.1
+      jest-util: 30.4.1
+      jest-validate: 30.4.1
+
   jest-haste-map@30.2.0:
     dependencies:
       '@jest/types': 30.2.0
@@ -21035,11 +20738,31 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  jest-haste-map@30.4.1:
+    dependencies:
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 30.4.0
+      jest-util: 30.4.1
+      jest-worker: 30.4.1
+      picomatch: 4.0.4
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
+
   jest-leak-detector@30.2.0:
     dependencies:
       '@jest/get-type': 30.1.0
       pretty-format: 30.2.0
 
+  jest-leak-detector@30.4.1:
+    dependencies:
+      '@jest/get-type': 30.1.0
+      pretty-format: 30.4.1
+
   jest-matcher-utils@30.2.0:
     dependencies:
       '@jest/get-type': 30.1.0
@@ -21047,6 +20770,13 @@ snapshots:
       jest-diff: 30.2.0
       pretty-format: 30.2.0
 
+  jest-matcher-utils@30.4.1:
+    dependencies:
+      '@jest/get-type': 30.1.0
+      chalk: 4.1.2
+      jest-diff: 30.4.1
+      pretty-format: 30.4.1
+
   jest-message-util@30.2.0:
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -21059,30 +20789,53 @@ snapshots:
       slash: 3.0.0
       stack-utils: 2.0.6
 
+  jest-message-util@30.4.1:
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@jest/types': 30.4.1
+      '@types/stack-utils': 2.0.3
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-util: 30.4.1
+      picomatch: 4.0.4
+      pretty-format: 30.4.1
+      slash: 3.0.0
+      stack-utils: 2.0.6
+
   jest-mock@30.2.0:
     dependencies:
       '@jest/types': 30.2.0
       '@types/node': 20.19.9
       jest-util: 30.2.0
 
+  jest-mock@30.4.1:
+    dependencies:
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      jest-util: 30.4.1
+
   jest-pnp-resolver@1.2.3(jest-resolve@30.2.0):
     optionalDependencies:
       jest-resolve: 30.2.0
 
-  jest-preset-angular@15.0.3(75c2f4d3e02d43367177c3c83cdeef78):
+  jest-pnp-resolver@1.2.3(jest-resolve@30.4.1):
+    optionalDependencies:
+      jest-resolve: 30.4.1
+
+  jest-preset-angular@15.0.3(c4e4d73a3616691068af99860e93e092):
     dependencies:
       '@angular/compiler-cli': 21.2.17(@angular/compiler@21.2.17)(typescript@5.9.3)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
-      '@angular/platform-browser-dynamic': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
+      '@angular/platform-browser-dynamic': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/compiler@21.2.17)(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))
       '@jest/environment-jsdom-abstract': 30.2.0(jsdom@26.1.0)
       bs-logger: 0.2.6
       esbuild-wasm: 0.27.2
-      jest: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      jest-util: 30.2.0
+      jest: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      jest-util: 30.4.1
       jsdom: 26.1.0
       pretty-format: 30.2.0
-      ts-jest: 29.4.6(@babel/core@7.29.0)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.29.0))(esbuild@0.28.1)(jest-util@30.2.0)(jest@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3)
+      ts-jest: 29.4.12(@babel/core@7.29.7)(@jest/transform@30.4.1)(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7))(esbuild@0.28.1)(jest-util@30.4.1)(jest@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3)
       typescript: 5.9.3
     optionalDependencies:
       esbuild: 0.28.1
@@ -21095,10 +20848,12 @@ snapshots:
 
   jest-regex-util@30.0.1: {}
 
-  jest-resolve-dependencies@30.2.0:
+  jest-regex-util@30.4.0: {}
+
+  jest-resolve-dependencies@30.4.2:
     dependencies:
-      jest-regex-util: 30.0.1
-      jest-snapshot: 30.2.0
+      jest-regex-util: 30.4.0
+      jest-snapshot: 30.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -21113,6 +20868,17 @@ snapshots:
       slash: 3.0.0
       unrs-resolver: 1.11.1
 
+  jest-resolve@30.4.1:
+    dependencies:
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 30.4.1
+      jest-pnp-resolver: 1.2.3(jest-resolve@30.4.1)
+      jest-util: 30.4.1
+      jest-validate: 30.4.1
+      slash: 3.0.0
+      unrs-resolver: 1.11.1
+
   jest-runner@30.2.0:
     dependencies:
       '@jest/console': 30.2.0
@@ -21140,6 +20906,33 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  jest-runner@30.4.2:
+    dependencies:
+      '@jest/console': 30.4.1
+      '@jest/environment': 30.4.1
+      '@jest/test-result': 30.4.1
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      emittery: 0.13.1
+      exit-x: 0.2.2
+      graceful-fs: 4.2.11
+      jest-docblock: 30.4.0
+      jest-environment-node: 30.4.1
+      jest-haste-map: 30.4.1
+      jest-leak-detector: 30.4.1
+      jest-message-util: 30.4.1
+      jest-resolve: 30.4.1
+      jest-runtime: 30.4.2
+      jest-util: 30.4.1
+      jest-watcher: 30.4.1
+      jest-worker: 30.4.1
+      p-limit: 3.1.0
+      source-map-support: 0.5.13
+    transitivePeerDependencies:
+      - supports-color
+
   jest-runtime@30.2.0:
     dependencies:
       '@jest/environment': 30.2.0
@@ -21167,6 +20960,33 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  jest-runtime@30.4.2:
+    dependencies:
+      '@jest/environment': 30.4.1
+      '@jest/fake-timers': 30.4.1
+      '@jest/globals': 30.4.1
+      '@jest/source-map': 30.0.1
+      '@jest/test-result': 30.4.1
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      cjs-module-lexer: 2.2.0
+      collect-v8-coverage: 1.0.3
+      glob: 10.5.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 30.4.1
+      jest-message-util: 30.4.1
+      jest-mock: 30.4.1
+      jest-regex-util: 30.4.0
+      jest-resolve: 30.4.1
+      jest-snapshot: 30.4.1
+      jest-util: 30.4.1
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   jest-snapshot@30.2.0:
     dependencies:
       '@babel/core': 7.29.0
@@ -21193,6 +21013,32 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  jest-snapshot@30.4.1:
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.29.7)
+      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7)
+      '@babel/types': 7.29.7
+      '@jest/expect-utils': 30.4.1
+      '@jest/get-type': 30.1.0
+      '@jest/snapshot-utils': 30.4.1
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
+      babel-preset-current-node-syntax: 1.2.0(@babel/core@7.29.7)
+      chalk: 4.1.2
+      expect: 30.4.1
+      graceful-fs: 4.2.11
+      jest-diff: 30.4.1
+      jest-matcher-utils: 30.4.1
+      jest-message-util: 30.4.1
+      jest-util: 30.4.1
+      pretty-format: 30.4.1
+      semver: 7.7.4
+      synckit: 0.11.11
+    transitivePeerDependencies:
+      - supports-color
+
   jest-util@30.2.0:
     dependencies:
       '@jest/types': 30.2.0
@@ -21202,6 +21048,15 @@ snapshots:
       graceful-fs: 4.2.11
       picomatch: 4.0.3
 
+  jest-util@30.4.1:
+    dependencies:
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      chalk: 4.1.2
+      ci-info: 4.3.1
+      graceful-fs: 4.2.11
+      picomatch: 4.0.4
+
   jest-validate@30.2.0:
     dependencies:
       '@jest/get-type': 30.1.0
@@ -21211,6 +21066,15 @@ snapshots:
       leven: 3.1.0
       pretty-format: 30.2.0
 
+  jest-validate@30.4.1:
+    dependencies:
+      '@jest/get-type': 30.1.0
+      '@jest/types': 30.4.1
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      leven: 3.1.0
+      pretty-format: 30.4.1
+
   jest-watcher@30.2.0:
     dependencies:
       '@jest/test-result': 30.2.0
@@ -21222,6 +21086,17 @@ snapshots:
       jest-util: 30.2.0
       string-length: 4.0.2
 
+  jest-watcher@30.4.1:
+    dependencies:
+      '@jest/test-result': 30.4.1
+      '@jest/types': 30.4.1
+      '@types/node': 20.19.9
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.13.1
+      jest-util: 30.4.1
+      string-length: 4.0.2
+
   jest-worker@27.5.1:
     dependencies:
       '@types/node': 20.19.9
@@ -21236,12 +21111,20 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)):
+  jest-worker@30.4.1:
     dependencies:
-      '@jest/core': 30.2.0(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
-      '@jest/types': 30.2.0
+      '@types/node': 20.19.9
+      '@ungap/structured-clone': 1.3.0
+      jest-util: 30.4.1
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+
+  jest@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)):
+    dependencies:
+      '@jest/core': 30.4.2(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
+      '@jest/types': 30.4.1
       import-local: 3.2.0
-      jest-cli: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
+      jest-cli: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -21264,7 +21147,7 @@ snapshots:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  js-yaml@4.1.1:
+  js-yaml@4.3.0:
     dependencies:
       argparse: 2.0.1
 
@@ -21299,8 +21182,6 @@ snapshots:
 
   json-buffer@3.0.1: {}
 
-  json-parse-better-errors@1.0.2: {}
-
   json-parse-even-better-errors@2.3.1: {}
 
   json-parse-even-better-errors@5.0.0: {}
@@ -21386,12 +21267,12 @@ snapshots:
 
   lazy-val@1.0.5: {}
 
-  less-loader@12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.18))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  less-loader@12.3.2(@rspack/core@1.6.8(@swc/helpers@0.5.23))(less@4.5.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       less: 4.5.1
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   less@4.5.1:
     dependencies:
@@ -21414,11 +21295,11 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  license-webpack-plugin@4.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  license-webpack-plugin@4.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       webpack-sources: 3.3.3
     optionalDependencies:
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   lilconfig@3.1.3: {}
 
@@ -21453,13 +21334,6 @@ snapshots:
       '@lmdb/lmdb-win32-x64': 3.5.1
     optional: true
 
-  load-json-file@4.0.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      parse-json: 4.0.0
-      pify: 3.0.0
-      strip-bom: 3.0.0
-
   loader-runner@4.3.1: {}
 
   loader-utils@2.0.4:
@@ -21468,11 +21342,6 @@ snapshots:
       emojis-list: 3.0.0
       json5: 2.2.3
 
-  locate-path@2.0.0:
-    dependencies:
-      p-locate: 2.0.0
-      path-exists: 3.0.0
-
   locate-path@5.0.0:
     dependencies:
       p-locate: 4.1.0
@@ -21485,10 +21354,6 @@ snapshots:
     dependencies:
       p-locate: 6.0.0
 
-  lodash-es@4.18.1: {}
-
-  lodash.capitalize@4.2.1: {}
-
   lodash.clonedeepwith@4.5.0: {}
 
   lodash.debounce@4.0.8: {}
@@ -21497,18 +21362,12 @@ snapshots:
 
   lodash.isequal@4.5.0: {}
 
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.isstring@4.0.1: {}
-
   lodash.memoize@4.1.2: {}
 
   lodash.merge@4.6.2: {}
 
   lodash.uniq@4.5.0: {}
 
-  lodash.uniqby@4.7.0: {}
-
   lodash@4.18.1: {}
 
   log-symbols@4.1.0:
@@ -21570,7 +21429,7 @@ snapshots:
   m3u8-parser@7.2.0:
     dependencies:
       '@babel/runtime': 7.28.4
-      '@videojs/vhs-utils': 4.1.1
+      '@videojs/vhs-utils': 4.1.2
       global: 4.4.0
 
   magic-string@0.30.21:
@@ -21583,12 +21442,6 @@ snapshots:
       '@babel/types': 7.29.0
       source-map-js: 1.2.1
 
-  make-asynchronous@1.0.1:
-    dependencies:
-      p-event: 6.0.1
-      type-fest: 4.41.0
-      web-worker: 1.2.0
-
   make-dir@2.1.0:
     dependencies:
       pify: 4.0.1
@@ -21647,20 +21500,7 @@ snapshots:
 
   markdown-table@3.0.4: {}
 
-  marked-terminal@7.3.0(marked@15.0.12):
-    dependencies:
-      ansi-escapes: 7.2.0
-      ansi-regex: 6.2.2
-      chalk: 5.6.2
-      cli-highlight: 2.1.11
-      cli-table3: 0.6.5
-      marked: 15.0.12
-      node-emoji: 2.2.0
-      supports-hyperlinks: 3.2.0
-
-  marked@15.0.12: {}
-
-  marked@18.0.5: {}
+  marked@18.0.7: {}
 
   material-design-icons-iconfont@6.7.0: {}
 
@@ -21856,8 +21696,6 @@ snapshots:
       tree-dump: 1.1.0(tslib@2.8.1)
       tslib: 2.8.1
 
-  meow@13.2.0: {}
-
   merge-descriptors@1.0.3: {}
 
   merge-descriptors@2.0.0: {}
@@ -22153,12 +21991,8 @@ snapshots:
 
   mime@2.6.0: {}
 
-  mime@4.1.0: {}
-
   mimic-fn@2.1.0: {}
 
-  mimic-fn@4.0.0: {}
-
   mimic-function@5.0.1: {}
 
   mimic-response@1.0.1: {}
@@ -22169,10 +22003,10 @@ snapshots:
     dependencies:
       dom-walk: 0.1.2
 
-  mini-css-extract-plugin@2.4.7(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  mini-css-extract-plugin@2.4.7(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       schema-utils: 4.3.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   minimalistic-assert@1.0.1: {}
 
@@ -22188,6 +22022,10 @@ snapshots:
     dependencies:
       brace-expansion: 1.1.13
 
+  minimatch@3.1.5:
+    dependencies:
+      brace-expansion: 1.1.13
+
   minimatch@5.1.9:
     dependencies:
       brace-expansion: 2.1.0
@@ -22267,14 +22105,14 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.28.4
       '@videojs/vhs-utils': 3.0.5
-      '@xmldom/xmldom': 0.8.11
+      '@xmldom/xmldom': 0.8.13
       global: 4.4.0
 
-  mpd-parser@1.3.1:
+  mpd-parser@1.4.0:
     dependencies:
       '@babel/runtime': 7.28.4
-      '@videojs/vhs-utils': 4.1.1
-      '@xmldom/xmldom': 0.8.11
+      '@videojs/vhs-utils': 4.1.2
+      '@xmldom/xmldom': 0.8.13
       global: 4.4.0
 
   mpegts.js@1.8.0:
@@ -22352,25 +22190,23 @@ snapshots:
 
   neotraverse@0.6.18: {}
 
-  nerf-dart@1.0.0: {}
-
-  ng-mocks@14.15.1(3bd9032d10655768ae17cd8d4331ec90):
+  ng-mocks@14.15.3(1918f1ef5f9f83bc2aab38921c00c721):
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
-      '@angular/forms': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(rxjs@7.8.2)
-      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/forms': 21.2.17(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+      '@angular/platform-browser': 21.2.17(@angular/animations@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))
 
-  ngx-indexed-db@21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)):
+  ngx-indexed-db@21.0.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)):
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
 
-  ngx-skeleton-loader@11.3.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)):
+  ngx-skeleton-loader@11.3.0(@angular/common@21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)):
     dependencies:
-      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1))(rxjs@7.8.2)
-      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.15.1)
+      '@angular/common': 21.2.17(@angular/core@21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 21.2.17(@angular/compiler@21.2.17)(rxjs@7.8.2)(zone.js@0.16.2)
       tslib: 2.8.1
 
   nlcst-to-string@4.0.0:
@@ -22396,13 +22232,6 @@ snapshots:
     dependencies:
       semver: 7.7.4
 
-  node-emoji@2.2.0:
-    dependencies:
-      '@sindresorhus/is': 4.6.0
-      char-regex: 1.0.2
-      emojilib: 2.4.0
-      skin-tone: 2.0.0
-
   node-fetch-native@1.6.7: {}
 
   node-fetch@2.7.0(encoding@0.1.13):
@@ -22455,18 +22284,10 @@ snapshots:
     dependencies:
       abbrev: 4.0.0
 
-  normalize-package-data@6.0.2:
-    dependencies:
-      hosted-git-info: 7.0.2
-      semver: 7.7.4
-      validate-npm-package-license: 3.0.4
-
   normalize-path@3.0.0: {}
 
   normalize-url@6.1.0: {}
 
-  normalize-url@8.1.1: {}
-
   npm-bundled@5.0.0:
     dependencies:
       npm-normalize-package-bin: 5.0.0
@@ -22513,39 +22334,28 @@ snapshots:
     dependencies:
       path-key: 3.1.1
 
-  npm-run-path@5.3.0:
-    dependencies:
-      path-key: 4.0.0
-
-  npm-run-path@6.0.0:
-    dependencies:
-      path-key: 4.0.0
-      unicorn-magic: 0.3.0
-
-  npm@10.9.4: {}
-
   nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
 
   nwsapi@2.2.23: {}
 
-  nx-electron@22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@41.7.2)(esbuild@0.28.1)(rxjs@7.8.2)(typescript@5.9.3):
+  nx-electron@22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))))(@nx/workspace@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))(@swc/core@1.15.46(@swc/helpers@0.5.23))(electron-builder-squirrel-windows@26.0.12)(electron@41.7.2)(esbuild@0.28.1)(rxjs@7.8.2)(typescript@5.9.3):
     dependencies:
-      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
-      '@nx/workspace': 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
-      copy-webpack-plugin: 12.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      '@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)))
+      '@nx/workspace': 22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23))
+      copy-webpack-plugin: 12.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       electron: 41.7.2
       electron-builder: 26.0.12(electron-builder-squirrel-windows@26.0.12)
-      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
-      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
+      license-webpack-plugin: 4.0.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       rxjs-for-await: 1.0.0(rxjs@7.8.2)
       strip-json-comments: 3.1.1
-      terser-webpack-plugin: 5.3.16(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      terser-webpack-plugin: 5.3.16(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       tree-kill: 1.2.2
-      ts-loader: 9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      ts-loader: 9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       tsconfig-paths-webpack-plugin: 4.2.0
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
       webpack-merge: 5.10.0
     transitivePeerDependencies:
       - '@swc/core'
@@ -22558,7 +22368,7 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)):
+  nx@22.7.1(@swc-node/register@1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3))(@swc/core@1.15.46(@swc/helpers@0.5.23)):
     dependencies:
       '@emnapi/core': 1.4.5
       '@emnapi/runtime': 1.4.5
@@ -22607,7 +22417,7 @@ snapshots:
       figures: 3.2.0
       flat: 5.0.2
       follow-redirects: 1.16.0(debug@4.4.3)
-      form-data: 4.0.5
+      form-data: 4.0.6
       fs-constants: 1.0.0
       function-bind: 1.1.2
       get-caller-file: 2.0.5
@@ -22681,8 +22491,8 @@ snapshots:
       '@nx/nx-linux-x64-musl': 22.7.1
       '@nx/nx-win32-arm64-msvc': 22.7.1
       '@nx/nx-win32-x64-msvc': 22.7.1
-      '@swc-node/register': 1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3)
-      '@swc/core': 1.15.8(@swc/helpers@0.5.18)
+      '@swc-node/register': 1.12.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(@swc/types@0.1.27)(typescript@5.9.3)
+      '@swc/core': 1.15.46(@swc/helpers@0.5.23)
     transitivePeerDependencies:
       - debug
 
@@ -22747,10 +22557,6 @@ snapshots:
     dependencies:
       mimic-fn: 2.1.0
 
-  onetime@6.0.0:
-    dependencies:
-      mimic-fn: 4.0.0
-
   onetime@7.0.0:
     dependencies:
       mimic-function: 5.0.1
@@ -22859,22 +22665,6 @@ snapshots:
 
   p-cancelable@2.1.1: {}
 
-  p-each-series@3.0.0: {}
-
-  p-event@6.0.1:
-    dependencies:
-      p-timeout: 6.1.4
-
-  p-filter@4.1.0:
-    dependencies:
-      p-map: 7.0.4
-
-  p-is-promise@3.0.0: {}
-
-  p-limit@1.3.0:
-    dependencies:
-      p-try: 1.0.0
-
   p-limit@2.3.0:
     dependencies:
       p-try: 2.2.0
@@ -22891,10 +22681,6 @@ snapshots:
     dependencies:
       yocto-queue: 1.2.2
 
-  p-locate@2.0.0:
-    dependencies:
-      p-limit: 1.3.0
-
   p-locate@4.1.0:
     dependencies:
       p-limit: 2.3.0
@@ -22918,10 +22704,6 @@ snapshots:
       eventemitter3: 5.0.1
       p-timeout: 6.1.4
 
-  p-reduce@2.1.0: {}
-
-  p-reduce@3.0.0: {}
-
   p-retry@6.2.1:
     dependencies:
       '@types/retry': 0.12.2
@@ -22930,8 +22712,6 @@ snapshots:
 
   p-timeout@6.1.4: {}
 
-  p-try@1.0.0: {}
-
   p-try@2.2.0: {}
 
   package-json-from-dist@1.0.1: {}
@@ -22974,11 +22754,6 @@ snapshots:
       is-decimal: 2.0.1
       is-hexadecimal: 2.0.1
 
-  parse-json@4.0.0:
-    dependencies:
-      error-ex: 1.3.4
-      json-parse-better-errors: 1.0.2
-
   parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.27.1
@@ -22986,12 +22761,6 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
-  parse-json@8.3.0:
-    dependencies:
-      '@babel/code-frame': 7.27.1
-      index-to-position: 1.2.0
-      type-fest: 4.41.0
-
   parse-latin@7.0.0:
     dependencies:
       '@types/nlcst': 2.0.3
@@ -23001,8 +22770,6 @@ snapshots:
       unist-util-visit-children: 3.0.0
       vfile: 6.0.3
 
-  parse-ms@4.0.0: {}
-
   parse-node-version@1.0.1: {}
 
   parse-passwd@1.0.0: {}
@@ -23013,20 +22780,12 @@ snapshots:
       parse5: 8.0.0
       parse5-sax-parser: 8.0.0
 
-  parse5-htmlparser2-tree-adapter@6.0.1:
-    dependencies:
-      parse5: 6.0.1
-
   parse5-sax-parser@8.0.0:
     dependencies:
       parse5: 8.0.0
 
   parse5@4.0.0: {}
 
-  parse5@5.1.1: {}
-
-  parse5@6.0.1: {}
-
   parse5@7.3.0:
     dependencies:
       entities: 6.0.1
@@ -23037,8 +22796,6 @@ snapshots:
 
   parseurl@1.3.3: {}
 
-  path-exists@3.0.0: {}
-
   path-exists@4.0.0: {}
 
   path-exists@5.0.0: {}
@@ -23047,8 +22804,6 @@ snapshots:
 
   path-key@3.1.1: {}
 
-  path-key@4.0.0: {}
-
   path-parse@1.0.7: {}
 
   path-scurry@1.11.1:
@@ -23083,8 +22838,6 @@ snapshots:
 
   pify@2.3.0: {}
 
-  pify@3.0.0: {}
-
   pify@4.0.1:
     optional: true
 
@@ -23100,11 +22853,6 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.28.4
 
-  pkg-conf@2.1.0:
-    dependencies:
-      find-up: 2.1.0
-      load-json-file: 4.0.0
-
   pkg-dir@4.2.0:
     dependencies:
       find-up: 4.1.0
@@ -23113,17 +22861,17 @@ snapshots:
     dependencies:
       find-up: 6.3.0
 
-  playwright-core@1.57.0: {}
+  playwright-core@1.62.0: {}
 
-  playwright@1.57.0:
+  playwright@1.62.0:
     dependencies:
-      playwright-core: 1.57.0
+      playwright-core: 1.62.0
     optionalDependencies:
       fsevents: 2.3.2
 
   plist@3.1.0:
     dependencies:
-      '@xmldom/xmldom': 0.8.11
+      '@xmldom/xmldom': 0.8.13
       base64-js: 1.5.1
       xmlbuilder: 15.1.1
 
@@ -23194,44 +22942,44 @@ snapshots:
       camelcase-css: 2.0.1
       postcss: 8.5.6
 
-  postcss-load-config@4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)):
+  postcss-load-config@4.0.2(postcss@8.5.6)(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)):
     dependencies:
       lilconfig: 3.1.3
-      yaml: 2.8.2
+      yaml: 2.9.0
     optionalDependencies:
       postcss: 8.5.6
-      ts-node: 10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)
+      ts-node: 10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)
 
-  postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(yaml@2.8.2):
+  postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.23.1)(yaml@2.9.0):
     dependencies:
       lilconfig: 3.1.3
     optionalDependencies:
       jiti: 1.21.7
       postcss: 8.5.6
-      tsx: 4.21.0
-      yaml: 2.8.2
+      tsx: 4.23.1
+      yaml: 2.9.0
 
-  postcss-loader@8.2.0(@rspack/core@1.6.8(@swc/helpers@0.5.18))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  postcss-loader@8.2.0(@rspack/core@1.6.8(@swc/helpers@0.5.23))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       cosmiconfig: 9.0.0(typescript@5.9.3)
       jiti: 2.6.1
       postcss: 8.5.6
       semver: 7.7.4
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - typescript
 
-  postcss-loader@8.2.1(@rspack/core@1.6.8(@swc/helpers@0.5.18))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  postcss-loader@8.2.1(@rspack/core@1.6.8(@swc/helpers@0.5.23))(postcss@8.5.6)(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       cosmiconfig: 9.0.0(typescript@5.9.3)
       jiti: 2.6.1
       postcss: 8.5.6
       semver: 7.7.4
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - typescript
 
@@ -23426,7 +23174,7 @@ snapshots:
 
   prelude-ls@1.2.1: {}
 
-  prettier@3.8.1: {}
+  prettier@3.9.6: {}
 
   pretty-format@30.2.0:
     dependencies:
@@ -23434,9 +23182,12 @@ snapshots:
       ansi-styles: 5.2.0
       react-is: 18.3.1
 
-  pretty-ms@9.3.0:
+  pretty-format@30.4.1:
     dependencies:
-      parse-ms: 4.0.0
+      '@jest/schemas': 30.4.1
+      ansi-styles: 5.2.0
+      react-is-18: react-is@18.3.1
+      react-is-19: react-is@19.2.8
 
   prismjs@1.30.0: {}
 
@@ -23464,8 +23215,6 @@ snapshots:
 
   property-information@7.1.0: {}
 
-  proto-list@1.2.4: {}
-
   proxy-addr@2.0.7:
     dependencies:
       forwarded: 0.2.0
@@ -23483,10 +23232,6 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  pupa@3.3.0:
-    dependencies:
-      escape-goat: 4.0.0
-
   pure-rand@7.0.1: {}
 
   qrcode@1.5.4:
@@ -23541,6 +23286,8 @@ snapshots:
 
   react-is@18.3.1: {}
 
+  react-is@19.2.8: {}
+
   react-refresh@0.18.0: {}
 
   react@19.2.3: {}
@@ -23555,20 +23302,6 @@ snapshots:
     dependencies:
       pify: 2.3.0
 
-  read-package-up@11.0.0:
-    dependencies:
-      find-up-simple: 1.0.1
-      read-pkg: 9.0.1
-      type-fest: 4.41.0
-
-  read-pkg@9.0.1:
-    dependencies:
-      '@types/normalize-package-data': 2.4.4
-      normalize-package-data: 6.0.2
-      parse-json: 8.3.0
-      type-fest: 4.41.0
-      unicorn-magic: 0.1.0
-
   readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
@@ -23669,10 +23402,6 @@ snapshots:
       unicode-match-property-ecmascript: 2.0.0
       unicode-match-property-value-ecmascript: 2.2.1
 
-  registry-auth-token@5.1.0:
-    dependencies:
-      '@pnpm/npm-conf': 2.3.1
-
   regjsgen@0.8.0: {}
 
   regjsparser@0.13.0:
@@ -24059,14 +23788,14 @@ snapshots:
       sass-embedded-win32-arm64: 1.97.1
       sass-embedded-win32-x64: 1.97.1
 
-  sass-loader@16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.18))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  sass-loader@16.0.6(@rspack/core@1.6.8(@swc/helpers@0.5.23))(sass-embedded@1.97.1)(sass@1.97.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       neo-async: 2.6.2
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
       sass: 1.97.1
       sass-embedded: 1.97.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   sass@1.97.1:
     dependencies:
@@ -24123,47 +23852,6 @@ snapshots:
       '@types/node-forge': 1.3.14
       node-forge: 1.4.0
 
-  semantic-release@24.2.9(typescript@5.9.3):
-    dependencies:
-      '@semantic-release/commit-analyzer': 13.0.1(semantic-release@24.2.9(typescript@5.9.3))
-      '@semantic-release/error': 4.0.0
-      '@semantic-release/github': 11.0.6(semantic-release@24.2.9(typescript@5.9.3))
-      '@semantic-release/npm': 12.0.2(semantic-release@24.2.9(typescript@5.9.3))
-      '@semantic-release/release-notes-generator': 14.1.0(semantic-release@24.2.9(typescript@5.9.3))
-      aggregate-error: 5.0.0
-      cosmiconfig: 9.0.0(typescript@5.9.3)
-      debug: 4.4.3
-      env-ci: 11.2.0
-      execa: 9.6.1
-      figures: 6.1.0
-      find-versions: 6.0.0
-      get-stream: 6.0.1
-      git-log-parser: 1.2.1
-      hook-std: 4.0.0
-      hosted-git-info: 8.1.0
-      import-from-esm: 2.0.0
-      lodash-es: 4.18.1
-      marked: 15.0.12
-      marked-terminal: 7.3.0(marked@15.0.12)
-      micromatch: 4.0.8
-      p-each-series: 3.0.0
-      p-reduce: 3.0.0
-      read-package-up: 11.0.0
-      resolve-from: 5.0.0
-      semver: 7.7.3
-      semver-diff: 5.0.0
-      signale: 1.4.0
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  semver-diff@5.0.0:
-    dependencies:
-      semver: 7.7.4
-
-  semver-regex@4.0.5: {}
-
   semver@5.7.2: {}
 
   semver@6.3.1: {}
@@ -24174,6 +23862,8 @@ snapshots:
 
   semver@7.7.4: {}
 
+  semver@7.8.5: {}
+
   send@0.19.2:
     dependencies:
       debug: 2.6.9
@@ -24272,6 +23962,8 @@ snapshots:
 
   setprototypeof@1.2.0: {}
 
+  shaka-player@5.2.2: {}
+
   shallow-clone@3.0.1:
     dependencies:
       kind-of: 6.0.3
@@ -24280,7 +23972,7 @@ snapshots:
     dependencies:
       '@img/colour': 1.0.0
       detect-libc: 2.1.2
-      semver: 7.7.3
+      semver: 7.7.4
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.34.5
       '@img/sharp-darwin-x64': 0.34.5
@@ -24306,6 +23998,40 @@ snapshots:
       '@img/sharp-win32-arm64': 0.34.5
       '@img/sharp-win32-ia32': 0.34.5
       '@img/sharp-win32-x64': 0.34.5
+    optional: true
+
+  sharp@0.35.3(@types/node@20.19.9):
+    dependencies:
+      '@img/colour': 1.1.0
+      detect-libc: 2.1.2
+      semver: 7.8.5
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.35.3
+      '@img/sharp-darwin-x64': 0.35.3
+      '@img/sharp-freebsd-wasm32': 0.35.3
+      '@img/sharp-libvips-darwin-arm64': 1.3.2
+      '@img/sharp-libvips-darwin-x64': 1.3.2
+      '@img/sharp-libvips-linux-arm': 1.3.2
+      '@img/sharp-libvips-linux-arm64': 1.3.2
+      '@img/sharp-libvips-linux-ppc64': 1.3.2
+      '@img/sharp-libvips-linux-riscv64': 1.3.2
+      '@img/sharp-libvips-linux-s390x': 1.3.2
+      '@img/sharp-libvips-linux-x64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-arm64': 1.3.2
+      '@img/sharp-libvips-linuxmusl-x64': 1.3.2
+      '@img/sharp-linux-arm': 0.35.3
+      '@img/sharp-linux-arm64': 0.35.3
+      '@img/sharp-linux-ppc64': 0.35.3
+      '@img/sharp-linux-riscv64': 0.35.3
+      '@img/sharp-linux-s390x': 0.35.3
+      '@img/sharp-linux-x64': 0.35.3
+      '@img/sharp-linuxmusl-arm64': 0.35.3
+      '@img/sharp-linuxmusl-x64': 0.35.3
+      '@img/sharp-webcontainers-wasm32': 0.35.3
+      '@img/sharp-win32-arm64': 0.35.3
+      '@img/sharp-win32-ia32': 0.35.3
+      '@img/sharp-win32-x64': 0.35.3
+      '@types/node': 20.19.9
 
   shebang-command@2.0.0:
     dependencies:
@@ -24368,12 +24094,6 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  signale@1.4.0:
-    dependencies:
-      chalk: 2.4.2
-      figures: 2.0.0
-      pkg-conf: 2.1.0
-
   sigstore@4.1.0:
     dependencies:
       '@sigstore/bundle': 4.0.0
@@ -24399,16 +24119,12 @@ snapshots:
 
   sisteransi@1.0.5: {}
 
-  sitemap@8.0.2:
+  sitemap@9.0.1:
     dependencies:
-      '@types/node': 17.0.45
+      '@types/node': 24.13.1
       '@types/sax': 1.2.7
       arg: 5.0.2
-      sax: 1.4.3
-
-  skin-tone@2.0.0:
-    dependencies:
-      unicode-emoji-modifier-base: 1.0.0
+      sax: 1.6.0
 
   slash@3.0.0: {}
 
@@ -24457,23 +24173,15 @@ snapshots:
       ip-address: 10.2.0
       smart-buffer: 4.2.0
 
-  sort-keys-length@1.0.1:
-    dependencies:
-      sort-keys: 1.1.2
-
-  sort-keys@1.1.2:
-    dependencies:
-      is-plain-obj: 1.1.0
-
   sorted-array-functions@1.3.0: {}
 
   source-map-js@1.2.1: {}
 
-  source-map-loader@5.0.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  source-map-loader@5.0.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       iconv-lite: 0.6.3
       source-map-js: 1.2.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   source-map-support@0.5.13:
     dependencies:
@@ -24496,20 +24204,8 @@ snapshots:
 
   space-separated-tokens@2.0.2: {}
 
-  spawn-error-forwarder@1.0.0: {}
-
-  spdx-correct@3.2.0:
-    dependencies:
-      spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.22
-
   spdx-exceptions@2.5.0: {}
 
-  spdx-expression-parse@3.0.1:
-    dependencies:
-      spdx-exceptions: 2.5.0
-      spdx-license-ids: 3.0.22
-
   spdx-expression-parse@4.0.0:
     dependencies:
       spdx-exceptions: 2.5.0
@@ -24538,10 +24234,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  split2@1.0.0:
-    dependencies:
-      through2: 2.0.5
-
   sprintf-js@1.0.3: {}
 
   ssri@13.0.1:
@@ -24571,11 +24263,6 @@ snapshots:
       es-errors: 1.3.0
       internal-slot: 1.1.0
 
-  stream-combiner2@1.1.1:
-    dependencies:
-      duplexer2: 0.1.4
-      readable-stream: 2.3.8
-
   stream-replace-string@2.0.0: {}
 
   streamroller@3.1.5:
@@ -24664,17 +24351,13 @@ snapshots:
 
   strip-final-newline@2.0.0: {}
 
-  strip-final-newline@3.0.0: {}
-
-  strip-final-newline@4.0.0: {}
-
   strip-json-comments@2.0.1: {}
 
   strip-json-comments@3.1.1: {}
 
-  style-loader@3.3.4(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  style-loader@3.3.4(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
   style-to-js@1.1.21:
     dependencies:
@@ -24706,16 +24389,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  super-regex@1.1.0:
-    dependencies:
-      function-timeout: 1.0.2
-      make-asynchronous: 1.0.1
-      time-span: 5.1.0
-
-  supports-color@5.5.0:
-    dependencies:
-      has-flag: 3.0.0
-
   supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
@@ -24724,11 +24397,6 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
-  supports-hyperlinks@3.2.0:
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-
   supports-preserve-symlinks-flag@1.0.0: {}
 
   svgo@4.0.0:
@@ -24763,7 +24431,7 @@ snapshots:
     dependencies:
       '@pkgr/core': 0.2.9
 
-  tailwindcss@3.4.19(tsx@4.21.0)(yaml@2.8.2):
+  tailwindcss@3.4.19(tsx@4.23.1)(yaml@2.9.0):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -24782,7 +24450,7 @@ snapshots:
       postcss: 8.5.6
       postcss-import: 15.1.0(postcss@8.5.6)
       postcss-js: 4.1.0(postcss@8.5.6)
-      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.21.0)(yaml@2.8.2)
+      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6)(tsx@4.23.1)(yaml@2.9.0)
       postcss-nested: 6.2.0(postcss@8.5.6)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.11
@@ -24825,8 +24493,6 @@ snapshots:
       minizlib: 3.1.0
       yallist: 5.0.0
 
-  temp-dir@3.0.0: {}
-
   temp-file@3.4.0:
     dependencies:
       async-exit-hook: 2.0.1
@@ -24837,27 +24503,16 @@ snapshots:
       mkdirp: 0.5.6
       rimraf: 2.6.3
 
-  tempfile@5.0.0:
-    dependencies:
-      temp-dir: 3.0.0
-
-  tempy@3.1.0:
-    dependencies:
-      is-stream: 3.0.0
-      temp-dir: 3.0.0
-      type-fest: 2.19.0
-      unique-string: 3.0.0
-
-  terser-webpack-plugin@5.3.16(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  terser-webpack-plugin@5.3.16(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       jest-worker: 27.5.1
       schema-utils: 4.3.3
       serialize-javascript: 6.0.2
       terser: 5.44.1
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     optionalDependencies:
-      '@swc/core': 1.15.8(@swc/helpers@0.5.18)
+      '@swc/core': 1.15.46(@swc/helpers@0.5.23)
       esbuild: 0.28.1
 
   terser@5.44.1:
@@ -24885,17 +24540,8 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  through2@2.0.5:
-    dependencies:
-      readable-stream: 2.3.8
-      xtend: 4.0.2
-
   thunky@1.1.0: {}
 
-  time-span@5.1.0:
-    dependencies:
-      convert-hrtime: 5.0.0
-
   tiny-async-pool@1.3.0:
     dependencies:
       semver: 5.7.2
@@ -24943,8 +24589,6 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  traverse@0.6.8: {}
-
   tree-dump@1.1.0(tslib@2.8.1):
     dependencies:
       tslib: 2.8.1
@@ -24963,7 +24607,11 @@ snapshots:
     dependencies:
       typescript: 5.9.3
 
-  ts-checker-rspack-plugin@1.2.3(@rspack/core@1.6.8(@swc/helpers@0.5.18))(typescript@5.9.3):
+  ts-api-utils@2.5.0(typescript@5.9.3):
+    dependencies:
+      typescript: 5.9.3
+
+  ts-checker-rspack-plugin@1.2.3(@rspack/core@1.6.8(@swc/helpers@0.5.23))(typescript@5.9.3):
     dependencies:
       '@babel/code-frame': 7.27.1
       '@rspack/lite-tapable': 1.1.0
@@ -24974,32 +24622,32 @@ snapshots:
       picocolors: 1.1.1
       typescript: 5.9.3
     optionalDependencies:
-      '@rspack/core': 1.6.8(@swc/helpers@0.5.18)
+      '@rspack/core': 1.6.8(@swc/helpers@0.5.23)
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.4.6(@babel/core@7.29.0)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.29.0))(esbuild@0.28.1)(jest-util@30.2.0)(jest@30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3):
+  ts-jest@29.4.12(@babel/core@7.29.7)(@jest/transform@30.4.1)(@jest/types@30.4.1)(babel-jest@30.4.1(@babel/core@7.29.7))(esbuild@0.28.1)(jest-util@30.4.1)(jest@30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3)))(typescript@5.9.3):
     dependencies:
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      handlebars: 4.7.8
-      jest: 30.2.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3))
+      handlebars: 4.7.9
+      jest: 30.4.2(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.28.1))(ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3))
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
-      semver: 7.7.3
+      semver: 7.8.5
       type-fest: 4.41.0
       typescript: 5.9.3
       yargs-parser: 21.1.1
     optionalDependencies:
-      '@babel/core': 7.29.0
-      '@jest/transform': 30.2.0
-      '@jest/types': 30.2.0
-      babel-jest: 30.2.0(@babel/core@7.29.0)
+      '@babel/core': 7.29.7
+      '@jest/transform': 30.4.1
+      '@jest/types': 30.4.1
+      babel-jest: 30.4.1(@babel/core@7.29.7)
       esbuild: 0.28.1
-      jest-util: 30.2.0
+      jest-util: 30.4.1
 
-  ts-loader@9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  ts-loader@9.5.4(typescript@5.9.3)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       chalk: 4.1.2
       enhanced-resolve: 5.18.4
@@ -25007,9 +24655,9 @@ snapshots:
       semver: 7.7.4
       source-map: 0.7.6
       typescript: 5.9.3
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  ts-node@10.9.2(@swc/core@1.15.8(@swc/helpers@0.5.18))(@types/node@20.19.9)(typescript@5.9.3):
+  ts-node@10.9.2(@swc/core@1.15.46(@swc/helpers@0.5.23))(@types/node@20.19.9)(typescript@5.9.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.12
@@ -25027,7 +24675,7 @@ snapshots:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
     optionalDependencies:
-      '@swc/core': 1.15.8(@swc/helpers@0.5.18)
+      '@swc/core': 1.15.46(@swc/helpers@0.5.23)
 
   tsconfck@3.1.6(typescript@5.9.3):
     optionalDependencies:
@@ -25057,10 +24705,9 @@ snapshots:
 
   tsscmp@1.0.6: {}
 
-  tsx@4.21.0:
+  tsx@4.23.1:
     dependencies:
-      esbuild: 0.27.7
-      get-tsconfig: 4.13.0
+      esbuild: 0.28.1
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -25086,10 +24733,6 @@ snapshots:
 
   type-fest@0.21.3: {}
 
-  type-fest@1.4.0: {}
-
-  type-fest@2.19.0: {}
-
   type-fest@4.41.0: {}
 
   type-is@1.6.18:
@@ -25138,12 +24781,12 @@ snapshots:
 
   typed-assert@1.0.9: {}
 
-  typescript-eslint@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
+  typescript-eslint@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.51.0(@typescript-eslint/parser@8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.51.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.51.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/eslint-plugin': 8.65.0(@typescript-eslint/parser@8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3))(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.65.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.65.0(eslint@9.39.2(jiti@1.21.7))(typescript@5.9.3)
       eslint: 9.39.2(jiti@1.21.7)
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -25177,8 +24820,6 @@ snapshots:
 
   unicode-canonical-property-names-ecmascript@2.0.1: {}
 
-  unicode-emoji-modifier-base@1.0.0: {}
-
   unicode-match-property-ecmascript@2.0.0:
     dependencies:
       unicode-canonical-property-names-ecmascript: 2.0.1
@@ -25188,8 +24829,6 @@ snapshots:
 
   unicode-property-aliases-ecmascript@2.2.0: {}
 
-  unicorn-magic@0.1.0: {}
-
   unicorn-magic@0.3.0: {}
 
   unified@11.0.5:
@@ -25228,10 +24867,6 @@ snapshots:
     dependencies:
       imurmurhash: 0.1.4
 
-  unique-string@3.0.0:
-    dependencies:
-      crypto-random-string: 4.0.0
-
   unist-util-find-after@5.0.0:
     dependencies:
       '@types/unist': 3.0.3
@@ -25278,8 +24913,6 @@ snapshots:
       unist-util-is: 6.0.1
       unist-util-visit-parents: 6.0.2
 
-  universal-user-agent@7.0.3: {}
-
   universalify@0.1.2: {}
 
   universalify@2.0.1: {}
@@ -25321,11 +24954,6 @@ snapshots:
       ofetch: 1.5.1
       ufo: 1.6.3
 
-  unused-filename@4.0.1:
-    dependencies:
-      escape-string-regexp: 5.0.0
-      path-exists: 5.0.0
-
   upath@2.0.1: {}
 
   update-browserslist-db@1.2.3(browserslist@4.28.1):
@@ -25346,8 +24974,6 @@ snapshots:
 
   url-join@4.0.1: {}
 
-  url-join@5.0.0: {}
-
   url-toolkit@2.2.5: {}
 
   utf8-byte-length@1.0.5: {}
@@ -25358,8 +24984,6 @@ snapshots:
 
   uuid@8.3.2: {}
 
-  uuid@9.0.0: {}
-
   v8-compile-cache-lib@3.0.1: {}
 
   v8-to-istanbul@9.3.0:
@@ -25368,15 +24992,8 @@ snapshots:
       '@types/istanbul-lib-coverage': 2.0.6
       convert-source-map: 2.0.0
 
-  validate-npm-package-license@3.0.4:
-    dependencies:
-      spdx-correct: 3.2.0
-      spdx-expression-parse: 3.0.1
-
   validate-npm-package-name@7.0.2: {}
 
-  validator@13.15.26: {}
-
   varint@6.0.0: {}
 
   vary@1.1.2: {}
@@ -25419,25 +25036,25 @@ snapshots:
       videojs-font: 3.2.0
       videojs-vtt.js: 0.15.5
 
-  video.js@8.23.4:
+  video.js@8.23.9:
     dependencies:
       '@babel/runtime': 7.28.4
-      '@videojs/http-streaming': 3.17.2(video.js@8.23.4)
-      '@videojs/vhs-utils': 4.1.1
+      '@videojs/http-streaming': 3.17.5(video.js@8.23.9)
+      '@videojs/vhs-utils': 4.1.2
       '@videojs/xhr': 2.7.0
       aes-decrypter: 4.0.2
       global: 4.4.0
       m3u8-parser: 7.2.0
-      mpd-parser: 1.3.1
+      mpd-parser: 1.4.0
       mux.js: 7.1.0
-      videojs-contrib-quality-levels: 4.1.0(video.js@8.23.4)
+      videojs-contrib-quality-levels: 4.1.0(video.js@8.23.9)
       videojs-font: 4.2.0
       videojs-vtt.js: 0.15.5
 
-  videojs-contrib-quality-levels@4.1.0(video.js@8.23.4):
+  videojs-contrib-quality-levels@4.1.0(video.js@8.23.9):
     dependencies:
       global: 4.4.0
-      video.js: 8.23.4
+      video.js: 8.23.9
 
   videojs-font@3.2.0: {}
 
@@ -25446,14 +25063,14 @@ snapshots:
   videojs-quality-selector-hls@1.1.1:
     dependencies:
       global: 4.4.0
-      video.js: 8.23.4
-      videojs-contrib-quality-levels: 4.1.0(video.js@8.23.4)
+      video.js: 8.23.9
+      videojs-contrib-quality-levels: 4.1.0(video.js@8.23.9)
 
   videojs-vtt.js@0.15.5:
     dependencies:
       global: 4.4.0
 
-  vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2):
+  vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0):
     dependencies:
       esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.4)
@@ -25469,10 +25086,10 @@ snapshots:
       sass: 1.97.1
       sass-embedded: 1.97.1
       terser: 5.44.1
-      tsx: 4.21.0
-      yaml: 2.8.2
+      tsx: 4.23.1
+      yaml: 2.9.0
 
-  vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2):
+  vite@7.3.5(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.3)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0):
     dependencies:
       esbuild: 0.27.7
       fdir: 6.5.0(picomatch@4.0.4)
@@ -25488,12 +25105,12 @@ snapshots:
       sass: 1.97.3
       sass-embedded: 1.97.1
       terser: 5.44.1
-      tsx: 4.21.0
-      yaml: 2.8.2
+      tsx: 4.23.1
+      yaml: 2.9.0
 
-  vitefu@1.1.1(vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)):
+  vitefu@1.1.1(vite@6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0)):
     optionalDependencies:
-      vite: 6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.21.0)(yaml@2.8.2)
+      vite: 6.4.1(@types/node@20.19.9)(jiti@1.21.7)(less@4.5.1)(sass-embedded@1.97.1)(sass@1.97.1)(terser@5.44.1)(tsx@4.23.1)(yaml@2.9.0)
 
   w3c-xmlserializer@5.0.0:
     dependencies:
@@ -25526,13 +25143,11 @@ snapshots:
 
   web-namespaces@2.0.1: {}
 
-  web-worker@1.2.0: {}
-
   webidl-conversions@3.0.1: {}
 
   webidl-conversions@7.0.0: {}
 
-  webpack-dev-middleware@7.4.5(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  webpack-dev-middleware@7.4.5(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       colorette: 2.0.20
       memfs: 4.51.1
@@ -25541,9 +25156,9 @@ snapshots:
       range-parser: 1.2.1
       schema-utils: 4.3.3
     optionalDependencies:
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  webpack-dev-server@5.2.2(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  webpack-dev-server@5.2.2(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       '@types/bonjour': 3.5.13
       '@types/connect-history-api-fallback': 1.5.4
@@ -25571,10 +25186,10 @@ snapshots:
       serve-index: 1.9.1
       sockjs: 0.3.24
       spdy: 4.0.2
-      webpack-dev-middleware: 7.4.5(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      webpack-dev-middleware: 7.4.5(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       ws: 8.18.3
     optionalDependencies:
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
     transitivePeerDependencies:
       - bufferutil
       - debug
@@ -25591,12 +25206,12 @@ snapshots:
 
   webpack-sources@3.3.3: {}
 
-  webpack-subresource-integrity@5.1.0(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)):
+  webpack-subresource-integrity@5.1.0(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)):
     dependencies:
       typed-assert: 1.0.9
-      webpack: 5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)
+      webpack: 5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)
 
-  webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1):
+  webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.8
@@ -25620,7 +25235,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 4.3.3
       tapable: 2.3.0
-      terser-webpack-plugin: 5.3.16(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(esbuild@0.28.1))
+      terser-webpack-plugin: 5.3.16(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack@5.104.1(@swc/core@1.15.46(@swc/helpers@0.5.23))(esbuild@0.28.1))
       watchpack: 2.5.0
       webpack-sources: 3.3.3
     transitivePeerDependencies:
@@ -25774,8 +25389,6 @@ snapshots:
 
   xmlchars@2.2.0: {}
 
-  xtend@4.0.2: {}
-
   xxhash-wasm@1.1.0: {}
 
   y18n@4.0.3: {}
@@ -25792,15 +25405,13 @@ snapshots:
 
   yaml@2.8.0: {}
 
-  yaml@2.8.2: {}
+  yaml@2.9.0: {}
 
   yargs-parser@18.1.3:
     dependencies:
       camelcase: 5.3.1
       decamelize: 1.2.0
 
-  yargs-parser@20.2.9: {}
-
   yargs-parser@21.1.1: {}
 
   yargs-parser@22.0.0: {}
@@ -25819,16 +25430,6 @@ snapshots:
       y18n: 4.0.3
       yargs-parser: 18.1.3
 
-  yargs@16.2.0:
-    dependencies:
-      cliui: 7.0.4
-      escalade: 3.2.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 20.2.9
-
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
@@ -25879,6 +25480,6 @@ snapshots:
 
   zod@4.3.6: {}
 
-  zone.js@0.15.1: {}
+  zone.js@0.16.2: {}
 
   zwitch@2.0.4: {}
diff --git a/spikes/mpv-frame-copy/.gitignore b/spikes/mpv-frame-copy/.gitignore
new file mode 100644
index 000000000..daba7867e
--- /dev/null
+++ b/spikes/mpv-frame-copy/.gitignore
@@ -0,0 +1,3 @@
+build/
+media/
+results-*.txt
diff --git a/spikes/mpv-frame-copy/ANALYSIS.md b/spikes/mpv-frame-copy/ANALYSIS.md
new file mode 100644
index 000000000..a83eec6b5
--- /dev/null
+++ b/spikes/mpv-frame-copy/ANALYSIS.md
@@ -0,0 +1,107 @@
+# Embedded MPV: frame-copy unification — analysis handoff
+
+> Committed for history: this is the 2026-07-10 analysis that kicked off the
+> spike and the integration on this branch. Current state lives in
+> README.md/RESULTS.md/DESIGN.md next to this file and in
+> `docs/architecture/embedded-mpv-native.md` ("Frame-Copy Engine").
+
+Status: **analysis/decision doc, no code yet.** This distills a working session
+(2026-07-10) comparing the embedded-MPV approaches and designing the next step.
+A fresh agent/developer session should be able to continue from this file alone.
+
+## Context
+
+- Contributor **larsemig** proposed a unified player-controls architecture in
+  [PR #1105](https://github.com/4gray/iptvnator/pull/1105) (docs-only, direction
+  approved) and implemented it as a stacked 7-PR series:
+  [#1148](https://github.com/4gray/iptvnator/pull/1148) shared controls layer,
+  [#1149](https://github.com/4gray/iptvnator/pull/1149) session-controller decompose,
+  [#1150](https://github.com/4gray/iptvnator/pull/1150) immersive overlay (macOS),
+  [#1151](https://github.com/4gray/iptvnator/pull/1151) native macOS fullscreen,
+  [#1152](https://github.com/4gray/iptvnator/pull/1152)–[#1154](https://github.com/4gray/iptvnator/pull/1154)
+  HTML5/Video.js/ArtPlayer on shared controls (flag `WEB_PLAYER_SHARED_CONTROLS`, default OFF).
+- All 7 PRs are OPEN (as of 2026-07-10). Master still has the pre-series
+  ("docked controls") approach documented in `docs/architecture/embedded-mpv-native.md`.
+
+## Comparison verdict
+
+The series is really **two independent things**:
+
+1. **Shared engine-agnostic controls contract** (`PlayerController`:
+   capabilities/state/commands + thin per-engine adapters) — low-risk, valuable,
+   survives any change of rendering mechanics. Recommendation: merge PRs 1, 2, 5, 6, 7.
+2. **Immersive compositing** (native mpv surface `NSWindowBelow` the WebContents,
+   `transparent:true` main window, structural CSS "tunnel" via
+   `:has(app-embedded-mpv-player)`, backdrop-with-hole) — the risky part.
+   Two field bugs already found by 4gray in #1154:
+   - opaque page wrappers painting black over the video (fixed structurally);
+   - transparent "hole to the desktop" until the user scrolls — a Chromium
+     compositor damage-tracking bug class, not fixable app-side.
+   Worst for prod: `transparent:true` is set at window creation and therefore
+   applies to **all macOS users unconditionally**, flag or no flag.
+   Recommendation: do not ship PRs 3–4 as-is; keep as experiment.
+
+## Next step: frame-copy prototype (larsemig's own follow-up idea)
+
+Idea from [his comment on #1154](https://github.com/4gray/iptvnator/pull/1154#issuecomment-4932807350):
+render natively in the background, copy frames into the web UI, drop the
+transparent window entirely. Assessment: correct direction — trades
+unpredictable compositor bugs for a predictable performance tax, and it is the
+only realistic path to one architecture on macOS/Windows/Linux.
+
+### Target architecture (prototype the end-state directly)
+
+```
+mpv-helper process (links libmpv)          Electron
+  decode (hwdec=*-copy)                      native addon: map shm,
+  render offscreen GL FBO -> async PBO       memcpy frame -> ArrayBuffer
+  readback (or SW render)                    renderer: WebGL texture upload
+  audio -> OS directly                       in rAF -> <canvas>; controls = DOM
+        |                                        ^
+        +---- shared-memory ring buffer ---------+
+        +---- JSON IPC (reuse Linux protocol in
+              embedded_mpv_wid_common.h) -------->
+```
+
+Key design points:
+
+- **Helper process, not in-process libmpv**: in-process is forbidden on Linux
+  (ffmpeg/GL symbol clash with Electron — see `embedded-mpv-native.md`), and a
+  helper gives crash isolation everywhere + lets Linux finally bundle libmpv
+  (full feature set, Flatpak/Snap become possible, no system-mpv-on-PATH).
+- **Render at viewport size, not source size** — mpv scales on GPU before
+  readback; 4K source in a 720p window costs 720p. Full price only in 4K fullscreen.
+- **Audio untouched** (helper plays directly); compensate video-path latency
+  with calibrated mpv `--audio-delay` to restore lip-sync.
+- **3-frame ring buffer** in shm; reader takes latest complete frame, drops
+  stale ones (prevents latency accumulation).
+- The controls layer from the PR series is reused as-is (adapter over the same
+  `PlayerController` contract); tunnel/backdrop/immersive code becomes unnecessary.
+
+### 4K numbers and risks
+
+- 3840×2160 RGBA = 33 MB/frame; ~2 GB/s per copy at 50–60 fps; 2–3 copies in
+  the path (readback, shm→buffer, texture upload).
+- Added latency ≈ 2–3 frames (~40–60 ms): async PBO readback +1 frame, memcpy
+  ~6–8 ms, rAF alignment 0–17 ms, Chromium compositor +1 frame. Fixed latency
+  is NOT the problem for IPTV (audio-delay compensates lip-sync).
+- Real risks: **frame pacing/judder** on weak hardware (Intel iGPU, old
+  Intel Macs) if the per-frame budget isn't met consistently; **50→60 Hz
+  cadence** judder (mpv's display-resync is lost with manual rAF presentation);
+  **HDR** must be tonemapped (canvas is SDR); battery cost of extra GB/s.
+
+### Prototype plan and go/no-go gates
+
+1. Spike without Electron (~days): helper renders to shm; bare Chromium page draws.
+2. Measure on: Apple Silicon, Intel Mac, mid-range Windows laptop (iGPU).
+   Scenarios: 1080p60, 4K25/50 SDR, 4K HDR; windowed + fullscreen.
+3. Gates: sustained fps with low frame-time variance (not average fps!),
+   CPU/GPU %, end-to-end latency (flash test), battery drain.
+4. Only on green numbers: integrate behind its own flag; docked path stays as fallback.
+   If weak hardware fails: still viable as main path with auto-fallback to
+   docked/external player for 4K fullscreen.
+
+## Coordination
+
+larsemig offered to hand over or assist (see #1154 thread). Suggested reply:
+convert the offer into a joint frame-copy spike rather than a branch handover.
diff --git a/spikes/mpv-frame-copy/DESIGN.md b/spikes/mpv-frame-copy/DESIGN.md
new file mode 100644
index 000000000..d69e87c15
--- /dev/null
+++ b/spikes/mpv-frame-copy/DESIGN.md
@@ -0,0 +1,132 @@
+# Frame-copy engine — integration design (draft)
+
+Status: **draft for discussion**, based on the spike in this directory
+(measurements: `RESULTS.md`; analysis:
+`.plans/2026-07-10-embedded-mpv-frame-copy-unification.md`). Not committed
+to `docs/architecture/` yet because nothing here ships; graduate it there
+when integration starts.
+
+## Goal
+
+One embedded-playback rendering architecture on macOS, Windows, and Linux:
+mpv renders in a helper process, frames are copied into the web UI as a
+normal `<canvas>`. This replaces, eventually:
+
+- macOS: `NSOpenGLView` layered under/over Chromium (fragile against OS
+  compositor changes — see the macOS 26.2 layering regression) and the
+  immersive `transparent:true` experiment (PRs #1150–#1151);
+- Windows: `--wid` against a child `HWND` (native surface stacking, no DOM
+  overlays);
+- Linux: out-of-process `mpv --wid=<x11-window>` (X11-only, system mpv
+  required, reduced feature set).
+
+## Process model
+
+- `iptvnator-mpv-helper` — a per-session process shipped with the app,
+  linking the bundled libmpv on **all three platforms**. In-process libmpv
+  is forbidden on Linux (ffmpeg/GL symbol clash with Electron), but a
+  helper process is exactly the isolation that makes it legal — so Linux
+  finally gets the full libmpv feature set (subtitles, speed, aspect,
+  recording), native-Wayland stops mattering (no window embedding at all),
+  and Flatpak/Snap become possible.
+- Spawned/owned by the existing `EmbeddedMpvNativeService` successor in the
+  Electron main process. Helper crash = session `error` event + UI fallback;
+  the Electron process is never taken down by libmpv.
+- The native addon shrinks to a thin shm reader (map + copyLatest), as in
+  the spike. Process spawning/control needs no native code (Node
+  `child_process` + stdio).
+
+## Control protocol
+
+- JSON lines over the helper's stdin/stdout, evolving the command set the
+  Linux `--wid` backend already speaks over its socket
+  (`embedded_mpv_wid_common.h`): `loadfile` (with start offset, headers,
+  user-agent, referrer), `pause`, `seek`, `volume`, `aid`/`sid`/`speed`/
+  `video-aspect-override`, `stream-record`, `quit`.
+- Unlike the Linux socket backend, the helper links libmpv, so it pushes
+  property events (status, time-pos/duration, track-list, eof-reached)
+  instead of being polled with a scalar-only parser. Status mapping
+  (`ended` vs `idle` vs `error`, `MPV_END_FILE_REASON_*`, `eof-reached`
+  with `keep-open`) is ported unchanged from `embedded_mpv.mm`.
+- The main process keeps translating to the existing
+  `EmbeddedMpvSession` contract — the preload/renderer API surface does not
+  change, so `EmbeddedMpvPlayerComponent` and the PR-series
+  `PlayerController` adapter sit on top unmodified.
+
+## Video path
+
+- shm ring exactly as in the spike: 3 slots, per-slot seqlock, BGRA frames
+  at **viewport size** (claim verified: 4K source in a 720p viewport costs
+  720p — RESULTS.md).
+- Renderer: WebGL2 canvas inside the player component, rAF-polling
+  `latestSeq` (spike-proven at 60 fps; a wakeup channel is a later
+  optimization, as is skipping redraws when no new frame arrived).
+- **This deletes the compositor-workaround machinery**: no bounds-sync on
+  scroll/resize, no `HIDDEN_BOUNDS` when dialogs open, no 300 px popover
+  cutout, no reserved control dock — controls and dialogs are ordinary DOM
+  above a canvas.
+- Resize: renderer reports new bounds (debounced ~100 ms) → helper
+  recreates FBO/PBOs and a new shm generation
+  (`/iptvnator-mpv-<sessionId>-<gen>`); the viewer remaps on the control
+  event announcing the new generation and keeps presenting the old frame
+  (CSS-scaled) until the first new-generation frame lands.
+
+## Audio and A/V sync
+
+Audio never crosses the boundary — the helper plays it through the OS
+directly. The video path adds ~10 ms on M1 (measure per platform); a
+calibrated default `--audio-delay` compensates lip-sync. Calibration method
+(flash test) is still an open gate.
+
+## HDR
+
+mpv tonemaps HDR→SDR before readback (verified with 4K25 HDR10 PQ/BT.2020
+at full rate). The canvas stays SDR; HDR passthrough is explicitly out of
+scope for v1.
+
+## Packaging
+
+- macOS/Windows: the existing vendored-LGPL libmpv staging
+  (`tools/embedded-mpv/`, `vendor/embedded-mpv/`) is reused as-is; the
+  helper binary is one more artifact built per platform/arch next to
+  `embedded_mpv.node`.
+- Linux: the helper links the **bundled** libmpv — the
+  `external-mpv-process` manifest and the system-mpv-on-PATH requirement
+  disappear. Linux staging switches from "headers only" to the same
+  vendored-runtime flow as macOS.
+- Windows shm: POSIX `shm_open` on macOS/Linux, `CreateFileMapping` named
+  sections on Windows behind the same header layout.
+
+## Platform scope
+
+macOS: **Apple Silicon (arm64) only** — owner decision 2026-07-10. Support
+detection gates on the CPU architecture; Intel Macs keep the existing
+docked native path, external players, and web engines. This closes the
+macOS hardware gate with the M1 Pro measurements and moves all remaining
+hardware risk to Windows/Linux.
+
+## Platform bring-up order
+
+1. macOS: spike is the implementation seed (CGL headless + PBO ring).
+2. Windows: WGL headless context (hidden window) + same GL readback path;
+   `MPV_RENDER_API_TYPE_SW` is the fallback bring-up option if WGL fights,
+   at the cost of CPU-side scaling.
+3. Linux: EGL headless (surfaceless platform) — also drops the
+   Xwayland-only constraint.
+
+## Rollout
+
+- Behind its own experiment flag (settings + env), default OFF. The current
+  docked native path stays the default until the hardware gates pass.
+- Relationship to the PR series: the shared-controls PRs (#1148, #1149,
+  #1152–#1154) merge independently — the frame-copy player is just another
+  `PlayerController` engine. The immersive/transparent-window PRs
+  (#1150–#1151) stay experimental and are superseded by this path.
+
+## Open gates before default-ON
+
+- Windows iGPU numbers (needs the Windows helper port; RESULTS.md has the
+  repro recipe). Intel Mac gate closed by the arm64-only scope decision.
+- Latency flash test + per-platform `--audio-delay` calibration.
+- Battery drain delta vs the native-surface approach.
+- Windows/Linux helper ports validated on real machines.
diff --git a/spikes/mpv-frame-copy/Makefile b/spikes/mpv-frame-copy/Makefile
new file mode 100644
index 000000000..71f53bd92
--- /dev/null
+++ b/spikes/mpv-frame-copy/Makefile
@@ -0,0 +1,46 @@
+# mpv frame-copy spike (macOS only for now).
+#
+# Requires: Homebrew libmpv (brew install mpv) and Node >= 18 on PATH (for
+# its N-API headers). Both are auto-detected; override BREW_PREFIX/NODE_INC
+# if detection picks the wrong one. Works on Apple Silicon (/opt/homebrew)
+# and Intel (/usr/local) Homebrew layouts.
+
+# libmpv prefix: Homebrew (Apple Silicon /opt/homebrew or Intel /usr/local)
+# or MacPorts (/opt/local, needed on legacy macOS like High Sierra where
+# Homebrew is unsupported — install with: sudo port install mpv +libmpv).
+MPV_PREFIX ?= $(shell \
+	brew_p="$$(brew --prefix 2>/dev/null)"; \
+	if [ -n "$$brew_p" ] && ls "$$brew_p"/lib/libmpv*.dylib >/dev/null 2>&1; then echo "$$brew_p"; \
+	elif ls /opt/local/lib/libmpv*.dylib >/dev/null 2>&1; then echo /opt/local; \
+	else echo /opt/homebrew; fi)
+BREW_PREFIX ?= $(MPV_PREFIX)
+# Self-contained bundles vendor the four N-API headers so no Node install
+# is needed; otherwise take headers from the PATH node.
+ifneq (,$(wildcard vendor/node-headers/node_api.h))
+NODE_INC ?= vendor/node-headers
+else
+NODE_INC ?= $(shell node -p "require('path').join(process.execPath, '..', '..', 'include', 'node')" 2>/dev/null)
+endif
+
+BUILD := build
+
+all: $(BUILD)/mpv_helper $(BUILD)/shm_reader.node
+
+$(BUILD):
+	mkdir -p $(BUILD)
+
+$(BUILD)/mpv_helper: helper/mpv_helper.cpp common/spike_shm.h | $(BUILD)
+	clang++ -std=c++17 -O2 -Wall -Icommon -I$(BREW_PREFIX)/include \
+		-o $@ helper/mpv_helper.cpp \
+		-L$(BREW_PREFIX)/lib -lmpv -Wl,-rpath,$(BREW_PREFIX)/lib \
+		-framework OpenGL
+
+$(BUILD)/shm_reader.node: viewer/addon/shm_reader.c common/spike_shm.h | $(BUILD)
+	clang -std=c11 -O2 -Wall -Icommon -I$(NODE_INC) \
+		-shared -fPIC -Wl,-undefined,dynamic_lookup \
+		-o $@ viewer/addon/shm_reader.c
+
+clean:
+	rm -rf $(BUILD)
+
+.PHONY: all clean
diff --git a/spikes/mpv-frame-copy/PORTING.md b/spikes/mpv-frame-copy/PORTING.md
new file mode 100644
index 000000000..0e0389738
--- /dev/null
+++ b/spikes/mpv-frame-copy/PORTING.md
@@ -0,0 +1,232 @@
+# Frame-copy engine — Windows/Linux porting handoff
+
+> Historical handoff and maintenance notes for the completed Linux and
+> Windows ports. The canonical runtime contract now lives in
+> `docs/architecture/embedded-mpv-native.md`.
+
+## State as of 2026-07-15
+
+- The macOS base shipped through PR #1169 and is now merged into `master`.
+- The engine works end-to-end on macOS Apple Silicon: Settings toggle →
+  restart → helper process renders mpv offscreen → shm ring → preload pump
+  → WebGL canvas. Verified live with real IPTV + Stalker VOD.
+- Scope decision: macOS = arm64 only (Intel Macs keep the native engine).
+- **The Linux port below is DONE in PR #1171** (rebased directly onto the
+  merged #1169 result) — headless
+  EGL helper, portable clock, reader on `__linux__`, TS gates, i18n,
+  measurements in RESULTS.md. Verified end-to-end in-app on Ubuntu 25.04
+  (Wayland session) with the xtream mock portal. Dev-build-only on Linux:
+  the helper links system libmpv and `electron-after-pack.cjs` strips it
+  from packages until milestone 4 (Linux bundled-libmpv runtime) — remove
+  that strip when milestone 4 lands.
+- **The Windows port below landed through PR #1175** — WGL GlContext twin,
+  QPC clock + `Local\` named-file-mapping
+  shm twins (the protocol keeps POSIX-style `/impv-*` names; the native
+  sides derive the mapping name), reader compiled as C++ on `_WIN32`
+  (MSVC has no C11 `<stdatomic.h>`), helper `.exe` binding.gyp target
+  linking the vendored import lib + opengl32 (mpv DLL resolved from the
+  exe's own directory), TS gates + `.exe` helper discovery, i18n,
+  packaging/CI guards (win32 packages must ship helper + reader; MSVC
+  intermediates and import libs excluded from dist). **The open iGPU perf
+  gate is CLOSED**: RESULTS.md rows on the same i7-1165G7/Iris Xe laptop
+  as the Linux section (dual boot) — 1080p60 sustained (clean 60 s run),
+  the viewport-price claim reproduces, d3d11va hwdec active (5.5× CPU
+  drop), torn=0 everywhere. Machine gotchas for future sessions: Windows
+  11 Smart App Control must be OFF to run locally-built unsigned helpers,
+  and a fresh Windows install can leave the iGPU on the Basic Display
+  Adapter — bind the real Intel driver (`pnputil /remove-device` +
+  `/scan-devices` once the driver is in the store) or WGL has no 3.2 core
+  context and no d3d11va.
+- PR #1169 credits larsemig's idea (#1154 comment 4932807350). Shared-player
+  controls remain a separate integration after this platform stack; do not
+  conflate that UI layer with the frame-copy transport ports.
+
+## What "porting" means
+
+Only the helper (and a small reader-addon branch) is platform-specific.
+The stdio protocol, shm layout, TS adapter, main-process service, preload
+pump, and Angular UI are shared and already shipped.
+
+```
+apps/electron-backend/native/helper/          # state after all three ports:
+├── mpv_frame_helper.cpp     # portable: protocol, mpv session, snapshots
+├── frame_helper_io.h        # portable: TSV-in/JSON-out, percent-encoding
+├── frame_shm.h              # portable layout + shared clock (POSIX
+│                            # CLOCK_MONOTONIC / Windows QPC) + the Windows
+│                            # Local\ mapping-name derivation
+├── frame_helper_render.h    # portable render + ShmRing (POSIX shm_open /
+│                            # Windows CreateFileMapping twins)
+└── frame_helper_gl.h        # PLATFORM SEAM: GlContext — CGL (macOS),
+                             # EGL (Linux) and WGL (Windows)
+apps/electron-backend/native/src/embedded_mpv_frame_reader.c
+                             # real impl on __APPLE__ + __linux__ + _WIN32
+                             # (compiled as C++ there), stub elsewhere
+```
+
+All three ports have landed; new platforms follow the same seams: a
+GlContext twin in `frame_helper_gl.h`, shm create/open + `frame_shm_now_ns`
+twins, the TS gate in `embedded-mpv-frame-copy-platform.util.ts`, packaging.
+
+## Branching & merge strategy
+
+- The platform stack landed in order #1169 → #1171 → #1175.
+- Each child was rewritten onto the latest squash-merged `master` using only
+  its platform-specific commit range; the old parent history was not replayed.
+- New frame-copy work branches directly from `master`. Keep future stacks at
+  most one unmerged level deep and land platform measurements with their port.
+
+## Per-platform task lists
+
+### Linux (DONE 2026-07-11 — see the update in "State" above)
+
+1. **Render backend**: headless EGL (`EGL_PLATFORM_SURFACELESS_MESA` /
+   `eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA)` with fallback to
+   default-display and GBM candidates) + the same FBO/PBO/readback code.
+   Each candidate is validated through context bind and `GL_RENDERER`; a
+   hardware renderer wins over an earlier software tier. mpv resolves linked
+   core GL symbols through `dlsym(RTLD_DEFAULT)` and falls back to
+   `eglGetProcAddress` for extensions.
+2. **shm**: POSIX `shm_open` works as-is. The ONLY blocker in shared code:
+   `clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW)` is **macOS-only** — replace
+   with a portable `now_ns()` (`clock_gettime(CLOCK_MONOTONIC, ...)`) in
+   `frame_helper_render.h`, `frame_shm` users, and the reader addon. Keep
+   producer/consumer on the SAME clock.
+3. **Reader addon**: change `#ifdef __APPLE__` to also cover `__linux__`
+   (code is already POSIX apart from the clock call).
+4. **binding.gyp**: helper target gets a linux branch — link system libmpv
+   for dev first (`-lmpv`); bundled-libmpv runtime is a later packaging
+   task. NOTE: the LINUX ADDON must still not link libmpv (that rule is for
+   in-process only — the helper is a separate process, linking is the whole
+   point and is legal there).
+5. **TS gates**: `isFrameCopyEngineActive`/`isFrameCopyAvailable` in
+   `embedded-mpv-native.service.ts` (drop the darwin/arm64-only condition
+   for linux), `EmbeddedMpvFrameCopyAdapter.isSupported`, Settings copy +
+   i18n descriptions currently say "macOS Apple Silicon only".
+6. **Big prize**: no window embedding → native Wayland just works; later
+   bundle libmpv → no system-mpv-on-PATH requirement → Flatpak/Snap. Update
+   the Linux support matrix in `docs/architecture/embedded-mpv-native.md`
+   when this lands.
+
+### Windows (DONE 2026-07-12 — see the update in "State" above)
+
+One deviation from the checklist below: the WGL context uses a hidden
+regular window, not a message-only one — SetPixelFormat needs a
+display-capable DC.
+
+1. **Render backend**: WGL headless — create a hidden message-only window +
+   dummy pixel format, `wglCreateContextAttribsARB` 3.2 core, then the same
+   FBO/PBO path. `MPV_RENDER_API_TYPE_SW` is the fallback bring-up if WGL
+   fights (CPU render, still proves the pipeline).
+2. **shm**: `CreateFileMapping(INVALID_HANDLE_VALUE, ...)` +
+   `MapViewOfFile` behind the same `FrameShmHeader` layout. Name mapping:
+   `Local\\impv-...` (session-local namespace). Reader addon gets the
+   `#ifdef _WIN32` twin. Atomics: `std::atomic<uint64_t>` fine with MSVC;
+   the C reader can use `InterlockedCompareExchange`-free plain
+   `_Atomic`-equivalent via C11 `<stdatomic.h>` (clang-cl) or volatile+
+   `MemoryBarrier` — simplest is compiling the reader as C++ on Windows.
+3. **Process control**: `child.kill('SIGTERM')` on Windows is
+   TerminateProcess (no graceful signal) — the quit command + stdin-EOF
+   paths (already implemented) are the graceful route; keep the kill as the
+   hard fallback. stdio pipes work unchanged.
+4. **binding.gyp**: helper `.exe` target under `OS=="win"` linking the
+   existing import lib (`LIBMPV_IMPORT_LIB` env — see build-embedded-mpv.js
+   Windows path). DLL resolution: the helper exe sits next to `lib/` with
+   the mpv DLL — either copy the DLL beside the exe at build time or call
+   `SetDllDirectory`/`AddDllDirectory` at startup. Watch the documented
+   import-library-vs-DLL-basename gotcha (embedded-mpv-native.md).
+5. **TS gates + audio**: same switches as Linux. WASAPI audio comes from
+   mpv directly — nothing to do.
+6. **This is the open PERFORMANCE gate**: mid-range iGPU laptop numbers
+   decide go/no-go (RESULTS.md has the methodology + reference M1 numbers:
+   4K60 sustained, ~10 ms produce→upload, zero torn frames).
+
+### Both platforms — shared chores
+
+- `validatePackagedEmbeddedMpv` in `tools/packaging/embedded-mpv-packaging.cjs`
+  currently requires frame-copy artifacts **on darwin only** — extend per
+  platform when artifacts ship. Keep tests host-agnostic (CI runs them on
+  a Linux runner; asserting an empty error list for a darwin dir fails
+  there with "link validation must run on a macOS host" — already fixed
+  once, don't regress).
+- `getMainWindowScaleFactor` (Electron `screen`) is cross-platform — no
+  work needed; the helper receives device pixels.
+- Sandbox story: the flag relaxes the BrowserWindow sandbox for the preload
+  reader require. Same trade-off applies on Win/Linux. Revisit-before-
+  default-on candidates are in the architecture doc.
+
+## Hard-won gotchas (do not rediscover these)
+
+1. **Preload + tslib**: repo tsconfig has `target: es2015`; ANY construct
+   that emits TS helpers in preload code (async/await, object spread in
+   downlevel positions) with `importHelpers: true` makes webpack
+   externalize `tslib` → the sandboxed preload dies with
+   `module not found: tslib` → `window.electron` disappears app-wide.
+   `apps/electron-backend/tsconfig.app.json` now sets
+   `importHelpers: false` — NEVER revert it. Symptom to recognize:
+   "Unable to load preload script" in renderer console.
+2. **V8 memory cage**: `napi_create_external_arraybuffer` over shm aborts
+   in Electron. The reader MUST memcpy into a V8 buffer. Budgeted (~1.2 ms
+   at 4K).
+3. **Frame orientation**: helper renders with `MPV_RENDER_PARAM_FLIP_Y=1`
+   and `glReadPixels` reads rows bottom-up → the shm buffer is already in
+   texture order. The pump shader samples with UN-flipped uv. Adding a
+   second flip shows upside-down video (bug already made and fixed once).
+4. **BGRA fast path**: readback as `GL_BGRA`/`GL_UNSIGNED_INT_8_8_8_8_REV`,
+   upload as RGBA, swizzle `.bgr` in the fragment shader. On Windows check
+   whether BGRA readback stays the fast path per driver; measure, don't
+   assume.
+5. **Aspect**: mpv reports unset `video-aspect-override` as `"-1.000000"`
+   → normalize to `"no"`. The helper aspect-fits the FBO to
+   `dwidth`/`dheight` inside the viewport (no baked letterbox bars) and
+   bumps a shm generation (`<base>-g<N>`) on every size change; the pump
+   re-attaches via the FRAME_SOURCE_CHANGED event.
+6. **Stale attach race**: attach/detach bump a shared epoch in the pump;
+   every await re-checks it. Keep that invariant if touching the pump.
+7. **Lifecycle**: dispose escalation is quit-command → stdin.end() (helper
+   exits on EOF) → SIGTERM(500 ms) → SIGKILL(2 s). The SERVICE also reaps
+   all sessions on `render-process-gone`/`did-navigate` (renderer crash or
+   hard reload never runs Angular teardown — without this, helpers leak).
+   Watch `ps | grep iptvnator_mpv_helper` during any manual test session.
+8. **Stale opt-in**: `isFrameCopyEngineActive()` requires the helper binary
+   on disk; missing helper = silent fallback to native, and the Settings
+   checkbox stays visible while the saved value is true so it can always
+   be cleared.
+9. **node-gyp naming**: module targets emit `<target_name>.node` (no
+   `product_name` needed); the helper uses the `"type": "none"` default +
+   per-OS `"type": "executable"` override trick in binding.gyp.
+10. **snapshot protocol**: helper's `snapshot` JSON mirrors
+    `NativeEmbeddedMpvSessionSnapshot` verbatim (volume 0..1, `null`able
+    duration/track ids, `videoWidth/videoHeight` when known). Status
+    semantics are ported from `embedded_mpv.mm` — END_FILE reason mapping,
+    `eof-reached` ⇒ `ended` (keep-open), pause gated on loadedPath,
+    only fatal/load errors flip status. Don't invent new mappings.
+
+## Testing recipes
+
+- **Helper standalone** (no Electron):
+  `(printf 'load\turl=av://lavfi:testsrc2=size=640x360:rate=30\n'; sleep 5; printf 'quit\n') | ./iptvnator_mpv_helper --shm-base /impv-t --width 1280 --height 720`
+  → expect `shm` generations, `snapshot` events at 4 Hz, aspect-fit
+  generation after video loads.
+- **Reader probe** (any Node ≥18):
+  `node -e "const r=require('.../embedded_mpv_frame_reader.node'); const i=r.open('/impv-t-g2'); ..."`
+  → `latestSeq()` advancing + pixel min/max spread.
+- **In-app**: `IPTVNATOR_ENABLE_EMBEDDED_MPV_FRAME_COPY=1 pnpm run
+serve:backend:embedded-mpv` or the Settings toggle (+restart). Second
+  parallel instance for CDP testing: build, then run
+  `electron dist/apps/electron-backend/main.js --remote-debugging-port=9223
+--user-data-dir=/tmp/x` with `ELECTRON_IS_DEV=0` for the file:// renderer
+  (dist package.json has no `main` field — point at main.js explicitly;
+  a separate user-data-dir avoids the Chromium profile singleton).
+- **Perf gate**: follow `RESULTS.md` methodology (STATS/LONGRUN lines,
+  present-interval sd/p99/late counters). Reference: M1 Pro tables therein.
+  The spike harness in this directory is macOS-only; for Windows/Linux
+  measure through the real app + helper stderr or port collect-results.sh.
+
+## Suggested milestone order
+
+1. **Completed in #1171:** Linux helper bring-up (EGL + portable clock) →
+   lavfi smoke → in-app behind flag → measure.
+2. Windows helper bring-up (WGL, named shm, reader twin) → same ladder →
+   **iGPU laptop numbers = the decisive open gate**.
+3. Packaging: per-platform artifact validation + runtime staging.
+4. Only then: revisit Linux bundled-libmpv + Flatpak/Snap story.
diff --git a/spikes/mpv-frame-copy/README.md b/spikes/mpv-frame-copy/README.md
new file mode 100644
index 000000000..224ec6625
--- /dev/null
+++ b/spikes/mpv-frame-copy/README.md
@@ -0,0 +1,115 @@
+# mpv frame-copy spike
+
+Standalone prototype for the frame-copy unification of embedded MPV
+(analysis: `.plans/2026-07-10-embedded-mpv-frame-copy-unification.md`).
+Instead of compositing a native mpv surface under a transparent Electron
+window, the helper renders mpv offscreen and copies frames into the web UI:
+
+```
+mpv_helper (links libmpv)                Electron viewer
+  decode (hwdec) + offscreen GL FBO        shm_reader.node: memcpy newest
+  async PBO readback (3-deep ring)         frame -> ArrayBuffer
+  BGRA frames -> shm ring (3 slots)        renderer: texSubImage2D in rAF
+  audio -> OS directly                     -> WebGL canvas (BGRA swizzle)
+        |                                      ^
+        +------ POSIX shm ring buffer ---------+
+```
+
+macOS only for now. No Electron-app integration, no controls — this exists
+to measure whether the copy pipeline meets the go/no-go gates.
+
+## Build and run
+
+Requires Homebrew `mpv` (libmpv + headers) and Node ≥ 18 on `PATH`; the
+Makefile auto-detects the Homebrew prefix (Apple Silicon and Intel) and the
+Node include dir.
+
+Quick checklist for a fresh machine (e.g. the pending Intel Mac run):
+
+```bash
+brew install mpv                     # libmpv + headers
+git clone <repo> && cd <repo>
+pnpm install --frozen-lockfile       # provides the Electron binary for the viewer
+cd spikes/mpv-frame-copy
+./run.sh 'av://lavfi:testsrc2=size=1920x1080:rate=60'   # sanity
+# then the RESULTS.md scenarios (4K synthetic, 4K HEVC hwdec, 50 fps, HDR)
+```
+
+```bash
+./run.sh /path/to/video.mkv 3840x2160
+./run.sh 'av://lavfi:testsrc2=size=1920x1080:rate=60'   # synthetic source
+HELPER_ARGS='--hwdec videotoolbox --loop' ./run.sh /tmp/clip.mp4 3840x2160
+```
+
+`run.sh` builds both binaries, starts the helper, then opens the Electron
+viewer (binary auto-detected from the repo `node_modules`, override with
+`ELECTRON=`). The helper prints producer stats to stderr once per second;
+the viewer prints `STATS` lines to stdout every 2 s and shows the same in an
+on-screen HUD. `PIXELPROBE` is a one-shot image sanity check (spread > 0
+means real frames, not black).
+
+Key design points implemented here:
+
+- **Render at viewport size**: `--size WxH` is the FBO size; mpv scales on
+  the GPU before readback, so a 4K source in a 720p viewport costs 720p.
+- **Async PBO readback**: `glReadPixels` goes into a 3-deep PBO ring; the
+  previous frame's PBO is mapped/copied while the new readback is in flight.
+- **3-slot shm ring with per-slot seqlock**: the reader takes the newest
+  complete frame and drops stale ones, so latency cannot accumulate.
+- **Audio never crosses the boundary**: the helper plays it directly.
+- **mpv keeps its own frame pacing**: the render call blocks for mpv's
+  target time (default `block_for_target_time`), so the helper's `render ms`
+  figure includes that pacing wait — it is not GPU cost.
+- **The addon must memcpy**: Electron's V8 memory cage forbids external
+  ArrayBuffers over shm, so zero-copy into JS is impossible. The measured
+  path is readback -> shm -> renderer ArrayBuffer -> GPU texture upload.
+
+## First measurements (2026-07-10, MacBook Pro M1 Pro, 120 Hz display)
+
+> Canonical measurement log (per machine, with repro commands): `RESULTS.md`.
+> Append future runs there — especially the pending Intel Mac / Windows iGPU
+> baselines.
+
+| Scenario | Producer | Viewer new-frame fps | copy ms avg/p95 | upload ms avg/p95 | produce→uploaded age ms avg/p95 | torn |
+| --- | --- | --- | --- | --- | --- | --- |
+| 1080p60 testsrc2 (sw) | 60.0 fps | 59.8 | 0.28 / 0.35 | 0.29 / 0.40 | 4.2 / 6.8 | 0 |
+| 4K60 testsrc2 (sw) | 60.0 fps | 60.0 | 1.17 / 1.35 | 3.8 / 4.5 | 11.0 / 12.7 | 0 |
+| 4K60 HEVC 25 Mbit (hwdec=videotoolbox) | 60.0 fps | 59.9 | 1.2 / 1.6 | 3.3 / 4.1 | 9.8 / 11.7 | 0 |
+
+Helper-side PBO map+copy at 4K: ~1.0–1.8 ms avg. CPU during 4K60 HEVC:
+helper ~18 %, Electron renderer ~24 % of one core. The only fps dip observed
+coincided with the `--loop` file restart (decoder reinit), not the copy path.
+
+Takeaway so far: on Apple Silicon the copy tax is far below the analysis
+doc's worst-case budget (33 MB memcpy ≈ 1.2 ms, not 6–8 ms; end-to-end added
+latency ≈ 10 ms, not 40–60 ms). The remaining open gates are weaker hardware
+and long-run pacing, not raw throughput on modern Macs.
+
+## Gate status (details in RESULTS.md)
+
+Measured on M1 Pro (2026-07-10):
+
+- ✅ Throughput: 4K60 HEVC hwdec sustained end to end with ~10 ms added
+  latency and single-digit-ms copies.
+- ✅ Frame pacing: viewer STATS now report per-interval stddev/p99/late
+  counts (`present iv` / `src iv`, `LONGRUN` cumulative line every 30 s).
+  50 fps and 25 fps cadences are clean; residual jitter is 120 Hz rAF grid
+  quantization (≤ one display tick), not lost frames.
+- ✅ HDR: 4K25 HDR10 (PQ/BT.2020) tonemapped to SDR by mpv before readback
+  at full rate with unchanged copy costs.
+
+Still open:
+
+- Mid-range Windows laptop (iGPU) — the actual risk hardware; needs the
+  Windows helper port first. (Intel Macs: skipped by decision — on macOS
+  the engine targets Apple Silicon only, see RESULTS.md.)
+- End-to-end latency flash test (photodiode/screen-capture method) and
+  audio/video sync offset to calibrate `--audio-delay`.
+- Battery drain delta vs the native-surface approach.
+
+## Known limitations of this spike
+
+- macOS-only helper (CGL); Windows needs WGL/D3D, Linux EGL — same protocol.
+- `latestSeq`/`copyLatest` poll in rAF; no wakeup channel (fine at 60 fps).
+- Viewer canvas redraws every rAF tick even without a new frame.
+- No reconnect handling if the helper restarts (viewer keeps last mapping).
diff --git a/spikes/mpv-frame-copy/RESULTS.md b/spikes/mpv-frame-copy/RESULTS.md
new file mode 100644
index 000000000..fb83fd340
--- /dev/null
+++ b/spikes/mpv-frame-copy/RESULTS.md
@@ -0,0 +1,192 @@
+# Frame-copy spike — measurement log
+
+One section per machine. Append new runs here; do not overwrite old ones —
+this file is the cross-hardware comparison baseline for the go/no-go
+decision (gates in README.md and
+`.plans/2026-07-10-embedded-mpv-frame-copy-unification.md`).
+
+How to reproduce a row:
+
+```bash
+# synthetic (no decode load):
+./run.sh 'av://lavfi:testsrc2=size=3840x2160:rate=60' 3840x2160
+# real 4K60 HEVC with hw decode (generate once):
+ffmpeg -y -f lavfi -i "testsrc2=size=3840x2160:rate=60" -t 12 \
+  -c:v hevc_videotoolbox -b:v 25M -tag:v hvc1 -pix_fmt yuv420p /tmp/spike-4k-hevc.mp4
+HELPER_ARGS='--hwdec videotoolbox --no-audio --loop' ./run.sh /tmp/spike-4k-hevc.mp4 3840x2160
+```
+
+Read `STATS` lines from viewer stdout after they stabilize (skip the first
+window); helper stats are on its stderr. CPU: `ps -o %cpu -p <pid>` for the
+helper and the `Electron Helper (Renderer)` process during playback.
+
+Column meanings: *new fps* — frames actually reaching the canvas; *copy* —
+shm→ArrayBuffer memcpy in the addon; *upload* — `texSubImage2D` wall time;
+*age* — produce→uploaded latency (helper memcpy done → texture updated,
+same monotonic clock on both sides — CLOCK_MONOTONIC_RAW in the original
+spike harness used for the M1 rows; the production engine uses
+CLOCK_MONOTONIC via `frame_shm_now_ns()` since the Linux port).
+
+## MacBook Pro M1 Pro (arm64), macOS, 120 Hz internal display — 2026-07-10
+
+Source: commit `7e39d2e5`, libmpv 2.3.0 (Homebrew mpv 0.39.0), Electron 41.7.2.
+
+| Scenario | Producer fps | New fps | copy ms avg/p95 | upload ms avg/p95 | age ms avg/p95 | torn | CPU helper / renderer |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| 1080p60 testsrc2, sw decode | 60.0 | 59.8 | 0.28 / 0.35 | 0.29 / 0.40 | 4.2 / 6.8 | 0 | — |
+| 4K60 testsrc2, sw decode | 60.0 | 60.0 | 1.17 / 1.35 | 3.8 / 4.5 | 11.0 / 12.7 | 0 | — |
+| 4K60 HEVC 25 Mbit, hwdec=videotoolbox | 60.0 | 59.9 | 1.2 / 1.6 | 3.3 / 4.1 | 9.8 / 11.7 | 0 | ~18 % / ~24 % |
+
+Helper-side PBO map+copy at 4K: 1.0–1.8 ms avg. Only fps dip observed was at
+the `--loop` file restart (decoder reinit), not in the copy path.
+
+### Pacing / judder and HDR (2026-07-10, same machine, viewer with interval instrumentation)
+
+Metrics: *present iv sd* — stddev of intervals between texture uploads
+(viewer clock, rAF-quantized); *src iv sd* — stddev of intervals between
+produced frames (helper clock); *late1.5x* — present intervals > 1.5× the
+producer's median interval (a missed beat).
+
+| Scenario | New fps | present iv sd | src iv sd | late (steady state) | Notes |
+| --- | --- | --- | --- | --- | --- |
+| 4K60 HEVC hwdec (steady state) | 60.0 | 0.5–1.4 ms | 0.7–1.2 ms | 0–1 per 2 s | worst intervals only at `--loop` restart |
+| 1080p50 testsrc2 (50→120 Hz cadence) | 50.0 | ~4.1 ms | ~1.9 ms | 0; LONGRUN 30 s: 0.13 % (startup only) | sd is 120 Hz rAF grid quantization (16.7/25 ms alternation around 20 ms), not lost frames |
+| 1080p25 testsrc2 | 25.0 | ~4.1 ms | ~2.7 ms | 0 | same grid effect |
+| 4K25 HDR10 PQ/BT.2020 HEVC hwdec | 25.0 | ~5.5 ms | ~4.3 ms | 0 | mpv tonemaps to SDR before readback (PIXELPROBE spread 255); copy/upload costs unchanged |
+
+### Viewport-size scaling check (2026-07-10)
+
+Design claim "render at viewport size, pay viewport price" confirmed:
+the same 4K60 HEVC clip rendered into a 1280×720 FBO costs helper
+map+copy 0.17 ms (vs 1.5 ms at 4K), viewer copy 0.16 ms (vs 1.2),
+upload 0.17 ms (vs 3.5), steady 60 fps. Full 4K price is only paid in
+4K-sized viewports (i.e. fullscreen on a 4K display).
+
+### 10-minute long run — 4K60 HEVC hwdec, `--loop` (2026-07-10)
+
+Final cumulative line at t=574 s: 33 501 frames, avg 58.32 fps,
+late1.5x 0.475 %, late2.5x 0.20 %, worst interval 2306 ms, dropped 261,
+torn 0.
+
+Reading the anomalies before quoting the headline numbers:
+
+- All 261 dropped frames and the single 2.3 s worst-interval stall happened
+  in the **first ~60 s** (startup/warmup); from t=93 s to the end — zero
+  drops over ~8.5 minutes.
+- The steady-state late frames (~102 × late1.5x, ~43 × late2.5x after
+  warmup ≈ 0.36 % / 0.15 %) track the `--loop` restarts of the 12 s test
+  clip (~48 restarts, each a decoder reinit hiccup) — a test-clip artifact,
+  not a pipeline property. A real long-form stream should be cleaner.
+- torn=0 across the whole run: the seqlock ring never produced a torn read.
+
+Cadence verdict on this hardware: the producer keeps a clean source cadence
+(mpv's own pacing survives); the only jitter is display-grid quantization in
+the rAF presenter, bounded by one 120 Hz tick (~8.3 ms). A future refinement
+could reduce it with display-rate matching, but nothing here blocks the gate.
+
+HDR clip generation for repro:
+
+```bash
+ffmpeg -y -f lavfi -i "testsrc2=size=3840x2160:rate=25" -t 10 \
+  -c:v hevc_videotoolbox -profile:v main10 -pix_fmt p010le -b:v 30M -tag:v hvc1 /tmp/spike-4k-hdr.mp4
+ffmpeg -y -i /tmp/spike-4k-hdr.mp4 -c:v copy \
+  -bsf:v "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9" \
+  /tmp/spike-4k-hdr10.mp4   # videotoolbox omits VUI color tags; inject HDR10 ones
+```
+
+Reference worst-case budget from the analysis doc, for orientation:
+33 MB 4K memcpy est. 6–8 ms (measured ≈1.2 ms); end-to-end added latency
+est. 40–60 ms (measured ≈10 ms produce→uploaded, before compositor).
+
+## Intel Mac — SKIPPED by decision (2026-07-10)
+
+Owner decision: the frame-copy engine targets Apple Silicon (M1+) only on
+macOS; support detection must gate on arm64. Rationale: Intel Macs able to
+run the app at all (Electron 41 ⇒ macOS 10.15+) are a shrinking 2015–2020
+cohort and keep the existing docked/external/web player paths; the only
+Intel device sourced (iMac mid-2011, High Sierra) cannot run the app and
+would not have been representative. The macOS hardware gate is therefore
+closed by the M1 Pro numbers above; the remaining risk hardware is
+Windows/Linux.
+
+## Linux mid-range laptop (iGPU) — Ubuntu 25.04, i7-1165G7 / Iris Xe, x64 — 2026-07-11
+
+Source: Linux port branch (headless-EGL `frame_helper_gl.h` backend), system
+libmpv 2.5.0 (mpv 0.40), Mesa 25.0 iris. Measured with the production helper
+binary + `embedded_mpv_frame_reader.node` in a Node probe loop
+(`linux-frame-probe.mjs` in this directory — the spike viewer harness is
+macOS-only), so *age* here is produce→reader-copy and excludes the renderer
+texture upload. hwdec was NOT active — this machine
+has no VAAPI driver installed (`intel-media-va-driver`), so HEVC rows are
+software decode; treat them as a decode-limited floor, not a pipeline
+ceiling.
+
+| Scenario | New fps | copy ms avg/p95 | age ms avg/p95 | torn |
+| --- | --- | --- | --- | --- |
+| 1080p60 testsrc2, sw | 60.1 | 1.16 / 1.37 | 2.26 / 3.21 | 0 |
+| 4K60 testsrc2, sw | 50.0 | 5.75 / 6.92 | 7.22 / 8.00 | 0 |
+| 4K60 HEVC 25 Mbit, sw decode | 39.9 | 7.62 / 14.6 | 9.06 / 17.0 | 0 |
+| 4K60 HEVC 25 Mbit in a 1280×720 viewport | 53.1 | 0.94 / 2.57 | 2.42 / 5.28 | 0 |
+
+Readings:
+
+- 1080p60 — the realistic viewport class for this laptop's 1920×1200
+  screen — holds a clean 60 fps with ~1 ms copies.
+- The 4K rows are stress rows: producers are limited by software
+  decode/source generation on 4 cores, not by the copy path (copy stays
+  well under one 60 Hz frame budget even at full 4K).
+- The viewport-size claim reproduces on Linux: the same 4K60 HEVC clip in a
+  720p viewport drops the copy from 7.6 ms to 0.94 ms and lifts fps from
+  ~40 to ~53 (remaining gap = software decode).
+- torn=0 across every run; the aspect-fit generation bump was verified
+  separately (4:3 source in a 16:9 viewport → `-g2` at 960×720).
+- EGL display tier used: Mesa surfaceless platform (first tier; no display
+  server needed).
+
+## Windows mid-range laptop (iGPU) — Windows 11 Home 26200, i7-1165G7 / Iris Xe, x64 — 2026-07-12
+
+Source: Windows port branch (WGL `frame_helper_gl.h` backend), vendored
+libmpv from zhongfly/mpv-winbuild 2026-06-14 (`git-7d245fd100`,
+`libmpv-2.dll`), Intel driver 30.0.101.1340. **Same physical laptop as the
+Linux section above** (TUXEDO Book XP14 Gen12, dual boot), so the two
+sections compare OS/driver stacks on identical hardware. Measured with the
+production helper + `embedded_mpv_frame_reader.node` through
+`linux-frame-probe.mjs` (now cross-platform; on Windows it polls via
+setImmediate because setTimeout quantizes to the ~15.6 ms system timer,
+which would dominate *age*), so *age* is produce→reader-copy and excludes
+the renderer texture upload — same semantics as the Linux rows. Unlike the
+Linux rows, hwdec IS available here: mpv's `hwdec=auto` engages d3d11va
+(verified by helper CPU: 0.51 core-s/s vs 2.82 core-s/s with `--hwdec no`
+on the 4K row — a 5.5× CPU drop). Test clip generated with `hevc_qsv`
+(the Intel encoder), so decode complexity is not byte-identical to the
+videotoolbox/x265 clips of the other sections.
+
+| Scenario | New fps | copy ms avg/p95 | age ms avg/p95 | torn |
+| --- | --- | --- | --- | --- |
+| 1080p60 testsrc2, sw | 60.0 | 1.80 / 2.10 | 1.83 / 2.14 | 0 |
+| 4K60 testsrc2, sw | 56.0 | 8.81 / 9.88 | 8.83 / 9.86 | 0 |
+| 4K60 HEVC 25 Mbit, hwdec=d3d11va | 41.1 | 8.57 / 10.4 | 8.71 / 10.4 | 0 |
+| 4K60 HEVC 25 Mbit, sw decode | 45.7 | 10.3 / 15.1 | 10.4 / 15.4 | 0 |
+| 4K60 HEVC 25 Mbit in a 1280×720 viewport, hwdec | 60.2 | 1.29 / 1.87 | 1.27 / 1.82 | 0 |
+
+Readings:
+
+- 1080p60 — the realistic viewport class for this laptop's 1920×1200
+  screen — holds a clean 60 fps with ~1.8 ms copies. A 60-second sustained
+  run kept 60.0 fps over 3601 frames (copy 1.57 / 1.84 ms, torn 0).
+- The 4K rows are stress rows, as on Linux: at a full-4K viewport the
+  Iris Xe is saturated by mpv render + readback (56 fps ceiling with no
+  decode at all), so d3d11va decode — which shares the same iGPU — buys
+  CPU headroom (5.5×), not fps; sw decode trades ~2.3 cores for ~4 fps.
+- The viewport-size claim reproduces on Windows: the same 4K60 HEVC clip
+  in a 720p viewport runs 60 fps with 1.3 ms copies and hardware decode
+  active.
+- torn=0 across every run; the aspect-fit generation bump was verified
+  (4:3 960×720 source in a 1280×720 viewport → `-g2` at 960×720).
+- WGL context: `gl renderer: Intel(R) Iris(R) Xe Graphics` (hardware,
+  3.2 core via wglCreateContextAttribsARB). Machine prerequisite hit
+  during bring-up: Windows 11 Smart App Control blocks locally-built
+  unsigned executables (the helper) until turned off, and a fresh Windows
+  install may run the iGPU on the Basic Display Adapter — the frame-copy
+  engine needs the real Intel driver bound (WGL on the basic adapter has
+  no 3.2 core context, and there is no d3d11va).
diff --git a/spikes/mpv-frame-copy/collect-results.sh b/spikes/mpv-frame-copy/collect-results.sh
new file mode 100755
index 000000000..cf4a42470
--- /dev/null
+++ b/spikes/mpv-frame-copy/collect-results.sh
@@ -0,0 +1,144 @@
+#!/usr/bin/env bash
+# Build the spike and run the full RESULTS.md scenario suite automatically,
+# writing all metrics into one results-<host>-<date>.txt file to send back.
+#
+#   ./collect-results.sh           # quick suite (~4 min, 30 s per scenario)
+#   ./collect-results.sh --long    # + 10-minute 4K60 HEVC long run
+#
+# Prereqs on the target machine: Xcode Command Line Tools and Homebrew mpv
+# (`brew install mpv`). Electron and media clips are bundled (or resolved
+# from the repo / generated with ffmpeg when running from a checkout).
+# Viewer windows will open and close on their own during the run.
+set -euo pipefail
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$DIR"
+
+DURATION="${DURATION:-30}"
+LONG=0
+[[ "${1:-}" == "--long" ]] && LONG=1
+
+if ! xcode-select -p >/dev/null 2>&1; then
+    echo "Xcode Command Line Tools required: run 'xcode-select --install'" >&2
+    exit 1
+fi
+MPV_PREFIX=""
+for prefix in "$(brew --prefix 2>/dev/null || true)" /opt/local; do
+    if [[ -n "$prefix" ]] && ls "$prefix"/lib/libmpv*.dylib >/dev/null 2>&1; then
+        MPV_PREFIX="$prefix"
+        break
+    fi
+done
+if [[ -z "$MPV_PREFIX" ]]; then
+    echo "libmpv not found. Install it with Homebrew ('brew install mpv') or," >&2
+    echo "on legacy macOS (e.g. High Sierra), MacPorts: 'sudo port install mpv +libmpv'" >&2
+    exit 1
+fi
+
+make
+
+if [[ -z "${ELECTRON:-}" ]]; then
+    for candidate in \
+        "$DIR/electron/Electron.app/Contents/MacOS/Electron" \
+        "$DIR/../../node_modules/.bin/electron" \
+        "$DIR/../../../../../node_modules/.bin/electron"; do
+        if [[ -x "$candidate" ]]; then
+            ELECTRON="$candidate"
+            break
+        fi
+    done
+fi
+if [[ -z "${ELECTRON:-}" ]]; then
+    echo "Electron not found; set ELECTRON=/path/to/electron" >&2
+    exit 1
+fi
+if [[ "$ELECTRON" == "$DIR/electron/"* ]]; then
+    # Bundled runtime may carry a quarantine attribute after transfer.
+    xattr -cr "$DIR/electron/Electron.app" 2>/dev/null || true
+fi
+
+# Media clips: bundled under media/, otherwise generate with ffmpeg.
+mkdir -p media
+if [[ ! -f media/spike-4k-hevc.mp4 ]] && command -v ffmpeg >/dev/null; then
+    echo "generating media/spike-4k-hevc.mp4 ..."
+    ffmpeg -v error -y -f lavfi -i "testsrc2=size=3840x2160:rate=60" -t 12 \
+        -c:v hevc_videotoolbox -b:v 25M -tag:v hvc1 -pix_fmt yuv420p \
+        media/spike-4k-hevc.mp4
+fi
+if [[ ! -f media/spike-4k-hdr10.mp4 && -f media/spike-4k-hevc.mp4 ]] &&
+    command -v ffmpeg >/dev/null; then
+    echo "generating media/spike-4k-hdr10.mp4 ..."
+    ffmpeg -v error -y -f lavfi -i "testsrc2=size=3840x2160:rate=25" -t 10 \
+        -c:v hevc_videotoolbox -profile:v main10 -pix_fmt p010le -b:v 30M \
+        -tag:v hvc1 /tmp/spike-hdr-base.mp4
+    ffmpeg -v error -y -i /tmp/spike-hdr-base.mp4 -c:v copy \
+        -bsf:v "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9" \
+        media/spike-4k-hdr10.mp4
+fi
+
+OUT="$DIR/results-$(hostname -s)-$(date +%Y%m%d-%H%M).txt"
+{
+    echo "# mpv frame-copy spike results"
+    echo "date: $(date)"
+    echo "cpu: $(sysctl -n machdep.cpu.brand_string 2>/dev/null || echo unknown)"
+    echo "os: $(sw_vers -productName) $(sw_vers -productVersion)"
+    system_profiler SPDisplaysDataType 2>/dev/null |
+        grep -E "Chipset Model|Resolution|UI Looks like" | sed 's/^ *//' || true
+} > "$OUT"
+
+run_scenario() { # name media size extra_helper_args duration
+    local name="$1" media="$2" size="$3" extra="$4" dur="$5"
+    echo "== $name (${dur}s) =="
+    printf '\n## %s\n' "$name" >> "$OUT"
+    local hlog vlog
+    hlog="$(mktemp /tmp/spike-helper.XXXXXX)"
+    vlog="$(mktemp /tmp/spike-viewer.XXXXXX)"
+    # shellcheck disable=SC2086
+    ./build/mpv_helper "$media" --size "$size" --no-audio $extra \
+        > "$hlog" 2>&1 &
+    local hpid=$!
+    disown "$hpid"
+    sleep 2
+    SPIKE_SHM=/mpv-frame-spike "$ELECTRON" "$DIR/viewer/main.js" \
+        > "$vlog" 2>&1 &
+    local vpid=$!
+    disown "$vpid"
+    sleep "$dur"
+    kill "$vpid" 2>/dev/null || true
+    kill -INT "$hpid" 2>/dev/null || true
+    sleep 1
+    kill -9 "$hpid" "$vpid" 2>/dev/null || true
+    grep -E "PIXELPROBE|STATS|LONGRUN" "$vlog" |
+        sed 's/^\[viewer\] //' | tail -24 >> "$OUT"
+    grep -E "^\[helper\] (GL renderer|fps=)" "$hlog" | tail -6 >> "$OUT"
+    rm -f "$hlog" "$vlog"
+}
+
+run_scenario "1080p60 testsrc2 sw" \
+    'av://lavfi:testsrc2=size=1920x1080:rate=60' 1920x1080 "" "$DURATION"
+run_scenario "4K60 testsrc2 sw" \
+    'av://lavfi:testsrc2=size=3840x2160:rate=60' 3840x2160 "" "$DURATION"
+run_scenario "1080p50 cadence" \
+    'av://lavfi:testsrc2=size=1920x1080:rate=50' 1920x1080 "" "$DURATION"
+if [[ -f media/spike-4k-hevc.mp4 ]]; then
+    run_scenario "4K60 HEVC hwdec=videotoolbox" \
+        media/spike-4k-hevc.mp4 3840x2160 "--hwdec videotoolbox --loop" "$DURATION"
+    run_scenario "4K60 HEVC -> 720p viewport" \
+        media/spike-4k-hevc.mp4 1280x720 "--hwdec videotoolbox --loop" "$DURATION"
+else
+    echo "WARN: media/spike-4k-hevc.mp4 missing, HEVC scenarios skipped" | tee -a "$OUT"
+fi
+if [[ -f media/spike-4k-hdr10.mp4 ]]; then
+    run_scenario "4K25 HDR10 tonemap hwdec" \
+        media/spike-4k-hdr10.mp4 3840x2160 "--hwdec videotoolbox --loop" "$DURATION"
+else
+    echo "WARN: media/spike-4k-hdr10.mp4 missing, HDR scenario skipped" | tee -a "$OUT"
+fi
+if [[ "$LONG" == 1 && -f media/spike-4k-hevc.mp4 ]]; then
+    run_scenario "LONGRUN 10min 4K60 HEVC hwdec" \
+        media/spike-4k-hevc.mp4 3840x2160 "--hwdec videotoolbox --loop" 600
+fi
+
+echo
+echo "Done. Send this file back:"
+echo "  $OUT"
diff --git a/spikes/mpv-frame-copy/common/spike_shm.h b/spikes/mpv-frame-copy/common/spike_shm.h
new file mode 100644
index 000000000..26ece01fc
--- /dev/null
+++ b/spikes/mpv-frame-copy/common/spike_shm.h
@@ -0,0 +1,59 @@
+/*
+ * Shared-memory frame ring protocol for the mpv frame-copy spike.
+ *
+ * Producer: helper/mpv_helper.cpp (C++) — renders mpv offscreen, writes
+ * BGRA frames into a 3-slot ring inside POSIX shared memory.
+ * Consumer: viewer/addon/shm_reader.c (C, N-API) — copies the newest
+ * complete frame out for WebGL upload in an Electron renderer.
+ *
+ * This header must compile both as C11 and C++17; the atomic fields rely on
+ * _Atomic uint64_t and std::atomic<uint64_t> having identical size/layout
+ * (both are 8-byte lock-free on the targets this spike cares about).
+ *
+ * Slot protocol (classic triple buffer with per-slot seqlock):
+ *   writer: slot.seq = 0  ->  memcpy frame + fill meta  ->  slot.seq = seq
+ *           -> header.latest_seq = seq        (all stores release)
+ *   reader: seq = header.latest_seq (acquire); slot = slots[seq % SLOTS];
+ *           verify slot.seq == seq, copy, re-check slot.seq for tearing.
+ * The writer always writes slot (seq % SLOTS) with a monotonically growing
+ * seq, so the newest complete slot is never the one being overwritten next.
+ */
+#pragma once
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+#include <atomic>
+typedef std::atomic<uint64_t> spike_atomic_u64;
+#else
+#include <stdatomic.h>
+typedef _Atomic uint64_t spike_atomic_u64;
+#endif
+
+#define SPIKE_SHM_DEFAULT_NAME "/mpv-frame-spike"
+#define SPIKE_SHM_MAGIC 0x564d5053u /* 'SPMV' little-endian */
+#define SPIKE_SHM_VERSION 1u
+#define SPIKE_RING_SLOTS 3u
+#define SPIKE_DATA_ALIGN 4096u
+#define SPIKE_PTS_UNKNOWN UINT64_MAX
+
+typedef struct {
+    spike_atomic_u64 seq;     /* 0 while the slot is being (re)written */
+    uint64_t pts_us;          /* mpv time-pos in µs, SPIKE_PTS_UNKNOWN if n/a */
+    uint64_t produce_time_ns; /* CLOCK_MONOTONIC_RAW, set after copy is done */
+} SpikeSlot;
+
+typedef struct {
+    uint32_t magic;   /* written last during init (with release fence) */
+    uint32_t version;
+    uint32_t width;
+    uint32_t height;
+    uint32_t stride;  /* bytes per row, tightly packed: width * 4 */
+    uint32_t reserved;
+    uint64_t frame_bytes; /* stride * height */
+    uint64_t data_offset; /* from mapping base, SPIKE_DATA_ALIGN aligned */
+    spike_atomic_u64 latest_seq;        /* newest complete frame, 0 = none */
+    spike_atomic_u64 producer_fps_milli; /* producer render fps * 1000 */
+    spike_atomic_u64 heartbeat_ns;       /* producer liveness */
+    SpikeSlot slots[SPIKE_RING_SLOTS];
+} SpikeShmHeader;
diff --git a/spikes/mpv-frame-copy/helper/mpv_helper.cpp b/spikes/mpv-frame-copy/helper/mpv_helper.cpp
new file mode 100644
index 000000000..b1806c181
--- /dev/null
+++ b/spikes/mpv-frame-copy/helper/mpv_helper.cpp
@@ -0,0 +1,480 @@
+/*
+ * mpv frame-copy spike — helper process (macOS).
+ *
+ * Owns libmpv in a standalone process: decodes + renders offscreen into a GL
+ * FBO (headless CGL context, no window), reads frames back through a 3-deep
+ * async PBO ring, and publishes BGRA frames into a POSIX shared-memory ring
+ * (see common/spike_shm.h). Audio plays directly from this process.
+ *
+ * Prints one stats line per second: render ms, PBO map+copy ms (avg/p95),
+ * effective fps. These are the producer-side numbers for the go/no-go gates.
+ */
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl3.h>
+
+#include <mpv/client.h>
+#include <mpv/render_gl.h>
+
+#include <dlfcn.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <clocale>
+#include <cmath>
+#include <condition_variable>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "spike_shm.h"
+
+namespace {
+
+struct Args {
+    std::string media;
+    std::string shmName = SPIKE_SHM_DEFAULT_NAME;
+    std::string hwdec = "auto";
+    int width = 1920;
+    int height = 1080;
+    bool audio = true;
+    bool loop = false;
+};
+
+uint64_t nowNs() { return clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW); }
+
+[[noreturn]] void usage() {
+    std::fprintf(stderr,
+                 "usage: mpv_helper <media> [--size WxH] [--shm /name] "
+                 "[--hwdec <mode>] [--no-audio] [--loop]\n");
+    std::exit(2);
+}
+
+Args parseArgs(int argc, char** argv) {
+    Args args;
+    for (int i = 1; i < argc; i++) {
+        const std::string a = argv[i];
+        auto next = [&]() -> std::string {
+            if (i + 1 >= argc) usage();
+            return argv[++i];
+        };
+        if (a == "--size") {
+            const std::string v = next();
+            if (std::sscanf(v.c_str(), "%dx%d", &args.width, &args.height) != 2)
+                usage();
+        } else if (a == "--shm") {
+            args.shmName = next();
+        } else if (a == "--hwdec") {
+            args.hwdec = next();
+        } else if (a == "--no-audio") {
+            args.audio = false;
+        } else if (a == "--loop") {
+            args.loop = true;
+        } else if (!a.empty() && a[0] == '-') {
+            usage();
+        } else if (args.media.empty()) {
+            args.media = a;
+        } else {
+            usage();
+        }
+    }
+    if (args.media.empty() || args.width < 16 || args.height < 16) usage();
+    return args;
+}
+
+/* ---- shared memory ----------------------------------------------------- */
+
+struct Shm {
+    SpikeShmHeader* hdr = nullptr;
+    uint8_t* base = nullptr;
+    size_t size = 0;
+    std::string name;
+
+    uint8_t* slotData(uint64_t seq) const {
+        return base + hdr->data_offset +
+               (seq % SPIKE_RING_SLOTS) * hdr->frame_bytes;
+    }
+};
+
+bool shmCreate(Shm& shm, const std::string& name, int width, int height) {
+    shm_unlink(name.c_str()); /* remove a stale ring from a previous run */
+    const int fd = shm_open(name.c_str(), O_CREAT | O_EXCL | O_RDWR, 0600);
+    if (fd < 0) {
+        std::perror("shm_open");
+        return false;
+    }
+    const uint64_t frameBytes = (uint64_t)width * 4u * (uint64_t)height;
+    const uint64_t dataOffset =
+        (sizeof(SpikeShmHeader) + SPIKE_DATA_ALIGN - 1) & ~(uint64_t)(SPIKE_DATA_ALIGN - 1);
+    const size_t total = (size_t)(dataOffset + SPIKE_RING_SLOTS * frameBytes);
+    if (ftruncate(fd, (off_t)total) != 0) {
+        std::perror("ftruncate");
+        close(fd);
+        return false;
+    }
+    void* base = mmap(nullptr, total, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    close(fd);
+    if (base == MAP_FAILED) {
+        std::perror("mmap");
+        return false;
+    }
+    std::memset(base, 0, sizeof(SpikeShmHeader));
+    auto* hdr = static_cast<SpikeShmHeader*>(base);
+    hdr->version = SPIKE_SHM_VERSION;
+    hdr->width = (uint32_t)width;
+    hdr->height = (uint32_t)height;
+    hdr->stride = (uint32_t)width * 4u;
+    hdr->frame_bytes = frameBytes;
+    hdr->data_offset = dataOffset;
+    std::atomic_thread_fence(std::memory_order_release);
+    hdr->magic = SPIKE_SHM_MAGIC; /* readers treat magic as the ready flag */
+
+    shm.hdr = hdr;
+    shm.base = static_cast<uint8_t*>(base);
+    shm.size = total;
+    shm.name = name;
+    return true;
+}
+
+/* ---- stats -------------------------------------------------------------- */
+
+struct PhaseStats {
+    std::vector<double> samples;
+    void add(double ms) { samples.push_back(ms); }
+    double avg() const {
+        if (samples.empty()) return 0;
+        double s = 0;
+        for (double v : samples) s += v;
+        return s / (double)samples.size();
+    }
+    double p95() {
+        if (samples.empty()) return 0;
+        std::sort(samples.begin(), samples.end());
+        return samples[(size_t)((double)(samples.size() - 1) * 0.95)];
+    }
+    void reset() { samples.clear(); }
+};
+
+/* ---- render loop -------------------------------------------------------- */
+
+void* g_glDylib = nullptr;
+
+void* getProcAddress(void*, const char* name) {
+    return dlsym(g_glDylib, name);
+}
+
+struct RenderShared {
+    mpv_handle* mpv = nullptr;
+    Shm* shm = nullptr;
+    int width = 0;
+    int height = 0;
+    CGLContextObj cgl = nullptr;
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    bool updatePending = false;
+    bool stop = false;
+    bool ready = false;
+    bool failed = false;
+};
+
+void onMpvRenderUpdate(void* ctx) {
+    auto* shared = static_cast<RenderShared*>(ctx);
+    {
+        std::lock_guard<std::mutex> lock(shared->mutex);
+        shared->updatePending = true;
+    }
+    shared->cv.notify_all();
+}
+
+void renderThreadMain(RenderShared* shared) {
+    CGLSetCurrentContext(shared->cgl);
+
+    const int w = shared->width;
+    const int h = shared->height;
+    const GLsizeiptr frameBytes = (GLsizeiptr)w * 4 * h;
+
+    GLuint texture = 0, fbo = 0;
+    glGenTextures(1, &texture);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGBA,
+                 GL_UNSIGNED_BYTE, nullptr);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glGenFramebuffers(1, &fbo);
+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+                           texture, 0);
+
+    GLuint pbos[SPIKE_RING_SLOTS] = {0};
+    glGenBuffers(SPIKE_RING_SLOTS, pbos);
+    for (GLuint pbo : pbos) {
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
+        glBufferData(GL_PIXEL_PACK_BUFFER, frameBytes, nullptr, GL_STREAM_READ);
+    }
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+
+    const bool fboOk =
+        glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE;
+
+    mpv_opengl_init_params glInit = {getProcAddress, nullptr};
+    mpv_render_param createParams[] = {
+        {MPV_RENDER_PARAM_API_TYPE,
+         const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL)},
+        {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &glInit},
+        {MPV_RENDER_PARAM_INVALID, nullptr},
+    };
+    mpv_render_context* rc = nullptr;
+    const int createResult =
+        fboOk ? mpv_render_context_create(&rc, shared->mpv, createParams) : -1;
+
+    {
+        std::lock_guard<std::mutex> lock(shared->mutex);
+        shared->ready = true;
+        shared->failed = createResult < 0;
+    }
+    shared->cv.notify_all();
+    if (createResult < 0) {
+        std::fprintf(stderr, "[helper] render context init failed (%s)\n",
+                     fboOk ? mpv_error_string(createResult) : "FBO incomplete");
+        return;
+    }
+    std::fprintf(stderr, "[helper] GL renderer: %s\n",
+                 (const char*)glGetString(GL_RENDERER));
+    mpv_render_context_set_update_callback(rc, onMpvRenderUpdate, shared);
+
+    SpikeShmHeader* hdr = shared->shm->hdr;
+    uint64_t nextSeq = 1;
+    int pendingPbo = -1;      /* PBO with an in-flight readback from last frame */
+    uint64_t pendingPtsUs = SPIKE_PTS_UNKNOWN;
+    int cursor = 0;
+
+    PhaseStats renderStats, copyStats;
+    uint64_t framesThisSecond = 0;
+    uint64_t statsWindowStart = nowNs();
+
+    auto publishPending = [&]() {
+        if (pendingPbo < 0) return;
+        const uint64_t t0 = nowNs();
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, pbos[pendingPbo]);
+        const void* mapped =
+            glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, frameBytes, GL_MAP_READ_BIT);
+        if (mapped) {
+            const uint64_t seq = nextSeq++;
+            SpikeSlot& slot = hdr->slots[seq % SPIKE_RING_SLOTS];
+            slot.seq.store(0, std::memory_order_release);
+            std::memcpy(shared->shm->slotData(seq), mapped,
+                        (size_t)frameBytes);
+            slot.pts_us = pendingPtsUs;
+            slot.produce_time_ns = nowNs();
+            slot.seq.store(seq, std::memory_order_release);
+            hdr->latest_seq.store(seq, std::memory_order_release);
+            glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
+            copyStats.add((double)(nowNs() - t0) / 1e6);
+            framesThisSecond++;
+        }
+        glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+        pendingPbo = -1;
+    };
+
+    while (true) {
+        {
+            std::unique_lock<std::mutex> lock(shared->mutex);
+            shared->cv.wait_for(lock, std::chrono::milliseconds(100), [&] {
+                return shared->updatePending || shared->stop;
+            });
+            if (shared->stop) break;
+            shared->updatePending = false;
+        }
+
+        const uint64_t flags = mpv_render_context_update(rc);
+        if (flags & MPV_RENDER_UPDATE_FRAME) {
+            const uint64_t t0 = nowNs();
+            mpv_opengl_fbo mpvFbo = {(int)fbo, w, h, 0};
+            int flipY = 1; /* top-down rows so the consumer can upload as-is */
+            mpv_render_param renderParams[] = {
+                {MPV_RENDER_PARAM_OPENGL_FBO, &mpvFbo},
+                {MPV_RENDER_PARAM_FLIP_Y, &flipY},
+                {MPV_RENDER_PARAM_INVALID, nullptr},
+            };
+            mpv_render_context_render(rc, renderParams);
+            renderStats.add((double)(nowNs() - t0) / 1e6);
+
+            /* Kick off the async readback for this frame ... */
+            double pts = 0;
+            pendingPtsUs =
+                mpv_get_property(shared->mpv, "time-pos", MPV_FORMAT_DOUBLE,
+                                 &pts) >= 0
+                    ? (uint64_t)(pts * 1e6)
+                    : SPIKE_PTS_UNKNOWN;
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
+            glReadBuffer(GL_COLOR_ATTACHMENT0);
+            glPixelStorei(GL_PACK_ALIGNMENT, 1);
+            glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+            /* Publish the previous frame first so this readback stays async. */
+            publishPending();
+            glBindBuffer(GL_PIXEL_PACK_BUFFER, pbos[cursor]);
+            glReadPixels(0, 0, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+                         nullptr);
+            glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+            pendingPbo = cursor;
+            cursor = (cursor + 1) % SPIKE_RING_SLOTS;
+            mpv_render_context_report_swap(rc);
+        } else {
+            /* No new video frame; still flush a leftover readback so pause
+             * doesn't strand the last frame inside a PBO. */
+            publishPending();
+        }
+
+        const uint64_t now = nowNs();
+        hdr->heartbeat_ns.store(now, std::memory_order_relaxed);
+        if (now - statsWindowStart >= 1000000000ull) {
+            const double seconds = (double)(now - statsWindowStart) / 1e9;
+            const double fps = (double)framesThisSecond / seconds;
+            hdr->producer_fps_milli.store((uint64_t)(fps * 1000.0),
+                                          std::memory_order_relaxed);
+            std::fprintf(stderr,
+                         "[helper] fps=%5.1f | render ms avg=%5.2f p95=%5.2f | "
+                         "map+copy ms avg=%5.2f p95=%5.2f\n",
+                         fps, renderStats.avg(), renderStats.p95(),
+                         copyStats.avg(), copyStats.p95());
+            renderStats.reset();
+            copyStats.reset();
+            framesThisSecond = 0;
+            statsWindowStart = now;
+        }
+    }
+
+    mpv_render_context_set_update_callback(rc, nullptr, nullptr);
+    mpv_render_context_free(rc);
+    glDeleteBuffers(SPIKE_RING_SLOTS, pbos);
+    glDeleteFramebuffers(1, &fbo);
+    glDeleteTextures(1, &texture);
+    CGLSetCurrentContext(nullptr);
+}
+
+/* ---- main / mpv event loop ---------------------------------------------- */
+
+std::atomic<bool> g_quit{false};
+void onSignal(int) { g_quit.store(true); }
+
+} // namespace
+
+int main(int argc, char** argv) {
+    std::setlocale(LC_NUMERIC, "C");
+    const Args args = parseArgs(argc, argv);
+
+    g_glDylib = dlopen(
+        "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",
+        RTLD_LAZY | RTLD_LOCAL);
+    if (!g_glDylib) {
+        std::fprintf(stderr, "[helper] failed to dlopen OpenGL framework\n");
+        return 1;
+    }
+
+    Shm shm;
+    if (!shmCreate(shm, args.shmName, args.width, args.height)) return 1;
+
+    CGLPixelFormatAttribute pfAttrs[] = {
+        kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core,
+        kCGLPFAAccelerated,
+        kCGLPFAColorSize, (CGLPixelFormatAttribute)24,
+        kCGLPFAAlphaSize, (CGLPixelFormatAttribute)8,
+        (CGLPixelFormatAttribute)0,
+    };
+    CGLPixelFormatObj pixelFormat = nullptr;
+    GLint pixelFormatCount = 0;
+    CGLContextObj cgl = nullptr;
+    if (CGLChoosePixelFormat(pfAttrs, &pixelFormat, &pixelFormatCount) !=
+            kCGLNoError ||
+        !pixelFormat ||
+        CGLCreateContext(pixelFormat, nullptr, &cgl) != kCGLNoError) {
+        std::fprintf(stderr, "[helper] failed to create headless CGL context\n");
+        return 1;
+    }
+    CGLDestroyPixelFormat(pixelFormat);
+
+    mpv_handle* mpv = mpv_create();
+    if (!mpv) {
+        std::fprintf(stderr, "[helper] mpv_create failed\n");
+        return 1;
+    }
+    mpv_set_option_string(mpv, "vo", "libmpv");
+    mpv_set_option_string(mpv, "hwdec", args.hwdec.c_str());
+    mpv_set_option_string(mpv, "keep-open", "yes");
+    if (!args.audio) mpv_set_option_string(mpv, "aid", "no");
+    if (args.loop) mpv_set_option_string(mpv, "loop-file", "inf");
+    if (mpv_initialize(mpv) < 0) {
+        std::fprintf(stderr, "[helper] mpv_initialize failed\n");
+        return 1;
+    }
+    mpv_request_log_messages(mpv, "warn");
+
+    std::fprintf(stderr,
+                 "[helper] media=%s size=%dx%d shm=%s hwdec=%s audio=%s\n",
+                 args.media.c_str(), args.width, args.height,
+                 args.shmName.c_str(), args.hwdec.c_str(),
+                 args.audio ? "on" : "off");
+
+    RenderShared shared;
+    shared.mpv = mpv;
+    shared.shm = &shm;
+    shared.width = args.width;
+    shared.height = args.height;
+    shared.cgl = cgl;
+
+    std::thread renderThread(renderThreadMain, &shared);
+    {
+        std::unique_lock<std::mutex> lock(shared.mutex);
+        shared.cv.wait(lock, [&] { return shared.ready; });
+        if (shared.failed) {
+            lock.unlock();
+            renderThread.join();
+            mpv_terminate_destroy(mpv);
+            return 1;
+        }
+    }
+
+    signal(SIGINT, onSignal);
+    signal(SIGTERM, onSignal);
+
+    const char* loadCmd[] = {"loadfile", args.media.c_str(), nullptr};
+    mpv_command(mpv, loadCmd);
+
+    while (!g_quit.load()) {
+        mpv_event* event = mpv_wait_event(mpv, 0.25);
+        if (event->event_id == MPV_EVENT_NONE) continue;
+        if (event->event_id == MPV_EVENT_SHUTDOWN) break;
+        if (event->event_id == MPV_EVENT_LOG_MESSAGE) {
+            auto* msg = static_cast<mpv_event_log_message*>(event->data);
+            std::fprintf(stderr, "[mpv/%s] %s", msg->prefix, msg->text);
+        } else if (event->event_id == MPV_EVENT_END_FILE) {
+            auto* end = static_cast<mpv_event_end_file*>(event->data);
+            std::fprintf(stderr, "[helper] end-file reason=%d error=%s\n",
+                         end->reason,
+                         end->error < 0 ? mpv_error_string(end->error) : "none");
+        }
+    }
+
+    {
+        std::lock_guard<std::mutex> lock(shared.mutex);
+        shared.stop = true;
+    }
+    shared.cv.notify_all();
+    renderThread.join();
+    mpv_terminate_destroy(mpv);
+    CGLDestroyContext(cgl);
+    munmap(shm.base, shm.size);
+    shm_unlink(shm.name.c_str());
+    std::fprintf(stderr, "[helper] clean exit\n");
+    return 0;
+}
diff --git a/spikes/mpv-frame-copy/linux-frame-probe.mjs b/spikes/mpv-frame-copy/linux-frame-probe.mjs
new file mode 100644
index 000000000..8783cc199
--- /dev/null
+++ b/spikes/mpv-frame-copy/linux-frame-probe.mjs
@@ -0,0 +1,151 @@
+/*
+ * Linux/Windows frame-copy probe: spawns iptvnator_mpv_helper, attaches the
+ * embedded_mpv_frame_reader addon to the announced shm generation, and
+ * reports producer fps, copy latency (ageMs), copy wall time, torn reads
+ * and pixel spread. Usage:
+ *   node frame-probe.mjs <url> <width> <height> <seconds> [--hwdec auto]
+ */
+import { spawn } from 'node:child_process';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const releaseDir = process.env.RELEASE_DIR;
+const [url, width = '1280', height = '720', seconds = '5', ...rest] =
+    process.argv.slice(2);
+if (!url || !releaseDir) {
+    console.error('usage: RELEASE_DIR=<native build dir> node frame-probe.mjs <url> [w] [h] [s]');
+    process.exit(1);
+}
+const hwdecIdx = rest.indexOf('--hwdec');
+const hwdec = hwdecIdx >= 0 ? rest[hwdecIdx + 1] : null;
+
+const reader = require(path.join(releaseDir, 'embedded_mpv_frame_reader.node'));
+const helperPath = path.join(
+    releaseDir,
+    process.platform === 'win32'
+        ? 'iptvnator_mpv_helper.exe'
+        : 'iptvnator_mpv_helper'
+);
+const shmBase = `/impv-probe-${process.pid}`;
+
+const args = ['--shm-base', shmBase, '--width', width, '--height', height];
+if (hwdec) args.push('--hwdec', hwdec);
+const child = spawn(helperPath, args, { stdio: ['pipe', 'pipe', 'inherit'] });
+
+let buffer = '';
+let currentSource = null;
+const generations = [];
+let statusLog = [];
+
+child.stdout.on('data', (chunk) => {
+    buffer += chunk.toString();
+    let i;
+    while ((i = buffer.indexOf('\n')) >= 0) {
+        const line = buffer.slice(0, i);
+        buffer = buffer.slice(i + 1);
+        if (!line.trim()) continue;
+        let ev;
+        try { ev = JSON.parse(line); } catch { continue; }
+        if (ev.event === 'shm') {
+            generations.push(`${ev.name} ${ev.width}x${ev.height}`);
+            currentSource = ev;
+        } else if (ev.event === 'snapshot') {
+            if (statusLog[statusLog.length - 1] !== ev.status) statusLog.push(ev.status);
+        } else if (ev.event === 'fatal') {
+            console.error('FATAL:', ev.error);
+            process.exit(2);
+        }
+    }
+});
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+/* Poll yield between latestSeq checks: Windows quantizes setTimeout to the
+ * ~15.6 ms system timer, which would dominate ageMs; setImmediate keeps the
+ * poll sub-ms there at the cost of one busy event loop. */
+const pollYield =
+    process.platform === 'win32'
+        ? () => new Promise((r) => setImmediate(r))
+        : () => sleep(2);
+
+await sleep(300);
+child.stdin.write(`load\turl=${url.replace(/%/g, '%25')}\n`);
+
+// Wait for playback + a possibly-resized generation to settle.
+const settleDeadline = Date.now() + 10000;
+while (Date.now() < settleDeadline) {
+    await sleep(100);
+    if (statusLog.includes('playing') && currentSource) {
+        await sleep(700); // allow the aspect-fit resize generation to land
+        break;
+    }
+}
+if (!currentSource) {
+    console.error('no shm source announced');
+    child.kill('SIGKILL');
+    process.exit(2);
+}
+
+const info = reader.open(currentSource.name);
+console.log(`attached ${currentSource.name}: ${info.width}x${info.height} stride=${info.stride} gen=${info.generation}`);
+
+const frameBuf = new ArrayBuffer(info.frameBytes);
+let lastSeq = 0;
+let frames = 0;
+let torn = 0;
+const ages = [];
+const copyTimes = [];
+const durationMs = Number(seconds) * 1000;
+const start = Date.now();
+let pixelMin = 255, pixelMax = 0;
+
+while (Date.now() - start < durationMs) {
+    const seq = reader.latestSeq();
+    if (seq !== lastSeq) {
+        const t0 = process.hrtime.bigint();
+        const result = reader.copyLatest(frameBuf);
+        const t1 = process.hrtime.bigint();
+        if (result) {
+            frames += 1;
+            lastSeq = result.seq;
+            ages.push(result.ageMs);
+            copyTimes.push(Number(t1 - t0) / 1e6);
+            if (result.torn) torn += 1;
+        }
+    }
+    await pollYield();
+}
+const elapsed = (Date.now() - start) / 1000;
+
+// pixel spread over the last frame
+const view = new Uint8Array(frameBuf);
+for (let i = 0; i < view.length; i += 4001 * 4) {
+    for (let c = 0; c < 3; c++) {
+        const v = view[i + c];
+        if (v < pixelMin) pixelMin = v;
+        if (v > pixelMax) pixelMax = v;
+    }
+}
+
+const pct = (arr, p) => {
+    if (!arr.length) return NaN;
+    const sorted = [...arr].sort((a, b) => a - b);
+    return sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * p))];
+};
+const avg = (arr) => arr.reduce((a, b) => a + b, 0) / (arr.length || 1);
+
+console.log(`generations seen: ${generations.join(' | ')}`);
+console.log(`status transitions: ${statusLog.join(' -> ')}`);
+console.log(`producerAliveMs: ${reader.producerAliveMs().toFixed(1)}`);
+console.log(`new frames: ${frames} in ${elapsed.toFixed(1)}s = ${(frames / elapsed).toFixed(1)} fps`);
+console.log(`copy ms avg/p95: ${avg(copyTimes).toFixed(2)} / ${pct(copyTimes, 0.95).toFixed(2)}`);
+console.log(`age ms avg/p95: ${avg(ages).toFixed(2)} / ${pct(ages, 0.95).toFixed(2)}`);
+console.log(`torn: ${torn}`);
+console.log(`pixel spread (BGR sampled): min=${pixelMin} max=${pixelMax}`);
+
+child.stdin.write('quit\n');
+child.stdin.end();
+await sleep(500);
+if (child.exitCode === null) child.kill('SIGKILL');
+reader.close();
diff --git a/spikes/mpv-frame-copy/make-bundle.sh b/spikes/mpv-frame-copy/make-bundle.sh
new file mode 100755
index 000000000..dbfa8c461
--- /dev/null
+++ b/spikes/mpv-frame-copy/make-bundle.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+# Assemble a self-contained tarball of the spike for a machine without
+# Node/pnpm (e.g. the Intel Mac measurement run). The bundle carries the
+# spike sources, vendored N-API headers, pre-generated test clips, and an
+# official Electron dist download; the target machine only needs Xcode
+# Command Line Tools and `brew install mpv`.
+#
+#   ./make-bundle.sh [x64|arm64]      # Electron arch of the TARGET machine
+#
+# For legacy macOS targets override the Electron version — Electron 27+
+# requires macOS 10.15, Electron 26.6.10 is the last for 10.13/10.14:
+#   ELECTRON_VERSION=26.6.10 BUNDLE_SUFFIX=highsierra-x64 ./make-bundle.sh x64
+set -euo pipefail
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$DIR"
+
+ARCH="${1:-x64}"
+ELECTRON_VERSION="${ELECTRON_VERSION:-41.7.2}"
+BUNDLE_SUFFIX="${BUNDLE_SUFFIX:-$ARCH}"
+BUNDLE_ROOT="build/bundle/mpv-frame-copy-spike"
+TARBALL="build/mpv-frame-copy-spike-macos-$BUNDLE_SUFFIX.tar.gz"
+
+rm -rf build/bundle
+mkdir -p "$BUNDLE_ROOT"
+
+cp -R common helper viewer Makefile run.sh collect-results.sh \
+    README.md RESULTS.md DESIGN.md "$BUNDLE_ROOT/"
+
+# N-API headers so the addon builds without any Node installation.
+NODE_INC="$(node -p "require('path').join(process.execPath, '..', '..', 'include', 'node')" 2>/dev/null || true)"
+if [[ -z "$NODE_INC" || ! -f "$NODE_INC/node_api.h" ]]; then
+    echo "need a Node >= 18 on PATH to source N-API headers" >&2
+    exit 1
+fi
+mkdir -p "$BUNDLE_ROOT/vendor/node-headers"
+cp "$NODE_INC"/node_api.h "$NODE_INC"/node_api_types.h \
+    "$NODE_INC"/js_native_api.h "$NODE_INC"/js_native_api_types.h \
+    "$BUNDLE_ROOT/vendor/node-headers/"
+
+# Pre-generate the test clips so the target needs no ffmpeg.
+mkdir -p media
+if [[ ! -f media/spike-4k-hevc.mp4 ]]; then
+    echo "generating media/spike-4k-hevc.mp4 ..."
+    ffmpeg -v error -y -f lavfi -i "testsrc2=size=3840x2160:rate=60" -t 12 \
+        -c:v hevc_videotoolbox -b:v 25M -tag:v hvc1 -pix_fmt yuv420p \
+        media/spike-4k-hevc.mp4
+fi
+if [[ ! -f media/spike-4k-hdr10.mp4 ]]; then
+    echo "generating media/spike-4k-hdr10.mp4 ..."
+    ffmpeg -v error -y -f lavfi -i "testsrc2=size=3840x2160:rate=25" -t 10 \
+        -c:v hevc_videotoolbox -profile:v main10 -pix_fmt p010le -b:v 30M \
+        -tag:v hvc1 /tmp/spike-hdr-base.mp4
+    ffmpeg -v error -y -i /tmp/spike-hdr-base.mp4 -c:v copy \
+        -bsf:v "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9" \
+        media/spike-4k-hdr10.mp4
+fi
+mkdir -p "$BUNDLE_ROOT/media"
+cp media/spike-4k-hevc.mp4 media/spike-4k-hdr10.mp4 "$BUNDLE_ROOT/media/"
+
+# Official Electron dist for the target arch (no npm involved).
+ELECTRON_ZIP="build/electron-v$ELECTRON_VERSION-darwin-$ARCH.zip"
+if [[ ! -f "$ELECTRON_ZIP" ]]; then
+    echo "downloading electron v$ELECTRON_VERSION darwin-$ARCH ..."
+    curl -fL --retry 3 -o "$ELECTRON_ZIP" \
+        "https://github.com/electron/electron/releases/download/v$ELECTRON_VERSION/electron-v$ELECTRON_VERSION-darwin-$ARCH.zip"
+fi
+mkdir -p "$BUNDLE_ROOT/electron"
+unzip -q "$ELECTRON_ZIP" -d "$BUNDLE_ROOT/electron"
+
+cat > "$BUNDLE_ROOT/START-HERE.md" <<'EOF'
+# mpv frame-copy spike — self-contained measurement bundle
+
+Target-machine prerequisites (no Node/pnpm needed):
+
+1. Xcode Command Line Tools: `xcode-select --install`
+2. libmpv, either via:
+    - Homebrew (macOS 13+): `brew install mpv`
+    - MacPorts (legacy macOS, e.g. High Sierra — install the MacPorts pkg
+      for your macOS from macports.org first):
+      `sudo port install mpv +libmpv` (compiles from source; can take
+      an hour or more on old hardware)
+
+Then:
+
+```bash
+./collect-results.sh          # ~4 min, all scenarios
+./collect-results.sh --long   # + 10-minute 4K60 long run (recommended)
+```
+
+Viewer windows open and close by themselves during the run. At the end the
+script prints the path of a `results-<host>-<date>.txt` file — send that
+file back. Detailed docs: README.md; baseline numbers: RESULTS.md.
+EOF
+
+tar -czf "$TARBALL" -C build/bundle mpv-frame-copy-spike
+echo
+echo "bundle ready: $DIR/$TARBALL"
+du -h "$TARBALL" | cut -f1
diff --git a/spikes/mpv-frame-copy/run.sh b/spikes/mpv-frame-copy/run.sh
new file mode 100755
index 000000000..22404a7a8
--- /dev/null
+++ b/spikes/mpv-frame-copy/run.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Build and run the full spike: helper (producer) + Electron viewer (consumer).
+#
+#   ./run.sh <media-url-or-path> [WxH]
+#   ./run.sh 'av://lavfi:testsrc2=size=1920x1080:rate=60' 1920x1080
+#
+# Env overrides: ELECTRON (viewer binary), SPIKE_SHM (ring name),
+# HELPER_ARGS (extra helper flags, e.g. "--hwdec videotoolbox-copy --loop").
+set -euo pipefail
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+MEDIA="${1:?usage: run.sh <media-url-or-path> [WxH]}"
+SIZE="${2:-1920x1080}"
+SHM="${SPIKE_SHM:-/mpv-frame-spike}"
+
+make -C "$DIR"
+
+if [[ -z "${ELECTRON:-}" ]]; then
+    for candidate in \
+        "$DIR/../../node_modules/.bin/electron" \
+        "$DIR/../../../../../node_modules/.bin/electron"; do
+        if [[ -x "$candidate" ]]; then
+            ELECTRON="$candidate"
+            break
+        fi
+    done
+fi
+if [[ -z "${ELECTRON:-}" ]]; then
+    echo "electron binary not found; set ELECTRON=/path/to/electron" >&2
+    exit 1
+fi
+
+# shellcheck disable=SC2086
+"$DIR/build/mpv_helper" "$MEDIA" --size "$SIZE" --shm "$SHM" ${HELPER_ARGS:-} &
+HELPER_PID=$!
+trap 'kill "$HELPER_PID" 2>/dev/null || true' EXIT
+
+SPIKE_SHM="$SHM" "$ELECTRON" "$DIR/viewer/main.js"
diff --git a/spikes/mpv-frame-copy/viewer/addon/shm_reader.c b/spikes/mpv-frame-copy/viewer/addon/shm_reader.c
new file mode 100644
index 000000000..ac1fdaa00
--- /dev/null
+++ b/spikes/mpv-frame-copy/viewer/addon/shm_reader.c
@@ -0,0 +1,210 @@
+/*
+ * mpv frame-copy spike — shared-memory reader addon (plain C N-API).
+ *
+ * Maps the ring created by helper/mpv_helper.cpp and copies the newest
+ * complete frame into a caller-provided ArrayBuffer. A memcpy is mandatory:
+ * Electron's V8 memory cage forbids external ArrayBuffers over foreign
+ * memory (napi_create_external_arraybuffer aborts), so zero-copy into JS is
+ * not possible — this copy is one of the 2-3 copies the architecture doc
+ * budgets for.
+ *
+ * Built directly with clang (-undefined dynamic_lookup); N-API is ABI-stable
+ * so the same .node loads in Node and Electron.
+ */
+#define NAPI_VERSION 8
+#include <node_api.h>
+
+#include <fcntl.h>
+#include <stdatomic.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "spike_shm.h"
+
+static SpikeShmHeader* g_hdr = NULL;
+static uint8_t* g_base = NULL;
+static size_t g_size = 0;
+
+static uint64_t now_ns(void) {
+    return clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
+}
+
+static napi_value throw_error(napi_env env, const char* msg) {
+    napi_throw_error(env, NULL, msg);
+    return NULL;
+}
+
+static void set_named_double(napi_env env, napi_value obj, const char* key,
+                             double value) {
+    napi_value v;
+    napi_create_double(env, value, &v);
+    napi_set_named_property(env, obj, key, v);
+}
+
+/* open(name) -> { width, height, stride, frameBytes } */
+static napi_value Open(napi_env env, napi_callback_info info) {
+    size_t argc = 1;
+    napi_value argv[1];
+    napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
+    if (argc < 1) return throw_error(env, "open(name) requires a shm name");
+
+    char name[256];
+    size_t len = 0;
+    if (napi_get_value_string_utf8(env, argv[0], name, sizeof(name), &len) !=
+        napi_ok)
+        return throw_error(env, "shm name must be a string");
+
+    if (g_base) {
+        munmap(g_base, g_size);
+        g_base = NULL;
+        g_hdr = NULL;
+    }
+
+    const int fd = shm_open(name, O_RDONLY, 0);
+    if (fd < 0) return throw_error(env, "shm_open failed (helper not running?)");
+    struct stat st;
+    if (fstat(fd, &st) != 0 || st.st_size < (off_t)sizeof(SpikeShmHeader)) {
+        close(fd);
+        return throw_error(env, "shm segment too small");
+    }
+    void* base = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+    close(fd);
+    if (base == MAP_FAILED) return throw_error(env, "mmap failed");
+
+    SpikeShmHeader* hdr = (SpikeShmHeader*)base;
+    if (hdr->magic != SPIKE_SHM_MAGIC || hdr->version != SPIKE_SHM_VERSION) {
+        munmap(base, (size_t)st.st_size);
+        return throw_error(env, "shm ring not initialized yet");
+    }
+
+    g_base = (uint8_t*)base;
+    g_size = (size_t)st.st_size;
+    g_hdr = hdr;
+
+    napi_value result;
+    napi_create_object(env, &result);
+    set_named_double(env, result, "width", hdr->width);
+    set_named_double(env, result, "height", hdr->height);
+    set_named_double(env, result, "stride", hdr->stride);
+    set_named_double(env, result, "frameBytes", (double)hdr->frame_bytes);
+    return result;
+}
+
+/* latestSeq() -> number (0 = no frame yet) */
+static napi_value LatestSeq(napi_env env, napi_callback_info info) {
+    napi_value out;
+    const uint64_t seq =
+        g_hdr ? atomic_load_explicit(&g_hdr->latest_seq, memory_order_acquire)
+              : 0;
+    napi_create_double(env, (double)seq, &out);
+    return out;
+}
+
+/* copyLatest(arrayBuffer) -> { seq, ptsSec, ageMs, copyMs, torn } | null */
+static napi_value CopyLatest(napi_env env, napi_callback_info info) {
+    size_t argc = 1;
+    napi_value argv[1];
+    napi_get_cb_info(env, info, &argc, argv, NULL, NULL);
+    if (!g_hdr) return throw_error(env, "call open() first");
+    if (argc < 1) return throw_error(env, "copyLatest(buffer) needs a buffer");
+
+    void* dst = NULL;
+    size_t dstLen = 0;
+    if (napi_get_arraybuffer_info(env, argv[0], &dst, &dstLen) != napi_ok)
+        return throw_error(env, "argument must be an ArrayBuffer");
+    if (dstLen < g_hdr->frame_bytes)
+        return throw_error(env, "buffer smaller than one frame");
+
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+
+    const uint64_t seq =
+        atomic_load_explicit(&g_hdr->latest_seq, memory_order_acquire);
+    if (seq == 0) return null_value;
+
+    SpikeSlot* slot = &g_hdr->slots[seq % SPIKE_RING_SLOTS];
+    if (atomic_load_explicit(&slot->seq, memory_order_acquire) != seq)
+        return null_value; /* writer racing this slot; try next tick */
+
+    const uint8_t* src =
+        g_base + g_hdr->data_offset + (seq % SPIKE_RING_SLOTS) * g_hdr->frame_bytes;
+    const uint64_t t0 = now_ns();
+    memcpy(dst, src, (size_t)g_hdr->frame_bytes);
+    const uint64_t t1 = now_ns();
+
+    const int torn =
+        atomic_load_explicit(&slot->seq, memory_order_acquire) != seq;
+    const uint64_t pts_us = slot->pts_us;
+    const double age_ms = (double)(t1 - slot->produce_time_ns) / 1e6;
+
+    napi_value result;
+    napi_create_object(env, &result);
+    set_named_double(env, result, "seq", (double)seq);
+    set_named_double(env, result, "ptsSec",
+                     pts_us == SPIKE_PTS_UNKNOWN ? -1.0 : (double)pts_us / 1e6);
+    set_named_double(env, result, "ageMs", age_ms);
+    set_named_double(env, result, "copyMs", (double)(t1 - t0) / 1e6);
+    /* producer timestamp on the shared monotonic clock, for pacing stats */
+    set_named_double(env, result, "produceMs",
+                     (double)slot->produce_time_ns / 1e6);
+    napi_value torn_value;
+    napi_get_boolean(env, torn, &torn_value);
+    napi_set_named_property(env, result, "torn", torn_value);
+    return result;
+}
+
+/* producerFps() -> number */
+static napi_value ProducerFps(napi_env env, napi_callback_info info) {
+    napi_value out;
+    const double fps =
+        g_hdr ? (double)atomic_load_explicit(&g_hdr->producer_fps_milli,
+                                             memory_order_relaxed) /
+                    1000.0
+              : 0;
+    napi_create_double(env, fps, &out);
+    return out;
+}
+
+/* producerAliveMs() -> ms since last producer heartbeat (-1 if unknown) */
+static napi_value ProducerAliveMs(napi_env env, napi_callback_info info) {
+    napi_value out;
+    double ms = -1;
+    if (g_hdr) {
+        const uint64_t hb =
+            atomic_load_explicit(&g_hdr->heartbeat_ns, memory_order_relaxed);
+        if (hb) ms = (double)(now_ns() - hb) / 1e6;
+    }
+    napi_create_double(env, ms, &out);
+    return out;
+}
+
+/* nowMs() -> CLOCK_MONOTONIC_RAW in ms (same clock as helper timestamps) */
+static napi_value NowMs(napi_env env, napi_callback_info info) {
+    napi_value out;
+    napi_create_double(env, (double)now_ns() / 1e6, &out);
+    return out;
+}
+
+static napi_value Init(napi_env env, napi_value exports) {
+    const struct {
+        const char* name;
+        napi_callback fn;
+    } fns[] = {
+        {"open", Open},           {"latestSeq", LatestSeq},
+        {"copyLatest", CopyLatest}, {"producerFps", ProducerFps},
+        {"producerAliveMs", ProducerAliveMs}, {"nowMs", NowMs},
+    };
+    for (size_t i = 0; i < sizeof(fns) / sizeof(fns[0]); i++) {
+        napi_value fn;
+        napi_create_function(env, fns[i].name, NAPI_AUTO_LENGTH, fns[i].fn,
+                             NULL, &fn);
+        napi_set_named_property(env, exports, fns[i].name, fn);
+    }
+    return exports;
+}
+
+NAPI_MODULE(shm_reader, Init)
diff --git a/spikes/mpv-frame-copy/viewer/index.html b/spikes/mpv-frame-copy/viewer/index.html
new file mode 100644
index 000000000..1cdf8ae81
--- /dev/null
+++ b/spikes/mpv-frame-copy/viewer/index.html
@@ -0,0 +1,295 @@
+<!doctype html>
+<meta charset="utf-8" />
+<title>mpv frame-copy spike viewer</title>
+<style>
+    html,
+    body {
+        margin: 0;
+        height: 100%;
+        background: #101014;
+        color: #e8e8ee;
+        font: 13px/1.5 ui-monospace, monospace;
+        overflow: hidden;
+    }
+    #stage {
+        position: absolute;
+        inset: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    canvas {
+        max-width: 100%;
+        max-height: 100%;
+    }
+    #hud {
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        padding: 8px 12px;
+        background: rgba(10, 10, 14, 0.78);
+        border: 1px solid #2a2a33;
+        border-radius: 6px;
+        white-space: pre;
+        pointer-events: none;
+    }
+</style>
+<div id="stage"><canvas id="video"></canvas></div>
+<div id="hud">waiting for helper…</div>
+<script>
+    const path = require('path');
+    const shm = require(path.join(__dirname, '..', 'build', 'shm_reader.node'));
+    const shmName =
+        new URLSearchParams(location.search).get('shm') || '/mpv-frame-spike';
+    const hud = document.getElementById('hud');
+
+    function percentile(samples, p) {
+        if (!samples.length) return 0;
+        const sorted = [...samples].sort((a, b) => a - b);
+        return sorted[Math.floor((sorted.length - 1) * p)];
+    }
+    const avg = (samples) =>
+        samples.length
+            ? samples.reduce((sum, v) => sum + v, 0) / samples.length
+            : 0;
+    function stddev(samples) {
+        if (samples.length < 2) return 0;
+        const mean = avg(samples);
+        const variance =
+            samples.reduce((sum, v) => sum + (v - mean) * (v - mean), 0) /
+            (samples.length - 1);
+        return Math.sqrt(variance);
+    }
+    function median(samples) {
+        if (!samples.length) return 0;
+        const sorted = [...samples].sort((a, b) => a - b);
+        return sorted[Math.floor(sorted.length / 2)];
+    }
+
+    function start(info) {
+        const width = info.width;
+        const height = info.height;
+        const canvas = document.getElementById('video');
+        canvas.width = width;
+        canvas.height = height;
+
+        const gl = canvas.getContext('webgl2', {
+            antialias: false,
+            preserveDrawingBuffer: false,
+        });
+        const vertexSrc = `#version 300 es
+            out vec2 v_uv;
+            void main() {
+                vec2 corner = vec2((gl_VertexID << 1) & 2, gl_VertexID & 2);
+                v_uv = vec2(corner.x, 1.0 - corner.y); // top-down rows in shm
+                gl_Position = vec4(corner * 2.0 - 1.0, 0.0, 1.0);
+            }`;
+        const fragmentSrc = `#version 300 es
+            precision mediump float;
+            uniform sampler2D u_tex;
+            in vec2 v_uv;
+            out vec4 o_color;
+            void main() {
+                vec4 c = texture(u_tex, v_uv);
+                o_color = vec4(c.b, c.g, c.r, 1.0); // shm frames are BGRA
+            }`;
+        const program = gl.createProgram();
+        for (const [type, src] of [
+            [gl.VERTEX_SHADER, vertexSrc],
+            [gl.FRAGMENT_SHADER, fragmentSrc],
+        ]) {
+            const shader = gl.createShader(type);
+            gl.shaderSource(shader, src);
+            gl.compileShader(shader);
+            if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+                console.error('shader: ' + gl.getShaderInfoLog(shader));
+            }
+            gl.attachShader(program, shader);
+        }
+        gl.linkProgram(program);
+        gl.useProgram(program);
+        gl.createVertexArray && gl.bindVertexArray(gl.createVertexArray());
+
+        const texture = gl.createTexture();
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+        gl.texImage2D(
+            gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0,
+            gl.RGBA, gl.UNSIGNED_BYTE, null,
+        );
+        gl.viewport(0, 0, width, height);
+
+        const frame = new Uint8Array(info.frameBytes);
+        let pixelProbeDone = false;
+        function probePixels() {
+            // One-shot sanity check that frames carry a real image: sample a
+            // grid and report channel spread (a black/uniform frame fails).
+            let min = 255;
+            let max = 0;
+            for (let i = 0; i < 64; i++) {
+                const offset =
+                    Math.floor((i / 64) * (info.frameBytes / 4)) * 4;
+                for (let channel = 0; channel < 3; channel++) {
+                    const v = frame[offset + channel];
+                    if (v < min) min = v;
+                    if (v > max) max = v;
+                }
+            }
+            console.log(`PIXELPROBE min=${min} max=${max} spread=${max - min}`);
+        }
+        let lastSeq = 0;
+        let drawTicks = 0;
+        let newFrames = 0;
+        let dropped = 0;
+        let torn = 0;
+        const copyMs = [];
+        const uploadMs = [];
+        const ageMs = [];
+        // Pacing/judder instrumentation: intervals between consecutive
+        // presented frames (viewer clock) and between produced frames
+        // (helper clock via produceMs). The gate is variance, not avg fps.
+        const presentIntervals = [];
+        const producerIntervals = [];
+        let lastPresentMs = 0;
+        let lastProduceMs = 0;
+        const longRun = {
+            start: performance.now(),
+            frames: 0,
+            late15: 0, // present interval > 1.5x nominal (one missed beat)
+            late25: 0, // present interval > 2.5x nominal (visible stutter)
+            worstIntervalMs: 0,
+        };
+        let lastSummaryMs = performance.now();
+        let windowStart = performance.now();
+
+        function tick() {
+            requestAnimationFrame(tick);
+            drawTicks++;
+
+            if (shm.latestSeq() > lastSeq) {
+                const result = shm.copyLatest(frame.buffer);
+                if (result) {
+                    const t0 = performance.now();
+                    gl.texSubImage2D(
+                        gl.TEXTURE_2D, 0, 0, 0, width, height,
+                        gl.RGBA, gl.UNSIGNED_BYTE, frame,
+                    );
+                    const upload = performance.now() - t0;
+                    if (lastSeq > 0 && result.seq - lastSeq > 1) {
+                        dropped += result.seq - lastSeq - 1;
+                    }
+                    lastSeq = result.seq;
+                    newFrames++;
+                    if (!pixelProbeDone && result.seq > 60) {
+                        pixelProbeDone = true;
+                        probePixels();
+                    }
+                    copyMs.push(result.copyMs);
+                    uploadMs.push(upload);
+                    ageMs.push(result.ageMs + upload);
+                    if (result.torn) torn++;
+                    const tPresent = performance.now();
+                    if (lastPresentMs > 0) {
+                        presentIntervals.push(tPresent - lastPresentMs);
+                    }
+                    lastPresentMs = tPresent;
+                    if (lastProduceMs > 0) {
+                        producerIntervals.push(
+                            result.produceMs - lastProduceMs,
+                        );
+                    }
+                    lastProduceMs = result.produceMs;
+                }
+            }
+            gl.drawArrays(gl.TRIANGLES, 0, 3);
+
+            const now = performance.now();
+            if (now - windowStart >= 2000) {
+                const seconds = (now - windowStart) / 1000;
+                // Nominal frame interval from the producer's own cadence —
+                // robust against rAF quantization on high-Hz displays.
+                const nominal =
+                    median(producerIntervals) ||
+                    (shm.producerFps() > 0 ? 1000 / shm.producerFps() : 0);
+                let late15 = 0;
+                let late25 = 0;
+                let worst = 0;
+                for (const interval of presentIntervals) {
+                    if (interval > worst) worst = interval;
+                    if (nominal > 0 && interval > nominal * 1.5) late15++;
+                    if (nominal > 0 && interval > nominal * 2.5) late25++;
+                }
+                longRun.frames += newFrames;
+                longRun.late15 += late15;
+                longRun.late25 += late25;
+                longRun.worstIntervalMs = Math.max(
+                    longRun.worstIntervalMs,
+                    worst,
+                );
+                const line =
+                    `STATS draw=${(drawTicks / seconds).toFixed(1)}fps ` +
+                    `new=${(newFrames / seconds).toFixed(1)}fps ` +
+                    `producer=${shm.producerFps().toFixed(1)}fps | ` +
+                    `copy ms avg=${avg(copyMs).toFixed(2)} p95=${percentile(copyMs, 0.95).toFixed(2)} | ` +
+                    `upload ms avg=${avg(uploadMs).toFixed(2)} p95=${percentile(uploadMs, 0.95).toFixed(2)} | ` +
+                    `age ms avg=${avg(ageMs).toFixed(1)} p95=${percentile(ageMs, 0.95).toFixed(1)} | ` +
+                    `present iv ms sd=${stddev(presentIntervals).toFixed(2)} ` +
+                    `p99=${percentile(presentIntervals, 0.99).toFixed(1)} ` +
+                    `max=${worst.toFixed(1)} late1.5x=${late15} | ` +
+                    `src iv ms sd=${stddev(producerIntervals).toFixed(2)} ` +
+                    `p99=${percentile(producerIntervals, 0.99).toFixed(1)} | ` +
+                    `dropped=${dropped} torn=${torn}`;
+                console.log(line);
+                hud.textContent =
+                    `shm ${shmName}  ${width}x${height}\n` +
+                    line.replace('STATS ', '').replaceAll(' | ', '\n');
+                if (now - lastSummaryMs >= 30000) {
+                    lastSummaryMs = now;
+                    const totalSeconds = (now - longRun.start) / 1000;
+                    const latePct = (
+                        (100 * longRun.late15) / Math.max(1, longRun.frames)
+                    ).toFixed(3);
+                    console.log(
+                        `LONGRUN t=${totalSeconds.toFixed(0)}s ` +
+                            `frames=${longRun.frames} ` +
+                            `avg=${(longRun.frames / totalSeconds).toFixed(2)}fps ` +
+                            `late1.5x=${longRun.late15} (${latePct}%) ` +
+                            `late2.5x=${longRun.late25} ` +
+                            `worstIv=${longRun.worstIntervalMs.toFixed(1)}ms ` +
+                            `dropped=${dropped} torn=${torn}`,
+                    );
+                }
+                drawTicks = 0;
+                newFrames = 0;
+                copyMs.length = 0;
+                uploadMs.length = 0;
+                ageMs.length = 0;
+                presentIntervals.length = 0;
+                producerIntervals.length = 0;
+                windowStart = now;
+            }
+        }
+        tick();
+    }
+
+    (function waitForHelper() {
+        let info = null;
+        try {
+            info = shm.open(shmName);
+        } catch (error) {
+            hud.textContent = `waiting for helper… (${error.message})`;
+        }
+        if (info) {
+            console.log(
+                `attached to ${shmName}: ${info.width}x${info.height}, ` +
+                    `${info.frameBytes} bytes/frame`,
+            );
+            start(info);
+        } else {
+            setTimeout(waitForHelper, 250);
+        }
+    })();
+</script>
diff --git a/spikes/mpv-frame-copy/viewer/main.js b/spikes/mpv-frame-copy/viewer/main.js
new file mode 100644
index 000000000..28f61d0bc
--- /dev/null
+++ b/spikes/mpv-frame-copy/viewer/main.js
@@ -0,0 +1,30 @@
+/*
+ * mpv frame-copy spike — Electron viewer harness.
+ *
+ * Deliberately minimal: nodeIntegration on, no preload, renderer console is
+ * mirrored to stdout so an automated run can scrape the STATS lines.
+ */
+const { app, BrowserWindow } = require('electron');
+const path = require('path');
+
+const shmName = process.env.SPIKE_SHM || '/mpv-frame-spike';
+
+app.whenReady().then(() => {
+    const win = new BrowserWindow({
+        width: 1600,
+        height: 980,
+        backgroundColor: '#101014',
+        webPreferences: {
+            nodeIntegration: true,
+            contextIsolation: false,
+        },
+    });
+    win.webContents.on('console-message', (_event, _level, message) => {
+        console.log(`[viewer] ${message}`);
+    });
+    win.loadFile(path.join(__dirname, 'index.html'), {
+        query: { shm: shmName },
+    });
+});
+
+app.on('window-all-closed', () => app.quit());
diff --git a/tools/build/inject-build-commit.mjs b/tools/build/inject-build-commit.mjs
new file mode 100644
index 000000000..fa6fcb914
--- /dev/null
+++ b/tools/build/inject-build-commit.mjs
@@ -0,0 +1,50 @@
+/**
+ * Injects the git commit SHA from the BUILD_COMMIT environment variable into
+ * the frontend BUILD_COMMIT constant before a CI build.
+ *
+ * The commit is shown next to the app version in Settings > About so bug
+ * reports from test and nightly builds identify the exact commit. The semver
+ * version itself intentionally stays untouched: a `-sha` suffix would flip
+ * electron-updater into prerelease mode and leak into installer/artifact
+ * version fields. Without BUILD_COMMIT the script is a no-op — local and dev
+ * builds show the plain version.
+ *
+ * Usage (CI, before `nx build web`):
+ *   BUILD_COMMIT=<git-sha> node tools/build/inject-build-commit.mjs
+ */
+import { readFileSync, writeFileSync } from 'node:fs';
+
+const CONFIG_PATH = 'apps/web/src/environments/build-commit.ts';
+const MARKER = "export const BUILD_COMMIT = '';";
+
+const commit = (process.env.BUILD_COMMIT ?? '').trim().toLowerCase();
+
+if (!commit) {
+    console.warn(
+        'BUILD_COMMIT is not set — Settings > About will show the plain version.'
+    );
+    process.exit(0);
+}
+
+if (!/^[0-9a-f]{7,40}$/.test(commit)) {
+    console.error(
+        'BUILD_COMMIT must be a 7-40 character hex git SHA; aborting.'
+    );
+    process.exit(1);
+}
+
+const source = readFileSync(CONFIG_PATH, 'utf8');
+
+if (!source.includes(MARKER)) {
+    console.error(
+        `Expected placeholder not found in ${CONFIG_PATH}. ` +
+            'Update tools/build/inject-build-commit.mjs if the constant moved.'
+    );
+    process.exit(1);
+}
+
+writeFileSync(
+    CONFIG_PATH,
+    source.replace(MARKER, `export const BUILD_COMMIT = '${commit}';`)
+);
+console.log(`Injected build commit ${commit} into ${CONFIG_PATH}.`);
diff --git a/tools/coverage/coverage-health.mjs b/tools/coverage/coverage-health.mjs
index 555b75b32..705623e72 100644
--- a/tools/coverage/coverage-health.mjs
+++ b/tools/coverage/coverage-health.mjs
@@ -10,6 +10,21 @@ import {
 import path from 'node:path';
 import process from 'node:process';
 
+import {
+    evaluateCoverageRatchets,
+    validateMergedCoverage,
+    validateProjectCoverage,
+    validateRequiredProjectReports,
+} from './coverage-integrity.mjs';
+
+const COVERAGE_METRICS = [
+    'statements',
+    'branches',
+    'functions',
+    'lines',
+];
+const COVERAGE_SUMMARY_FIELDS = ['covered', 'total', 'pct'];
+
 const workspaceRoot = process.cwd();
 const args = new Set(process.argv.slice(2));
 const requireReport = args.has('--require-report');
@@ -37,6 +52,15 @@ function projectJsonPath(project) {
     return path.join(workspaceRoot, project.root, 'project.json');
 }
 
+function projectCoveragePath(project) {
+    return path.join(
+        workspaceRoot,
+        'coverage',
+        project.root,
+        'coverage-final.json'
+    );
+}
+
 function verifyTierAProjects() {
     for (const project of policy.unitCoverage.tierA) {
         const filePath = projectJsonPath(project);
@@ -58,14 +82,63 @@ function verifyTierAProjects() {
     }
 }
 
+function verifyProjectCoverageReports() {
+    if (requireReport) {
+        const validation = validateRequiredProjectReports({
+            projects: policy.unitCoverage.tierA,
+            workspaceRoot,
+        });
+        errors.push(...validation.errors);
+        return;
+    }
+
+    for (const project of policy.unitCoverage.tierA) {
+        if (!existsSync(projectCoveragePath(project))) {
+            continue;
+        }
+
+        const validation = validateProjectCoverage({
+            project,
+            workspaceRoot,
+        });
+        errors.push(...validation.errors);
+    }
+}
+
+function reportCoverageSummaryMismatches(reportedSummary, computedSummary) {
+    for (const metric of COVERAGE_METRICS) {
+        const reported = reportedSummary[metric];
+        const computed = computedSummary[metric];
+        if (
+            COVERAGE_SUMMARY_FIELDS.every(
+                (field) => reported?.[field] === computed?.[field]
+            )
+        ) {
+            continue;
+        }
+
+        errors.push(
+            `Merged coverage summary mismatch for ${metric}: coverage-summary.json reports covered ${reported?.covered}, total ${reported?.total}, pct ${reported?.pct}; coverage-final.json computes covered ${computed?.covered}, total ${computed?.total}, pct ${computed?.pct}.`
+        );
+    }
+}
+
 function verifyCoverageReport() {
     const summaryPath = path.join(
         workspaceRoot,
         policy.reporting.mergedCoverageDir,
         'coverage-summary.json'
     );
+    const ratchet = policy.reporting.coverageRatchet;
+    const coveragePath = path.join(
+        workspaceRoot,
+        policy.reporting.mergedCoverageDir,
+        'coverage-final.json'
+    );
+    const summaryExists = existsSync(summaryPath);
+    const coverageExists = existsSync(coveragePath);
 
-    if (!existsSync(summaryPath)) {
+    if (!summaryExists && !coverageExists) {
         const message = `Merged coverage summary not found at ${path.relative(workspaceRoot, summaryPath)}.`;
         if (requireReport) {
             errors.push(message);
@@ -75,25 +148,86 @@ function verifyCoverageReport() {
         return;
     }
 
-    const summary = readJson(summaryPath).total;
-    console.log(
-        `Merged coverage: statements ${summary.statements.pct}%, branches ${summary.branches.pct}%, functions ${summary.functions.pct}%, lines ${summary.lines.pct}%.`
-    );
+    if (summaryExists !== coverageExists) {
+        const existingPath = summaryExists ? summaryPath : coveragePath;
+        const missingPath = summaryExists ? coveragePath : summaryPath;
+        errors.push(
+            `Merged coverage artifacts are incomplete: found ${path.relative(workspaceRoot, existingPath)} but ${path.relative(workspaceRoot, missingPath)} is missing.`
+        );
+        return;
+    }
 
-    if (requireReport) {
-        for (const project of policy.unitCoverage.tierA) {
-            const projectCoveragePath = path.join(
+    let summaryDocument;
+    try {
+        summaryDocument = readJson(summaryPath);
+    } catch (error) {
+        errors.push(
+            `Merged coverage summary ${path.relative(workspaceRoot, summaryPath)} contains invalid JSON: ${error.message}`
+        );
+        return;
+    }
+
+    const summary = summaryDocument?.total;
+    if (
+        !summary ||
+        COVERAGE_METRICS.some(
+            (metric) =>
+                !summary[metric] ||
+                !Number.isFinite(summary[metric].pct)
+        )
+    ) {
+        errors.push(
+            `Merged coverage summary ${path.relative(workspaceRoot, summaryPath)} does not contain usable total coverage metrics.`
+        );
+        return;
+    }
+
+    let coverageData;
+    try {
+        coverageData = readJson(coveragePath);
+    } catch (error) {
+        errors.push(
+            `Merged coverage report ${path.relative(workspaceRoot, coveragePath)} contains invalid JSON: ${error.message}`
+        );
+        return;
+    }
+
+    const mergedValidation = validateMergedCoverage({
+        coverageData,
+        projects: policy.unitCoverage.tierA,
+        reportPath: coveragePath,
+        workspaceRoot,
+    });
+    errors.push(...mergedValidation.errors);
+    if (!mergedValidation.coverageMap) {
+        return;
+    }
+    const computedSummary = mergedValidation.coverageMap
+        .getCoverageSummary()
+        .toJSON();
+
+    console.log(
+        `Merged coverage: statements ${computedSummary.statements.pct}%, branches ${computedSummary.branches.pct}%, functions ${computedSummary.functions.pct}%, lines ${computedSummary.lines.pct}%.`
+    );
+    reportCoverageSummaryMismatches(summary, computedSummary);
+
+    if (mergedValidation.errors.length > 0 || ratchet === undefined) {
+        return;
+    }
+
+    try {
+        errors.push(
+            ...evaluateCoverageRatchets({
+                coverageData,
+                mergedSummary: computedSummary,
+                ratchet,
                 workspaceRoot,
-                'coverage',
-                project.root,
-                'coverage-final.json'
-            );
-            if (!existsSync(projectCoveragePath)) {
-                errors.push(
-                    `Tier A project ${project.name} did not produce ${path.relative(workspaceRoot, projectCoveragePath)}.`
-                );
-            }
-        }
+            })
+        );
+    } catch (error) {
+        errors.push(
+            `Merged coverage report ${path.relative(workspaceRoot, coveragePath)} is not valid Istanbul coverage: ${error.message}`
+        );
     }
 }
 
@@ -216,6 +350,7 @@ function reportChangedCriticalFiles() {
 }
 
 verifyTierAProjects();
+verifyProjectCoverageReports();
 verifyCoverageReport();
 scanE2ETags();
 reportChangedCriticalFiles();
diff --git a/tools/coverage/coverage-integrity.mjs b/tools/coverage/coverage-integrity.mjs
new file mode 100644
index 000000000..b73e035b4
--- /dev/null
+++ b/tools/coverage/coverage-integrity.mjs
@@ -0,0 +1,579 @@
+import { createRequire } from 'node:module';
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import path from 'node:path';
+import ts from 'typescript';
+
+const require = createRequire(import.meta.url);
+const { createCoverageMap } = require('istanbul-lib-coverage');
+
+export const COVERAGE_COLLECTION_FAILURE = 'Failed to collect coverage';
+const ANSI_ESCAPE = /\u001b\[[0-?]*[ -/]*[@-~]/g;
+const COVERAGE_METRICS = [
+    'statements',
+    'branches',
+    'functions',
+    'lines',
+];
+
+function toPosix(filePath) {
+    return filePath.split(path.sep).join('/');
+}
+
+function hasDeclareModifier(statement) {
+    const modifiers = ts.canHaveModifiers(statement)
+        ? (ts.getModifiers(statement) ?? [])
+        : [];
+    return modifiers.some(
+        (modifier) => modifier.kind === ts.SyntaxKind.DeclareKeyword
+    );
+}
+
+export function hasRuntimeOwnedStatement(sourceText, fileName = 'source.ts') {
+    const source = ts.createSourceFile(
+        fileName,
+        sourceText,
+        ts.ScriptTarget.Latest,
+        true
+    );
+
+    return source.statements.some((statement) => {
+        if (hasDeclareModifier(statement)) {
+            return false;
+        }
+
+        return !(
+            ts.isImportDeclaration(statement) ||
+            ts.isImportEqualsDeclaration(statement) ||
+            ts.isInterfaceDeclaration(statement) ||
+            ts.isTypeAliasDeclaration(statement) ||
+            ts.isExportDeclaration(statement) ||
+            ts.isEmptyStatement(statement)
+        );
+    });
+}
+
+export function createCoverageOutputScanner(maxCharacters = 4096) {
+    let tail = '';
+    let collectionFailed = false;
+    let ansiState = 'text';
+
+    function stripAnsi(chunk) {
+        const input = String(chunk).replace(ANSI_ESCAPE, '');
+        let output = '';
+
+        for (let index = 0; index < input.length; index += 1) {
+            const character = input[index];
+            const code = character.charCodeAt(0);
+
+            if (ansiState === 'text') {
+                if (code === 0x1b) {
+                    ansiState = 'escape';
+                } else {
+                    output += character;
+                }
+                continue;
+            }
+
+            if (ansiState === 'escape') {
+                if (character === '[') {
+                    ansiState = 'parameters';
+                } else {
+                    output += '\u001b';
+                    ansiState = 'text';
+                    index -= 1;
+                }
+                continue;
+            }
+
+            if (ansiState === 'parameters') {
+                if (code >= 0x30 && code <= 0x3f) {
+                    continue;
+                }
+                if (code >= 0x20 && code <= 0x2f) {
+                    ansiState = 'intermediates';
+                    continue;
+                }
+                if (code >= 0x40 && code <= 0x7e) {
+                    ansiState = 'text';
+                    continue;
+                }
+
+                ansiState = 'text';
+                index -= 1;
+                continue;
+            }
+
+            if (code >= 0x20 && code <= 0x2f) {
+                continue;
+            }
+            if (code >= 0x40 && code <= 0x7e) {
+                ansiState = 'text';
+                continue;
+            }
+
+            ansiState = 'text';
+            index -= 1;
+        }
+
+        return output;
+    }
+
+    return {
+        get collectionFailed() {
+            return collectionFailed;
+        },
+        get tail() {
+            return tail;
+        },
+        push(chunk) {
+            const output = `${tail}${stripAnsi(chunk)}`;
+            if (output.includes(COVERAGE_COLLECTION_FAILURE)) {
+                collectionFailed = true;
+            }
+            tail = output.slice(-maxCharacters);
+        },
+    };
+}
+
+function isExcludedSource(filePath) {
+    const file = toPosix(filePath);
+    return (
+        /\.(spec|test)\.ts$/.test(file) ||
+        file.endsWith('.d.ts') ||
+        file.endsWith('/test-setup.ts') ||
+        file.includes('/test-stubs/') ||
+        /\.generated\./.test(file) ||
+        file.includes('/environments/') ||
+        file.endsWith('/index.ts')
+    );
+}
+
+function runtimeOwningSourceFiles(workspaceRoot, sourceRoot) {
+    const absoluteSourceRoot = path.resolve(workspaceRoot, sourceRoot);
+    const runtimeFiles = [];
+    const directories = [absoluteSourceRoot];
+
+    while (directories.length > 0) {
+        const directory = directories.pop();
+        for (const name of readdirSync(directory)) {
+            const filePath = path.join(directory, name);
+            const stats = statSync(filePath);
+
+            if (stats.isDirectory()) {
+                directories.push(filePath);
+                continue;
+            }
+            if (
+                !stats.isFile() ||
+                !filePath.endsWith('.ts') ||
+                isExcludedSource(filePath)
+            ) {
+                continue;
+            }
+            if (
+                hasRuntimeOwnedStatement(
+                    readFileSync(filePath, 'utf8'),
+                    filePath
+                )
+            ) {
+                runtimeFiles.push(path.resolve(filePath));
+            }
+        }
+    }
+
+    return runtimeFiles.sort();
+}
+
+function isObjectRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function indexCoverageFilesByAbsolutePath(coverageMap, workspaceRoot) {
+    const filesByAbsolutePath = new Map();
+    const duplicateAbsolutePaths = new Set();
+
+    for (const reportedPath of coverageMap.files().sort()) {
+        const absolutePath = path.resolve(workspaceRoot, reportedPath);
+        if (filesByAbsolutePath.has(absolutePath)) {
+            duplicateAbsolutePaths.add(absolutePath);
+            continue;
+        }
+        filesByAbsolutePath.set(absolutePath, reportedPath);
+    }
+
+    return {
+        duplicateAbsolutePaths: [...duplicateAbsolutePaths].sort(),
+        filesByAbsolutePath,
+    };
+}
+
+export function validateProjectCoverage({ workspaceRoot, project }) {
+    const reportPath = path.resolve(
+        workspaceRoot,
+        'coverage',
+        project.root,
+        'coverage-final.json'
+    );
+    const relativeReportPath = toPosix(
+        path.relative(workspaceRoot, reportPath)
+    );
+
+    if (!existsSync(reportPath)) {
+        return {
+            errors: [
+                `${project.name} did not produce ${relativeReportPath}.`,
+            ],
+            report: undefined,
+        };
+    }
+
+    let data;
+    try {
+        data = JSON.parse(readFileSync(reportPath, 'utf8'));
+    } catch (error) {
+        return {
+            errors: [
+                `${project.name} coverage report ${relativeReportPath} contains invalid JSON: ${error.message}`,
+            ],
+            report: undefined,
+        };
+    }
+
+    if (
+        !isObjectRecord(data) ||
+        Object.values(data).some((entry) => !isObjectRecord(entry))
+    ) {
+        return {
+            errors: [
+                `${project.name} coverage report ${relativeReportPath} must contain a JSON object mapping source paths to JSON objects.`,
+            ],
+            report: undefined,
+        };
+    }
+
+    let coverageMap;
+    try {
+        coverageMap = createCoverageMap(data);
+        for (const filePath of coverageMap.files()) {
+            coverageMap.fileCoverageFor(filePath).toSummary();
+        }
+    } catch (error) {
+        return {
+            errors: [
+                `${project.name} coverage report ${relativeReportPath} is not valid Istanbul coverage: ${error.message}`,
+            ],
+            report: undefined,
+        };
+    }
+
+    const {
+        duplicateAbsolutePaths,
+        filesByAbsolutePath: reportedFiles,
+    } = indexCoverageFilesByAbsolutePath(coverageMap, workspaceRoot);
+    if (duplicateAbsolutePaths.length > 0) {
+        return {
+            errors: duplicateAbsolutePaths.map(
+                (filePath) =>
+                    `${project.name} coverage report ${relativeReportPath} contains a duplicate entry for ${toPosix(
+                        path.relative(workspaceRoot, filePath)
+                    )} after path normalization.`
+            ),
+            report: undefined,
+        };
+    }
+
+    const errors = [];
+    for (const filePath of runtimeOwningSourceFiles(
+        workspaceRoot,
+        project.sourceRoot
+    )) {
+        const reportedPath = reportedFiles.get(filePath);
+        const relativeSourcePath = toPosix(
+            path.relative(workspaceRoot, filePath)
+        );
+        if (reportedPath === undefined) {
+            errors.push(
+                `${project.name} coverage report is missing runtime-owning source ${relativeSourcePath}.`
+            );
+            continue;
+        }
+
+        const summary = coverageMap
+            .fileCoverageFor(reportedPath)
+            .toSummary()
+            .toJSON();
+        const hasUsableInstrumentation = [
+            summary.statements,
+            summary.functions,
+            summary.branches,
+        ].some((metric) => metric.total > 0);
+        if (!hasUsableInstrumentation) {
+            errors.push(
+                `${project.name} coverage report ${relativeReportPath} has no usable instrumentation for runtime-owning source ${relativeSourcePath}.`
+            );
+        }
+    }
+
+    return {
+        errors,
+        report: {
+            data,
+            path: reportPath,
+            project,
+        },
+    };
+}
+
+export function validateRequiredProjectReports({ projects, workspaceRoot }) {
+    const errors = [];
+    const reports = [];
+
+    for (const project of projects) {
+        const result = validateProjectCoverage({ project, workspaceRoot });
+        errors.push(...result.errors);
+        if (result.report) {
+            reports.push(result.report);
+        }
+    }
+
+    return { errors, reports };
+}
+
+export function validateMergedCoverage({
+    coverageData,
+    projects,
+    reportPath,
+    workspaceRoot,
+}) {
+    const relativeReportPath = toPosix(
+        path.relative(workspaceRoot, reportPath)
+    );
+    const reportDescription = `Merged coverage report ${relativeReportPath}`;
+
+    if (
+        !isObjectRecord(coverageData) ||
+        Object.values(coverageData).some(
+            (entry) => !isObjectRecord(entry)
+        )
+    ) {
+        return {
+            coverageMap: undefined,
+            errors: [
+                `${reportDescription} must contain a JSON object mapping source paths to JSON objects.`,
+            ],
+        };
+    }
+
+    let coverageMap;
+    try {
+        coverageMap = createCoverageMap(coverageData);
+        for (const filePath of coverageMap.files()) {
+            coverageMap.fileCoverageFor(filePath).toSummary();
+        }
+    } catch (error) {
+        return {
+            coverageMap: undefined,
+            errors: [
+                `${reportDescription} is not valid Istanbul coverage: ${error.message}`,
+            ],
+        };
+    }
+
+    const {
+        duplicateAbsolutePaths,
+        filesByAbsolutePath: reportedFiles,
+    } = indexCoverageFilesByAbsolutePath(coverageMap, workspaceRoot);
+    if (duplicateAbsolutePaths.length > 0) {
+        return {
+            coverageMap: undefined,
+            errors: duplicateAbsolutePaths.map(
+                (filePath) =>
+                    `${reportDescription} contains a duplicate entry for ${toPosix(
+                        path.relative(workspaceRoot, filePath)
+                    )} after path normalization.`
+            ),
+        };
+    }
+
+    const errors = [];
+    for (const project of projects) {
+        for (const filePath of runtimeOwningSourceFiles(
+            workspaceRoot,
+            project.sourceRoot
+        )) {
+            const relativeSourcePath = toPosix(
+                path.relative(workspaceRoot, filePath)
+            );
+            const reportedPath = reportedFiles.get(filePath);
+            if (reportedPath === undefined) {
+                errors.push(
+                    `${reportDescription} is missing runtime-owning source ${relativeSourcePath} from Tier A project ${project.name}.`
+                );
+                continue;
+            }
+
+            const summary = coverageMap
+                .fileCoverageFor(reportedPath)
+                .toSummary()
+                .toJSON();
+            const hasUsableInstrumentation = [
+                summary.statements,
+                summary.functions,
+                summary.branches,
+            ].some((metric) => metric.total > 0);
+            if (!hasUsableInstrumentation) {
+                errors.push(
+                    `${reportDescription} has no usable instrumentation for runtime-owning source ${relativeSourcePath} from Tier A project ${project.name}.`
+                );
+            }
+        }
+    }
+
+    return { coverageMap, errors };
+}
+
+function formatConfigurationValue(value) {
+    return typeof value === 'string' ? JSON.stringify(value) : String(value);
+}
+
+function validateCoverageRatchetConfiguration(ratchet) {
+    const errors = [];
+
+    for (const metric of COVERAGE_METRICS) {
+        const value = ratchet?.merged?.[metric];
+        if (
+            typeof value !== 'number' ||
+            !Number.isFinite(value) ||
+            value < 0 ||
+            value > 100
+        ) {
+            errors.push(
+                `Invalid coverage ratchet merged.${metric}: expected a finite number between 0 and 100, received ${formatConfigurationValue(value)}.`
+            );
+        }
+    }
+
+    const criticalFiles = ratchet?.criticalFiles;
+    if (!Array.isArray(criticalFiles)) {
+        errors.push(
+            `Invalid coverage ratchet criticalFiles: expected an array, received ${formatConfigurationValue(criticalFiles)}.`
+        );
+        return errors;
+    }
+
+    for (const [index, criticalFile] of criticalFiles.entries()) {
+        const criticalPath = criticalFile?.path;
+        const hasValidPath =
+            typeof criticalPath === 'string' &&
+            criticalPath.trim().length > 0;
+        if (!hasValidPath) {
+            errors.push(
+                `Invalid coverage ratchet criticalFiles[${index}].path: expected a non-empty string, received ${formatConfigurationValue(criticalPath)}.`
+            );
+        }
+        const filePath = hasValidPath
+            ? toPosix(criticalPath)
+            : `criticalFiles[${index}]`;
+        const minimumCovered =
+            criticalFile?.statements?.minimumCovered;
+        if (
+            typeof minimumCovered !== 'number' ||
+            !Number.isFinite(minimumCovered) ||
+            !Number.isInteger(minimumCovered) ||
+            minimumCovered < 0
+        ) {
+            errors.push(
+                `Invalid coverage ratchet ${filePath} statements.minimumCovered: expected a non-negative integer, received ${formatConfigurationValue(minimumCovered)}.`
+            );
+        }
+
+        const minimumPercent =
+            criticalFile?.statements?.minimumPercent;
+        if (
+            typeof minimumPercent !== 'number' ||
+            !Number.isFinite(minimumPercent) ||
+            minimumPercent < 0 ||
+            minimumPercent > 100
+        ) {
+            errors.push(
+                `Invalid coverage ratchet ${filePath} statements.minimumPercent: expected a finite number between 0 and 100, received ${formatConfigurationValue(minimumPercent)}.`
+            );
+        }
+    }
+
+    return errors;
+}
+
+export function evaluateCoverageRatchets({
+    coverageData,
+    mergedSummary,
+    ratchet,
+    workspaceRoot,
+}) {
+    const configurationErrors =
+        validateCoverageRatchetConfiguration(ratchet);
+    if (configurationErrors.length > 0) {
+        return configurationErrors;
+    }
+
+    const errors = [];
+
+    for (const metric of COVERAGE_METRICS) {
+        const required = ratchet.merged[metric];
+        const observed = mergedSummary[metric]?.pct;
+        if (!Number.isFinite(observed) || observed < required) {
+            errors.push(
+                `Merged ${metric} coverage regressed: observed ${observed}%, required at least ${required}%.`
+            );
+        }
+    }
+
+    const coverageMap = createCoverageMap(coverageData);
+    const {
+        duplicateAbsolutePaths,
+        filesByAbsolutePath: reportedFiles,
+    } = indexCoverageFilesByAbsolutePath(coverageMap, workspaceRoot);
+    if (duplicateAbsolutePaths.length > 0) {
+        return [
+            ...errors,
+            ...duplicateAbsolutePaths.map(
+                (filePath) =>
+                    `Merged coverage contains a duplicate entry for ${toPosix(
+                        path.relative(workspaceRoot, filePath)
+                    )} after path normalization.`
+            ),
+        ];
+    }
+
+    for (const criticalFile of ratchet.criticalFiles) {
+        const filePath = path.resolve(workspaceRoot, criticalFile.path);
+        const relativePath = toPosix(path.relative(workspaceRoot, filePath));
+        const reportedPath = reportedFiles.get(filePath);
+        if (reportedPath === undefined) {
+            errors.push(
+                `Critical coverage ${relativePath} is missing from merged coverage.`
+            );
+            continue;
+        }
+
+        const statements = coverageMap
+            .fileCoverageFor(reportedPath)
+            .toSummary()
+            .toJSON().statements;
+        const minimumCovered = criticalFile.statements.minimumCovered;
+        if (statements.covered < minimumCovered) {
+            errors.push(
+                `Critical coverage ${relativePath} statements covered regressed: observed ${statements.covered}, required at least ${minimumCovered}.`
+            );
+        }
+
+        const minimumPercent = criticalFile.statements.minimumPercent;
+        if (statements.pct < minimumPercent) {
+            errors.push(
+                `Critical coverage ${relativePath} statements percent regressed: observed ${statements.pct}%, required at least ${minimumPercent}%.`
+            );
+        }
+    }
+
+    return errors;
+}
diff --git a/tools/coverage/coverage-integrity.test.mjs b/tools/coverage/coverage-integrity.test.mjs
new file mode 100644
index 000000000..5dcc87304
--- /dev/null
+++ b/tools/coverage/coverage-integrity.test.mjs
@@ -0,0 +1,904 @@
+import assert from 'node:assert/strict';
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, it } from 'node:test';
+
+import {
+    createCoverageOutputScanner,
+    evaluateCoverageRatchets,
+    hasRuntimeOwnedStatement,
+    validateMergedCoverage,
+    validateProjectCoverage,
+    validateRequiredProjectReports,
+} from './coverage-integrity.mjs';
+
+const temporaryRoots = [];
+
+afterEach(() => {
+    for (const root of temporaryRoots.splice(0)) {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+
+function makeProjectFixture({
+    name = 'example',
+    projectRoot = `libs/${name}`,
+    workspaceRoot = undefined,
+} = {}) {
+    const ownsWorkspace = workspaceRoot === undefined;
+    const fixtureRoot =
+        workspaceRoot ??
+        mkdtempSync(path.join(tmpdir(), 'iptvnator-coverage-integrity-'));
+    if (ownsWorkspace) {
+        temporaryRoots.push(fixtureRoot);
+    }
+
+    const sourceRoot = `${projectRoot}/src`;
+    const sourcePath = path.join(fixtureRoot, sourceRoot, 'runtime.ts');
+    const reportPath = path.join(
+        fixtureRoot,
+        'coverage',
+        projectRoot,
+        'coverage-final.json'
+    );
+
+    mkdirSync(path.dirname(sourcePath), { recursive: true });
+    mkdirSync(path.dirname(reportPath), { recursive: true });
+    writeFileSync(sourcePath, 'export const runtime = true;\n');
+
+    const project = {
+        name,
+        root: projectRoot,
+        sourceRoot,
+    };
+
+    return {
+        project,
+        reportPath,
+        sourcePath,
+        workspaceRoot: fixtureRoot,
+    };
+}
+
+function coverageEntry(filePath, hits = [0]) {
+    const statementMap = Object.fromEntries(
+        hits.map((_, index) => [
+            index,
+            {
+                start: { line: index + 1, column: 0 },
+                end: { line: index + 1, column: 28 },
+            },
+        ])
+    );
+    const statementHits = Object.fromEntries(
+        hits.map((hit, index) => [index, hit])
+    );
+
+    return {
+        path: filePath,
+        statementMap,
+        fnMap: {},
+        branchMap: {},
+        s: statementHits,
+        f: {},
+        b: {},
+    };
+}
+
+function functionOnlyCoverageEntry(filePath) {
+    return {
+        path: filePath,
+        statementMap: {},
+        fnMap: {
+            0: {
+                name: 'runtime',
+                decl: {
+                    start: { line: 1, column: 7 },
+                    end: { line: 1, column: 15 },
+                },
+                loc: {
+                    start: { line: 1, column: 7 },
+                    end: { line: 1, column: 28 },
+                },
+                line: 1,
+            },
+        },
+        branchMap: {},
+        s: {},
+        f: { 0: 1 },
+        b: {},
+    };
+}
+
+function writeCompleteReport(fixture, reportKey = fixture.sourcePath) {
+    writeFileSync(
+        fixture.reportPath,
+        JSON.stringify({
+            [reportKey]: coverageEntry(fixture.sourcePath),
+        })
+    );
+}
+
+function fullyCoveredSummary() {
+    return {
+        statements: { covered: 1, total: 1, pct: 100 },
+        branches: { covered: 0, total: 0, pct: 100 },
+        functions: { covered: 0, total: 0, pct: 100 },
+        lines: { covered: 1, total: 1, pct: 100 },
+    };
+}
+
+function ratchetWithCriticalFiles(criticalFiles) {
+    return {
+        merged: {
+            statements: 0,
+            branches: 0,
+            functions: 0,
+            lines: 0,
+        },
+        criticalFiles,
+    };
+}
+
+describe('hasRuntimeOwnedStatement', () => {
+    it('excludes type-only, import-only, and pure re-export source', () => {
+        assert.equal(
+            hasRuntimeOwnedStatement(
+                'import type { Settings } from "./settings";'
+            ),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement(
+                'import settings = require("./settings");'
+            ),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('interface Settings { enabled: boolean }'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('export type Mode = "live" | "vod";'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('export { value } from "./value";'),
+            false
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement('declare const injected: string;'),
+            false
+        );
+    });
+
+    it('includes emitted declarations and executable statements', () => {
+        assert.equal(
+            hasRuntimeOwnedStatement('export const enabled = true;'),
+            true
+        );
+        assert.equal(
+            hasRuntimeOwnedStatement(
+                'export class RuntimeBoundary { start() {} }'
+            ),
+            true
+        );
+        assert.equal(hasRuntimeOwnedStatement('console.log("runtime");'), true);
+    });
+});
+
+describe('createCoverageOutputScanner', () => {
+    it('detects an ANSI-colored marker split across chunks', () => {
+        const scanner = createCoverageOutputScanner(128);
+
+        scanner.push('\u001b[31mFailed to collect');
+        scanner.push(' coverage from /workspace/effects.ts\u001b[39m');
+
+        assert.equal(scanner.collectionFailed, true);
+    });
+
+    it('detects a marker across a split ANSI escape sequence', () => {
+        const scanner = createCoverageOutputScanner(128);
+
+        scanner.push('Failed to \u001b[3');
+        scanner.push('1mcollect coverage from /workspace/effects.ts');
+
+        assert.equal(scanner.collectionFailed, true);
+        assert.equal(scanner.tail.includes('\u001b'), false);
+    });
+
+    it('keeps only a bounded rolling tail', () => {
+        const scanner = createCoverageOutputScanner(32);
+
+        scanner.push('x'.repeat(256));
+
+        assert.equal(scanner.tail.length, 32);
+        assert.equal(scanner.collectionFailed, false);
+    });
+
+    it('detects the marker before trimming a long chunk', () => {
+        const scanner = createCoverageOutputScanner(32);
+
+        scanner.push(`Failed to collect coverage${'x'.repeat(256)}`);
+
+        assert.equal(scanner.tail.length, 32);
+        assert.equal(scanner.collectionFailed, true);
+    });
+});
+
+describe('validateProjectCoverage', () => {
+    it('accepts a report containing every runtime-owning file', () => {
+        const fixture = makeProjectFixture();
+        const relativeReportKey = path.relative(
+            fixture.workspaceRoot,
+            fixture.sourcePath
+        );
+        writeCompleteReport(fixture, relativeReportKey);
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.deepEqual(result.errors, []);
+        assert.equal(result.report?.project.name, 'example');
+        assert.equal(result.report?.path, fixture.reportPath);
+    });
+
+    it('reports a runtime-owning source omitted from a valid report', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(fixture.reportPath, '{}');
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.equal(result.errors.length, 1);
+        assert.match(result.errors[0], /example/);
+        assert.match(result.errors[0], /libs\/example\/src\/runtime\.ts/);
+    });
+
+    it('rejects a malformed Istanbul coverage entry', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({ [fixture.sourcePath]: {} })
+        );
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.equal(result.report, undefined);
+        assert.match(
+            result.errors[0],
+            /example.*coverage\/libs\/example\/coverage-final\.json.*valid Istanbul/
+        );
+    });
+
+    it('rejects duplicate report paths after normalization', () => {
+        const fixture = makeProjectFixture();
+        const relativePath = path.relative(
+            fixture.workspaceRoot,
+            fixture.sourcePath
+        );
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({
+                [relativePath]: coverageEntry(relativePath),
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath),
+            })
+        );
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.equal(result.report, undefined);
+        assert.equal(result.errors.length, 1);
+        assert.match(
+            result.errors[0],
+            /example.*coverage\/libs\/example\/coverage-final\.json.*duplicate.*libs\/example\/src\/runtime\.ts.*normalization/
+        );
+    });
+
+    it('rejects a runtime source without usable instrumentation', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath, []),
+            })
+        );
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.equal(result.errors.length, 1);
+        assert.match(result.errors[0], /example/);
+        assert.match(result.errors[0], /libs\/example\/src\/runtime\.ts/);
+        assert.match(result.errors[0], /usable instrumentation/);
+    });
+
+    it('accepts function-only instrumentation for a runtime source', () => {
+        const fixture = makeProjectFixture();
+        writeFileSync(
+            fixture.sourcePath,
+            'export function runtime() {}\n'
+        );
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({
+                [fixture.sourcePath]: functionOnlyCoverageEntry(
+                    fixture.sourcePath
+                ),
+            })
+        );
+
+        const result = validateProjectCoverage(fixture);
+
+        assert.deepEqual(result.errors, []);
+        assert.equal(result.report?.project.name, 'example');
+    });
+
+    it('does not require excluded or type-only TypeScript sources', () => {
+        const fixture = makeProjectFixture();
+        const excludedSources = [
+            'feature.spec.ts',
+            'feature.test.ts',
+            'ambient.d.ts',
+            'test-setup.ts',
+            'test-stubs/runtime.ts',
+            'feature.generated.ts',
+            'environments/environment.ts',
+            'index.ts',
+        ];
+        for (const relativePath of excludedSources) {
+            const filePath = path.join(
+                fixture.workspaceRoot,
+                fixture.project.sourceRoot,
+                relativePath
+            );
+            mkdirSync(path.dirname(filePath), { recursive: true });
+            writeFileSync(filePath, 'export const omitted = true;\n');
+        }
+        writeFileSync(
+            path.join(
+                fixture.workspaceRoot,
+                fixture.project.sourceRoot,
+                'contract.ts'
+            ),
+            'export interface Contract { enabled: boolean }\n'
+        );
+        writeCompleteReport(fixture);
+
+        assert.deepEqual(validateProjectCoverage(fixture).errors, []);
+    });
+
+    it('reports missing, malformed, and non-object project reports', () => {
+        const missing = makeProjectFixture();
+        const malformed = makeProjectFixture();
+        const array = makeProjectFixture();
+        const nullValue = makeProjectFixture();
+        writeFileSync(malformed.reportPath, '{ invalid json');
+        writeFileSync(array.reportPath, '[]');
+        writeFileSync(nullValue.reportPath, 'null');
+
+        assert.match(
+            validateProjectCoverage(missing).errors[0],
+            /example.*did not produce.*coverage\/libs\/example\/coverage-final\.json/
+        );
+        assert.match(
+            validateProjectCoverage(malformed).errors[0],
+            /example.*invalid JSON/
+        );
+        assert.match(
+            validateProjectCoverage(array).errors[0],
+            /example.*JSON object/
+        );
+        assert.match(
+            validateProjectCoverage(nullValue).errors[0],
+            /example.*JSON object/
+        );
+    });
+
+    it('requires every configured report and preserves policy order', () => {
+        const first = makeProjectFixture({
+            name: 'first',
+            projectRoot: 'libs/first',
+        });
+        const missing = makeProjectFixture({
+            name: 'missing',
+            projectRoot: 'libs/missing',
+            workspaceRoot: first.workspaceRoot,
+        });
+        const last = makeProjectFixture({
+            name: 'last',
+            projectRoot: 'libs/last',
+            workspaceRoot: first.workspaceRoot,
+        });
+        writeCompleteReport(first);
+        writeCompleteReport(last);
+
+        const result = validateRequiredProjectReports({
+            projects: [last.project, missing.project, first.project],
+            workspaceRoot: first.workspaceRoot,
+        });
+
+        assert.deepEqual(
+            result.reports.map((report) => report.project.name),
+            ['last', 'first']
+        );
+        assert.equal(result.errors.length, 1);
+        assert.match(result.errors[0], /missing/);
+    });
+});
+
+describe('validateMergedCoverage', () => {
+    it('reports the exact runtime source omitted from an otherwise valid merged map', () => {
+        const included = makeProjectFixture({
+            name: 'included',
+            projectRoot: 'libs/included',
+        });
+        const omitted = makeProjectFixture({
+            name: 'omitted',
+            projectRoot: 'libs/omitted',
+            workspaceRoot: included.workspaceRoot,
+        });
+        writeCompleteReport(included);
+        writeCompleteReport(omitted);
+
+        assert.deepEqual(validateProjectCoverage(included).errors, []);
+        assert.deepEqual(validateProjectCoverage(omitted).errors, []);
+
+        const result = validateMergedCoverage({
+            coverageData: {
+                [included.sourcePath]: coverageEntry(included.sourcePath),
+            },
+            projects: [included.project, omitted.project],
+            reportPath: path.join(
+                included.workspaceRoot,
+                'coverage/merged/coverage-final.json'
+            ),
+            workspaceRoot: included.workspaceRoot,
+        });
+
+        assert.deepEqual(result.errors, [
+            'Merged coverage report coverage/merged/coverage-final.json is missing runtime-owning source libs/omitted/src/runtime.ts from Tier A project omitted.',
+        ]);
+    });
+
+    it('fails completeness when permissive ratchets accept a recomputed summary', () => {
+        const fixture = makeProjectFixture({
+            name: 'm3u-state',
+            projectRoot: 'libs/m3u-state',
+        });
+        const effectsPath = path.join(
+            fixture.workspaceRoot,
+            fixture.project.sourceRoot,
+            'effects.ts'
+        );
+        writeFileSync(
+            effectsPath,
+            'export const effects = () => "runtime";\n'
+        );
+        writeFileSync(
+            fixture.reportPath,
+            JSON.stringify({
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath, [1]),
+                [effectsPath]: coverageEntry(effectsPath, [0]),
+            })
+        );
+        assert.deepEqual(validateProjectCoverage(fixture).errors, []);
+
+        const coverageData = {
+            [fixture.sourcePath]: coverageEntry(fixture.sourcePath, [1]),
+        };
+        const completeness = validateMergedCoverage({
+            coverageData,
+            projects: [fixture.project],
+            reportPath: path.join(
+                fixture.workspaceRoot,
+                'coverage/merged/coverage-final.json'
+            ),
+            workspaceRoot: fixture.workspaceRoot,
+        });
+        const recomputedSummary = completeness.coverageMap
+            .getCoverageSummary()
+            .toJSON();
+
+        assert.deepEqual(
+            evaluateCoverageRatchets({
+                coverageData,
+                mergedSummary: recomputedSummary,
+                ratchet: ratchetWithCriticalFiles([]),
+                workspaceRoot: fixture.workspaceRoot,
+            }),
+            []
+        );
+        assert.deepEqual(completeness.errors, [
+            'Merged coverage report coverage/merged/coverage-final.json is missing runtime-owning source libs/m3u-state/src/effects.ts from Tier A project m3u-state.',
+        ]);
+    });
+
+    it('accepts a complete merged map with normalized relative and absolute paths', () => {
+        const relative = makeProjectFixture({
+            name: 'relative',
+            projectRoot: 'libs/relative',
+        });
+        const absolute = makeProjectFixture({
+            name: 'absolute',
+            projectRoot: 'libs/absolute',
+            workspaceRoot: relative.workspaceRoot,
+        });
+        const relativePath = path.relative(
+            relative.workspaceRoot,
+            relative.sourcePath
+        );
+
+        const result = validateMergedCoverage({
+            coverageData: {
+                [relativePath]: coverageEntry(relativePath),
+                [absolute.sourcePath]: coverageEntry(absolute.sourcePath),
+            },
+            projects: [relative.project, absolute.project],
+            reportPath: path.join(
+                relative.workspaceRoot,
+                'coverage/merged/coverage-final.json'
+            ),
+            workspaceRoot: relative.workspaceRoot,
+        });
+
+        assert.deepEqual(result.errors, []);
+    });
+
+    it('rejects unusable merged instrumentation for a runtime source', () => {
+        const fixture = makeProjectFixture();
+
+        const result = validateMergedCoverage({
+            coverageData: {
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath, []),
+            },
+            projects: [fixture.project],
+            reportPath: path.join(
+                fixture.workspaceRoot,
+                'coverage/merged/coverage-final.json'
+            ),
+            workspaceRoot: fixture.workspaceRoot,
+        });
+
+        assert.deepEqual(result.errors, [
+            'Merged coverage report coverage/merged/coverage-final.json has no usable instrumentation for runtime-owning source libs/example/src/runtime.ts from Tier A project example.',
+        ]);
+    });
+
+    it('rejects duplicate merged paths after normalization', () => {
+        const fixture = makeProjectFixture();
+        const relativePath = path.relative(
+            fixture.workspaceRoot,
+            fixture.sourcePath
+        );
+
+        const result = validateMergedCoverage({
+            coverageData: {
+                [relativePath]: coverageEntry(relativePath),
+                [fixture.sourcePath]: coverageEntry(fixture.sourcePath),
+            },
+            projects: [fixture.project],
+            reportPath: path.join(
+                fixture.workspaceRoot,
+                'coverage/merged/coverage-final.json'
+            ),
+            workspaceRoot: fixture.workspaceRoot,
+        });
+
+        assert.deepEqual(result.errors, [
+            'Merged coverage report coverage/merged/coverage-final.json contains a duplicate entry for libs/example/src/runtime.ts after path normalization.',
+        ]);
+    });
+});
+
+describe('evaluateCoverageRatchets', () => {
+    it('reports all aggregate percentage regressions', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: {
+                statements: { covered: 68, total: 100, pct: 68 },
+                branches: { covered: 57, total: 100, pct: 57 },
+                functions: { covered: 67, total: 100, pct: 67 },
+                lines: { covered: 69, total: 100, pct: 69 },
+            },
+            ratchet: {
+                merged: {
+                    statements: 68.86,
+                    branches: 58.66,
+                    functions: 67.19,
+                    lines: 69.2,
+                },
+                criticalFiles: [],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.deepEqual(errors, [
+            'Merged statements coverage regressed: observed 68%, required at least 68.86%.',
+            'Merged branches coverage regressed: observed 57%, required at least 58.66%.',
+            'Merged functions coverage regressed: observed 67%, required at least 67.19%.',
+            'Merged lines coverage regressed: observed 69%, required at least 69.2%.',
+        ]);
+    });
+
+    it('rejects missing, non-numeric, and out-of-range aggregate minima', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    branches: '58.66',
+                    functions: -1,
+                    lines: 101,
+                },
+                criticalFiles: [],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.equal(errors.length, 4);
+        assert.match(errors[0], /merged\.statements.*undefined/);
+        assert.match(errors[1], /merged\.branches.*"58\.66"/);
+        assert.match(errors[2], /merged\.functions.*-1/);
+        assert.match(errors[3], /merged\.lines.*101/);
+    });
+
+    it('accepts an explicitly empty criticalFiles array', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: ratchetWithCriticalFiles([]),
+            workspaceRoot: '/workspace',
+        });
+
+        assert.deepEqual(errors, []);
+    });
+
+    it('requires an explicit criticalFiles array', () => {
+        const merged = ratchetWithCriticalFiles([]).merged;
+        const ratchets = [
+            { merged },
+            { merged, criticalFiles: null },
+        ];
+
+        for (const ratchet of ratchets) {
+            const errors = evaluateCoverageRatchets({
+                coverageData: {},
+                mergedSummary: fullyCoveredSummary(),
+                ratchet,
+                workspaceRoot: '/workspace',
+            });
+
+            assert.equal(errors.length, 1);
+            assert.match(errors[0], /criticalFiles.*array/);
+        }
+    });
+
+    it('rejects a non-array criticalFiles container without throwing', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: ratchetWithCriticalFiles({}),
+            workspaceRoot: '/workspace',
+        });
+
+        assert.equal(errors.length, 1);
+        assert.match(errors[0], /criticalFiles.*array.*object/);
+    });
+
+    it('requires a non-empty string path for every critical file', () => {
+        for (const invalidPath of [undefined, null, 42, '', '   ']) {
+            const errors = evaluateCoverageRatchets({
+                coverageData: {},
+                mergedSummary: fullyCoveredSummary(),
+                ratchet: ratchetWithCriticalFiles([
+                    {
+                        path: invalidPath,
+                        statements: {
+                            minimumCovered: 0,
+                            minimumPercent: 0,
+                        },
+                    },
+                ]),
+                workspaceRoot: '/workspace',
+            });
+
+            assert.equal(errors.length, 1);
+            assert.match(errors[0], /criticalFiles\[0\]\.path/);
+        }
+    });
+
+    it('rejects invalid critical-file statement minima', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: 'apps/missing-values.ts',
+                        statements: {},
+                    },
+                    {
+                        path: 'apps/string-values.ts',
+                        statements: {
+                            minimumCovered: '2',
+                            minimumPercent: '75',
+                        },
+                    },
+                    {
+                        path: 'apps/out-of-range.ts',
+                        statements: {
+                            minimumCovered: -1,
+                            minimumPercent: 101,
+                        },
+                    },
+                    {
+                        path: 'apps/fractional.ts',
+                        statements: {
+                            minimumCovered: 1.5,
+                            minimumPercent: 75,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.equal(errors.length, 7);
+        assert.match(
+            errors[0],
+            /apps\/missing-values\.ts.*minimumCovered.*undefined/
+        );
+        assert.match(
+            errors[1],
+            /apps\/missing-values\.ts.*minimumPercent.*undefined/
+        );
+        assert.match(
+            errors[2],
+            /apps\/string-values\.ts.*minimumCovered.*"2"/
+        );
+        assert.match(
+            errors[3],
+            /apps\/string-values\.ts.*minimumPercent.*"75"/
+        );
+        assert.match(
+            errors[4],
+            /apps\/out-of-range\.ts.*minimumCovered.*-1/
+        );
+        assert.match(
+            errors[5],
+            /apps\/out-of-range\.ts.*minimumPercent.*101/
+        );
+        assert.match(
+            errors[6],
+            /apps\/fractional\.ts.*minimumCovered.*1\.5/
+        );
+    });
+
+    it('requires both covered statements and percentage for a critical file', () => {
+        const workspaceRoot = '/workspace';
+        const filePath = path.join(workspaceRoot, 'apps/runtime.ts');
+        const errors = evaluateCoverageRatchets({
+            coverageData: {
+                [filePath]: coverageEntry(filePath, [1, 0]),
+            },
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: 'apps/runtime.ts',
+                        statements: {
+                            minimumCovered: 2,
+                            minimumPercent: 75,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot,
+        });
+
+        assert.deepEqual(errors, [
+            'Critical coverage apps/runtime.ts statements covered regressed: observed 1, required at least 2.',
+            'Critical coverage apps/runtime.ts statements percent regressed: observed 50%, required at least 75%.',
+        ]);
+    });
+
+    it('looks up a relative Istanbul key by its normalized critical path', () => {
+        const workspaceRoot = process.cwd();
+        const relativePath = 'apps/runtime.ts';
+        const errors = evaluateCoverageRatchets({
+            coverageData: {
+                [relativePath]: coverageEntry(relativePath, [1, 1]),
+            },
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: relativePath,
+                        statements: {
+                            minimumCovered: 2,
+                            minimumPercent: 100,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot,
+        });
+
+        assert.deepEqual(errors, []);
+    });
+
+    it('rejects duplicate Istanbul keys after path normalization', () => {
+        const workspaceRoot = process.cwd();
+        const relativePath = 'apps/runtime.ts';
+        const absolutePath = path.join(workspaceRoot, relativePath);
+        const errors = evaluateCoverageRatchets({
+            coverageData: {
+                [relativePath]: coverageEntry(relativePath, [1]),
+                [absolutePath]: coverageEntry(absolutePath, [1]),
+            },
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [],
+            },
+            workspaceRoot,
+        });
+
+        assert.equal(errors.length, 1);
+        assert.match(
+            errors[0],
+            /duplicate.*apps\/runtime\.ts.*normalization/
+        );
+    });
+
+    it('reports a critical file missing from merged coverage', () => {
+        const errors = evaluateCoverageRatchets({
+            coverageData: {},
+            mergedSummary: fullyCoveredSummary(),
+            ratchet: {
+                merged: {
+                    statements: 0,
+                    branches: 0,
+                    functions: 0,
+                    lines: 0,
+                },
+                criticalFiles: [
+                    {
+                        path: 'apps/missing.ts',
+                        statements: {
+                            minimumCovered: 1,
+                            minimumPercent: 0,
+                        },
+                    },
+                ],
+            },
+            workspaceRoot: '/workspace',
+        });
+
+        assert.deepEqual(errors, [
+            'Critical coverage apps/missing.ts is missing from merged coverage.',
+        ]);
+    });
+});
diff --git a/tools/coverage/coverage-policy.json b/tools/coverage/coverage-policy.json
index d29c4c0a7..5c3db575a 100644
--- a/tools/coverage/coverage-policy.json
+++ b/tools/coverage/coverage-policy.json
@@ -3,7 +3,45 @@
     "reporting": {
         "mergedCoverageDir": "coverage/merged",
         "e2eSummaryDir": "coverage/e2e",
-        "unitCodecovFlag": "unit"
+        "unitCodecovFlag": "unit",
+        "coverageRatchet": {
+            "merged": {
+                "statements": 69.54,
+                "branches": 59.07,
+                "functions": 67.44,
+                "lines": 69.85
+            },
+            "criticalFiles": [
+                {
+                    "path": "apps/electron-backend/src/app/server/http-server.ts",
+                    "statements": {
+                        "minimumCovered": 83,
+                        "minimumPercent": 90.21
+                    }
+                },
+                {
+                    "path": "apps/electron-backend/src/app/events/remote-control.events.ts",
+                    "statements": {
+                        "minimumCovered": 112,
+                        "minimumPercent": 96.55
+                    }
+                },
+                {
+                    "path": "apps/electron-backend/src/app/events/settings.events.ts",
+                    "statements": {
+                        "minimumCovered": 26,
+                        "minimumPercent": 96.29
+                    }
+                },
+                {
+                    "path": "apps/electron-backend/src/app/events/database/downloads.events.ts",
+                    "statements": {
+                        "minimumCovered": 86,
+                        "minimumPercent": 58.5
+                    }
+                }
+            ]
+        }
     },
     "unitCoverage": {
         "description": "Tier A projects collect and trend source coverage. Tier B projects are validated without percentage coverage. Tier C projects are excluded from the source coverage baseline.",
@@ -149,6 +187,13 @@
                 "validationCommand": "pnpm nx test shared-interfaces",
                 "e2eTags": ["@m3u", "@xtream", "@stalker"]
             },
+            {
+                "name": "shared-logging",
+                "root": "libs/shared/logging",
+                "sourceRoot": "libs/shared/logging/src",
+                "validationCommand": "pnpm nx test shared-logging",
+                "e2eTags": ["@electron", "@xtream", "@stalker", "@settings"]
+            },
             {
                 "name": "m3u-utils",
                 "root": "libs/shared/m3u-utils",
@@ -226,6 +271,18 @@
                 "validationCommand": "pnpm nx test packaging",
                 "reason": "Node package identity checks validate generated packaging metadata."
             },
+            {
+                "name": "release-tools",
+                "root": "tools/release",
+                "validationCommand": "pnpm nx test release-tools",
+                "reason": "Node tests validate release-note parsing, rendering and gate policy; the scripts are release tooling, not shipped source."
+            },
+            {
+                "name": "shared-marketing-fixtures",
+                "root": "libs/shared/marketing-fixtures",
+                "validationCommand": "pnpm nx test shared-marketing-fixtures",
+                "reason": "Screenshot-safe fictional poster catalog shared by both mock servers; the spec asserts catalog order and shape, and percentage coverage over fixture data would not mean anything."
+            },
             {
                 "name": "remote-control-web",
                 "root": "apps/remote-control-web",
diff --git a/tools/coverage/merge-coverage.mjs b/tools/coverage/merge-coverage.mjs
index 36b006dfb..901907005 100644
--- a/tools/coverage/merge-coverage.mjs
+++ b/tools/coverage/merge-coverage.mjs
@@ -2,7 +2,6 @@
 
 import { createRequire } from 'node:module';
 import {
-    existsSync,
     mkdirSync,
     readFileSync,
     rmSync,
@@ -11,6 +10,8 @@ import {
 import path from 'node:path';
 import process from 'node:process';
 
+import { validateRequiredProjectReports } from './coverage-integrity.mjs';
+
 const require = createRequire(import.meta.url);
 const { createCoverageMap } = require('istanbul-lib-coverage');
 const libReport = require('istanbul-lib-report');
@@ -22,11 +23,20 @@ const policy = JSON.parse(
 );
 const outputDir = path.join(workspaceRoot, policy.reporting.mergedCoverageDir);
 
-const coverageFiles = policy.unitCoverage.tierA
-    .map((project) => path.join(workspaceRoot, 'coverage', project.root, 'coverage-final.json'))
-    .filter((coverageFile) => existsSync(coverageFile));
+const validation = validateRequiredProjectReports({
+    projects: policy.unitCoverage.tierA,
+    workspaceRoot,
+});
 
-if (coverageFiles.length === 0) {
+if (validation.errors.length > 0) {
+    for (const error of validation.errors) {
+        console.error(`Error: ${error}`);
+    }
+    process.exit(1);
+}
+
+const coverageInputs = validation.reports;
+if (coverageInputs.length === 0) {
     console.error('No Tier A coverage-final.json files found under coverage/.');
     process.exit(1);
 }
@@ -36,9 +46,8 @@ mkdirSync(outputDir, { recursive: true });
 
 const coverageMap = createCoverageMap({});
 
-for (const coverageFile of coverageFiles) {
-    const data = JSON.parse(readFileSync(coverageFile, 'utf8'));
-    coverageMap.merge(data);
+for (const input of coverageInputs) {
+    coverageMap.merge(input.data);
 }
 
 const context = libReport.createContext({
@@ -56,7 +65,7 @@ writeFileSync(
     `${JSON.stringify(summary, null, 4)}\n`
 );
 
-console.log(`Merged ${coverageFiles.length} coverage files into ${policy.reporting.mergedCoverageDir}`);
+console.log(`Merged ${coverageInputs.length} coverage files into ${policy.reporting.mergedCoverageDir}`);
 console.log(
     `Statements: ${summary.statements.pct}% | Branches: ${summary.branches.pct}% | Functions: ${summary.functions.pct}% | Lines: ${summary.lines.pct}%`
 );
diff --git a/tools/coverage/run-tier-a-coverage.mjs b/tools/coverage/run-tier-a-coverage.mjs
index ecf553363..c9dda4974 100644
--- a/tools/coverage/run-tier-a-coverage.mjs
+++ b/tools/coverage/run-tier-a-coverage.mjs
@@ -1,10 +1,15 @@
 #!/usr/bin/env node
 
-import { spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
 
+import {
+    createCoverageOutputScanner,
+    validateProjectCoverage,
+} from './coverage-integrity.mjs';
+
 const workspaceRoot = process.cwd();
 const policyPath = path.join(workspaceRoot, 'tools/coverage/coverage-policy.json');
 const policy = JSON.parse(readFileSync(policyPath, 'utf8'));
@@ -120,6 +125,64 @@ function buildNxArgs(project) {
     );
 }
 
+function spawnCoverage(args, scanner) {
+    return new Promise((resolve, reject) => {
+        const child = spawn('pnpm', args, {
+            cwd: workspaceRoot,
+            env: {
+                ...process.env,
+                CI: process.env.CI ?? 'true',
+                NX_TASKS_RUNNER_DYNAMIC_OUTPUT: 'false',
+            },
+            stdio: ['inherit', 'pipe', 'pipe'],
+        });
+
+        child.stdout.on('data', (chunk) => {
+            scanner.push(chunk);
+            process.stdout.write(chunk);
+        });
+        child.stderr.on('data', (chunk) => {
+            scanner.push(chunk);
+            process.stderr.write(chunk);
+        });
+        child.once('error', reject);
+        child.once('close', (code, signal) => {
+            resolve({ code, signal });
+        });
+    });
+}
+
+async function collectProjectCoverage(project) {
+    const args = buildNxArgs(project);
+    console.log(`\n==> Collecting coverage for ${project.name}`);
+    console.log(`pnpm ${args.join(' ')}`);
+
+    const scanner = createCoverageOutputScanner();
+    const result = await spawnCoverage(args, scanner);
+    let failed = result.code !== 0 || result.signal !== null;
+
+    if (scanner.collectionFailed) {
+        console.error(
+            `Coverage collection failed while testing ${project.name}.`
+        );
+        failed = true;
+    }
+
+    if (failed) {
+        return result.code && result.code !== 0 ? result.code : 1;
+    }
+
+    const validation = validateProjectCoverage({
+        project,
+        workspaceRoot,
+    });
+    for (const error of validation.errors) {
+        console.error(`Error: ${error}`);
+    }
+
+    return validation.errors.length === 0 ? 0 : 1;
+}
+
 for (const project of tierAProjects) {
     const coverageDir = path.join(workspaceRoot, 'coverage', project.root);
     rmSync(coverageDir, { recursive: true, force: true });
@@ -136,21 +199,8 @@ if (requestedProjects.size === 0) {
 }
 
 for (const project of tierAProjects) {
-    const args = buildNxArgs(project);
-    console.log(`\n==> Collecting coverage for ${project.name}`);
-    console.log(`pnpm ${args.join(' ')}`);
-
-    const result = spawnSync('pnpm', args, {
-        cwd: workspaceRoot,
-        env: {
-            ...process.env,
-            CI: process.env.CI ?? 'true',
-            NX_TASKS_RUNNER_DYNAMIC_OUTPUT: 'false',
-        },
-        stdio: 'inherit',
-    });
-
-    if (result.status !== 0) {
-        process.exit(result.status ?? 1);
+    const status = await collectProjectCoverage(project);
+    if (status !== 0) {
+        process.exit(status);
     }
 }
diff --git a/tools/embedded-mpv/README.md b/tools/embedded-mpv/README.md
index 3e5b74dad..ccbd1b39b 100644
--- a/tools/embedded-mpv/README.md
+++ b/tools/embedded-mpv/README.md
@@ -1,21 +1,33 @@
 # Embedded MPV Runtime
 
-This folder contains tooling for preparing MPV runtime/build inputs for IPTVnator's experimental embedded MPV player. macOS and Windows bundle `libmpv`; Linux uses staged MPV headers for compilation and launches the system `mpv` executable at runtime.
+This directory owns the source builders, staging, manifests, and archive
+helpers for IPTVnator's experimental Embedded MPV runtime.
+
+The Linux architecture has a strict process boundary:
+
+- Electron, `embedded_mpv.node`, and `embedded_mpv_frame_reader.node` must not
+  load or link libmpv.
+- Native-view starts a separate system `mpv --wid` process.
+- Frame-copy starts `iptvnator_mpv_helper`; only that helper may link libmpv.
+
+Do not weaken this boundary to simplify packaging. A missing helper/runtime
+must make frame-copy unavailable and leave native-view as the safe x64
+fallback.
 
 ## Runtime Policy
 
-Release builds must use an LGPL-compatible runtime:
+Release builds use an LGPL-compatible, dynamically linked runtime:
 
-- FFmpeg must be built without `--enable-gpl` and without `--enable-nonfree`.
-- mpv must be built with `-Dlibmpv=true` and `-Dgpl=false`.
-- The runtime must be dynamically linked so users can inspect and replace LGPL libraries.
-- The exact source URLs, versions, build flags, local patches, and checksums must be published with the release.
+- FFmpeg is built without `--enable-gpl` and `--enable-nonfree`.
+- mpv is built with `-Dlibmpv=true` and `-Dgpl=false`.
+- Bundled libraries remain individually replaceable under `native/lib`.
+- Exact source URLs, versions, checksums or git commits, submodules, licenses,
+  build flags, local patches, and build scripts are published with the release.
 
-Do not ship the Homebrew `mpv` runtime. It is acceptable only for local development when `IPTVNATOR_EMBEDDED_MPV_ALLOW_HOMEBREW=1` is set, and release packaging rejects it.
+Homebrew mpv is local-development-only. It requires
+`IPTVNATOR_EMBEDDED_MPV_ALLOW_HOMEBREW=1`, and release validation rejects it.
 
-## Expected Layout
-
-The native addon build consumes:
+## Generated Layout
 
 ```text
 vendor/embedded-mpv/
@@ -29,123 +41,352 @@ vendor/embedded-mpv/
     runtime-manifest.json
   win32-x64/
     include/mpv/client.h
-    lib/libmpv-2.dll # or mpv-2.dll/mpv.dll/libmpv.dll
-    lib/libmpv.dll.a # or mpv.lib/mpv-2.lib
+    lib/libmpv-2.dll        # accepted basename variants are preserved
+    lib/libmpv.dll.a        # or an MSVC import library
     runtime-manifest.json
   linux-x64/
     include/mpv/client.h
+    lib/libmpv.so
+    lib/libmpv.so.2
+    lib/<declared closure>
+    notices/embedded-mpv-notices.json
+    notices/THIRD_PARTY_NOTICES.txt
+    notices/licenses/<package>/<upstream path>
     runtime-manifest.json
 ```
 
-The generated `lib/` and `include/` directories are release inputs, not source files. They are ignored by git by default.
+These directories are generated release inputs and are ignored by git.
+`runtime-manifest.json` is the profile-neutral source/build manifest. Packaging
+writes a normalized `embedded-mpv-runtime.json` beside the native artifacts.
+Bundled Linux profiles flatten the three notice entries from `notices/` into
+that same native directory; system and marker-only profiles remove them.
 
-## Staging A Built Runtime
+## Building And Staging
 
-After building an LGPL-compatible prefix for one platform/architecture, stage it with:
+Stage an existing compatible prefix with:
 
 ```bash
-pnpm embedded-mpv:stage-runtime -- darwin arm64 /path/to/lgpl-prefix
-pnpm embedded-mpv:stage-runtime -- darwin x64 /path/to/lgpl-prefix
-pnpm embedded-mpv:stage-runtime -- win32 x64 /path/to/lgpl-prefix
-pnpm embedded-mpv:stage-runtime -- linux x64 /path/to/lgpl-prefix
+pnpm embedded-mpv:stage-runtime -- darwin arm64 /path/to/prefix
+pnpm embedded-mpv:stage-runtime -- darwin x64 /path/to/prefix
+pnpm embedded-mpv:stage-runtime -- win32 x64 /path/to/prefix
+pnpm embedded-mpv:stage-runtime -- linux x64 /path/to/prefix
 ```
 
-For compatibility, the legacy macOS-only staging command is still available:
+Build the pinned macOS or Linux source runtime first when no prefix exists:
 
 ```bash
-pnpm embedded-mpv:stage-runtime:macos -- arm64 /path/to/lgpl-prefix
-pnpm embedded-mpv:stage-runtime:macos -- x64 /path/to/lgpl-prefix
+pnpm embedded-mpv:build-runtime -- arm64 /tmp/macos-prefix
+pnpm embedded-mpv:stage-runtime -- darwin arm64 /tmp/macos-prefix
+
+pnpm embedded-mpv:build-runtime:linux -- /tmp/linux-prefix
+pnpm embedded-mpv:stage-runtime -- linux x64 /tmp/linux-prefix
 ```
 
-The prefix must contain `include/mpv/client.h` and the platform runtime/build files:
+The Linux builder runs only on Linux x64. It requires the tool versions and
+system development interfaces declared in `build-linux-runtime.cjs`, including
+Meson 1.6 or newer, gperf 3.1 or newer, Ninja, CMake, NASM, pkg-config,
+patchelf, and `readelf`.
+It builds into an owned staging directory and publishes atomically, so it will
+not delete or overwrite an arbitrary destination.
 
-- macOS: `lib/libmpv.2.dylib` or `lib/libmpv.dylib` plus all non-system dylib dependencies
-- Windows: `lib/mpv.lib`, `lib/mpv-2.lib`, or `libmpv.dll.a`, and `bin/` or `lib/` containing `mpv-2.dll`, `libmpv-2.dll`, `mpv.dll`, or `libmpv.dll`
-- Linux: `include/mpv/client.h`; CI also records the `libmpv-dev` and `mpv` package versions used as build inputs. Linux runtime playback uses the system `mpv` executable and does not bundle `libmpv.so`.
+The pinned Linux source stack currently includes FFmpeg 8.1, mpv 0.41.0,
+libplacebo 7.360.1, libass 0.17.3, FreeType 2.13.3, FriBidi 1.0.16,
+HarfBuzz 8.5.0, Expat 2.8.2, Fontconfig 2.16.0, OpenSSL 3.5.7, hwdata
+0.409, and libdisplay-info 0.1.1. The builder stages a private pinned
+`pnp.ids`/`hwdata.pc`; libdisplay-info is not allowed to consume the build
+host's `/usr/share/hwdata`.
 
-If the prefix contains `runtime-manifest.json`, the staging script copies its build metadata into the vendored manifest. At minimum, record:
+Before publication, the Linux builder verifies:
 
-- FFmpeg version, source URL, checksum, configure flags, and patches
-- mpv version, source URL, checksum, Meson flags, and patches
-- source-distribution URL for the corresponding release
+- every archive digest and git/submodule commit;
+- the exact FFmpeg/mpv flags and LGPL policy;
+- an exact `libmpv.so.2` SONAME and complete reachable shared-library closure;
+- `$ORIGIN` RUNPATHs with no build-prefix paths or undeclared host fallback;
+- the external system-library allowlist;
+- `GLIBC_2.35` and `GLIBCXX_3.4.30` ABI ceilings;
+- file hashes, byte sizes, build inputs, licenses, and source obligations.
 
-## Building The CI Runtime
+## Linux Package Profiles
 
-Tagged macOS release builds build the runtime from pinned source archives before `electron-backend:build`. The workflow can also enable this path temporarily for macOS PR artifact testing:
+Set one exact `IPTVNATOR_LINUX_FRAME_COPY_PROFILE` per packaging pass:
 
-```bash
-pnpm embedded-mpv:build-runtime -- arm64 /tmp/embedded-mpv-prefix
-pnpm embedded-mpv:stage-runtime -- darwin arm64 /tmp/embedded-mpv-prefix
-```
+| Profile    | Formats          | Runtime handling                                                             |
+| ---------- | ---------------- | ---------------------------------------------------------------------------- |
+| `system`   | DEB, RPM, Pacman | Remove `native/lib`; require the format-specific system runtime listed below |
+| `portable` | AppImage, Snap   | Retain the pinned LGPL closure under `native/lib`                            |
+| `flatpak`  | Flatpak          | Retain the same pinned LGPL closure under `native/lib`                       |
 
-Linux CI does not build libmpv from source. It installs Ubuntu runner packages
-(`libmpv-dev` and `mpv`), stages their headers and build metadata under
-`vendor/embedded-mpv/linux-x64/`, and requires the native addon/package layout
-to be present. Linux playback does not load or bundle `libmpv` in the Electron
-process; the addon creates an X11 child window and starts a system `mpv --wid`
-process at runtime.
+The system helper directly links libmpv, EGL, GL, and GBM. Package metadata
+therefore declares the full interface set:
 
-Windows CI does not build libmpv from source. It restores an exact-keyed cache
-for `vendor/embedded-mpv/win32-x64/`; on cache miss it stages a checksum-pinned
-LGPL-compatible archive from repository configuration:
+- DEB: `libmpv2`, `libegl1`, `libgl1`, `libgbm1`
+- RPM: `mpv-libs`, `libglvnd-egl`, `libglvnd-glx`, `mesa-libgbm`
+- Pacman: `mpv`, `libglvnd`, `mesa`
 
-```text
-IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_URL
-IPTVNATOR_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256
-```
+The helper links `libGL.so.1` (`-lGL`) rather than `libOpenGL.so.0`; the
+former is the direct GL interface supplied by all three system contracts and
+Snap's `mesa-core22`.
 
-The values can be repository variables or secrets. Prefer variables when PR
-artifact builds from same-repository branches should include Embedded MPV. For
-non-tag artifact builds only, the workflow falls back to a checksum-pinned
-`zhongfly/mpv-winbuild` `mpv-dev-lgpl-x86_64` archive when those variables are
-unset. Tagged release builds must provide the repository configuration
-explicitly.
+The DEB metadata is release-tested on Ubuntu 24.04 (Noble). Ubuntu 22.04
+(Jammy) only provides `libmpv1`; use the x64 AppImage on that distribution
+rather than relaxing the runtime contract. CI explicitly installs the distro
+Mesa software renderer for headless smoke. IPTVnator does not add DRI-driver
+packages as direct dependencies; any transitive graphics-driver stack remains
+under the distro's dependency policy.
 
-The Windows job is pinned to `windows-2022` while the current Electron
-`node-gyp` toolchain cannot identify Visual Studio 18 from `windows-latest`.
+The Snap is `base: core22` with strict confinement. It retains Electron
+Builder's default plugs and adds an auto-connected private `shared-memory`
+plug plus `graphics-core22`, targeting a real empty mode-0755 `$SNAP/graphics`
+with external `mesa-core22` as default provider. The graphics provider supplies
+EGL/GL/GLX/GBM/DRM/VA, while Electron Builder's exact GNOME content runtime
+supplies ALSA/PulseAudio. Neither provider is bundled into IPTVnator's Snap,
+source archive, notices, or package-size accounting. The package hook creates
+the empty content target because core22 does not synthesize one; the extracted
+artifact verifier rejects a missing, redirected, non-empty, or wrongly
+permissioned target. Snap metadata must also contain exactly the canonical
+graphics-provider layouts: bind `/usr/share/libdrm` from
+`$SNAP/graphics/libdrm`, and symlink `/usr/share/drirc.d` to
+`$SNAP/graphics/drirc.d`.
 
-The archive must contain a Windows x64 prefix with `include/mpv/client.h`, a
-libmpv import library, and `mpv-2.dll`/`mpv.dll` or
-`libmpv-2.dll`/`libmpv.dll`. The archive can use either the normal prefix layout
-(`lib/` and `bin/`) or the common `mpv-dev-lgpl` flat layout with the import
-library and DLL in the archive root. The staged runtime preserves the DLL
-basename from the archive because Windows import libraries encode the DLL name
-that `embedded_mpv.node` must load at runtime. If
-`runtime-manifest.json` is missing, CI generates a minimal manifest from the
-archive URL/path and checksum; release-ready runtime archives should still
-provide full source/build metadata.
+The bounded probe and every playback helper share one sanitized loader
+environment derived from the validated, cached runtime mode. Ambient
+ELF audit/preload/origin/library overrides, direct EGL/GBM/GL/VA/Vulkan paths,
+shell startup/options, tracing hooks, exported Bash functions, and
+caller-provided architecture triplets are removed or replaced. The
+extracted-artifact verifier uses the same deny-set for its direct helper smoke
+and preserves feature/debug selectors such as `LIBGL_ALWAYS_SOFTWARE`. System
+packages then use the default loader; bundled packages put their validated
+`native/lib` first. Packaged addon/helper lookup is package-owned
+`app.asar.unpacked` only; cwd/dist candidates are development-only.
+AppImage and Flatpak use normal host/sandbox lookup for the declared external
+interfaces. Inside the exact packaged Flatpak `/app` context, the helper
+reconstructs only Freedesktop Platform 24.08's immutable
+`__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS` value; the GL extension's
+`add-ld-path` remains available through the sandbox loader cache. Flatpak CI
+therefore invokes `flatpak run com.fourgray.iptvnator
+--embedded-mpv-runtime-probe` instead of executing the helper around the
+application gate. In a genuine Snap mount, filtered `SNAP_LIBRARY_PATH` GL roots
+under `/var/lib/snapd/lib/gl` come next, then the fixed x64
+`$SNAP/graphics` roots, then the core22 base
+`/usr/lib/x86_64-linux-gnu`, exact `$SNAP/gnome-platform` graphics/audio roots,
+and finally generic `$SNAP` library roots. Keeping the base ABI ahead of the
+older GNOME content runtime prevents its `libedit.so.2` from injecting an
+unavailable `libtinfo.so.5` dependency into mesa-core22's software renderer.
+The helper rebuilds GBM, GL/VA driver, EGL vendor/platform, and Vulkan layer
+variables from those trusted locations. A Linux session without the validated
+cached mode is rejected before spawn.
+Both the bounded probe and playback execute through
+`$SNAP/graphics/bin/graphics-core22-provider-wrapper`. The graphics mount must
+be a real directory and the wrapper a regular, non-symlinked, readable
+executable. Otherwise the gate returns the stable
+`snap-graphics-provider-unavailable` reason before spawning the helper. The
+wrapper child also drops shell startup/options, tracing hooks, and exported
+`BASH_FUNC_*` functions, and uses a fixed core22 system `PATH`; ambient Bash
+configuration therefore cannot replace the probe before helper execution.
 
-During temporary PR and `master` artifact testing, CI restores an exact-keyed GitHub Actions cache for the staged `vendor/embedded-mpv/<platform>-<arch>/` runtime before falling back to the macOS source build or Windows runtime archive where available. The cache key includes the target platform, architecture, macOS deployment target, Xcode version when available, a hash of the Windows runtime checksum when applicable, and hashes of the runtime build/staging scripts. Cache entries are saved only from trusted repository refs and are treated strictly as a speed optimization; tagged macOS release builds continue to rebuild from pinned sources unless a future signed and attested runtime artifact flow is introduced.
+Installed-Snap CI disconnects `graphics-core22`, requires the application-level
+diagnostic to emit `snap-graphics-provider-unavailable` and exit with the
+controlled status `1`, then reconnects the provider and requires a successful
+diagnostic. This keeps the canonical layouts and missing-provider fallback in
+the same regression contract.
 
-The builder currently pins:
+Flatpak is an isolated packaging pass and keeps `iptvnator` as the real
+Electron ELF so Electron Builder's `electron-wrapper` passes it directly to
+Zypak. Other Linux targets retain the conditional `iptvnator` wrapper and
+`iptvnator.bin`. Mixed Flatpak/non-Flatpak target sets fail before mutation. A
+missing or unsupported profile, or a target from another profile, fails
+packaging.
 
-- FFmpeg `8.1`, configured without `--enable-gpl` or `--enable-nonfree`, and with autodetected external libraries disabled
-- mpv `0.41.0`, configured with `-Dlibmpv=true -Dgpl=false`
-- libplacebo `7.360.1`, checked out from git with the `glad`, Python template, `fast_float`, and `Vulkan-Headers` submodules required by its Meson build
-- libass `0.17.3` plus FreeType, FriBidi, and HarfBuzz
-
-The build manifest records source URLs, downloaded archive SHA-256 values where applicable, libplacebo git commit/submodule metadata, and the exact FFmpeg/mpv flags. The staged macOS/Windows manifest is normalized to `origin: vendored-lgpl`, which is the only embedded MPV runtime origin allowed in required macOS/Windows release packaging.
+Linux frame-copy release artifacts are x64-only. Non-x64 packages are always
+marker-only even if environment variables point at the x64 staged runtime.
 
 ## Build Integration
 
-`apps/electron-backend/build-embedded-mpv.js` builds the native addon against the staged runtime/build inputs, copies macOS/Windows runtime libraries into `apps/electron-backend/native/build/Release/lib/`, rewrites macOS Mach-O paths to `@loader_path`, and writes `embedded-mpv-runtime.json`. Linux builds use the staged MPV headers and system X11 development libraries, write an `external-mpv-process` manifest, and must not copy or link directly to `libmpv`; CI validates this with package checks and `ldd`.
+`apps/electron-backend/build-embedded-mpv.js` builds the addon, frame reader,
+and helper against the staged inputs. On Linux it links the helper to the
+verified staged libmpv path rather than a generic host `-lmpv`, then checks
+with `readelf` that:
 
-For local macOS development with Homebrew `mpv`, use:
+- the helper has exactly the declared libmpv `DT_NEEDED`;
+- the helper RUNPATH is `$ORIGIN/lib`;
+- the addon and frame reader have no libmpv dependency;
+- no runtime dependency contains an absolute/build-prefix loader path.
+
+The package hook copies native artifacts into
+`app.asar.unpacked/electron-backend/native/`, selects the system or bundled
+layout, restores exact file modes, writes the packaged manifest, and validates
+the bundled legal payload. AppImage, Snap, and Flatpak receive
+`embedded-mpv-notices.json`, `THIRD_PARTY_NOTICES.txt`, and
+`licenses/<package>/**`; DEB, RPM, Pacman, and marker-only packages must not
+retain them. Package validation also scans the Electron executable and all
+shipped Electron libraries for a direct libmpv dependency. Before target
+packaging, that scan is recursive over the pristine Electron tree. After Snap
+has merged its template runtime into the payload root, the post-target scan
+excludes exactly its package-manager `lib/**` and `usr/lib/**` trees while
+remaining recursive everywhere else.
+
+At startup, Linux x64 frame-copy is advertised only after the main process
+validates that manifest/files and successfully executes:
+
+```bash
+iptvnator_mpv_helper --runtime-probe
+```
+
+The bounded probe initializes idle libmpv plus EGL/OpenGL and mpv render
+contexts, then creates, maps, validates, and destroys a minimal `16x16`
+shared-memory ring named `/impv-fc-runtime-probe-<pid>`. It does not open media
+or enter media/command loops. A timeout, loader failure, malformed protocol,
+missing file, hash mismatch, unusable graphics path, or shm lifecycle failure
+returns a stable reason and keeps the BrowserWindow sandbox enabled. The
+application diagnostic retains `helper-probe-failed` as the top-level reason
+for nonzero helper exits and adds `helperReason` only when the helper emitted
+one exact protocol-v1 line with a fixed allowlisted reason. Its optional
+`helperDetail` is restricted to 1–1024 printable ASCII characters; invalid
+detail suppresses both helper fields. Every probe has the same explicit 16 MiB
+aggregate captured-output ceiling, regardless of tracing. With
+`IPTVNATOR_TRACE_PLAYER=1`, non-empty captured helper stderr is written
+separately as one JSON-escaped stderr line: its `stderr` field contains at most
+the first 16,384 characters and its `truncated` boolean is always explicit.
+Empty captures, disabled tracing, and trace-writer failures do not emit a
+record or alter availability. The installed-Snap probe therefore tests the
+private shared-memory confinement
+needed by playback rather than only loader and graphics startup.
+Packaging CI invokes the same gate through
+`snap run iptvnator --embedded-mpv-runtime-probe`. This packaging-only
+application switch runs before BrowserWindow startup, emits one availability
+JSON line, and returns zero only for a usable runtime; it never directly loads
+libmpv in Electron. The installed-Snap smoke adds `EGL_LOG_LEVEL=debug` and
+`LIBGL_DEBUG=verbose` under that bounded trace channel to expose GLVND/Mesa
+loader failures without weakening the hostile-environment gate.
+
+Electron Builder excludes `electron-backend/native{,/**/*}` from `app.asar`.
+Only `afterPack` writes the profile-normalized
+`app.asar.unpacked/electron-backend/native` tree. Layout and final-artifact
+verification enumerate `app.asar` and reject any stale native entry, preventing
+hidden x64 helpers, bundled libraries, or notices in system and marker-only
+packages.
+
+## CI And Source Distribution
+
+Linux CI builds or restores the pinned source runtime once, then packages and
+verifies `system`, `portable`, and `flatpak` independently. Every artifact is
+extracted for manifest, mode, package-metadata, ELF-isolation, and helper-probe
+checks. System formats are probed after their declared dependency is installed;
+Snap and Flatpak also require a sandboxed probe where the runner supports it.
+For a locally installed `--dangerous` Snap, CI explicitly installs and
+connects `mesa-core22` and `gnome-3-28-1804`, verifies both connections, and
+then runs the application-level diagnostic under Xvfb.
+The Linux packaging matrix alone depends on the runtime-builder job. macOS and
+Windows use an independent matrix, while both matrices share the same anchored
+step list; draft release assembly remains atomic and requires both matrices.
+
+The Linux runtime cache contains only staged headers/libraries/manifest plus
+immutable source inputs: exact downloaded archives (including hwdata), a clean
+recursive libplacebo checkout, and collected license files. It never caches
+finished notices or the compliance tarball. After either a build or cache hit,
+CI revalidates those inputs, regenerates `vendor/embedded-mpv/linux-x64/notices`
+for the current runtime manifest, and creates
+`linux-frame-copy-runtime-sources.tar.xz` for the current repository
+revision/diff. Before archiving, the clean cached libplacebo checkout is
+converted into a non-dereferenced working-tree snapshot with every `.git`
+entry removed; the validated main/submodule commits remain in the source
+index.
+
+That source-compliance archive uses normalized tar metadata and contains the
+exact unique archive hash set, VCS-free libplacebo sources and the exact pinned
+six recursive submodule records, license inputs, generated notices,
+runtime/source index metadata, and the builder, stager, manifest,
+notice-generator, and source-snapshot code.
+Submodule identity is canonicalized as `full-commit safe/path`; optional
+clone-depth-dependent `git describe` annotations are discarded.
+The source index carries a globally sorted inventory of every libplacebo
+directory, file, and symlink. Regular-file hashes, sizes, normalized executable
+bits, exact safe link targets, aggregate counts/bytes, and the canonical
+inventory digest are checked against the trusted pinned v7.360.1 checkout. The
+tar has an exact member/type layout, and `metadata/archive-sha256.txt` is
+checked against the actual source archive bytes. Listing continues past every
+tar end marker so concatenated xz streams cannot hide undeclared members.
+The notice generator rejects missing, undeclared, symlinked, size-mismatched,
+or hash-mismatched license files.
+
+Once CI creates the final `linux-frame-copy-runtime-sources.tar.xz`, it writes
+`source-archive-binding.json` beside the staged runtime with the archive's
+SHA-256 and repository revision. Bundled x64 AppImage, Snap, and Flatpak
+manifests copy that exact object as `sourceArchive`; system packages and
+marker-only non-x64 packages omit it.
+
+The packaged x64 Playwright smoke depends on its fixture-contract target and
+passes Chromium `--ignore-gpu-blocklist` so Mesa llvmpipe can provide WebGL2 in
+CI. This affects only Chromium's software-renderer admission; the manifest,
+hash, loader, and helper probes still fail closed, and `--no-sandbox` remains
+root-only.
+
+Snap publication is a separate `release.published` workflow for public `v*`
+GitHub releases. It verifies that the public release already contains at least
+one Snap and exactly one non-empty
+`linux-frame-copy-runtime-sources.tar.xz` before uploading anything. The
+release verifier hashes the downloaded archive, checks its clean released
+revision, exact member/type layout and safe link targets, source checksum
+metadata, source index, actual pinned source-member hashes, six recursive
+libplacebo submodule records, legal payload, exact trusted libplacebo tree
+inventory/digest, released tooling, and runtime manifest. Checkout and both
+artifact-transfer actions use full pinned commits, and checkout does not
+persist its repository credential. The verifier bounds
+source members, the archive, SquashFS listing, extracted size, entry count,
+command time, and job time; every Snap must use the canonical
+`/usr/lib/iptvnator` layout and pass the existing static package validator.
+The public-release boundary also reapplies the exact strict
+`meta/snap.yaml` graphics/shared-memory/layout contract and enumerates the
+extracted `resources/app.asar`, rejecting any archived
+`electron-backend/native/**` payload. Its bounded ASAR header reader depends
+only on Node built-ins and released local tooling, so verification remains
+runnable in the clean tag checkout without `node_modules`.
+Exactly one x64 Snap is accepted, and only when its exact `sourceArchive` and
+`sourceRuntime` match the downloaded archive; any non-x64 Snap must be
+marker-only. A secretless job copies each asset through a no-follow descriptor,
+checks hashes before and after inspection, writes an exact receipt, fully
+reverifies a root-owned read-only snapshot, and transfers only that data
+through the pinned artifact service while publishing the exact receipt digest
+separately as a job output.
+
+The dependent publish job runs on a bounded GitHub-hosted `ubuntu-latest`
+runner with no checkout or release-tag code. It verifies that separate digest,
+the exact receipt schema, every asset size/hash, and the expected regular-file
+layout, rejects links and extras, root-seals the transferred data again, and
+installs the official stable Snapcraft snap. Only its final fixed shell step
+receives the Store credential; it executes no released code, resolves no PATH
+command, and passes the credential only to each exact
+`/snap/bin/snapcraft upload --release=edge` process. GitHub credentials remain
+scoped to asset selection/download. Candidate/stable
+promotion is manual after installed-Snap frame-copy and missing-runtime
+fallback smoke; GitHub Actions never promotes automatically.
+
+Windows CI stages a checksum-pinned x64 LGPL archive. The DLL basename encoded
+in its import library is preserved and must be present beside
+`iptvnator_mpv_helper.exe`. Tagged releases require explicit repository
+configuration; the public fallback is for non-tag artifacts only. The upstream
+keeps only its latest 30 daily builds, so the fallback URL and checksum plus any
+matching repository variables must be refreshed as one pair before they age
+out. A permanent mirror must publish the corresponding source/build records and
+license notices with the binary.
+
+## Local Development
+
+Linux can use distribution development packages for an unshipped local build
+(`libmpv-dev`, EGL/GL/GBM development files, and X11 headers). Overrides:
+`LIBMPV_INCLUDE_DIR` selects the header root. `LINUX_NATIVE_LIBRARY_DIR`
+selects a link-time library directory that must already be visible to the
+system dynamic loader; it is not inherited as a helper `LD_LIBRARY_PATH`.
+Required/release package builds must use the pinned staged runtime and manifest.
+
+On macOS:
 
 ```bash
 pnpm run serve:backend:embedded-mpv
 ```
 
-The script rebuilds the native addon with `IPTVNATOR_EMBEDDED_MPV_ALLOW_HOMEBREW=1` before starting Electron with the experimental player enabled. Use this only for local testing; release packaging rejects the resulting `homebrew-dev` runtime manifest.
+This explicitly permits Homebrew for the local native build and enables the
+experiment. It is not a release path.
 
-The `afterPack` hook copies `dist/apps/electron-backend/native/` into `app.asar.unpacked/electron-backend/native/` so the addon, runtime manifest, and runtime libraries are available as real files where needed. Linux packages include the addon and manifest, but no bundled `libmpv.so`.
-
-During release packaging, `tools/packaging/electron-after-pack.cjs` verifies that macOS/Windows packages use a `vendored-lgpl` runtime/build input set. macOS artifacts additionally verify that Mach-O dependencies have no `/opt/homebrew` or `/usr/local` dynamic links for embedded MPV. Linux artifacts verify that the addon and `external-mpv-process` manifest are present, that no bundled `libmpv.so` files are present, and the runtime support check verifies that `mpv` is available on `PATH`.
-
-Set `IPTVNATOR_REQUIRE_EMBEDDED_MPV=1` when packaging a release artifact that must include Embedded MPV. The same variable is temporarily enabled for macOS PR and `master` push artifacts while the bundled runtime is being tested. Linux CI packaging requires Embedded MPV after staging the Ubuntu package build inputs. Windows CI packaging now requires Embedded MPV for x64 artifacts: the job restores the staged runtime cache or stages the checksum-pinned runtime archive, then fails backend build, package make, or package-layout verification if the addon/runtime is missing.
-
-## Platform Notes
-
-- macOS keeps the existing libmpv render-context backend because mpv `wid` stays black inside Electron on macOS.
-- Windows uses an embedded child `HWND` and passes it to mpv through `wid`.
-- Linux uses an X11 child window and starts a system `mpv --wid` process for that window. Native Wayland is not supported in v1; run under X11/Xwayland so `DISPLAY` is set and `mpv` can honor the X11 window id.
+See `docs/architecture/embedded-mpv-native.md` for the runtime capability,
+fallback, controls, and packaged-release contracts.
diff --git a/tools/embedded-mpv/build-linux-runtime.cjs b/tools/embedded-mpv/build-linux-runtime.cjs
new file mode 100644
index 000000000..a8b4d370c
--- /dev/null
+++ b/tools/embedded-mpv/build-linux-runtime.cjs
@@ -0,0 +1,1693 @@
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+
+const HWDATA_BUILD_INPUT = Object.freeze({
+    consumer: 'libdisplay-info',
+    relativePath: 'pnp.ids',
+    purpose: 'PNP vendor lookup table compiled into libdisplay-info.',
+});
+const EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES = Object.freeze([
+    '450bd2232225d6c7728a4108055ac2e37cef6475 3rdparty/Vulkan-Headers',
+    '97b54ca9e75f5303507699d27c6b4f4efe4641a1 3rdparty/fast_float',
+    '73db193f853e2ee079bf3ca8a64aa2eaf6459043 3rdparty/glad',
+    '15206881c006c79667fe5154fe80c01c65410679 3rdparty/jinja',
+    '297fc8e356e6836a62087949245d09a28e9f1b13 3rdparty/markupsafe',
+    '242f35efa067a46c595645eeda7b1771ea1f83b1 demos/3rdparty/nuklear',
+]);
+
+const SOURCE_PACKAGES = Object.freeze(
+    [
+        {
+            id: 'freetype',
+            version: '2.13.3',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz',
+            expectedSha256:
+                '0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289',
+            license: 'FreeType License (FTL)',
+        },
+        {
+            id: 'fribidi',
+            version: '1.0.16',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/fribidi/fribidi/releases/download/v1.0.16/fribidi-1.0.16.tar.xz',
+            expectedSha256:
+                '1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c',
+            license: 'LGPL-2.1-or-later',
+        },
+        {
+            id: 'harfbuzz',
+            version: '8.5.0',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/harfbuzz/harfbuzz/releases/download/8.5.0/harfbuzz-8.5.0.tar.xz',
+            expectedSha256:
+                '77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27',
+            license: 'MIT',
+        },
+        {
+            id: 'expat',
+            version: '2.8.2',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/libexpat/libexpat/releases/download/R_2_8_2/expat-2.8.2.tar.xz',
+            expectedSha256:
+                '3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4',
+            license: 'MIT',
+        },
+        {
+            id: 'fontconfig',
+            version: '2.16.0',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz',
+            expectedSha256:
+                '6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220',
+            license: 'MIT',
+        },
+        {
+            id: 'libass',
+            version: '0.17.3',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/libass/libass/releases/download/0.17.3/libass-0.17.3.tar.xz',
+            expectedSha256:
+                'eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959',
+            license: 'ISC',
+        },
+        {
+            id: 'openssl',
+            version: '3.5.7',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/openssl/openssl/releases/download/openssl-3.5.7/openssl-3.5.7.tar.gz',
+            expectedSha256:
+                'a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8',
+            license: 'Apache-2.0',
+        },
+        {
+            id: 'ffmpeg',
+            version: '8.1',
+            sourceKind: 'archive',
+            sourceUrl: 'https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz',
+            expectedSha256:
+                'b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a',
+            license: 'LGPL-2.1-or-later',
+        },
+        {
+            id: 'libplacebo',
+            version: '7.360.1',
+            sourceKind: 'git',
+            sourceUrl: 'https://github.com/haasn/libplacebo.git',
+            sourceTag: 'v7.360.1',
+            expectedGitCommit: 'cee9b076f2c63104ccfd497fa79c39a867293ec4',
+            expectedSubmodules: EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES,
+            license: 'LGPL-2.1-or-later',
+        },
+        {
+            id: 'hwdata',
+            version: '0.409',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.409.tar.gz',
+            expectedSha256:
+                '23006accc0f931dd5187d0307a57d0744e2b8feb85e73c37bc0f5229fb31eadd',
+            license: 'GPL-2.0-or-later OR XFree86-1.0',
+            buildInput: HWDATA_BUILD_INPUT,
+        },
+        {
+            id: 'libdisplay-info',
+            version: '0.1.1',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/libdisplay-info-0.1.1.tar.xz',
+            expectedSha256:
+                '0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60',
+            license: 'MIT',
+        },
+        {
+            id: 'mpv',
+            version: '0.41.0',
+            sourceKind: 'archive',
+            sourceUrl:
+                'https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz',
+            expectedSha256:
+                'ee21092a5ee427353392360929dc64645c54479aefdb5babc5cfbb5fad626209',
+            license: 'LGPL-2.1-or-later with -Dgpl=false',
+        },
+    ].map((sourcePackage) => Object.freeze(sourcePackage))
+);
+
+const BUILD_ORDER = Object.freeze(
+    SOURCE_PACKAGES.map((sourcePackage) => sourcePackage.id)
+);
+
+const FFMPEG_CONFIGURE_FLAGS = Object.freeze([
+    '--enable-shared',
+    '--disable-static',
+    '--disable-programs',
+    '--disable-doc',
+    '--disable-debug',
+    '--disable-autodetect',
+    '--disable-gpl',
+    '--disable-nonfree',
+    '--disable-version3',
+    '--enable-pic',
+    '--enable-pthreads',
+    '--enable-openssl',
+    '--disable-gnutls',
+    '--disable-mbedtls',
+    '--disable-libtls',
+    '--enable-network',
+    '--disable-protocols',
+    '--enable-protocol=file',
+    '--enable-protocol=http',
+    '--enable-protocol=https',
+    '--enable-protocol=httpproxy',
+    '--enable-protocol=tcp',
+    '--enable-protocol=tls',
+    '--enable-protocol=udp',
+    '--enable-protocol=crypto',
+    '--enable-protocol=data',
+    '--enable-demuxer=hls',
+    '--enable-vaapi',
+    '--disable-vdpau',
+    '--disable-vulkan',
+    '--disable-libdrm',
+    '--disable-cuda-llvm',
+    '--disable-cuvid',
+    '--disable-nvdec',
+    '--disable-nvenc',
+    '--disable-xlib',
+    '--disable-sdl2',
+    '--disable-openal',
+]);
+
+const MPV_MESON_FLAGS = Object.freeze([
+    '-Dgpl=false',
+    '-Dlibmpv=true',
+    '-Dcplayer=false',
+    '-Dbuild-date=false',
+    '-Dtests=false',
+    '-Dfuzzers=false',
+    '-Ddisable-packet-pool=false',
+    '-Dcdda=disabled',
+    '-Dcplugins=disabled',
+    '-Ddvbin=disabled',
+    '-Ddvdnav=disabled',
+    '-Diconv=enabled',
+    '-Djavascript=disabled',
+    '-Djpeg=disabled',
+    '-Dlcms2=disabled',
+    '-Dlibarchive=disabled',
+    '-Dlibavdevice=disabled',
+    '-Dlibbluray=disabled',
+    '-Dlua=disabled',
+    '-Dpthread-debug=disabled',
+    '-Drubberband=disabled',
+    '-Dsdl2-gamepad=disabled',
+    '-Duchardet=disabled',
+    '-Duwp=disabled',
+    '-Dvapoursynth=disabled',
+    '-Dvector=enabled',
+    '-Dwin32-threads=disabled',
+    '-Dx11-clipboard=disabled',
+    '-Dzimg=disabled',
+    '-Dzlib=disabled',
+    '-Dalsa=enabled',
+    '-Daudiounit=disabled',
+    '-Dcoreaudio=disabled',
+    '-Davfoundation=disabled',
+    '-Djack=disabled',
+    '-Dopenal=disabled',
+    '-Daudiotrack=disabled',
+    '-Daaudio=disabled',
+    '-Dopensles=disabled',
+    '-Doss-audio=disabled',
+    '-Dpipewire=disabled',
+    '-Dpulse=enabled',
+    '-Dsdl2-audio=disabled',
+    '-Dsndio=disabled',
+    '-Dwasapi=disabled',
+    '-Dcaca=disabled',
+    '-Dcocoa=disabled',
+    '-Dd3d11=disabled',
+    '-Ddirect3d=disabled',
+    '-Ddmabuf-wayland=disabled',
+    '-Ddrm=enabled',
+    '-Degl=enabled',
+    '-Degl-android=disabled',
+    '-Degl-angle=disabled',
+    '-Degl-angle-lib=disabled',
+    '-Degl-angle-win32=disabled',
+    '-Degl-drm=disabled',
+    '-Degl-wayland=disabled',
+    '-Degl-x11=disabled',
+    '-Dgbm=enabled',
+    '-Dgl=enabled',
+    '-Dgl-cocoa=disabled',
+    '-Dgl-dxinterop=disabled',
+    '-Dgl-win32=disabled',
+    '-Dgl-x11=disabled',
+    '-Dsdl2-video=disabled',
+    '-Dshaderc=disabled',
+    '-Dsixel=disabled',
+    '-Dspirv-cross=disabled',
+    '-Dplain-gl=enabled',
+    '-Dvdpau=disabled',
+    '-Dvdpau-gl-x11=disabled',
+    '-Dvaapi=enabled',
+    '-Dvaapi-drm=enabled',
+    '-Dvaapi-wayland=disabled',
+    '-Dvaapi-win32=disabled',
+    '-Dvaapi-x11=disabled',
+    '-Dvulkan=disabled',
+    '-Dwayland=disabled',
+    '-Dx11=disabled',
+    '-Dxv=disabled',
+    '-Dandroid-media-ndk=disabled',
+    '-Dcuda-hwaccel=disabled',
+    '-Dcuda-interop=disabled',
+    '-Dd3d-hwaccel=disabled',
+    '-Dd3d9-hwaccel=disabled',
+    '-Dgl-dxinterop-d3d9=disabled',
+    '-Dios-gl=disabled',
+    '-Dvideotoolbox-gl=disabled',
+    '-Dvideotoolbox-pl=disabled',
+    '-Dmacos-10-15-4-features=disabled',
+    '-Dmacos-11-features=disabled',
+    '-Dmacos-11-3-features=disabled',
+    '-Dmacos-12-features=disabled',
+    '-Dmacos-cocoa-cb=disabled',
+    '-Dmacos-media-player=disabled',
+    '-Dmacos-touchbar=disabled',
+    '-Dswift-build=disabled',
+    '-Dwin32-smtc=disabled',
+    '-Dhtml-build=disabled',
+    '-Dmanpage-build=disabled',
+    '-Dpdf-build=disabled',
+]);
+
+const BUILD_RECIPES = Object.freeze({
+    freetype: Object.freeze({
+        buildSystem: 'configure',
+        sharedOnly: true,
+        args: Object.freeze([
+            '--enable-shared',
+            '--disable-static',
+            '--without-brotli',
+            '--without-bzip2',
+            '--without-harfbuzz',
+            '--without-png',
+            '--without-zlib',
+        ]),
+    }),
+    fribidi: Object.freeze({
+        buildSystem: 'configure',
+        sharedOnly: true,
+        args: Object.freeze([
+            '--enable-shared',
+            '--disable-static',
+            '--disable-docs',
+            '--disable-bin',
+        ]),
+    }),
+    harfbuzz: Object.freeze({
+        buildSystem: 'meson',
+        sharedOnly: true,
+        args: Object.freeze([
+            '-Dglib=disabled',
+            '-Dgobject=disabled',
+            '-Dcairo=disabled',
+            '-Dchafa=disabled',
+            '-Dicu=disabled',
+            '-Dfreetype=enabled',
+            '-Dtests=disabled',
+            '-Dintrospection=disabled',
+            '-Ddocs=disabled',
+            '-Dutilities=disabled',
+            '-Dbenchmark=disabled',
+        ]),
+    }),
+    expat: Object.freeze({
+        buildSystem: 'cmake',
+        sharedOnly: true,
+        args: Object.freeze([
+            '-DEXPAT_SHARED_LIBS=ON',
+            '-DEXPAT_BUILD_TOOLS=OFF',
+            '-DEXPAT_BUILD_EXAMPLES=OFF',
+            '-DEXPAT_BUILD_TESTS=OFF',
+            '-DEXPAT_BUILD_DOCS=OFF',
+        ]),
+    }),
+    fontconfig: Object.freeze({
+        buildSystem: 'meson',
+        sharedOnly: true,
+        args: Object.freeze([
+            '-Ddoc=disabled',
+            '-Dtests=disabled',
+            '-Dtools=disabled',
+            '-Dcache-build=disabled',
+            '-Dnls=disabled',
+            '-Dxml-backend=expat',
+            '-Dbaseconfig-dir=/etc/fonts',
+            '-Dconfig-dir=/etc/fonts/conf.d',
+            '-Dtemplate-dir=/usr/share/fontconfig/conf.avail',
+            '-Dcache-dir=/var/cache/fontconfig',
+            '-Dxml-dir=/usr/share/xml/fontconfig',
+        ]),
+    }),
+    libass: Object.freeze({
+        buildSystem: 'configure',
+        sharedOnly: true,
+        args: Object.freeze([
+            '--enable-shared',
+            '--disable-static',
+            '--enable-fontconfig',
+            '--disable-coretext',
+            '--disable-directwrite',
+            '--disable-libunibreak',
+        ]),
+    }),
+    openssl: Object.freeze({
+        buildSystem: 'openssl',
+        sharedOnly: true,
+        args: Object.freeze([
+            'shared',
+            'no-apps',
+            'no-docs',
+            'no-tests',
+            'no-engine',
+            'no-legacy',
+            'no-module',
+            'no-weak-ssl-ciphers',
+            '--openssldir=/etc/ssl',
+        ]),
+    }),
+    ffmpeg: Object.freeze({
+        buildSystem: 'ffmpeg',
+        sharedOnly: true,
+        args: FFMPEG_CONFIGURE_FLAGS,
+    }),
+    libplacebo: Object.freeze({
+        buildSystem: 'meson',
+        sharedOnly: true,
+        args: Object.freeze([
+            '-Dopengl=enabled',
+            '-Dvulkan=disabled',
+            '-Dvk-proc-addr=disabled',
+            '-Dglslang=disabled',
+            '-Dshaderc=disabled',
+            '-Dlcms=disabled',
+            '-Ddovi=disabled',
+            '-Dlibdovi=disabled',
+            '-Ddemos=false',
+            '-Dtests=false',
+            '-Dbench=false',
+            '-Dfuzz=false',
+            '-Dunwind=disabled',
+            '-Dxxhash=disabled',
+        ]),
+    }),
+    hwdata: Object.freeze({
+        buildSystem: 'data',
+        sharedOnly: false,
+        args: Object.freeze([]),
+    }),
+    'libdisplay-info': Object.freeze({
+        buildSystem: 'meson',
+        sharedOnly: true,
+        args: Object.freeze([]),
+    }),
+    mpv: Object.freeze({
+        buildSystem: 'meson',
+        sharedOnly: true,
+        args: MPV_MESON_FLAGS,
+    }),
+});
+
+const REQUIRED_TOOLS = Object.freeze([
+    'cc',
+    'cmake',
+    'curl',
+    'git',
+    'gperf',
+    'make',
+    'meson',
+    'nasm',
+    'ninja',
+    'patchelf',
+    'perl',
+    'pkg-config',
+    'python3',
+    'readelf',
+    'tar',
+]);
+
+const MINIMUM_TOOL_VERSIONS = Object.freeze({
+    cc: '9.0.0',
+    cmake: '3.16.0',
+    curl: '7.71.0',
+    git: '2.30.0',
+    gperf: '3.1.0',
+    make: '4.0.0',
+    meson: '1.6.0',
+    nasm: '2.15.05',
+    ninja: '1.10.0',
+    patchelf: '0.14.0',
+    perl: '5.30.0',
+    'pkg-config': '0.29.0',
+    python3: '3.8.0',
+    readelf: '2.35.0',
+    tar: '1.30.0',
+});
+
+const DEFAULT_SYSTEM_PKG_CONFIG_DIRS = Object.freeze([
+    '/usr/lib/x86_64-linux-gnu/pkgconfig',
+    '/usr/lib64/pkgconfig',
+    '/usr/lib/pkgconfig',
+    '/usr/share/pkgconfig',
+]);
+
+const EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES = Object.freeze([
+    'alsa',
+    'egl',
+    'gbm',
+    'gl',
+    'libdrm',
+    'libpulse',
+    'libva',
+    'libva-drm',
+]);
+
+const GLIBC_TOOLCHAIN_ALLOWLIST = Object.freeze([
+    'ld-linux-x86-64.so.2',
+    'libc.so.6',
+    'libdl.so.2',
+    'libgcc_s.so.1',
+    'libm.so.6',
+    'libpthread.so.0',
+    'librt.so.1',
+    'libstdc++.so.6',
+]);
+
+const EXTERNAL_SYSTEM_LIBRARIES = Object.freeze(
+    [
+        {
+            name: 'libEGL.so.1',
+            interface: 'EGL',
+            reason: 'System graphics-driver interface used by the frame-copy helper.',
+        },
+        {
+            name: 'libGL.so.1',
+            interface: 'OpenGL',
+            reason: 'System OpenGL compatibility interface supplied by the graphics stack.',
+        },
+        {
+            name: 'libGLX.so.0',
+            interface: 'OpenGL',
+            reason: 'GLVND OpenGL dispatch interface supplied by the graphics stack.',
+        },
+        {
+            name: 'libOpenGL.so.0',
+            interface: 'OpenGL',
+            reason: 'GLVND OpenGL interface supplied by the graphics stack.',
+        },
+        {
+            name: 'libasound.so.2',
+            interface: 'ALSA',
+            reason: 'Linux system audio interface intentionally used by libmpv.',
+        },
+        {
+            name: 'libdrm.so.2',
+            interface: 'DRM',
+            reason: 'Kernel graphics interface used by system GBM and VA-API drivers.',
+        },
+        {
+            name: 'libgbm.so.1',
+            interface: 'GBM',
+            reason: 'System graphics-buffer interface used by headless EGL rendering.',
+        },
+        {
+            name: 'libpulse.so.0',
+            interface: 'PulseAudio',
+            reason: 'Linux desktop audio interface intentionally used by libmpv.',
+        },
+        {
+            name: 'libva-drm.so.2',
+            interface: 'VA-API DRM',
+            reason: 'System VA-API DRM interface used for hardware decoding.',
+        },
+        {
+            name: 'libva.so.2',
+            interface: 'VA-API',
+            reason: 'System video-acceleration interface used for hardware decoding.',
+        },
+    ].map((externalLibrary) => Object.freeze(externalLibrary))
+);
+
+const RUNTIME_EXTERNAL_CONFIGURATION = Object.freeze({
+    fontconfig: Object.freeze({
+        configDirectory: '/etc/fonts',
+        templateDirectory: '/usr/share/fontconfig',
+        cacheDirectory: '/var/cache/fontconfig',
+        ownership: 'system',
+    }),
+    openssl: Object.freeze({
+        configFile: '/etc/ssl/openssl.cnf',
+        certificateFile: '/etc/ssl/cert.pem',
+        certificateDirectory: '/etc/ssl/certs',
+        ownership: 'system',
+    }),
+});
+
+const OUTPUT_OWNERSHIP_MARKER = '.iptvnator-linux-runtime-owner';
+const OUTPUT_OWNERSHIP_MARKER_CONTENT =
+    'iptvnator-embedded-mpv-linux-runtime-v1\n';
+
+const PORTABLE_ABI_BASELINE = Object.freeze({
+    distribution: 'Ubuntu 22.04',
+    glibcMaximum: '2.35',
+    glibcxxMaximum: '3.4.30',
+});
+
+const SHARED_LIBRARY_PATTERN = /\.so(?:\.\d+)*$/;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+const externalSystemLibraryNames = new Set(
+    EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name)
+);
+const allowedExternalLibraryNames = new Set([
+    ...GLIBC_TOOLCHAIN_ALLOWLIST,
+    ...externalSystemLibraryNames,
+]);
+
+function assertArchiveMatchesPin(sourcePackage, actualSha256) {
+    if (actualSha256 !== sourcePackage.expectedSha256) {
+        throw new Error(
+            `${sourcePackage.id} archive SHA-256 mismatch: expected ${sourcePackage.expectedSha256}, received ${actualSha256}.`
+        );
+    }
+}
+
+function assertGitCommitMatchesPin(sourcePackage, actualGitCommit) {
+    if (actualGitCommit !== sourcePackage.expectedGitCommit) {
+        throw new Error(
+            `${sourcePackage.id} git commit mismatch: expected ${sourcePackage.expectedGitCommit}, received ${actualGitCommit}.`
+        );
+    }
+}
+
+function assertGitSubmodulesMatchPin(sourcePackage, actualSubmodules) {
+    if (
+        !isDeepStrictEqual(actualSubmodules, sourcePackage.expectedSubmodules)
+    ) {
+        throw new Error(
+            `${sourcePackage.id} git submodules do not match the exact pinned recursive records.`
+        );
+    }
+}
+
+function canonicalizeGitSubmoduleStatus(output) {
+    if (typeof output !== 'string') {
+        throw new Error('Git submodule status output must be a string.');
+    }
+    if (output.trim() === '') {
+        return [];
+    }
+
+    const records = [];
+    const seenRecords = new Set();
+    const seenPaths = new Set();
+    for (const rawLine of output.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (line === '') {
+            continue;
+        }
+        if (/^[-+U]/.test(line)) {
+            throw new Error(
+                `Git submodule checkout is not clean: ${rawLine.trimEnd()}`
+            );
+        }
+        const match = line.match(
+            /^([a-f0-9]{40,64})\s+([A-Za-z0-9_+./-]+)(?:\s+\([^\r\n]*\))?$/
+        );
+        if (!match) {
+            throw new Error(
+                `Git submodule status contains an unsafe or malformed record: ${rawLine.trimEnd()}`
+            );
+        }
+        const submodulePath = match[2];
+        if (
+            path.posix.isAbsolute(submodulePath) ||
+            submodulePath
+                .split('/')
+                .some(
+                    (segment) =>
+                        segment === '' || segment === '.' || segment === '..'
+                )
+        ) {
+            throw new Error(
+                `Git submodule status contains an unsafe path: ${submodulePath}`
+            );
+        }
+        const record = `${match[1]} ${submodulePath}`;
+        if (seenRecords.has(record) || seenPaths.has(submodulePath)) {
+            throw new Error(
+                `Git submodule status contains a duplicate record: ${record}`
+            );
+        }
+        seenRecords.add(record);
+        seenPaths.add(submodulePath);
+        records.push(record);
+    }
+    return records;
+}
+
+function parseVersion(value) {
+    if (typeof value !== 'string') {
+        return null;
+    }
+    const match = value.match(/\b(\d+\.\d+(?:\.\d+)*)\b/);
+    return match?.[1] ?? null;
+}
+
+function compareVersions(left, right) {
+    const leftParts = left.split('.').map(Number);
+    const rightParts = right.split('.').map(Number);
+    const length = Math.max(leftParts.length, rightParts.length);
+    for (let index = 0; index < length; index += 1) {
+        const difference = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
+        if (difference !== 0) {
+            return Math.sign(difference);
+        }
+    }
+    return 0;
+}
+
+function assertMinimumToolVersions(toolVersions) {
+    for (const tool of REQUIRED_TOOLS) {
+        const declaredVersion = toolVersions?.[tool];
+        if (typeof declaredVersion !== 'string' || !declaredVersion.trim()) {
+            throw new Error(`Missing required tool version for ${tool}.`);
+        }
+        const actualVersion = parseVersion(declaredVersion);
+        if (!actualVersion) {
+            throw new Error(
+                `Unable to parse required tool version for ${tool}: ${declaredVersion}.`
+            );
+        }
+        const minimumVersion = MINIMUM_TOOL_VERSIONS[tool];
+        if (compareVersions(actualVersion, minimumVersion) < 0) {
+            throw new Error(
+                `${tool} ${actualVersion} is unsupported; ${tool} requires ${minimumVersion} or newer for Linux runtime builds.`
+            );
+        }
+    }
+}
+
+function assertUniqueMesonOptionAssignments(buildRecipes) {
+    if (!buildRecipes || typeof buildRecipes !== 'object') {
+        throw new TypeError('Linux runtime build recipes must be an object.');
+    }
+    for (const [packageId, recipe] of Object.entries(buildRecipes)) {
+        if (recipe?.buildSystem !== 'meson') {
+            continue;
+        }
+        if (!Array.isArray(recipe.args)) {
+            throw new Error(
+                `${packageId} Meson recipe must declare an argument array.`
+            );
+        }
+
+        const assignmentsByOption = new Map();
+        for (const flag of recipe.args) {
+            const match =
+                typeof flag === 'string' ? flag.match(/^(-D[^=]+)=/) : null;
+            if (!match) {
+                continue;
+            }
+            const option = match[1];
+            const assignmentCount = (assignmentsByOption.get(option) ?? 0) + 1;
+            assignmentsByOption.set(option, assignmentCount);
+            if (assignmentCount > 1) {
+                throw new Error(
+                    `${packageId} Meson recipe must assign ${option} exactly once.`
+                );
+            }
+        }
+    }
+}
+
+function lstatIfExists(fileSystem, filePath) {
+    try {
+        return fileSystem.lstatSync(filePath);
+    } catch (error) {
+        if (error?.code === 'ENOENT') {
+            return null;
+        }
+        throw error;
+    }
+}
+
+function assertOwnedOutputDestination(outputPrefix, fileSystem = fs) {
+    const outputStat = lstatIfExists(fileSystem, outputPrefix);
+    if (!outputStat) {
+        return;
+    }
+    if (!outputStat.isDirectory() || outputStat.isSymbolicLink()) {
+        throw new Error(
+            `Existing output ${outputPrefix} must be a non-symbolic-link directory carrying the IPTVnator ownership marker.`
+        );
+    }
+
+    const markerPath = path.join(outputPrefix, OUTPUT_OWNERSHIP_MARKER);
+    const markerStat = lstatIfExists(fileSystem, markerPath);
+    if (
+        !markerStat ||
+        !markerStat.isFile() ||
+        markerStat.isSymbolicLink() ||
+        fileSystem.readFileSync(markerPath, 'utf8') !==
+            OUTPUT_OWNERSHIP_MARKER_CONTENT
+    ) {
+        throw new Error(
+            `Existing output ${outputPrefix} is missing the valid IPTVnator ownership marker.`
+        );
+    }
+}
+
+function ownedStagingPrefixPath(outputPrefix, token) {
+    return path.join(
+        path.dirname(outputPrefix),
+        `.${path.basename(outputPrefix)}.iptvnator-stage-${token}`
+    );
+}
+
+function createOwnedStagingPrefix(
+    outputPrefix,
+    { fileSystem = fs, token = crypto.randomBytes(8).toString('hex') } = {}
+) {
+    assertOwnedOutputDestination(outputPrefix, fileSystem);
+    const outputParent = path.dirname(outputPrefix);
+    const stagingPrefix = ownedStagingPrefixPath(outputPrefix, token);
+    if (lstatIfExists(fileSystem, stagingPrefix)) {
+        throw new Error(
+            `Refusing to reuse existing Linux runtime staging path ${stagingPrefix}.`
+        );
+    }
+
+    fileSystem.mkdirSync(outputParent, { recursive: true });
+    fileSystem.mkdirSync(stagingPrefix);
+    try {
+        fileSystem.writeFileSync(
+            path.join(stagingPrefix, OUTPUT_OWNERSHIP_MARKER),
+            OUTPUT_OWNERSHIP_MARKER_CONTENT,
+            { mode: 0o644 }
+        );
+    } catch (error) {
+        fileSystem.rmSync(stagingPrefix, { recursive: true, force: true });
+        throw error;
+    }
+    return stagingPrefix;
+}
+
+function publishOwnedOutput({
+    outputPrefix,
+    stagingPrefix,
+    fileSystem = fs,
+    token = crypto.randomBytes(8).toString('hex'),
+}) {
+    assertOwnedOutputDestination(outputPrefix, fileSystem);
+    assertOwnedOutputDestination(stagingPrefix, fileSystem);
+    if (!lstatIfExists(fileSystem, stagingPrefix)) {
+        throw new Error(
+            `Linux runtime staging prefix does not exist: ${stagingPrefix}.`
+        );
+    }
+
+    const backupPrefix = path.join(
+        path.dirname(outputPrefix),
+        `.${path.basename(outputPrefix)}.iptvnator-backup-${token}`
+    );
+    if (lstatIfExists(fileSystem, backupPrefix)) {
+        throw new Error(
+            `Refusing to reuse existing Linux runtime backup path ${backupPrefix}.`
+        );
+    }
+
+    let movedPreviousOutput = false;
+    let published = false;
+    try {
+        if (lstatIfExists(fileSystem, outputPrefix)) {
+            fileSystem.renameSync(outputPrefix, backupPrefix);
+            movedPreviousOutput = true;
+        }
+        fileSystem.renameSync(stagingPrefix, outputPrefix);
+        published = true;
+        if (movedPreviousOutput) {
+            fileSystem.rmSync(backupPrefix, {
+                recursive: true,
+                force: true,
+            });
+        }
+    } catch (error) {
+        if (
+            movedPreviousOutput &&
+            !lstatIfExists(fileSystem, outputPrefix) &&
+            lstatIfExists(fileSystem, backupPrefix)
+        ) {
+            fileSystem.renameSync(backupPrefix, outputPrefix);
+        }
+        throw error;
+    } finally {
+        if (lstatIfExists(fileSystem, stagingPrefix)) {
+            fileSystem.rmSync(stagingPrefix, {
+                recursive: true,
+                force: true,
+            });
+        }
+        if (published && lstatIfExists(fileSystem, backupPrefix)) {
+            fileSystem.rmSync(backupPrefix, {
+                recursive: true,
+                force: true,
+            });
+        }
+    }
+}
+
+function joinEnvironmentParts(parts, separator = ' ') {
+    return parts.filter((value) => value && value.trim()).join(separator);
+}
+
+function resolveSystemPkgConfigDirs(environment = {}) {
+    const explicitDirectories =
+        environment.IPTVNATOR_EMBEDDED_MPV_SYSTEM_PKG_CONFIG_DIRS;
+    if (!explicitDirectories) {
+        return [...DEFAULT_SYSTEM_PKG_CONFIG_DIRS];
+    }
+
+    const directories = explicitDirectories
+        .split(path.delimiter)
+        .map((directory) => directory.trim())
+        .filter(Boolean);
+    if (
+        directories.length === 0 ||
+        directories.some((directory) => !path.isAbsolute(directory))
+    ) {
+        throw new Error(
+            'IPTVNATOR_EMBEDDED_MPV_SYSTEM_PKG_CONFIG_DIRS must contain only absolute paths.'
+        );
+    }
+    return [
+        ...new Set(directories.map((directory) => path.normalize(directory))),
+    ];
+}
+
+function createBuildEnvironment({
+    prefix,
+    baseEnv = process.env,
+    systemPkgConfigDirs = [],
+}) {
+    const prefixPkgConfigDirs = [
+        path.join(prefix, 'lib', 'pkgconfig'),
+        path.join(prefix, 'share', 'pkgconfig'),
+    ];
+    const pkgConfigLibDirs = [
+        ...new Set([
+            ...prefixPkgConfigDirs,
+            ...systemPkgConfigDirs.filter(Boolean),
+        ]),
+    ];
+    const prefixLibDir = path.join(prefix, 'lib');
+    const ignoredVariables = new Set([
+        'CFLAGS',
+        'CPPFLAGS',
+        'CXXFLAGS',
+        'LDFLAGS',
+        'LD_LIBRARY_PATH',
+        'LIBRARY_PATH',
+        'CPATH',
+        'C_INCLUDE_PATH',
+        'CPLUS_INCLUDE_PATH',
+        'CMAKE_PREFIX_PATH',
+        'CMAKE_LIBRARY_PATH',
+        'CMAKE_INCLUDE_PATH',
+        'FONTCONFIG_PATH',
+        'OPENSSL_MODULES',
+    ]);
+    const inheritedEnvironment = Object.fromEntries(
+        Object.entries(baseEnv).filter(
+            ([name]) =>
+                !ignoredVariables.has(name) && !name.startsWith('PKG_CONFIG')
+        )
+    );
+
+    return {
+        ...inheritedEnvironment,
+        PATH: joinEnvironmentParts(
+            [path.join(prefix, 'bin'), baseEnv.PATH],
+            path.delimiter
+        ),
+        PKG_CONFIG_PATH: prefixPkgConfigDirs.join(path.delimiter),
+        PKG_CONFIG_LIBDIR: pkgConfigLibDirs.join(path.delimiter),
+        CMAKE_PREFIX_PATH: prefix,
+        CPPFLAGS: `-I${path.join(prefix, 'include')}`,
+        CFLAGS: joinEnvironmentParts([
+            '-fPIC',
+            `-I${path.join(prefix, 'include')}`,
+        ]),
+        CXXFLAGS: joinEnvironmentParts([
+            '-fPIC',
+            `-I${path.join(prefix, 'include')}`,
+        ]),
+        LDFLAGS: joinEnvironmentParts([
+            `-L${prefixLibDir}`,
+            `-Wl,-rpath-link,${prefixLibDir}`,
+        ]),
+        LD_LIBRARY_PATH: prefixLibDir,
+        FONTCONFIG_PATH: path.join(prefix, 'etc', 'fonts'),
+        OPENSSL_MODULES: path.join(prefixLibDir, 'ossl-modules'),
+    };
+}
+
+function createPinnedHwdataPkgConfigEnvironment({ buildEnvironment, prefix }) {
+    if (!buildEnvironment || typeof buildEnvironment !== 'object') {
+        throw new TypeError(
+            'Pinned hwdata requires the Linux runtime build environment.'
+        );
+    }
+    const prefixPkgConfigDirs = [
+        path.join(prefix, 'lib', 'pkgconfig'),
+        path.join(prefix, 'share', 'pkgconfig'),
+    ];
+    const pinnedPkgConfigPath = prefixPkgConfigDirs.join(path.delimiter);
+    return {
+        ...buildEnvironment,
+        PKG_CONFIG_PATH: pinnedPkgConfigPath,
+        PKG_CONFIG_LIBDIR: pinnedPkgConfigPath,
+    };
+}
+
+function assertPinnedHwdataResolution({
+    pcFileDir,
+    pkgDataDir,
+    prefix,
+    version,
+}) {
+    const expectedPcFileDir = path.join(prefix, 'share', 'pkgconfig');
+    const expectedPkgDataDir = path.join(prefix, 'share', 'hwdata');
+    if (path.resolve(pcFileDir) !== path.resolve(expectedPcFileDir)) {
+        throw new Error(
+            `Pinned hwdata pkg-config metadata resolved outside the staged prefix: ${pcFileDir}.`
+        );
+    }
+    if (path.resolve(pkgDataDir) !== path.resolve(expectedPkgDataDir)) {
+        throw new Error(
+            `Pinned hwdata data resolved outside the staged prefix: ${pkgDataDir}.`
+        );
+    }
+    const hwdataPackage = SOURCE_PACKAGES.find(({ id }) => id === 'hwdata');
+    if (version !== hwdataPackage.version) {
+        throw new Error(
+            `Pinned hwdata version mismatch: expected ${hwdataPackage.version}, received ${version}.`
+        );
+    }
+}
+
+function preparePinnedHwdataBuildInput({
+    buildEnvironment,
+    fileSystem = fs,
+    prefix,
+    runCapture,
+    sourcePath,
+}) {
+    if (typeof runCapture !== 'function') {
+        throw new TypeError(
+            'Pinned hwdata preparation requires a command capture function.'
+        );
+    }
+    const hwdataPackage = SOURCE_PACKAGES.find(({ id }) => id === 'hwdata');
+    const sourceRoot = fileSystem.realpathSync(sourcePath);
+    const sourceInputPath = path.join(
+        sourcePath,
+        hwdataPackage.buildInput.relativePath
+    );
+    const sourceInputStat = fileSystem.lstatSync(sourceInputPath);
+    if (!sourceInputStat.isFile() || sourceInputStat.isSymbolicLink()) {
+        throw new Error(
+            `Pinned hwdata build input must be a regular file: ${sourceInputPath}.`
+        );
+    }
+    const realSourceInputPath = fileSystem.realpathSync(sourceInputPath);
+    assertPathInside(
+        sourceRoot,
+        realSourceInputPath,
+        'Pinned hwdata build input'
+    );
+    const pnpIds = fileSystem.readFileSync(realSourceInputPath);
+    if (pnpIds.length === 0) {
+        throw new Error('Pinned hwdata pnp.ids build input must not be empty.');
+    }
+
+    const pkgDataDir = path.join(prefix, 'share', 'hwdata');
+    const pcFileDir = path.join(prefix, 'share', 'pkgconfig');
+    fileSystem.mkdirSync(pkgDataDir, { recursive: true });
+    fileSystem.mkdirSync(pcFileDir, { recursive: true });
+    fileSystem.writeFileSync(path.join(pkgDataDir, 'pnp.ids'), pnpIds, {
+        mode: 0o644,
+    });
+    fileSystem.writeFileSync(
+        path.join(pcFileDir, 'hwdata.pc'),
+        [
+            `prefix=${prefix}`,
+            'datadir=${prefix}/share',
+            `pkgdatadir=${pkgDataDir}`,
+            '',
+            'Name: hwdata',
+            'Description: Pinned PNP hardware identification data',
+            `Version: ${hwdataPackage.version}`,
+            '',
+        ].join('\n'),
+        { mode: 0o644 }
+    );
+
+    const pinnedEnvironment = createPinnedHwdataPkgConfigEnvironment({
+        buildEnvironment,
+        prefix,
+    });
+    const captureOptions = { env: pinnedEnvironment };
+    const resolvedPcFileDir = runCapture(
+        'pkg-config',
+        ['--variable=pcfiledir', 'hwdata'],
+        captureOptions
+    );
+    const resolvedPkgDataDir = runCapture(
+        'pkg-config',
+        ['--variable=pkgdatadir', 'hwdata'],
+        captureOptions
+    );
+    const resolvedVersion = runCapture(
+        'pkg-config',
+        ['--modversion', 'hwdata'],
+        captureOptions
+    );
+    assertPinnedHwdataResolution({
+        pcFileDir: resolvedPcFileDir,
+        pkgDataDir: resolvedPkgDataDir,
+        prefix,
+        version: resolvedVersion,
+    });
+    return pinnedEnvironment;
+}
+
+function resolveLinuxPackageBuildEnvironment(packageId, context) {
+    if (packageId !== 'libdisplay-info') {
+        return context.buildEnvironment;
+    }
+    if (!context.hwdataBuildEnvironment) {
+        throw new Error(
+            'libdisplay-info requires the staged pinned hwdata build environment.'
+        );
+    }
+    return context.hwdataBuildEnvironment;
+}
+
+function sha256Buffer(contents) {
+    return crypto.createHash('sha256').update(contents).digest('hex');
+}
+
+function runtimeLibraryNames(libDir) {
+    return fs
+        .readdirSync(libDir, { withFileTypes: true })
+        .filter(
+            (entry) =>
+                (entry.isFile() || entry.isSymbolicLink()) &&
+                SHARED_LIBRARY_PATTERN.test(entry.name)
+        )
+        .map((entry) => entry.name)
+        .sort();
+}
+
+function assertPathInside(parentPath, candidatePath, label) {
+    const relativePath = path.relative(parentPath, candidatePath);
+    if (
+        relativePath === '..' ||
+        relativePath.startsWith(`..${path.sep}`) ||
+        path.isAbsolute(relativePath)
+    ) {
+        throw new Error(`${label} resolves outside ${parentPath}.`);
+    }
+}
+
+function materializeLibrarySymlinks(libDir, selectedNames = null) {
+    const realLibDir = fs.realpathSync(libDir);
+    for (const name of runtimeLibraryNames(libDir)) {
+        if (selectedNames && !selectedNames.has(name)) {
+            continue;
+        }
+        const libraryPath = path.join(libDir, name);
+        const stat = fs.lstatSync(libraryPath);
+        if (!stat.isSymbolicLink()) {
+            continue;
+        }
+
+        const realLibraryPath = fs.realpathSync(libraryPath);
+        assertPathInside(
+            realLibDir,
+            realLibraryPath,
+            `Runtime library alias ${name}`
+        );
+        const targetStat = fs.statSync(realLibraryPath);
+        if (!targetStat.isFile()) {
+            throw new Error(
+                `Runtime library alias ${name} does not resolve to a regular file.`
+            );
+        }
+        const contents = fs.readFileSync(realLibraryPath);
+        fs.unlinkSync(libraryPath);
+        fs.writeFileSync(libraryPath, contents, {
+            mode: targetStat.mode & 0o777,
+        });
+    }
+}
+
+function selectReachableRuntimeLibraryNames(entries) {
+    if (!Array.isArray(entries)) {
+        throw new TypeError('Runtime dynamic entries must be an array.');
+    }
+
+    const entriesByName = new Map();
+    for (const entry of entries) {
+        if (
+            !entry ||
+            typeof entry.name !== 'string' ||
+            !SHARED_LIBRARY_PATTERN.test(entry.name)
+        ) {
+            throw new Error(
+                'Runtime dynamic entry has an invalid library name.'
+            );
+        }
+        if (entriesByName.has(entry.name)) {
+            throw new Error(
+                `Runtime dynamic entries contain duplicate library ${entry.name}.`
+            );
+        }
+        entriesByName.set(entry.name, entry);
+    }
+
+    const linkerAlias = entriesByName.get('libmpv.so');
+    if (!linkerAlias) {
+        throw new Error(
+            'Linux runtime must contain the libmpv.so linker alias.'
+        );
+    }
+    if (
+        typeof linkerAlias.soname !== 'string' ||
+        !SHARED_LIBRARY_PATTERN.test(linkerAlias.soname) ||
+        !entriesByName.has(linkerAlias.soname)
+    ) {
+        throw new Error(
+            'libmpv.so must declare a bundled SONAME before runtime pruning.'
+        );
+    }
+
+    const reachableNames = new Set(['libmpv.so']);
+    const pendingNames = [linkerAlias.soname];
+    while (pendingNames.length > 0) {
+        const libraryName = pendingNames.shift();
+        if (reachableNames.has(libraryName)) {
+            continue;
+        }
+        reachableNames.add(libraryName);
+        const entry = entriesByName.get(libraryName);
+        if (!entry) {
+            throw new Error(
+                `Reachable runtime library ${libraryName} is missing its dynamic entry.`
+            );
+        }
+        for (const neededName of entry.needed ?? []) {
+            if (
+                entriesByName.has(neededName) &&
+                !reachableNames.has(neededName)
+            ) {
+                pendingNames.push(neededName);
+            }
+        }
+    }
+
+    return [...reachableNames].sort();
+}
+
+function retainRuntimeLibraries(libDir, retainedNames) {
+    if (!Array.isArray(retainedNames) || retainedNames.length === 0) {
+        throw new Error('Runtime retention list must be a non-empty array.');
+    }
+    const retainedNameSet = new Set(retainedNames);
+    if (retainedNameSet.size !== retainedNames.length) {
+        throw new Error('Runtime retention list contains duplicate libraries.');
+    }
+
+    const availableNames = runtimeLibraryNames(libDir);
+    for (const retainedName of retainedNameSet) {
+        if (!availableNames.includes(retainedName)) {
+            throw new Error(
+                `Retained runtime library does not exist: ${retainedName}.`
+            );
+        }
+    }
+
+    materializeLibrarySymlinks(libDir, retainedNameSet);
+    for (const libraryName of availableNames) {
+        if (!retainedNameSet.has(libraryName)) {
+            fs.rmSync(path.join(libDir, libraryName));
+        }
+    }
+
+    for (const retainedName of retainedNameSet) {
+        const retainedPath = path.join(libDir, retainedName);
+        const stat = fs.lstatSync(retainedPath);
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error(
+                `Retained runtime library ${retainedName} must be a materialized regular file.`
+            );
+        }
+    }
+}
+
+function createRuntimeFileRecords(libDir) {
+    return runtimeLibraryNames(libDir).map((name) => {
+        const libraryPath = path.join(libDir, name);
+        const stat = fs.lstatSync(libraryPath);
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error(
+                `Runtime library ${name} must be a materialized regular file.`
+            );
+        }
+        const contents = fs.readFileSync(libraryPath);
+        return {
+            name,
+            size: contents.length,
+            sha256: sha256Buffer(contents),
+        };
+    });
+}
+
+function parseReadelfDynamic(output) {
+    const dynamic = {
+        needed: [],
+        rpath: [],
+        runpath: [],
+        soname: null,
+    };
+    const dynamicEntryPattern =
+        /\((NEEDED|RPATH|RUNPATH|SONAME)\)[^[]*\[([^\]]*)\]/g;
+    for (const match of output.matchAll(dynamicEntryPattern)) {
+        const [, tag, value] = match;
+        if (tag === 'SONAME') {
+            dynamic.soname = value;
+            continue;
+        }
+        if (tag === 'NEEDED') {
+            dynamic.needed.push(value);
+            continue;
+        }
+        const field = tag.toLowerCase();
+        dynamic[field].push(
+            ...value.split(':').filter((pathEntry) => pathEntry.length > 0)
+        );
+    }
+
+    for (const field of ['needed', 'rpath', 'runpath']) {
+        dynamic[field] = [...new Set(dynamic[field])].sort();
+    }
+    return dynamic;
+}
+
+function parseReadelfVersionInfo(output, name) {
+    if (typeof output !== 'string' || typeof name !== 'string' || !name) {
+        throw new TypeError(
+            'readelf version output and runtime library name are required.'
+        );
+    }
+
+    let requiredGlibc = null;
+    let requiredGlibcxx = null;
+    const versionPattern = /\b(GLIBCXX|GLIBC)_(\d+(?:\.\d+)+)\b/g;
+    for (const [, namespace, version] of output.matchAll(versionPattern)) {
+        if (
+            namespace === 'GLIBC' &&
+            (!requiredGlibc || compareVersions(version, requiredGlibc) > 0)
+        ) {
+            requiredGlibc = version;
+        }
+        if (
+            namespace === 'GLIBCXX' &&
+            (!requiredGlibcxx || compareVersions(version, requiredGlibcxx) > 0)
+        ) {
+            requiredGlibcxx = version;
+        }
+    }
+
+    return { name, requiredGlibc, requiredGlibcxx };
+}
+
+function assertPortableAbiRecords(records) {
+    if (!Array.isArray(records)) {
+        throw new TypeError('Runtime ABI records must be an array.');
+    }
+    for (const record of records) {
+        for (const [field, maximum] of [
+            ['requiredGlibc', PORTABLE_ABI_BASELINE.glibcMaximum],
+            ['requiredGlibcxx', PORTABLE_ABI_BASELINE.glibcxxMaximum],
+        ]) {
+            const version = record?.[field];
+            if (version && compareVersions(version, maximum) > 0) {
+                throw new Error(
+                    `Portable ABI baseline ${PORTABLE_ABI_BASELINE.distribution} rejects newer symbol ${version} required by ${record.name}; maximum ${field} is ${maximum}.`
+                );
+            }
+        }
+    }
+}
+
+function assertPortableBuildHostGlibc(glibcVersion) {
+    if (
+        typeof glibcVersion !== 'string' ||
+        !/^\d+(?:\.\d+)+$/.test(glibcVersion)
+    ) {
+        throw new Error(
+            'Unable to determine the Linux build host glibc version.'
+        );
+    }
+    if (compareVersions(glibcVersion, PORTABLE_ABI_BASELINE.glibcMaximum) > 0) {
+        throw new Error(
+            `Build host glibc ${glibcVersion} exceeds the portable ABI baseline ${PORTABLE_ABI_BASELINE.distribution} maximum ${PORTABLE_ABI_BASELINE.glibcMaximum}.`
+        );
+    }
+}
+
+function validateRuntimeDependencyClosure({
+    entries,
+    runtimeFileNames,
+    buildPrefix,
+}) {
+    if (!Array.isArray(entries) || !Array.isArray(runtimeFileNames)) {
+        throw new TypeError(
+            'Runtime closure entries and runtime file names must be arrays.'
+        );
+    }
+
+    const bundledNames = new Set(runtimeFileNames);
+    const entryNames = new Set();
+    const externalDependencies = new Set();
+    const normalizedEntries = [...entries]
+        .map((entry) => ({
+            name: entry.name,
+            soname: entry.soname ?? null,
+            needed: [...new Set(entry.needed ?? [])].sort(),
+            rpath: [...new Set(entry.rpath ?? [])].sort(),
+            runpath: [...new Set(entry.runpath ?? [])].sort(),
+        }))
+        .sort((left, right) => left.name.localeCompare(right.name));
+
+    for (const entry of normalizedEntries) {
+        if (!bundledNames.has(entry.name)) {
+            throw new Error(
+                `Dynamic closure contains undeclared runtime file ${entry.name}.`
+            );
+        }
+        if (entryNames.has(entry.name)) {
+            throw new Error(
+                `Dynamic closure contains duplicate runtime file ${entry.name}.`
+            );
+        }
+        entryNames.add(entry.name);
+
+        if (
+            entry.soname !== null &&
+            (typeof entry.soname !== 'string' ||
+                !SHARED_LIBRARY_PATTERN.test(entry.soname) ||
+                path.basename(entry.soname) !== entry.soname)
+        ) {
+            throw new Error(
+                `${entry.name} SONAME must be null or a safe shared-library basename.`
+            );
+        }
+        if (
+            entry.name === 'libmpv.so' &&
+            (typeof entry.soname !== 'string' ||
+                !/^libmpv\.so\.\d+(?:\.\d+)*$/.test(entry.soname) ||
+                !bundledNames.has(entry.soname))
+        ) {
+            throw new Error(
+                'libmpv.so must declare a versioned SONAME present in the runtime closure.'
+            );
+        }
+
+        if (entry.rpath.length > 0) {
+            throw new Error(
+                `${entry.name} has forbidden RPATH ${entry.rpath.join(':')}.`
+            );
+        }
+        if (entry.runpath.length !== 1 || entry.runpath[0] !== '$ORIGIN') {
+            const renderedRunpath =
+                entry.runpath.length > 0 ? entry.runpath.join(':') : '<empty>';
+            throw new Error(
+                `${entry.name} RUNPATH must be exactly $ORIGIN; got ${renderedRunpath}.`
+            );
+        }
+        if (
+            buildPrefix &&
+            [...entry.rpath, ...entry.runpath].some((value) =>
+                value.includes(buildPrefix)
+            )
+        ) {
+            throw new Error(
+                `${entry.name} RPATH/RUNPATH contains build prefix ${buildPrefix}.`
+            );
+        }
+
+        for (const dependencyName of entry.needed) {
+            if (bundledNames.has(dependencyName)) {
+                continue;
+            }
+            if (!allowedExternalLibraryNames.has(dependencyName)) {
+                throw new Error(
+                    `Runtime dependency is not bundled or allowlisted: ${entry.name} -> ${dependencyName}.`
+                );
+            }
+            externalDependencies.add(dependencyName);
+        }
+    }
+
+    for (const runtimeFileName of bundledNames) {
+        if (!entryNames.has(runtimeFileName)) {
+            throw new Error(
+                `Runtime library ${runtimeFileName} is missing from the dynamic closure.`
+            );
+        }
+    }
+
+    return {
+        entries: normalizedEntries,
+        externalDependencies: [...externalDependencies].sort(),
+    };
+}
+
+function parseCliInvocation({ platform, arch, argv, cwd }) {
+    if (platform !== 'linux' || arch !== 'x64') {
+        throw new Error(
+            `Embedded MPV runtime source builds are supported on Linux x64 only; received ${platform}/${arch}.`
+        );
+    }
+
+    const args = argv[0] === '--' ? argv.slice(1) : argv;
+    if (args.length !== 1 || !args[0]) {
+        throw new Error(
+            [
+                'Usage: node tools/embedded-mpv/build-linux-runtime.mjs <output-prefix>',
+                '',
+                'Builds the pinned LGPL-compatible Linux x64 libmpv runtime from source.',
+            ].join('\n')
+        );
+    }
+
+    return { prefix: path.resolve(cwd, args[0]) };
+}
+
+function sourceManifestMetadata(sourceRecord) {
+    const metadata = {
+        version: sourceRecord.version,
+        sourceUrl: sourceRecord.sourceUrl,
+        ...(sourceRecord.sourceTag
+            ? { sourceTag: sourceRecord.sourceTag }
+            : {}),
+        ...(sourceRecord.sourceSha256
+            ? { sourceSha256: sourceRecord.sourceSha256 }
+            : {}),
+        ...(sourceRecord.sourceGitCommit
+            ? { sourceGitCommit: sourceRecord.sourceGitCommit }
+            : {}),
+        ...(sourceRecord.sourceSubmodules
+            ? { sourceSubmodules: [...sourceRecord.sourceSubmodules] }
+            : {}),
+        ...(sourceRecord.buildInput
+            ? { buildInput: { ...sourceRecord.buildInput } }
+            : {}),
+        license: sourceRecord.license,
+    };
+
+    if (
+        sourceRecord.sourceKind === 'archive' &&
+        !SHA256_PATTERN.test(sourceRecord.sourceSha256 ?? '')
+    ) {
+        throw new Error(
+            `Archive source ${sourceRecord.id} is missing its downloaded SHA-256 digest.`
+        );
+    }
+    if (
+        sourceRecord.sourceKind === 'git' &&
+        !/^[a-f0-9]{40,64}$/.test(sourceRecord.sourceGitCommit ?? '')
+    ) {
+        throw new Error(
+            `Git source ${sourceRecord.id} is missing its exact commit digest.`
+        );
+    }
+    return metadata;
+}
+
+function createLinuxRuntimeManifest({
+    sourceRecords,
+    runtimeFiles,
+    abiRecords,
+    dependencyClosure,
+    buildHost,
+    generatedAt = new Date().toISOString(),
+    ffmpegConfigureFlags = FFMPEG_CONFIGURE_FLAGS,
+    mpvMesonFlags = MPV_MESON_FLAGS,
+}) {
+    const packages = {};
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        const sourceRecord = sourceRecords[sourcePackage.id];
+        if (!sourceRecord) {
+            throw new Error(`Missing source metadata for ${sourcePackage.id}.`);
+        }
+        if (sourcePackage.sourceKind === 'archive') {
+            assertArchiveMatchesPin(sourcePackage, sourceRecord.sourceSha256);
+        } else {
+            assertGitCommitMatchesPin(
+                sourcePackage,
+                sourceRecord.sourceGitCommit
+            );
+            assertGitSubmodulesMatchPin(
+                sourcePackage,
+                sourceRecord.sourceSubmodules
+            );
+        }
+        packages[sourcePackage.id] = sourceManifestMetadata(sourceRecord);
+    }
+    assertPortableAbiRecords(abiRecords);
+
+    const runtimeTotalBytes = runtimeFiles.reduce(
+        (total, runtimeFile) => total + runtimeFile.size,
+        0
+    );
+    return {
+        schemaVersion: 1,
+        origin: 'vendored-lgpl-source-build',
+        platform: 'linux',
+        arch: 'x64',
+        generatedAt,
+        packages,
+        ffmpeg: {
+            ...packages.ffmpeg,
+            licensePolicy:
+                'LGPL, built with OpenSSL and without GPL, nonfree, or version-3-only components.',
+            configureFlags: [...ffmpegConfigureFlags],
+        },
+        mpv: {
+            ...packages.mpv,
+            licensePolicy:
+                'LGPL-compatible libmpv built with -Dgpl=false and without the CLI player.',
+            mesonFlags: [...mpvMesonFlags],
+        },
+        runtimeFiles: runtimeFiles.map((runtimeFile) => ({ ...runtimeFile })),
+        runtimeTotalBytes,
+        runtimeAbi: {
+            baseline: { ...PORTABLE_ABI_BASELINE },
+            files: abiRecords.map((record) => ({ ...record })),
+        },
+        runtimeExternalConfiguration: {
+            fontconfig: { ...RUNTIME_EXTERNAL_CONFIGURATION.fontconfig },
+            openssl: { ...RUNTIME_EXTERNAL_CONFIGURATION.openssl },
+        },
+        runtimeDependencyClosure: {
+            entries: dependencyClosure.entries.map((entry) => ({
+                name: entry.name,
+                soname: entry.soname ?? null,
+                needed: [...entry.needed],
+                rpath: [...entry.rpath],
+                runpath: [...entry.runpath],
+            })),
+            externalDependencies: [...dependencyClosure.externalDependencies],
+        },
+        externalSystemLibraries: EXTERNAL_SYSTEM_LIBRARIES.map(
+            (externalLibrary) => ({ ...externalLibrary })
+        ),
+        buildHost,
+        sourceDistribution:
+            'Attach a source archive to the corresponding Linux binary release containing the exact downloaded source archives, including the pinned dual-licensed hwdata archive whose pnp.ids is compiled into the MIT-licensed libdisplay-info source archive, a checkout or git bundle of the recorded libplacebo commit and submodules, tools/embedded-mpv/build-linux-runtime.mjs, tools/embedded-mpv/build-linux-runtime.cjs, this runtime manifest, and any local patches.',
+    };
+}
+
+module.exports = {
+    BUILD_RECIPES,
+    BUILD_ORDER,
+    DEFAULT_SYSTEM_PKG_CONFIG_DIRS,
+    EXTERNAL_SYSTEM_LIBRARIES,
+    EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    FFMPEG_CONFIGURE_FLAGS,
+    GLIBC_TOOLCHAIN_ALLOWLIST,
+    MINIMUM_TOOL_VERSIONS,
+    MPV_MESON_FLAGS,
+    OUTPUT_OWNERSHIP_MARKER,
+    PORTABLE_ABI_BASELINE,
+    REQUIRED_TOOLS,
+    RUNTIME_EXTERNAL_CONFIGURATION,
+    SOURCE_PACKAGES,
+    assertArchiveMatchesPin,
+    assertGitCommitMatchesPin,
+    assertGitSubmodulesMatchPin,
+    assertMinimumToolVersions,
+    assertOwnedOutputDestination,
+    assertPortableAbiRecords,
+    assertPortableBuildHostGlibc,
+    assertUniqueMesonOptionAssignments,
+    canonicalizeGitSubmoduleStatus,
+    compareVersions,
+    createBuildEnvironment,
+    createLinuxRuntimeManifest,
+    createOwnedStagingPrefix,
+    createRuntimeFileRecords,
+    materializeLibrarySymlinks,
+    ownedStagingPrefixPath,
+    parseCliInvocation,
+    parseReadelfDynamic,
+    parseReadelfVersionInfo,
+    parseVersion,
+    preparePinnedHwdataBuildInput,
+    resolveSystemPkgConfigDirs,
+    resolveLinuxPackageBuildEnvironment,
+    runtimeLibraryNames,
+    sha256Buffer,
+    publishOwnedOutput,
+    retainRuntimeLibraries,
+    selectReachableRuntimeLibraryNames,
+    validateRuntimeDependencyClosure,
+};
diff --git a/tools/embedded-mpv/build-linux-runtime.mjs b/tools/embedded-mpv/build-linux-runtime.mjs
new file mode 100644
index 000000000..e9efefd8f
--- /dev/null
+++ b/tools/embedded-mpv/build-linux-runtime.mjs
@@ -0,0 +1,865 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import crypto from 'node:crypto';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const {
+    BUILD_RECIPES,
+    BUILD_ORDER,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    MPV_MESON_FLAGS,
+    PORTABLE_ABI_BASELINE,
+    REQUIRED_TOOLS,
+    SOURCE_PACKAGES,
+    assertArchiveMatchesPin,
+    assertGitCommitMatchesPin,
+    assertMinimumToolVersions,
+    assertOwnedOutputDestination,
+    assertPortableAbiRecords,
+    assertPortableBuildHostGlibc,
+    assertUniqueMesonOptionAssignments,
+    canonicalizeGitSubmoduleStatus,
+    createBuildEnvironment,
+    createLinuxRuntimeManifest,
+    createOwnedStagingPrefix,
+    createRuntimeFileRecords,
+    ownedStagingPrefixPath,
+    parseCliInvocation,
+    parseReadelfDynamic,
+    parseReadelfVersionInfo,
+    preparePinnedHwdataBuildInput,
+    retainRuntimeLibraries,
+    resolveLinuxPackageBuildEnvironment,
+    resolveSystemPkgConfigDirs,
+    runtimeLibraryNames,
+    selectReachableRuntimeLibraryNames,
+    sha256Buffer,
+    publishOwnedOutput,
+    validateRuntimeDependencyClosure,
+} = require('./build-linux-runtime.cjs');
+const {
+    validateLinuxRuntimeManifest,
+} = require('./linux-runtime-manifest.cjs');
+
+const scriptPath = fileURLToPath(import.meta.url);
+const workspaceRoot = path.resolve(path.dirname(scriptPath), '..', '..');
+const sourcePackageById = new Map(
+    SOURCE_PACKAGES.map((sourcePackage) => [sourcePackage.id, sourcePackage])
+);
+
+function log(message) {
+    process.stdout.write(`[embedded-mpv-linux-runtime] ${message}\n`);
+}
+
+function commandLine(command, args) {
+    return [command, ...args]
+        .map((value) =>
+            /^[A-Za-z0-9_./:=+,-]+$/.test(value) ? value : JSON.stringify(value)
+        )
+        .join(' ');
+}
+
+function spawn(command, args, options, capture) {
+    log(commandLine(command, args));
+    const result = spawnSync(command, args, {
+        cwd: options.cwd,
+        env: options.env,
+        encoding: capture ? 'utf8' : undefined,
+        stdio: capture ? 'pipe' : 'inherit',
+    });
+
+    if (result.error) {
+        throw new Error(
+            `Unable to run ${commandLine(command, args)}: ${result.error.message}`
+        );
+    }
+    if (result.status !== 0) {
+        const details = capture
+            ? [result.stdout, result.stderr].filter(Boolean).join('\n').trim()
+            : '';
+        throw new Error(
+            `${commandLine(command, args)} failed with status ${
+                result.status ?? 1
+            }.${details ? `\n${details}` : ''}`
+        );
+    }
+    return result;
+}
+
+function createCommandRunner({ buildEnvironment }) {
+    return {
+        run(command, args, options = {}) {
+            spawn(
+                command,
+                args,
+                {
+                    cwd: options.cwd ?? workspaceRoot,
+                    env: options.env ?? buildEnvironment,
+                },
+                false
+            );
+        },
+        runCapture(command, args, options = {}) {
+            const result = spawn(
+                command,
+                args,
+                {
+                    cwd: options.cwd ?? workspaceRoot,
+                    env: options.env ?? buildEnvironment,
+                },
+                true
+            );
+            return [result.stdout, result.stderr]
+                .filter(Boolean)
+                .join('\n')
+                .trim();
+        },
+    };
+}
+
+function commandExists(command) {
+    const result = spawnSync(
+        'sh',
+        ['-c', 'command -v "$1" >/dev/null 2>&1', 'sh', command],
+        { stdio: 'ignore' }
+    );
+    return result.status === 0;
+}
+
+function ensureTools() {
+    const missingTools = REQUIRED_TOOLS.filter(
+        (command) => !commandExists(command)
+    );
+    if (missingTools.length > 0) {
+        throw new Error(
+            `Missing required Linux runtime build tools: ${missingTools.join(
+                ', '
+            )}.`
+        );
+    }
+}
+
+function resolveParallelism(environment) {
+    const explicitJobs = environment.IPTVNATOR_EMBEDDED_MPV_JOBS;
+    const makeJobs = environment.MAKEFLAGS?.match(
+        /(?:^|\s)-j\s*(\d+)(?:\s|$)/
+    )?.[1];
+    const value =
+        explicitJobs ??
+        makeJobs ??
+        String(os.availableParallelism?.() ?? os.cpus().length);
+    if (!/^[1-9]\d*$/.test(value)) {
+        throw new Error(
+            `IPTVNATOR_EMBEDDED_MPV_JOBS must be a positive integer; received ${value}.`
+        );
+    }
+    return value;
+}
+
+function containsPath(parentPath, candidatePath) {
+    const relativePath = path.relative(parentPath, candidatePath);
+    return (
+        relativePath === '' ||
+        (!relativePath.startsWith(`..${path.sep}`) &&
+            relativePath !== '..' &&
+            !path.isAbsolute(relativePath))
+    );
+}
+
+function assertSafeOutputPrefix(prefix, buildRoot) {
+    const filesystemRoot = path.parse(prefix).root;
+    if (
+        prefix === filesystemRoot ||
+        containsPath(prefix, workspaceRoot) ||
+        containsPath(prefix, buildRoot)
+    ) {
+        throw new Error(
+            `Refusing unsafe output prefix ${prefix}; choose a dedicated directory that does not contain the repository or build cache.`
+        );
+    }
+}
+
+function archiveExtension(sourceUrl) {
+    for (const extension of ['.tar.xz', '.tar.gz', '.tar.bz2', '.tgz']) {
+        if (new URL(sourceUrl).pathname.endsWith(extension)) {
+            return extension;
+        }
+    }
+    throw new Error(`Unsupported source archive URL: ${sourceUrl}`);
+}
+
+function archivePathFor(sourcePackage, archiveRoot) {
+    return path.join(
+        archiveRoot,
+        `${sourcePackage.id}-${sourcePackage.version}${archiveExtension(
+            sourcePackage.sourceUrl
+        )}`
+    );
+}
+
+function sourcePathFor(packageId, sourceRoot) {
+    return path.join(sourceRoot, packageId);
+}
+
+function sha256File(filePath) {
+    return sha256Buffer(fs.readFileSync(filePath));
+}
+
+function downloadArchive(sourcePackage, context) {
+    const archivePath = archivePathFor(sourcePackage, context.archiveRoot);
+    if (!fs.existsSync(archivePath)) {
+        const temporaryArchivePath = `${archivePath}.partial`;
+        fs.rmSync(temporaryArchivePath, { force: true });
+        context.run('curl', [
+            '--fail',
+            '--location',
+            '--retry',
+            '3',
+            '--retry-all-errors',
+            '--connect-timeout',
+            '30',
+            '--proto',
+            '=https',
+            '--tlsv1.2',
+            '--output',
+            temporaryArchivePath,
+            sourcePackage.sourceUrl,
+        ]);
+        fs.renameSync(temporaryArchivePath, archivePath);
+    }
+
+    const sourceSha256 = sha256File(archivePath);
+    assertArchiveMatchesPin(sourcePackage, sourceSha256);
+    const packageSourcePath = sourcePathFor(
+        sourcePackage.id,
+        context.sourceRoot
+    );
+    fs.rmSync(packageSourcePath, { recursive: true, force: true });
+    fs.mkdirSync(packageSourcePath, { recursive: true });
+    context.run('tar', [
+        '--extract',
+        '--file',
+        archivePath,
+        '--directory',
+        packageSourcePath,
+        '--strip-components',
+        '1',
+        '--no-same-owner',
+    ]);
+
+    return {
+        ...sourcePackage,
+        sourceSha256,
+    };
+}
+
+function cloneGitSource(sourcePackage, context) {
+    const packageSourcePath = sourcePathFor(
+        sourcePackage.id,
+        context.sourceRoot
+    );
+    fs.rmSync(packageSourcePath, { recursive: true, force: true });
+    context.run('git', [
+        'clone',
+        '--depth',
+        '1',
+        '--branch',
+        sourcePackage.sourceTag,
+        sourcePackage.sourceUrl,
+        packageSourcePath,
+    ]);
+    const sourceGitCommit = context.runCapture('git', ['rev-parse', 'HEAD'], {
+        cwd: packageSourcePath,
+    });
+    assertGitCommitMatchesPin(sourcePackage, sourceGitCommit);
+    context.run(
+        'git',
+        ['submodule', 'update', '--init', '--recursive', '--depth', '1'],
+        { cwd: packageSourcePath }
+    );
+
+    const submoduleOutput = context.runCapture(
+        'git',
+        ['submodule', 'status', '--recursive'],
+        { cwd: packageSourcePath }
+    );
+
+    return {
+        ...sourcePackage,
+        sourceGitCommit,
+        sourceSubmodules: canonicalizeGitSubmoduleStatus(submoduleOutput),
+    };
+}
+
+function acquireSources(context) {
+    fs.mkdirSync(context.archiveRoot, { recursive: true });
+    fs.mkdirSync(context.sourceRoot, { recursive: true });
+    const sourceRecords = {};
+
+    for (const packageId of BUILD_ORDER) {
+        const sourcePackage = sourcePackageById.get(packageId);
+        log(
+            `Acquiring ${sourcePackage.id} ${sourcePackage.version} from ${sourcePackage.sourceUrl}`
+        );
+        sourceRecords[packageId] =
+            sourcePackage.sourceKind === 'git'
+                ? cloneGitSource(sourcePackage, context)
+                : downloadArchive(sourcePackage, context);
+    }
+    return sourceRecords;
+}
+
+function configureInstall(packageId, recipe, context) {
+    const sourcePath = sourcePathFor(packageId, context.sourceRoot);
+    context.run('./configure', [`--prefix=${context.prefix}`, ...recipe.args], {
+        cwd: sourcePath,
+    });
+    context.run('make', [`-j${context.parallelism}`], { cwd: sourcePath });
+    context.run('make', ['install'], { cwd: sourcePath });
+}
+
+function mesonSetupArgs(prefix, recipeArgs) {
+    return [
+        `--prefix=${prefix}`,
+        '--libdir=lib',
+        '--buildtype=release',
+        '--default-library=shared',
+        '--wrap-mode=nodownload',
+        '--auto-features=disabled',
+        '-Db_ndebug=true',
+        ...recipeArgs,
+    ];
+}
+
+function mesonInstall(packageId, recipe, context) {
+    const sourcePath = sourcePathFor(packageId, context.sourceRoot);
+    const buildPath = path.join(sourcePath, 'build-iptvnator');
+    const buildEnvironment = resolveLinuxPackageBuildEnvironment(
+        packageId,
+        context
+    );
+    fs.rmSync(buildPath, { recursive: true, force: true });
+    context.run(
+        'meson',
+        ['setup', buildPath, ...mesonSetupArgs(context.prefix, recipe.args)],
+        { cwd: sourcePath, env: buildEnvironment }
+    );
+    context.run(
+        'meson',
+        ['compile', '--jobs', context.parallelism, '-C', buildPath],
+        { cwd: sourcePath, env: buildEnvironment }
+    );
+    context.run('meson', ['install', '-C', buildPath], {
+        cwd: sourcePath,
+        env: buildEnvironment,
+    });
+}
+
+function prepareHwdata(context) {
+    context.hwdataBuildEnvironment = preparePinnedHwdataBuildInput({
+        buildEnvironment: context.buildEnvironment,
+        prefix: context.prefix,
+        runCapture: (command, args, options) =>
+            context.runCapture(command, args, options),
+        sourcePath: sourcePathFor('hwdata', context.sourceRoot),
+    });
+}
+
+function pathInsideDestdir(destdir, absolutePath) {
+    return path.join(
+        destdir,
+        absolutePath.slice(path.parse(absolutePath).root.length)
+    );
+}
+
+export function copyDirectoryContents(sourceDirectory, destinationDirectory) {
+    if (!fs.existsSync(sourceDirectory)) {
+        return;
+    }
+    fs.mkdirSync(destinationDirectory, { recursive: true });
+    for (const entry of fs.readdirSync(sourceDirectory)) {
+        fs.cpSync(
+            path.join(sourceDirectory, entry),
+            path.join(destinationDirectory, entry),
+            {
+                recursive: true,
+                force: true,
+                verbatimSymlinks: true,
+            }
+        );
+    }
+}
+
+function installWithDestdir(packageId, context, install, externalPaths = []) {
+    const destdir = path.join(context.buildRoot, 'install-roots', packageId);
+    fs.rmSync(destdir, { recursive: true, force: true });
+    fs.mkdirSync(destdir, { recursive: true });
+    try {
+        install(destdir);
+        copyDirectoryContents(
+            pathInsideDestdir(destdir, context.prefix),
+            context.prefix
+        );
+        for (const { destination, source } of externalPaths) {
+            copyDirectoryContents(
+                pathInsideDestdir(destdir, source),
+                path.join(context.prefix, destination)
+            );
+        }
+    } finally {
+        fs.rmSync(destdir, { recursive: true, force: true });
+    }
+}
+
+function fontconfigInstall(recipe, context) {
+    const sourcePath = sourcePathFor('fontconfig', context.sourceRoot);
+    const buildPath = path.join(sourcePath, 'build-iptvnator');
+    fs.rmSync(buildPath, { recursive: true, force: true });
+    context.run(
+        'meson',
+        ['setup', buildPath, ...mesonSetupArgs(context.prefix, recipe.args)],
+        { cwd: sourcePath }
+    );
+    context.run(
+        'meson',
+        ['compile', '--jobs', context.parallelism, '-C', buildPath],
+        { cwd: sourcePath }
+    );
+    installWithDestdir(
+        'fontconfig',
+        context,
+        (destdir) =>
+            context.run('meson', ['install', '-C', buildPath], {
+                cwd: sourcePath,
+                env: { ...context.buildEnvironment, DESTDIR: destdir },
+            }),
+        [
+            { source: '/etc/fonts', destination: path.join('etc', 'fonts') },
+            {
+                source: '/usr/share/fontconfig',
+                destination: path.join('share', 'fontconfig'),
+            },
+            {
+                source: '/usr/share/xml/fontconfig',
+                destination: path.join('share', 'xml', 'fontconfig'),
+            },
+            {
+                source: '/var/cache/fontconfig',
+                destination: path.join('var', 'cache', 'fontconfig'),
+            },
+        ]
+    );
+}
+
+function cmakeInstall(packageId, recipe, context) {
+    const sourcePath = sourcePathFor(packageId, context.sourceRoot);
+    const buildPath = path.join(sourcePath, 'build-iptvnator');
+    fs.rmSync(buildPath, { recursive: true, force: true });
+    context.run('cmake', [
+        '-S',
+        sourcePath,
+        '-B',
+        buildPath,
+        '-G',
+        'Ninja',
+        `-DCMAKE_INSTALL_PREFIX=${context.prefix}`,
+        '-DCMAKE_INSTALL_LIBDIR=lib',
+        '-DCMAKE_BUILD_TYPE=Release',
+        '-DBUILD_SHARED_LIBS=ON',
+        ...recipe.args,
+    ]);
+    context.run('cmake', [
+        '--build',
+        buildPath,
+        '--parallel',
+        context.parallelism,
+    ]);
+    context.run('cmake', ['--install', buildPath]);
+}
+
+function opensslInstall(recipe, context) {
+    const sourcePath = sourcePathFor('openssl', context.sourceRoot);
+    context.run(
+        'perl',
+        [
+            './Configure',
+            'linux-x86_64',
+            `--prefix=${context.prefix}`,
+            '--libdir=lib',
+            ...recipe.args,
+        ],
+        { cwd: sourcePath }
+    );
+    context.run('make', [`-j${context.parallelism}`], { cwd: sourcePath });
+    installWithDestdir('openssl', context, (destdir) =>
+        context.run('make', ['install_sw', `DESTDIR=${destdir}`], {
+            cwd: sourcePath,
+        })
+    );
+}
+
+function ffmpegInstall(recipe, context) {
+    const sourcePath = sourcePathFor('ffmpeg', context.sourceRoot);
+    const configureFlags = [`--prefix=${context.prefix}`, ...recipe.args];
+    context.run('./configure', configureFlags, { cwd: sourcePath });
+    context.run('make', [`-j${context.parallelism}`], { cwd: sourcePath });
+    context.run('make', ['install'], { cwd: sourcePath });
+    context.ffmpegConfigureFlags = configureFlags;
+}
+
+function buildRuntime(context) {
+    for (const packageId of BUILD_ORDER) {
+        const recipe = BUILD_RECIPES[packageId];
+        log(`Building ${packageId} as shared libraries`);
+        if (packageId === 'fontconfig') {
+            fontconfigInstall(recipe, context);
+            continue;
+        }
+        switch (recipe.buildSystem) {
+            case 'data':
+                prepareHwdata(context);
+                break;
+            case 'configure':
+                configureInstall(packageId, recipe, context);
+                break;
+            case 'meson':
+                mesonInstall(packageId, recipe, context);
+                break;
+            case 'cmake':
+                cmakeInstall(packageId, recipe, context);
+                break;
+            case 'openssl':
+                opensslInstall(recipe, context);
+                break;
+            case 'ffmpeg':
+                ffmpegInstall(recipe, context);
+                break;
+            default:
+                throw new Error(
+                    `Unsupported build system ${recipe.buildSystem} for ${packageId}.`
+                );
+        }
+    }
+}
+
+function removeFilesMatching(root, pattern) {
+    if (!fs.existsSync(root)) {
+        return;
+    }
+    for (const entry of fs.readdirSync(root, { withFileTypes: true })) {
+        const entryPath = path.join(root, entry.name);
+        if (entry.isDirectory()) {
+            removeFilesMatching(entryPath, pattern);
+        } else if (entry.isFile() && pattern.test(entry.name)) {
+            fs.rmSync(entryPath);
+        }
+    }
+}
+
+function removeNonRuntimeBuildOutputs(prefix) {
+    removeFilesMatching(path.join(prefix, 'lib'), /\.(?:a|la)$/);
+    for (const relativePath of [
+        'bin',
+        path.join('share', 'doc'),
+        path.join('share', 'gtk-doc'),
+        path.join('share', 'man'),
+    ]) {
+        fs.rmSync(path.join(prefix, relativePath), {
+            recursive: true,
+            force: true,
+        });
+    }
+}
+
+function assertElfLibrary(libraryPath) {
+    const descriptor = fs.openSync(libraryPath, 'r');
+    try {
+        const header = Buffer.alloc(4);
+        const bytesRead = fs.readSync(descriptor, header, 0, header.length, 0);
+        if (
+            bytesRead !== 4 ||
+            !header.equals(Buffer.from([0x7f, 0x45, 0x4c, 0x46]))
+        ) {
+            throw new Error(
+                `Runtime shared library is not an ELF file: ${libraryPath}.`
+            );
+        }
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+
+function postProcessRuntime(context) {
+    const libDir = path.join(context.prefix, 'lib');
+    if (!fs.existsSync(libDir)) {
+        throw new Error(`Runtime library directory was not built: ${libDir}.`);
+    }
+
+    const unprunedDynamicEntries = runtimeLibraryNames(libDir).map(
+        (libraryName) => {
+            const libraryPath = path.join(libDir, libraryName);
+            assertElfLibrary(libraryPath);
+            return {
+                name: libraryName,
+                ...parseReadelfDynamic(
+                    context.runCapture('readelf', ['-d', libraryPath])
+                ),
+            };
+        }
+    );
+    const retainedNames = selectReachableRuntimeLibraryNames(
+        unprunedDynamicEntries
+    );
+    retainRuntimeLibraries(libDir, retainedNames);
+
+    const abiRecords = [];
+    const dynamicEntries = [];
+    for (const libraryName of runtimeLibraryNames(libDir)) {
+        const libraryPath = path.join(libDir, libraryName);
+        assertElfLibrary(libraryPath);
+        context.run('patchelf', ['--set-rpath', '$ORIGIN', libraryPath]);
+        const dynamic = parseReadelfDynamic(
+            context.runCapture('readelf', ['-d', libraryPath])
+        );
+        dynamicEntries.push({ name: libraryName, ...dynamic });
+        const versionInfo = context.runCapture('readelf', [
+            '--version-info',
+            libraryPath,
+        ]);
+        abiRecords.push(parseReadelfVersionInfo(versionInfo, libraryName));
+    }
+    assertPortableAbiRecords(abiRecords);
+
+    const runtimeFiles = createRuntimeFileRecords(libDir);
+    if (runtimeFiles.length === 0) {
+        throw new Error(
+            'The Linux runtime build produced no shared libraries.'
+        );
+    }
+    const dependencyClosure = validateRuntimeDependencyClosure({
+        entries: dynamicEntries,
+        runtimeFileNames: runtimeFiles.map(({ name }) => name),
+        buildPrefix: context.prefix,
+    });
+
+    return {
+        abiBaseline: PORTABLE_ABI_BASELINE,
+        abiRecords,
+        dependencyClosure,
+        runtimeFiles,
+    };
+}
+
+function firstLine(value) {
+    return (
+        value
+            .split(/\r?\n/)
+            .find((line) => line.trim())
+            ?.trim() ?? ''
+    );
+}
+
+function collectBuildHost(context) {
+    const tools = context.toolVersions;
+    if (!tools) {
+        throw new Error('Linux runtime tool versions were not preflighted.');
+    }
+    return {
+        platform: process.platform,
+        arch: process.arch,
+        release: os.release(),
+        glibcVersion: context.glibcVersion,
+        systemPkgConfigDirs: [...context.systemPkgConfigDirs],
+        systemPkgConfigPackages: {
+            ...context.systemPkgConfigPackages,
+        },
+        tools: { ...tools },
+    };
+}
+
+function detectBuildHostGlibcVersion() {
+    const glibcVersion =
+        process.report?.getReport?.()?.header?.glibcVersionRuntime;
+    assertPortableBuildHostGlibc(glibcVersion);
+    return glibcVersion;
+}
+
+function collectToolVersions(context) {
+    const versionArgs = {
+        cc: ['--version'],
+        cmake: ['--version'],
+        curl: ['--version'],
+        git: ['--version'],
+        gperf: ['--version'],
+        make: ['--version'],
+        meson: ['--version'],
+        nasm: ['-v'],
+        ninja: ['--version'],
+        patchelf: ['--version'],
+        perl: ['-e', 'printf "%vd\\n", $^V'],
+        'pkg-config': ['--version'],
+        python3: ['--version'],
+        readelf: ['--version'],
+        tar: ['--version'],
+    };
+    const toolVersions = {};
+    for (const tool of REQUIRED_TOOLS) {
+        toolVersions[tool] = firstLine(
+            context.runCapture(tool, versionArgs[tool] ?? ['--version'])
+        );
+    }
+    return toolVersions;
+}
+
+function verifySystemPkgConfigPackages(context) {
+    const systemPkgConfigPackages = {};
+    for (const packageName of EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES) {
+        context.run('pkg-config', ['--exists', packageName]);
+        systemPkgConfigPackages[packageName] = context.runCapture(
+            'pkg-config',
+            ['--modversion', packageName]
+        );
+    }
+    return systemPkgConfigPackages;
+}
+
+function writeManifest(context, sourceRecords, runtimeMetadata) {
+    const mpvMesonFlags = mesonSetupArgs(context.prefix, MPV_MESON_FLAGS);
+    const manifest = createLinuxRuntimeManifest({
+        sourceRecords,
+        runtimeFiles: runtimeMetadata.runtimeFiles,
+        abiRecords: runtimeMetadata.abiRecords,
+        dependencyClosure: runtimeMetadata.dependencyClosure,
+        buildHost: collectBuildHost(context),
+        ffmpegConfigureFlags: context.ffmpegConfigureFlags,
+        mpvMesonFlags,
+    });
+    const manifestErrors = validateLinuxRuntimeManifest(manifest);
+    if (manifestErrors.length > 0) {
+        throw new Error(
+            [
+                'Generated Linux runtime manifest is invalid:',
+                ...manifestErrors.map((error) => `- ${error}`),
+            ].join('\n')
+        );
+    }
+
+    const manifestPath = path.join(context.prefix, 'runtime-manifest.json');
+    const temporaryManifestPath = `${manifestPath}.tmp`;
+    fs.writeFileSync(
+        temporaryManifestPath,
+        `${JSON.stringify(manifest, null, 2)}\n`,
+        { mode: 0o644 }
+    );
+    fs.renameSync(temporaryManifestPath, manifestPath);
+    return manifest;
+}
+
+function createBuildContext(prefix, environment) {
+    const buildRoot = path.resolve(
+        environment.IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT ??
+            path.join(
+                os.tmpdir(),
+                'iptvnator-embedded-mpv-runtime',
+                'linux-x64'
+            )
+    );
+    assertSafeOutputPrefix(prefix, buildRoot);
+    const systemPkgConfigDirs = resolveSystemPkgConfigDirs(environment);
+    const buildEnvironment = createBuildEnvironment({
+        prefix,
+        baseEnv: environment,
+        systemPkgConfigDirs,
+    });
+    const runner = createCommandRunner({ buildEnvironment });
+    return {
+        ...runner,
+        prefix,
+        buildRoot,
+        archiveRoot: path.join(buildRoot, 'archives'),
+        sourceRoot: path.join(buildRoot, 'sources'),
+        parallelism: resolveParallelism(environment),
+        systemPkgConfigDirs,
+        buildEnvironment,
+        ffmpegConfigureFlags: null,
+    };
+}
+
+export function main({
+    argv = process.argv.slice(2),
+    platform = process.platform,
+    arch = process.arch,
+    cwd = process.cwd(),
+    environment = process.env,
+} = {}) {
+    const { prefix: outputPrefix } = parseCliInvocation({
+        platform,
+        arch,
+        argv,
+        cwd,
+    });
+    assertUniqueMesonOptionAssignments(BUILD_RECIPES);
+    ensureTools();
+    assertOwnedOutputDestination(outputPrefix);
+    const stagingToken = `${process.pid}-${crypto
+        .randomBytes(8)
+        .toString('hex')}`;
+    const stagingPrefix = ownedStagingPrefixPath(outputPrefix, stagingToken);
+    const context = createBuildContext(stagingPrefix, environment);
+    assertSafeOutputPrefix(outputPrefix, context.buildRoot);
+    const toolVersions = collectToolVersions(context);
+    assertMinimumToolVersions(toolVersions);
+    context.toolVersions = toolVersions;
+    context.glibcVersion = detectBuildHostGlibcVersion();
+    context.systemPkgConfigPackages = verifySystemPkgConfigPackages(context);
+    fs.mkdirSync(context.buildRoot, { recursive: true });
+    let stagingCreated = false;
+    try {
+        const createdStagingPrefix = createOwnedStagingPrefix(outputPrefix, {
+            token: stagingToken,
+        });
+        if (createdStagingPrefix !== stagingPrefix) {
+            throw new Error(
+                'Linux runtime staging prefix changed unexpectedly.'
+            );
+        }
+        stagingCreated = true;
+        const sourceRecords = acquireSources(context);
+        buildRuntime(context);
+        removeNonRuntimeBuildOutputs(context.prefix);
+        const runtimeMetadata = postProcessRuntime(context);
+        const manifest = writeManifest(context, sourceRecords, runtimeMetadata);
+        publishOwnedOutput({
+            outputPrefix,
+            stagingPrefix,
+        });
+        stagingCreated = false;
+        log(
+            `Built ${manifest.runtimeFiles.length} LGPL-compatible runtime libraries (${manifest.runtimeTotalBytes} bytes) at ${outputPrefix}`
+        );
+    } finally {
+        if (stagingCreated) {
+            fs.rmSync(stagingPrefix, { recursive: true, force: true });
+        }
+    }
+}
+
+const invokedScriptPath = process.argv[1]
+    ? path.resolve(process.argv[1])
+    : undefined;
+if (invokedScriptPath === scriptPath) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
diff --git a/tools/embedded-mpv/build-linux-runtime.test.mjs b/tools/embedded-mpv/build-linux-runtime.test.mjs
new file mode 100644
index 000000000..61a2cbd0a
--- /dev/null
+++ b/tools/embedded-mpv/build-linux-runtime.test.mjs
@@ -0,0 +1,1638 @@
+import assert from 'node:assert/strict';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import test from 'node:test';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+const currentDir = path.dirname(fileURLToPath(import.meta.url));
+const builderScript = path.join(currentDir, 'build-linux-runtime.mjs');
+const builderHelpers = path.join(currentDir, 'build-linux-runtime.cjs');
+const workspaceRoot = path.resolve(currentDir, '..', '..');
+const require = createRequire(import.meta.url);
+const {
+    BUILD_RECIPES,
+    BUILD_ORDER,
+    DEFAULT_SYSTEM_PKG_CONFIG_DIRS,
+    EXTERNAL_SYSTEM_LIBRARIES,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    FFMPEG_CONFIGURE_FLAGS,
+    GLIBC_TOOLCHAIN_ALLOWLIST,
+    MINIMUM_TOOL_VERSIONS,
+    MPV_MESON_FLAGS,
+    OUTPUT_OWNERSHIP_MARKER,
+    PORTABLE_ABI_BASELINE,
+    REQUIRED_TOOLS,
+    RUNTIME_EXTERNAL_CONFIGURATION,
+    SOURCE_PACKAGES,
+    assertArchiveMatchesPin,
+    assertGitCommitMatchesPin,
+    assertMinimumToolVersions,
+    assertOwnedOutputDestination,
+    assertPortableAbiRecords,
+    assertPortableBuildHostGlibc,
+    assertUniqueMesonOptionAssignments,
+    canonicalizeGitSubmoduleStatus,
+    createBuildEnvironment,
+    createLinuxRuntimeManifest,
+    createOwnedStagingPrefix,
+    createRuntimeFileRecords,
+    materializeLibrarySymlinks,
+    parseCliInvocation,
+    parseReadelfDynamic,
+    parseReadelfVersionInfo,
+    preparePinnedHwdataBuildInput,
+    publishOwnedOutput,
+    retainRuntimeLibraries,
+    resolveLinuxPackageBuildEnvironment,
+    resolveSystemPkgConfigDirs,
+    selectReachableRuntimeLibraryNames,
+    validateRuntimeDependencyClosure,
+} = require('./build-linux-runtime.cjs');
+const {
+    validateLinuxRuntimeManifest,
+} = require('./linux-runtime-manifest.cjs');
+
+function createPinnedSourceRecords() {
+    return Object.fromEntries(
+        SOURCE_PACKAGES.map((sourcePackage) => [
+            sourcePackage.id,
+            {
+                ...sourcePackage,
+                ...(sourcePackage.sourceKind === 'git'
+                    ? {
+                          sourceGitCommit: sourcePackage.expectedGitCommit,
+                          sourceSubmodules: [
+                              ...sourcePackage.expectedSubmodules,
+                          ],
+                      }
+                    : {
+                          sourceSha256: sourcePackage.expectedSha256,
+                      }),
+            },
+        ])
+    );
+}
+
+test('provides the Linux source runtime builder entrypoint and helpers', () => {
+    assert.equal(fs.existsSync(builderScript), true);
+    assert.equal(fs.existsSync(builderHelpers), true);
+});
+
+test('canonicalizes exact submodule identities independently of clone depth', () => {
+    const commit = '450bd2232225d6c7728a4108055ac2e37cef6475';
+    const path = '3rdparty/Vulkan-Headers';
+    assert.deepEqual(
+        canonicalizeGitSubmoduleStatus(` ${commit} ${path} (v1.4.337)\n`),
+        [`${commit} ${path}`]
+    );
+    assert.deepEqual(
+        canonicalizeGitSubmoduleStatus(`${commit} ${path} (450bd22)`),
+        [`${commit} ${path}`]
+    );
+});
+
+test('rejects non-clean, unsafe, and duplicate submodule status records', () => {
+    const commit = 'a'.repeat(40);
+    for (const output of [
+        `-${commit} 3rdparty/missing`,
+        `+${commit} 3rdparty/moved`,
+        `U${commit} 3rdparty/conflicted`,
+        ` ${commit} ../outside`,
+        ` ${commit} 3rdparty/example\n ${commit} 3rdparty/example`,
+    ]) {
+        assert.throws(
+            () => canonicalizeGitSubmoduleStatus(output),
+            /not clean|unsafe|duplicate/i
+        );
+    }
+});
+
+test('pins the complete source stack and preserves dependency build order', () => {
+    assert.deepEqual(
+        SOURCE_PACKAGES.map(({ id, version }) => ({ id, version })),
+        [
+            { id: 'freetype', version: '2.13.3' },
+            { id: 'fribidi', version: '1.0.16' },
+            { id: 'harfbuzz', version: '8.5.0' },
+            { id: 'expat', version: '2.8.2' },
+            { id: 'fontconfig', version: '2.16.0' },
+            { id: 'libass', version: '0.17.3' },
+            { id: 'openssl', version: '3.5.7' },
+            { id: 'ffmpeg', version: '8.1' },
+            { id: 'libplacebo', version: '7.360.1' },
+            { id: 'hwdata', version: '0.409' },
+            { id: 'libdisplay-info', version: '0.1.1' },
+            { id: 'mpv', version: '0.41.0' },
+        ]
+    );
+    assert.deepEqual(
+        BUILD_ORDER,
+        SOURCE_PACKAGES.map(({ id }) => id)
+    );
+
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        assert.match(sourcePackage.sourceUrl, /^https:\/\//);
+        assert.ok(sourcePackage.license);
+        if (sourcePackage.id === 'libplacebo') {
+            assert.equal(sourcePackage.sourceTag, 'v7.360.1');
+            assert.equal(sourcePackage.sourceKind, 'git');
+        } else {
+            assert.equal(sourcePackage.sourceKind, 'archive');
+        }
+    }
+
+    const byId = new Map(
+        SOURCE_PACKAGES.map((sourcePackage) => [
+            sourcePackage.id,
+            sourcePackage,
+        ])
+    );
+    assert.equal(
+        byId.get('expat').sourceUrl,
+        'https://github.com/libexpat/libexpat/releases/download/R_2_8_2/expat-2.8.2.tar.xz'
+    );
+    assert.equal(
+        byId.get('fontconfig').sourceUrl,
+        'https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz'
+    );
+    assert.equal(
+        byId.get('openssl').sourceUrl,
+        'https://github.com/openssl/openssl/releases/download/openssl-3.5.7/openssl-3.5.7.tar.gz'
+    );
+    assert.deepEqual(byId.get('hwdata'), {
+        id: 'hwdata',
+        version: '0.409',
+        sourceKind: 'archive',
+        sourceUrl:
+            'https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.409.tar.gz',
+        expectedSha256:
+            '23006accc0f931dd5187d0307a57d0744e2b8feb85e73c37bc0f5229fb31eadd',
+        license: 'GPL-2.0-or-later OR XFree86-1.0',
+        buildInput: {
+            consumer: 'libdisplay-info',
+            relativePath: 'pnp.ids',
+            purpose: 'PNP vendor lookup table compiled into libdisplay-info.',
+        },
+    });
+    assert.deepEqual(byId.get('libdisplay-info'), {
+        id: 'libdisplay-info',
+        version: '0.1.1',
+        sourceKind: 'archive',
+        sourceUrl:
+            'https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/libdisplay-info-0.1.1.tar.xz',
+        expectedSha256:
+            '0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60',
+        license: 'MIT',
+    });
+    assert.ok(
+        BUILD_ORDER.indexOf('hwdata') < BUILD_ORDER.indexOf('libdisplay-info')
+    );
+    assert.ok(
+        BUILD_ORDER.indexOf('libdisplay-info') < BUILD_ORDER.indexOf('mpv')
+    );
+});
+
+test('hardcodes the verified official archive digests and libplacebo commit', () => {
+    const expectedArchivePins = {
+        expat: '3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4',
+        ffmpeg: 'b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a',
+        fontconfig:
+            '6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220',
+        freetype:
+            '0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289',
+        fribidi:
+            '1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c',
+        harfbuzz:
+            '77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27',
+        hwdata: '23006accc0f931dd5187d0307a57d0744e2b8feb85e73c37bc0f5229fb31eadd',
+        libass: 'eae425da50f0015c21f7b3a9c7262a910f0218af469e22e2931462fed3c50959',
+        'libdisplay-info':
+            '0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60',
+        mpv: 'ee21092a5ee427353392360929dc64645c54479aefdb5babc5cfbb5fad626209',
+        openssl:
+            'a8c0d28a529ca480f9f36cf5792e2cd21984552a3c8e4aa11a24aa31aeac98e8',
+    };
+    assert.deepEqual(
+        Object.fromEntries(
+            SOURCE_PACKAGES.filter(({ sourceKind }) => sourceKind === 'archive')
+                .map(({ id, expectedSha256 }) => [id, expectedSha256])
+                .sort(([left], [right]) => left.localeCompare(right))
+        ),
+        expectedArchivePins
+    );
+    assert.equal(
+        SOURCE_PACKAGES.find(({ id }) => id === 'libplacebo').expectedGitCommit,
+        'cee9b076f2c63104ccfd497fa79c39a867293ec4'
+    );
+});
+
+test('rejects archive and git sources that differ from immutable pins', () => {
+    const freetype = SOURCE_PACKAGES.find(({ id }) => id === 'freetype');
+    assert.doesNotThrow(() =>
+        assertArchiveMatchesPin(freetype, freetype.expectedSha256)
+    );
+    assert.throws(
+        () => assertArchiveMatchesPin(freetype, '0'.repeat(64)),
+        /freetype.*SHA-256 mismatch.*expected 055035.*received 000000/i
+    );
+
+    const libplacebo = SOURCE_PACKAGES.find(({ id }) => id === 'libplacebo');
+    assert.doesNotThrow(() =>
+        assertGitCommitMatchesPin(libplacebo, libplacebo.expectedGitCommit)
+    );
+    assert.throws(
+        () => assertGitCommitMatchesPin(libplacebo, '0'.repeat(40)),
+        /libplacebo.*commit mismatch.*expected cee9b.*received 000000/i
+    );
+});
+
+test('verifies source pins before archive extraction or git submodules', () => {
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.ok(
+        builderSource.indexOf(
+            'assertArchiveMatchesPin(sourcePackage, sourceSha256)'
+        ) < builderSource.indexOf("context.run('tar'")
+    );
+    assert.ok(
+        builderSource.indexOf(
+            'assertGitCommitMatchesPin(sourcePackage, sourceGitCommit)'
+        ) <
+            builderSource.indexOf(
+                "['submodule', 'update', '--init', '--recursive', '--depth', '1']"
+            )
+    );
+});
+
+test('rejects source metadata that does not match the immutable pins', () => {
+    const sourceRecords = createPinnedSourceRecords();
+    sourceRecords.freetype.sourceSha256 = '0'.repeat(64);
+    assert.throws(
+        () =>
+            createLinuxRuntimeManifest({
+                sourceRecords,
+                runtimeFiles: [
+                    {
+                        name: 'libmpv.so.2',
+                        size: 1,
+                        sha256: 'a'.repeat(64),
+                    },
+                ],
+                dependencyClosure: {
+                    entries: [
+                        {
+                            name: 'libmpv.so.2',
+                            needed: ['libc.so.6'],
+                            rpath: [],
+                            runpath: ['$ORIGIN'],
+                        },
+                    ],
+                    externalDependencies: ['libc.so.6'],
+                },
+                buildHost: {
+                    platform: 'linux',
+                    arch: 'x64',
+                    tools: {},
+                },
+            }),
+        /freetype.*SHA-256 mismatch/i
+    );
+});
+
+test('defines shared-only source recipes with font discovery before playback', () => {
+    assert.deepEqual(Object.keys(BUILD_RECIPES), BUILD_ORDER);
+    assert.ok(BUILD_RECIPES.freetype.args.includes('--enable-shared'));
+    assert.ok(BUILD_RECIPES.freetype.args.includes('--disable-static'));
+    assert.ok(BUILD_RECIPES.fribidi.args.includes('--disable-docs'));
+    assert.ok(BUILD_RECIPES.fribidi.args.includes('--disable-bin'));
+    for (const flag of [
+        '-Dtests=disabled',
+        '-Ddocs=disabled',
+        '-Dutilities=disabled',
+    ]) {
+        assert.ok(BUILD_RECIPES.harfbuzz.args.includes(flag), flag);
+    }
+    for (const flag of [
+        '-DEXPAT_SHARED_LIBS=ON',
+        '-DEXPAT_BUILD_TOOLS=OFF',
+        '-DEXPAT_BUILD_EXAMPLES=OFF',
+        '-DEXPAT_BUILD_TESTS=OFF',
+        '-DEXPAT_BUILD_DOCS=OFF',
+    ]) {
+        assert.ok(BUILD_RECIPES.expat.args.includes(flag), flag);
+    }
+    for (const flag of [
+        '-Ddoc=disabled',
+        '-Dtests=disabled',
+        '-Dtools=disabled',
+        '-Dcache-build=disabled',
+        '-Dxml-backend=expat',
+        '-Dbaseconfig-dir=/etc/fonts',
+        '-Dconfig-dir=/etc/fonts/conf.d',
+        '-Dtemplate-dir=/usr/share/fontconfig/conf.avail',
+        '-Dcache-dir=/var/cache/fontconfig',
+        '-Dxml-dir=/usr/share/xml/fontconfig',
+    ]) {
+        assert.ok(BUILD_RECIPES.fontconfig.args.includes(flag), flag);
+    }
+    assert.ok(BUILD_RECIPES.libass.args.includes('--enable-fontconfig'));
+    assert.equal(
+        BUILD_RECIPES.libass.args.includes('--disable-fontconfig'),
+        false
+    );
+    for (const flag of [
+        'shared',
+        'no-apps',
+        'no-docs',
+        'no-tests',
+        '--openssldir=/etc/ssl',
+    ]) {
+        assert.ok(BUILD_RECIPES.openssl.args.includes(flag), flag);
+    }
+    assert.ok(
+        BUILD_ORDER.indexOf('fontconfig') < BUILD_ORDER.indexOf('libass')
+    );
+    assert.ok(BUILD_ORDER.indexOf('openssl') < BUILD_ORDER.indexOf('ffmpeg'));
+    assert.equal(BUILD_RECIPES.hwdata.buildSystem, 'data');
+    assert.equal(BUILD_RECIPES.hwdata.sharedOnly, false);
+    assert.equal(BUILD_RECIPES['libdisplay-info'].buildSystem, 'meson');
+    for (const packageId of BUILD_ORDER.filter(
+        (packageId) => packageId !== 'hwdata'
+    )) {
+        assert.equal(BUILD_RECIPES[packageId].sharedOnly, true, packageId);
+    }
+});
+
+test('stages pinned hwdata and excludes host pkg-config fallback', (t) => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-pinned-hwdata-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const sourcePath = path.join(root, 'sources', 'hwdata');
+    const prefix = path.join(root, 'runtime');
+    fs.mkdirSync(sourcePath, { recursive: true });
+    const pnpIds = 'ABC Example Display Vendor\n';
+    fs.writeFileSync(path.join(sourcePath, 'pnp.ids'), pnpIds);
+
+    const invocations = [];
+    const buildEnvironment = {
+        PATH: '/usr/bin',
+        PKG_CONFIG_PATH: '/host/pkgconfig',
+        PKG_CONFIG_LIBDIR:
+            '/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig',
+    };
+    const pinnedEnvironment = preparePinnedHwdataBuildInput({
+        buildEnvironment,
+        prefix,
+        runCapture(command, args, options) {
+            invocations.push({ args, command, env: options.env });
+            assert.equal(options.env.PKG_CONFIG_PATH.includes('/host'), false);
+            assert.equal(options.env.PKG_CONFIG_LIBDIR.includes('/usr'), false);
+            if (args[0] === '--variable=pcfiledir') {
+                return path.join(prefix, 'share', 'pkgconfig');
+            }
+            if (args[0] === '--variable=pkgdatadir') {
+                return path.join(prefix, 'share', 'hwdata');
+            }
+            if (args[0] === '--modversion') {
+                return '0.409';
+            }
+            throw new Error(`Unexpected pkg-config query: ${args.join(' ')}`);
+        },
+        sourcePath,
+    });
+
+    assert.equal(
+        fs.readFileSync(
+            path.join(prefix, 'share', 'hwdata', 'pnp.ids'),
+            'utf8'
+        ),
+        pnpIds
+    );
+    const pkgConfig = fs.readFileSync(
+        path.join(prefix, 'share', 'pkgconfig', 'hwdata.pc'),
+        'utf8'
+    );
+    assert.match(pkgConfig, /^Version: 0\.409$/m);
+    assert.match(
+        pkgConfig,
+        new RegExp(
+            `^pkgdatadir=${path
+                .join(prefix, 'share', 'hwdata')
+                .replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`,
+            'm'
+        )
+    );
+    assert.doesNotMatch(pkgConfig, /\/usr\/share\/hwdata/);
+    assert.equal(pinnedEnvironment.PKG_CONFIG_PATH.includes('/host'), false);
+    assert.equal(pinnedEnvironment.PKG_CONFIG_LIBDIR.includes('/usr'), false);
+    assert.equal(
+        resolveLinuxPackageBuildEnvironment('libdisplay-info', {
+            buildEnvironment,
+            hwdataBuildEnvironment: pinnedEnvironment,
+        }),
+        pinnedEnvironment
+    );
+    assert.equal(
+        resolveLinuxPackageBuildEnvironment('mpv', {
+            buildEnvironment,
+            hwdataBuildEnvironment: pinnedEnvironment,
+        }),
+        buildEnvironment
+    );
+    assert.throws(
+        () =>
+            resolveLinuxPackageBuildEnvironment('libdisplay-info', {
+                buildEnvironment,
+            }),
+        /libdisplay-info.*pinned hwdata/i
+    );
+    assert.deepEqual(
+        invocations.map(({ args, command }) => [command, ...args]),
+        [
+            ['pkg-config', '--variable=pcfiledir', 'hwdata'],
+            ['pkg-config', '--variable=pkgdatadir', 'hwdata'],
+            ['pkg-config', '--modversion', 'hwdata'],
+        ]
+    );
+
+    assert.throws(
+        () =>
+            preparePinnedHwdataBuildInput({
+                buildEnvironment,
+                prefix: path.join(root, 'rejected-runtime'),
+                runCapture(_command, args) {
+                    return args[0] === '--modversion'
+                        ? '0.409'
+                        : '/usr/share/hwdata';
+                },
+                sourcePath,
+            }),
+        /pinned hwdata.*host|host.*hwdata|resolved outside/i
+    );
+});
+
+test('rejects duplicate option assignments in every Meson recipe', () => {
+    assert.doesNotThrow(() =>
+        assertUniqueMesonOptionAssignments(BUILD_RECIPES)
+    );
+
+    for (const [packageId, duplicateFlag] of [
+        ['fontconfig', '-Dxml-backend=libxml2'],
+        ['libplacebo', '-Dvulkan=enabled'],
+    ]) {
+        const duplicateRecipes = {
+            ...BUILD_RECIPES,
+            [packageId]: {
+                ...BUILD_RECIPES[packageId],
+                args: [...BUILD_RECIPES[packageId].args, duplicateFlag],
+            },
+        };
+        assert.throws(
+            () => assertUniqueMesonOptionAssignments(duplicateRecipes),
+            new RegExp(
+                `${packageId}.*${duplicateFlag.split('=')[0]}.*once`,
+                'i'
+            )
+        );
+    }
+});
+
+test('constructs a prefix-only build environment and ignores hostile host flags', () => {
+    const environment = createBuildEnvironment({
+        prefix: '/opt/runtime',
+        baseEnv: {
+            PATH: '/usr/bin',
+            KEEP_ME: 'benign',
+            CPPFLAGS: '-I/host/include',
+            CFLAGS: '-O0 -march=native',
+            CXXFLAGS: '-stdlib=hostile',
+            LDFLAGS: '-L/host/lib -Wl,--as-needed',
+            LD_LIBRARY_PATH: '/host/runtime',
+            LIBRARY_PATH: '/host/implicit',
+            CPATH: '/host/cpath',
+            C_INCLUDE_PATH: '/host/c-include',
+            CPLUS_INCLUDE_PATH: '/host/cxx-include',
+            CMAKE_PREFIX_PATH: '/host/cmake',
+            PKG_CONFIG_PATH: '/host/pkgconfig',
+            PKG_CONFIG_LIBDIR: '/host/pkgconfig-libdir',
+            PKG_CONFIG_SYSROOT_DIR: '/host/sysroot',
+            FONTCONFIG_PATH: '/host/fonts',
+            OPENSSL_MODULES: '/host/openssl-modules',
+        },
+        systemPkgConfigDirs: [
+            '/usr/lib/x86_64-linux-gnu/pkgconfig',
+            '/usr/share/pkgconfig',
+        ],
+    });
+
+    assert.equal(environment.PATH, '/opt/runtime/bin:/usr/bin');
+    assert.equal(
+        environment.PKG_CONFIG_PATH,
+        '/opt/runtime/lib/pkgconfig:/opt/runtime/share/pkgconfig'
+    );
+    assert.equal(
+        environment.PKG_CONFIG_LIBDIR,
+        [
+            '/opt/runtime/lib/pkgconfig',
+            '/opt/runtime/share/pkgconfig',
+            '/usr/lib/x86_64-linux-gnu/pkgconfig',
+            '/usr/share/pkgconfig',
+        ].join(':')
+    );
+    assert.equal(environment.CPPFLAGS, '-I/opt/runtime/include');
+    assert.equal(environment.CFLAGS, '-fPIC -I/opt/runtime/include');
+    assert.equal(environment.CXXFLAGS, '-fPIC -I/opt/runtime/include');
+    assert.equal(
+        environment.LDFLAGS,
+        '-L/opt/runtime/lib -Wl,-rpath-link,/opt/runtime/lib'
+    );
+    assert.equal(environment.LD_LIBRARY_PATH, '/opt/runtime/lib');
+    assert.equal(environment.CMAKE_PREFIX_PATH, '/opt/runtime');
+    assert.equal(environment.KEEP_ME, 'benign');
+    for (const variable of [
+        'LIBRARY_PATH',
+        'CPATH',
+        'C_INCLUDE_PATH',
+        'CPLUS_INCLUDE_PATH',
+        'PKG_CONFIG_SYSROOT_DIR',
+    ]) {
+        assert.equal(environment[variable], undefined, variable);
+    }
+    assert.doesNotMatch(JSON.stringify(environment), /\/host\//);
+});
+
+test('rejects an existing unmarked output without changing its contents', (t) => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-output-ownership-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const outputPrefix = path.join(root, 'usr', 'local');
+    fs.mkdirSync(outputPrefix, { recursive: true });
+    fs.writeFileSync(path.join(outputPrefix, 'keep-me'), 'untouched');
+
+    assert.throws(
+        () => assertOwnedOutputDestination(outputPrefix),
+        /existing output.*ownership marker/i
+    );
+    assert.equal(
+        fs.readFileSync(path.join(outputPrefix, 'keep-me'), 'utf8'),
+        'untouched'
+    );
+});
+
+test('atomically publishes only owned outputs and rolls back failures', (t) => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-output-publish-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const outputPrefix = path.join(root, 'runtime');
+    fs.mkdirSync(outputPrefix);
+    fs.writeFileSync(
+        path.join(outputPrefix, OUTPUT_OWNERSHIP_MARKER),
+        'iptvnator-embedded-mpv-linux-runtime-v1\n'
+    );
+    fs.writeFileSync(path.join(outputPrefix, 'state'), 'previous');
+
+    const failedStagingPrefix = createOwnedStagingPrefix(outputPrefix, {
+        token: 'failed',
+    });
+    fs.writeFileSync(path.join(failedStagingPrefix, 'state'), 'replacement');
+    let renameCount = 0;
+    const failingFileSystem = {
+        ...fs,
+        renameSync(source, destination) {
+            renameCount += 1;
+            if (renameCount === 2) {
+                throw new Error('injected publication failure');
+            }
+            return fs.renameSync(source, destination);
+        },
+    };
+    assert.throws(
+        () =>
+            publishOwnedOutput({
+                fileSystem: failingFileSystem,
+                outputPrefix,
+                stagingPrefix: failedStagingPrefix,
+                token: 'rollback',
+            }),
+        /injected publication failure/
+    );
+    assert.equal(
+        fs.readFileSync(path.join(outputPrefix, 'state'), 'utf8'),
+        'previous'
+    );
+    assert.equal(fs.existsSync(failedStagingPrefix), false);
+    assert.deepEqual(
+        fs.readdirSync(root).filter((name) => name.includes('backup')),
+        []
+    );
+
+    const successfulStagingPrefix = createOwnedStagingPrefix(outputPrefix, {
+        token: 'successful',
+    });
+    fs.writeFileSync(
+        path.join(successfulStagingPrefix, 'state'),
+        'replacement'
+    );
+    publishOwnedOutput({
+        outputPrefix,
+        stagingPrefix: successfulStagingPrefix,
+        token: 'success',
+    });
+    assert.equal(
+        fs.readFileSync(path.join(outputPrefix, 'state'), 'utf8'),
+        'replacement'
+    );
+    assert.equal(
+        fs.readFileSync(
+            path.join(outputPrefix, OUTPUT_OWNERSHIP_MARKER),
+            'utf8'
+        ),
+        'iptvnator-embedded-mpv-linux-runtime-v1\n'
+    );
+});
+
+test('builds in an owned sibling before atomically publishing output', () => {
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.doesNotMatch(
+        builderSource,
+        /fs\.rmSync\(context\.prefix, \{ recursive: true, force: true \}\)/
+    );
+    const toolPreflight = builderSource.indexOf(
+        'assertMinimumToolVersions(toolVersions)'
+    );
+    const stagingMutation = builderSource.indexOf(
+        'createOwnedStagingPrefix(outputPrefix'
+    );
+    const publication = builderSource.indexOf('publishOwnedOutput({');
+    assert.notEqual(stagingMutation, -1);
+    assert.notEqual(publication, -1);
+    assert.ok(toolPreflight < stagingMutation);
+    assert.ok(stagingMutation < publication);
+});
+
+test('uses fixed Linux x64 pkg-config directories without host discovery', () => {
+    assert.deepEqual(DEFAULT_SYSTEM_PKG_CONFIG_DIRS, [
+        '/usr/lib/x86_64-linux-gnu/pkgconfig',
+        '/usr/lib64/pkgconfig',
+        '/usr/lib/pkgconfig',
+        '/usr/share/pkgconfig',
+    ]);
+    assert.deepEqual(
+        resolveSystemPkgConfigDirs({}),
+        DEFAULT_SYSTEM_PKG_CONFIG_DIRS
+    );
+    assert.deepEqual(
+        resolveSystemPkgConfigDirs({
+            IPTVNATOR_EMBEDDED_MPV_SYSTEM_PKG_CONFIG_DIRS:
+                '/opt/interfaces/pkgconfig:/usr/share/pkgconfig:/opt/interfaces/pkgconfig',
+        }),
+        ['/opt/interfaces/pkgconfig', '/usr/share/pkgconfig']
+    );
+    assert.throws(
+        () =>
+            resolveSystemPkgConfigDirs({
+                IPTVNATOR_EMBEDDED_MPV_SYSTEM_PKG_CONFIG_DIRS:
+                    'relative/pkgconfig',
+            }),
+        /must contain only absolute paths/
+    );
+
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.doesNotMatch(builderSource, /--variable['"],\s*['"]pc_path/);
+});
+
+test('declares only the intended Linux system interface packages', () => {
+    assert.deepEqual(EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES, [
+        'alsa',
+        'egl',
+        'gbm',
+        'gl',
+        'libdrm',
+        'libpulse',
+        'libva',
+        'libva-drm',
+    ]);
+
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.match(
+        builderSource,
+        /pkg-config['"],\s*\[['"]--exists['"],\s*packageName\]/
+    );
+    assert.match(
+        builderSource,
+        /pkg-config['"],\s*\[['"]--modversion['"],\s*packageName\]/
+    );
+});
+
+test('requires ELF patching and inspection tools in addition to the build toolchain', () => {
+    for (const tool of [
+        'cc',
+        'cmake',
+        'curl',
+        'git',
+        'gperf',
+        'make',
+        'meson',
+        'nasm',
+        'ninja',
+        'patchelf',
+        'pkg-config',
+        'readelf',
+        'tar',
+    ]) {
+        assert.ok(REQUIRED_TOOLS.includes(tool), tool);
+    }
+});
+
+test('preflights every required tool against a supported minimum version', () => {
+    assert.deepEqual(
+        Object.keys(MINIMUM_TOOL_VERSIONS).sort(),
+        [...REQUIRED_TOOLS].sort()
+    );
+    assert.equal(MINIMUM_TOOL_VERSIONS.meson, '1.6.0');
+    assert.equal(MINIMUM_TOOL_VERSIONS.nasm, '2.15.05');
+    assert.equal(MINIMUM_TOOL_VERSIONS.gperf, '3.1.0');
+
+    const supportedVersions = Object.fromEntries(
+        REQUIRED_TOOLS.map((tool) => [
+            tool,
+            `${tool} ${MINIMUM_TOOL_VERSIONS[tool]}`,
+        ])
+    );
+    assert.doesNotThrow(() => assertMinimumToolVersions(supportedVersions));
+
+    const missingTool = { ...supportedVersions };
+    delete missingTool.nasm;
+    assert.throws(
+        () => assertMinimumToolVersions(missingTool),
+        /missing required tool version.*nasm/i
+    );
+
+    for (const [tool, oldVersion] of [
+        ['gperf', 'GNU gperf 3.0.4'],
+        ['meson', 'meson 1.5.9'],
+        ['nasm', 'NASM version 2.15.04'],
+    ]) {
+        assert.throws(
+            () =>
+                assertMinimumToolVersions({
+                    ...supportedVersions,
+                    [tool]: oldVersion,
+                }),
+            new RegExp(`${tool}.*requires.*${MINIMUM_TOOL_VERSIONS[tool]}`, 'i')
+        );
+    }
+});
+
+test('completes tool and system-package preflight before filesystem mutation', () => {
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    const buildRootMutation = builderSource.indexOf(
+        'fs.mkdirSync(context.buildRoot'
+    );
+    const toolPreflight = builderSource.indexOf(
+        'assertMinimumToolVersions(toolVersions)'
+    );
+    const packagePreflight = builderSource.indexOf(
+        'verifySystemPkgConfigPackages(context)'
+    );
+    const mesonPolicyPreflight = builderSource.indexOf(
+        'assertUniqueMesonOptionAssignments(BUILD_RECIPES)'
+    );
+    assert.notEqual(mesonPolicyPreflight, -1);
+    assert.notEqual(toolPreflight, -1);
+    assert.notEqual(packagePreflight, -1);
+    assert.ok(mesonPolicyPreflight < buildRootMutation);
+    assert.ok(toolPreflight < buildRootMutation);
+    assert.ok(packagePreflight < buildRootMutation);
+});
+
+test('uses DESTDIR with standard fontconfig and OpenSSL runtime paths', () => {
+    assert.deepEqual(RUNTIME_EXTERNAL_CONFIGURATION, {
+        fontconfig: {
+            configDirectory: '/etc/fonts',
+            templateDirectory: '/usr/share/fontconfig',
+            cacheDirectory: '/var/cache/fontconfig',
+            ownership: 'system',
+        },
+        openssl: {
+            configFile: '/etc/ssl/openssl.cnf',
+            certificateFile: '/etc/ssl/cert.pem',
+            certificateDirectory: '/etc/ssl/certs',
+            ownership: 'system',
+        },
+    });
+    assert.doesNotMatch(
+        JSON.stringify(RUNTIME_EXTERNAL_CONFIGURATION),
+        /build|prefix|tmp/i
+    );
+
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.match(builderSource, /DESTDIR/);
+    assert.match(builderSource, /installWithDestdir/);
+    assert.doesNotMatch(
+        builderSource,
+        /--openssldir=\$\{path\.join\(context\.prefix/
+    );
+});
+
+test('preserves relative library symlinks copied out of DESTDIR', async (t) => {
+    const { copyDirectoryContents } = await import(
+        pathToFileURL(builderScript).href
+    );
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-destdir-links-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const sourceDirectory = path.join(root, 'destdir', 'lib');
+    const destinationDirectory = path.join(root, 'prefix', 'lib');
+    fs.mkdirSync(sourceDirectory, { recursive: true });
+    fs.writeFileSync(path.join(sourceDirectory, 'libcrypto.so.3'), 'crypto');
+    fs.symlinkSync(
+        'libcrypto.so.3',
+        path.join(sourceDirectory, 'libcrypto.so')
+    );
+
+    copyDirectoryContents(sourceDirectory, destinationDirectory);
+    fs.rmSync(path.join(root, 'destdir'), {
+        recursive: true,
+        force: true,
+    });
+
+    assert.equal(
+        fs.readlinkSync(path.join(destinationDirectory, 'libcrypto.so')),
+        'libcrypto.so.3'
+    );
+    assert.equal(
+        fs.readFileSync(
+            path.join(destinationDirectory, 'libcrypto.so'),
+            'utf8'
+        ),
+        'crypto'
+    );
+});
+
+test('uses an explicit LGPL FFmpeg HTTPS and HLS protocol baseline', () => {
+    const required = [
+        '--enable-shared',
+        '--disable-static',
+        '--disable-programs',
+        '--disable-doc',
+        '--disable-debug',
+        '--disable-autodetect',
+        '--disable-gpl',
+        '--disable-nonfree',
+        '--enable-pic',
+        '--enable-pthreads',
+        '--enable-openssl',
+        '--enable-network',
+        '--enable-protocol=file',
+        '--enable-protocol=http',
+        '--enable-protocol=https',
+        '--enable-protocol=tcp',
+        '--enable-protocol=tls',
+        '--enable-protocol=udp',
+        '--enable-protocol=crypto',
+        '--enable-protocol=data',
+        '--enable-demuxer=hls',
+        '--enable-vaapi',
+    ];
+
+    for (const flag of required) {
+        assert.ok(FFMPEG_CONFIGURE_FLAGS.includes(flag), `missing ${flag}`);
+    }
+    for (const forbidden of [
+        '--enable-gpl',
+        '--enable-nonfree',
+        '--enable-version3',
+    ]) {
+        assert.equal(FFMPEG_CONFIGURE_FLAGS.includes(forbidden), false);
+    }
+});
+
+test('uses valid mpv v0.41 Meson option names and pins the Linux backends', () => {
+    const upstreamMpv041Options = new Set([
+        'aaudio',
+        'alsa',
+        'android-media-ndk',
+        'audiotrack',
+        'audiounit',
+        'avfoundation',
+        'build-date',
+        'caca',
+        'cdda',
+        'coreaudio',
+        'cocoa',
+        'cplayer',
+        'cplugins',
+        'cuda-hwaccel',
+        'cuda-interop',
+        'd3d-hwaccel',
+        'd3d11',
+        'd3d9-hwaccel',
+        'direct3d',
+        'disable-packet-pool',
+        'dmabuf-wayland',
+        'drm',
+        'dvbin',
+        'dvdnav',
+        'egl',
+        'egl-android',
+        'egl-angle',
+        'egl-angle-lib',
+        'egl-angle-win32',
+        'egl-drm',
+        'egl-wayland',
+        'egl-x11',
+        'fuzzers',
+        'gbm',
+        'gl',
+        'gl-cocoa',
+        'gl-dxinterop',
+        'gl-dxinterop-d3d9',
+        'gl-win32',
+        'gl-x11',
+        'gpl',
+        'html-build',
+        'iconv',
+        'ios-gl',
+        'jack',
+        'javascript',
+        'jpeg',
+        'lcms2',
+        'libarchive',
+        'libavdevice',
+        'libbluray',
+        'libmpv',
+        'lua',
+        'macos-10-15-4-features',
+        'macos-11-3-features',
+        'macos-11-features',
+        'macos-12-features',
+        'macos-cocoa-cb',
+        'macos-media-player',
+        'macos-touchbar',
+        'manpage-build',
+        'openal',
+        'opensles',
+        'oss-audio',
+        'pdf-build',
+        'pipewire',
+        'plain-gl',
+        'pthread-debug',
+        'pulse',
+        'rubberband',
+        'sdl2-audio',
+        'sdl2-gamepad',
+        'sdl2-video',
+        'shaderc',
+        'sixel',
+        'sndio',
+        'spirv-cross',
+        'swift-build',
+        'tests',
+        'uchardet',
+        'uwp',
+        'vaapi',
+        'vaapi-drm',
+        'vaapi-wayland',
+        'vaapi-win32',
+        'vaapi-x11',
+        'vapoursynth',
+        'vdpau',
+        'vdpau-gl-x11',
+        'vector',
+        'videotoolbox-gl',
+        'videotoolbox-pl',
+        'vulkan',
+        'wasapi',
+        'wayland',
+        'win32-smtc',
+        'win32-threads',
+        'x11',
+        'x11-clipboard',
+        'xv',
+        'zimg',
+        'zlib',
+    ]);
+
+    for (const flag of MPV_MESON_FLAGS) {
+        const optionName = flag.slice(2).split('=')[0];
+        assert.ok(
+            upstreamMpv041Options.has(optionName),
+            `unknown mpv v0.41 option ${optionName}`
+        );
+        assert.doesNotMatch(flag, /=auto$/);
+    }
+
+    for (const required of [
+        '-Dgpl=false',
+        '-Dlibmpv=true',
+        '-Dcplayer=false',
+        '-Dtests=false',
+        '-Dlua=disabled',
+        '-Djavascript=disabled',
+        '-Dcplugins=disabled',
+        '-Dmanpage-build=disabled',
+        '-Dhtml-build=disabled',
+        '-Dpdf-build=disabled',
+        '-Dlibarchive=disabled',
+        '-Dlibbluray=disabled',
+        '-Ddvdnav=disabled',
+        '-Dcdda=disabled',
+        '-Ddvbin=disabled',
+        '-Dvulkan=disabled',
+        '-Dshaderc=disabled',
+        '-Dspirv-cross=disabled',
+        '-Ddrm=enabled',
+        '-Dgl=enabled',
+        '-Dplain-gl=enabled',
+        '-Degl=enabled',
+        '-Dgbm=enabled',
+        '-Dpulse=enabled',
+        '-Dalsa=enabled',
+        '-Dvaapi=enabled',
+        '-Dvaapi-drm=enabled',
+    ]) {
+        assert.ok(MPV_MESON_FLAGS.includes(required), `missing ${required}`);
+    }
+    assert.equal(MPV_MESON_FLAGS.includes('-Ddrm=disabled'), false);
+    for (const optionName of ['drm', 'gbm', 'vaapi-drm']) {
+        const assignments = MPV_MESON_FLAGS.filter((flag) =>
+            flag.startsWith(`-D${optionName}=`)
+        );
+        assert.deepEqual(assignments, [`-D${optionName}=enabled`]);
+    }
+});
+
+test('keeps the external dependency allowlists explicit and deterministic', () => {
+    assert.deepEqual(GLIBC_TOOLCHAIN_ALLOWLIST, [
+        'ld-linux-x86-64.so.2',
+        'libc.so.6',
+        'libdl.so.2',
+        'libgcc_s.so.1',
+        'libm.so.6',
+        'libpthread.so.0',
+        'librt.so.1',
+        'libstdc++.so.6',
+    ]);
+    assert.deepEqual(
+        EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+        [
+            'libEGL.so.1',
+            'libGL.so.1',
+            'libGLX.so.0',
+            'libOpenGL.so.0',
+            'libasound.so.2',
+            'libdrm.so.2',
+            'libgbm.so.1',
+            'libpulse.so.0',
+            'libva-drm.so.2',
+            'libva.so.2',
+        ]
+    );
+    for (const externalLibrary of EXTERNAL_SYSTEM_LIBRARIES) {
+        assert.ok(externalLibrary.interface);
+        assert.ok(externalLibrary.reason);
+    }
+});
+
+test('parses readelf dynamic sections and validates an ORIGIN-only closure', () => {
+    const mpvDynamic = parseReadelfDynamic(`
+ 0x000000000000000e (SONAME)             Library soname: [libmpv.so.2]
+ 0x0000000000000001 (NEEDED)             Shared library: [libavcodec.so.62]
+ 0x0000000000000001 (NEEDED)             Shared library: [libEGL.so.1]
+ 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
+ 0x000000000000001d (RUNPATH)            Library runpath: [$ORIGIN]
+`);
+    assert.deepEqual(mpvDynamic, {
+        needed: ['libEGL.so.1', 'libavcodec.so.62', 'libc.so.6'],
+        rpath: [],
+        runpath: ['$ORIGIN'],
+        soname: 'libmpv.so.2',
+    });
+
+    const closure = validateRuntimeDependencyClosure({
+        entries: [
+            {
+                name: 'libavcodec.so.62',
+                ...parseReadelfDynamic(`
+ 0x0000000000000001 (NEEDED) Shared library: [libm.so.6]
+ 0x000000000000001d (RUNPATH) Library runpath: [$ORIGIN]
+`),
+            },
+            { name: 'libmpv.so.2', ...mpvDynamic },
+        ],
+        runtimeFileNames: ['libavcodec.so.62', 'libmpv.so.2'],
+        buildPrefix: '/tmp/iptvnator-prefix',
+    });
+    assert.deepEqual(closure.externalDependencies, [
+        'libEGL.so.1',
+        'libc.so.6',
+        'libm.so.6',
+    ]);
+    assert.deepEqual(closure.entries[1].needed, [
+        'libEGL.so.1',
+        'libavcodec.so.62',
+        'libc.so.6',
+    ]);
+    assert.equal(closure.entries[1].soname, 'libmpv.so.2');
+
+    const aliasClosure = validateRuntimeDependencyClosure({
+        entries: [
+            {
+                name: 'libmpv.so',
+                ...mpvDynamic,
+            },
+            {
+                name: 'libmpv.so.2',
+                ...mpvDynamic,
+            },
+            {
+                name: 'libavcodec.so.62',
+                needed: ['libm.so.6'],
+                rpath: [],
+                runpath: ['$ORIGIN'],
+                soname: 'libavcodec.so.62',
+            },
+        ],
+        runtimeFileNames: ['libavcodec.so.62', 'libmpv.so', 'libmpv.so.2'],
+        buildPrefix: '/tmp/iptvnator-prefix',
+    });
+    assert.equal(
+        aliasClosure.entries.find(({ name }) => name === 'libmpv.so').soname,
+        'libmpv.so.2'
+    );
+    assert.throws(
+        () =>
+            validateRuntimeDependencyClosure({
+                entries: aliasClosure.entries.map((entry) =>
+                    entry.name === 'libmpv.so'
+                        ? { ...entry, soname: 'libmpv.so.99' }
+                        : entry
+                ),
+                runtimeFileNames: [
+                    'libavcodec.so.62',
+                    'libmpv.so',
+                    'libmpv.so.2',
+                ],
+                buildPrefix: '/tmp/iptvnator-prefix',
+            }),
+        /libmpv\.so must declare a versioned SONAME present in the runtime closure/
+    );
+
+    assert.throws(
+        () =>
+            validateRuntimeDependencyClosure({
+                entries: [
+                    {
+                        name: 'libmpv.so.2',
+                        needed: ['libsurprise.so.1'],
+                        rpath: [],
+                        runpath: ['$ORIGIN'],
+                    },
+                ],
+                runtimeFileNames: ['libmpv.so.2'],
+                buildPrefix: '/tmp/iptvnator-prefix',
+            }),
+        /not bundled or allowlisted.*libsurprise\.so\.1/
+    );
+    for (const forbiddenRunpath of [
+        '/tmp/iptvnator-prefix/lib',
+        '/usr/local/lib',
+        '$ORIGIN:/tmp/host-lib',
+    ]) {
+        assert.throws(
+            () =>
+                validateRuntimeDependencyClosure({
+                    entries: [
+                        {
+                            name: 'libmpv.so.2',
+                            needed: ['libc.so.6'],
+                            rpath: [],
+                            runpath: [forbiddenRunpath],
+                        },
+                    ],
+                    runtimeFileNames: ['libmpv.so.2'],
+                    buildPrefix: '/tmp/iptvnator-prefix',
+                }),
+            /RUNPATH/
+        );
+    }
+});
+
+test('retains only the reachable SONAME closure plus the libmpv linker alias', (t) => {
+    const entries = [
+        {
+            name: 'libmpv.so',
+            soname: 'libmpv.so.2',
+            needed: ['libavcodec.so.62', 'libc.so.6'],
+        },
+        {
+            name: 'libmpv.so.2',
+            soname: 'libmpv.so.2',
+            needed: ['libavcodec.so.62', 'libc.so.6'],
+        },
+        {
+            name: 'libmpv.so.2.0.0',
+            soname: 'libmpv.so.2',
+            needed: ['libavcodec.so.62', 'libc.so.6'],
+        },
+        {
+            name: 'libavcodec.so',
+            soname: 'libavcodec.so.62',
+            needed: ['libm.so.6'],
+        },
+        {
+            name: 'libavcodec.so.62',
+            soname: 'libavcodec.so.62',
+            needed: ['libm.so.6'],
+        },
+        {
+            name: 'libavcodec.so.62.1.0',
+            soname: 'libavcodec.so.62',
+            needed: ['libm.so.6'],
+        },
+        {
+            name: 'libunused.so.1',
+            soname: 'libunused.so.1',
+            needed: ['libc.so.6'],
+        },
+    ];
+    const retainedNames = selectReachableRuntimeLibraryNames(entries);
+    assert.deepEqual(retainedNames, [
+        'libavcodec.so.62',
+        'libmpv.so',
+        'libmpv.so.2',
+    ]);
+
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-runtime-prune-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const libDir = path.join(root, 'lib');
+    fs.mkdirSync(libDir);
+    fs.writeFileSync(path.join(libDir, 'libmpv.so.2.0.0'), 'mpv');
+    fs.symlinkSync('libmpv.so.2.0.0', path.join(libDir, 'libmpv.so.2'));
+    fs.symlinkSync('libmpv.so.2', path.join(libDir, 'libmpv.so'));
+    fs.writeFileSync(path.join(libDir, 'libavcodec.so.62.1.0'), 'codec');
+    fs.symlinkSync(
+        'libavcodec.so.62.1.0',
+        path.join(libDir, 'libavcodec.so.62')
+    );
+    fs.symlinkSync('libavcodec.so.62', path.join(libDir, 'libavcodec.so'));
+    fs.writeFileSync(path.join(libDir, 'libunused.so.1'), 'unused');
+
+    retainRuntimeLibraries(libDir, retainedNames);
+    assert.deepEqual(fs.readdirSync(libDir).sort(), retainedNames);
+    for (const retainedName of retainedNames) {
+        assert.equal(
+            fs.lstatSync(path.join(libDir, retainedName)).isFile(),
+            true,
+            retainedName
+        );
+    }
+});
+
+test('enforces the Ubuntu 22.04 GLIBC and GLIBCXX symbol ceilings', () => {
+    assert.deepEqual(PORTABLE_ABI_BASELINE, {
+        distribution: 'Ubuntu 22.04',
+        glibcMaximum: '2.35',
+        glibcxxMaximum: '3.4.30',
+    });
+    const record = parseReadelfVersionInfo(
+        `
+  0x0010:   Name: GLIBC_2.2.5  Flags: none  Version: 7
+  0x0020:   Name: GLIBC_2.34   Flags: none  Version: 5
+  0x0030:   Name: GLIBCXX_3.4.21  Flags: none  Version: 4
+  0x0040:   Name: GLIBCXX_3.4.29  Flags: none  Version: 3
+`,
+        'libmpv.so.2'
+    );
+    assert.deepEqual(record, {
+        name: 'libmpv.so.2',
+        requiredGlibc: '2.34',
+        requiredGlibcxx: '3.4.29',
+    });
+    assert.doesNotThrow(() => assertPortableAbiRecords([record]));
+
+    for (const [field, version] of [
+        ['requiredGlibc', '2.36'],
+        ['requiredGlibcxx', '3.4.31'],
+    ]) {
+        assert.throws(
+            () =>
+                assertPortableAbiRecords([
+                    {
+                        ...record,
+                        [field]: version,
+                    },
+                ]),
+            /portable ABI baseline.*newer symbol/i
+        );
+    }
+});
+
+test('rejects build hosts newer than the portable glibc baseline', () => {
+    assert.doesNotThrow(() => assertPortableBuildHostGlibc('2.35'));
+    assert.throws(
+        () => assertPortableBuildHostGlibc('2.36'),
+        /build host glibc 2\.36.*portable ABI baseline.*2\.35/i
+    );
+    assert.throws(
+        () => assertPortableBuildHostGlibc(undefined),
+        /unable to determine the Linux build host glibc version/i
+    );
+});
+
+test('inspects every retained runtime file for portable symbol versions', () => {
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.match(
+        builderSource,
+        /runCapture\('readelf', \[\s*'--version-info',\s*libraryPath,\s*\]\)/
+    );
+    assert.match(builderSource, /retainRuntimeLibraries\(libDir,/);
+    assert.match(builderSource, /assertPortableAbiRecords\(abiRecords\)/);
+});
+
+test('materializes symlink aliases and hashes every runtime library', (t) => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-builder-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const libDir = path.join(root, 'lib');
+    fs.mkdirSync(libDir);
+    const contents = Buffer.from('fake-elf-runtime');
+    fs.writeFileSync(path.join(libDir, 'libmpv.so.2.0.0'), contents);
+    fs.symlinkSync('libmpv.so.2.0.0', path.join(libDir, 'libmpv.so.2'));
+    fs.symlinkSync('libmpv.so.2', path.join(libDir, 'libmpv.so'));
+
+    materializeLibrarySymlinks(libDir);
+
+    for (const name of ['libmpv.so', 'libmpv.so.2', 'libmpv.so.2.0.0']) {
+        const filePath = path.join(libDir, name);
+        assert.equal(fs.lstatSync(filePath).isFile(), true);
+        assert.deepEqual(fs.readFileSync(filePath), contents);
+    }
+    assert.deepEqual(createRuntimeFileRecords(libDir), [
+        {
+            name: 'libmpv.so',
+            size: contents.length,
+            sha256: crypto.createHash('sha256').update(contents).digest('hex'),
+        },
+        {
+            name: 'libmpv.so.2',
+            size: contents.length,
+            sha256: crypto.createHash('sha256').update(contents).digest('hex'),
+        },
+        {
+            name: 'libmpv.so.2.0.0',
+            size: contents.length,
+            sha256: crypto.createHash('sha256').update(contents).digest('hex'),
+        },
+    ]);
+});
+
+test('generates a hash-complete manifest accepted by the Linux validator', (t) => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-manifest-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const libDir = path.join(root, 'lib');
+    fs.mkdirSync(libDir);
+    fs.writeFileSync(path.join(libDir, 'libavcodec.so.62'), 'avcodec');
+    fs.writeFileSync(path.join(libDir, 'libmpv.so'), 'mpv');
+    fs.writeFileSync(path.join(libDir, 'libmpv.so.2'), 'mpv');
+    const runtimeFiles = createRuntimeFileRecords(libDir);
+    const sourceRecords = createPinnedSourceRecords();
+    const abiRecords = runtimeFiles.map(({ name }) => ({
+        name,
+        requiredGlibc: '2.34',
+        requiredGlibcxx: null,
+    }));
+    const manifest = createLinuxRuntimeManifest({
+        sourceRecords,
+        runtimeFiles,
+        abiRecords,
+        dependencyClosure: {
+            entries: [
+                {
+                    name: 'libavcodec.so.62',
+                    soname: 'libavcodec.so.62',
+                    needed: ['libm.so.6'],
+                    rpath: [],
+                    runpath: ['$ORIGIN'],
+                },
+                {
+                    name: 'libmpv.so',
+                    soname: 'libmpv.so.2',
+                    needed: ['libavcodec.so.62', 'libEGL.so.1'],
+                    rpath: [],
+                    runpath: ['$ORIGIN'],
+                },
+                {
+                    name: 'libmpv.so.2',
+                    soname: 'libmpv.so.2',
+                    needed: ['libavcodec.so.62', 'libEGL.so.1'],
+                    rpath: [],
+                    runpath: ['$ORIGIN'],
+                },
+            ],
+            externalDependencies: ['libEGL.so.1', 'libm.so.6'],
+        },
+        buildHost: {
+            platform: 'linux',
+            arch: 'x64',
+            release: 'fixture-kernel',
+            glibcVersion: '2.35',
+            systemPkgConfigDirs: [...DEFAULT_SYSTEM_PKG_CONFIG_DIRS],
+            systemPkgConfigPackages: Object.fromEntries(
+                EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES.map((packageName) => [
+                    packageName,
+                    `${packageName} fixture version`,
+                ])
+            ),
+            tools: Object.fromEntries(
+                REQUIRED_TOOLS.map((tool) => [
+                    tool,
+                    `${tool} ${MINIMUM_TOOL_VERSIONS[tool]}`,
+                ])
+            ),
+        },
+        generatedAt: '2026-07-17T00:00:00.000Z',
+    });
+
+    assert.deepEqual(validateLinuxRuntimeManifest(manifest), []);
+    assert.equal(
+        manifest.runtimeTotalBytes,
+        runtimeFiles.reduce((total, runtimeFile) => total + runtimeFile.size, 0)
+    );
+    assert.deepEqual(manifest.runtimeDependencyClosure.externalDependencies, [
+        'libEGL.so.1',
+        'libm.so.6',
+    ]);
+    assert.equal(
+        manifest.runtimeDependencyClosure.entries.find(
+            ({ name }) => name === 'libmpv.so'
+        ).soname,
+        'libmpv.so.2'
+    );
+    assert.deepEqual(
+        manifest.externalSystemLibraries,
+        EXTERNAL_SYSTEM_LIBRARIES
+    );
+    assert.deepEqual(manifest.runtimeAbi, {
+        baseline: PORTABLE_ABI_BASELINE,
+        files: abiRecords,
+    });
+    assert.deepEqual(
+        manifest.runtimeExternalConfiguration,
+        RUNTIME_EXTERNAL_CONFIGURATION
+    );
+    assert.equal(manifest.buildHost.glibcVersion, '2.35');
+    assert.deepEqual(
+        Object.keys(manifest.buildHost.systemPkgConfigPackages),
+        EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES
+    );
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        if (sourcePackage.sourceKind === 'archive') {
+            assert.equal(
+                manifest.packages[sourcePackage.id].sourceSha256,
+                sourcePackage.expectedSha256
+            );
+        }
+    }
+    assert.equal(
+        manifest.packages.libplacebo.sourceGitCommit,
+        SOURCE_PACKAGES.find(({ id }) => id === 'libplacebo').expectedGitCommit
+    );
+    assert.doesNotMatch(manifest.sourceDistribution, /TBD|TODO/i);
+    assert.match(manifest.sourceDistribution, /source archives/i);
+    assert.match(manifest.sourceDistribution, /libdisplay-info/i);
+    assert.match(manifest.sourceDistribution, /hwdata/i);
+    assert.match(manifest.sourceDistribution, /pnp\.ids/i);
+    assert.deepEqual(manifest.packages.hwdata.buildInput, {
+        consumer: 'libdisplay-info',
+        relativePath: 'pnp.ids',
+        purpose: 'PNP vendor lookup table compiled into libdisplay-info.',
+    });
+});
+
+test('guards the CLI to Linux x64 and requires exactly one output prefix', () => {
+    assert.deepEqual(
+        parseCliInvocation({
+            platform: 'linux',
+            arch: 'x64',
+            argv: ['/tmp/runtime'],
+            cwd: '/workspace',
+        }),
+        { prefix: '/tmp/runtime' }
+    );
+    assert.deepEqual(
+        parseCliInvocation({
+            platform: 'linux',
+            arch: 'x64',
+            argv: ['--', 'relative/runtime'],
+            cwd: '/workspace',
+        }),
+        { prefix: '/workspace/relative/runtime' }
+    );
+    assert.throws(
+        () =>
+            parseCliInvocation({
+                platform: 'darwin',
+                arch: 'x64',
+                argv: ['/tmp/runtime'],
+                cwd: '/workspace',
+            }),
+        /supported on Linux x64 only.*darwin\/x64/
+    );
+    assert.throws(
+        () =>
+            parseCliInvocation({
+                platform: 'linux',
+                arch: 'arm64',
+                argv: ['/tmp/runtime'],
+                cwd: '/workspace',
+            }),
+        /supported on Linux x64 only.*linux\/arm64/
+    );
+    for (const argv of [[], ['/one', '/two']]) {
+        assert.throws(
+            () =>
+                parseCliInvocation({
+                    platform: 'linux',
+                    arch: 'x64',
+                    argv,
+                    cwd: '/workspace',
+                }),
+            /Usage: node tools\/embedded-mpv\/build-linux-runtime\.mjs <output-prefix>/
+        );
+    }
+});
+
+test('does not execute the Linux build when the entrypoint is imported', async () => {
+    await assert.doesNotReject(() => import(pathToFileURL(builderScript).href));
+});
+
+test('patches every materialized ELF runtime to ORIGIN before validating closure', () => {
+    const builderSource = fs.readFileSync(builderScript, 'utf8');
+    assert.match(
+        builderSource,
+        /run\('patchelf', \['--set-rpath', '\$ORIGIN', libraryPath\]\)/
+    );
+    assert.match(
+        builderSource,
+        /runCapture\('readelf', \['-d', libraryPath\]\)/
+    );
+    assert.match(builderSource, /retainRuntimeLibraries\(libDir,/);
+    assert.match(builderSource, /validateRuntimeDependencyClosure\(\{/);
+    assert.match(builderSource, /createRuntimeFileRecords\(libDir\)/);
+    assert.match(builderSource, /runtime-manifest\.json/);
+    assert.match(builderSource, /validateLinuxRuntimeManifest\(manifest\)/);
+});
+
+test('registers the builder script and focused test with package and Nx', () => {
+    const packageMetadata = JSON.parse(
+        fs.readFileSync(path.join(workspaceRoot, 'package.json'), 'utf8')
+    );
+    assert.equal(
+        packageMetadata.scripts['embedded-mpv:build-runtime:linux'],
+        'node tools/embedded-mpv/build-linux-runtime.mjs'
+    );
+
+    const packagingProject = JSON.parse(
+        fs.readFileSync(
+            path.join(workspaceRoot, 'tools', 'packaging', 'project.json'),
+            'utf8'
+        )
+    );
+    const inputs = packagingProject.targets.test.inputs;
+    for (const registeredInput of [
+        '{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.cjs',
+        '{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.mjs',
+        '{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.test.mjs',
+    ]) {
+        assert.ok(inputs.includes(registeredInput), registeredInput);
+    }
+    assert.match(
+        packagingProject.targets.test.options.command,
+        /tools\/embedded-mpv\/build-linux-runtime\.test\.mjs/
+    );
+
+    const lintInputs = packagingProject.targets.lint.inputs;
+    for (const registeredInput of [
+        '{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.mjs',
+        '{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.test.mjs',
+    ]) {
+        assert.ok(lintInputs.includes(registeredInput), registeredInput);
+    }
+    assert.match(
+        packagingProject.targets.lint.command,
+        /tools\/embedded-mpv\/build-linux-runtime\.\{mjs,test\.mjs\}/
+    );
+});
diff --git a/tools/embedded-mpv/generate-linux-runtime-notices.cjs b/tools/embedded-mpv/generate-linux-runtime-notices.cjs
new file mode 100644
index 000000000..ec2a44dc1
--- /dev/null
+++ b/tools/embedded-mpv/generate-linux-runtime-notices.cjs
@@ -0,0 +1,753 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const { SOURCE_PACKAGES } = require('./build-linux-runtime.cjs');
+
+const LICENSE_INPUT_MANIFEST = 'linux-runtime-license-inputs.json';
+const NOTICE_MANIFEST = 'embedded-mpv-notices.json';
+const THIRD_PARTY_NOTICES = 'THIRD_PARTY_NOTICES.txt';
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+const compareText = (left, right) => (left < right ? -1 : left > right ? 1 : 0);
+const NOTICE_SOURCE_PACKAGES = Object.freeze(
+    [...SOURCE_PACKAGES].sort(({ id: left }, { id: right }) =>
+        compareText(left, right)
+    )
+);
+
+const LICENSE_PATHS_BY_PACKAGE = Object.freeze({
+    freetype: Object.freeze(['LICENSE.TXT', 'docs/FTL.TXT']),
+    fribidi: Object.freeze(['COPYING']),
+    harfbuzz: Object.freeze(['COPYING']),
+    expat: Object.freeze(['COPYING']),
+    fontconfig: Object.freeze(['COPYING']),
+    libass: Object.freeze(['COPYING']),
+    openssl: Object.freeze(['LICENSE.txt']),
+    ffmpeg: Object.freeze(['LICENSE.md', 'COPYING.LGPLv2.1']),
+    libplacebo: Object.freeze([
+        'LICENSE',
+        '3rdparty/Vulkan-Headers/LICENSE.md',
+        '3rdparty/fast_float/LICENSE-APACHE',
+        '3rdparty/fast_float/LICENSE-BOOST',
+        '3rdparty/fast_float/LICENSE-MIT',
+        '3rdparty/glad/LICENSE',
+        '3rdparty/jinja/LICENSE.txt',
+        '3rdparty/markupsafe/LICENSE.txt',
+        'demos/3rdparty/nuklear/LICENSE',
+    ]),
+    hwdata: Object.freeze(['LICENSE', 'COPYING']),
+    'libdisplay-info': Object.freeze(['LICENSE']),
+    mpv: Object.freeze(['Copyright', 'LICENSE.LGPL']),
+});
+
+function sha256(contents) {
+    return crypto.createHash('sha256').update(contents).digest('hex');
+}
+
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function hasExactFields(value, fields) {
+    return (
+        isObject(value) &&
+        isDeepStrictEqual(Object.keys(value).sort(), [...fields].sort())
+    );
+}
+
+function isPathInside(root, candidate) {
+    const relative = path.relative(root, candidate);
+    return (
+        relative === '' ||
+        (relative !== '..' &&
+            !relative.startsWith(`..${path.sep}`) &&
+            !path.isAbsolute(relative))
+    );
+}
+
+function assertDirectoryWithoutSymlinks(directoryPath, label) {
+    let stat;
+    try {
+        stat = fs.lstatSync(directoryPath);
+    } catch {
+        throw new Error(`Missing ${label}: ${directoryPath}`);
+    }
+    if (!stat.isDirectory() || stat.isSymbolicLink()) {
+        throw new Error(`${label} must be a real directory: ${directoryPath}`);
+    }
+    return fs.realpathSync(directoryPath);
+}
+
+function assertRegularFileInside(root, relativePath, label) {
+    if (
+        typeof relativePath !== 'string' ||
+        relativePath.length === 0 ||
+        path.isAbsolute(relativePath) ||
+        relativePath.split(/[\\/]/).some((part) => part === '..' || part === '')
+    ) {
+        throw new Error(
+            `${label} has an unsafe relative path: ${relativePath}`
+        );
+    }
+    const realRoot = assertDirectoryWithoutSymlinks(root, `${label} root`);
+    const candidate = path.resolve(root, ...relativePath.split('/'));
+    if (!isPathInside(path.resolve(root), candidate)) {
+        throw new Error(`${label} resolves outside ${root}: ${relativePath}`);
+    }
+
+    let cursor = path.resolve(root);
+    const parts = path.relative(cursor, candidate).split(path.sep);
+    for (const [index, part] of parts.entries()) {
+        cursor = path.join(cursor, part);
+        let stat;
+        try {
+            stat = fs.lstatSync(cursor);
+        } catch {
+            throw new Error(`Missing ${label}: ${cursor}`);
+        }
+        if (stat.isSymbolicLink()) {
+            throw new Error(`${label} must not use a symbolic link: ${cursor}`);
+        }
+        if (index < parts.length - 1 && !stat.isDirectory()) {
+            throw new Error(`${label} parent must be a directory: ${cursor}`);
+        }
+        if (index === parts.length - 1 && !stat.isFile()) {
+            throw new Error(`${label} must be a regular file: ${cursor}`);
+        }
+    }
+
+    const realCandidate = fs.realpathSync(candidate);
+    if (!isPathInside(realRoot, realCandidate)) {
+        throw new Error(
+            `${label} resolves outside its trusted root: ${relativePath}`
+        );
+    }
+    return realCandidate;
+}
+
+function sourcePackageMetadata(sourcePackage) {
+    return {
+        version: sourcePackage.version,
+        sourceUrl: sourcePackage.sourceUrl,
+        ...(sourcePackage.sourceTag
+            ? { sourceTag: sourcePackage.sourceTag }
+            : {}),
+        ...(sourcePackage.sourceKind === 'archive'
+            ? { sourceSha256: sourcePackage.expectedSha256 }
+            : { sourceGitCommit: sourcePackage.expectedGitCommit }),
+        license: sourcePackage.license,
+    };
+}
+
+function validateRuntimeManifestPackages(runtimeManifest) {
+    if (
+        !isObject(runtimeManifest) ||
+        runtimeManifest.platform !== 'linux' ||
+        runtimeManifest.arch !== 'x64' ||
+        !isObject(runtimeManifest.packages) ||
+        !isDeepStrictEqual(
+            Object.keys(runtimeManifest.packages).sort(),
+            SOURCE_PACKAGES.map(({ id }) => id).sort()
+        )
+    ) {
+        throw new Error(
+            'Linux runtime notice generation requires the exact pinned linux-x64 package manifest.'
+        );
+    }
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        const actual = runtimeManifest.packages[sourcePackage.id];
+        const expected = sourcePackageMetadata(sourcePackage);
+        for (const [field, expectedValue] of Object.entries(expected)) {
+            if (!isDeepStrictEqual(actual?.[field], expectedValue)) {
+                throw new Error(
+                    `Linux runtime package ${sourcePackage.id}.${field} does not match its immutable pin.`
+                );
+            }
+        }
+        if (
+            sourcePackage.sourceKind === 'git' &&
+            (!Array.isArray(actual.sourceSubmodules) ||
+                actual.sourceSubmodules.length === 0)
+        ) {
+            throw new Error(
+                `Linux runtime package ${sourcePackage.id} must record pinned submodules.`
+            );
+        }
+        const licensePaths = LICENSE_PATHS_BY_PACKAGE[sourcePackage.id];
+        if (!Array.isArray(licensePaths) || licensePaths.length === 0) {
+            throw new Error(
+                `Linux runtime package ${sourcePackage.id} has no pinned upstream license files.`
+            );
+        }
+    }
+}
+
+function fileRecord(filePath, relativePath) {
+    const contents = fs.readFileSync(filePath);
+    return {
+        path: relativePath.split(path.sep).join('/'),
+        size: contents.length,
+        sha256: sha256(contents),
+    };
+}
+
+function writeJson(filePath, value) {
+    fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, {
+        mode: 0o644,
+    });
+}
+
+function replaceDirectory(outputRoot, writer) {
+    const resolvedOutputRoot = path.resolve(outputRoot);
+    const temporaryRoot = `${resolvedOutputRoot}.tmp-${process.pid}-${crypto
+        .randomBytes(8)
+        .toString('hex')}`;
+    fs.rmSync(temporaryRoot, { recursive: true, force: true });
+    fs.mkdirSync(temporaryRoot, { recursive: true });
+    try {
+        const result = writer(temporaryRoot);
+        fs.rmSync(resolvedOutputRoot, { recursive: true, force: true });
+        fs.renameSync(temporaryRoot, resolvedOutputRoot);
+        return result;
+    } catch (error) {
+        fs.rmSync(temporaryRoot, { recursive: true, force: true });
+        throw error;
+    }
+}
+
+function expectedLicensePath(packageId, sourceRelativePath) {
+    return path.posix.join('licenses', packageId, sourceRelativePath);
+}
+
+function collectLinuxRuntimeLicenseInputs({
+    sourceRoot,
+    outputRoot,
+    runtimeManifest,
+}) {
+    validateRuntimeManifestPackages(runtimeManifest);
+    assertDirectoryWithoutSymlinks(sourceRoot, 'Linux runtime source root');
+
+    return replaceDirectory(outputRoot, (temporaryRoot) => {
+        const packages = NOTICE_SOURCE_PACKAGES.map((sourcePackage) => {
+            const files = LICENSE_PATHS_BY_PACKAGE[sourcePackage.id].map(
+                (sourceRelativePath) => {
+                    const sourcePath = assertRegularFileInside(
+                        path.join(sourceRoot, sourcePackage.id),
+                        sourceRelativePath,
+                        `${sourcePackage.id} upstream license`
+                    );
+                    const relativeOutputPath = expectedLicensePath(
+                        sourcePackage.id,
+                        sourceRelativePath
+                    );
+                    const destinationPath = path.join(
+                        temporaryRoot,
+                        ...relativeOutputPath.split('/')
+                    );
+                    fs.mkdirSync(path.dirname(destinationPath), {
+                        recursive: true,
+                    });
+                    fs.copyFileSync(sourcePath, destinationPath);
+                    fs.chmodSync(destinationPath, 0o644);
+                    return {
+                        sourcePath: sourceRelativePath,
+                        ...fileRecord(destinationPath, relativeOutputPath),
+                    };
+                }
+            );
+            return {
+                id: sourcePackage.id,
+                ...sourcePackageMetadata(sourcePackage),
+                files,
+            };
+        });
+        const manifest = {
+            schemaVersion: 1,
+            origin: 'pinned-linux-runtime-license-inputs',
+            platform: 'linux',
+            arch: 'x64',
+            packages,
+        };
+        writeJson(path.join(temporaryRoot, LICENSE_INPUT_MANIFEST), manifest);
+        return manifest;
+    });
+}
+
+function listFilesRecursively(root) {
+    const files = [];
+    function visit(directoryPath) {
+        for (const entry of fs
+            .readdirSync(directoryPath, { withFileTypes: true })
+            .sort((left, right) => compareText(left.name, right.name))) {
+            const entryPath = path.join(directoryPath, entry.name);
+            if (entry.isSymbolicLink()) {
+                throw new Error(
+                    `Linux runtime legal files must not use symbolic links: ${entryPath}`
+                );
+            }
+            if (entry.isDirectory()) {
+                visit(entryPath);
+            } else if (entry.isFile()) {
+                files.push(
+                    path.relative(root, entryPath).split(path.sep).join('/')
+                );
+            } else {
+                throw new Error(
+                    `Linux runtime legal input must be a regular file: ${entryPath}`
+                );
+            }
+        }
+    }
+    visit(root);
+    return files;
+}
+
+function readJsonFileInside(root, relativePath, label) {
+    const filePath = assertRegularFileInside(root, relativePath, label);
+    try {
+        return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    } catch (error) {
+        throw new Error(
+            `Invalid JSON in ${label}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+}
+
+function validateLicenseInputManifest(inputRoot, runtimeManifest) {
+    validateRuntimeManifestPackages(runtimeManifest);
+    const inputManifest = readJsonFileInside(
+        inputRoot,
+        LICENSE_INPUT_MANIFEST,
+        'Linux runtime license input manifest'
+    );
+    if (
+        !hasExactFields(inputManifest, [
+            'schemaVersion',
+            'origin',
+            'platform',
+            'arch',
+            'packages',
+        ]) ||
+        inputManifest.schemaVersion !== 1 ||
+        inputManifest.origin !== 'pinned-linux-runtime-license-inputs' ||
+        inputManifest.platform !== 'linux' ||
+        inputManifest.arch !== 'x64' ||
+        !Array.isArray(inputManifest.packages) ||
+        inputManifest.packages.length !== NOTICE_SOURCE_PACKAGES.length
+    ) {
+        throw new Error('Invalid Linux runtime license input manifest.');
+    }
+
+    const expectedPaths = new Set([LICENSE_INPUT_MANIFEST]);
+    for (const [index, sourcePackage] of NOTICE_SOURCE_PACKAGES.entries()) {
+        const packageRecord = inputManifest.packages[index];
+        const expectedMetadata = sourcePackageMetadata(sourcePackage);
+        if (
+            !hasExactFields(packageRecord, [
+                'id',
+                ...Object.keys(expectedMetadata),
+                'files',
+            ]) ||
+            packageRecord.id !== sourcePackage.id ||
+            !Object.entries(expectedMetadata).every(([field, value]) =>
+                isDeepStrictEqual(packageRecord[field], value)
+            ) ||
+            !Array.isArray(packageRecord.files) ||
+            packageRecord.files.length !==
+                LICENSE_PATHS_BY_PACKAGE[sourcePackage.id].length
+        ) {
+            throw new Error(
+                `Invalid cached license inputs for ${sourcePackage.id}.`
+            );
+        }
+        for (const [fileIndex, sourceRelativePath] of LICENSE_PATHS_BY_PACKAGE[
+            sourcePackage.id
+        ].entries()) {
+            const record = packageRecord.files[fileIndex];
+            const expectedPath = expectedLicensePath(
+                sourcePackage.id,
+                sourceRelativePath
+            );
+            if (
+                !hasExactFields(record, [
+                    'sourcePath',
+                    'path',
+                    'size',
+                    'sha256',
+                ]) ||
+                record.sourcePath !== sourceRelativePath ||
+                record.path !== expectedPath ||
+                !Number.isSafeInteger(record.size) ||
+                record.size <= 0 ||
+                !SHA256_PATTERN.test(record.sha256)
+            ) {
+                throw new Error(
+                    `Invalid cached license file record for ${sourcePackage.id}.`
+                );
+            }
+            const inputPath = assertRegularFileInside(
+                inputRoot,
+                record.path,
+                `${sourcePackage.id} license input`
+            );
+            const actual = fileRecord(inputPath, record.path);
+            if (actual.size !== record.size) {
+                throw new Error(
+                    `Size mismatch for cached license input ${record.path}.`
+                );
+            }
+            if (actual.sha256 !== record.sha256) {
+                throw new Error(
+                    `SHA-256 mismatch for cached license input ${record.path}.`
+                );
+            }
+            expectedPaths.add(record.path);
+        }
+    }
+    for (const actualPath of listFilesRecursively(inputRoot)) {
+        if (!expectedPaths.has(actualPath)) {
+            throw new Error(
+                `Found undeclared license input ${actualPath} in ${inputRoot}.`
+            );
+        }
+    }
+    return inputManifest;
+}
+
+function noticePackageRecord(sourcePackage, inputPackage) {
+    return {
+        id: sourcePackage.id,
+        ...sourcePackageMetadata(sourcePackage),
+        files: inputPackage.files.map(
+            ({ path: filePath, size, sha256: hash }) => ({
+                path: filePath,
+                size,
+                sha256: hash,
+            })
+        ),
+    };
+}
+
+function createThirdPartyNotices(packages) {
+    const lines = [
+        'IPTVnator Linux Embedded MPV Third-Party Notices',
+        '================================================',
+        '',
+        'This file identifies the pinned upstream source packages used by the bundled Linux Embedded MPV runtime.',
+        'The complete verbatim upstream license files are included at the paths and SHA-256 digests listed below.',
+        'The exact corresponding sources and build scripts are distributed alongside the binary release as linux-frame-copy-runtime-sources.tar.xz.',
+        '',
+    ];
+    for (const packageRecord of packages) {
+        lines.push(
+            `${packageRecord.id} ${packageRecord.version}`,
+            `License: ${packageRecord.license}`,
+            `Source: ${packageRecord.sourceUrl}`,
+            'Included upstream license files:'
+        );
+        for (const file of packageRecord.files) {
+            lines.push(`- ${file.path} (SHA-256 ${file.sha256})`);
+        }
+        lines.push('');
+    }
+    return `${lines.join('\n')}\n`;
+}
+
+function generateLinuxRuntimeNotices({
+    licenseInputRoot,
+    outputRoot,
+    runtimeManifest,
+}) {
+    const inputManifest = validateLicenseInputManifest(
+        licenseInputRoot,
+        runtimeManifest
+    );
+    return replaceDirectory(outputRoot, (temporaryRoot) => {
+        const packages = NOTICE_SOURCE_PACKAGES.map((sourcePackage, index) => {
+            const inputPackage = inputManifest.packages[index];
+            for (const file of inputPackage.files) {
+                const sourcePath = assertRegularFileInside(
+                    licenseInputRoot,
+                    file.path,
+                    `${sourcePackage.id} cached license`
+                );
+                const destinationPath = path.join(
+                    temporaryRoot,
+                    ...file.path.split('/')
+                );
+                fs.mkdirSync(path.dirname(destinationPath), {
+                    recursive: true,
+                });
+                fs.copyFileSync(sourcePath, destinationPath);
+                fs.chmodSync(destinationPath, 0o644);
+            }
+            return noticePackageRecord(sourcePackage, inputPackage);
+        });
+        const noticeContents = Buffer.from(createThirdPartyNotices(packages));
+        const noticePath = path.join(temporaryRoot, THIRD_PARTY_NOTICES);
+        fs.writeFileSync(noticePath, noticeContents, { mode: 0o644 });
+        const noticeFile = fileRecord(noticePath, THIRD_PARTY_NOTICES);
+        const licenseTotalBytes = packages
+            .flatMap(({ files }) => files)
+            .reduce((total, file) => total + file.size, 0);
+        const manifest = {
+            schemaVersion: 1,
+            origin: 'pinned-linux-runtime-upstream-licenses',
+            platform: 'linux',
+            arch: 'x64',
+            noticeFile,
+            packages,
+            totalBytes: noticeFile.size + licenseTotalBytes,
+        };
+        writeJson(path.join(temporaryRoot, NOTICE_MANIFEST), manifest);
+        const errors = validateLinuxRuntimeNotices(
+            temporaryRoot,
+            runtimeManifest
+        );
+        if (errors.length > 0) {
+            throw new Error(
+                [
+                    'Generated Linux runtime notices are invalid.',
+                    ...errors.map((error) => `- ${error}`),
+                ].join('\n')
+            );
+        }
+        return manifest;
+    });
+}
+
+function assertValidLinuxRuntimeNotices(
+    root,
+    runtimeManifest,
+    { allowUnrelatedFiles = false } = {}
+) {
+    validateRuntimeManifestPackages(runtimeManifest);
+    assertDirectoryWithoutSymlinks(root, 'Linux runtime notices root');
+    const manifest = readJsonFileInside(
+        root,
+        NOTICE_MANIFEST,
+        'Linux runtime notices manifest'
+    );
+    if (
+        !hasExactFields(manifest, [
+            'schemaVersion',
+            'origin',
+            'platform',
+            'arch',
+            'noticeFile',
+            'packages',
+            'totalBytes',
+        ]) ||
+        manifest.schemaVersion !== 1 ||
+        manifest.origin !== 'pinned-linux-runtime-upstream-licenses' ||
+        manifest.platform !== 'linux' ||
+        manifest.arch !== 'x64' ||
+        !Array.isArray(manifest.packages) ||
+        manifest.packages.length !== NOTICE_SOURCE_PACKAGES.length
+    ) {
+        throw new Error('Invalid Linux runtime notices manifest.');
+    }
+
+    const expectedFiles = new Set([NOTICE_MANIFEST, THIRD_PARTY_NOTICES]);
+    let licenseTotalBytes = 0;
+    for (const [index, sourcePackage] of NOTICE_SOURCE_PACKAGES.entries()) {
+        const packageRecord = manifest.packages[index];
+        const expectedMetadata = sourcePackageMetadata(sourcePackage);
+        const expectedPaths = LICENSE_PATHS_BY_PACKAGE[sourcePackage.id].map(
+            (sourceRelativePath) =>
+                expectedLicensePath(sourcePackage.id, sourceRelativePath)
+        );
+        if (
+            !hasExactFields(packageRecord, [
+                'id',
+                ...Object.keys(expectedMetadata),
+                'files',
+            ]) ||
+            packageRecord.id !== sourcePackage.id ||
+            !Object.entries(expectedMetadata).every(([field, value]) =>
+                isDeepStrictEqual(packageRecord[field], value)
+            ) ||
+            !Array.isArray(packageRecord.files) ||
+            !isDeepStrictEqual(
+                packageRecord.files.map(({ path: filePath }) => filePath),
+                expectedPaths
+            )
+        ) {
+            throw new Error(
+                `Invalid packaged notice record for ${sourcePackage.id}.`
+            );
+        }
+        for (const record of packageRecord.files) {
+            if (
+                !hasExactFields(record, ['path', 'size', 'sha256']) ||
+                !Number.isSafeInteger(record.size) ||
+                record.size <= 0 ||
+                !SHA256_PATTERN.test(record.sha256)
+            ) {
+                throw new Error(
+                    `Invalid packaged notice file for ${sourcePackage.id}.`
+                );
+            }
+            const filePath = assertRegularFileInside(
+                root,
+                record.path,
+                `${sourcePackage.id} packaged license`
+            );
+            const actual = fileRecord(filePath, record.path);
+            if (actual.size !== record.size) {
+                throw new Error(
+                    `Size mismatch for packaged license ${record.path}.`
+                );
+            }
+            if (actual.sha256 !== record.sha256) {
+                throw new Error(
+                    `SHA-256 mismatch for packaged license ${record.path}.`
+                );
+            }
+            licenseTotalBytes += record.size;
+            expectedFiles.add(record.path);
+        }
+    }
+
+    if (
+        !hasExactFields(manifest.noticeFile, ['path', 'size', 'sha256']) ||
+        manifest.noticeFile.path !== THIRD_PARTY_NOTICES ||
+        !Number.isSafeInteger(manifest.noticeFile.size) ||
+        manifest.noticeFile.size <= 0 ||
+        !SHA256_PATTERN.test(manifest.noticeFile.sha256)
+    ) {
+        throw new Error('Invalid aggregate third-party notice file record.');
+    }
+    const noticePath = assertRegularFileInside(
+        root,
+        THIRD_PARTY_NOTICES,
+        'aggregate third-party notices'
+    );
+    const actualNotice = fileRecord(noticePath, THIRD_PARTY_NOTICES);
+    if (
+        actualNotice.size !== manifest.noticeFile.size ||
+        actualNotice.sha256 !== manifest.noticeFile.sha256
+    ) {
+        throw new Error(
+            'Aggregate THIRD_PARTY_NOTICES.txt size or SHA-256 mismatch.'
+        );
+    }
+    const expectedNoticeContents = createThirdPartyNotices(manifest.packages);
+    if (fs.readFileSync(noticePath, 'utf8') !== expectedNoticeContents) {
+        throw new Error(
+            'Aggregate THIRD_PARTY_NOTICES.txt does not match the exact notice index.'
+        );
+    }
+    if (manifest.totalBytes !== actualNotice.size + licenseTotalBytes) {
+        throw new Error(
+            'Linux runtime notices totalBytes does not match declared legal files.'
+        );
+    }
+    const actualPaths = allowUnrelatedFiles
+        ? [
+              NOTICE_MANIFEST,
+              THIRD_PARTY_NOTICES,
+              ...listFilesRecursively(path.join(root, 'licenses')).map(
+                  (relativePath) => path.posix.join('licenses', relativePath)
+              ),
+          ]
+        : listFilesRecursively(root);
+    for (const actualPath of actualPaths) {
+        if (!expectedFiles.has(actualPath)) {
+            throw new Error(
+                `Found undeclared packaged legal file ${actualPath} in ${root}.`
+            );
+        }
+    }
+    return manifest;
+}
+
+function validateLinuxRuntimeNotices(root, runtimeManifest, options) {
+    try {
+        assertValidLinuxRuntimeNotices(root, runtimeManifest, options);
+        return [];
+    } catch (error) {
+        return [error instanceof Error ? error.message : String(error)];
+    }
+}
+
+function parseArguments(argv) {
+    const args = argv[0] === '--' ? argv.slice(1) : [...argv];
+    const mode = args.shift();
+    if (!['collect', 'generate'].includes(mode)) {
+        throw new Error(
+            'Usage: generate-linux-runtime-notices.cjs <collect|generate> --runtime-manifest <path> --output-root <path> [--source-root <path>|--license-input-root <path>]'
+        );
+    }
+    const values = {};
+    while (args.length > 0) {
+        const key = args.shift();
+        const value = args.shift();
+        if (!key?.startsWith('--') || !value) {
+            throw new Error(`Invalid Linux runtime notices argument: ${key}`);
+        }
+        const name = key.slice(2);
+        if (Object.hasOwn(values, name)) {
+            throw new Error(`Duplicate Linux runtime notices argument: ${key}`);
+        }
+        values[name] = value;
+    }
+    const required = [
+        'runtime-manifest',
+        'output-root',
+        mode === 'collect' ? 'source-root' : 'license-input-root',
+    ];
+    for (const name of required) {
+        if (!values[name]) {
+            throw new Error(`Missing --${name}.`);
+        }
+    }
+    return { mode, values };
+}
+
+function main(argv = process.argv.slice(2)) {
+    const { mode, values } = parseArguments(argv);
+    const runtimeManifest = JSON.parse(
+        fs.readFileSync(path.resolve(values['runtime-manifest']), 'utf8')
+    );
+    if (mode === 'collect') {
+        collectLinuxRuntimeLicenseInputs({
+            sourceRoot: path.resolve(values['source-root']),
+            outputRoot: path.resolve(values['output-root']),
+            runtimeManifest,
+        });
+    } else {
+        generateLinuxRuntimeNotices({
+            licenseInputRoot: path.resolve(values['license-input-root']),
+            outputRoot: path.resolve(values['output-root']),
+            runtimeManifest,
+        });
+    }
+}
+
+if (require.main === module) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
+
+module.exports = {
+    LICENSE_INPUT_MANIFEST,
+    LICENSE_PATHS_BY_PACKAGE,
+    NOTICE_MANIFEST,
+    THIRD_PARTY_NOTICES,
+    collectLinuxRuntimeLicenseInputs,
+    generateLinuxRuntimeNotices,
+    validateLinuxRuntimeNotices,
+};
diff --git a/tools/embedded-mpv/generate-linux-runtime-notices.test.mjs b/tools/embedded-mpv/generate-linux-runtime-notices.test.mjs
new file mode 100644
index 000000000..7e9942342
--- /dev/null
+++ b/tools/embedded-mpv/generate-linux-runtime-notices.test.mjs
@@ -0,0 +1,338 @@
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import test from 'node:test';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const { SOURCE_PACKAGES } = require('./build-linux-runtime.cjs');
+const {
+    LICENSE_PATHS_BY_PACKAGE,
+    collectLinuxRuntimeLicenseInputs,
+    generateLinuxRuntimeNotices,
+    validateLinuxRuntimeNotices,
+} = require('./generate-linux-runtime-notices.cjs');
+const generatorScript = path.join(
+    path.dirname(fileURLToPath(import.meta.url)),
+    'generate-linux-runtime-notices.cjs'
+);
+
+function runtimeManifest() {
+    return {
+        platform: 'linux',
+        arch: 'x64',
+        packages: Object.fromEntries(
+            SOURCE_PACKAGES.map((sourcePackage) => [
+                sourcePackage.id,
+                {
+                    version: sourcePackage.version,
+                    sourceUrl: sourcePackage.sourceUrl,
+                    ...(sourcePackage.sourceTag
+                        ? { sourceTag: sourcePackage.sourceTag }
+                        : {}),
+                    ...(sourcePackage.sourceKind === 'archive'
+                        ? { sourceSha256: sourcePackage.expectedSha256 }
+                        : {
+                              sourceGitCommit: sourcePackage.expectedGitCommit,
+                              sourceSubmodules: [
+                                  ...sourcePackage.expectedSubmodules,
+                              ],
+                          }),
+                    license: sourcePackage.license,
+                    ...(sourcePackage.buildInput
+                        ? { buildInput: sourcePackage.buildInput }
+                        : {}),
+                },
+            ])
+        ),
+    };
+}
+
+function createSourceFixture() {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-license-sources-')
+    );
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        const licensePaths = LICENSE_PATHS_BY_PACKAGE[sourcePackage.id];
+        assert.ok(
+            Array.isArray(licensePaths) && licensePaths.length > 0,
+            `missing test mapping for ${sourcePackage.id}`
+        );
+        for (const relativePath of licensePaths) {
+            const filePath = path.join(root, sourcePackage.id, relativePath);
+            fs.mkdirSync(path.dirname(filePath), { recursive: true });
+            fs.writeFileSync(
+                filePath,
+                `verbatim upstream ${sourcePackage.id} ${relativePath}\n`
+            );
+        }
+    }
+    return root;
+}
+
+function fileTree(root) {
+    const files = [];
+    function visit(directoryPath) {
+        for (const entry of fs
+            .readdirSync(directoryPath, { withFileTypes: true })
+            .sort((left, right) => left.name.localeCompare(right.name))) {
+            const entryPath = path.join(directoryPath, entry.name);
+            if (entry.isDirectory()) {
+                visit(entryPath);
+            } else {
+                files.push({
+                    path: path
+                        .relative(root, entryPath)
+                        .split(path.sep)
+                        .join('/'),
+                    contents: fs.readFileSync(entryPath),
+                });
+            }
+        }
+    }
+    visit(root);
+    return files;
+}
+
+test('collects verbatim pinned licenses and generates deterministic exact notices', (t) => {
+    const sourceRoot = createSourceFixture();
+    const fixtureRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-notices-')
+    );
+    const inputRoot = path.join(fixtureRoot, 'inputs');
+    const firstOutput = path.join(fixtureRoot, 'first');
+    const secondOutput = path.join(fixtureRoot, 'second');
+    t.after(() => {
+        fs.rmSync(sourceRoot, { recursive: true, force: true });
+        fs.rmSync(fixtureRoot, { recursive: true, force: true });
+    });
+
+    const manifest = runtimeManifest();
+    collectLinuxRuntimeLicenseInputs({
+        sourceRoot,
+        outputRoot: inputRoot,
+        runtimeManifest: manifest,
+    });
+    const first = generateLinuxRuntimeNotices({
+        licenseInputRoot: inputRoot,
+        outputRoot: firstOutput,
+        runtimeManifest: manifest,
+    });
+    const second = generateLinuxRuntimeNotices({
+        licenseInputRoot: inputRoot,
+        outputRoot: secondOutput,
+        runtimeManifest: manifest,
+    });
+
+    assert.deepEqual(fileTree(firstOutput), fileTree(secondOutput));
+    assert.deepEqual(first, second);
+    assert.equal(first.schemaVersion, 1);
+    assert.equal(first.origin, 'pinned-linux-runtime-upstream-licenses');
+    assert.deepEqual(
+        first.packages.map(({ id }) => id),
+        SOURCE_PACKAGES.map(({ id }) => id).sort()
+    );
+    assert.ok(first.packages.every(({ files }) => files.length >= 1));
+    assert.deepEqual(LICENSE_PATHS_BY_PACKAGE.libplacebo, [
+        'LICENSE',
+        '3rdparty/Vulkan-Headers/LICENSE.md',
+        '3rdparty/fast_float/LICENSE-APACHE',
+        '3rdparty/fast_float/LICENSE-BOOST',
+        '3rdparty/fast_float/LICENSE-MIT',
+        '3rdparty/glad/LICENSE',
+        '3rdparty/jinja/LICENSE.txt',
+        '3rdparty/markupsafe/LICENSE.txt',
+        'demos/3rdparty/nuklear/LICENSE',
+    ]);
+    assert.deepEqual(validateLinuxRuntimeNotices(firstOutput, manifest), []);
+
+    const noticeContents = fs.readFileSync(
+        path.join(firstOutput, 'THIRD_PARTY_NOTICES.txt')
+    );
+    assert.equal(first.noticeFile.path, 'THIRD_PARTY_NOTICES.txt');
+    assert.equal(first.noticeFile.size, noticeContents.length);
+    assert.equal(
+        first.noticeFile.sha256,
+        crypto.createHash('sha256').update(noticeContents).digest('hex')
+    );
+    assert.match(
+        noticeContents.toString('utf8'),
+        /exact corresponding sources and build scripts are distributed alongside the binary release as linux-frame-copy-runtime-sources\.tar\.xz/
+    );
+
+    for (const packageRecord of first.packages) {
+        for (const fileRecord of packageRecord.files) {
+            const outputContents = fs.readFileSync(
+                path.join(firstOutput, fileRecord.path)
+            );
+            const sourcePath = fileRecord.path.slice(
+                `licenses/${packageRecord.id}/`.length
+            );
+            assert.ok(
+                LICENSE_PATHS_BY_PACKAGE[packageRecord.id].includes(sourcePath)
+            );
+            assert.deepEqual(
+                outputContents,
+                fs.readFileSync(
+                    path.join(sourceRoot, packageRecord.id, sourcePath)
+                )
+            );
+        }
+    }
+});
+
+test('rejects symlinked license sources and path escapes', (t) => {
+    const sourceRoot = createSourceFixture();
+    const outputRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-license-inputs-')
+    );
+    const outsidePath = path.join(outputRoot, 'outside-license');
+    fs.writeFileSync(outsidePath, 'outside\n');
+    t.after(() => {
+        fs.rmSync(sourceRoot, { recursive: true, force: true });
+        fs.rmSync(outputRoot, { recursive: true, force: true });
+    });
+
+    const freetypeLicense = path.join(
+        sourceRoot,
+        'freetype',
+        LICENSE_PATHS_BY_PACKAGE.freetype[0]
+    );
+    fs.rmSync(freetypeLicense);
+    fs.symlinkSync(outsidePath, freetypeLicense);
+
+    assert.throws(
+        () =>
+            collectLinuxRuntimeLicenseInputs({
+                sourceRoot,
+                outputRoot: path.join(outputRoot, 'collected'),
+                runtimeManifest: runtimeManifest(),
+            }),
+        /symbolic link|outside/i
+    );
+});
+
+test('rejects missing, tampered, and undeclared cached license inputs', (t) => {
+    const sourceRoot = createSourceFixture();
+    const fixtureRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-license-cache-')
+    );
+    const inputRoot = path.join(fixtureRoot, 'inputs');
+    t.after(() => {
+        fs.rmSync(sourceRoot, { recursive: true, force: true });
+        fs.rmSync(fixtureRoot, { recursive: true, force: true });
+    });
+
+    const manifest = runtimeManifest();
+    collectLinuxRuntimeLicenseInputs({
+        sourceRoot,
+        outputRoot: inputRoot,
+        runtimeManifest: manifest,
+    });
+    const collectedManifest = JSON.parse(
+        fs.readFileSync(
+            path.join(inputRoot, 'linux-runtime-license-inputs.json'),
+            'utf8'
+        )
+    );
+    const firstLicensePath = path.join(
+        inputRoot,
+        collectedManifest.packages[0].files[0].path
+    );
+    fs.appendFileSync(firstLicensePath, 'tampered\n');
+    assert.throws(
+        () =>
+            generateLinuxRuntimeNotices({
+                licenseInputRoot: inputRoot,
+                outputRoot: path.join(fixtureRoot, 'tampered-output'),
+                runtimeManifest: manifest,
+            }),
+        /(?:Size|SHA-256) mismatch/
+    );
+
+    collectLinuxRuntimeLicenseInputs({
+        sourceRoot,
+        outputRoot: inputRoot,
+        runtimeManifest: manifest,
+    });
+    fs.writeFileSync(path.join(inputRoot, 'licenses', 'undeclared.txt'), 'x');
+    assert.throws(
+        () =>
+            generateLinuxRuntimeNotices({
+                licenseInputRoot: inputRoot,
+                outputRoot: path.join(fixtureRoot, 'extra-output'),
+                runtimeManifest: manifest,
+            }),
+        /undeclared license input/
+    );
+
+    fs.rmSync(path.join(inputRoot, 'licenses', 'undeclared.txt'));
+    fs.rmSync(
+        path.join(inputRoot, collectedManifest.packages[0].files[0].path)
+    );
+    assert.throws(
+        () =>
+            generateLinuxRuntimeNotices({
+                licenseInputRoot: inputRoot,
+                outputRoot: path.join(fixtureRoot, 'missing-output'),
+                runtimeManifest: manifest,
+            }),
+        /Missing .*license input/
+    );
+});
+
+test('CLI collects immutable inputs and regenerates the packaged notice bundle', (t) => {
+    const sourceRoot = createSourceFixture();
+    const fixtureRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-notices-cli-')
+    );
+    const manifestPath = path.join(fixtureRoot, 'runtime-manifest.json');
+    const inputRoot = path.join(fixtureRoot, 'inputs');
+    const outputRoot = path.join(fixtureRoot, 'notices');
+    fs.writeFileSync(
+        manifestPath,
+        `${JSON.stringify(runtimeManifest(), null, 2)}\n`
+    );
+    t.after(() => {
+        fs.rmSync(sourceRoot, { recursive: true, force: true });
+        fs.rmSync(fixtureRoot, { recursive: true, force: true });
+    });
+
+    for (const args of [
+        [
+            'collect',
+            '--runtime-manifest',
+            manifestPath,
+            '--source-root',
+            sourceRoot,
+            '--output-root',
+            inputRoot,
+        ],
+        [
+            'generate',
+            '--runtime-manifest',
+            manifestPath,
+            '--license-input-root',
+            inputRoot,
+            '--output-root',
+            outputRoot,
+        ],
+    ]) {
+        const result = spawnSync(process.execPath, [generatorScript, ...args], {
+            encoding: 'utf8',
+        });
+        assert.equal(
+            result.status,
+            0,
+            [result.stdout, result.stderr].filter(Boolean).join('\n')
+        );
+    }
+    assert.deepEqual(
+        validateLinuxRuntimeNotices(outputRoot, runtimeManifest()),
+        []
+    );
+});
diff --git a/tools/embedded-mpv/linux-runtime-manifest.cjs b/tools/embedded-mpv/linux-runtime-manifest.cjs
new file mode 100644
index 000000000..4230ee129
--- /dev/null
+++ b/tools/embedded-mpv/linux-runtime-manifest.cjs
@@ -0,0 +1,999 @@
+'use strict';
+
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    EXTERNAL_SYSTEM_LIBRARIES,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    GLIBC_TOOLCHAIN_ALLOWLIST,
+    MINIMUM_TOOL_VERSIONS,
+    PORTABLE_ABI_BASELINE,
+    REQUIRED_TOOLS,
+    RUNTIME_EXTERNAL_CONFIGURATION,
+    SOURCE_PACKAGES,
+    compareVersions,
+    parseVersion,
+} = require('./build-linux-runtime.cjs');
+
+const LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION = 1;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+const SAFE_BASENAME_PATTERN = /^[A-Za-z0-9_+.-]+$/;
+const SHARED_LIBRARY_PATTERN = /\.so(?:\.\d+)*$/;
+const VERSIONED_LIBMPV_PATTERN = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+const REQUIRED_SOURCE_PACKAGES = SOURCE_PACKAGES.map(({ id }) => id);
+const SOURCE_PACKAGE_BY_ID = new Map(
+    SOURCE_PACKAGES.map((sourcePackage) => [sourcePackage.id, sourcePackage])
+);
+const ALLOWED_EXTERNAL_LIBRARY_NAMES = new Set([
+    ...GLIBC_TOOLCHAIN_ALLOWLIST,
+    ...EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+]);
+const SUBMODULE_RECORD_PATTERN = /^[a-f0-9]{40,64}\s+([A-Za-z0-9_+./-]+)$/;
+const LINUX_SYSTEM_BACKEND = 'process-isolated mpv --wid';
+
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function isNonEmptyString(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+
+function isSafeBasename(value) {
+    return (
+        isNonEmptyString(value) &&
+        path.basename(value) === value &&
+        !value.includes('/') &&
+        !value.includes('\\') &&
+        value !== '.' &&
+        value !== '..' &&
+        SAFE_BASENAME_PATTERN.test(value)
+    );
+}
+
+function isValidSubmoduleRecord(value) {
+    if (typeof value !== 'string') {
+        return false;
+    }
+    const match = value.match(SUBMODULE_RECORD_PATTERN);
+    if (!match) {
+        return false;
+    }
+    const submodulePath = match[1];
+    return (
+        !path.posix.isAbsolute(submodulePath) &&
+        !submodulePath
+            .split('/')
+            .some((segment) => segment === '.' || segment === '..')
+    );
+}
+
+function validateSourceMetadata(errors, value, label) {
+    if (!isNonEmptyString(value.version)) {
+        errors.push(
+            `Linux runtime manifest ${label}.version must be a non-empty string.`
+        );
+    }
+    if (!isNonEmptyString(value.sourceUrl)) {
+        errors.push(
+            `Linux runtime manifest ${label}.sourceUrl must be a non-empty string.`
+        );
+    }
+
+    const hasSourceSha256 = value.sourceSha256 !== undefined;
+    const hasSourceGitCommit = value.sourceGitCommit !== undefined;
+    if (!hasSourceSha256 && !hasSourceGitCommit) {
+        errors.push(
+            `Linux runtime manifest ${label} must include sourceSha256 or sourceGitCommit.`
+        );
+        return;
+    }
+    if (
+        hasSourceSha256 &&
+        (typeof value.sourceSha256 !== 'string' ||
+            !SHA256_PATTERN.test(value.sourceSha256))
+    ) {
+        errors.push(
+            `Linux runtime manifest ${label}.sourceSha256 must be a lowercase 64-character hexadecimal digest.`
+        );
+    }
+    if (
+        hasSourceGitCommit &&
+        (typeof value.sourceGitCommit !== 'string' ||
+            !GIT_COMMIT_PATTERN.test(value.sourceGitCommit))
+    ) {
+        errors.push(
+            `Linux runtime manifest ${label}.sourceGitCommit must be a lowercase hexadecimal commit digest.`
+        );
+    }
+}
+
+function validatePackages(errors, packages) {
+    if (!isObject(packages)) {
+        errors.push(
+            'Linux runtime manifest packages must contain source package metadata.'
+        );
+        return;
+    }
+
+    if (Object.keys(packages).length === 0) {
+        errors.push(
+            'Linux runtime manifest packages must contain source package metadata.'
+        );
+    }
+
+    const invalidRequiredPackages = new Set();
+    for (const packageName of REQUIRED_SOURCE_PACKAGES) {
+        if (
+            !Object.prototype.hasOwnProperty.call(packages, packageName) ||
+            !isObject(packages[packageName])
+        ) {
+            errors.push(
+                `Linux runtime manifest packages.${packageName} must be an object.`
+            );
+            invalidRequiredPackages.add(packageName);
+        }
+    }
+
+    for (const packageName of Object.keys(packages).sort()) {
+        if (!SOURCE_PACKAGE_BY_ID.has(packageName)) {
+            errors.push(
+                `Linux runtime manifest packages contains unexpected source package "${packageName}".`
+            );
+        }
+    }
+
+    for (const packageName of Object.keys(packages).sort()) {
+        const packageMetadata = packages[packageName];
+        const label = `packages.${packageName}`;
+        if (!isObject(packageMetadata)) {
+            if (!invalidRequiredPackages.has(packageName)) {
+                errors.push(
+                    `Linux runtime manifest ${label} must be an object.`
+                );
+            }
+            continue;
+        }
+
+        validateSourceMetadata(errors, packageMetadata, label);
+        if (!isNonEmptyString(packageMetadata.license)) {
+            errors.push(
+                `Linux runtime manifest ${label}.license must be a non-empty string.`
+            );
+        }
+
+        const pinnedPackage = SOURCE_PACKAGE_BY_ID.get(packageName);
+        if (!pinnedPackage) {
+            continue;
+        }
+
+        for (const field of ['version', 'sourceUrl', 'license']) {
+            if (
+                isNonEmptyString(packageMetadata[field]) &&
+                packageMetadata[field] !== pinnedPackage[field]
+            ) {
+                errors.push(
+                    `Linux runtime manifest ${label}.${field} must equal the pinned value.`
+                );
+            }
+        }
+
+        if (pinnedPackage.sourceTag) {
+            if (packageMetadata.sourceTag !== pinnedPackage.sourceTag) {
+                errors.push(
+                    `Linux runtime manifest ${label}.sourceTag must equal the pinned tag.`
+                );
+            }
+        } else if (packageMetadata.sourceTag !== undefined) {
+            errors.push(
+                `Linux runtime manifest ${label} must not include sourceTag.`
+            );
+        }
+
+        if (pinnedPackage.buildInput) {
+            if (
+                !isObject(packageMetadata.buildInput) ||
+                !isDeepStrictEqual(
+                    packageMetadata.buildInput,
+                    pinnedPackage.buildInput
+                )
+            ) {
+                errors.push(
+                    `Linux runtime manifest ${label}.buildInput must equal the pinned build input.`
+                );
+            }
+        } else if (packageMetadata.buildInput !== undefined) {
+            errors.push(
+                `Linux runtime manifest ${label} must not include buildInput.`
+            );
+        }
+
+        if (pinnedPackage.sourceKind === 'archive') {
+            if (
+                typeof packageMetadata.sourceSha256 === 'string' &&
+                SHA256_PATTERN.test(packageMetadata.sourceSha256) &&
+                packageMetadata.sourceSha256 !== pinnedPackage.expectedSha256
+            ) {
+                errors.push(
+                    `Linux runtime manifest ${label}.sourceSha256 must equal the pinned digest.`
+                );
+            }
+            if (packageMetadata.sourceGitCommit !== undefined) {
+                errors.push(
+                    `Linux runtime manifest ${label} must not include sourceGitCommit.`
+                );
+            }
+            if (packageMetadata.sourceSubmodules !== undefined) {
+                errors.push(
+                    `Linux runtime manifest ${label} must not include sourceSubmodules.`
+                );
+            }
+            continue;
+        }
+
+        if (
+            typeof packageMetadata.sourceGitCommit === 'string' &&
+            GIT_COMMIT_PATTERN.test(packageMetadata.sourceGitCommit) &&
+            packageMetadata.sourceGitCommit !== pinnedPackage.expectedGitCommit
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.sourceGitCommit must equal the pinned commit.`
+            );
+        }
+        if (packageMetadata.sourceSha256 !== undefined) {
+            errors.push(
+                `Linux runtime manifest ${label} must not include sourceSha256.`
+            );
+        }
+        if (
+            !Array.isArray(packageMetadata.sourceSubmodules) ||
+            packageMetadata.sourceSubmodules.length === 0 ||
+            packageMetadata.sourceSubmodules.some(
+                (record) => !isValidSubmoduleRecord(record)
+            ) ||
+            new Set(packageMetadata.sourceSubmodules).size !==
+                packageMetadata.sourceSubmodules.length
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.sourceSubmodules must be a non-empty array of commit-and-path records.`
+            );
+        } else if (
+            !isDeepStrictEqual(
+                packageMetadata.sourceSubmodules,
+                pinnedPackage.expectedSubmodules
+            )
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.sourceSubmodules must equal the pinned records.`
+            );
+        }
+    }
+}
+
+function validateFlags(errors, value, label, options) {
+    if (
+        !Array.isArray(value) ||
+        value.some((flag) => typeof flag !== 'string')
+    ) {
+        errors.push(
+            `Linux runtime manifest ${label} must be an array of strings.`
+        );
+        return;
+    }
+
+    const addForbiddenErrors = () => {
+        for (const forbiddenFlag of options.forbidden) {
+            if (value.includes(forbiddenFlag)) {
+                errors.push(
+                    `Linux runtime manifest ${label} must not include "${forbiddenFlag}".`
+                );
+            }
+        }
+    };
+    const addRequiredErrors = () => {
+        for (const requiredFlag of options.required) {
+            if (!value.includes(requiredFlag)) {
+                errors.push(
+                    `Linux runtime manifest ${label} must include "${requiredFlag}".`
+                );
+            }
+        }
+    };
+
+    if (options.requiredFirst) {
+        addRequiredErrors();
+        addForbiddenErrors();
+    } else {
+        addForbiddenErrors();
+        addRequiredErrors();
+    }
+}
+
+function validateFfmpeg(errors, ffmpeg) {
+    if (!isObject(ffmpeg)) {
+        errors.push('Linux runtime manifest ffmpeg must be an object.');
+        return;
+    }
+
+    validateFlags(errors, ffmpeg.configureFlags, 'ffmpeg.configureFlags', {
+        forbidden: ['--enable-gpl', '--enable-nonfree'],
+        required: ['--disable-gpl', '--disable-nonfree'],
+    });
+}
+
+function validateMpv(errors, mpv) {
+    if (!isObject(mpv)) {
+        errors.push('Linux runtime manifest mpv must be an object.');
+        return;
+    }
+
+    validateFlags(errors, mpv.mesonFlags, 'mpv.mesonFlags', {
+        forbidden: [],
+        required: ['-Dgpl=false', '-Dlibmpv=true'],
+        requiredFirst: true,
+    });
+
+    if (Array.isArray(mpv.mesonFlags)) {
+        const assignmentsByOption = new Map();
+        for (const flag of mpv.mesonFlags) {
+            const match =
+                typeof flag === 'string' ? flag.match(/^(-D[^=]+)=/) : null;
+            if (!match) {
+                continue;
+            }
+            const option = match[1];
+            const assignments = assignmentsByOption.get(option) ?? [];
+            assignments.push(flag);
+            assignmentsByOption.set(option, assignments);
+        }
+        for (const [option, assignments] of assignmentsByOption) {
+            if (assignments.length > 1) {
+                errors.push(
+                    `Linux runtime manifest mpv.mesonFlags must assign "${option}" exactly once.`
+                );
+            }
+        }
+
+        for (const [option, requiredFlag] of [
+            ['-Dgpl', '-Dgpl=false'],
+            ['-Dlibmpv', '-Dlibmpv=true'],
+        ]) {
+            const assignments = assignmentsByOption.get(option) ?? [];
+            for (const flag of assignments) {
+                if (flag !== requiredFlag) {
+                    errors.push(
+                        `Linux runtime manifest mpv.mesonFlags must not include "${flag}".`
+                    );
+                }
+            }
+        }
+    }
+}
+
+function validateRuntimeFiles(errors, runtimeFiles) {
+    if (!Array.isArray(runtimeFiles) || runtimeFiles.length === 0) {
+        errors.push(
+            'Linux runtime manifest runtimeFiles must be a non-empty array.'
+        );
+        return;
+    }
+
+    const names = new Set();
+    let hasLibMpvLinkerAlias = false;
+    let hasVersionedLibMpv = false;
+
+    for (const [index, runtimeFile] of runtimeFiles.entries()) {
+        const label = `runtimeFiles[${index}]`;
+        if (!isObject(runtimeFile)) {
+            errors.push(`Linux runtime manifest ${label} must be an object.`);
+            continue;
+        }
+
+        const { name, sha256, size } = runtimeFile;
+        const safeName = isSafeBasename(name);
+        if (!safeName) {
+            errors.push(
+                `Linux runtime manifest ${label}.name must be a safe shared-library basename.`
+            );
+        }
+        if (
+            typeof name === 'string' &&
+            safeName &&
+            !SHARED_LIBRARY_PATTERN.test(name)
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.name must end in ".so" or a numeric ".so.N" suffix.`
+            );
+        }
+        if (!Number.isInteger(size) || size <= 0) {
+            errors.push(
+                `Linux runtime manifest ${label}.size must be a positive integer.`
+            );
+        }
+        if (typeof sha256 !== 'string' || !SHA256_PATTERN.test(sha256)) {
+            errors.push(
+                `Linux runtime manifest ${label}.sha256 must be a lowercase 64-character hexadecimal digest.`
+            );
+        }
+
+        if (typeof name === 'string') {
+            if (names.has(name)) {
+                errors.push(
+                    `Linux runtime manifest runtimeFiles contains duplicate name "${name}".`
+                );
+            } else {
+                names.add(name);
+            }
+            if (name === 'libmpv.so') {
+                hasLibMpvLinkerAlias = true;
+            }
+            if (VERSIONED_LIBMPV_PATTERN.test(name)) {
+                hasVersionedLibMpv = true;
+            }
+        }
+    }
+
+    if (!hasVersionedLibMpv) {
+        errors.push(
+            'Linux runtime manifest runtimeFiles must include a versioned libmpv.so.N entry.'
+        );
+    }
+    if (!hasLibMpvLinkerAlias) {
+        errors.push(
+            'Linux runtime manifest runtimeFiles must include the libmpv.so linker alias.'
+        );
+    }
+}
+
+function validateRuntimeTotalBytes(errors, runtimeFiles, runtimeTotalBytes) {
+    const expectedTotal = Array.isArray(runtimeFiles)
+        ? runtimeFiles.reduce(
+              (total, runtimeFile) =>
+                  total +
+                  (isObject(runtimeFile) &&
+                  Number.isInteger(runtimeFile.size) &&
+                  runtimeFile.size > 0
+                      ? runtimeFile.size
+                      : 0),
+              0
+          )
+        : 0;
+    if (
+        !Number.isInteger(runtimeTotalBytes) ||
+        runtimeTotalBytes !== expectedTotal
+    ) {
+        errors.push(
+            `Linux runtime manifest runtimeTotalBytes must equal the sum of runtimeFiles sizes (${expectedTotal}).`
+        );
+    }
+}
+
+function validateRuntimeAbi(errors, runtimeAbi, runtimeFiles) {
+    if (!isObject(runtimeAbi)) {
+        errors.push('Linux runtime manifest runtimeAbi must be an object.');
+        return;
+    }
+    if (
+        !isObject(runtimeAbi.baseline) ||
+        !isDeepStrictEqual(runtimeAbi.baseline, PORTABLE_ABI_BASELINE)
+    ) {
+        errors.push(
+            'Linux runtime manifest runtimeAbi.baseline must exactly match the portable ABI baseline.'
+        );
+    }
+
+    const runtimeNames = Array.isArray(runtimeFiles)
+        ? runtimeFiles
+              .filter((runtimeFile) => isObject(runtimeFile))
+              .map(({ name }) => name)
+              .filter((name) => typeof name === 'string')
+        : [];
+    const runtimeNameSet = new Set(runtimeNames);
+    if (!Array.isArray(runtimeAbi.files)) {
+        errors.push(
+            'Linux runtime manifest runtimeAbi.files must contain one record for every runtime file.'
+        );
+        return;
+    }
+
+    const abiNames = new Set();
+    for (const [index, record] of runtimeAbi.files.entries()) {
+        const label = `runtimeAbi.files[${index}]`;
+        if (!isObject(record)) {
+            errors.push(`Linux runtime manifest ${label} must be an object.`);
+            continue;
+        }
+        if (
+            !isSafeBasename(record.name) ||
+            !SHARED_LIBRARY_PATTERN.test(record.name)
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.name must be a safe shared-library basename.`
+            );
+        }
+        if (abiNames.has(record.name)) {
+            errors.push(
+                `Linux runtime manifest runtimeAbi.files contains duplicate name "${String(
+                    record.name
+                )}".`
+            );
+        } else if (typeof record.name === 'string') {
+            abiNames.add(record.name);
+        }
+
+        for (const [field, maximum] of [
+            ['requiredGlibc', PORTABLE_ABI_BASELINE.glibcMaximum],
+            ['requiredGlibcxx', PORTABLE_ABI_BASELINE.glibcxxMaximum],
+        ]) {
+            const version = record[field];
+            if (
+                version !== null &&
+                (typeof version !== 'string' ||
+                    !/^\d+(?:\.\d+)+$/.test(version))
+            ) {
+                errors.push(
+                    `Linux runtime manifest ${label}.${field} must be null or a dotted numeric symbol version.`
+                );
+                continue;
+            }
+            if (version && compareVersions(version, maximum) > 0) {
+                errors.push(
+                    `Linux runtime manifest ${label}.${field} must not exceed portable ABI maximum ${maximum}.`
+                );
+            }
+        }
+    }
+
+    if (
+        runtimeAbi.files.length !== runtimeNames.length ||
+        runtimeNames.some((name) => !abiNames.has(name)) ||
+        [...abiNames].some((name) => !runtimeNameSet.has(name))
+    ) {
+        errors.push(
+            'Linux runtime manifest runtimeAbi.files must contain one record for every runtime file.'
+        );
+    }
+}
+
+function validateRuntimeExternalConfiguration(
+    errors,
+    runtimeExternalConfiguration
+) {
+    if (
+        !isObject(runtimeExternalConfiguration) ||
+        !isDeepStrictEqual(
+            runtimeExternalConfiguration,
+            RUNTIME_EXTERNAL_CONFIGURATION
+        )
+    ) {
+        errors.push(
+            'Linux runtime manifest runtimeExternalConfiguration must exactly match the system-owned runtime paths.'
+        );
+    }
+}
+
+function validateRuntimeDependencyClosure(
+    errors,
+    runtimeDependencyClosure,
+    runtimeFiles
+) {
+    if (!isObject(runtimeDependencyClosure)) {
+        errors.push(
+            'Linux runtime manifest runtimeDependencyClosure must be an object.'
+        );
+        return;
+    }
+
+    const runtimeNames = Array.isArray(runtimeFiles)
+        ? runtimeFiles
+              .filter((runtimeFile) => isObject(runtimeFile))
+              .map(({ name }) => name)
+              .filter((name) => typeof name === 'string')
+        : [];
+    const runtimeNameSet = new Set(runtimeNames);
+    const { entries, externalDependencies } = runtimeDependencyClosure;
+
+    if (!Array.isArray(entries)) {
+        errors.push(
+            'Linux runtime manifest runtimeDependencyClosure.entries must contain one record for every runtime file.'
+        );
+        return;
+    }
+
+    const entryNames = new Set();
+    const computedExternalDependencies = new Set();
+    for (const [index, entry] of entries.entries()) {
+        const label = `runtimeDependencyClosure.entries[${index}]`;
+        if (!isObject(entry)) {
+            errors.push(`Linux runtime manifest ${label} must be an object.`);
+            continue;
+        }
+
+        if (
+            !isSafeBasename(entry.name) ||
+            !SHARED_LIBRARY_PATTERN.test(entry.name)
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.name must be a safe shared-library basename.`
+            );
+        }
+        if (entryNames.has(entry.name)) {
+            errors.push(
+                `Linux runtime manifest runtimeDependencyClosure.entries contains duplicate name "${String(
+                    entry.name
+                )}".`
+            );
+        } else if (typeof entry.name === 'string') {
+            entryNames.add(entry.name);
+        }
+
+        if (
+            entry.soname !== null &&
+            (!isSafeBasename(entry.soname) ||
+                !SHARED_LIBRARY_PATTERN.test(entry.soname))
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.soname must be null or a safe shared-library basename.`
+            );
+        }
+
+        if (
+            !Array.isArray(entry.needed) ||
+            entry.needed.some(
+                (dependencyName) =>
+                    !isSafeBasename(dependencyName) ||
+                    !SHARED_LIBRARY_PATTERN.test(dependencyName)
+            )
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.needed must be an array of safe shared-library names.`
+            );
+        } else {
+            const neededNames = new Set();
+            for (const dependencyName of entry.needed) {
+                if (neededNames.has(dependencyName)) {
+                    errors.push(
+                        `Linux runtime manifest ${label}.needed contains duplicate name "${dependencyName}".`
+                    );
+                    continue;
+                }
+                neededNames.add(dependencyName);
+                if (runtimeNameSet.has(dependencyName)) {
+                    continue;
+                }
+                if (!ALLOWED_EXTERNAL_LIBRARY_NAMES.has(dependencyName)) {
+                    errors.push(
+                        `Linux runtime manifest dependency ${dependencyName} is not in the deterministic system-library allowlist.`
+                    );
+                    continue;
+                }
+                computedExternalDependencies.add(dependencyName);
+            }
+        }
+
+        if (!Array.isArray(entry.rpath) || entry.rpath.length !== 0) {
+            errors.push(
+                `Linux runtime manifest ${label}.rpath must be an empty array.`
+            );
+        }
+        if (
+            !Array.isArray(entry.runpath) ||
+            entry.runpath.length !== 1 ||
+            entry.runpath[0] !== '$ORIGIN'
+        ) {
+            errors.push(
+                `Linux runtime manifest ${label}.runpath must contain only "$ORIGIN".`
+            );
+        }
+    }
+
+    if (
+        entries.length !== runtimeNames.length ||
+        runtimeNames.some((name) => !entryNames.has(name)) ||
+        [...entryNames].some((name) => !runtimeNameSet.has(name))
+    ) {
+        errors.push(
+            'Linux runtime manifest runtimeDependencyClosure.entries must contain one record for every runtime file.'
+        );
+    }
+
+    const libMpvLinkerEntry = entries.find(
+        (entry) => isObject(entry) && entry.name === 'libmpv.so'
+    );
+    if (
+        !libMpvLinkerEntry ||
+        typeof libMpvLinkerEntry.soname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(libMpvLinkerEntry.soname) ||
+        !runtimeNameSet.has(libMpvLinkerEntry.soname)
+    ) {
+        errors.push(
+            'Linux runtime manifest libmpv.so must declare a versioned SONAME present in runtimeFiles.'
+        );
+    }
+
+    const expectedExternalDependencies = [
+        ...computedExternalDependencies,
+    ].sort();
+    if (
+        !Array.isArray(externalDependencies) ||
+        externalDependencies.some(
+            (dependencyName) =>
+                !isSafeBasename(dependencyName) ||
+                !SHARED_LIBRARY_PATTERN.test(dependencyName)
+        ) ||
+        JSON.stringify(externalDependencies) !==
+            JSON.stringify(expectedExternalDependencies)
+    ) {
+        errors.push(
+            'Linux runtime manifest runtimeDependencyClosure.externalDependencies must exactly match the sorted allowlisted external dependency set.'
+        );
+    }
+}
+
+function validateExternalSystemLibraries(errors, externalSystemLibraries) {
+    const expectedKeys = ['interface', 'name', 'reason'];
+    const matchesDeterministicAllowlist =
+        Array.isArray(externalSystemLibraries) &&
+        externalSystemLibraries.length === EXTERNAL_SYSTEM_LIBRARIES.length &&
+        externalSystemLibraries.every((externalLibrary, index) => {
+            if (!isObject(externalLibrary)) {
+                return false;
+            }
+            const actualKeys = Object.keys(externalLibrary).sort();
+            if (
+                actualKeys.length !== expectedKeys.length ||
+                actualKeys.some(
+                    (key, keyIndex) => key !== expectedKeys[keyIndex]
+                )
+            ) {
+                return false;
+            }
+            const expectedLibrary = EXTERNAL_SYSTEM_LIBRARIES[index];
+            return expectedKeys.every(
+                (key) => externalLibrary[key] === expectedLibrary[key]
+            );
+        });
+    if (!matchesDeterministicAllowlist) {
+        errors.push(
+            'Linux runtime manifest externalSystemLibraries must exactly match the deterministic allowlist.'
+        );
+    }
+}
+
+function validateBuildHost(errors, buildHost) {
+    if (!isObject(buildHost)) {
+        errors.push('Linux runtime manifest buildHost must be an object.');
+        return;
+    }
+    if (buildHost.platform !== 'linux') {
+        errors.push(
+            'Linux runtime manifest buildHost.platform must be "linux".'
+        );
+    }
+    if (buildHost.arch !== 'x64') {
+        errors.push('Linux runtime manifest buildHost.arch must be "x64".');
+    }
+    if (!isNonEmptyString(buildHost.release)) {
+        errors.push(
+            'Linux runtime manifest buildHost.release must be a non-empty string.'
+        );
+    }
+    if (
+        typeof buildHost.glibcVersion !== 'string' ||
+        !/^\d+(?:\.\d+)+$/.test(buildHost.glibcVersion)
+    ) {
+        errors.push(
+            'Linux runtime manifest buildHost.glibcVersion must be a dotted numeric version.'
+        );
+    } else if (
+        compareVersions(
+            buildHost.glibcVersion,
+            PORTABLE_ABI_BASELINE.glibcMaximum
+        ) > 0
+    ) {
+        errors.push(
+            `Linux runtime manifest buildHost.glibcVersion ${buildHost.glibcVersion} exceeds portable ABI baseline maximum ${PORTABLE_ABI_BASELINE.glibcMaximum}.`
+        );
+    }
+
+    if (
+        !Array.isArray(buildHost.systemPkgConfigDirs) ||
+        buildHost.systemPkgConfigDirs.length === 0 ||
+        buildHost.systemPkgConfigDirs.some(
+            (directory) =>
+                !isNonEmptyString(directory) || !path.isAbsolute(directory)
+        ) ||
+        new Set(buildHost.systemPkgConfigDirs).size !==
+            buildHost.systemPkgConfigDirs.length
+    ) {
+        errors.push(
+            'Linux runtime manifest buildHost.systemPkgConfigDirs must be a non-empty array of unique absolute paths.'
+        );
+    }
+
+    if (!isObject(buildHost.systemPkgConfigPackages)) {
+        errors.push(
+            'Linux runtime manifest buildHost.systemPkgConfigPackages must be an object.'
+        );
+    } else {
+        for (const packageName of EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES) {
+            if (
+                !isNonEmptyString(
+                    buildHost.systemPkgConfigPackages[packageName]
+                )
+            ) {
+                errors.push(
+                    `Linux runtime manifest buildHost.systemPkgConfigPackages.${packageName} must be a non-empty version string.`
+                );
+            }
+        }
+        for (const packageName of Object.keys(
+            buildHost.systemPkgConfigPackages
+        ).sort()) {
+            if (!EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES.includes(packageName)) {
+                errors.push(
+                    `Linux runtime manifest buildHost.systemPkgConfigPackages contains unexpected package "${packageName}".`
+                );
+            }
+        }
+    }
+
+    if (!isObject(buildHost.tools)) {
+        errors.push(
+            'Linux runtime manifest buildHost.tools must be an object.'
+        );
+        return;
+    }
+    for (const tool of REQUIRED_TOOLS) {
+        const declaredVersion = buildHost.tools[tool];
+        if (!isNonEmptyString(declaredVersion)) {
+            errors.push(
+                `Linux runtime manifest buildHost.tools.${tool} must be a non-empty version string.`
+            );
+            continue;
+        }
+        const actualVersion = parseVersion(declaredVersion);
+        if (!actualVersion) {
+            errors.push(
+                `Linux runtime manifest buildHost.tools.${tool} must contain a parseable dotted numeric version.`
+            );
+        } else if (
+            compareVersions(actualVersion, MINIMUM_TOOL_VERSIONS[tool]) < 0
+        ) {
+            errors.push(
+                `Linux runtime manifest buildHost.tools.${tool} ${actualVersion} is unsupported; requires ${MINIMUM_TOOL_VERSIONS[tool]} or newer.`
+            );
+        }
+    }
+    for (const tool of Object.keys(buildHost.tools).sort()) {
+        if (!REQUIRED_TOOLS.includes(tool)) {
+            errors.push(
+                `Linux runtime manifest buildHost.tools contains unexpected tool "${tool}".`
+            );
+        }
+    }
+}
+
+function validateLinuxRuntimeManifest(manifest) {
+    if (!isObject(manifest)) {
+        return ['Linux runtime manifest must be an object.'];
+    }
+
+    const errors = [];
+    if (manifest.schemaVersion !== LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION) {
+        errors.push(
+            `Linux runtime manifest schemaVersion must be ${LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION}.`
+        );
+    }
+    if (manifest.origin !== 'vendored-lgpl-source-build') {
+        errors.push(
+            'Linux runtime manifest origin must be "vendored-lgpl-source-build".'
+        );
+    }
+    if (manifest.platform !== 'linux') {
+        errors.push('Linux runtime manifest platform must be "linux".');
+    }
+    if (manifest.arch !== 'x64') {
+        errors.push('Linux runtime manifest arch must be "x64".');
+    }
+
+    validatePackages(errors, manifest.packages);
+    validateFfmpeg(errors, manifest.ffmpeg);
+    validateMpv(errors, manifest.mpv);
+
+    if (!isNonEmptyString(manifest.sourceDistribution)) {
+        errors.push(
+            'Linux runtime manifest sourceDistribution must be a non-empty string.'
+        );
+    } else {
+        for (const [sourceName, sourcePattern] of [
+            ['hwdata', /\bhwdata\b/i],
+            ['pnp.ids', /\bpnp\.ids\b/i],
+            ['libdisplay-info', /\blibdisplay-info\b/i],
+        ]) {
+            if (!sourcePattern.test(manifest.sourceDistribution)) {
+                errors.push(
+                    `Linux runtime manifest sourceDistribution must explicitly include ${sourceName}.`
+                );
+            }
+        }
+    }
+
+    validateRuntimeFiles(errors, manifest.runtimeFiles);
+    validateRuntimeTotalBytes(
+        errors,
+        manifest.runtimeFiles,
+        manifest.runtimeTotalBytes
+    );
+    validateRuntimeAbi(errors, manifest.runtimeAbi, manifest.runtimeFiles);
+    validateRuntimeExternalConfiguration(
+        errors,
+        manifest.runtimeExternalConfiguration
+    );
+    validateRuntimeDependencyClosure(
+        errors,
+        manifest.runtimeDependencyClosure,
+        manifest.runtimeFiles
+    );
+    validateExternalSystemLibraries(errors, manifest.externalSystemLibraries);
+    validateBuildHost(errors, manifest.buildHost);
+    return errors;
+}
+
+function isLinuxSystemBuildInputManifest(manifest) {
+    return isObject(manifest) && manifest.linuxBackend === LINUX_SYSTEM_BACKEND;
+}
+
+function validateLinuxSystemBuildInputManifest(manifest) {
+    if (!isObject(manifest)) {
+        return ['Linux system build-input manifest must be an object.'];
+    }
+
+    const errors = [];
+    if (manifest.linuxBackend !== LINUX_SYSTEM_BACKEND) {
+        errors.push(
+            `Linux system build-input manifest linuxBackend must be "${LINUX_SYSTEM_BACKEND}".`
+        );
+    }
+
+    if (!isObject(manifest.buildInputs)) {
+        errors.push(
+            'Linux system build-input manifest buildInputs must be an object.'
+        );
+    } else {
+        for (const packageName of ['libmpvDevPackage', 'mpvPackage']) {
+            if (!isNonEmptyString(manifest.buildInputs[packageName])) {
+                errors.push(
+                    `Linux system build-input manifest buildInputs.${packageName} must be a non-empty string.`
+                );
+            }
+        }
+    }
+
+    if (!isNonEmptyString(manifest.sourceDistribution)) {
+        errors.push(
+            'Linux system build-input manifest sourceDistribution must be a non-empty string.'
+        );
+    }
+    if (Object.prototype.hasOwnProperty.call(manifest, 'origin')) {
+        errors.push(
+            'Linux system build-input manifest must not include origin.'
+        );
+    }
+    if (Object.prototype.hasOwnProperty.call(manifest, 'runtimeFiles')) {
+        errors.push(
+            'Linux system build-input manifest must not include runtimeFiles.'
+        );
+    }
+
+    return errors;
+}
+
+module.exports = {
+    LINUX_SYSTEM_BACKEND,
+    LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION,
+    isLinuxSystemBuildInputManifest,
+    validateLinuxRuntimeManifest,
+    validateLinuxSystemBuildInputManifest,
+};
diff --git a/tools/embedded-mpv/linux-runtime-manifest.test.mjs b/tools/embedded-mpv/linux-runtime-manifest.test.mjs
new file mode 100644
index 000000000..81ae64543
--- /dev/null
+++ b/tools/embedded-mpv/linux-runtime-manifest.test.mjs
@@ -0,0 +1,1185 @@
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import test from 'node:test';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const {
+    LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION,
+    validateLinuxRuntimeManifest,
+    validateLinuxSystemBuildInputManifest,
+} = require('./linux-runtime-manifest.cjs');
+const {
+    DEFAULT_SYSTEM_PKG_CONFIG_DIRS,
+    EXTERNAL_SYSTEM_LIBRARIES,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    GLIBC_TOOLCHAIN_ALLOWLIST,
+    MINIMUM_TOOL_VERSIONS,
+    PORTABLE_ABI_BASELINE,
+    REQUIRED_TOOLS,
+    RUNTIME_EXTERNAL_CONFIGURATION,
+    SOURCE_PACKAGES,
+} = require('./build-linux-runtime.cjs');
+
+const workspaceRoot = fileURLToPath(new URL('../..', import.meta.url));
+const stageRuntimeScript = path.join(
+    workspaceRoot,
+    'tools',
+    'embedded-mpv',
+    'stage-runtime.mjs'
+);
+const stageRuntimeSource = fs.readFileSync(stageRuntimeScript, 'utf8');
+const EXPECTED_LIBPLACEBO_SOURCE_SUBMODULES = Object.freeze([
+    '450bd2232225d6c7728a4108055ac2e37cef6475 3rdparty/Vulkan-Headers',
+    '97b54ca9e75f5303507699d27c6b4f4efe4641a1 3rdparty/fast_float',
+    '73db193f853e2ee079bf3ca8a64aa2eaf6459043 3rdparty/glad',
+    '15206881c006c79667fe5154fe80c01c65410679 3rdparty/jinja',
+    '297fc8e356e6836a62087949245d09a28e9f1b13 3rdparty/markupsafe',
+    '242f35efa067a46c595645eeda7b1771ea1f83b1 demos/3rdparty/nuklear',
+]);
+
+function sha256(value) {
+    return crypto.createHash('sha256').update(value).digest('hex');
+}
+
+function runtimeFile(name, contents) {
+    return {
+        name,
+        size: Buffer.byteLength(contents),
+        sha256: sha256(contents),
+    };
+}
+
+function sourcePackageRecord(sourcePackage) {
+    return {
+        version: sourcePackage.version,
+        sourceUrl: sourcePackage.sourceUrl,
+        ...(sourcePackage.sourceTag
+            ? { sourceTag: sourcePackage.sourceTag }
+            : {}),
+        ...(sourcePackage.buildInput
+            ? { buildInput: structuredClone(sourcePackage.buildInput) }
+            : {}),
+        ...(sourcePackage.sourceKind === 'archive'
+            ? { sourceSha256: sourcePackage.expectedSha256 }
+            : {
+                  sourceGitCommit: sourcePackage.expectedGitCommit,
+                  sourceSubmodules: [...EXPECTED_LIBPLACEBO_SOURCE_SUBMODULES],
+              }),
+        license: sourcePackage.license,
+    };
+}
+
+function createValidManifest(
+    runtimeFiles = [
+        runtimeFile('libmpv.so.2', 'libmpv-runtime'),
+        runtimeFile('libavcodec.so.61', 'libavcodec-runtime'),
+        runtimeFile('libmpv.so', 'libmpv-runtime'),
+    ]
+) {
+    const packages = Object.fromEntries(
+        SOURCE_PACKAGES.map((sourcePackage) => [
+            sourcePackage.id,
+            sourcePackageRecord(sourcePackage),
+        ])
+    );
+    const runtimeNames = new Set(
+        runtimeFiles
+            .map((runtimeEntry) => runtimeEntry?.name)
+            .filter((name) => typeof name === 'string')
+    );
+    const closureEntries = runtimeFiles
+        .filter(
+            (runtimeEntry) =>
+                runtimeEntry && typeof runtimeEntry.name === 'string'
+        )
+        .map((runtimeEntry) => ({
+            name: runtimeEntry.name,
+            soname: runtimeEntry.name.startsWith('libmpv.so')
+                ? 'libmpv.so.2'
+                : runtimeEntry.name,
+            needed: runtimeEntry.name.startsWith('libmpv.so')
+                ? [
+                      ...(runtimeNames.has('libavcodec.so.61')
+                          ? ['libavcodec.so.61']
+                          : []),
+                      'libEGL.so.1',
+                      'libc.so.6',
+                  ]
+                : ['libm.so.6'],
+            rpath: [],
+            runpath: ['$ORIGIN'],
+        }));
+    const externalDependencies = [
+        ...new Set(
+            closureEntries
+                .flatMap(({ needed }) => needed)
+                .filter((neededName) => !runtimeNames.has(neededName))
+        ),
+    ].sort();
+
+    return {
+        schemaVersion: 1,
+        origin: 'vendored-lgpl-source-build',
+        platform: 'linux',
+        arch: 'x64',
+        packages,
+        ffmpeg: {
+            ...packages.ffmpeg,
+            configureFlags: [
+                '--enable-shared',
+                '--disable-gpl',
+                '--disable-nonfree',
+            ],
+        },
+        mpv: {
+            ...packages.mpv,
+            mesonFlags: ['-Dlibmpv=true', '-Dgpl=false'],
+        },
+        sourceDistribution:
+            'Publish the exact source archives, including pinned hwdata pnp.ids and the MIT-licensed libdisplay-info source archive.',
+        runtimeFiles,
+        runtimeTotalBytes: runtimeFiles.reduce(
+            (total, runtimeEntry) => total + (runtimeEntry?.size ?? 0),
+            0
+        ),
+        runtimeAbi: {
+            baseline: { ...PORTABLE_ABI_BASELINE },
+            files: runtimeFiles
+                .filter(
+                    (runtimeEntry) =>
+                        runtimeEntry && typeof runtimeEntry.name === 'string'
+                )
+                .map(({ name }) => ({
+                    name,
+                    requiredGlibc: '2.34',
+                    requiredGlibcxx: null,
+                })),
+        },
+        runtimeExternalConfiguration: structuredClone(
+            RUNTIME_EXTERNAL_CONFIGURATION
+        ),
+        runtimeDependencyClosure: {
+            entries: closureEntries,
+            externalDependencies,
+        },
+        externalSystemLibraries: EXTERNAL_SYSTEM_LIBRARIES.map(
+            (externalLibrary) => ({ ...externalLibrary })
+        ),
+        buildHost: {
+            platform: 'linux',
+            arch: 'x64',
+            release: 'fixture-kernel',
+            glibcVersion: '2.35',
+            systemPkgConfigDirs: [...DEFAULT_SYSTEM_PKG_CONFIG_DIRS],
+            systemPkgConfigPackages: Object.fromEntries(
+                EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES.map((packageName) => [
+                    packageName,
+                    `${packageName} fixture version`,
+                ])
+            ),
+            tools: Object.fromEntries(
+                REQUIRED_TOOLS.map((tool) => [
+                    tool,
+                    `${tool} ${MINIMUM_TOOL_VERSIONS[tool]}`,
+                ])
+            ),
+        },
+    };
+}
+
+function createSystemBuildInputManifest() {
+    return {
+        linuxBackend: 'process-isolated mpv --wid',
+        buildInputs: {
+            libmpvDevPackage: '2:0.40.0-3ubuntu2',
+            mpvPackage: '0.40.0-3ubuntu2',
+        },
+        sourceDistribution:
+            'Linux CI build inputs come from Ubuntu runner packages. Runtime playback uses the system mpv executable; IPTVnator does not bundle or load libmpv in the Electron process on Linux.',
+    };
+}
+
+function createFixture(t, options = {}) {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-runtime-test-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+
+    const prefix = path.join(root, 'prefix');
+    const includeDir = path.join(prefix, 'include', 'mpv');
+    const libDir = path.join(prefix, 'lib');
+    fs.mkdirSync(includeDir, { recursive: true });
+    fs.mkdirSync(libDir, { recursive: true });
+    fs.writeFileSync(
+        path.join(includeDir, 'client.h'),
+        '/* libmpv header */\n'
+    );
+
+    const contentsByName = new Map([
+        ['libmpv.so.2', 'libmpv-runtime'],
+        ['libavcodec.so.61', 'libavcodec-runtime'],
+        ['libmpv.so', 'libmpv-runtime'],
+    ]);
+
+    for (const [name, contents] of contentsByName) {
+        fs.writeFileSync(path.join(libDir, name), contents);
+    }
+
+    const manifest =
+        options.manifest ??
+        createValidManifest(
+            [...contentsByName].map(([name, contents]) =>
+                runtimeFile(name, contents)
+            )
+        );
+    options.mutateManifest?.(manifest);
+
+    if (options.removeRuntimeFile) {
+        fs.rmSync(path.join(libDir, options.removeRuntimeFile), {
+            force: true,
+        });
+    }
+    if (options.removeHeader) {
+        fs.rmSync(path.join(includeDir, 'client.h'), { force: true });
+    }
+    if (!options.omitManifest) {
+        fs.writeFileSync(
+            path.join(prefix, 'runtime-manifest.json'),
+            `${JSON.stringify(manifest, null, 2)}\n`
+        );
+    }
+
+    return { libDir, manifest, prefix, root };
+}
+
+function destinationRootFor(fixture) {
+    return path.join(fixture.root, 'vendor', 'embedded-mpv', 'linux-x64');
+}
+
+function runStage(fixture) {
+    return spawnSync(
+        process.execPath,
+        [stageRuntimeScript, 'linux', 'x64', fixture.prefix],
+        {
+            cwd: fixture.root,
+            encoding: 'utf8',
+        }
+    );
+}
+
+function assertStageRejected(t, options, expectedError) {
+    const fixture = createFixture(t, options);
+    const result = runStage(fixture);
+
+    assert.notEqual(result.status, 0, result.stdout);
+    assert.match(result.stderr, expectedError);
+}
+
+test('exports the Linux runtime manifest schema version', () => {
+    assert.equal(LINUX_RUNTIME_MANIFEST_SCHEMA_VERSION, 1);
+});
+
+test('accepts a complete LGPL Linux x64 source-build manifest', () => {
+    assert.deepEqual(validateLinuxRuntimeManifest(createValidManifest()), []);
+});
+
+test('requires the exact pinned source package set and provenance', () => {
+    const expectedPackageNames = SOURCE_PACKAGES.map(({ id }) => id).sort();
+    assert.deepEqual(
+        Object.keys(createValidManifest().packages).sort(),
+        expectedPackageNames
+    );
+
+    for (const packageName of expectedPackageNames) {
+        const manifest = createValidManifest();
+        delete manifest.packages[packageName];
+        assert.match(
+            validateLinuxRuntimeManifest(manifest).join('\n'),
+            new RegExp(`packages\\.${packageName} must be an object`)
+        );
+    }
+
+    const unexpectedPackage = createValidManifest();
+    unexpectedPackage.packages.unpinned = {
+        version: '1.0.0',
+        sourceUrl: 'https://example.test/unpinned.tar.xz',
+        sourceSha256: 'f'.repeat(64),
+        license: 'MIT',
+    };
+    assert.match(
+        validateLinuxRuntimeManifest(unexpectedPackage).join('\n'),
+        /packages contains unexpected source package "unpinned"/
+    );
+});
+
+test('requires pinned archive hashes and exact libplacebo git provenance', () => {
+    const archiveMismatch = createValidManifest();
+    archiveMismatch.packages.freetype.sourceSha256 = '0'.repeat(64);
+    assert.match(
+        validateLinuxRuntimeManifest(archiveMismatch).join('\n'),
+        /packages\.freetype\.sourceSha256 must equal the pinned digest/
+    );
+
+    const commitMismatch = createValidManifest();
+    commitMismatch.packages.libplacebo.sourceGitCommit = '0'.repeat(40);
+    assert.match(
+        validateLinuxRuntimeManifest(commitMismatch).join('\n'),
+        /packages\.libplacebo\.sourceGitCommit must equal the pinned commit/
+    );
+
+    const submoduleCommitMismatch = createValidManifest();
+    submoduleCommitMismatch.packages.libplacebo.sourceSubmodules[0] = `${'f'.repeat(40)} 3rdparty/Vulkan-Headers`;
+    assert.match(
+        validateLinuxRuntimeManifest(submoduleCommitMismatch).join('\n'),
+        /packages\.libplacebo\.sourceSubmodules must equal the pinned records/
+    );
+
+    const hostHwdataInput = createValidManifest();
+    hostHwdataInput.packages.hwdata.buildInput.relativePath =
+        '/usr/share/hwdata/pnp.ids';
+    assert.match(
+        validateLinuxRuntimeManifest(hostHwdataInput).join('\n'),
+        /packages\.hwdata\.buildInput must equal the pinned build input/
+    );
+
+    const validSubmoduleRecord = `${'a'.repeat(40)} 3rdparty/example`;
+    for (const sourceSubmodules of [
+        [],
+        ['not-a-submodule-record'],
+        [`${'a'.repeat(40)} ../escape`],
+        [validSubmoduleRecord, validSubmoduleRecord],
+    ]) {
+        const invalidSubmodules = createValidManifest();
+        invalidSubmodules.packages.libplacebo.sourceSubmodules =
+            sourceSubmodules;
+        assert.match(
+            validateLinuxRuntimeManifest(invalidSubmodules).join('\n'),
+            /packages\.libplacebo\.sourceSubmodules/
+        );
+    }
+});
+
+test('requires runtimeTotalBytes to equal the declared runtime file sizes', () => {
+    const missingTotal = createValidManifest();
+    delete missingTotal.runtimeTotalBytes;
+    assert.match(
+        validateLinuxRuntimeManifest(missingTotal).join('\n'),
+        /runtimeTotalBytes must equal the sum/
+    );
+
+    const wrongTotal = createValidManifest();
+    wrongTotal.runtimeTotalBytes += 1;
+    assert.match(
+        validateLinuxRuntimeManifest(wrongTotal).join('\n'),
+        /runtimeTotalBytes must equal the sum/
+    );
+});
+
+test('requires a complete ORIGIN-only runtime dependency closure', () => {
+    const missingEntry = createValidManifest();
+    missingEntry.runtimeDependencyClosure.entries.pop();
+    assert.match(
+        validateLinuxRuntimeManifest(missingEntry).join('\n'),
+        /runtimeDependencyClosure\.entries must contain one record for every runtime file/
+    );
+
+    const duplicateEntry = createValidManifest();
+    duplicateEntry.runtimeDependencyClosure.entries[1].name =
+        duplicateEntry.runtimeDependencyClosure.entries[0].name;
+    assert.match(
+        validateLinuxRuntimeManifest(duplicateEntry).join('\n'),
+        /runtimeDependencyClosure\.entries contains duplicate name/
+    );
+
+    const invalidNeeded = createValidManifest();
+    invalidNeeded.runtimeDependencyClosure.entries[0].needed = 'libc.so.6';
+    assert.match(
+        validateLinuxRuntimeManifest(invalidNeeded).join('\n'),
+        /needed must be an array of safe shared-library names/
+    );
+
+    const absoluteRpath = createValidManifest();
+    absoluteRpath.runtimeDependencyClosure.entries[0].rpath = ['/tmp/lib'];
+    assert.match(
+        validateLinuxRuntimeManifest(absoluteRpath).join('\n'),
+        /rpath must be an empty array/
+    );
+
+    const wrongRunpath = createValidManifest();
+    wrongRunpath.runtimeDependencyClosure.entries[0].runpath = ['/tmp/lib'];
+    assert.match(
+        validateLinuxRuntimeManifest(wrongRunpath).join('\n'),
+        /runpath must contain only "\$ORIGIN"/
+    );
+
+    const unknownDependency = createValidManifest();
+    unknownDependency.runtimeDependencyClosure.entries[0].needed.push(
+        'libsurprise.so.1'
+    );
+    unknownDependency.runtimeDependencyClosure.externalDependencies.push(
+        'libsurprise.so.1'
+    );
+    assert.match(
+        validateLinuxRuntimeManifest(unknownDependency).join('\n'),
+        /libsurprise\.so\.1.*not in the deterministic system-library allowlist/
+    );
+});
+
+test('requires safe SONAME metadata and a bundled versioned libmpv target', () => {
+    const missingLinkerAlias = createValidManifest();
+    const aliasFile = missingLinkerAlias.runtimeFiles.find(
+        ({ name }) => name === 'libmpv.so'
+    );
+    missingLinkerAlias.runtimeFiles = missingLinkerAlias.runtimeFiles.filter(
+        ({ name }) => name !== 'libmpv.so'
+    );
+    missingLinkerAlias.runtimeTotalBytes -= aliasFile.size;
+    missingLinkerAlias.runtimeAbi.files =
+        missingLinkerAlias.runtimeAbi.files.filter(
+            ({ name }) => name !== 'libmpv.so'
+        );
+    missingLinkerAlias.runtimeDependencyClosure.entries =
+        missingLinkerAlias.runtimeDependencyClosure.entries.filter(
+            ({ name }) => name !== 'libmpv.so'
+        );
+    assert.match(
+        validateLinuxRuntimeManifest(missingLinkerAlias).join('\n'),
+        /runtimeFiles must include the libmpv\.so linker alias/
+    );
+
+    const missingLibmpvSoname = createValidManifest();
+    missingLibmpvSoname.runtimeDependencyClosure.entries.find(
+        ({ name }) => name === 'libmpv.so'
+    ).soname = null;
+    assert.match(
+        validateLinuxRuntimeManifest(missingLibmpvSoname).join('\n'),
+        /libmpv\.so must declare a versioned SONAME present in runtimeFiles/
+    );
+
+    const unsafeSoname = createValidManifest();
+    unsafeSoname.runtimeDependencyClosure.entries[0].soname = '../libmpv.so.2';
+    assert.match(
+        validateLinuxRuntimeManifest(unsafeSoname).join('\n'),
+        /runtimeDependencyClosure\.entries\[0\]\.soname must be null or a safe shared-library basename/
+    );
+
+    const absentSonameTarget = createValidManifest();
+    absentSonameTarget.runtimeDependencyClosure.entries.find(
+        ({ name }) => name === 'libmpv.so'
+    ).soname = 'libmpv.so.99';
+    assert.match(
+        validateLinuxRuntimeManifest(absentSonameTarget).join('\n'),
+        /libmpv\.so must declare a versioned SONAME present in runtimeFiles/
+    );
+});
+
+test('requires the deterministic external-system-library records', () => {
+    const manifest = createValidManifest();
+    manifest.externalSystemLibraries.reverse();
+    assert.match(
+        validateLinuxRuntimeManifest(manifest).join('\n'),
+        /externalSystemLibraries must exactly match the deterministic allowlist/
+    );
+
+    const allowedNames = new Set([
+        ...GLIBC_TOOLCHAIN_ALLOWLIST,
+        ...EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+    ]);
+    for (const dependencyName of createValidManifest().runtimeDependencyClosure
+        .externalDependencies) {
+        assert.equal(allowedNames.has(dependencyName), true, dependencyName);
+    }
+});
+
+test('requires a Linux x64 build host and every required tool version', () => {
+    const wrongPlatform = createValidManifest();
+    wrongPlatform.buildHost.platform = 'darwin';
+    assert.match(
+        validateLinuxRuntimeManifest(wrongPlatform).join('\n'),
+        /buildHost\.platform must be "linux"/
+    );
+
+    const wrongArch = createValidManifest();
+    wrongArch.buildHost.arch = 'arm64';
+    assert.match(
+        validateLinuxRuntimeManifest(wrongArch).join('\n'),
+        /buildHost\.arch must be "x64"/
+    );
+
+    for (const tool of REQUIRED_TOOLS) {
+        const missingTool = createValidManifest();
+        delete missingTool.buildHost.tools[tool];
+        assert.match(
+            validateLinuxRuntimeManifest(missingTool).join('\n'),
+            new RegExp(`buildHost\\.tools\\.${tool.replace('-', '\\-')}`)
+        );
+    }
+
+    const unexpectedTool = createValidManifest();
+    unexpectedTool.buildHost.tools.unexpected = '1.0';
+    assert.match(
+        validateLinuxRuntimeManifest(unexpectedTool).join('\n'),
+        /buildHost\.tools contains unexpected tool "unexpected"/
+    );
+
+    const relativePkgConfigDir = createValidManifest();
+    relativePkgConfigDir.buildHost.systemPkgConfigDirs = ['relative/pkgconfig'];
+    assert.match(
+        validateLinuxRuntimeManifest(relativePkgConfigDir).join('\n'),
+        /buildHost\.systemPkgConfigDirs must be a non-empty array of unique absolute paths/
+    );
+
+    for (const packageName of EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES) {
+        const missingPackage = createValidManifest();
+        delete missingPackage.buildHost.systemPkgConfigPackages[packageName];
+        assert.match(
+            validateLinuxRuntimeManifest(missingPackage).join('\n'),
+            new RegExp(
+                `buildHost\\.systemPkgConfigPackages\\.${packageName.replace(
+                    '-',
+                    '\\-'
+                )}`
+            )
+        );
+    }
+
+    const unexpectedPackage = createValidManifest();
+    unexpectedPackage.buildHost.systemPkgConfigPackages.unexpected = '1.0';
+    assert.match(
+        validateLinuxRuntimeManifest(unexpectedPackage).join('\n'),
+        /buildHost\.systemPkgConfigPackages contains unexpected package "unexpected"/
+    );
+
+    const unsupportedGlibc = createValidManifest();
+    unsupportedGlibc.buildHost.glibcVersion = '2.36';
+    assert.match(
+        validateLinuxRuntimeManifest(unsupportedGlibc).join('\n'),
+        /buildHost\.glibcVersion.*portable ABI baseline.*2\.35/i
+    );
+
+    const unsupportedMeson = createValidManifest();
+    unsupportedMeson.buildHost.tools.meson = 'meson 1.5.9';
+    assert.match(
+        validateLinuxRuntimeManifest(unsupportedMeson).join('\n'),
+        /buildHost\.tools\.meson.*requires 1\.6\.0 or newer/i
+    );
+});
+
+test('requires exact portable ABI and external configuration records', () => {
+    const missingAbiFile = createValidManifest();
+    missingAbiFile.runtimeAbi.files.pop();
+    assert.match(
+        validateLinuxRuntimeManifest(missingAbiFile).join('\n'),
+        /runtimeAbi\.files must contain one record for every runtime file/
+    );
+
+    const newerGlibcSymbol = createValidManifest();
+    newerGlibcSymbol.runtimeAbi.files[0].requiredGlibc = '2.36';
+    assert.match(
+        validateLinuxRuntimeManifest(newerGlibcSymbol).join('\n'),
+        /runtimeAbi\.files\[0\]\.requiredGlibc.*maximum 2\.35/
+    );
+
+    const newerGlibcxxSymbol = createValidManifest();
+    newerGlibcxxSymbol.runtimeAbi.files[0].requiredGlibcxx = '3.4.31';
+    assert.match(
+        validateLinuxRuntimeManifest(newerGlibcxxSymbol).join('\n'),
+        /runtimeAbi\.files\[0\]\.requiredGlibcxx.*maximum 3\.4\.30/
+    );
+
+    const wrongBaseline = createValidManifest();
+    wrongBaseline.runtimeAbi.baseline.distribution = 'current host';
+    assert.match(
+        validateLinuxRuntimeManifest(wrongBaseline).join('\n'),
+        /runtimeAbi\.baseline must exactly match the portable ABI baseline/
+    );
+
+    const buildPathConfiguration = createValidManifest();
+    buildPathConfiguration.runtimeExternalConfiguration.fontconfig.configDirectory =
+        '/tmp/build-prefix/etc/fonts';
+    assert.match(
+        validateLinuxRuntimeManifest(buildPathConfiguration).join('\n'),
+        /runtimeExternalConfiguration must exactly match the system-owned runtime paths/
+    );
+});
+
+test('requires the source-distribution statement to name pinned display data', () => {
+    const manifest = createValidManifest();
+    manifest.sourceDistribution =
+        'Publish all of the other source archives with the binary release.';
+    const errors = validateLinuxRuntimeManifest(manifest).join('\n');
+    assert.match(errors, /sourceDistribution must explicitly include hwdata/);
+    assert.match(errors, /sourceDistribution must explicitly include pnp\.ids/);
+    assert.match(
+        errors,
+        /sourceDistribution must explicitly include libdisplay-info/
+    );
+});
+
+test('accepts and stages the current Linux CI system build-input manifest', (t) => {
+    const systemManifest = createSystemBuildInputManifest();
+    assert.deepEqual(validateLinuxSystemBuildInputManifest(systemManifest), []);
+
+    const fixture = createFixture(t, { manifest: systemManifest });
+    const result = runStage(fixture);
+    assert.equal(result.status, 0, result.stderr);
+
+    const destinationRoot = destinationRootFor(fixture);
+    assert.equal(
+        fs.readFileSync(
+            path.join(destinationRoot, 'include', 'mpv', 'client.h'),
+            'utf8'
+        ),
+        '/* libmpv header */\n'
+    );
+    assert.equal(fs.existsSync(path.join(destinationRoot, 'lib')), false);
+
+    const stagedManifest = JSON.parse(
+        fs.readFileSync(
+            path.join(destinationRoot, 'runtime-manifest.json'),
+            'utf8'
+        )
+    );
+    assert.equal(stagedManifest.origin, 'vendored-lgpl');
+    assert.equal(stagedManifest.platform, 'linux');
+    assert.equal(stagedManifest.arch, 'x64');
+    assert.deepEqual(stagedManifest.runtimeFiles, []);
+    assert.deepEqual(stagedManifest.buildInputs, systemManifest.buildInputs);
+    assert.equal(stagedManifest.linuxBackend, systemManifest.linuxBackend);
+    assert.equal('sourceBuildOrigin' in stagedManifest, false);
+});
+
+test('rejects malformed system build-input manifests without falling through', (t) => {
+    const malformedSystemManifest = createSystemBuildInputManifest();
+    malformedSystemManifest.buildInputs.mpvPackage = '';
+    malformedSystemManifest.runtimeFiles = [];
+
+    assert.deepEqual(
+        validateLinuxSystemBuildInputManifest(malformedSystemManifest),
+        [
+            'Linux system build-input manifest buildInputs.mpvPackage must be a non-empty string.',
+            'Linux system build-input manifest must not include runtimeFiles.',
+        ]
+    );
+
+    const fixture = createFixture(t, { manifest: malformedSystemManifest });
+    const result = runStage(fixture);
+    assert.notEqual(result.status, 0, result.stdout);
+    assert.match(result.stderr, /buildInputs\.mpvPackage/);
+    assert.match(result.stderr, /must not include runtimeFiles/);
+});
+
+test('returns deterministic validation errors for untrusted input', () => {
+    assert.deepEqual(validateLinuxRuntimeManifest(null), [
+        'Linux runtime manifest must be an object.',
+    ]);
+    assert.deepEqual(validateLinuxRuntimeManifest(null), [
+        'Linux runtime manifest must be an object.',
+    ]);
+
+    const manifest = createValidManifest();
+    manifest.runtimeFiles[0].sha256 = Symbol('not-a-digest');
+    assert.doesNotThrow(() => validateLinuxRuntimeManifest(manifest));
+    assert.match(
+        validateLinuxRuntimeManifest(manifest).join('\n'),
+        /runtimeFiles\[0\]\.sha256/
+    );
+
+    const hostileAllowlist = createValidManifest();
+    hostileAllowlist.externalSystemLibraries = 1n;
+    assert.doesNotThrow(() => validateLinuxRuntimeManifest(hostileAllowlist));
+    assert.match(
+        validateLinuxRuntimeManifest(hostileAllowlist).join('\n'),
+        /externalSystemLibraries/
+    );
+});
+
+test('requires schema, provenance, target, package, and source metadata', () => {
+    const manifest = createValidManifest();
+    manifest.schemaVersion = 2;
+    manifest.origin = 'vendored-lgpl';
+    manifest.platform = 'darwin';
+    manifest.arch = 'arm64';
+    manifest.packages.ffmpeg.sourceUrl = '';
+    manifest.packages.mpv.version = '';
+    manifest.sourceDistribution = ' ';
+
+    assert.deepEqual(validateLinuxRuntimeManifest(manifest), [
+        'Linux runtime manifest schemaVersion must be 1.',
+        'Linux runtime manifest origin must be "vendored-lgpl-source-build".',
+        'Linux runtime manifest platform must be "linux".',
+        'Linux runtime manifest arch must be "x64".',
+        'Linux runtime manifest packages.ffmpeg.sourceUrl must be a non-empty string.',
+        'Linux runtime manifest packages.mpv.version must be a non-empty string.',
+        'Linux runtime manifest sourceDistribution must be a non-empty string.',
+    ]);
+
+    manifest.packages = {};
+    assert.match(
+        validateLinuxRuntimeManifest(manifest).join('\n'),
+        /packages must contain source package metadata/
+    );
+});
+
+test('requires exact FFmpeg and mpv source package records', () => {
+    const missingFfmpeg = createValidManifest();
+    missingFfmpeg.packages.libavcodec = missingFfmpeg.packages.ffmpeg;
+    delete missingFfmpeg.packages.ffmpeg;
+    assert.match(
+        validateLinuxRuntimeManifest(missingFfmpeg).join('\n'),
+        /packages\.ffmpeg must be an object/
+    );
+
+    const missingMpv = createValidManifest();
+    missingMpv.packages.libmpv = missingMpv.packages.mpv;
+    delete missingMpv.packages.mpv;
+    assert.match(
+        validateLinuxRuntimeManifest(missingMpv).join('\n'),
+        /packages\.mpv must be an object/
+    );
+
+    const substitutedPackages = createValidManifest();
+    substitutedPackages.packages = {
+        multimediaRuntime: {
+            version: '1.0.0',
+            sourceUrl: 'https://example.test/multimedia-runtime.tar.xz',
+            sourceSha256: 'c'.repeat(64),
+            license: 'LGPL-2.1-or-later',
+        },
+    };
+    const substitutedErrors =
+        validateLinuxRuntimeManifest(substitutedPackages).join('\n');
+    for (const packageName of SOURCE_PACKAGES.map(({ id }) => id)) {
+        assert.match(
+            substitutedErrors,
+            new RegExp(`packages\\.${packageName} must be an object`)
+        );
+    }
+    assert.match(
+        substitutedErrors,
+        /packages contains unexpected source package "multimediaRuntime"/
+    );
+});
+
+test('rejects GPL and nonfree FFmpeg configurations', () => {
+    const cases = [
+        {
+            flags: ['--disable-nonfree'],
+            expected: /must include "--disable-gpl"/,
+        },
+        {
+            flags: ['--disable-gpl'],
+            expected: /must include "--disable-nonfree"/,
+        },
+        {
+            flags: ['--disable-gpl', '--disable-nonfree', '--enable-gpl'],
+            expected: /must not include "--enable-gpl"/,
+        },
+        {
+            flags: ['--disable-gpl', '--disable-nonfree', '--enable-nonfree'],
+            expected: /must not include "--enable-nonfree"/,
+        },
+    ];
+
+    for (const { flags, expected } of cases) {
+        const manifest = createValidManifest();
+        manifest.ffmpeg.configureFlags = flags;
+        assert.match(
+            validateLinuxRuntimeManifest(manifest).join('\n'),
+            expected
+        );
+    }
+
+    const manifest = createValidManifest();
+    manifest.ffmpeg = { configureFlags: ['--enable-gpl'] };
+    assert.match(validateLinuxRuntimeManifest(manifest)[0], /--enable-gpl/);
+});
+
+test('requires libmpv and GPL-disabled mpv Meson flags', () => {
+    const cases = [
+        {
+            flags: ['-Dgpl=false'],
+            expected: /must include "-Dlibmpv=true"/,
+        },
+        {
+            flags: ['-Dlibmpv=true'],
+            expected: /must include "-Dgpl=false"/,
+        },
+        {
+            flags: ['-Dlibmpv=true', '-Dgpl=false', '-Dgpl=true'],
+            expected: /must not include "-Dgpl=true"/,
+        },
+    ];
+
+    for (const { flags, expected } of cases) {
+        const manifest = createValidManifest();
+        manifest.mpv.mesonFlags = flags;
+        assert.match(
+            validateLinuxRuntimeManifest(manifest).join('\n'),
+            expected
+        );
+    }
+
+    const manifest = createValidManifest();
+    manifest.mpv = { mesonFlags: ['-Dgpl=true'] };
+    assert.match(validateLinuxRuntimeManifest(manifest)[0], /-Dgpl=false/);
+});
+
+test('rejects duplicate or contradictory required mpv Meson assignments', () => {
+    const cases = [
+        {
+            flags: ['-Dlibmpv=true', '-Dlibmpv=false', '-Dgpl=false'],
+            expected: /must assign "-Dlibmpv" exactly once/,
+        },
+        {
+            flags: ['-Dlibmpv=true', '-Dgpl=false', '-Dgpl=true'],
+            expected: /must assign "-Dgpl" exactly once/,
+        },
+        {
+            flags: ['-Dlibmpv=true', '-Dlibmpv=true', '-Dgpl=false'],
+            expected: /must assign "-Dlibmpv" exactly once/,
+        },
+    ];
+
+    for (const { expected, flags } of cases) {
+        const manifest = createValidManifest();
+        manifest.mpv.mesonFlags = flags;
+        assert.match(
+            validateLinuxRuntimeManifest(manifest).join('\n'),
+            expected
+        );
+    }
+});
+
+test('rejects duplicate assignments for every mpv Meson option', () => {
+    const manifest = createValidManifest();
+    manifest.mpv.mesonFlags.push('-Ddrm=enabled', '-Ddrm=enabled');
+    assert.match(
+        validateLinuxRuntimeManifest(manifest).join('\n'),
+        /mpv\.mesonFlags must assign "-Ddrm" exactly once/
+    );
+});
+
+test('validates safe, unique shared-library metadata', () => {
+    const manifest = createValidManifest([
+        {
+            name: '../libmpv.so.2',
+            size: 0,
+            sha256: 'ABC',
+        },
+        runtimeFile('libcodec.a', 'archive'),
+        runtimeFile('libcodec.a', 'duplicate'),
+    ]);
+
+    const errors = validateLinuxRuntimeManifest(manifest);
+    assert.deepEqual(errors.slice(0, 7), [
+        'Linux runtime manifest runtimeFiles[0].name must be a safe shared-library basename.',
+        'Linux runtime manifest runtimeFiles[0].size must be a positive integer.',
+        'Linux runtime manifest runtimeFiles[0].sha256 must be a lowercase 64-character hexadecimal digest.',
+        'Linux runtime manifest runtimeFiles[1].name must end in ".so" or a numeric ".so.N" suffix.',
+        'Linux runtime manifest runtimeFiles[2].name must end in ".so" or a numeric ".so.N" suffix.',
+        'Linux runtime manifest runtimeFiles contains duplicate name "libcodec.a".',
+        'Linux runtime manifest runtimeFiles must include a versioned libmpv.so.N entry.',
+    ]);
+    assert.match(
+        errors.join('\n'),
+        /runtimeDependencyClosure\.entries\[0\]\.name must be a safe shared-library basename/
+    );
+    assert.match(
+        errors.join('\n'),
+        /runtimeDependencyClosure\.entries contains duplicate name "libcodec\.a"/
+    );
+});
+
+test('rejects control characters in shared-library basenames', () => {
+    const manifest = createValidManifest();
+    manifest.runtimeFiles.push(
+        runtimeFile('libinjected.so.1\n', 'unsafe-name')
+    );
+
+    assert.match(
+        validateLinuxRuntimeManifest(manifest).join('\n'),
+        /runtimeFiles\[3\]\.name must be a safe shared-library basename/
+    );
+});
+
+test('stages only declared Linux libraries and materializes source symlinks', (t) => {
+    const fixture = createFixture(t);
+    fs.renameSync(
+        path.join(fixture.libDir, 'libmpv.so.2'),
+        path.join(fixture.libDir, 'libmpv.so.2.1.0')
+    );
+    fs.rmSync(path.join(fixture.libDir, 'libmpv.so'));
+    fs.symlinkSync('libmpv.so.2.1.0', path.join(fixture.libDir, 'libmpv.so.2'));
+    fs.symlinkSync('libmpv.so.2', path.join(fixture.libDir, 'libmpv.so'));
+    fs.writeFileSync(path.join(fixture.libDir, 'libundeclared.so.1'), 'extra');
+    fs.writeFileSync(
+        path.join(fixture.prefix, 'runtime-manifest.json'),
+        `${JSON.stringify(fixture.manifest, null, 2)}\n`
+    );
+
+    const result = runStage(fixture);
+    assert.equal(result.status, 0, result.stderr);
+
+    const destinationRoot = destinationRootFor(fixture);
+    const destinationLibDir = path.join(destinationRoot, 'lib');
+    assert.deepEqual(fs.readdirSync(destinationLibDir).sort(), [
+        'libavcodec.so.61',
+        'libmpv.so',
+        'libmpv.so.2',
+    ]);
+    for (const runtimeEntry of fixture.manifest.runtimeFiles) {
+        const destinationPath = path.join(destinationLibDir, runtimeEntry.name);
+        const stat = fs.lstatSync(destinationPath);
+        assert.equal(stat.isFile(), true);
+        assert.equal(stat.isSymbolicLink(), false);
+        assert.equal(stat.size, runtimeEntry.size);
+        assert.equal(
+            sha256(fs.readFileSync(destinationPath)),
+            runtimeEntry.sha256
+        );
+    }
+    assert.equal(
+        fs.readFileSync(
+            path.join(destinationRoot, 'include', 'mpv', 'client.h'),
+            'utf8'
+        ),
+        '/* libmpv header */\n'
+    );
+
+    const stagedManifest = JSON.parse(
+        fs.readFileSync(
+            path.join(destinationRoot, 'runtime-manifest.json'),
+            'utf8'
+        )
+    );
+    assert.equal(stagedManifest.origin, 'vendored-lgpl');
+    assert.equal(
+        stagedManifest.sourceBuildOrigin,
+        'vendored-lgpl-source-build'
+    );
+    assert.equal(stagedManifest.platform, 'linux');
+    assert.equal(stagedManifest.arch, 'x64');
+    assert.deepEqual(
+        stagedManifest.runtimeFiles,
+        fixture.manifest.runtimeFiles
+    );
+    for (const field of [
+        'packages',
+        'runtimeTotalBytes',
+        'runtimeAbi',
+        'runtimeExternalConfiguration',
+        'runtimeDependencyClosure',
+        'externalSystemLibraries',
+        'buildHost',
+    ]) {
+        assert.deepEqual(stagedManifest[field], fixture.manifest[field], field);
+    }
+});
+
+test('copies runtime libraries only from the verified byte snapshot', () => {
+    assert.match(
+        stageRuntimeSource,
+        /function readVerifiedLinuxRuntimeFiles\(manifest\)/
+    );
+    assert.match(
+        stageRuntimeSource,
+        /contents = fs\.readFileSync\(sourcePath\)/
+    );
+    assert.match(
+        stageRuntimeSource,
+        /fs\.writeFileSync\(destinationPath, verifiedRuntimeFile\.contents\)/
+    );
+    assert.doesNotMatch(
+        stageRuntimeSource,
+        /function copyLinuxRuntimeFiles\(manifest\)/
+    );
+});
+
+test('atomically replaces the complete Linux destination tree', (t) => {
+    const fixture = createFixture(t);
+    const destinationRoot = destinationRootFor(fixture);
+    fs.mkdirSync(destinationRoot, { recursive: true });
+    fs.writeFileSync(path.join(destinationRoot, 'stale-runtime.txt'), 'stale');
+
+    const result = runStage(fixture);
+    assert.equal(result.status, 0, result.stderr);
+    assert.equal(
+        fs.existsSync(path.join(destinationRoot, 'stale-runtime.txt')),
+        false
+    );
+    assert.deepEqual(
+        fs
+            .readdirSync(path.dirname(destinationRoot))
+            .filter((name) => name.startsWith('.linux-x64.')),
+        []
+    );
+});
+
+test('rejects a libmpv header symlink that escapes the source prefix', (t) => {
+    const fixture = createFixture(t);
+    const outsideHeader = path.join(fixture.root, 'outside-client.h');
+    const clientHeader = path.join(
+        fixture.prefix,
+        'include',
+        'mpv',
+        'client.h'
+    );
+    fs.writeFileSync(outsideHeader, '/* untrusted external header */\n');
+    fs.rmSync(clientHeader);
+    fs.symlinkSync(outsideHeader, clientHeader);
+
+    const result = runStage(fixture);
+    assert.notEqual(result.status, 0, result.stdout);
+    assert.match(
+        result.stderr,
+        /Linux header resolves outside prefix\/include/
+    );
+});
+
+test('rejects destination root and ancestor symlink redirection', (t) => {
+    for (const symlinkLocation of ['destination', 'ancestor']) {
+        const fixture = createFixture(t);
+        const destinationRoot = destinationRootFor(fixture);
+        const outsideRoot = path.join(
+            fixture.root,
+            `outside-${symlinkLocation}`
+        );
+        fs.mkdirSync(outsideRoot, { recursive: true });
+        fs.writeFileSync(path.join(outsideRoot, 'untouched.txt'), 'untouched');
+
+        if (symlinkLocation === 'destination') {
+            fs.mkdirSync(path.dirname(destinationRoot), { recursive: true });
+            fs.symlinkSync(outsideRoot, destinationRoot);
+        } else {
+            const embeddedMpvRoot = path.dirname(destinationRoot);
+            fs.mkdirSync(path.dirname(embeddedMpvRoot), { recursive: true });
+            fs.symlinkSync(outsideRoot, embeddedMpvRoot);
+        }
+
+        const result = runStage(fixture);
+        assert.notEqual(result.status, 0, result.stdout);
+        assert.match(
+            result.stderr,
+            /Linux runtime destination path contains a symbolic link/
+        );
+        assert.equal(
+            fs.readFileSync(path.join(outsideRoot, 'untouched.txt'), 'utf8'),
+            'untouched'
+        );
+    }
+});
+
+test('rejects missing Linux headers or manifests', (t) => {
+    assertStageRejected(t, { removeHeader: true }, /Missing libmpv header/);
+    assertStageRejected(
+        t,
+        { omitManifest: true },
+        /Missing Linux runtime manifest/
+    );
+});
+
+test('rejects unsafe or duplicate declared library names', (t) => {
+    assertStageRejected(
+        t,
+        {
+            mutateManifest(manifest) {
+                manifest.runtimeFiles[0].name = '../libmpv.so.2';
+            },
+        },
+        /safe shared-library basename/
+    );
+    assertStageRejected(
+        t,
+        {
+            mutateManifest(manifest) {
+                manifest.runtimeFiles.push({ ...manifest.runtimeFiles[0] });
+            },
+        },
+        /duplicate name "libmpv.so.2"/
+    );
+});
+
+test('rejects missing files and mismatched size or hash metadata', (t) => {
+    assertStageRejected(
+        t,
+        { removeRuntimeFile: 'libavcodec.so.61' },
+        /Missing declared Linux runtime file.*libavcodec\.so\.61/
+    );
+    assertStageRejected(
+        t,
+        {
+            mutateManifest(manifest) {
+                manifest.runtimeFiles[0].size += 1;
+                manifest.runtimeTotalBytes += 1;
+            },
+        },
+        /Size mismatch for Linux runtime file.*libmpv\.so\.2/
+    );
+    assertStageRejected(
+        t,
+        {
+            mutateManifest(manifest) {
+                manifest.runtimeFiles[0].sha256 = '0'.repeat(64);
+            },
+        },
+        /SHA-256 mismatch for Linux runtime file.*libmpv\.so\.2/
+    );
+});
+
+test('rejects forbidden build flags and a missing versioned libmpv entry', (t) => {
+    const invalidConfigurations = [
+        {
+            mutateManifest(manifest) {
+                manifest.ffmpeg.configureFlags.push('--enable-gpl');
+            },
+            expected: /must not include "--enable-gpl"/,
+        },
+        {
+            mutateManifest(manifest) {
+                manifest.ffmpeg.configureFlags.push('--enable-nonfree');
+            },
+            expected: /must not include "--enable-nonfree"/,
+        },
+        {
+            mutateManifest(manifest) {
+                manifest.mpv.mesonFlags = ['-Dlibmpv=true', '-Dgpl=true'];
+            },
+            expected: /must include "-Dgpl=false"/,
+        },
+        {
+            mutateManifest(manifest) {
+                manifest.mpv.mesonFlags = ['-Dgpl=false'];
+            },
+            expected: /must include "-Dlibmpv=true"/,
+        },
+        {
+            mutateManifest(manifest) {
+                manifest.mpv.mesonFlags = [
+                    '-Dlibmpv=true',
+                    '-Dlibmpv=false',
+                    '-Dgpl=false',
+                ];
+            },
+            expected: /must assign "-Dlibmpv" exactly once/,
+        },
+        {
+            mutateManifest(manifest) {
+                manifest.runtimeFiles = manifest.runtimeFiles.filter(
+                    ({ name }) => name !== 'libmpv.so.2'
+                );
+            },
+            expected: /must include a versioned libmpv\.so\.N entry/,
+        },
+    ];
+
+    for (const { expected, mutateManifest } of invalidConfigurations) {
+        assertStageRejected(t, { mutateManifest }, expected);
+    }
+});
diff --git a/tools/embedded-mpv/linux-source-archive-contract.cjs b/tools/embedded-mpv/linux-source-archive-contract.cjs
new file mode 100644
index 000000000..e6e892bfd
--- /dev/null
+++ b/tools/embedded-mpv/linux-source-archive-contract.cjs
@@ -0,0 +1,181 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const { isDeepStrictEqual } = require('node:util');
+
+const SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION = 1;
+const SOURCE_ARCHIVE_NAME = 'linux-frame-copy-runtime-sources.tar.xz';
+const SOURCE_ARCHIVE_BINDING_NAME = 'source-archive-binding.json';
+const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+
+function validateLinuxSourceArchiveBinding(
+    binding,
+    { expectedRepositoryRevision, expectedSha256 } = {}
+) {
+    const errors = [];
+    if (
+        binding === null ||
+        typeof binding !== 'object' ||
+        Array.isArray(binding)
+    ) {
+        return ['Linux source archive binding must be an object.'];
+    }
+    if (
+        !isDeepStrictEqual(Object.keys(binding).sort(), [
+            'name',
+            'repositoryRevision',
+            'schemaVersion',
+            'sha256',
+        ])
+    ) {
+        errors.push(
+            'Linux source archive binding must contain only schemaVersion, name, sha256, and repositoryRevision.'
+        );
+    }
+    if (binding.schemaVersion !== SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION) {
+        errors.push(
+            `Linux source archive binding schemaVersion must equal ${SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION}.`
+        );
+    }
+    if (binding.name !== SOURCE_ARCHIVE_NAME) {
+        errors.push(
+            `Linux source archive binding name must equal ${SOURCE_ARCHIVE_NAME}.`
+        );
+    }
+    if (
+        typeof binding.sha256 !== 'string' ||
+        !SHA256_PATTERN.test(binding.sha256)
+    ) {
+        errors.push(
+            'Linux source archive binding sha256 must be a lowercase SHA-256 digest.'
+        );
+    }
+    if (
+        typeof binding.repositoryRevision !== 'string' ||
+        !GIT_COMMIT_PATTERN.test(binding.repositoryRevision)
+    ) {
+        errors.push(
+            'Linux source archive binding repositoryRevision must be a full Git commit.'
+        );
+    }
+    if (
+        expectedRepositoryRevision !== undefined &&
+        binding.repositoryRevision !== expectedRepositoryRevision
+    ) {
+        errors.push(
+            'Linux source archive binding repositoryRevision does not match the expected release commit.'
+        );
+    }
+    if (expectedSha256 !== undefined && binding.sha256 !== expectedSha256) {
+        errors.push(
+            'Linux source archive binding sha256 does not match the source archive bytes.'
+        );
+    }
+    return errors;
+}
+
+function sha256File(filePath) {
+    const descriptor = fs.openSync(filePath, 'r');
+    const hash = crypto.createHash('sha256');
+    const buffer = Buffer.alloc(1024 * 1024);
+    try {
+        let bytesRead;
+        do {
+            bytesRead = fs.readSync(descriptor, buffer, 0, buffer.length, null);
+            if (bytesRead > 0) {
+                hash.update(buffer.subarray(0, bytesRead));
+            }
+        } while (bytesRead > 0);
+    } finally {
+        fs.closeSync(descriptor);
+    }
+    return hash.digest('hex');
+}
+
+function createLinuxSourceArchiveBinding({ archivePath, repositoryRevision }) {
+    const stat = fs.lstatSync(archivePath);
+    if (!stat.isFile() || stat.isSymbolicLink() || stat.size === 0) {
+        throw new Error(
+            'Linux source archive must be a non-empty regular file.'
+        );
+    }
+    const binding = {
+        schemaVersion: SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION,
+        name: SOURCE_ARCHIVE_NAME,
+        sha256: sha256File(archivePath),
+        repositoryRevision,
+    };
+    const errors = validateLinuxSourceArchiveBinding(binding);
+    if (errors.length > 0) {
+        throw new Error(errors.join('\n'));
+    }
+    return binding;
+}
+
+function parseArguments(argv) {
+    const [command, ...tokens] = argv;
+    if (tokens.length % 2 !== 0) {
+        throw new Error('Linux source archive binding arguments are invalid.');
+    }
+    const options = {};
+    for (let index = 0; index < tokens.length; index += 2) {
+        const token = tokens[index];
+        const value = tokens[index + 1];
+        if (
+            !token.startsWith('--') ||
+            value === undefined ||
+            Object.hasOwn(options, token.slice(2))
+        ) {
+            throw new Error(
+                'Linux source archive binding arguments are invalid.'
+            );
+        }
+        options[token.slice(2)] = value;
+    }
+    return { command, options };
+}
+
+function main(argv = process.argv.slice(2)) {
+    const { command, options } = parseArguments(argv);
+    if (
+        command !== 'create' ||
+        !options.archive ||
+        !options['repository-revision'] ||
+        !options.output
+    ) {
+        throw new Error(
+            'Usage: linux-source-archive-contract.cjs create --archive <path> --repository-revision <commit> --output <path>'
+        );
+    }
+    const binding = createLinuxSourceArchiveBinding({
+        archivePath: options.archive,
+        repositoryRevision: options['repository-revision'],
+    });
+    fs.writeFileSync(options.output, `${JSON.stringify(binding, null, 2)}\n`, {
+        mode: 0o644,
+    });
+}
+
+if (require.main === module) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
+
+module.exports = {
+    SOURCE_ARCHIVE_BINDING_NAME,
+    SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION,
+    SOURCE_ARCHIVE_NAME,
+    createLinuxSourceArchiveBinding,
+    sha256File,
+    validateLinuxSourceArchiveBinding,
+};
diff --git a/tools/embedded-mpv/linux-source-archive-contract.d.cts b/tools/embedded-mpv/linux-source-archive-contract.d.cts
new file mode 100644
index 000000000..0ecb0bce8
--- /dev/null
+++ b/tools/embedded-mpv/linux-source-archive-contract.d.cts
@@ -0,0 +1,26 @@
+interface LinuxSourceArchiveBinding {
+    schemaVersion: 1;
+    name: 'linux-frame-copy-runtime-sources.tar.xz';
+    sha256: string;
+    repositoryRevision: string;
+}
+
+declare const LINUX_SOURCE_ARCHIVE_CONTRACT: {
+    readonly SOURCE_ARCHIVE_BINDING_NAME: 'source-archive-binding.json';
+    readonly SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION: 1;
+    readonly SOURCE_ARCHIVE_NAME: 'linux-frame-copy-runtime-sources.tar.xz';
+    createLinuxSourceArchiveBinding(options: {
+        archivePath: string;
+        repositoryRevision: string;
+    }): LinuxSourceArchiveBinding;
+    sha256File(filePath: string): string;
+    validateLinuxSourceArchiveBinding(
+        binding: unknown,
+        options?: {
+            expectedRepositoryRevision?: string;
+            expectedSha256?: string;
+        }
+    ): string[];
+};
+
+export = LINUX_SOURCE_ARCHIVE_CONTRACT;
diff --git a/tools/embedded-mpv/runtime-probe-contract.cjs b/tools/embedded-mpv/runtime-probe-contract.cjs
new file mode 100644
index 000000000..28e8bde7d
--- /dev/null
+++ b/tools/embedded-mpv/runtime-probe-contract.cjs
@@ -0,0 +1,6 @@
+const RUNTIME_PROBE_CONTRACT = Object.freeze({
+    RUNTIME_PROBE_MAX_BUFFER_BYTES: 16 * 1024 * 1024,
+    RUNTIME_PROBE_TIMEOUT_MS: 3000,
+});
+
+module.exports = RUNTIME_PROBE_CONTRACT;
diff --git a/tools/embedded-mpv/runtime-probe-contract.d.cts b/tools/embedded-mpv/runtime-probe-contract.d.cts
new file mode 100644
index 000000000..545231e21
--- /dev/null
+++ b/tools/embedded-mpv/runtime-probe-contract.d.cts
@@ -0,0 +1,6 @@
+declare const RUNTIME_PROBE_CONTRACT: Readonly<{
+    readonly RUNTIME_PROBE_MAX_BUFFER_BYTES: 16777216;
+    readonly RUNTIME_PROBE_TIMEOUT_MS: 3000;
+}>;
+
+export = RUNTIME_PROBE_CONTRACT;
diff --git a/tools/embedded-mpv/stage-runtime.mjs b/tools/embedded-mpv/stage-runtime.mjs
index 81b06e3fa..1b758034c 100644
--- a/tools/embedded-mpv/stage-runtime.mjs
+++ b/tools/embedded-mpv/stage-runtime.mjs
@@ -1,5 +1,14 @@
+import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const {
+    isLinuxSystemBuildInputManifest,
+    validateLinuxRuntimeManifest,
+    validateLinuxSystemBuildInputManifest,
+} = require('./linux-runtime-manifest.cjs');
 
 const rawArgs = process.argv.slice(2);
 const args = rawArgs[0] === '--' ? rawArgs.slice(1) : rawArgs;
@@ -161,48 +170,191 @@ function readJsonIfExists(filePath) {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'));
 }
 
-try {
-    assertExists(
-        path.join(sourceIncludeDir, 'mpv', 'client.h'),
-        'Missing libmpv header'
-    );
-    if (platform !== 'linux' && !findRuntimeFile(sourceLibDir)) {
-        throw new Error(
-            `Missing libmpv runtime for ${platform} in ${sourceLibDir}`
-        );
+function readLinuxRuntimeManifest() {
+    const manifestPath = path.join(normalizedPrefix, 'runtime-manifest.json');
+    if (!fs.existsSync(manifestPath)) {
+        throw new Error(`Missing Linux runtime manifest: ${manifestPath}`);
     }
-    if (platform === 'win32' && !hasWindowsImportLibrary(sourceLibDir)) {
+
+    let manifest;
+    try {
+        manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+    } catch (error) {
         throw new Error(
-            `Missing Windows libmpv import library in ${sourceLibDir}`
+            `Invalid JSON in Linux runtime manifest ${manifestPath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
         );
     }
 
-    fs.rmSync(destinationIncludeDir, { recursive: true, force: true });
-    fs.rmSync(destinationLibDir, { recursive: true, force: true });
-    fs.mkdirSync(destinationRoot, { recursive: true });
+    const mode = isLinuxSystemBuildInputManifest(manifest)
+        ? 'system-build-inputs'
+        : 'bundled-runtime';
+    const errors =
+        mode === 'system-build-inputs'
+            ? validateLinuxSystemBuildInputManifest(manifest)
+            : validateLinuxRuntimeManifest(manifest);
+    if (errors.length > 0) {
+        throw new Error(
+            ['Invalid Linux runtime manifest.', ...errors].join('\n')
+        );
+    }
 
-    copyDirectory(
-        path.join(sourceIncludeDir, 'mpv'),
-        path.join(destinationIncludeDir, 'mpv')
+    return { manifest, mode };
+}
+
+function sha256Contents(contents) {
+    return crypto.createHash('sha256').update(contents).digest('hex');
+}
+
+function resolvePathInsideDirectory(filePath, directory, message) {
+    const resolvedDirectory = fs.realpathSync(directory);
+    const resolvedFilePath = fs.realpathSync(filePath);
+    const relativePath = path.relative(resolvedDirectory, resolvedFilePath);
+    if (
+        relativePath === '..' ||
+        relativePath.startsWith(`..${path.sep}`) ||
+        path.isAbsolute(relativePath)
+    ) {
+        throw new Error(`${message}: ${filePath}`);
+    }
+
+    return resolvedFilePath;
+}
+
+function readVerifiedLinuxRuntimeFiles(manifest) {
+    return manifest.runtimeFiles.map((runtimeFile) => {
+        const declaredSourcePath = path.join(sourceLibDir, runtimeFile.name);
+        if (!fs.existsSync(declaredSourcePath)) {
+            throw new Error(
+                `Missing declared Linux runtime file: ${declaredSourcePath}`
+            );
+        }
+
+        const sourcePath = resolvePathInsideDirectory(
+            declaredSourcePath,
+            sourceLibDir,
+            'Declared Linux runtime file resolves outside prefix/lib'
+        );
+        const sourceStat = fs.statSync(sourcePath);
+        if (!sourceStat.isFile()) {
+            throw new Error(
+                `Declared Linux runtime path is not a regular file: ${declaredSourcePath}`
+            );
+        }
+
+        const contents = fs.readFileSync(sourcePath);
+        if (contents.byteLength !== runtimeFile.size) {
+            throw new Error(
+                `Size mismatch for Linux runtime file ${declaredSourcePath}: expected ${runtimeFile.size}, received ${contents.byteLength}`
+            );
+        }
+
+        const actualSha256 = sha256Contents(contents);
+        if (actualSha256 !== runtimeFile.sha256) {
+            throw new Error(
+                `SHA-256 mismatch for Linux runtime file ${declaredSourcePath}: expected ${runtimeFile.sha256}, received ${actualSha256}`
+            );
+        }
+
+        return { contents, runtimeFile };
+    });
+}
+
+function readLinuxHeaderFiles() {
+    resolvePathInsideDirectory(
+        sourceIncludeDir,
+        normalizedPrefix,
+        'Linux include directory resolves outside source prefix'
     );
-    if (platform !== 'linux') {
-        copyDirectory(sourceLibDir, destinationLibDir, runtimeFileFilter);
-    }
-    if (platform === 'win32') {
-        copyDirectory(sourceBinDir, destinationLibDir, runtimeFileFilter);
+
+    const headerFiles = [];
+    function visitDirectory(sourceDirectory, relativeDirectory) {
+        for (const entry of fs.readdirSync(sourceDirectory, {
+            withFileTypes: true,
+        })) {
+            const sourcePath = path.join(sourceDirectory, entry.name);
+            const relativePath = path.join(relativeDirectory, entry.name);
+            if (entry.isDirectory()) {
+                visitDirectory(sourcePath, relativePath);
+                continue;
+            }
+            if (!entry.isFile() && !entry.isSymbolicLink()) {
+                continue;
+            }
+
+            const resolvedSourcePath = resolvePathInsideDirectory(
+                sourcePath,
+                sourceIncludeDir,
+                'Linux header resolves outside prefix/include'
+            );
+            if (!fs.statSync(resolvedSourcePath).isFile()) {
+                throw new Error(
+                    `Linux header is not a regular file: ${sourcePath}`
+                );
+            }
+            headerFiles.push({
+                contents: fs.readFileSync(resolvedSourcePath),
+                relativePath,
+            });
+        }
     }
 
-    const externalManifest =
-        readJsonIfExists(
-            path.join(normalizedPrefix, 'runtime-manifest.json')
-        ) ?? {};
-    const manifest = {
+    visitDirectory(path.join(sourceIncludeDir, 'mpv'), 'mpv');
+    return headerFiles;
+}
+
+function lstatIfExists(filePath) {
+    try {
+        return fs.lstatSync(filePath);
+    } catch (error) {
+        if (error?.code === 'ENOENT') {
+            return null;
+        }
+        throw error;
+    }
+}
+
+function assertSafeLinuxDestinationPath() {
+    const relativeDestination = path.relative(workspaceRoot, destinationRoot);
+    if (
+        relativeDestination === '..' ||
+        relativeDestination.startsWith(`..${path.sep}`) ||
+        path.isAbsolute(relativeDestination)
+    ) {
+        throw new Error(
+            `Linux runtime destination escapes the workspace: ${destinationRoot}`
+        );
+    }
+
+    let currentPath = workspaceRoot;
+    for (const segment of relativeDestination.split(path.sep)) {
+        currentPath = path.join(currentPath, segment);
+        const stat = lstatIfExists(currentPath);
+        if (stat?.isSymbolicLink()) {
+            throw new Error(
+                `Linux runtime destination path contains a symbolic link: ${currentPath}`
+            );
+        }
+    }
+}
+
+function createLinuxStagedManifest(externalManifest, mode) {
+    return {
         ...externalManifest,
         origin: 'vendored-lgpl',
+        ...(mode === 'bundled-runtime'
+            ? { sourceBuildOrigin: externalManifest.origin }
+            : {}),
         platform,
         arch,
         stagedAt: new Date().toISOString(),
-        runtimeFiles: listRuntimeFiles(destinationLibDir),
+        runtimeFiles:
+            mode === 'bundled-runtime'
+                ? externalManifest.runtimeFiles.map((runtimeFile) => ({
+                      ...runtimeFile,
+                  }))
+                : [],
         ffmpeg: {
             licensePolicy:
                 'LGPL, built without --enable-gpl and --enable-nonfree',
@@ -219,15 +371,193 @@ try {
                 externalManifest.mpv?.mesonFlags ??
                 'Record the exact mpv Meson flags used to build this runtime.',
         },
-        sourceDistribution:
-            externalManifest.sourceDistribution ??
-            `Publish exact source archives and local patches with the ${platform}-${arch} binary release.`,
+        sourceDistribution: externalManifest.sourceDistribution,
     };
+}
+
+function writeLinuxStagingTree(
+    stagingRoot,
+    headerFiles,
+    verifiedRuntimeFiles,
+    stagedManifest
+) {
+    for (const headerFile of headerFiles) {
+        const destinationPath = path.join(
+            stagingRoot,
+            'include',
+            headerFile.relativePath
+        );
+        fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+        fs.writeFileSync(destinationPath, headerFile.contents);
+        fs.chmodSync(destinationPath, 0o644);
+    }
+
+    for (const verifiedRuntimeFile of verifiedRuntimeFiles) {
+        const destinationPath = path.join(
+            stagingRoot,
+            'lib',
+            verifiedRuntimeFile.runtimeFile.name
+        );
+        fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
+        fs.writeFileSync(destinationPath, verifiedRuntimeFile.contents);
+        fs.chmodSync(destinationPath, 0o755);
+    }
 
     fs.writeFileSync(
-        path.join(destinationRoot, 'runtime-manifest.json'),
-        `${JSON.stringify(manifest, null, 2)}\n`
+        path.join(stagingRoot, 'runtime-manifest.json'),
+        `${JSON.stringify(stagedManifest, null, 2)}\n`
     );
+}
+
+function publishLinuxStagingTree(stagingRoot) {
+    const token = `${process.pid}-${crypto.randomBytes(8).toString('hex')}`;
+    const backupRoot = path.join(
+        path.dirname(destinationRoot),
+        `.linux-x64.backup-${token}`
+    );
+    let movedPreviousDestination = false;
+
+    try {
+        assertSafeLinuxDestinationPath();
+        const destinationStat = lstatIfExists(destinationRoot);
+        if (destinationStat && !destinationStat.isDirectory()) {
+            throw new Error(
+                `Linux runtime destination is not a directory: ${destinationRoot}`
+            );
+        }
+        if (destinationStat) {
+            fs.renameSync(destinationRoot, backupRoot);
+            movedPreviousDestination = true;
+        }
+
+        fs.renameSync(stagingRoot, destinationRoot);
+        if (movedPreviousDestination) {
+            fs.rmSync(backupRoot, { recursive: true, force: true });
+        }
+    } catch (error) {
+        if (
+            movedPreviousDestination &&
+            !lstatIfExists(destinationRoot) &&
+            lstatIfExists(backupRoot)
+        ) {
+            fs.renameSync(backupRoot, destinationRoot);
+        }
+        throw error;
+    } finally {
+        fs.rmSync(stagingRoot, { recursive: true, force: true });
+        if (lstatIfExists(destinationRoot)) {
+            fs.rmSync(backupRoot, { recursive: true, force: true });
+        }
+    }
+}
+
+function stageLinuxRuntime(headerFiles, verifiedRuntimeFiles, stagedManifest) {
+    assertSafeLinuxDestinationPath();
+    const destinationParent = path.dirname(destinationRoot);
+    fs.mkdirSync(destinationParent, { recursive: true });
+    assertSafeLinuxDestinationPath();
+
+    const stagingRoot = path.join(
+        destinationParent,
+        `.linux-x64.stage-${process.pid}-${crypto
+            .randomBytes(8)
+            .toString('hex')}`
+    );
+    fs.mkdirSync(stagingRoot);
+    try {
+        writeLinuxStagingTree(
+            stagingRoot,
+            headerFiles,
+            verifiedRuntimeFiles,
+            stagedManifest
+        );
+        publishLinuxStagingTree(stagingRoot);
+    } catch (error) {
+        fs.rmSync(stagingRoot, { recursive: true, force: true });
+        throw error;
+    }
+}
+
+try {
+    assertExists(
+        path.join(sourceIncludeDir, 'mpv', 'client.h'),
+        'Missing libmpv header'
+    );
+
+    if (platform === 'linux') {
+        const { manifest: externalManifest, mode } = readLinuxRuntimeManifest();
+        const headerFiles = readLinuxHeaderFiles();
+        const verifiedRuntimeFiles =
+            mode === 'bundled-runtime'
+                ? readVerifiedLinuxRuntimeFiles(externalManifest)
+                : [];
+        stageLinuxRuntime(
+            headerFiles,
+            verifiedRuntimeFiles,
+            createLinuxStagedManifest(externalManifest, mode)
+        );
+    } else {
+        const externalManifest =
+            readJsonIfExists(
+                path.join(normalizedPrefix, 'runtime-manifest.json')
+            ) ?? {};
+        if (!findRuntimeFile(sourceLibDir)) {
+            throw new Error(
+                `Missing libmpv runtime for ${platform} in ${sourceLibDir}`
+            );
+        }
+        if (platform === 'win32' && !hasWindowsImportLibrary(sourceLibDir)) {
+            throw new Error(
+                `Missing Windows libmpv import library in ${sourceLibDir}`
+            );
+        }
+
+        fs.rmSync(destinationIncludeDir, { recursive: true, force: true });
+        fs.rmSync(destinationLibDir, { recursive: true, force: true });
+        fs.mkdirSync(destinationRoot, { recursive: true });
+
+        copyDirectory(
+            path.join(sourceIncludeDir, 'mpv'),
+            path.join(destinationIncludeDir, 'mpv')
+        );
+        copyDirectory(sourceLibDir, destinationLibDir, runtimeFileFilter);
+        if (platform === 'win32') {
+            copyDirectory(sourceBinDir, destinationLibDir, runtimeFileFilter);
+        }
+
+        const manifest = {
+            ...externalManifest,
+            origin: 'vendored-lgpl',
+            platform,
+            arch,
+            stagedAt: new Date().toISOString(),
+            runtimeFiles: listRuntimeFiles(destinationLibDir),
+            ffmpeg: {
+                licensePolicy:
+                    'LGPL, built without --enable-gpl and --enable-nonfree',
+                ...externalManifest.ffmpeg,
+                configureFlags:
+                    externalManifest.ffmpeg?.configureFlags ??
+                    'Record the exact FFmpeg configure flags used to build this runtime.',
+            },
+            mpv: {
+                licensePolicy:
+                    'LGPL-compatible libmpv, built with -Dlibmpv=true -Dgpl=false',
+                ...externalManifest.mpv,
+                mesonFlags:
+                    externalManifest.mpv?.mesonFlags ??
+                    'Record the exact mpv Meson flags used to build this runtime.',
+            },
+            sourceDistribution:
+                externalManifest.sourceDistribution ??
+                `Publish exact source archives and local patches with the ${platform}-${arch} binary release.`,
+        };
+
+        fs.writeFileSync(
+            path.join(destinationRoot, 'runtime-manifest.json'),
+            `${JSON.stringify(manifest, null, 2)}\n`
+        );
+    }
 
     console.log(
         `Staged embedded MPV runtime for ${platform}-${arch} at ${path.relative(
diff --git a/tools/eslint/generate-max-lines-baseline.mjs b/tools/eslint/generate-max-lines-baseline.mjs
index a92204f12..2fe912693 100644
--- a/tools/eslint/generate-max-lines-baseline.mjs
+++ b/tools/eslint/generate-max-lines-baseline.mjs
@@ -5,6 +5,11 @@
  * files that already exceed the max-lines limit enforced in eslint.config.mjs.
  * Baselined files are exempt from the rule; the list should only shrink.
  *
+ * Files that carry their own file-wide `eslint-disable max-lines` comment are
+ * skipped: they are already exempt with a written justification next to the
+ * code, which is the preferred escape hatch for a file that genuinely cannot
+ * be split (for example a function serialized into another process).
+ *
  * Usage: node tools/eslint/generate-max-lines-baseline.mjs
  */
 
@@ -34,8 +39,7 @@ function collectTsFiles(dir, results) {
     return results;
 }
 
-function countLines(filePath) {
-    const content = readFileSync(filePath, 'utf8');
+function countLines(content) {
     if (content.length === 0) {
         return 0;
     }
@@ -43,19 +47,58 @@ function countLines(filePath) {
     return content.endsWith('\n') ? lines - 1 : lines;
 }
 
+/**
+ * True when the file already suppresses max-lines with a file-wide
+ * `/* eslint-disable *\/` comment. Those files are deliberately exempt with a
+ * reviewed justification, so baselining them too would be redundant — and
+ * would wrongly imply they merely predate the rule.
+ */
+function hasInlineMaxLinesDisable(content) {
+    // Only a file-wide `eslint-disable` block comment can suppress max-lines;
+    // the rule reports at the line where the limit is exceeded, so
+    // `eslint-disable-next-line` cannot apply to it.
+    const disableComments = content.matchAll(
+        /\/\*\s*eslint-disable\s*([^*]*?)\*\//g
+    );
+    for (const [, ruleList = ''] of disableComments) {
+        // `/* eslint-disable */` with no rules disables everything.
+        const rules = ruleList.split('--')[0].trim();
+        if (rules === '') {
+            return true;
+        }
+        if (
+            rules
+                .split(',')
+                .some((rule) => rule.trim() === 'max-lines')
+        ) {
+            return true;
+        }
+    }
+    return false;
+}
+
 const offenders = scanRoots
     .flatMap((root) => collectTsFiles(path.join(workspaceRoot, root), []))
-    .map((filePath) => ({
-        file: path.relative(workspaceRoot, filePath).split(path.sep).join('/'),
-        lines: countLines(filePath),
-    }))
-    .filter(({ lines }) => lines > MAX_LINES)
+    .map((filePath) => {
+        const content = readFileSync(filePath, 'utf8');
+        return {
+            file: path
+                .relative(workspaceRoot, filePath)
+                .split(path.sep)
+                .join('/'),
+            lines: countLines(content),
+            disabled: hasInlineMaxLinesDisable(content),
+        };
+    })
+    .filter(({ lines, disabled }) => lines > MAX_LINES && !disabled)
     .sort((a, b) => a.file.localeCompare(b.file));
 
 const banner = `// Generated by tools/eslint/generate-max-lines-baseline.mjs — do not edit by hand.
 // TypeScript files that predate the max-lines (${MAX_LINES}) ESLint rule.
 // This list should only shrink: split a file below the limit, rerun the
 // generator, and commit the result. Never add new files here.
+// A new file that genuinely cannot be split takes a file-wide
+// \`/* eslint-disable max-lines -- <why> */\` instead; the generator skips those.
 `;
 
 const body = offenders.map(({ file }) => `    '${file}',`).join('\n');
diff --git a/tools/eslint/max-lines-baseline.mjs b/tools/eslint/max-lines-baseline.mjs
index 4ccadc2cf..8ac72bd1d 100644
--- a/tools/eslint/max-lines-baseline.mjs
+++ b/tools/eslint/max-lines-baseline.mjs
@@ -2,6 +2,8 @@
 // TypeScript files that predate the max-lines (400) ESLint rule.
 // This list should only shrink: split a file below the limit, rerun the
 // generator, and commit the result. Never add new files here.
+// A new file that genuinely cannot be split takes a file-wide
+// `/* eslint-disable max-lines -- <why> */` instead; the generator skips those.
 export const maxLinesBaseline = [
     'apps/electron-backend-e2e/src/catalog-sorting.e2e.ts',
     'apps/electron-backend-e2e/src/category-management.e2e.ts',
@@ -42,8 +44,6 @@ export const maxLinesBaseline = [
     'apps/web-e2e/src/xtream.e2e.ts',
     'apps/web/src/app/services/electron.service.ts',
     'apps/web/src/app/services/pwa.service.ts',
-    'apps/web/src/app/settings/settings.component.spec.ts',
-    'apps/web/src/app/settings/settings.component.ts',
     'apps/xtream-mock-server/src/app/generators/marketing.generator.ts',
     'libs/epg/data-access/src/lib/epg.service.spec.ts',
     'libs/epg/data-access/src/lib/epg.service.ts',
@@ -120,10 +120,6 @@ export const maxLinesBaseline = [
     'libs/ui/components/src/lib/season-container/season-container.component.ts',
     'libs/ui/epg/src/lib/multi-epg/multi-epg-container.component.ts',
     'libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-player.component.ts',
-    'libs/ui/playback/src/lib/embedded-mpv-player/embedded-mpv-session-controller.ts',
-    'libs/ui/playback/src/lib/html-video-player/html-video-player.component.ts',
-    'libs/ui/playback/src/lib/vjs-player/vjs-player.component.spec.ts',
-    'libs/ui/playback/src/lib/vjs-player/vjs-player.component.ts',
     'libs/ui/playback/src/lib/web-player-view/web-player-view.component.spec.ts',
     'libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.spec.ts',
     'libs/workspace/dashboard/data-access/src/lib/dashboard-data.service.ts',
@@ -134,6 +130,5 @@ export const maxLinesBaseline = [
     'libs/workspace/shell/feature/src/lib/workspace-shell/services/helpers/workspace-shell-command-builders.ts',
     'libs/workspace/shell/feature/src/lib/workspace-shell/services/workspace-shell.facade.spec.ts',
     'libs/workspace/shell/feature/src/lib/workspace-shell/workspace-shell.component.spec.ts',
-    'tools/release/capture-v020-screenshots.ts',
     'tools/release/generate-marketing-artwork.ts',
 ];
diff --git a/tools/packaging/asar-dependency-closure.mjs b/tools/packaging/asar-dependency-closure.mjs
index 7f7768a0f..6fd4d775c 100644
--- a/tools/packaging/asar-dependency-closure.mjs
+++ b/tools/packaging/asar-dependency-closure.mjs
@@ -15,10 +15,226 @@
  * so the core logic stays pure and unit-testable without a real archive.
  */
 
+import fs from 'node:fs';
 import path from 'node:path';
+import { TextDecoder } from 'node:util';
 
 const PACKAGE_MANIFEST = 'package.json';
 const NODE_MODULES_SEGMENT = '/node_modules/';
+const EMBEDDED_MPV_NATIVE_ARCHIVE_ROOT = '/electron-backend/native';
+const ASAR_SIZE_PREFIX_BYTES = 8;
+const ASAR_HEADER_MAX_BYTES = 32 * 1024 * 1024;
+const ASAR_ENTRY_LIMIT = 250_000;
+const ASAR_PATH_MAX_BYTES = 32 * 1024;
+const ASAR_LISTED_PATH_MAX_BYTES = 32 * 1024 * 1024;
+
+function isRecord(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
+function* ownRecordEntries(record) {
+    for (const name in record) {
+        if (Object.hasOwn(record, name)) {
+            yield [name, record[name]];
+        }
+    }
+}
+
+function readExactly(descriptor, buffer, position) {
+    let offset = 0;
+    while (offset < buffer.length) {
+        const bytesRead = fs.readSync(
+            descriptor,
+            buffer,
+            offset,
+            buffer.length - offset,
+            position + offset
+        );
+        if (bytesRead === 0) {
+            throw new Error('ASAR archive ended before its header was read.');
+        }
+        offset += bytesRead;
+    }
+}
+
+/**
+ * Lists an ASAR from its bounded Chromium-Pickle JSON header using only Node
+ * built-ins. Public-release verification runs from a clean tag checkout, so it
+ * cannot rely on the workspace-only `@electron/asar` development dependency.
+ */
+export function listAsarPackageEntries(
+    archivePath,
+    { maxListedPathBytes = ASAR_LISTED_PATH_MAX_BYTES } = {}
+) {
+    if (
+        !Number.isSafeInteger(maxListedPathBytes) ||
+        maxListedPathBytes <= 0 ||
+        maxListedPathBytes > ASAR_LISTED_PATH_MAX_BYTES
+    ) {
+        throw new Error('ASAR listed-path byte limit is invalid.');
+    }
+    const noFollow = fs.constants.O_NOFOLLOW ?? 0;
+    const descriptor = fs.openSync(
+        archivePath,
+        fs.constants.O_RDONLY | noFollow
+    );
+    let header;
+    try {
+        const archiveStat = fs.fstatSync(descriptor);
+        if (!archiveStat.isFile()) {
+            throw new Error('ASAR archive must be a regular file.');
+        }
+        const sizePrefix = Buffer.alloc(ASAR_SIZE_PREFIX_BYTES);
+        readExactly(descriptor, sizePrefix, 0);
+        if (sizePrefix.readUInt32LE(0) !== 4) {
+            throw new Error('ASAR size pickle is malformed.');
+        }
+        const headerSize = sizePrefix.readUInt32LE(4);
+        if (headerSize > ASAR_HEADER_MAX_BYTES) {
+            throw new Error(
+                `ASAR header exceeds the ${String(
+                    ASAR_HEADER_MAX_BYTES
+                )}-byte limit.`
+            );
+        }
+        if (
+            headerSize < 8 ||
+            headerSize + ASAR_SIZE_PREFIX_BYTES > archiveStat.size
+        ) {
+            throw new Error('ASAR header size is invalid.');
+        }
+        header = Buffer.alloc(headerSize);
+        readExactly(descriptor, header, ASAR_SIZE_PREFIX_BYTES);
+    } finally {
+        fs.closeSync(descriptor);
+    }
+
+    const payloadSize = header.readUInt32LE(0);
+    if (payloadSize + 4 !== header.length || payloadSize < 4) {
+        throw new Error('ASAR header pickle is malformed.');
+    }
+    const jsonLength = header.readInt32LE(4);
+    const alignedJsonLength =
+        jsonLength >= 0 ? Math.ceil(jsonLength / 4) * 4 : -1;
+    if (
+        jsonLength <= 0 ||
+        alignedJsonLength + 4 !== payloadSize ||
+        header
+            .subarray(8 + jsonLength, 8 + alignedJsonLength)
+            .some((byte) => byte !== 0)
+    ) {
+        throw new Error('ASAR header JSON framing is malformed.');
+    }
+
+    let parsedHeader;
+    try {
+        const headerJson = new TextDecoder('utf-8', { fatal: true }).decode(
+            header.subarray(8, 8 + jsonLength)
+        );
+        parsedHeader = JSON.parse(headerJson);
+    } catch (error) {
+        throw new Error(
+            `ASAR header JSON is invalid: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+    if (!isRecord(parsedHeader) || !isRecord(parsedHeader.files)) {
+        throw new Error('ASAR header must contain a files mapping.');
+    }
+
+    const entries = [];
+    let listedPathBytes = 0;
+    const pendingDirectories = [
+        {
+            entries: ownRecordEntries(parsedHeader.files),
+            parentPath: '',
+        },
+    ];
+    while (pendingDirectories.length > 0) {
+        const directory = pendingDirectories.at(-1);
+        const nextEntry = directory.entries.next();
+        if (nextEntry.done) {
+            pendingDirectories.pop();
+            continue;
+        }
+        const [name, node] = nextEntry.value;
+        const { parentPath } = directory;
+        if (
+            !name ||
+            name === '.' ||
+            name === '..' ||
+            name.includes('/') ||
+            name.includes('\0')
+        ) {
+            throw new Error('ASAR header contains an invalid path segment.');
+        }
+        if (!isRecord(node)) {
+            throw new Error('ASAR header contains an invalid filesystem node.');
+        }
+        const entryPath = `${parentPath}/${name}`;
+        const entryPathBytes = Buffer.byteLength(entryPath, 'utf8');
+        if (entryPathBytes > ASAR_PATH_MAX_BYTES) {
+            throw new Error('ASAR header contains an overlong entry path.');
+        }
+        if (entryPathBytes > maxListedPathBytes - listedPathBytes) {
+            throw new Error(
+                `Cumulative ASAR entry paths exceed the ${String(
+                    maxListedPathBytes
+                )}-byte limit.`
+            );
+        }
+        listedPathBytes += entryPathBytes;
+        entries.push(entryPath);
+        if (entries.length > ASAR_ENTRY_LIMIT) {
+            throw new Error(
+                `ASAR header exceeds the ${String(ASAR_ENTRY_LIMIT)}-entry limit.`
+            );
+        }
+
+        if (Object.hasOwn(node, 'files')) {
+            if (!isRecord(node.files)) {
+                throw new Error(
+                    'ASAR header contains an invalid directory mapping.'
+                );
+            }
+            pendingDirectories.push({
+                entries: ownRecordEntries(node.files),
+                parentPath: entryPath,
+            });
+        } else if (
+            !(
+                (Number.isSafeInteger(node.size) && node.size >= 0) ||
+                (typeof node.link === 'string' && node.link.length > 0)
+            )
+        ) {
+            throw new Error('ASAR header contains an invalid file node.');
+        }
+    }
+    return entries;
+}
+
+/**
+ * Embedded MPV's native payload is profile-specific and is written only by
+ * afterPack. Any copy retained in app.asar predates that mutation and can leak
+ * x64 helpers, runtimes, manifests, or notices into marker-only/system builds.
+ */
+export function collectEmbeddedMpvNativeArchiveEntries(
+    asarEntries,
+    pathSep = path.sep
+) {
+    const toPosix = (value) =>
+        pathSep === '\\' ? value.replaceAll('\\', '/') : value;
+
+    return asarEntries
+        .map(toPosix)
+        .map((entry) => (entry.startsWith('/') ? entry : `/${entry}`))
+        .filter(
+            (entry) =>
+                entry === EMBEDDED_MPV_NATIVE_ARCHIVE_ROOT ||
+                entry.startsWith(`${EMBEDDED_MPV_NATIVE_ARCHIVE_ROOT}/`)
+        );
+}
 
 /**
  * A genuine installed package lives directly under a node_modules directory as
@@ -70,7 +286,11 @@ export function collectAsarPackageDirs(asarEntries) {
  * as `/electron-backend/node_modules/foo`. Returns the resolved package
  * directory or null when the dependency is absent.
  */
-export function resolvePackagedDependency(fromDir, dependencyName, packageDirs) {
+export function resolvePackagedDependency(
+    fromDir,
+    dependencyName,
+    packageDirs
+) {
     let current = fromDir;
 
     while (true) {
diff --git a/tools/packaging/asar-dependency-closure.test.mjs b/tools/packaging/asar-dependency-closure.test.mjs
index 0c5fc81fe..d1737371a 100644
--- a/tools/packaging/asar-dependency-closure.test.mjs
+++ b/tools/packaging/asar-dependency-closure.test.mjs
@@ -1,13 +1,40 @@
 import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import os from 'node:os';
+import path from 'node:path';
 import test from 'node:test';
 
 import {
+    collectEmbeddedMpvNativeArchiveEntries,
     collectAsarPackageDirs,
     findMissingPackagedDependencies,
     inspectPackagedDependencyClosure,
+    listAsarPackageEntries,
     resolvePackagedDependency,
 } from './asar-dependency-closure.mjs';
 
+const require = createRequire(import.meta.url);
+const {
+    createPackage: createAsarPackage,
+    listPackage: listAsarPackageWithDependency,
+} = require('@electron/asar');
+
+function writeSyntheticAsarHeader(archivePath, files) {
+    const json = Buffer.from(JSON.stringify({ files }), 'utf8');
+    const alignedJsonLength = Math.ceil(json.length / 4) * 4;
+    const headerPayloadSize = 4 + alignedJsonLength;
+    const headerSize = 4 + headerPayloadSize;
+    const sizePrefix = Buffer.alloc(8);
+    sizePrefix.writeUInt32LE(4, 0);
+    sizePrefix.writeUInt32LE(headerSize, 4);
+    const header = Buffer.alloc(headerSize);
+    header.writeUInt32LE(headerPayloadSize, 0);
+    header.writeInt32LE(json.length, 4);
+    json.copy(header, 8);
+    fs.writeFileSync(archivePath, Buffer.concat([sizePrefix, header]));
+}
+
 /**
  * Builds a `readManifest(dir)` backed by an in-memory map of
  * `{ packageDir: manifest }`, mirroring how manifests are read from an asar.
@@ -16,6 +43,202 @@ function manifestReader(manifests) {
     return (packageDir) => manifests[packageDir] ?? null;
 }
 
+test('collectEmbeddedMpvNativeArchiveEntries finds stale native payloads on every host separator', () => {
+    assert.deepEqual(
+        collectEmbeddedMpvNativeArchiveEntries(
+            [
+                '/electron-backend/main.js',
+                '/electron-backend/native/iptvnator_mpv_helper',
+                '/electron-backend/native/lib/libmpv.so.2',
+                '/web/index.html',
+            ],
+            '/'
+        ),
+        [
+            '/electron-backend/native/iptvnator_mpv_helper',
+            '/electron-backend/native/lib/libmpv.so.2',
+        ]
+    );
+    assert.deepEqual(
+        collectEmbeddedMpvNativeArchiveEntries(
+            [
+                '\\electron-backend\\native\\embedded-mpv-unavailable.txt',
+                '\\electron-backend\\node_modules\\package.json',
+            ],
+            '\\'
+        ),
+        ['/electron-backend/native/embedded-mpv-unavailable.txt']
+    );
+});
+
+test('listAsarPackageEntries matches Electron ASAR listings from a bounded header', async (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const sourceRoot = path.join(temporaryRoot, 'source');
+    const archivePath = path.join(temporaryRoot, 'app.asar');
+    fs.mkdirSync(path.join(sourceRoot, 'electron-backend', 'native'), {
+        recursive: true,
+    });
+    fs.writeFileSync(path.join(sourceRoot, 'main.js'), 'main');
+    fs.writeFileSync(
+        path.join(
+            sourceRoot,
+            'electron-backend',
+            'native',
+            'embedded-mpv-runtime.json'
+        ),
+        '{}\n'
+    );
+    await createAsarPackage(sourceRoot, archivePath);
+
+    assert.deepEqual(
+        listAsarPackageEntries(archivePath),
+        listAsarPackageWithDependency(archivePath)
+    );
+});
+
+test('listAsarPackageEntries rejects an unbounded declared header before allocation', (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const archivePath = path.join(temporaryRoot, 'oversized.asar');
+    const prefix = Buffer.alloc(8);
+    prefix.writeUInt32LE(4, 0);
+    prefix.writeUInt32LE(0xffffffff, 4);
+    fs.writeFileSync(archivePath, prefix);
+
+    assert.throws(
+        () => listAsarPackageEntries(archivePath),
+        /ASAR header exceeds.*limit/i
+    );
+});
+
+test('listAsarPackageEntries traverses untrusted directory mappings without bulk Object.entries allocation', (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const archivePath = path.join(temporaryRoot, 'wide.asar');
+    const files = Object.fromEntries(
+        Array.from({ length: 4096 }, (_, index) => [
+            `entry-${String(index).padStart(4, '0')}`,
+            { size: 0, offset: '0' },
+        ])
+    );
+    writeSyntheticAsarHeader(archivePath, files);
+
+    const originalObjectEntries = Object.entries;
+    Object.entries = () => {
+        throw new Error(
+            'untrusted ASAR mappings must not be materialized in bulk'
+        );
+    };
+    try {
+        assert.equal(listAsarPackageEntries(archivePath).length, 4096);
+    } finally {
+        Object.entries = originalObjectEntries;
+    }
+});
+
+test('listAsarPackageEntries bounds cumulative paths under a wide long prefix', (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const archivePath = path.join(temporaryRoot, 'wide-prefix.asar');
+    const children = Object.fromEntries(
+        Array.from({ length: 64 }, (_, index) => [
+            `leaf-${String(index).padStart(2, '0')}`,
+            { size: 0, offset: '0' },
+        ])
+    );
+    writeSyntheticAsarHeader(archivePath, {
+        ['prefix-'.repeat(32)]: { files: children },
+    });
+
+    assert.throws(
+        () =>
+            listAsarPackageEntries(archivePath, {
+                maxListedPathBytes: 1024,
+            }),
+        /cumulative ASAR entry paths exceed.*limit/i
+    );
+});
+
+test('listAsarPackageEntries fails closed on malformed pickle, padding, and UTF-8', (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const validArchivePath = path.join(temporaryRoot, 'valid.asar');
+    writeSyntheticAsarHeader(validArchivePath, {
+        a: { size: 0, offset: '0' },
+    });
+    const validArchive = fs.readFileSync(validArchivePath);
+
+    const malformedPickle = Buffer.from(validArchive);
+    malformedPickle.writeUInt32LE(malformedPickle.readUInt32LE(8) - 4, 8);
+    const malformedPicklePath = path.join(
+        temporaryRoot,
+        'malformed-pickle.asar'
+    );
+    fs.writeFileSync(malformedPicklePath, malformedPickle);
+    assert.throws(
+        () => listAsarPackageEntries(malformedPicklePath),
+        /header pickle is malformed/i
+    );
+
+    const malformedPadding = Buffer.from(validArchive);
+    malformedPadding[malformedPadding.length - 1] = 0xff;
+    const malformedPaddingPath = path.join(
+        temporaryRoot,
+        'malformed-padding.asar'
+    );
+    fs.writeFileSync(malformedPaddingPath, malformedPadding);
+    assert.throws(
+        () => listAsarPackageEntries(malformedPaddingPath),
+        /JSON framing is malformed/i
+    );
+
+    const malformedUtf8 = Buffer.from(validArchive);
+    malformedUtf8[16] = 0xff;
+    const malformedUtf8Path = path.join(temporaryRoot, 'malformed-utf8.asar');
+    fs.writeFileSync(malformedUtf8Path, malformedUtf8);
+    assert.throws(
+        () => listAsarPackageEntries(malformedUtf8Path),
+        /header JSON is invalid/i
+    );
+});
+
+test('listAsarPackageEntries rejects unsafe archive path segments', (t) => {
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-asar-header-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+
+    for (const [index, unsafeSegment] of [
+        '.',
+        '..',
+        'nested/name',
+        'nul\0name',
+    ].entries()) {
+        const archivePath = path.join(
+            temporaryRoot,
+            `unsafe-${String(index)}.asar`
+        );
+        writeSyntheticAsarHeader(archivePath, {
+            [unsafeSegment]: { size: 0, offset: '0' },
+        });
+        assert.throws(
+            () => listAsarPackageEntries(archivePath),
+            /invalid path segment/i
+        );
+    }
+});
+
 test('collectAsarPackageDirs keeps only genuine package roots', () => {
     const dirs = collectAsarPackageDirs([
         '/package.json',
diff --git a/tools/packaging/configure-linux-frame-copy-build.mjs b/tools/packaging/configure-linux-frame-copy-build.mjs
new file mode 100644
index 000000000..6cd570418
--- /dev/null
+++ b/tools/packaging/configure-linux-frame-copy-build.mjs
@@ -0,0 +1,263 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const {
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+} = require('./linux-frame-copy-profile.cjs');
+const scriptPath = fileURLToPath(import.meta.url);
+
+function cloneJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+
+function targetName(target) {
+    const value =
+        typeof target === 'string'
+            ? target
+            : target && typeof target === 'object'
+              ? target.target
+              : null;
+    if (typeof value !== 'string' || value.trim() === '') {
+        throw new Error(
+            'Electron Builder Linux targets must have a non-empty target name.'
+        );
+    }
+    return value.trim().toLowerCase();
+}
+
+function targetObject(target) {
+    return typeof target === 'string' ? { target } : { ...target };
+}
+
+function fpmDependencyName(option) {
+    return String(option).match(
+        /^--depends(?:=|\s+)([A-Za-z0-9+_.-]+)(?:$|\s|[<>=])/
+    )?.[1];
+}
+
+function configureSystemDependencies(config) {
+    for (const [format, dependencies] of Object.entries(
+        LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+    )) {
+        const frameCopyDependencies = new Set(dependencies);
+        const formatConfig = { ...(config[format] ?? {}) };
+        const otherFpmOptions = (formatConfig.fpm ?? []).filter(
+            (option) => !frameCopyDependencies.has(fpmDependencyName(option))
+        );
+        formatConfig.fpm = [
+            ...otherFpmOptions,
+            ...dependencies.map((dependency) => `--depends=${dependency}`),
+        ];
+        config[format] = formatConfig;
+    }
+}
+
+function removeForeignFrameCopyDependency(config, format) {
+    const dependencies = new Set(
+        LINUX_SYSTEM_PACKAGE_DEPENDENCIES[format] ?? []
+    );
+    const formatConfig = { ...(config[format] ?? {}) };
+    const retainedFpmOptions = (formatConfig.fpm ?? []).filter(
+        (option) => !dependencies.has(fpmDependencyName(option))
+    );
+    if (retainedFpmOptions.length > 0) {
+        formatConfig.fpm = retainedFpmOptions;
+    } else {
+        delete formatConfig.fpm;
+    }
+    config[format] = formatConfig;
+}
+
+export function configureLinuxFrameCopyBuild(
+    electronBuilderConfig,
+    { profileName, foreignDeb = false, foreignArch } = {}
+) {
+    const hasForeignArch = foreignArch !== undefined;
+    if (
+        !electronBuilderConfig ||
+        typeof electronBuilderConfig !== 'object' ||
+        Array.isArray(electronBuilderConfig)
+    ) {
+        throw new TypeError(
+            'Electron Builder configuration must be an object.'
+        );
+    }
+    if (foreignDeb && profileName) {
+        throw new Error(
+            'The marker-only foreign DEB pass must not select a frame-copy profile.'
+        );
+    }
+    if (hasForeignArch && !foreignDeb) {
+        throw new Error(
+            'A marker-only foreign architecture requires --foreign-deb.'
+        );
+    }
+    const configured = cloneJson(electronBuilderConfig);
+    const targets = configured.linux?.target;
+    if (!Array.isArray(targets)) {
+        throw new Error('Electron Builder linux.target must be an array.');
+    }
+
+    if (foreignDeb) {
+        const debTarget = targets.find(
+            (target) => targetName(target) === 'deb'
+        );
+        if (!debTarget) {
+            throw new Error(
+                'Electron Builder has no DEB target for the foreign-architecture pass.'
+            );
+        }
+        const configuredDebTarget = targetObject(debTarget);
+        const configuredArches = Array.isArray(configuredDebTarget.arch)
+            ? configuredDebTarget.arch
+            : [configuredDebTarget.arch].filter(Boolean);
+        const foreignArches = configuredArches.filter(
+            (architecture) => architecture !== 'x64'
+        );
+        if (foreignArches.length === 0) {
+            throw new Error(
+                'Electron Builder DEB target has no foreign architectures.'
+            );
+        }
+        if (
+            hasForeignArch &&
+            (typeof foreignArch !== 'string' ||
+                !foreignArches.includes(foreignArch))
+        ) {
+            throw new Error(
+                `Unsupported marker-only foreign DEB architecture "${foreignArch}". Expected one of: ${foreignArches.join(
+                    ', '
+                )}.`
+            );
+        }
+        configuredDebTarget.arch = hasForeignArch
+            ? [foreignArch]
+            : foreignArches;
+        configured.linux.target = [configuredDebTarget];
+        configured.directories = {
+            ...(configured.directories ?? {}),
+            output: 'dist/executables-linux-foreign',
+        };
+        removeForeignFrameCopyDependency(configured, 'deb');
+        return configured;
+    }
+
+    const profile = resolveLinuxFrameCopyProfile(profileName);
+    const allowedTargets = new Set(profile.targets);
+    const targetsByName = new Map(
+        profile.targets.map((profileTarget) => [profileTarget, []])
+    );
+    for (const target of targets) {
+        const name = targetName(target);
+        if (allowedTargets.has(name)) {
+            targetsByName.get(name).push(target);
+        }
+    }
+    const duplicateTargets = profile.targets.filter(
+        (profileTarget) => targetsByName.get(profileTarget).length > 1
+    );
+    const missingTargets = profile.targets.filter(
+        (profileTarget) => targetsByName.get(profileTarget).length === 0
+    );
+    if (duplicateTargets.length > 0 || missingTargets.length > 0) {
+        throw new Error(
+            [
+                `Invalid Electron Builder targets for Linux profile "${profile.name}".`,
+                ...(duplicateTargets.length > 0
+                    ? [
+                          `Found duplicate target "${duplicateTargets.join(
+                              '", "'
+                          )}".`,
+                      ]
+                    : []),
+                ...(missingTargets.length > 0
+                    ? [`Missing targets: ${missingTargets.join(', ')}.`]
+                    : []),
+            ].join(' ')
+        );
+    }
+    configured.linux.target = profile.targets.map((profileTarget) => {
+        const target = targetsByName.get(profileTarget)[0];
+        const configuredTarget = targetObject(target);
+        if (profile.name === 'system') {
+            configuredTarget.arch = ['x64'];
+        }
+        return configuredTarget;
+    });
+    if (profile.name === 'system') {
+        configureSystemDependencies(configured);
+    }
+    return configured;
+}
+
+function parseArguments(argv) {
+    const normalized = argv[0] === '--' ? argv.slice(1) : argv;
+    let configPath = 'electron-builder.json';
+    let profileName;
+    let foreignDeb = false;
+    let foreignArch;
+    const nextValue = (flag, index) => {
+        const value = normalized[index + 1];
+        if (
+            typeof value !== 'string' ||
+            value.trim() === '' ||
+            value.startsWith('--')
+        ) {
+            throw new Error(`${flag} requires a value.`);
+        }
+        return value;
+    };
+    for (let index = 0; index < normalized.length; index += 1) {
+        const argument = normalized[index];
+        if (argument === '--config') {
+            configPath = nextValue(argument, index);
+            index += 1;
+        } else if (argument === '--profile') {
+            profileName = nextValue(argument, index);
+            index += 1;
+        } else if (argument === '--foreign-deb') {
+            foreignDeb = true;
+        } else if (argument === '--foreign-arch') {
+            foreignArch = nextValue(argument, index);
+            index += 1;
+        } else {
+            throw new Error(`Unsupported configurator argument: ${argument}`);
+        }
+    }
+    if (!foreignDeb && !profileName) {
+        throw new Error('--profile or --foreign-deb is required.');
+    }
+    return {
+        configPath: path.resolve(configPath),
+        profileName,
+        foreignDeb,
+        foreignArch,
+    };
+}
+
+function main() {
+    const options = parseArguments(process.argv.slice(2));
+    const config = JSON.parse(fs.readFileSync(options.configPath, 'utf8'));
+    const configured = configureLinuxFrameCopyBuild(config, options);
+    fs.writeFileSync(
+        options.configPath,
+        `${JSON.stringify(configured, null, 4)}\n`
+    );
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === scriptPath) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
diff --git a/tools/packaging/configure-linux-frame-copy-build.test.mjs b/tools/packaging/configure-linux-frame-copy-build.test.mjs
new file mode 100644
index 000000000..943b046ed
--- /dev/null
+++ b/tools/packaging/configure-linux-frame-copy-build.test.mjs
@@ -0,0 +1,912 @@
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { parse as parseYaml } from 'yaml';
+
+import { configureLinuxFrameCopyBuild } from './configure-linux-frame-copy-build.mjs';
+
+const workspaceRoot = path.resolve(
+    path.dirname(new URL(import.meta.url).pathname),
+    '..',
+    '..'
+);
+const electronBuilderConfig = JSON.parse(
+    fs.readFileSync(path.join(workspaceRoot, 'electron-builder.json'), 'utf8')
+);
+const buildWorkflow = fs.readFileSync(
+    path.join(workspaceRoot, '.github', 'workflows', 'build-and-make.yaml'),
+    'utf8'
+);
+const buildWorkflowConfig = parseYaml(buildWorkflow);
+
+function workflowStep(name) {
+    const marker = `            - name: ${name}\n`;
+    const start = buildWorkflow.indexOf(marker);
+    assert.notEqual(start, -1, `Missing workflow step: ${name}`);
+    const nextStep = buildWorkflow.indexOf('\n            - name:', start + 1);
+    return buildWorkflow.slice(
+        start,
+        nextStep === -1 ? buildWorkflow.length : nextStep
+    );
+}
+
+function configuredTargets(config) {
+    return config.linux.target.map(({ target, arch }) => ({
+        target: target.toLowerCase(),
+        arch,
+    }));
+}
+
+test('configures an x64-only system pass with exact package dependencies', () => {
+    const configured = configureLinuxFrameCopyBuild(electronBuilderConfig, {
+        profileName: 'system',
+    });
+
+    assert.deepEqual(configuredTargets(configured), [
+        { target: 'deb', arch: ['x64'] },
+        { target: 'rpm', arch: ['x64'] },
+        { target: 'pacman', arch: ['x64'] },
+    ]);
+    assert.deepEqual(configured.deb.fpm, [
+        '--depends=libmpv2',
+        '--depends=libegl1',
+        '--depends=libgl1',
+        '--depends=libgbm1',
+    ]);
+    assert.deepEqual(configured.rpm.fpm, [
+        '--depends=mpv-libs',
+        '--depends=libglvnd-egl',
+        '--depends=libglvnd-glx',
+        '--depends=mesa-libgbm',
+    ]);
+    assert.deepEqual(configured.pacman.fpm, [
+        '--depends=mpv',
+        '--depends=libglvnd',
+        '--depends=mesa',
+    ]);
+});
+
+test('configures portable and flatpak passes without mixing targets', () => {
+    const portable = configureLinuxFrameCopyBuild(electronBuilderConfig, {
+        profileName: 'portable',
+    });
+    assert.deepEqual(configuredTargets(portable), [
+        { target: 'appimage', arch: ['x64', 'armv7l', 'arm64'] },
+        { target: 'snap', arch: ['x64', 'armv7l'] },
+    ]);
+
+    const flatpak = configureLinuxFrameCopyBuild(electronBuilderConfig, {
+        profileName: 'flatpak',
+    });
+    assert.deepEqual(configuredTargets(flatpak), [
+        { target: 'flatpak', arch: ['x64'] },
+    ]);
+    assert.equal(portable.snap.base, 'core22');
+    assert.equal(portable.snap.confinement, 'strict');
+    assert.deepEqual(portable.snap.layout, {
+        '/usr/share/libdrm': {
+            bind: '$SNAP/graphics/libdrm',
+        },
+        '/usr/share/drirc.d': {
+            symlink: '$SNAP/graphics/drirc.d',
+        },
+    });
+    assert.deepEqual(portable.snap.plugs, [
+        'default',
+        {
+            'graphics-core22': {
+                interface: 'content',
+                target: '$SNAP/graphics',
+                'default-provider': 'mesa-core22',
+            },
+        },
+        {
+            'shared-memory': {
+                interface: 'shared-memory',
+                private: true,
+            },
+        },
+    ]);
+});
+
+test('configures a separate marker-only foreign DEB pass without libmpv metadata', () => {
+    const configured = configureLinuxFrameCopyBuild(electronBuilderConfig, {
+        foreignDeb: true,
+    });
+
+    assert.deepEqual(configuredTargets(configured), [
+        { target: 'deb', arch: ['armv7l', 'arm64'] },
+    ]);
+    assert.equal(
+        configured.deb.fpm?.some((entry) =>
+            entry.includes('--depends=libmpv2')
+        ) ?? false,
+        false
+    );
+    assert.equal(
+        configured.directories.output,
+        'dist/executables-linux-foreign'
+    );
+});
+
+test('configures exactly one requested marker-only foreign DEB architecture', () => {
+    for (const foreignArch of ['armv7l', 'arm64']) {
+        const configured = configureLinuxFrameCopyBuild(electronBuilderConfig, {
+            foreignDeb: true,
+            foreignArch,
+        });
+
+        assert.deepEqual(configuredTargets(configured), [
+            { target: 'deb', arch: [foreignArch] },
+        ]);
+    }
+});
+
+test('CLI writes an exact marker-only foreign DEB architecture', (t) => {
+    const temporaryDirectory = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-build-config-')
+    );
+    t.after(() =>
+        fs.rmSync(temporaryDirectory, { recursive: true, force: true })
+    );
+    const configPath = path.join(temporaryDirectory, 'electron-builder.json');
+    fs.writeFileSync(
+        configPath,
+        `${JSON.stringify(electronBuilderConfig, null, 4)}\n`
+    );
+
+    const result = spawnSync(
+        process.execPath,
+        [
+            path.join(
+                workspaceRoot,
+                'tools',
+                'packaging',
+                'configure-linux-frame-copy-build.mjs'
+            ),
+            '--config',
+            configPath,
+            '--foreign-deb',
+            '--foreign-arch',
+            'arm64',
+        ],
+        { encoding: 'utf8' }
+    );
+
+    assert.equal(result.status, 0, result.stderr);
+    assert.deepEqual(
+        configuredTargets(JSON.parse(fs.readFileSync(configPath, 'utf8'))),
+        [{ target: 'deb', arch: ['arm64'] }]
+    );
+
+    const missingValue = spawnSync(
+        process.execPath,
+        [
+            path.join(
+                workspaceRoot,
+                'tools',
+                'packaging',
+                'configure-linux-frame-copy-build.mjs'
+            ),
+            '--config',
+            configPath,
+            '--foreign-deb',
+            '--foreign-arch',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.notEqual(missingValue.status, 0);
+    assert.match(missingValue.stderr, /--foreign-arch requires a value/);
+});
+
+test('does not mutate the shared electron-builder configuration', () => {
+    const before = JSON.stringify(electronBuilderConfig);
+    configureLinuxFrameCopyBuild(electronBuilderConfig, {
+        profileName: 'system',
+    });
+    assert.equal(JSON.stringify(electronBuilderConfig), before);
+});
+
+test('rejects an unknown profile and conflicting foreign/profile modes', () => {
+    assert.throws(
+        () =>
+            configureLinuxFrameCopyBuild(electronBuilderConfig, {
+                profileName: 'standard',
+            }),
+        /Unsupported Linux frame-copy profile/
+    );
+    assert.throws(
+        () =>
+            configureLinuxFrameCopyBuild(electronBuilderConfig, {
+                profileName: 'system',
+                foreignDeb: true,
+            }),
+        /must not select a frame-copy profile/
+    );
+    assert.throws(
+        () =>
+            configureLinuxFrameCopyBuild(electronBuilderConfig, {
+                foreignArch: 'arm64',
+            }),
+        /foreign architecture requires --foreign-deb/
+    );
+    assert.throws(
+        () =>
+            configureLinuxFrameCopyBuild(electronBuilderConfig, {
+                foreignDeb: true,
+                foreignArch: 'x64',
+            }),
+        /Unsupported marker-only foreign DEB architecture/
+    );
+    for (const foreignArch of ['', 64]) {
+        assert.throws(
+            () =>
+                configureLinuxFrameCopyBuild(electronBuilderConfig, {
+                    foreignDeb: true,
+                    foreignArch,
+                }),
+            /Unsupported marker-only foreign DEB architecture/
+        );
+    }
+});
+
+test('rejects duplicate profile targets even when target count looks complete', () => {
+    const malformed = structuredClone(electronBuilderConfig);
+    malformed.linux.target = malformed.linux.target.map((target) =>
+        target.target === 'Snap' ? { ...target, target: 'AppImage' } : target
+    );
+    assert.throws(
+        () =>
+            configureLinuxFrameCopyBuild(malformed, {
+                profileName: 'portable',
+            }),
+        /duplicate target "appimage".*missing.*snap/is
+    );
+});
+
+test('preserves unrelated fpm dependencies and normalizes only frame-copy dependencies', () => {
+    const customized = structuredClone(electronBuilderConfig);
+    customized.deb = {
+        fpm: [
+            '--depends=unrelated-runtime',
+            '--depends=mesa',
+            '--depends=libmpv2 >= 2',
+            '--depends=libgl1',
+        ],
+    };
+    const system = configureLinuxFrameCopyBuild(customized, {
+        profileName: 'system',
+    });
+    assert.deepEqual(system.deb.fpm, [
+        '--depends=unrelated-runtime',
+        '--depends=mesa',
+        '--depends=libmpv2',
+        '--depends=libegl1',
+        '--depends=libgl1',
+        '--depends=libgbm1',
+    ]);
+
+    const foreign = configureLinuxFrameCopyBuild(customized, {
+        foreignDeb: true,
+    });
+    assert.deepEqual(foreign.deb.fpm, [
+        '--depends=unrelated-runtime',
+        '--depends=mesa',
+    ]);
+});
+
+test('Linux CI builds one cached source runtime and packages three isolated profiles', () => {
+    assert.match(buildWorkflow, /^ {4}linux-embedded-mpv-runtime:$/m);
+    for (const profile of ['system', 'portable', 'flatpak']) {
+        assert.match(
+            buildWorkflow,
+            new RegExp(`linux_profile: ${profile}(?:\\s|$)`)
+        );
+    }
+    assert.doesNotMatch(buildWorkflow, /linux_profile: standard/);
+    assert.match(
+        buildWorkflow,
+        /configure-linux-frame-copy-build\.mjs --profile/
+    );
+    assert.match(
+        buildWorkflow,
+        /configure-linux-frame-copy-build\.mjs[\s\S]*--foreign-deb/
+    );
+    assert.match(
+        buildWorkflow,
+        /apt-cache policy[\s\S]*meson=1\.7\.2[\s\S]*toolchain-sha256/
+    );
+    assert.match(
+        buildWorkflow,
+        /key: \$\{\{ steps\.linux-runtime-cache-key\.outputs\.key \}\}/
+    );
+    const cacheStep = workflowStep(
+        'Restore pinned Linux runtime and immutable source inputs'
+    );
+    assert.match(cacheStep, /dist\/linux-frame-copy-runtime-source-inputs/);
+    assert.doesNotMatch(cacheStep, /linux-frame-copy-runtime-sources\.tar\.xz/);
+    assert.doesNotMatch(cacheStep, /THIRD_PARTY_NOTICES/);
+
+    const complianceStep = workflowStep(
+        'Generate Linux runtime notices and assemble source compliance'
+    );
+    assert.doesNotMatch(complianceStep, /^\s+if:/m);
+    assert.match(
+        complianceStep,
+        /generate-linux-runtime-notices\.cjs generate/
+    );
+    assert.match(complianceStep, /git rev-parse HEAD/);
+    assert.match(complianceStep, /git diff --binary HEAD/);
+    assert.match(
+        complianceStep,
+        /tar[\s\S]*linux-frame-copy-runtime-sources\.tar\.xz/
+    );
+    assert.match(
+        complianceStep,
+        /linux-source-archive-contract\.cjs create[\s\S]*source-archive-binding\.json/
+    );
+    assert.ok(
+        complianceStep.indexOf(
+            '--file dist/compliance/linux-frame-copy-runtime-sources.tar.xz'
+        ) < complianceStep.indexOf('linux-source-archive-contract.cjs create')
+    );
+    assert.match(complianceStep, /source-index\.json/);
+    assert.match(complianceStep, /THIRD_PARTY_NOTICES\.txt/);
+    assert.match(complianceStep, /embedded-mpv-notices\.json/);
+    assert.match(
+        complianceStep,
+        /SOURCE_INPUT_ROOT.*license-inputs[\s\S]*SOURCE_BUNDLE_ROOT.*license-inputs/
+    );
+    assert.match(
+        complianceStep,
+        /new Set\(expectedArchiveHashes\)\.size[\s\S]*archives\.length !== expectedArchiveHashes\.length/
+    );
+    assert.match(complianceStep, /prepare-linux-runtime-source-snapshot\.cjs/);
+    assert.doesNotMatch(
+        complianceStep,
+        /cp -a "\$\{SOURCE_INPUT_ROOT\}\/git\/\."/
+    );
+    assert.ok(
+        complianceStep.indexOf('prepare-linux-runtime-source-snapshot.cjs') <
+            complianceStep.indexOf(
+                '--file dist/compliance/linux-frame-copy-runtime-sources.tar.xz'
+            )
+    );
+    assert.match(
+        complianceStep,
+        /libplacebo-source-record\.json[\s\S]*sourceGitCommit[\s\S]*sourceSubmodules/
+    );
+    assert.match(
+        complianceStep,
+        /prepare-linux-runtime-source-snapshot\.cjs assert-vcs-free/
+    );
+    assert.ok(
+        complianceStep.indexOf(
+            'prepare-linux-runtime-source-snapshot.cjs assert-vcs-free'
+        ) <
+            complianceStep.indexOf(
+                '--file dist/compliance/linux-frame-copy-runtime-sources.tar.xz'
+            )
+    );
+    assert.match(
+        buildWorkflow,
+        /hashFiles\([^\n]*prepare-linux-runtime-source-snapshot\.cjs/
+    );
+    assert.match(
+        buildWorkflow,
+        /hashFiles\([^\n]*linux-source-archive-contract\.cjs/
+    );
+
+    const buildStep = workflowStep('Build and stage pinned LGPL Linux runtime');
+    assert.match(buildStep, /generate-linux-runtime-notices\.cjs collect/);
+    assert.match(
+        buildStep,
+        /linux-frame-copy-runtime-source-inputs[\s\S]*archives[\s\S]*git\/libplacebo/
+    );
+    assert.ok(
+        buildStep.indexOf('git clean -ffdqx') <
+            buildStep.indexOf(
+                'cp -a "${IPTVNATOR_EMBEDDED_MPV_LINUX_BUILD_ROOT}/sources/libplacebo"'
+            )
+    );
+    assert.doesNotMatch(buildStep, /linux-frame-copy-runtime-sources\.tar\.xz/);
+    assert.match(
+        buildWorkflow,
+        /IPTVNATOR_LINUX_FRAME_COPY_PROFILE: \$\{\{ matrix\.linux_profile/
+    );
+    const makeStep = workflowStep('Make Electron app');
+    assert.match(
+        makeStep,
+        /IPTVNATOR_LINUX_FRAME_COPY_PROFILE: \$\{\{ matrix\.linux_profile/
+    );
+    assert.match(buildWorkflow, /linux-frame-copy-runtime-sources\.tar\.xz/);
+    assert.match(buildWorkflow, /name: linux-frame-copy-runtime-sources/);
+    assert.match(buildWorkflow, /sourceSha256[\s\S]*source-index\.json/);
+    assert.match(
+        buildWorkflow,
+        /sourceArchive\?\.name[\s\S]*sourceArchive\?\.sha256/
+    );
+    assert.match(buildWorkflow, /sourceArchive\?\.schemaVersion/);
+    assert.match(buildWorkflow, /sourceArchive\?\.repositoryRevision/);
+    assert.match(buildWorkflow, /execFileSync\('git', \['rev-parse', 'HEAD'\]/);
+});
+
+test('keeps non-Linux builds independent from the Linux runtime prerequisite', () => {
+    const crossPlatformJob = buildWorkflowConfig.jobs?.['build-cross-platform'];
+    const linuxJob = buildWorkflowConfig.jobs?.['build-linux'];
+
+    assert.ok(crossPlatformJob);
+    assert.ok(linuxJob);
+    assert.equal(crossPlatformJob.needs, undefined);
+    assert.deepEqual(
+        crossPlatformJob.strategy.matrix.include.map(({ os, arch }) => ({
+            os,
+            arch,
+        })),
+        [
+            { os: 'macos', arch: 'x64' },
+            { os: 'macos', arch: 'arm64' },
+            { os: 'windows', arch: 'x64' },
+        ]
+    );
+    assert.equal(crossPlatformJob.strategy['fail-fast'], false);
+    assert.equal(linuxJob.needs, 'linux-embedded-mpv-runtime');
+    assert.deepEqual(
+        linuxJob.strategy.matrix.include.map(
+            ({ os, arch, linux_profile: profile }) => ({
+                os,
+                arch,
+                profile,
+            })
+        ),
+        [
+            { os: 'linux', arch: 'x64', profile: 'system' },
+            { os: 'linux', arch: 'x64', profile: 'portable' },
+            { os: 'linux', arch: 'x64', profile: 'flatpak' },
+        ]
+    );
+    assert.equal(
+        linuxJob.name,
+        'Build on ${{ matrix.os }} ${{ matrix.arch }} (${{ matrix.linux_profile }})'
+    );
+    assert.equal(linuxJob.strategy['fail-fast'], false);
+    assert.deepEqual(linuxJob.steps, crossPlatformJob.steps);
+    assert.deepEqual(buildWorkflowConfig.jobs['create-release'].needs, [
+        'build-cross-platform',
+        'build-linux',
+    ]);
+    assert.match(buildWorkflow, /steps:\s+&electron-build-steps/);
+    assert.match(buildWorkflow, /steps:\s+\*electron-build-steps/);
+});
+
+test('Linux runtime toolchain installs fontconfig generators without network wraps', () => {
+    const cacheKeyStep = workflowStep(
+        'Resolve Linux runtime toolchain cache key'
+    );
+    const installStep = workflowStep(
+        'Install pinned Linux runtime build dependencies'
+    );
+
+    assert.match(cacheKeyStep, /\bapt-cache policy[\s\S]*\bgperf\b/);
+    assert.match(installStep, /^\s+gperf\s+\\$/m);
+});
+
+test('Linux CI verifies every package family and exercises intended environments', () => {
+    const flatpakVerificationStep = workflowStep(
+        'Verify Flatpak payload, launcher, and sandboxed runtime'
+    );
+
+    for (const suffix of [
+        'AppImage',
+        'deb',
+        'rpm',
+        'pacman',
+        'snap',
+        'flatpak',
+    ]) {
+        assert.match(
+            buildWorkflow,
+            new RegExp(`\\.${suffix.replace('.', '\\.')}(?:['"*:/\\s]|$)`)
+        );
+    }
+    assert.ok(
+        buildWorkflow.match(/verify-linux-frame-copy-runtime\.mjs/g).length >= 6
+    );
+    assert.match(buildWorkflow, /ubuntu:24\.04/);
+    assert.match(buildWorkflow, /fedora:latest/);
+    assert.match(buildWorkflow, /archlinux:latest/);
+    assert.match(
+        buildWorkflow,
+        /snap run iptvnator --embedded-mpv-runtime-probe/
+    );
+    assert.doesNotMatch(buildWorkflow, /snap run --shell iptvnator/);
+    assert.match(
+        buildWorkflow,
+        /flatpak run --command=sh com\.fourgray\.iptvnator/
+    );
+    assert.match(
+        flatpakVerificationStep,
+        /flatpak run\s+\\\s+--env=LIBGL_ALWAYS_SOFTWARE=1\s+\\\s+com\.fourgray\.iptvnator\s+\\\s+--embedded-mpv-runtime-probe/
+    );
+    assert.doesNotMatch(
+        flatpakVerificationStep,
+        /HELPER_PATH=.*iptvnator_mpv_helper/
+    );
+    assert.doesNotMatch(buildWorkflow, /\bldd\b/);
+});
+
+test('Flatpak application runtime probe runs under an isolated D-Bus session', () => {
+    const installStep = workflowStep('Install Linux system dependencies');
+    const flatpakVerificationStep = workflowStep(
+        'Verify Flatpak payload, launcher, and sandboxed runtime'
+    );
+
+    assert.match(
+        flatpakVerificationStep,
+        /xvfb-run -a dbus-run-session -- flatpak run\s+\\\s+--env=LIBGL_ALWAYS_SOFTWARE=1\s+\\\s+com\.fourgray\.iptvnator\s+\\\s+--embedded-mpv-runtime-probe/
+    );
+    assert.match(installStep, /^\s+dbus-daemon\s+\\$/m);
+    assert.match(
+        flatpakVerificationStep,
+        /xvfb-run -a env LIBGL_ALWAYS_SOFTWARE=1\s+\\\s+flatpak run --command=sh com\.fourgray\.iptvnator/
+    );
+});
+
+test('Flatpak CI verifies the direct Zypak ELF and preserves probe status', () => {
+    const flatpakVerificationStep = workflowStep(
+        'Verify Flatpak payload, launcher, and sandboxed runtime'
+    );
+
+    assert.match(
+        flatpakVerificationStep,
+        /LAUNCHER_PATH="\$\(readlink -f \/app\/bin\/iptvnator\)"/
+    );
+    assert.match(
+        flatpakVerificationStep,
+        /test -f "\$\{LAUNCHER_PATH\}"[\s\S]*test -x "\$\{LAUNCHER_PATH\}"/
+    );
+    assert.match(
+        flatpakVerificationStep,
+        /if \[ -e "\$\{LAUNCHER_PATH\}\.bin" \] \|\| \[ -L "\$\{LAUNCHER_PATH\}\.bin" \]; then/
+    );
+    assert.match(
+        flatpakVerificationStep,
+        /ELF_MAGIC="\$\(od -An -tx1 -N4 "\$\{LAUNCHER_PATH\}" \| tr -d "\[:space:\]"\)"[\s\S]*test "\$\{ELF_MAGIC\}" = "7f454c46"/
+    );
+    assert.doesNotMatch(
+        flatpakVerificationStep,
+        /grep -q .*readlink -f "\$SCRIPT_PATH"/
+    );
+    assert.doesNotMatch(
+        flatpakVerificationStep,
+        /grep -q .*exec "\$SCRIPT_DIR\/iptvnator\.bin"/
+    );
+
+    assert.match(
+        flatpakVerificationStep,
+        /set \+e[\s\S]*PROBE_OUTPUT="\$\([\s\S]*xvfb-run -a dbus-run-session -- flatpak run[\s\S]*--embedded-mpv-runtime-probe 2>&1[\s\S]*\)"[\s\S]*PROBE_STATUS=\$\?[\s\S]*set -e/
+    );
+    assert.match(
+        flatpakVerificationStep,
+        /PROBE_OUTPUT_LIMIT=16384[\s\S]*"\$\{PROBE_OUTPUT:0:PROBE_OUTPUT_LIMIT\}"/
+    );
+    assert.match(flatpakVerificationStep, /not an ELF file/);
+    assert.match(flatpakVerificationStep, /Zypak needs to be called directly/);
+    assert.match(
+        flatpakVerificationStep,
+        /if \[ "\$\{PROBE_STATUS\}" -ne 0 \]; then[\s\S]*exit "\$\{PROBE_STATUS\}"/
+    );
+});
+
+test('foreign DEB CI explicitly selects both marker-only ARM architectures', () => {
+    const foreignDebStep = workflowStep(
+        'Make marker-only foreign-architecture DEB packages'
+    );
+
+    assert.match(foreignDebStep, /for foreign_arch in armv7l arm64; do/);
+    assert.match(
+        foreignDebStep,
+        /--foreign-deb\s+\\\s+--foreign-arch "\$\{foreign_arch\}"/
+    );
+    assert.match(foreignDebStep, /--arch="\$\{foreign_arch\}"/);
+    assert.match(
+        foreignDebStep,
+        /for foreign_arch[\s\S]*cp "\$\{RUNNER_TEMP\}\/electron-builder\.base\.json" electron-builder\.json[\s\S]*configure-linux-frame-copy-build\.mjs/
+    );
+    assert.match(foreignDebStep, /rm -rf dist\/executables-linux-foreign/);
+    assert.match(
+        foreignDebStep,
+        /mapfile -t foreign_debs < <\(\s*find dist\/executables-linux-foreign[\s\S]*-name '\*\.deb' -print\s*\)/
+    );
+    assert.match(foreignDebStep, /test "\$\{#foreign_debs\[@\]\}" -eq 1/);
+    assert.match(foreignDebStep, /armv7l\) expected_deb_arch=armhf/);
+    assert.match(foreignDebStep, /arm64\) expected_deb_arch=arm64/);
+    assert.match(
+        foreignDebStep,
+        /actual_deb_arch="\$\(dpkg-deb --field "\$\{foreign_debs\[0\]\}" Architecture\)"[\s\S]*test "\$\{actual_deb_arch\}" = "\$\{expected_deb_arch\}"/
+    );
+    assert.match(
+        foreignDebStep,
+        /mv "\$\{foreign_debs\[0\]\}" dist\/executables\//
+    );
+    assert.match(foreignDebStep, /IPTVNATOR_LINUX_FRAME_COPY_PROFILE: ''/);
+    assert.match(foreignDebStep, /IPTVNATOR_REQUIRE_EMBEDDED_MPV: '1'/);
+    assert.doesNotMatch(foreignDebStep, /IPTVNATOR_REQUIRE_EMBEDDED_MPV: '0'/);
+});
+
+test('system package smoke environments install every direct helper runtime dependency', () => {
+    const debStep = workflowStep('Verify DEB payloads and x64 system runtime');
+    for (const dependency of ['libmpv2', 'libegl1', 'libgl1', 'libgbm1']) {
+        assert.match(debStep, new RegExp(`\\b${dependency}\\b`));
+    }
+
+    const rpmStep = workflowStep('Verify RPM payload and x64 system runtime');
+    for (const dependency of [
+        'mpv-libs',
+        'libglvnd-egl',
+        'libglvnd-glx',
+        'mesa-libgbm',
+    ]) {
+        assert.match(rpmStep, new RegExp(`\\b${dependency}\\b`));
+    }
+
+    const pacmanStep = workflowStep(
+        'Verify Pacman payload and x64 system runtime'
+    );
+    for (const dependency of ['mpv', 'libglvnd', 'mesa']) {
+        assert.match(pacmanStep, new RegExp(`\\b${dependency}\\b`));
+    }
+});
+
+test('Snap verifier preserves fail-closed status while exposing captured diagnostics', () => {
+    const snapStep = workflowStep(
+        'Verify Snap payloads and strict-confinement runtime'
+    );
+
+    assert.match(snapStep, /set -euo pipefail/);
+    assert.match(snapStep, /2>&1 \| tee \/dev\/stderr/);
+    assert.doesNotMatch(
+        snapStep,
+        /^\s+printf '%s\\n' "\$\{verification\}"\s*$/m
+    );
+    assert.ok(
+        snapStep.indexOf('verification="$(') <
+            snapStep.indexOf("grep -Fq 'Verified snap x64 Linux'")
+    );
+    assert.ok(
+        snapStep.indexOf("grep -Fq 'Verified snap x64 Linux'") <
+            snapStep.indexOf('sudo snap install --dangerous')
+    );
+    assert.match(
+        snapStep,
+        /snap list mesa-core22 >\/dev\/null 2>&1 \|\| sudo snap install mesa-core22/
+    );
+    assert.match(
+        snapStep,
+        /snap list gnome-3-28-1804 >\/dev\/null 2>&1 \|\| sudo snap install gnome-3-28-1804/
+    );
+    assert.ok(
+        snapStep.indexOf('sudo snap install mesa-core22') <
+            snapStep.indexOf('sudo snap install --dangerous')
+    );
+    assert.ok(
+        snapStep.indexOf('sudo snap install gnome-3-28-1804') <
+            snapStep.indexOf('sudo snap install --dangerous')
+    );
+    assert.ok(
+        snapStep.indexOf('sudo snap install --dangerous') <
+            snapStep.indexOf('installed_x64=true')
+    );
+    assert.match(
+        snapStep,
+        /sudo snap connect iptvnator:graphics-core22 mesa-core22:graphics-core22/
+    );
+    assert.match(
+        snapStep,
+        /sudo snap connect iptvnator:gnome-3-28-1804 gnome-3-28-1804:gnome-3-28-1804/
+    );
+    assert.match(
+        snapStep,
+        /\$2 == "iptvnator:graphics-core22" && \$3 == "mesa-core22:graphics-core22"/
+    );
+    assert.match(
+        snapStep,
+        /\$2 == "iptvnator:gnome-3-28-1804" && \$3 == "gnome-3-28-1804:gnome-3-28-1804"/
+    );
+    assert.match(
+        snapStep,
+        /\$1 == "shared-memory" && \$2 == "iptvnator:shared-memory" && \$3 == ":shared-memory"/
+    );
+    assert.match(
+        snapStep,
+        /sudo snap disconnect iptvnator:graphics-core22 mesa-core22:graphics-core22/
+    );
+    assert.match(
+        snapStep,
+        /\$2 == "iptvnator:graphics-core22" && \$3 == "-" \{ found=1 \} END \{ exit !found \}/
+    );
+    assert.match(snapStep, /disconnected_probe="\$\(/);
+    assert.match(snapStep, /disconnected_status=\$\?/);
+    assert.match(snapStep, /test "\$\{disconnected_status\}" -eq 1/);
+    assert.ok(
+        snapStep.includes(
+            `grep -Fx '{"usable":false,"reason":"snap-graphics-provider-unavailable"}'`
+        )
+    );
+    const firstGraphicsConnect = snapStep.indexOf(
+        'sudo snap connect iptvnator:graphics-core22'
+    );
+    const graphicsDisconnect = snapStep.indexOf(
+        'sudo snap disconnect iptvnator:graphics-core22'
+    );
+    const secondGraphicsConnect = snapStep.indexOf(
+        'sudo snap connect iptvnator:graphics-core22',
+        firstGraphicsConnect + 1
+    );
+    assert.ok(firstGraphicsConnect < graphicsDisconnect);
+    assert.ok(graphicsDisconnect < snapStep.indexOf('disconnected_probe="$('));
+    assert.ok(
+        snapStep.indexOf('test "${disconnected_status}" -eq 1') <
+            secondGraphicsConnect
+    );
+    const firstRuntimeProbe = snapStep.indexOf(
+        'snap run iptvnator --embedded-mpv-runtime-probe'
+    );
+    const successfulRuntimeProbe = snapStep.lastIndexOf(
+        'snap run iptvnator --embedded-mpv-runtime-probe'
+    );
+    const graphicsConnectionAssertion = snapStep.indexOf(
+        '$2 == "iptvnator:graphics-core22" && $3 == "mesa-core22:graphics-core22"'
+    );
+    const gnomeConnectionAssertion = snapStep.indexOf(
+        '$2 == "iptvnator:gnome-3-28-1804" && $3 == "gnome-3-28-1804:gnome-3-28-1804"'
+    );
+    const sharedMemoryConnectionAssertion = snapStep.indexOf(
+        '$1 == "shared-memory" && $2 == "iptvnator:shared-memory" && $3 == ":shared-memory"'
+    );
+    assert.ok(firstRuntimeProbe < secondGraphicsConnect);
+    assert.ok(firstRuntimeProbe < successfulRuntimeProbe);
+    assert.ok(secondGraphicsConnect < successfulRuntimeProbe);
+    assert.ok(secondGraphicsConnect < graphicsConnectionAssertion);
+    assert.ok(graphicsConnectionAssertion < gnomeConnectionAssertion);
+    assert.ok(gnomeConnectionAssertion < sharedMemoryConnectionAssertion);
+    assert.ok(sharedMemoryConnectionAssertion < successfulRuntimeProbe);
+    assert.match(snapStep, /snap run iptvnator --embedded-mpv-runtime-probe/);
+    for (const traceSelector of [
+        'IPTVNATOR_TRACE_PLAYER=1',
+        'EGL_LOG_LEVEL=debug',
+        'LIBGL_DEBUG=verbose',
+    ]) {
+        assert.match(
+            snapStep.slice(secondGraphicsConnect),
+            new RegExp(traceSelector)
+        );
+    }
+    for (const hostileOverride of [
+        '__EGL_VENDOR_LIBRARY_FILENAMES',
+        'GBM_BACKEND',
+        'MESA_LOADER_DRIVER_OVERRIDE',
+        'LIBVA_DRIVER_NAME',
+        'VDPAU_DRIVER_PATH',
+        'VK_DRIVER_FILES',
+        'VK_ICD_FILENAMES',
+        'VK_ADD_DRIVER_FILES',
+        'VK_ADD_LAYER_PATH',
+        'VK_IMPLICIT_LAYER_PATH',
+        'VK_ADD_IMPLICIT_LAYER_PATH',
+        'XDG_CONFIG_HOME',
+        'XDG_CONFIG_DIRS',
+        'XDG_DATA_HOME',
+        'XDG_DATA_DIRS',
+    ]) {
+        assert.match(
+            snapStep.slice(secondGraphicsConnect),
+            new RegExp(`${hostileOverride}=/tmp/hostile`)
+        );
+    }
+    assert.doesNotMatch(snapStep, /snap run --shell/);
+    assert.doesNotMatch(snapStep, /iptvnator_mpv_helper/);
+    assert.doesNotMatch(snapStep, /LD_LIBRARY_PATH/);
+});
+
+test('dedicated packaged x64 smoke cannot silently skip', () => {
+    const e2eProject = JSON.parse(
+        fs.readFileSync(
+            path.join(
+                workspaceRoot,
+                'apps',
+                'electron-backend-e2e',
+                'project.json'
+            ),
+            'utf8'
+        )
+    );
+    assert.deepEqual(
+        e2eProject.targets?.['packaged-frame-copy-smoke']?.dependsOn,
+        ['test-packaged-frame-copy-fixtures']
+    );
+    const linuxDependencies = workflowStep('Install Linux system dependencies');
+    assert.match(linuxDependencies, /--no-install-recommends/);
+    assert.match(linuxDependencies, /^\s+libgl-dev\s*\\?$/m);
+    assert.doesNotMatch(linuxDependencies, /\blibopengl-dev\b/);
+    assert.match(linuxDependencies, /^\s+xauth\s*\\?$/m);
+    assert.match(linuxDependencies, /^\s+xvfb\s*\\?$/m);
+    const packagedSmoke = workflowStep(
+        'Run packaged x64 frame-copy and fallback smoke'
+    );
+    assert.match(
+        packagedSmoke,
+        /IPTVNATOR_E2E_REQUIRE_PACKAGED_FRAME_COPY: '1'/
+    );
+    assert.match(
+        packagedSmoke,
+        /IPTVNATOR_E2E_PACKAGED_EXECUTABLE: \$\{\{ github\.workspace \}\}\/dist\/executables\/linux-unpacked\/iptvnator/
+    );
+    assert.match(
+        packagedSmoke,
+        /electron-backend-e2e:packaged-frame-copy-smoke/
+    );
+    const hardwareDiagnostic = workflowStep(
+        'Diagnose packaged x64 frame-copy hardware path'
+    );
+    assert.match(hardwareDiagnostic, /continue-on-error: true/);
+    assert.match(hardwareDiagnostic, /\/dev\/dri\/renderD128/);
+    assert.match(
+        hardwareDiagnostic,
+        /IPTVNATOR_E2E_REQUIRE_PACKAGED_FRAME_COPY: '1'/
+    );
+    assert.doesNotMatch(hardwareDiagnostic, /LIBGL_ALWAYS_SOFTWARE/);
+});
+
+test('draft release consumes split Linux artifacts and source compliance', () => {
+    for (const artifactName of [
+        'linux-system-artifacts',
+        'linux-portable-artifacts',
+        'linux-flatpak-artifacts',
+        'linux-frame-copy-runtime-sources',
+    ]) {
+        assert.match(buildWorkflow, new RegExp(artifactName));
+    }
+    const systemUpload = workflowStep('Upload system-runtime Linux artifacts');
+    for (const artifactGlob of [
+        'dist/executables/*.deb',
+        'dist/executables/*.rpm',
+        'dist/executables/*.pacman',
+        'dist/executables/*.pkg.tar.*',
+    ]) {
+        assert.ok(systemUpload.includes(artifactGlob));
+    }
+    const portableUpload = workflowStep(
+        'Upload portable-runtime Linux artifacts'
+    );
+    for (const artifactGlob of [
+        'dist/executables/*.AppImage',
+        'dist/executables/*.snap',
+        'dist/executables/**/latest-linux*.yml',
+        'dist/executables/**/*.blockmap',
+    ]) {
+        assert.ok(portableUpload.includes(artifactGlob));
+    }
+    assert.ok(
+        workflowStep('Upload Flatpak-runtime Linux artifacts').includes(
+            'dist/executables/**/*.flatpak'
+        )
+    );
+    const release = workflowStep('Create Draft Release');
+    for (const releasePath of [
+        'artifacts/linux-system-artifacts/*.deb',
+        'artifacts/linux-system-artifacts/*.rpm',
+        'artifacts/linux-system-artifacts/*.pacman',
+        'artifacts/linux-system-artifacts/*.pkg.tar.*',
+        'artifacts/linux-portable-artifacts/*.AppImage',
+        'artifacts/linux-portable-artifacts/*.snap',
+        'artifacts/linux-flatpak-artifacts/*.flatpak',
+        'artifacts/linux-frame-copy-runtime-sources/linux-frame-copy-runtime-sources.tar.xz',
+    ]) {
+        assert.ok(release.includes(releasePath));
+    }
+    assert.doesNotMatch(buildWorkflow, /^ {4}publish-snap:/m);
+});
diff --git a/tools/packaging/electron-after-pack.cjs b/tools/packaging/electron-after-pack.cjs
index 0fe49457e..5f7800cc3 100644
--- a/tools/packaging/electron-after-pack.cjs
+++ b/tools/packaging/electron-after-pack.cjs
@@ -4,8 +4,15 @@ const {
     resolveElectronBuilderArchName,
     validatePackagedEmbeddedMpv,
 } = require('./embedded-mpv-packaging.cjs');
+const {
+    resolveLinuxFrameCopyProfile,
+    validateLinuxProfileTargets,
+} = require('./linux-frame-copy-profile.cjs');
 const fs = require('fs');
 const path = require('path');
+const {
+    preparePackagedFrameCopyArtifacts,
+} = require('./embedded-mpv-frame-copy-files.cjs');
 
 function log(message) {
     console.log(`  - ${message}`);
@@ -19,7 +26,12 @@ function isTruthy(value) {
     );
 }
 
-function copyEmbeddedMpvNativeOutput(resourceDir, projectDir) {
+function copyEmbeddedMpvNativeOutput(
+    resourceDir,
+    projectDir,
+    platform,
+    preparationOptions
+) {
     const sourceDir = path.join(
         projectDir,
         'dist',
@@ -41,6 +53,25 @@ function copyEmbeddedMpvNativeOutput(resourceDir, projectDir) {
 
     fs.rmSync(destinationDir, { recursive: true, force: true });
     fs.cpSync(sourceDir, destinationDir, { recursive: true });
+
+    const resolvedPreparationOptions =
+        platform === 'linux' && preparationOptions
+            ? {
+                  ...preparationOptions,
+                  noticeSourceDir: path.join(
+                      projectDir,
+                      'vendor',
+                      'embedded-mpv',
+                      'linux-x64',
+                      'notices'
+                  ),
+              }
+            : preparationOptions;
+    return preparePackagedFrameCopyArtifacts(
+        destinationDir,
+        platform,
+        resolvedPreparationOptions
+    );
 }
 
 function writeEmbeddedMpvUnavailableMarker(resourceDir, targetArch) {
@@ -59,12 +90,129 @@ function writeEmbeddedMpvUnavailableMarker(resourceDir, targetArch) {
     );
 }
 
-async function afterPackHook(params) {
-    await linuxAfterPack(params);
+function resolveLinuxFrameCopyPackagingContext(
+    params,
+    {
+        required = isTruthy(process.env.IPTVNATOR_REQUIRE_EMBEDDED_MPV),
+        environment = process.env,
+    } = {}
+) {
+    if (params.electronPlatformName !== 'linux') {
+        return null;
+    }
 
+    const targetArch = resolveElectronBuilderArchName(params.arch);
+    if (!targetArch) {
+        throw new Error(
+            `Unknown Electron Builder architecture: ${String(params.arch)}.`
+        );
+    }
+    const targetNames = [];
+    for (const target of params.targets ?? []) {
+        const targetName = String(target?.name ?? '')
+            .trim()
+            .toLowerCase();
+        if (!targetName) {
+            throw new Error(
+                'Linux Electron Builder targets must expose a non-empty name.'
+            );
+        }
+        if (targetNames.includes(targetName)) {
+            throw new Error(
+                `Linux Electron Builder target "${targetName}" is duplicated.`
+            );
+        }
+        targetNames.push(targetName);
+    }
+    if (targetNames.length === 0) {
+        throw new Error(
+            'Linux Electron Builder must provide at least one packaging target.'
+        );
+    }
+
+    // Official Linux frame-copy artifacts are intentionally x64-only. Do not
+    // let a caller-provided build-arch environment value promote an ARM
+    // package to a supported layout: every non-x64 target must remain the
+    // marker-only native-view fallback.
+    const foreignArch = targetArch !== 'x64';
+    const profileValue =
+        environment.IPTVNATOR_LINUX_FRAME_COPY_PROFILE?.trim() ?? '';
+    if (!profileValue) {
+        if (required && targetArch === 'x64') {
+            resolveLinuxFrameCopyProfile(profileValue);
+        }
+        return {
+            targetArch,
+            foreignArch,
+            targetNames,
+            profile: null,
+        };
+    }
+
+    const profile = resolveLinuxFrameCopyProfile(profileValue);
+    const targetErrors = validateLinuxProfileTargets(profile.name, targetNames);
+    if (targetErrors.length > 0) {
+        throw new Error(targetErrors.join('\n'));
+    }
+    return {
+        targetArch,
+        foreignArch,
+        targetNames,
+        profile,
+    };
+}
+
+function ensureSnapGraphicsContentMount(appOutDir, targetNames) {
+    if (!targetNames.includes('snap')) {
+        return null;
+    }
+
+    const mountPath = path.join(appOutDir, 'graphics');
+    if (!fs.existsSync(mountPath)) {
+        fs.mkdirSync(mountPath, { mode: 0o755 });
+    }
+    const stat = fs.lstatSync(mountPath);
+    if (!stat.isDirectory() || stat.isSymbolicLink()) {
+        throw new Error(
+            `Snap graphics content mount must be a real empty directory: ${mountPath}`
+        );
+    }
+    if (fs.readdirSync(mountPath).length > 0) {
+        throw new Error(
+            `Snap graphics content mount directory must be empty: ${mountPath}`
+        );
+    }
+    fs.chmodSync(mountPath, 0o755);
+    return mountPath;
+}
+
+async function afterPackHook(params) {
     const requireEmbeddedMpv = isTruthy(
         process.env.IPTVNATOR_REQUIRE_EMBEDDED_MPV
     );
+    const linuxPackagingContext = resolveLinuxFrameCopyPackagingContext(
+        params,
+        {
+            required: requireEmbeddedMpv,
+            environment: process.env,
+        }
+    );
+
+    await linuxAfterPack(params, {
+        targetNames: linuxPackagingContext?.targetNames,
+    });
+    if (linuxPackagingContext) {
+        const graphicsMountPath = ensureSnapGraphicsContentMount(
+            params.appOutDir,
+            linuxPackagingContext.targetNames
+        );
+        if (graphicsMountPath) {
+            log(
+                `prepared empty Snap graphics content mount at ${graphicsMountPath}`
+            );
+        }
+    }
+
     log(
         requireEmbeddedMpv
             ? `validating required embedded MPV ${params.electronPlatformName} runtime`
@@ -72,12 +220,11 @@ async function afterPackHook(params) {
     );
     const resourceDir = getResourceDir(params);
 
-    const foreignArch = isForeignLinuxEmbeddedMpvArch(
-        params.electronPlatformName,
-        params.arch
-    );
+    const foreignArch =
+        linuxPackagingContext?.foreignArch ??
+        isForeignLinuxEmbeddedMpvArch(params.electronPlatformName, params.arch);
     if (foreignArch) {
-        const targetArch = resolveElectronBuilderArchName(params.arch);
+        const targetArch = linuxPackagingContext.targetArch;
         log(
             `embedded MPV addon is not built for ${targetArch}; packaging an unavailable marker instead`
         );
@@ -85,7 +232,14 @@ async function afterPackHook(params) {
     } else {
         copyEmbeddedMpvNativeOutput(
             resourceDir,
-            params.packager.projectDir ?? process.cwd()
+            params.packager.projectDir ?? process.cwd(),
+            params.electronPlatformName,
+            linuxPackagingContext
+                ? {
+                      profile: linuxPackagingContext.profile?.name,
+                      targetNames: linuxPackagingContext.targetNames,
+                  }
+                : undefined
         );
     }
 
@@ -93,6 +247,10 @@ async function afterPackHook(params) {
         platform: params.electronPlatformName,
         required: requireEmbeddedMpv,
         foreignArch,
+        targetArch: linuxPackagingContext?.targetArch,
+        profile: linuxPackagingContext?.profile?.name,
+        targetNames: linuxPackagingContext?.targetNames,
+        executableName: params.packager.executableName,
     });
 
     if (errors.length > 0) {
@@ -130,3 +288,8 @@ function getResourceDir(params) {
 }
 
 module.exports = afterPackHook;
+module.exports.ensureSnapGraphicsContentMount = ensureSnapGraphicsContentMount;
+module.exports.resolveLinuxFrameCopyPackagingContext =
+    resolveLinuxFrameCopyPackagingContext;
+module.exports.writeEmbeddedMpvUnavailableMarker =
+    writeEmbeddedMpvUnavailableMarker;
diff --git a/tools/packaging/electron-package-identity.test.mjs b/tools/packaging/electron-package-identity.test.mjs
index 4edcd317b..cbdc9c0cc 100644
--- a/tools/packaging/electron-package-identity.test.mjs
+++ b/tools/packaging/electron-package-identity.test.mjs
@@ -56,10 +56,18 @@ const packageLayoutVerifier = fs.readFileSync(
     join(currentDir, 'verify-electron-package-layout.mjs'),
     'utf8'
 );
+const flatpakLauncherValidationSource = fs.readFileSync(
+    join(currentDir, 'flatpak-launcher-validation.cjs'),
+    'utf8'
+);
 const electronAfterPackSource = fs.readFileSync(
     join(currentDir, 'electron-after-pack.cjs'),
     'utf8'
 );
+const frameCopyFilesModulePath = join(
+    currentDir,
+    'embedded-mpv-frame-copy-files.cjs'
+);
 const embeddedMpvPackagingSource = fs.readFileSync(
     join(currentDir, 'embedded-mpv-packaging.cjs'),
     'utf8'
@@ -98,6 +106,37 @@ const embeddedMpvWin32Source = fs.readFileSync(
 );
 const { validatePackagedEmbeddedMpv } = require('./embedded-mpv-packaging.cjs');
 
+function writeWindowsHelperFixture(helperPath, importedDllName) {
+    const peOffset = 0x80;
+    const optionalHeaderOffset = peOffset + 24;
+    const optionalHeaderSize = 0xf0;
+    const sectionTableOffset = optionalHeaderOffset + optionalHeaderSize;
+    const importRva = 0x1000;
+    const importRawOffset = 0x200;
+    const importNameOffset = 0x30;
+    const image = Buffer.alloc(0x400);
+
+    image.write('MZ', 0, 'ascii');
+    image.writeUInt32LE(peOffset, 0x3c);
+    image.write('PE\0\0', peOffset, 'ascii');
+    image.writeUInt16LE(0x8664, peOffset + 4);
+    image.writeUInt16LE(1, peOffset + 6);
+    image.writeUInt16LE(optionalHeaderSize, peOffset + 20);
+    image.writeUInt16LE(0x20b, optionalHeaderOffset);
+    image.writeUInt32LE(0x200, optionalHeaderOffset + 60);
+    image.writeUInt32LE(16, optionalHeaderOffset + 108);
+    image.writeUInt32LE(importRva, optionalHeaderOffset + 120);
+    image.writeUInt32LE(40, optionalHeaderOffset + 124);
+    image.write('.idata\0\0', sectionTableOffset, 'ascii');
+    image.writeUInt32LE(0x200, sectionTableOffset + 8);
+    image.writeUInt32LE(importRva, sectionTableOffset + 12);
+    image.writeUInt32LE(0x200, sectionTableOffset + 16);
+    image.writeUInt32LE(importRawOffset, sectionTableOffset + 20);
+    image.writeUInt32LE(importRva + importNameOffset, importRawOffset + 12);
+    image.write(`${importedDllName}\0`, importRawOffset + importNameOffset);
+    fs.writeFileSync(helperPath, image);
+}
+
 test('Linux package identity does not expose the internal Electron backend project name', () => {
     assert.equal(electronBuilderConfig.productName, 'IPTVnator');
     assert.equal(electronBuilderConfig.extraMetadata?.name, 'iptvnator');
@@ -115,8 +154,10 @@ test('Linux package identity does not expose the internal Electron backend proje
 });
 
 test('GitHub Releases auto-update metadata is generated and uploaded', () => {
+    // \r?\n keeps this host-agnostic: Windows checkouts with autocrlf see
+    // CRLF in the workflow file.
     const releaseFiles = buildAndMakeWorkflow.match(
-        /files: \|\n([\s\S]*?)\n\s+env:/
+        /files: \|\r?\n([\s\S]*?)\r?\n\s+env:/
     )?.[1];
 
     assert.ok(releaseFiles, 'release upload files block must exist');
@@ -159,7 +200,7 @@ test('GitHub Releases auto-update metadata is generated and uploaded', () => {
     );
     assert.match(
         buildAndMakeWorkflow,
-        /artifacts\/linux-artifacts\/latest-linux\*\.yml/
+        /artifacts\/linux-portable-artifacts\/latest-linux\*\.yml/
     );
     assert.match(
         buildAndMakeWorkflow,
@@ -261,6 +302,104 @@ test('package layout verifier uses canonical helpers and direct dependencies', (
         packageLayoutVerifier,
         /builderEffectiveConfigPath && fileExists\(builderEffectiveConfigPath\)/
     );
+    assert.match(packageLayoutVerifier, /IPTVNATOR_LINUX_FRAME_COPY_PROFILE/);
+    assert.match(packageLayoutVerifier, /profile:\s*linuxFrameCopyProfile/);
+    assert.match(packageLayoutVerifier, /targetNames:\s*linuxTargetNames/);
+    assert.match(
+        packageLayoutVerifier,
+        /validateLinuxProfileTargets\(\s*linuxFrameCopyProfile,\s*linuxTargetNames\s*\)/s
+    );
+    assert.match(packageLayoutVerifier, /dirArch !== 'x64'/);
+    assert.doesNotMatch(packageLayoutVerifier, /getEmbeddedMpvAddonArch/);
+    assert.match(electronAfterPackSource, /targetArch !== 'x64'/);
+    assert.match(
+        packageLayoutVerifier,
+        /const\s*{\s*resolveLinuxLauncherLayout\s*}\s*=\s*require\(['"]\.\/linux-launcher-layout\.cjs['"]\)/
+    );
+    assert.match(
+        packageLayoutVerifier,
+        /const\s*{\s*validateFlatpakLauncher\s*,?\s*}\s*=\s*require\(['"]\.\/flatpak-launcher-validation\.cjs['"]\)/
+    );
+    assert.match(
+        packageLayoutVerifier,
+        /function verifyLinuxLauncher\(\s*resourceDir,\s*targetNames,\s*errors\s*\)/
+    );
+    assert.match(
+        packageLayoutVerifier,
+        /resolveLinuxLauncherLayout\(\s*targetNames,\s*linuxExecutableName\s*\)/
+    );
+    assert.match(
+        packageLayoutVerifier,
+        /verifyLinuxLauncher\(\s*resourceDir,\s*linuxTargetNames,\s*errors\s*\)/
+    );
+
+    const launcherVerifier = packageLayoutVerifier.match(
+        /function verifyLinuxLauncher\([\s\S]*?\n}\n\nfunction verifyFlatpakPermissions/
+    )?.[0];
+    assert.ok(launcherVerifier);
+    assert.ok(
+        launcherVerifier.indexOf('resolveLinuxLauncherLayout(') <
+            launcherVerifier.indexOf('const launcherBinaryPath')
+    );
+    assert.match(
+        launcherVerifier,
+        /if \(!launcherLayout\.wrapperRequired\) \{\s*errors\.push\(\s*\.\.\.validateFlatpakLauncher\(\s*appDir,\s*linuxExecutableName\s*\)\s*\);\s*return;\s*\}\s*const launcherBinaryPath[\s\S]*?fs\.readFileSync\(launcherPath,\s*['"]utf8['"]\)/
+    );
+});
+
+test('Flatpak launcher validation locks descriptor-based ELF inspection', () => {
+    assert.match(
+        flatpakLauncherValidationSource,
+        /const expectedElfMagic = Buffer\.from\(\[\s*0x7f,\s*0x45,\s*0x4c,\s*0x46,?\s*\]\)/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /descriptor = fs\.openSync\(\s*launcherPath,\s*fs\.constants\.O_RDONLY\s*\|\s*fs\.constants\.O_NOFOLLOW\s*\)/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /launcherStat = fs\.fstatSync\(descriptor\)/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /const elfMagic = Buffer\.alloc\(expectedElfMagic\.length\)/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /bytesRead = fs\.readSync\(\s*descriptor,\s*elfMagic,\s*0,\s*elfMagic\.length,\s*0\s*\)/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /bytesRead !== expectedElfMagic\.length/
+    );
+    assert.match(
+        flatpakLauncherValidationSource,
+        /finally\s*{\s*try\s*{\s*fs\.closeSync\(descriptor\)/
+    );
+
+    const openOffset = flatpakLauncherValidationSource.indexOf(
+        'descriptor = fs.openSync('
+    );
+    const statOffset = flatpakLauncherValidationSource.indexOf(
+        'launcherStat = fs.fstatSync(descriptor)'
+    );
+    const readOffset = flatpakLauncherValidationSource.indexOf(
+        'bytesRead = fs.readSync('
+    );
+    const finallyOffset = flatpakLauncherValidationSource.indexOf(
+        '} finally {',
+        readOffset
+    );
+    const closeOffset = flatpakLauncherValidationSource.indexOf(
+        'fs.closeSync(descriptor)',
+        finallyOffset
+    );
+    assert.ok(
+        openOffset < statOffset &&
+            statOffset < readOffset &&
+            readOffset < finallyOffset &&
+            finallyOffset < closeOffset
+    );
 });
 
 test('nx-electron packaging does not copy duplicate root package metadata', () => {
@@ -293,6 +432,19 @@ test('embedded MPV runtime binaries are unpacked on every supported desktop plat
     }
 });
 
+test('embedded MPV native payload is owned exclusively by afterPack outside app.asar', () => {
+    assert.ok(
+        electronBuilderConfig.files.includes(
+            '!electron-backend/native{,/**/*}'
+        ),
+        'electron-builder files must exclude the entire pre-afterPack native payload from app.asar'
+    );
+    assert.match(
+        packageLayoutVerifier,
+        /collectEmbeddedMpvNativeArchiveEntries/
+    );
+});
+
 test('embedded MPV package validation accepts Windows runtime files and Linux process isolation', () => {
     const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'iptvnator-mpv-package-'));
 
@@ -300,10 +452,16 @@ test('embedded MPV package validation accepts Windows runtime files and Linux pr
         for (const [platform, runtimeFile] of [
             ['windows', 'mpv-2.dll'],
             ['windows', 'libmpv-2.dll'],
-            ['windows', join('lib', 'mpv.dll')],
-            ['windows', join('lib', 'libmpv.dll')],
+            ['windows', 'mpv.dll'],
+            ['windows', 'libmpv.dll'],
         ]) {
-            const resourceDir = join(tempDir, platform);
+            // One fixture dir per runtime-file scenario: the frame-copy
+            // artifacts written below must not leak into the next
+            // iteration's missing-artifact assertions.
+            const resourceDir = join(
+                tempDir,
+                `${platform}-${runtimeFile.replace(/[\\/]/g, '_')}`
+            );
             const nativeDir = join(
                 resourceDir,
                 'app.asar.unpacked',
@@ -318,6 +476,32 @@ test('embedded MPV package validation accepts Windows runtime files and Linux pr
             );
             fs.writeFileSync(join(nativeDir, runtimeFile), '');
 
+            // Windows packages that ship the addon must also ship the
+            // frame-copy engine artifacts built by the same binding.gyp run.
+            const missingWindowsFrameCopyErrors = validatePackagedEmbeddedMpv(
+                resourceDir,
+                { platform, required: true }
+            );
+            assert.ok(
+                missingWindowsFrameCopyErrors.some((error) =>
+                    error.includes('iptvnator_mpv_helper.exe')
+                )
+            );
+            assert.ok(
+                missingWindowsFrameCopyErrors.some((error) =>
+                    error.includes('embedded_mpv_frame_reader.node')
+                )
+            );
+
+            writeWindowsHelperFixture(
+                join(nativeDir, 'iptvnator_mpv_helper.exe'),
+                runtimeFile
+            );
+            fs.writeFileSync(
+                join(nativeDir, 'embedded_mpv_frame_reader.node'),
+                ''
+            );
+
             assert.deepEqual(
                 validatePackagedEmbeddedMpv(resourceDir, {
                     platform,
@@ -327,6 +511,57 @@ test('embedded MPV package validation accepts Windows runtime files and Linux pr
             );
         }
 
+        const darwinResourceDir = join(tempDir, 'darwin');
+        const darwinNativeDir = join(
+            darwinResourceDir,
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        fs.mkdirSync(join(darwinNativeDir, 'lib'), { recursive: true });
+        fs.writeFileSync(join(darwinNativeDir, 'embedded_mpv.node'), '');
+        fs.writeFileSync(
+            join(darwinNativeDir, 'embedded-mpv-runtime.json'),
+            JSON.stringify({ origin: 'vendored-lgpl' })
+        );
+        fs.writeFileSync(join(darwinNativeDir, 'lib', 'libmpv.2.dylib'), '');
+
+        // macOS packages that ship the addon must also ship the frame-copy
+        // engine artifacts built by the same binding.gyp run.
+        const missingFrameCopyErrors = validatePackagedEmbeddedMpv(
+            darwinResourceDir,
+            { platform: 'darwin', required: true }
+        );
+        assert.ok(
+            missingFrameCopyErrors.some((error) =>
+                error.includes('iptvnator_mpv_helper')
+            )
+        );
+        assert.ok(
+            missingFrameCopyErrors.some((error) =>
+                error.includes('embedded_mpv_frame_reader.node')
+            )
+        );
+
+        fs.writeFileSync(join(darwinNativeDir, 'iptvnator_mpv_helper'), '');
+        fs.writeFileSync(
+            join(darwinNativeDir, 'embedded_mpv_frame_reader.node'),
+            ''
+        );
+        // Host-agnostic assertion: on non-macOS hosts the validator also
+        // reports that link validation needs a macOS host, so only the
+        // frame-copy artifact requirement is asserted here.
+        const remainingErrors = validatePackagedEmbeddedMpv(darwinResourceDir, {
+            platform: 'darwin',
+            required: true,
+        });
+        assert.ok(
+            !remainingErrors.some((error) =>
+                error.includes('frame-copy artifact')
+            ),
+            `unexpected frame-copy errors: ${remainingErrors.join('; ')}`
+        );
+
         const linuxResourceDir = join(tempDir, 'linux');
         const linuxNativeDir = join(
             linuxResourceDir,
@@ -338,13 +573,24 @@ test('embedded MPV package validation accepts Windows runtime files and Linux pr
         fs.writeFileSync(join(linuxNativeDir, 'embedded_mpv.node'), '');
         fs.writeFileSync(
             join(linuxNativeDir, 'embedded-mpv-runtime.json'),
-            JSON.stringify({ origin: 'external-mpv-process' })
+            JSON.stringify({
+                schemaVersion: 1,
+                origin: 'external-mpv-process',
+                platform: 'linux',
+                arch: 'x64',
+                runtimeMode: 'native-view-only',
+                frameCopyAvailable: false,
+                artifacts: {
+                    addon: 'embedded_mpv.node',
+                },
+                nativeViewFallback: 'process-isolated mpv --wid',
+            })
         );
 
         assert.deepEqual(
             validatePackagedEmbeddedMpv(linuxResourceDir, {
                 platform: 'linux',
-                required: true,
+                required: false,
             }),
             []
         );
@@ -353,6 +599,138 @@ test('embedded MPV package validation accepts Windows runtime files and Linux pr
     }
 });
 
+test('Windows frame-copy packages reject an mpv DLL that exists only under native/lib', () => {
+    const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'iptvnator-mpv-package-'));
+
+    try {
+        for (const runtimeFile of [
+            'mpv-2.dll',
+            'libmpv-2.dll',
+            'mpv.dll',
+            'libmpv.dll',
+        ]) {
+            const resourceDir = join(tempDir, runtimeFile);
+            const nativeDir = join(
+                resourceDir,
+                'app.asar.unpacked',
+                'electron-backend',
+                'native'
+            );
+            fs.mkdirSync(join(nativeDir, 'lib'), { recursive: true });
+            fs.writeFileSync(join(nativeDir, 'embedded_mpv.node'), '');
+            fs.writeFileSync(
+                join(nativeDir, 'embedded-mpv-runtime.json'),
+                JSON.stringify({ origin: 'vendored-lgpl' })
+            );
+            writeWindowsHelperFixture(
+                join(nativeDir, 'iptvnator_mpv_helper.exe'),
+                runtimeFile
+            );
+            fs.writeFileSync(
+                join(nativeDir, 'embedded_mpv_frame_reader.node'),
+                ''
+            );
+            fs.writeFileSync(join(nativeDir, 'lib', runtimeFile), '');
+
+            const errors = validatePackagedEmbeddedMpv(resourceDir, {
+                platform: 'windows',
+                required: true,
+            });
+
+            assert.ok(
+                errors.some(
+                    (error) =>
+                        error.includes(
+                            'beside the Windows frame-copy helper'
+                        ) && error.includes(nativeDir)
+                ),
+                `${runtimeFile} under native/lib must not satisfy the helper DLL requirement: ${errors.join('; ')}`
+            );
+        }
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+
+test('Windows frame-copy packages require the DLL imported by the helper', () => {
+    const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'iptvnator-mpv-package-'));
+
+    try {
+        const nativeDir = join(
+            tempDir,
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        fs.mkdirSync(nativeDir, { recursive: true });
+        fs.writeFileSync(join(nativeDir, 'embedded_mpv.node'), '');
+        fs.writeFileSync(
+            join(nativeDir, 'embedded-mpv-runtime.json'),
+            JSON.stringify({ origin: 'vendored-lgpl' })
+        );
+        writeWindowsHelperFixture(
+            join(nativeDir, 'iptvnator_mpv_helper.exe'),
+            'mpv-2.dll'
+        );
+        fs.writeFileSync(join(nativeDir, 'embedded_mpv_frame_reader.node'), '');
+        fs.writeFileSync(join(nativeDir, 'libmpv.dll'), '');
+
+        const errors = validatePackagedEmbeddedMpv(tempDir, {
+            platform: 'windows',
+            required: true,
+        });
+
+        assert.ok(
+            errors.some(
+                (error) =>
+                    error.includes('imports mpv-2.dll') &&
+                    error.includes(join(nativeDir, 'mpv-2.dll'))
+            ),
+            `a different accepted DLL must not satisfy the helper import: ${errors.join('; ')}`
+        );
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+
+test('Windows frame-copy package validation fails closed for a malformed helper', () => {
+    const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'iptvnator-mpv-package-'));
+
+    try {
+        const nativeDir = join(
+            tempDir,
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        fs.mkdirSync(nativeDir, { recursive: true });
+        fs.writeFileSync(join(nativeDir, 'embedded_mpv.node'), '');
+        fs.writeFileSync(
+            join(nativeDir, 'embedded-mpv-runtime.json'),
+            JSON.stringify({ origin: 'vendored-lgpl' })
+        );
+        fs.writeFileSync(join(nativeDir, 'iptvnator_mpv_helper.exe'), 'MZ');
+        fs.writeFileSync(join(nativeDir, 'embedded_mpv_frame_reader.node'), '');
+        fs.writeFileSync(join(nativeDir, 'mpv-2.dll'), '');
+
+        const errors = validatePackagedEmbeddedMpv(tempDir, {
+            platform: 'windows',
+            required: true,
+        });
+
+        assert.ok(
+            errors.some((error) =>
+                error.includes(
+                    'Unable to inspect Windows frame-copy helper imports'
+                )
+            ),
+            `malformed helper must fail package validation: ${errors.join('; ')}`
+        );
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+
 test('Windows embedded MPV staging preserves import-library DLL basenames', () => {
     assert.match(
         embeddedMpvStageRuntimeSource,
@@ -404,10 +782,71 @@ test('embedded MPV packaging helpers use a cross-platform module name', () => {
     );
 });
 
+test('frame-copy packaging file operations enforce modes and remove stale artifacts', () => {
+    assert.ok(
+        fs.existsSync(frameCopyFilesModulePath),
+        'shared frame-copy packaging file helper must exist'
+    );
+    const {
+        preparePackagedFrameCopyArtifacts,
+        removeStaleFrameCopyArtifacts,
+    } = require(frameCopyFilesModulePath);
+    const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'impv-fc-files-'));
+
+    try {
+        const helperPath = join(tempDir, 'iptvnator_mpv_helper');
+        const windowsHelperPath = join(tempDir, 'iptvnator_mpv_helper.exe');
+        const readerPath = join(tempDir, 'embedded_mpv_frame_reader.node');
+        fs.writeFileSync(helperPath, '#!/bin/sh\n');
+        fs.chmodSync(helperPath, 0o644);
+        fs.writeFileSync(windowsHelperPath, 'exe');
+        fs.writeFileSync(readerPath, 'reader');
+
+        if (process.platform !== 'win32') {
+            preparePackagedFrameCopyArtifacts(tempDir, 'darwin');
+            assert.notEqual(
+                fs.statSync(helperPath).mode & 0o111,
+                0,
+                'macOS helper must be executable after packaging'
+            );
+        }
+
+        preparePackagedFrameCopyArtifacts(tempDir, 'linux');
+        assert.equal(
+            fs.existsSync(helperPath),
+            false,
+            'Linux packages must omit the unsupported frame-copy helper'
+        );
+        assert.equal(
+            fs.existsSync(windowsHelperPath),
+            false,
+            'Linux packages must omit stale Windows frame-copy helpers too'
+        );
+
+        fs.writeFileSync(helperPath, '#!/bin/sh\n');
+        removeStaleFrameCopyArtifacts(tempDir);
+        assert.equal(fs.existsSync(helperPath), false);
+        assert.equal(fs.existsSync(windowsHelperPath), false);
+        assert.equal(fs.existsSync(readerPath), false);
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
+
 test('Windows CI packages embedded MPV from a staged x64 runtime', () => {
     const requireEmbeddedMpvLines = buildAndMakeWorkflow
         .split(/\r?\n/)
         .filter((line) => line.includes('IPTVNATOR_REQUIRE_EMBEDDED_MPV:'));
+    const defaultRuntimeUrls = [
+        ...buildAndMakeWorkflow.matchAll(
+            /IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_URL:\s+(\S+)/g
+        ),
+    ].map((match) => match[1]);
+    const defaultRuntimeSha256s = [
+        ...buildAndMakeWorkflow.matchAll(
+            /IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_SHA256:\s+([a-f0-9]{64})/g
+        ),
+    ].map((match) => match[1]);
 
     assert.equal(
         packageMetadata.scripts?.['embedded-mpv:stage-runtime:windows-archive'],
@@ -430,6 +869,16 @@ test('Windows CI packages embedded MPV from a staged x64 runtime', () => {
         buildAndMakeWorkflow,
         /IPTVNATOR_DEFAULT_WINDOWS_EMBEDDED_MPV_RUNTIME_URL: https:\/\/github\.com\/zhongfly\/mpv-winbuild\/releases\/download\//
     );
+    assert.deepEqual(
+        [...new Set(defaultRuntimeUrls)],
+        [
+            'https://github.com/zhongfly/mpv-winbuild/releases/download/2026-07-17-94335ab87a/mpv-dev-lgpl-x86_64-20260717-git-94335ab87a.7z',
+        ]
+    );
+    assert.deepEqual(
+        [...new Set(defaultRuntimeSha256s)],
+        ['6014aa0e6d8e98cdba90f5288295a7105d7d14ab0ca906f51465eeb478d5fea0']
+    );
     assert.match(buildAndMakeWorkflow, /refs\/tags\/v\*/);
     assert.match(
         buildAndMakeWorkflow,
@@ -514,3 +963,36 @@ test('embedded MPV package validation rejects bundled Linux libmpv', () => {
         fs.rmSync(tempDir, { recursive: true, force: true });
     }
 });
+
+test('embedded MPV package validation rejects frame-copy helpers in Linux packages', () => {
+    const tempDir = fs.mkdtempSync(join(os.tmpdir(), 'iptvnator-mpv-package-'));
+
+    try {
+        const nativeDir = join(
+            tempDir,
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        fs.mkdirSync(nativeDir, { recursive: true });
+        fs.writeFileSync(join(nativeDir, 'embedded_mpv.node'), '');
+        fs.writeFileSync(
+            join(nativeDir, 'embedded-mpv-runtime.json'),
+            JSON.stringify({ origin: 'external-mpv-process' })
+        );
+        fs.writeFileSync(join(nativeDir, 'iptvnator_mpv_helper'), '');
+        fs.writeFileSync(join(nativeDir, 'iptvnator_mpv_helper.exe'), '');
+
+        const errors = validatePackagedEmbeddedMpv(tempDir, {
+            platform: 'linux',
+            required: true,
+        });
+
+        const message = errors.join('\n');
+        assert.match(message, /must not ship frame-copy helpers/);
+        assert.match(message, /iptvnator_mpv_helper\n/);
+        assert.match(message, /iptvnator_mpv_helper\.exe/);
+    } finally {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+});
diff --git a/tools/packaging/embedded-mpv-arch.test.mjs b/tools/packaging/embedded-mpv-arch.test.mjs
index 863f7a3af..1b4f56c17 100644
--- a/tools/packaging/embedded-mpv-arch.test.mjs
+++ b/tools/packaging/embedded-mpv-arch.test.mjs
@@ -1,19 +1,1326 @@
 import assert from 'node:assert/strict';
+import crypto from 'node:crypto';
 import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import os from 'node:os';
-import { join } from 'node:path';
+import { basename, dirname, join } from 'node:path';
 import test from 'node:test';
 
 const require = createRequire(import.meta.url);
+const {
+    DEFAULT_SYSTEM_PKG_CONFIG_DIRS,
+    EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES,
+    MINIMUM_TOOL_VERSIONS,
+    REQUIRED_TOOLS,
+    SOURCE_PACKAGES,
+    createLinuxRuntimeManifest,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
 const {
     isForeignLinuxEmbeddedMpvArch,
     linuxUnpackedDirArch,
+    resolveConfiguredLinuxTargetNames,
     resolveElectronBuilderArchName,
     validatePackagedEmbeddedMpv,
 } = require('./embedded-mpv-packaging.cjs');
+const {
+    preparePackagedFrameCopyArtifacts,
+} = require('./embedded-mpv-frame-copy-files.cjs');
+const {
+    LICENSE_PATHS_BY_PACKAGE,
+    collectLinuxRuntimeLicenseInputs,
+    generateLinuxRuntimeNotices,
+} = require('../embedded-mpv/generate-linux-runtime-notices.cjs');
+const {
+    ensureSnapGraphicsContentMount,
+    resolveLinuxFrameCopyPackagingContext,
+} = require('./electron-after-pack.cjs');
 
 const X64_ADDON_ENV = { IPTVNATOR_EMBEDDED_MPV_ARCH: 'x64' };
+const SYSTEM_PACKAGE_DEPENDENCIES = {
+    deb: ['libmpv2', 'libegl1', 'libgl1', 'libgbm1'],
+    rpm: ['mpv-libs', 'libglvnd-egl', 'libglvnd-glx', 'mesa-libgbm'],
+    pacman: ['mpv', 'libglvnd', 'mesa'],
+};
+const FRAME_COPY_ARTIFACTS = {
+    addon: 'embedded_mpv.node',
+    frameReader: 'embedded_mpv_frame_reader.node',
+    helper: 'iptvnator_mpv_helper',
+};
+
+function sha256(contents) {
+    return crypto.createHash('sha256').update(contents).digest('hex');
+}
+
+function sourcePackageRecord(sourcePackage) {
+    return {
+        version: sourcePackage.version,
+        sourceUrl: sourcePackage.sourceUrl,
+        ...(sourcePackage.sourceTag
+            ? { sourceTag: sourcePackage.sourceTag }
+            : {}),
+        ...(sourcePackage.sourceKind === 'archive'
+            ? { sourceSha256: sourcePackage.expectedSha256 }
+            : {
+                  sourceGitCommit: sourcePackage.expectedGitCommit,
+                  sourceSubmodules: [...sourcePackage.expectedSubmodules],
+              }),
+        license: sourcePackage.license,
+    };
+}
+
+function createSourceRuntime(runtimeContents) {
+    const runtimeFiles = Object.entries(runtimeContents)
+        .map(([name, contents]) => ({
+            name,
+            size: Buffer.byteLength(contents),
+            sha256: sha256(contents),
+        }))
+        .sort((left, right) => left.name.localeCompare(right.name));
+    const runtimeNames = new Set(runtimeFiles.map(({ name }) => name));
+    const entries = runtimeFiles.map(({ name }) => {
+        const needed = name.startsWith('libmpv.so')
+            ? [
+                  ...(runtimeNames.has('libavcodec.so.61')
+                      ? ['libavcodec.so.61']
+                      : []),
+                  'libEGL.so.1',
+                  'libc.so.6',
+              ]
+            : ['libm.so.6'];
+        return {
+            name,
+            soname: name === 'libmpv.so' ? 'libmpv.so.2' : null,
+            needed: needed.sort(),
+            rpath: [],
+            runpath: ['$ORIGIN'],
+        };
+    });
+    const externalDependencies = [
+        ...new Set(
+            entries
+                .flatMap(({ needed }) => needed)
+                .filter((name) => !runtimeNames.has(name))
+        ),
+    ].sort();
+    const sourceRecords = Object.fromEntries(
+        SOURCE_PACKAGES.map((sourcePackage) => [
+            sourcePackage.id,
+            {
+                ...sourcePackage,
+                ...sourcePackageRecord(sourcePackage),
+            },
+        ])
+    );
+
+    return createLinuxRuntimeManifest({
+        sourceRecords,
+        runtimeFiles,
+        abiRecords: runtimeFiles.map(({ name }) => ({
+            name,
+            requiredGlibc: '2.34',
+            requiredGlibcxx: null,
+        })),
+        dependencyClosure: {
+            entries,
+            externalDependencies,
+        },
+        buildHost: {
+            platform: 'linux',
+            arch: 'x64',
+            release: 'fixture-kernel',
+            glibcVersion: '2.35',
+            systemPkgConfigDirs: [...DEFAULT_SYSTEM_PKG_CONFIG_DIRS],
+            systemPkgConfigPackages: Object.fromEntries(
+                EXPECTED_SYSTEM_PKG_CONFIG_PACKAGES.map((name) => [
+                    name,
+                    `${name}-fixture`,
+                ])
+            ),
+            tools: Object.fromEntries(
+                REQUIRED_TOOLS.map((name) => [
+                    name,
+                    `${name} ${MINIMUM_TOOL_VERSIONS[name]}`,
+                ])
+            ),
+        },
+        generatedAt: '2026-07-17T00:00:00.000Z',
+    });
+}
+
+function createBuildManifest(runtimeContents) {
+    const sourceRuntime = createSourceRuntime(runtimeContents);
+    return {
+        schemaVersion: 1,
+        origin: 'linux-frame-copy-build',
+        generatedAt: '2026-07-17T00:00:00.000Z',
+        platform: 'linux',
+        arch: 'x64',
+        buildInputMode: 'bundled-runtime',
+        sourceRuntimeValidated: true,
+        allowedPackageRuntimeModes: ['system', 'bundled'],
+        packageRuntimeAvailability: {
+            system: true,
+            bundled: true,
+        },
+        artifacts: { ...FRAME_COPY_ARTIFACTS },
+        processIsolation: {
+            addonLoadsLibmpv: false,
+            helperLinksLibmpv: true,
+            helperRunpath: ['$ORIGIN/lib'],
+        },
+        nativeViewFallback: 'process-isolated mpv --wid',
+        libmpvSoname: 'libmpv.so.2',
+        runtimeFiles: sourceRuntime.runtimeFiles.map((entry) => ({ ...entry })),
+        runtimeTotalBytes: sourceRuntime.runtimeTotalBytes,
+        sourceArchive: {
+            schemaVersion: 1,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+            sha256: '7'.repeat(64),
+            repositoryRevision: '8'.repeat(40),
+        },
+        sourceRuntime,
+    };
+}
+
+function createNoticeFixture(fixtureRoot, sourceRuntime) {
+    const sourceRoot = join(fixtureRoot, 'upstream-license-sources');
+    for (const sourcePackage of SOURCE_PACKAGES) {
+        for (const relativePath of LICENSE_PATHS_BY_PACKAGE[sourcePackage.id]) {
+            const sourcePath = join(sourceRoot, sourcePackage.id, relativePath);
+            fs.mkdirSync(dirname(sourcePath), { recursive: true });
+            fs.writeFileSync(
+                sourcePath,
+                `verbatim ${sourcePackage.id} ${relativePath}\n`
+            );
+        }
+    }
+    const licenseInputRoot = join(fixtureRoot, 'license-inputs');
+    const noticeSourceDir = join(fixtureRoot, 'generated-notices');
+    collectLinuxRuntimeLicenseInputs({
+        sourceRoot,
+        outputRoot: licenseInputRoot,
+        runtimeManifest: sourceRuntime,
+    });
+    generateLinuxRuntimeNotices({
+        licenseInputRoot,
+        outputRoot: noticeSourceDir,
+        runtimeManifest: sourceRuntime,
+    });
+    return noticeSourceDir;
+}
+
+function createNativeFixture({
+    runtimeContents = {
+        'libavcodec.so.61': 'libavcodec-runtime',
+        'libmpv.so': 'libmpv-runtime',
+        'libmpv.so.2': 'libmpv-runtime',
+    },
+    buildManifest = createBuildManifest(runtimeContents),
+} = {}) {
+    const fixtureRoot = fs.mkdtempSync(
+        join(os.tmpdir(), 'iptvnator-embedded-mpv-layout-')
+    );
+    const appOutDir = join(fixtureRoot, 'linux-unpacked');
+    const resourceDir = join(appOutDir, 'resources');
+    const nativeDir = join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(join(nativeDir, 'lib'), { recursive: true });
+    fs.writeFileSync(join(nativeDir, FRAME_COPY_ARTIFACTS.addon), 'addon');
+    fs.writeFileSync(
+        join(nativeDir, FRAME_COPY_ARTIFACTS.frameReader),
+        'reader'
+    );
+    fs.writeFileSync(join(nativeDir, FRAME_COPY_ARTIFACTS.helper), 'helper', {
+        mode: 0o644,
+    });
+    fs.writeFileSync(
+        join(nativeDir, 'embedded-mpv-runtime.json'),
+        `${JSON.stringify(buildManifest, null, 2)}\n`
+    );
+    for (const [name, contents] of Object.entries(runtimeContents)) {
+        fs.writeFileSync(join(nativeDir, 'lib', name), contents);
+    }
+    const noticeSourceDir = createNoticeFixture(
+        fixtureRoot,
+        buildManifest.sourceRuntime
+    );
+    fs.cpSync(noticeSourceDir, nativeDir, { recursive: true });
+    fs.writeFileSync(join(appOutDir, 'iptvnator.bin'), 'electron');
+    return {
+        buildManifest,
+        fixtureRoot,
+        resourceDir,
+        appOutDir,
+        nativeDir,
+        noticeSourceDir,
+    };
+}
+
+function readManifest(nativeDir) {
+    return JSON.parse(
+        fs.readFileSync(join(nativeDir, 'embedded-mpv-runtime.json'), 'utf8')
+    );
+}
+
+function pureValidationOptions(options = {}) {
+    return {
+        platform: 'linux',
+        required: true,
+        foreignArch: false,
+        hostPlatform: 'darwin',
+        ...options,
+    };
+}
+
+function validElfInspector(nativeDir, manifest, overrides = {}) {
+    const libDir = join(nativeDir, 'lib');
+    const records = new Map([
+        ['iptvnator', { needed: ['libc.so.6'], rpath: [], runpath: [] }],
+        ['iptvnator.bin', { needed: ['libc.so.6'], rpath: [], runpath: [] }],
+        [
+            FRAME_COPY_ARTIFACTS.addon,
+            { needed: ['libX11.so.6'], rpath: [], runpath: [] },
+        ],
+        [
+            FRAME_COPY_ARTIFACTS.frameReader,
+            { needed: ['libc.so.6'], rpath: [], runpath: [] },
+        ],
+        [
+            FRAME_COPY_ARTIFACTS.helper,
+            {
+                needed: [manifest.libmpvSoname, 'libEGL.so.1', 'libc.so.6'],
+                rpath: [],
+                runpath: ['$ORIGIN/lib'],
+            },
+        ],
+    ]);
+    for (const entry of manifest.runtimeDependencyClosure?.entries ?? []) {
+        records.set(entry.name, {
+            soname: entry.soname ?? null,
+            needed: [...entry.needed],
+            rpath: [...entry.rpath],
+            runpath: [...entry.runpath],
+        });
+    }
+    for (const [name, value] of Object.entries(overrides)) {
+        records.set(name, value);
+    }
+
+    return (binaryPath) => {
+        const name =
+            dirname(binaryPath) === libDir
+                ? basename(binaryPath)
+                : basename(binaryPath);
+        const record = records.get(name);
+        if (!record) {
+            throw new Error(`Missing ELF fixture for ${binaryPath}`);
+        }
+        return record;
+    };
+}
+
+test('resolves the required Linux profile from afterPack targets before mutation', () => {
+    assert.deepEqual(
+        resolveLinuxFrameCopyPackagingContext(
+            {
+                electronPlatformName: 'linux',
+                arch: 1,
+                targets: [{ name: 'DEB' }, { name: 'rpm' }],
+            },
+            {
+                required: true,
+                environment: {
+                    IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'system',
+                    IPTVNATOR_EMBEDDED_MPV_ARCH: 'x64',
+                },
+            }
+        ),
+        {
+            targetArch: 'x64',
+            foreignArch: false,
+            targetNames: ['deb', 'rpm'],
+            profile: {
+                name: 'system',
+                runtimeMode: 'system',
+                targets: ['deb', 'rpm', 'pacman'],
+                manifestOrigin: 'system-libmpv-frame-copy',
+            },
+        }
+    );
+});
+
+test('keeps every non-x64 Linux target marker-only even when the configured addon arch matches it', () => {
+    const context = resolveLinuxFrameCopyPackagingContext(
+        {
+            electronPlatformName: 'linux',
+            arch: 3,
+            targets: [{ name: 'deb' }],
+        },
+        {
+            required: true,
+            environment: {
+                IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'system',
+                IPTVNATOR_EMBEDDED_MPV_ARCH: 'arm64',
+            },
+        }
+    );
+
+    assert.equal(context.targetArch, 'arm64');
+    assert.equal(context.foreignArch, true);
+});
+
+test('rejects missing, mixed, and unknown required Linux packaging context', () => {
+    const baseParams = {
+        electronPlatformName: 'linux',
+        arch: 1,
+        targets: [{ name: 'deb' }],
+    };
+
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(baseParams, {
+                required: true,
+                environment: { IPTVNATOR_EMBEDDED_MPV_ARCH: 'x64' },
+            }),
+        /Linux frame-copy profile is required/
+    );
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(
+                {
+                    ...baseParams,
+                    targets: [{ name: 'deb' }, { name: 'AppImage' }],
+                },
+                {
+                    required: true,
+                    environment: {
+                        IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'system',
+                        IPTVNATOR_EMBEDDED_MPV_ARCH: 'x64',
+                    },
+                }
+            ),
+        /cannot build target "appimage"/
+    );
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(
+                { ...baseParams, arch: 99 },
+                {
+                    required: true,
+                    environment: {
+                        IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'system',
+                    },
+                }
+            ),
+        /Unknown Electron Builder architecture/
+    );
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(
+                { ...baseParams, arch: 'mips64' },
+                {
+                    required: true,
+                    environment: {
+                        IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'system',
+                    },
+                }
+            ),
+        /Unknown Electron Builder architecture/
+    );
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(baseParams, {
+                required: true,
+                environment: {
+                    IPTVNATOR_EMBEDDED_MPV_ARCH: 'arm64',
+                },
+            }),
+        /Linux frame-copy profile is required/
+    );
+});
+
+test('validates a provided Linux profile even when embedded MPV is optional', () => {
+    assert.throws(
+        () =>
+            resolveLinuxFrameCopyPackagingContext(
+                {
+                    electronPlatformName: 'linux',
+                    arch: 1,
+                    targets: [{ name: 'snap' }, { name: 'deb' }],
+                },
+                {
+                    required: false,
+                    environment: {
+                        IPTVNATOR_LINUX_FRAME_COPY_PROFILE: 'portable',
+                        IPTVNATOR_EMBEDDED_MPV_ARCH: 'x64',
+                    },
+                }
+            ),
+        /cannot build target "deb"/
+    );
+});
+
+test('creates an exact empty Snap graphics content mount directory', (t) => {
+    const fixtureRoot = fs.mkdtempSync(
+        join(os.tmpdir(), 'iptvnator-snap-graphics-mount-')
+    );
+    t.after(() => fs.rmSync(fixtureRoot, { recursive: true, force: true }));
+
+    assert.equal(
+        ensureSnapGraphicsContentMount(fixtureRoot, ['appimage']),
+        null
+    );
+    assert.equal(fs.existsSync(join(fixtureRoot, 'graphics')), false);
+
+    const mountPath = ensureSnapGraphicsContentMount(fixtureRoot, [
+        'appimage',
+        'snap',
+    ]);
+    assert.equal(mountPath, join(fixtureRoot, 'graphics'));
+    const mountStat = fs.lstatSync(mountPath);
+    assert.equal(mountStat.isDirectory(), true);
+    assert.equal(mountStat.isSymbolicLink(), false);
+    assert.equal(mountStat.mode & 0o777, 0o755);
+    assert.deepEqual(fs.readdirSync(mountPath), []);
+
+    fs.chmodSync(mountPath, 0o700);
+    assert.equal(
+        ensureSnapGraphicsContentMount(fixtureRoot, ['snap']),
+        mountPath
+    );
+    assert.equal(fs.lstatSync(mountPath).mode & 0o777, 0o755);
+});
+
+test('rejects a non-empty or redirected Snap graphics content mount', (t) => {
+    const fixtureRoot = fs.mkdtempSync(
+        join(os.tmpdir(), 'iptvnator-snap-graphics-invalid-')
+    );
+    t.after(() => fs.rmSync(fixtureRoot, { recursive: true, force: true }));
+    const mountPath = join(fixtureRoot, 'graphics');
+
+    fs.writeFileSync(mountPath, 'not a directory');
+    assert.throws(
+        () => ensureSnapGraphicsContentMount(fixtureRoot, ['snap']),
+        /real empty directory/
+    );
+
+    fs.rmSync(mountPath);
+    fs.mkdirSync(mountPath);
+    fs.writeFileSync(join(mountPath, 'unexpected'), 'not empty');
+    assert.throws(
+        () => ensureSnapGraphicsContentMount(fixtureRoot, ['snap']),
+        /must be empty/
+    );
+
+    fs.rmSync(mountPath, { recursive: true });
+    const outsidePath = join(fixtureRoot, 'outside');
+    fs.mkdirSync(outsidePath);
+    fs.symlinkSync(outsidePath, mountPath, 'dir');
+    assert.throws(
+        () => ensureSnapGraphicsContentMount(fixtureRoot, ['snap']),
+        /real empty directory/
+    );
+});
+
+test('prepares a normalized system profile with no private runtime', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    fs.writeFileSync(
+        join(fixture.nativeDir, 'iptvnator_mpv_helper.exe'),
+        'stale'
+    );
+    fs.writeFileSync(
+        join(fixture.nativeDir, 'embedded-mpv-unavailable.txt'),
+        'stale'
+    );
+
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux',
+        {
+            profile: 'system',
+            targetNames: ['deb', 'rpm', 'pacman'],
+        }
+    );
+
+    assert.equal(manifest.profile, 'system');
+    assert.equal(manifest.runtimeMode, 'system');
+    assert.equal(manifest.origin, 'system-libmpv-frame-copy');
+    assert.deepEqual(manifest.targets, ['deb', 'pacman', 'rpm']);
+    assert.deepEqual(manifest.packageDependencies, SYSTEM_PACKAGE_DEPENDENCIES);
+    assert.equal(manifest.libmpvSoname, 'libmpv.so.2');
+    assert.deepEqual(manifest.runtimeFiles, []);
+    assert.equal(manifest.runtimeTotalBytes, 0);
+    assert.equal(Object.hasOwn(manifest, 'sourceArchive'), false);
+    assert.equal(fs.existsSync(join(fixture.nativeDir, 'lib')), false);
+    assert.equal(
+        fs.statSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.helper)).mode &
+            0o777,
+        0o755
+    );
+    assert.equal(
+        fs.statSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.frameReader))
+            .mode & 0o777,
+        0o644
+    );
+    assert.equal(
+        fs.existsSync(join(fixture.nativeDir, 'iptvnator_mpv_helper.exe')),
+        false
+    );
+    assert.equal(
+        fs.existsSync(join(fixture.nativeDir, 'embedded-mpv-unavailable.txt')),
+        false
+    );
+    for (const legalPath of [
+        'embedded-mpv-notices.json',
+        'THIRD_PARTY_NOTICES.txt',
+        'licenses',
+    ]) {
+        assert.equal(fs.existsSync(join(fixture.nativeDir, legalPath)), false);
+    }
+    assert.deepEqual(
+        validatePackagedEmbeddedMpv(
+            fixture.resourceDir,
+            pureValidationOptions({
+                profile: 'system',
+                targetNames: ['deb', 'rpm', 'pacman'],
+            })
+        ),
+        []
+    );
+});
+
+test('prepares portable and Flatpak manifests with the exact bundled closure', (t) => {
+    const portable = createNativeFixture();
+    const flatpak = createNativeFixture();
+    fs.renameSync(
+        join(flatpak.appOutDir, 'iptvnator.bin'),
+        join(flatpak.appOutDir, 'iptvnator')
+    );
+    t.after(() => {
+        for (const fixture of [portable, flatpak]) {
+            fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true });
+        }
+    });
+    for (const legalPath of [
+        'embedded-mpv-notices.json',
+        'THIRD_PARTY_NOTICES.txt',
+        'licenses',
+    ]) {
+        fs.rmSync(join(portable.nativeDir, legalPath), {
+            recursive: true,
+            force: true,
+        });
+    }
+
+    const portableManifest = preparePackagedFrameCopyArtifacts(
+        portable.nativeDir,
+        'linux',
+        {
+            profile: 'portable',
+            targetNames: ['AppImage', 'SNAP'],
+            noticeSourceDir: portable.noticeSourceDir,
+        }
+    );
+    const flatpakManifest = preparePackagedFrameCopyArtifacts(
+        flatpak.nativeDir,
+        'linux',
+        {
+            profile: 'flatpak',
+            targetNames: ['flatpak'],
+        }
+    );
+
+    assert.equal(portableManifest.profile, 'portable');
+    assert.equal(portableManifest.runtimeMode, 'bundled');
+    assert.equal(portableManifest.origin, 'bundled-lgpl-frame-copy');
+    assert.deepEqual(portableManifest.targets, ['appimage', 'snap']);
+    assert.deepEqual(portableManifest.packageDependencies, {});
+    assert.deepEqual(
+        portableManifest.runtimeFiles.map(({ name }) => name).sort(),
+        ['libavcodec.so.61', 'libmpv.so', 'libmpv.so.2']
+    );
+    assert.equal(
+        portableManifest.runtimeTotalBytes,
+        portableManifest.runtimeFiles.reduce(
+            (total, runtimeFile) => total + runtimeFile.size,
+            0
+        )
+    );
+    assert.equal(
+        portableManifest.sourceRuntime.origin,
+        'vendored-lgpl-source-build'
+    );
+    assert.ok(portableManifest.sourceRuntime.packages.ffmpeg.sourceSha256);
+    assert.deepEqual(
+        portableManifest.sourceArchive,
+        portable.buildManifest.sourceArchive
+    );
+    assert.ok(
+        portableManifest.sourceRuntime.ffmpeg.configureFlags.includes(
+            '--disable-gpl'
+        )
+    );
+    const notices = JSON.parse(
+        fs.readFileSync(
+            join(portable.nativeDir, 'embedded-mpv-notices.json'),
+            'utf8'
+        )
+    );
+    assert.equal(notices.schemaVersion, 1);
+    assert.equal(notices.origin, 'pinned-linux-runtime-upstream-licenses');
+    assert.equal(notices.noticeFile.path, 'THIRD_PARTY_NOTICES.txt');
+    assert.deepEqual(
+        notices.packages.map(({ id }) => id),
+        SOURCE_PACKAGES.map(({ id }) => id).sort()
+    );
+    assert.ok(notices.packages.every(({ files }) => files.length >= 1));
+    assert.equal(flatpakManifest.profile, 'flatpak');
+    assert.equal(flatpakManifest.runtimeMode, 'bundled');
+    assert.equal(flatpakManifest.origin, 'bundled-lgpl-frame-copy');
+    assert.deepEqual(
+        flatpakManifest.sourceArchive,
+        flatpak.buildManifest.sourceArchive
+    );
+    assert.deepEqual(
+        validatePackagedEmbeddedMpv(
+            portable.resourceDir,
+            pureValidationOptions({
+                profile: 'portable',
+                targetNames: ['appimage', 'snap'],
+            })
+        ),
+        []
+    );
+    assert.deepEqual(
+        validatePackagedEmbeddedMpv(
+            flatpak.resourceDir,
+            pureValidationOptions({
+                profile: 'flatpak',
+                targetNames: ['flatpak'],
+                hostPlatform: 'linux',
+                elfInspector: validElfInspector(
+                    flatpak.nativeDir,
+                    flatpakManifest
+                ),
+            })
+        ),
+        []
+    );
+});
+
+test('rejects missing, tampered, undeclared, and symlinked bundled legal files', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux',
+        {
+            profile: 'portable',
+            targetNames: ['appimage'],
+        }
+    );
+    const options = pureValidationOptions({
+        profile: 'portable',
+        targetNames: ['appimage'],
+        hostPlatform: 'linux',
+        elfInspector: validElfInspector(fixture.nativeDir, manifest),
+    });
+    const notices = JSON.parse(
+        fs.readFileSync(
+            join(fixture.nativeDir, 'embedded-mpv-notices.json'),
+            'utf8'
+        )
+    );
+    const licensePath = join(
+        fixture.nativeDir,
+        notices.packages[0].files[0].path
+    );
+    const originalContents = fs.readFileSync(licensePath);
+
+    fs.appendFileSync(licensePath, 'tampered\n');
+    assert.match(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, options).join('\n'),
+        /(?:Size|SHA-256) mismatch.*packaged license/i
+    );
+
+    fs.writeFileSync(licensePath, originalContents);
+    fs.rmSync(licensePath);
+    assert.match(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, options).join('\n'),
+        /Missing .*packaged license/i
+    );
+
+    fs.writeFileSync(licensePath, originalContents);
+    const undeclaredPath = join(fixture.nativeDir, 'licenses', 'stale.txt');
+    fs.writeFileSync(undeclaredPath, 'stale\n');
+    assert.match(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, options).join('\n'),
+        /undeclared packaged legal file.*stale\.txt/i
+    );
+
+    fs.rmSync(undeclaredPath);
+    fs.rmSync(licensePath);
+    fs.symlinkSync(
+        join(fixture.nativeDir, 'THIRD_PARTY_NOTICES.txt'),
+        licensePath
+    );
+    assert.match(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, options).join('\n'),
+        /packaged license.*symbolic link/i
+    );
+});
+
+test('rejects invalid build provenance and incomplete bundled runtime input', (t) => {
+    const extra = createNativeFixture();
+    const missing = createNativeFixture();
+    const invalidSource = createBuildManifest({
+        'libavcodec.so.61': 'libavcodec-runtime',
+        'libmpv.so': 'libmpv-runtime',
+        'libmpv.so.2': 'libmpv-runtime',
+    });
+    invalidSource.sourceRuntime.ffmpeg.configureFlags.push('--enable-gpl');
+    const invalid = createNativeFixture({ buildManifest: invalidSource });
+    const unexpectedModeManifest = createBuildManifest({
+        'libavcodec.so.61': 'libavcodec-runtime',
+        'libmpv.so': 'libmpv-runtime',
+        'libmpv.so.2': 'libmpv-runtime',
+    });
+    unexpectedModeManifest.allowedPackageRuntimeModes.push('development');
+    const unexpectedMode = createNativeFixture({
+        buildManifest: unexpectedModeManifest,
+    });
+    const wrongSonameManifest = createBuildManifest({
+        'libavcodec.so.61': 'libavcodec-runtime',
+        'libmpv.so': 'libmpv-runtime',
+        'libmpv.so.2': 'libmpv-runtime',
+    });
+    wrongSonameManifest.libmpvSoname = 'libmpv.so.9';
+    const wrongSoname = createNativeFixture({
+        buildManifest: wrongSonameManifest,
+    });
+    const wrongSourceArchiveManifest = createBuildManifest({
+        'libavcodec.so.61': 'libavcodec-runtime',
+        'libmpv.so': 'libmpv-runtime',
+        'libmpv.so.2': 'libmpv-runtime',
+    });
+    wrongSourceArchiveManifest.sourceArchive.sha256 = 'not-a-digest';
+    const wrongSourceArchive = createNativeFixture({
+        buildManifest: wrongSourceArchiveManifest,
+    });
+    t.after(() => {
+        for (const fixture of [
+            extra,
+            missing,
+            invalid,
+            unexpectedMode,
+            wrongSoname,
+            wrongSourceArchive,
+        ]) {
+            fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true });
+        }
+    });
+    fs.writeFileSync(join(extra.nativeDir, 'lib', 'libstale.so.1'), 'stale');
+    fs.rmSync(join(missing.nativeDir, 'lib', 'libavcodec.so.61'));
+
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(extra.nativeDir, 'linux', {
+                profile: 'portable',
+                targetNames: ['appimage'],
+            }),
+        /undeclared bundled runtime file.*libstale\.so\.1/i
+    );
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(missing.nativeDir, 'linux', {
+                profile: 'flatpak',
+                targetNames: ['flatpak'],
+            }),
+        /Missing bundled runtime file.*libavcodec\.so\.61/
+    );
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(invalid.nativeDir, 'linux', {
+                profile: 'portable',
+                targetNames: ['snap'],
+            }),
+        /--enable-gpl/
+    );
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(
+                unexpectedMode.nativeDir,
+                'linux',
+                {
+                    profile: 'portable',
+                    targetNames: ['appimage'],
+                }
+            ),
+        /allowedPackageRuntimeModes.*exactly/i
+    );
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(wrongSoname.nativeDir, 'linux', {
+                profile: 'portable',
+                targetNames: ['appimage'],
+            }),
+        /derived from.*SONAME/i
+    );
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(
+                wrongSourceArchive.nativeDir,
+                'linux',
+                {
+                    profile: 'portable',
+                    targetNames: ['snap'],
+                }
+            ),
+        /source archive binding.*sha256/i
+    );
+});
+
+test('rejects profiled preparation without a concrete package target', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+
+    assert.throws(
+        () =>
+            preparePackagedFrameCopyArtifacts(fixture.nativeDir, 'linux', {
+                profile: 'portable',
+                targetNames: [],
+            }),
+        /at least one target/
+    );
+});
+
+test(
+    'rejects symlinked frame-copy artifacts before chmod or packaging',
+    { skip: process.platform === 'win32' },
+    (t) => {
+        const fixture = createNativeFixture();
+        t.after(() =>
+            fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+        );
+        const readerPath = join(
+            fixture.nativeDir,
+            FRAME_COPY_ARTIFACTS.frameReader
+        );
+        fs.rmSync(readerPath);
+        fs.symlinkSync(FRAME_COPY_ARTIFACTS.addon, readerPath);
+
+        assert.throws(
+            () =>
+                preparePackagedFrameCopyArtifacts(fixture.nativeDir, 'linux', {
+                    profile: 'system',
+                    targetNames: ['deb'],
+                }),
+            /frame reader.*regular file/i
+        );
+        assert.equal(fs.lstatSync(readerPath).isSymbolicLink(), true);
+    }
+);
+
+test('keeps optional unprofiled Linux packages explicitly native-view-only', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux'
+    );
+
+    assert.equal(manifest.origin, 'external-mpv-process');
+    assert.equal(manifest.runtimeMode, 'native-view-only');
+    assert.equal(manifest.frameCopyAvailable, false);
+    assert.equal(
+        fs.existsSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.addon)),
+        true
+    );
+    assert.equal(
+        fs.existsSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.helper)),
+        false
+    );
+    assert.equal(
+        fs.existsSync(
+            join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.frameReader)
+        ),
+        false
+    );
+    assert.equal(fs.existsSync(join(fixture.nativeDir, 'lib')), false);
+    assert.notEqual(
+        readManifest(fixture.nativeDir).origin,
+        'linux-frame-copy-build'
+    );
+});
+
+test('rejects incorrect artifact modes and profile mismatches deterministically', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    preparePackagedFrameCopyArtifacts(fixture.nativeDir, 'linux', {
+        profile: 'system',
+        targetNames: ['deb'],
+    });
+    fs.chmodSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.helper), 0o644);
+
+    const modeErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        pureValidationOptions({
+            profile: 'system',
+            targetNames: ['deb'],
+        })
+    );
+    assert.match(modeErrors.join('\n'), /mode 0755/);
+
+    fs.chmodSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.helper), 0o4755);
+    assert.match(
+        validatePackagedEmbeddedMpv(
+            fixture.resourceDir,
+            pureValidationOptions({
+                profile: 'system',
+                targetNames: ['deb'],
+            })
+        ).join('\n'),
+        /mode 0755/
+    );
+
+    fs.chmodSync(join(fixture.nativeDir, FRAME_COPY_ARTIFACTS.helper), 0o755);
+    const profileErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        pureValidationOptions({
+            profile: 'portable',
+            targetNames: ['appimage'],
+        })
+    );
+    assert.match(profileErrors.join('\n'), /profile.*portable.*system/i);
+});
+
+test('turns malformed packaged manifest JSON into a deterministic error', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    fs.writeFileSync(
+        join(fixture.nativeDir, 'embedded-mpv-runtime.json'),
+        '{not-json'
+    );
+
+    assert.doesNotThrow(() =>
+        validatePackagedEmbeddedMpv(
+            fixture.resourceDir,
+            pureValidationOptions({
+                profile: 'system',
+                targetNames: ['deb'],
+            })
+        )
+    );
+    assert.match(
+        validatePackagedEmbeddedMpv(
+            fixture.resourceDir,
+            pureValidationOptions({
+                profile: 'system',
+                targetNames: ['deb'],
+            })
+        ).join('\n'),
+        /Invalid JSON in embedded MPV runtime manifest/
+    );
+});
+
+test('validates Linux ELF process isolation, helper linkage, and bundled closure', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux',
+        {
+            profile: 'portable',
+            targetNames: ['appimage'],
+        }
+    );
+    const options = {
+        platform: 'linux',
+        required: true,
+        foreignArch: false,
+        profile: 'portable',
+        targetNames: ['appimage'],
+        hostPlatform: 'linux',
+        elfInspector: validElfInspector(fixture.nativeDir, manifest),
+    };
+
+    assert.deepEqual(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, options),
+        []
+    );
+
+    for (const artifactName of [
+        FRAME_COPY_ARTIFACTS.addon,
+        FRAME_COPY_ARTIFACTS.frameReader,
+    ]) {
+        const isolationErrors = validatePackagedEmbeddedMpv(
+            fixture.resourceDir,
+            {
+                ...options,
+                elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+                    [artifactName]: {
+                        needed: ['libmpv.so.2'],
+                        rpath: [],
+                        runpath: [],
+                    },
+                }),
+            }
+        );
+        assert.match(
+            isolationErrors.join('\n'),
+            /must not link libmpv/,
+            `${artifactName} must remain process-isolated from libmpv`
+        );
+    }
+
+    const pathBearingAddonLinkErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        {
+            ...options,
+            elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+                [FRAME_COPY_ARTIFACTS.addon]: {
+                    needed: ['/tmp/build/libmpv.so.2'],
+                    rpath: [],
+                    runpath: [],
+                },
+            }),
+        }
+    );
+    assert.match(
+        pathBearingAddonLinkErrors.join('\n'),
+        /must not link libmpv.*\/tmp\/build\/libmpv\.so\.2/
+    );
+
+    const helperLinkErrors = validatePackagedEmbeddedMpv(fixture.resourceDir, {
+        ...options,
+        elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+            [FRAME_COPY_ARTIFACTS.helper]: {
+                needed: ['libmpv.so.1'],
+                rpath: [],
+                runpath: ['$ORIGIN/lib'],
+            },
+        }),
+    });
+    assert.match(
+        helperLinkErrors.join('\n'),
+        /must directly need libmpv\.so\.2/
+    );
+
+    const unexpectedHelperLinkErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        {
+            ...options,
+            elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+                [FRAME_COPY_ARTIFACTS.helper]: {
+                    needed: [
+                        manifest.libmpvSoname,
+                        'libEGL.so.1',
+                        'libc.so.6',
+                        'libsurprise.so.1',
+                    ],
+                    rpath: [],
+                    runpath: ['$ORIGIN/lib'],
+                },
+            }),
+        }
+    );
+    assert.match(
+        unexpectedHelperLinkErrors.join('\n'),
+        /helper dependency is not bundled or allowlisted.*libsurprise\.so\.1/
+    );
+
+    const closureErrors = validatePackagedEmbeddedMpv(fixture.resourceDir, {
+        ...options,
+        elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+            'libavcodec.so.61': {
+                needed: ['libsurprise.so.1'],
+                rpath: [],
+                runpath: ['/tmp/runtime-prefix'],
+            },
+        }),
+    });
+    assert.match(closureErrors.join('\n'), /RUNPATH must be exactly \$ORIGIN/);
+    assert.match(
+        closureErrors.join('\n'),
+        /not bundled or allowlisted.*libsurprise\.so\.1/
+    );
+
+    fs.writeFileSync(
+        join(fixture.appOutDir, 'libelectron-extra.so'),
+        'electron library'
+    );
+    const electronLibraryErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        {
+            ...options,
+            elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+                'libelectron-extra.so': {
+                    needed: ['libmpv.so.2'],
+                    rpath: [],
+                    runpath: [],
+                },
+            }),
+        }
+    );
+    assert.match(
+        electronLibraryErrors.join('\n'),
+        /Linux Electron library must not link libmpv.*libelectron-extra\.so/
+    );
+});
+
+test('recursively validates pristine Electron libraries before target packaging', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux',
+        {
+            profile: 'portable',
+            targetNames: ['snap'],
+        }
+    );
+    const nestedElectronLibrary = join(
+        fixture.appOutDir,
+        'future-electron-runtime',
+        'libfuture-electron.so'
+    );
+    fs.mkdirSync(dirname(nestedElectronLibrary), { recursive: true });
+    fs.writeFileSync(nestedElectronLibrary, 'future electron library');
+
+    const validationOptions = {
+        platform: 'linux',
+        required: true,
+        foreignArch: false,
+        profile: 'portable',
+        targetNames: ['snap'],
+        hostPlatform: 'linux',
+    };
+    const errors = validatePackagedEmbeddedMpv(fixture.resourceDir, {
+        ...validationOptions,
+        elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+            'libfuture-electron.so': {
+                needed: ['libmpv.so.2'],
+                rpath: [],
+                runpath: [],
+            },
+        }),
+    });
+
+    assert.match(
+        errors.join('\n'),
+        /Linux Electron library must not link libmpv.*libfuture-electron\.so/
+    );
+
+    fs.rmSync(dirname(nestedElectronLibrary), {
+        recursive: true,
+        force: true,
+    });
+    for (const packageLibraryDir of [
+        join(fixture.appOutDir, 'lib', 'x86_64-linux-gnu'),
+        join(fixture.appOutDir, 'usr', 'lib', 'x86_64-linux-gnu'),
+    ]) {
+        const targetPath = join(packageLibraryDir, 'libpackage.so.1.0');
+        fs.mkdirSync(packageLibraryDir, { recursive: true });
+        fs.writeFileSync(targetPath, 'Snap template library');
+        fs.symlinkSync(
+            'libpackage.so.1.0',
+            join(packageLibraryDir, 'libpackage.so.1')
+        );
+    }
+
+    assert.deepEqual(
+        validatePackagedEmbeddedMpv(fixture.resourceDir, {
+            ...validationOptions,
+            artifactFormat: 'snap',
+            elfInspector: validElfInspector(fixture.nativeDir, manifest),
+        }),
+        []
+    );
+
+    fs.mkdirSync(dirname(nestedElectronLibrary), { recursive: true });
+    fs.writeFileSync(nestedElectronLibrary, 'future electron library');
+    const snapIsolationErrors = validatePackagedEmbeddedMpv(
+        fixture.resourceDir,
+        {
+            ...validationOptions,
+            artifactFormat: 'snap',
+            elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+                'libfuture-electron.so': {
+                    needed: ['libmpv.so.2'],
+                    rpath: [],
+                    runpath: [],
+                },
+            }),
+        }
+    );
+    assert.match(
+        snapIsolationErrors.join('\n'),
+        /Linux Electron library must not link libmpv.*libfuture-electron\.so/
+    );
+});
+
+test('rejects undeclared helper dependencies in system-runtime packages', (t) => {
+    const fixture = createNativeFixture();
+    t.after(() =>
+        fs.rmSync(fixture.fixtureRoot, { recursive: true, force: true })
+    );
+    const manifest = preparePackagedFrameCopyArtifacts(
+        fixture.nativeDir,
+        'linux',
+        {
+            profile: 'system',
+            targetNames: ['deb'],
+        }
+    );
+
+    const errors = validatePackagedEmbeddedMpv(fixture.resourceDir, {
+        platform: 'linux',
+        required: true,
+        foreignArch: false,
+        profile: 'system',
+        targetNames: ['deb'],
+        hostPlatform: 'linux',
+        elfInspector: validElfInspector(fixture.nativeDir, manifest, {
+            [FRAME_COPY_ARTIFACTS.helper]: {
+                needed: [
+                    manifest.libmpvSoname,
+                    'libEGL.so.1',
+                    'libc.so.6',
+                    'libsurprise.so.1',
+                ],
+                rpath: [],
+                runpath: ['$ORIGIN/lib'],
+            },
+        }),
+    });
+
+    assert.match(
+        errors.join('\n'),
+        /helper dependency is not bundled or allowlisted.*libsurprise\.so\.1/
+    );
+});
 
 test('resolveElectronBuilderArchName maps builder-util Arch enum values', () => {
     assert.equal(resolveElectronBuilderArchName(0), 'ia32');
@@ -24,8 +1331,11 @@ test('resolveElectronBuilderArchName maps builder-util Arch enum values', () =>
     assert.equal(resolveElectronBuilderArchName(99), null);
 });
 
-test('flags Linux packages whose arch differs from the built addon', () => {
-    assert.equal(isForeignLinuxEmbeddedMpvArch('linux', 3, X64_ADDON_ENV), true);
+test('flags every non-x64 Linux package regardless of configured build arch', () => {
+    assert.equal(
+        isForeignLinuxEmbeddedMpvArch('linux', 3, X64_ADDON_ENV),
+        true
+    );
     assert.equal(
         isForeignLinuxEmbeddedMpvArch('linux', 'armv7l', X64_ADDON_ENV),
         true
@@ -34,6 +1344,12 @@ test('flags Linux packages whose arch differs from the built addon', () => {
         isForeignLinuxEmbeddedMpvArch('linux', 'x64', X64_ADDON_ENV),
         false
     );
+    assert.equal(
+        isForeignLinuxEmbeddedMpvArch('linux', 'arm64', {
+            IPTVNATOR_EMBEDDED_MPV_ARCH: 'arm64',
+        }),
+        true
+    );
     // Only Linux fans out foreign arches from one dist tree.
     assert.equal(
         isForeignLinuxEmbeddedMpvArch('darwin', 'arm64', X64_ADDON_ENV),
@@ -53,6 +1369,33 @@ test('derives package arch from electron-builder Linux output directory names',
     assert.equal(linuxUnpackedDirArch('win-unpacked'), null);
 });
 
+test('derives the exact selected Linux targets for each configured architecture', () => {
+    const configuredTargets = [
+        {
+            target: 'AppImage',
+            arch: ['x64', 'arm64'],
+        },
+        {
+            target: 'deb',
+            arch: ['x64'],
+        },
+        {
+            target: 'Snap',
+            arch: ['arm64'],
+        },
+        'rpm',
+    ];
+
+    assert.deepEqual(
+        resolveConfiguredLinuxTargetNames(configuredTargets, 'x64'),
+        ['appimage', 'deb', 'rpm']
+    );
+    assert.deepEqual(
+        resolveConfiguredLinuxTargetNames(configuredTargets, 'arm64'),
+        ['appimage', 'rpm', 'snap']
+    );
+});
+
 function createResourceDir(files) {
     const resourceDir = fs.mkdtempSync(
         join(os.tmpdir(), 'iptvnator-embedded-mpv-arch-')
diff --git a/tools/packaging/embedded-mpv-frame-copy-files.cjs b/tools/packaging/embedded-mpv-frame-copy-files.cjs
new file mode 100644
index 000000000..eedffeccc
--- /dev/null
+++ b/tools/packaging/embedded-mpv-frame-copy-files.cjs
@@ -0,0 +1,578 @@
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    validateLinuxRuntimeManifest,
+} = require('../embedded-mpv/linux-runtime-manifest.cjs');
+const {
+    validateLinuxSourceArchiveBinding,
+} = require('../embedded-mpv/linux-source-archive-contract.cjs');
+const {
+    NOTICE_MANIFEST,
+    THIRD_PARTY_NOTICES,
+    validateLinuxRuntimeNotices,
+} = require('../embedded-mpv/generate-linux-runtime-notices.cjs');
+const {
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+    validateLinuxProfileTargets,
+} = require('./linux-frame-copy-profile.cjs');
+
+const FRAME_COPY_HELPER = 'iptvnator_mpv_helper';
+const WINDOWS_FRAME_COPY_HELPER = 'iptvnator_mpv_helper.exe';
+const FRAME_COPY_READER = 'embedded_mpv_frame_reader.node';
+const EMBEDDED_MPV_ADDON = 'embedded_mpv.node';
+const RUNTIME_MANIFEST = 'embedded-mpv-runtime.json';
+const UNAVAILABLE_MARKER = 'embedded-mpv-unavailable.txt';
+const LICENSES_DIRECTORY = 'licenses';
+const VERSIONED_LIBMPV_PATTERN = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+const EXPECTED_ARTIFACTS = Object.freeze({
+    addon: EMBEDDED_MPV_ADDON,
+    frameReader: FRAME_COPY_READER,
+    helper: FRAME_COPY_HELPER,
+});
+const EXPECTED_PROCESS_ISOLATION = Object.freeze({
+    addonLoadsLibmpv: false,
+    helperLinksLibmpv: true,
+    helperRunpath: Object.freeze(['$ORIGIN/lib']),
+});
+
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function readJsonFile(filePath, label) {
+    let contents;
+    try {
+        contents = fs.readFileSync(filePath, 'utf8');
+    } catch (error) {
+        throw new Error(
+            `Unable to read ${label} at ${filePath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+    try {
+        return JSON.parse(contents);
+    } catch (error) {
+        throw new Error(
+            `Invalid JSON in ${label} at ${filePath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+}
+
+function assertRegularReadableFile(filePath, label) {
+    let stat;
+    try {
+        stat = fs.lstatSync(filePath);
+    } catch {
+        throw new Error(`Missing ${label}: ${filePath}`);
+    }
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        throw new Error(`${label} must be a regular file: ${filePath}`);
+    }
+    try {
+        fs.accessSync(filePath, fs.constants.R_OK);
+    } catch {
+        throw new Error(`${label} must be readable: ${filePath}`);
+    }
+    return stat;
+}
+
+function sameJson(left, right) {
+    return isDeepStrictEqual(left, right);
+}
+
+function normalizeTargetNames(targetNames) {
+    if (!Array.isArray(targetNames) || targetNames.length === 0) {
+        throw new Error(
+            'Linux frame-copy packaging requires at least one target.'
+        );
+    }
+    const normalized = [];
+    for (const targetName of targetNames) {
+        const name = String(targetName ?? '')
+            .trim()
+            .toLowerCase();
+        if (!name) {
+            throw new Error(
+                'Linux frame-copy target names must be non-empty strings.'
+            );
+        }
+        if (normalized.includes(name)) {
+            throw new Error(`Linux frame-copy target "${name}" is duplicated.`);
+        }
+        normalized.push(name);
+    }
+    return normalized.sort();
+}
+
+function validateLinuxFrameCopyBuildManifest(manifest) {
+    const errors = [];
+    if (!isObject(manifest)) {
+        return ['Linux frame-copy build manifest must be an object.'];
+    }
+    for (const [field, expected] of [
+        ['schemaVersion', 1],
+        ['origin', 'linux-frame-copy-build'],
+        ['platform', 'linux'],
+        ['arch', 'x64'],
+        ['buildInputMode', 'bundled-runtime'],
+        ['sourceRuntimeValidated', true],
+    ]) {
+        if (manifest[field] !== expected) {
+            errors.push(
+                `Linux frame-copy build manifest ${field} must equal ${JSON.stringify(
+                    expected
+                )}.`
+            );
+        }
+    }
+    if (!sameJson(manifest.allowedPackageRuntimeModes, ['system', 'bundled'])) {
+        errors.push(
+            'Linux frame-copy build manifest allowedPackageRuntimeModes must contain exactly system and bundled.'
+        );
+    }
+    if (
+        !sameJson(manifest.packageRuntimeAvailability, {
+            system: true,
+            bundled: true,
+        })
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest packageRuntimeAvailability must mark exactly system and bundled as available.'
+        );
+    }
+    if (!sameJson(manifest.artifacts, EXPECTED_ARTIFACTS)) {
+        errors.push(
+            'Linux frame-copy build manifest artifacts must name the addon, frame reader, and helper exactly.'
+        );
+    }
+    if (!sameJson(manifest.processIsolation, EXPECTED_PROCESS_ISOLATION)) {
+        errors.push(
+            'Linux frame-copy build manifest processIsolation contract is invalid.'
+        );
+    }
+    if (manifest.nativeViewFallback !== 'process-isolated mpv --wid') {
+        errors.push(
+            'Linux frame-copy build manifest nativeViewFallback contract is invalid.'
+        );
+    }
+    if (
+        typeof manifest.generatedAt !== 'string' ||
+        Number.isNaN(Date.parse(manifest.generatedAt))
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest generatedAt must be a valid timestamp.'
+        );
+    }
+    if (
+        typeof manifest.libmpvSoname !== 'string' ||
+        !VERSIONED_LIBMPV_PATTERN.test(manifest.libmpvSoname)
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest libmpvSoname must be a versioned libmpv SONAME.'
+        );
+    }
+    const sourceLinkerAlias =
+        manifest.sourceRuntime?.runtimeDependencyClosure?.entries?.find(
+            (entry) => entry?.name === 'libmpv.so'
+        );
+    if (
+        typeof manifest.libmpvSoname === 'string' &&
+        sourceLinkerAlias?.soname !== manifest.libmpvSoname
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest libmpvSoname must be derived from the validated source runtime libmpv.so SONAME.'
+        );
+    }
+    const sourceErrors = validateLinuxRuntimeManifest(manifest.sourceRuntime);
+    errors.push(
+        ...sourceErrors.map(
+            (error) => `Invalid bundled source runtime: ${error}`
+        )
+    );
+    errors.push(
+        ...validateLinuxSourceArchiveBinding(manifest.sourceArchive).map(
+            (error) => `Invalid Linux source archive binding: ${error}`
+        )
+    );
+    if (
+        Array.isArray(manifest.runtimeFiles) &&
+        Array.isArray(manifest.sourceRuntime?.runtimeFiles) &&
+        !sameJson(manifest.runtimeFiles, manifest.sourceRuntime.runtimeFiles)
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest runtimeFiles must exactly match sourceRuntime.runtimeFiles.'
+        );
+    }
+    const expectedTotal = Array.isArray(manifest.runtimeFiles)
+        ? manifest.runtimeFiles.reduce(
+              (total, runtimeFile) =>
+                  total +
+                  (isObject(runtimeFile) &&
+                  Number.isInteger(runtimeFile.size) &&
+                  runtimeFile.size > 0
+                      ? runtimeFile.size
+                      : 0),
+              0
+          )
+        : 0;
+    if (manifest.runtimeTotalBytes !== expectedTotal) {
+        errors.push(
+            `Linux frame-copy build manifest runtimeTotalBytes must equal ${expectedTotal}.`
+        );
+    }
+    if (
+        Array.isArray(manifest.runtimeFiles) &&
+        typeof manifest.libmpvSoname === 'string' &&
+        !manifest.runtimeFiles.some(
+            (runtimeFile) => runtimeFile.name === manifest.libmpvSoname
+        )
+    ) {
+        errors.push(
+            'Linux frame-copy build manifest runtimeFiles must include libmpvSoname.'
+        );
+    }
+    return errors;
+}
+
+function verifyBundledRuntimeFiles(nativeDir, manifest) {
+    const libDir = path.join(nativeDir, 'lib');
+    let libDirStat;
+    try {
+        libDirStat = fs.lstatSync(libDir);
+    } catch {
+        throw new Error(`Missing bundled runtime directory: ${libDir}`);
+    }
+    if (!libDirStat.isDirectory() || libDirStat.isSymbolicLink()) {
+        throw new Error(
+            `Bundled runtime directory must be a regular directory: ${libDir}`
+        );
+    }
+
+    const declaredFiles = new Map(
+        manifest.runtimeFiles.map((runtimeFile) => [
+            runtimeFile.name,
+            runtimeFile,
+        ])
+    );
+    for (const entry of fs.readdirSync(libDir, { withFileTypes: true })) {
+        if (!declaredFiles.has(entry.name)) {
+            throw new Error(
+                `Found undeclared bundled runtime file ${entry.name} in ${libDir}.`
+            );
+        }
+    }
+
+    for (const runtimeFile of manifest.runtimeFiles) {
+        const runtimePath = path.join(libDir, runtimeFile.name);
+        let stat;
+        try {
+            stat = fs.lstatSync(runtimePath);
+        } catch {
+            throw new Error(`Missing bundled runtime file: ${runtimePath}`);
+        }
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            throw new Error(
+                `Bundled runtime file must be a materialized regular file: ${runtimePath}`
+            );
+        }
+        try {
+            fs.accessSync(runtimePath, fs.constants.R_OK);
+        } catch {
+            throw new Error(
+                `Bundled runtime file must be readable: ${runtimePath}`
+            );
+        }
+        const contents = fs.readFileSync(runtimePath);
+        if (contents.length !== runtimeFile.size) {
+            throw new Error(
+                `Bundled runtime file size mismatch for ${runtimeFile.name}: expected ${runtimeFile.size}, received ${contents.length}.`
+            );
+        }
+        const actualSha256 = crypto
+            .createHash('sha256')
+            .update(contents)
+            .digest('hex');
+        if (actualSha256 !== runtimeFile.sha256) {
+            throw new Error(
+                `Bundled runtime file SHA-256 mismatch for ${runtimeFile.name}: expected ${runtimeFile.sha256}, received ${actualSha256}.`
+            );
+        }
+    }
+}
+
+function writeManifest(nativeDir, manifest) {
+    const manifestPath = path.join(nativeDir, RUNTIME_MANIFEST);
+    fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`, {
+        mode: 0o644,
+    });
+    return manifest;
+}
+
+function removeLinuxRuntimeNotices(nativeDir) {
+    for (const relativePath of [
+        NOTICE_MANIFEST,
+        THIRD_PARTY_NOTICES,
+        LICENSES_DIRECTORY,
+        'notices',
+    ]) {
+        fs.rmSync(path.join(nativeDir, relativePath), {
+            recursive: true,
+            force: true,
+        });
+    }
+}
+
+function prepareBundledLinuxRuntimeNotices(
+    nativeDir,
+    sourceRuntime,
+    noticeSourceDir
+) {
+    if (noticeSourceDir) {
+        const sourceErrors = validateLinuxRuntimeNotices(
+            noticeSourceDir,
+            sourceRuntime
+        );
+        if (sourceErrors.length > 0) {
+            throw new Error(
+                [
+                    `Invalid Linux runtime notice source at ${noticeSourceDir}.`,
+                    ...sourceErrors.map((error) => `- ${error}`),
+                ].join('\n')
+            );
+        }
+        removeLinuxRuntimeNotices(nativeDir);
+        for (const relativePath of [
+            NOTICE_MANIFEST,
+            THIRD_PARTY_NOTICES,
+            LICENSES_DIRECTORY,
+        ]) {
+            fs.cpSync(
+                path.join(noticeSourceDir, relativePath),
+                path.join(nativeDir, relativePath),
+                {
+                    recursive: true,
+                    force: true,
+                }
+            );
+        }
+    }
+
+    const packagedErrors = validateLinuxRuntimeNotices(
+        nativeDir,
+        sourceRuntime,
+        { allowUnrelatedFiles: true }
+    );
+    if (packagedErrors.length > 0) {
+        throw new Error(
+            [
+                `Invalid packaged Linux runtime notices at ${nativeDir}.`,
+                ...packagedErrors.map((error) => `- ${error}`),
+            ].join('\n')
+        );
+    }
+}
+
+function createPackagedManifest(buildManifest, profile, targetNames) {
+    const bundled = profile.runtimeMode === 'bundled';
+    const runtimeFiles = bundled
+        ? buildManifest.runtimeFiles.map((runtimeFile) => ({ ...runtimeFile }))
+        : [];
+    return {
+        schemaVersion: 1,
+        origin: profile.manifestOrigin,
+        generatedAt: buildManifest.generatedAt,
+        platform: 'linux',
+        arch: 'x64',
+        profile: profile.name,
+        runtimeMode: profile.runtimeMode,
+        targets: [...new Set(targetNames)].sort(),
+        artifacts: {
+            addon: {
+                name: EMBEDDED_MPV_ADDON,
+                regularFile: true,
+                readable: true,
+            },
+            frameReader: {
+                name: FRAME_COPY_READER,
+                regularFile: true,
+                readable: true,
+            },
+            helper: {
+                name: FRAME_COPY_HELPER,
+                regularFile: true,
+                readable: true,
+                executable: true,
+            },
+        },
+        processIsolation: {
+            addonLoadsLibmpv: false,
+            readerLoadsLibmpv: false,
+            electronLoadsLibmpv: false,
+            helperLinksLibmpv: true,
+            helperRunpath: ['$ORIGIN/lib'],
+        },
+        nativeViewFallback: buildManifest.nativeViewFallback,
+        libmpvSoname: buildManifest.libmpvSoname,
+        packageDependencies:
+            profile.runtimeMode === 'system'
+                ? { ...LINUX_SYSTEM_PACKAGE_DEPENDENCIES }
+                : {},
+        runtimeFiles,
+        runtimeTotalBytes: runtimeFiles.reduce(
+            (total, runtimeFile) => total + runtimeFile.size,
+            0
+        ),
+        ...(bundled
+            ? {
+                  runtimeDependencyClosure: {
+                      entries:
+                          buildManifest.sourceRuntime.runtimeDependencyClosure.entries.map(
+                              (entry) => ({
+                                  name: entry.name,
+                                  soname: entry.soname ?? null,
+                                  needed: [...entry.needed],
+                                  rpath: [...entry.rpath],
+                                  runpath: [...entry.runpath],
+                              })
+                          ),
+                      externalDependencies: [
+                          ...buildManifest.sourceRuntime
+                              .runtimeDependencyClosure.externalDependencies,
+                      ],
+                  },
+                  externalSystemLibraries:
+                      buildManifest.sourceRuntime.externalSystemLibraries.map(
+                          (entry) => ({ ...entry })
+                      ),
+                  sourceArchive: structuredClone(buildManifest.sourceArchive),
+                  sourceRuntime: structuredClone(buildManifest.sourceRuntime),
+              }
+            : {}),
+    };
+}
+
+function prepareNativeViewOnlyLinuxArtifacts(nativeDir) {
+    for (const fileName of [
+        FRAME_COPY_HELPER,
+        WINDOWS_FRAME_COPY_HELPER,
+        FRAME_COPY_READER,
+        UNAVAILABLE_MARKER,
+    ]) {
+        fs.rmSync(path.join(nativeDir, fileName), { force: true });
+    }
+    fs.rmSync(path.join(nativeDir, 'lib'), { recursive: true, force: true });
+    removeLinuxRuntimeNotices(nativeDir);
+
+    return writeManifest(nativeDir, {
+        schemaVersion: 1,
+        origin: 'external-mpv-process',
+        platform: 'linux',
+        arch: 'x64',
+        runtimeMode: 'native-view-only',
+        frameCopyAvailable: false,
+        artifacts: {
+            addon: EMBEDDED_MPV_ADDON,
+        },
+        nativeViewFallback: 'process-isolated mpv --wid',
+    });
+}
+
+function prepareLinuxFrameCopyArtifacts(nativeDir, options = {}) {
+    if (!options.profile) {
+        return prepareNativeViewOnlyLinuxArtifacts(nativeDir);
+    }
+    const profile = resolveLinuxFrameCopyProfile(options.profile);
+    const targetNames = normalizeTargetNames(options.targetNames);
+    const targetErrors = validateLinuxProfileTargets(profile.name, targetNames);
+    if (targetErrors.length > 0) {
+        throw new Error(targetErrors.join('\n'));
+    }
+
+    const addonPath = path.join(nativeDir, EMBEDDED_MPV_ADDON);
+    const readerPath = path.join(nativeDir, FRAME_COPY_READER);
+    const helperPath = path.join(nativeDir, FRAME_COPY_HELPER);
+    const manifestPath = path.join(nativeDir, RUNTIME_MANIFEST);
+    assertRegularReadableFile(addonPath, 'embedded MPV addon');
+    assertRegularReadableFile(readerPath, 'embedded MPV frame reader');
+    assertRegularReadableFile(helperPath, 'embedded MPV frame-copy helper');
+    assertRegularReadableFile(manifestPath, 'embedded MPV runtime manifest');
+
+    const buildManifest = readJsonFile(
+        manifestPath,
+        'embedded MPV runtime manifest'
+    );
+    const manifestErrors = validateLinuxFrameCopyBuildManifest(buildManifest);
+    if (manifestErrors.length > 0) {
+        throw new Error(
+            ['Invalid Linux frame-copy build manifest.', ...manifestErrors]
+                .map((error) => `- ${error}`)
+                .join('\n')
+        );
+    }
+    verifyBundledRuntimeFiles(nativeDir, buildManifest);
+
+    fs.chmodSync(helperPath, 0o755);
+    fs.chmodSync(readerPath, 0o644);
+    fs.rmSync(path.join(nativeDir, WINDOWS_FRAME_COPY_HELPER), { force: true });
+    fs.rmSync(path.join(nativeDir, UNAVAILABLE_MARKER), { force: true });
+    if (profile.runtimeMode === 'system') {
+        fs.rmSync(path.join(nativeDir, 'lib'), {
+            recursive: true,
+            force: true,
+        });
+        removeLinuxRuntimeNotices(nativeDir);
+    } else {
+        prepareBundledLinuxRuntimeNotices(
+            nativeDir,
+            buildManifest.sourceRuntime,
+            options.noticeSourceDir
+        );
+    }
+
+    return writeManifest(
+        nativeDir,
+        createPackagedManifest(buildManifest, profile, targetNames)
+    );
+}
+
+function preparePackagedFrameCopyArtifacts(nativeDir, platform, options = {}) {
+    if (platform === 'linux') {
+        return prepareLinuxFrameCopyArtifacts(nativeDir, options);
+    }
+
+    const helperPath = path.join(
+        nativeDir,
+        platform === 'win32' ? WINDOWS_FRAME_COPY_HELPER : FRAME_COPY_HELPER
+    );
+
+    if (platform !== 'win32' && fs.existsSync(helperPath)) {
+        // Asset copying drops POSIX modes; restore spawn permission.
+        fs.chmodSync(helperPath, 0o755);
+    }
+    return undefined;
+}
+
+function removeStaleFrameCopyArtifacts(nativeDir) {
+    for (const fileName of [
+        FRAME_COPY_HELPER,
+        WINDOWS_FRAME_COPY_HELPER,
+        FRAME_COPY_READER,
+    ]) {
+        fs.rmSync(path.join(nativeDir, fileName), { force: true });
+    }
+    removeLinuxRuntimeNotices(nativeDir);
+}
+
+module.exports = {
+    preparePackagedFrameCopyArtifacts,
+    removeStaleFrameCopyArtifacts,
+    validateLinuxFrameCopyBuildManifest,
+};
diff --git a/tools/packaging/embedded-mpv-packaging.cjs b/tools/packaging/embedded-mpv-packaging.cjs
index 8e3147d1a..173c89b09 100644
--- a/tools/packaging/embedded-mpv-packaging.cjs
+++ b/tools/packaging/embedded-mpv-packaging.cjs
@@ -1,9 +1,73 @@
+const crypto = require('node:crypto');
 const fs = require('fs');
 const path = require('path');
 const { spawnSync } = require('child_process');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    EXTERNAL_SYSTEM_LIBRARIES,
+    GLIBC_TOOLCHAIN_ALLOWLIST,
+    parseReadelfDynamic,
+    validateRuntimeDependencyClosure,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
+const {
+    validateLinuxRuntimeManifest,
+} = require('../embedded-mpv/linux-runtime-manifest.cjs');
+const {
+    validateLinuxSourceArchiveBinding,
+} = require('../embedded-mpv/linux-source-archive-contract.cjs');
+const {
+    NOTICE_MANIFEST,
+    THIRD_PARTY_NOTICES,
+    validateLinuxRuntimeNotices,
+} = require('../embedded-mpv/generate-linux-runtime-notices.cjs');
+const {
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+    validateLinuxProfileTargets,
+} = require('./linux-frame-copy-profile.cjs');
+const { resolveLinuxLauncherLayout } = require('./linux-launcher-layout.cjs');
 
 const forbiddenRuntimePathPrefixes = ['/opt/homebrew/', '/usr/local/'];
 const systemRuntimePathPrefixes = ['/System/Library/', '/usr/lib/'];
+const windowsMpvRuntimeNames = [
+    'mpv-2.dll',
+    'libmpv-2.dll',
+    'mpv.dll',
+    'libmpv.dll',
+];
+const linuxFrameCopyArtifacts = Object.freeze({
+    addon: Object.freeze({
+        name: 'embedded_mpv.node',
+        regularFile: true,
+        readable: true,
+    }),
+    frameReader: Object.freeze({
+        name: 'embedded_mpv_frame_reader.node',
+        regularFile: true,
+        readable: true,
+    }),
+    helper: Object.freeze({
+        name: 'iptvnator_mpv_helper',
+        regularFile: true,
+        readable: true,
+        executable: true,
+    }),
+});
+const linuxFrameCopyProcessIsolation = Object.freeze({
+    addonLoadsLibmpv: false,
+    readerLoadsLibmpv: false,
+    electronLoadsLibmpv: false,
+    helperLinksLibmpv: true,
+    helperRunpath: Object.freeze(['$ORIGIN/lib']),
+});
+const linuxNativeViewFallback = 'process-isolated mpv --wid';
+const versionedLinuxLibmpvPattern = /^libmpv\.so\.\d+(?:\.\d+)*$/;
+const anyLinuxLibmpvPattern = /^libmpv\.so(?:\.|$)/;
+const linuxRuntimeLegalPaths = Object.freeze([
+    NOTICE_MANIFEST,
+    THIRD_PARTY_NOTICES,
+    'licenses',
+]);
 
 function run(command, args, options = {}) {
     const result = spawnSync(command, args, {
@@ -67,6 +131,177 @@ function listRuntimeFiles(directoryPath) {
         .sort();
 }
 
+function assertPeRange(image, offset, size, label) {
+    if (
+        !Number.isSafeInteger(offset) ||
+        !Number.isSafeInteger(size) ||
+        offset < 0 ||
+        size < 0 ||
+        offset + size > image.length
+    ) {
+        throw new Error(`Invalid PE image: ${label} is out of range.`);
+    }
+}
+
+function readPeImportedDllNames(binaryPath) {
+    const image = fs.readFileSync(binaryPath);
+    assertPeRange(image, 0, 0x40, 'DOS header');
+    if (image.toString('ascii', 0, 2) !== 'MZ') {
+        throw new Error('Invalid PE image: missing DOS signature.');
+    }
+
+    const peOffset = image.readUInt32LE(0x3c);
+    assertPeRange(image, peOffset, 24, 'PE header');
+    if (image.toString('ascii', peOffset, peOffset + 4) !== 'PE\0\0') {
+        throw new Error('Invalid PE image: missing PE signature.');
+    }
+
+    const sectionCount = image.readUInt16LE(peOffset + 6);
+    const optionalHeaderSize = image.readUInt16LE(peOffset + 20);
+    const optionalHeaderOffset = peOffset + 24;
+    assertPeRange(
+        image,
+        optionalHeaderOffset,
+        optionalHeaderSize,
+        'optional header'
+    );
+
+    const optionalMagic = image.readUInt16LE(optionalHeaderOffset);
+    const dataDirectoryOffset =
+        optionalMagic === 0x20b
+            ? optionalHeaderOffset + 112
+            : optionalMagic === 0x10b
+              ? optionalHeaderOffset + 96
+              : null;
+    const directoryCountOffset =
+        optionalMagic === 0x20b
+            ? optionalHeaderOffset + 108
+            : optionalMagic === 0x10b
+              ? optionalHeaderOffset + 92
+              : null;
+    if (dataDirectoryOffset === null || directoryCountOffset === null) {
+        throw new Error(
+            `Invalid PE image: unsupported optional-header magic 0x${optionalMagic.toString(16)}.`
+        );
+    }
+    const optionalHeaderEnd = optionalHeaderOffset + optionalHeaderSize;
+    if (
+        directoryCountOffset + 4 > optionalHeaderEnd ||
+        dataDirectoryOffset + 16 > optionalHeaderEnd
+    ) {
+        throw new Error(
+            'Invalid PE image: data directories exceed the optional header.'
+        );
+    }
+    assertPeRange(image, directoryCountOffset, 4, 'data-directory count');
+    if (image.readUInt32LE(directoryCountOffset) < 2) {
+        return [];
+    }
+    assertPeRange(image, dataDirectoryOffset + 8, 8, 'import directory');
+
+    const importRva = image.readUInt32LE(dataDirectoryOffset + 8);
+    const importSize = image.readUInt32LE(dataDirectoryOffset + 12);
+    if (importRva === 0 && importSize === 0) {
+        return [];
+    }
+    if (importRva === 0 || importSize < 20) {
+        throw new Error('Invalid PE image: malformed import directory.');
+    }
+
+    const sectionTableOffset = optionalHeaderOffset + optionalHeaderSize;
+    assertPeRange(
+        image,
+        sectionTableOffset,
+        sectionCount * 40,
+        'section table'
+    );
+    const sections = Array.from({ length: sectionCount }, (_, index) => {
+        const offset = sectionTableOffset + index * 40;
+        return {
+            virtualSize: image.readUInt32LE(offset + 8),
+            virtualAddress: image.readUInt32LE(offset + 12),
+            rawSize: image.readUInt32LE(offset + 16),
+            rawOffset: image.readUInt32LE(offset + 20),
+        };
+    });
+
+    const rvaToLocation = (rva, label) => {
+        const section = sections.find(
+            (candidate) =>
+                rva >= candidate.virtualAddress &&
+                rva <
+                    candidate.virtualAddress +
+                        Math.max(candidate.virtualSize, candidate.rawSize)
+        );
+        if (!section) {
+            throw new Error(
+                `Invalid PE image: ${label} RVA 0x${rva.toString(16)} is not mapped.`
+            );
+        }
+
+        const sectionOffset = rva - section.virtualAddress;
+        if (sectionOffset >= section.rawSize) {
+            throw new Error(
+                `Invalid PE image: ${label} is outside section file data.`
+            );
+        }
+        const offset = section.rawOffset + sectionOffset;
+        assertPeRange(image, offset, 1, label);
+        return {
+            offset,
+            sectionEnd: section.rawOffset + section.rawSize,
+        };
+    };
+
+    const importedDllNames = [];
+    const descriptorCount = Math.floor(importSize / 20);
+    let foundTerminator = false;
+    for (let index = 0; index < descriptorCount; index += 1) {
+        const descriptorLocation = rvaToLocation(
+            importRva + index * 20,
+            'import descriptor'
+        );
+        const descriptorOffset = descriptorLocation.offset;
+        if (descriptorOffset + 20 > descriptorLocation.sectionEnd) {
+            throw new Error(
+                'Invalid PE image: import descriptor crosses section file data.'
+            );
+        }
+        assertPeRange(image, descriptorOffset, 20, 'import descriptor');
+        const descriptor = image.subarray(
+            descriptorOffset,
+            descriptorOffset + 20
+        );
+        if (descriptor.every((value) => value === 0)) {
+            foundTerminator = true;
+            break;
+        }
+
+        const nameRva = image.readUInt32LE(descriptorOffset + 12);
+        const nameLocation = rvaToLocation(nameRva, 'imported DLL name');
+        const nameOffset = nameLocation.offset;
+        const nameEnd = image.indexOf(0, nameOffset);
+        if (nameEnd < 0 || nameEnd >= nameLocation.sectionEnd) {
+            throw new Error(
+                'Invalid PE image: imported DLL name is not terminated.'
+            );
+        }
+        const name = image.toString('ascii', nameOffset, nameEnd);
+        if (!name) {
+            throw new Error('Invalid PE image: imported DLL name is empty.');
+        }
+        importedDllNames.push(name);
+    }
+
+    if (!foundTerminator) {
+        throw new Error(
+            'Invalid PE image: import descriptor table has no terminator.'
+        );
+    }
+
+    return [...new Set(importedDllNames)];
+}
+
 function parseOtoolDependencies(binaryPath) {
     const output = run('otool', ['-L', binaryPath]);
     return output
@@ -426,16 +661,12 @@ function getPackagedRuntimeCandidates(libDir, platform, nativeDir) {
                 path.join(libDir, 'libmpv.dylib'),
             ];
         case 'win32':
-            return [
-                nativeDir ? path.join(nativeDir, 'mpv-2.dll') : null,
-                nativeDir ? path.join(nativeDir, 'libmpv-2.dll') : null,
-                nativeDir ? path.join(nativeDir, 'mpv.dll') : null,
-                nativeDir ? path.join(nativeDir, 'libmpv.dll') : null,
-                path.join(libDir, 'mpv-2.dll'),
-                path.join(libDir, 'libmpv-2.dll'),
-                path.join(libDir, 'mpv.dll'),
-                path.join(libDir, 'libmpv.dll'),
-            ].filter(Boolean);
+            return windowsMpvRuntimeNames.flatMap((name) =>
+                [
+                    nativeDir ? path.join(nativeDir, name) : null,
+                    path.join(libDir, name),
+                ].filter(Boolean)
+            );
         case 'linux':
             return [];
         default:
@@ -465,27 +696,80 @@ const ELECTRON_BUILDER_ARCH_NAMES = [
 
 function resolveElectronBuilderArchName(arch) {
     if (typeof arch === 'string') {
-        return arch;
+        return ELECTRON_BUILDER_ARCH_NAMES.includes(arch) ? arch : null;
     }
     return ELECTRON_BUILDER_ARCH_NAMES[arch] ?? null;
 }
 
-function getEmbeddedMpvAddonArch(env = process.env) {
-    return env.IPTVNATOR_EMBEDDED_MPV_ARCH || process.arch;
+function resolveConfiguredLinuxTargetNames(configuredTargets, targetArch) {
+    if (!Array.isArray(configuredTargets)) {
+        throw new TypeError('Electron Builder linux.target must be an array.');
+    }
+    const archName = resolveElectronBuilderArchName(targetArch);
+    if (!archName) {
+        throw new Error(
+            `Unknown Electron Builder architecture: ${String(targetArch)}.`
+        );
+    }
+
+    const targetNames = new Set();
+    for (const target of configuredTargets) {
+        const targetName =
+            typeof target === 'string'
+                ? target
+                : target && typeof target === 'object'
+                  ? target.target
+                  : null;
+        if (typeof targetName !== 'string' || targetName.trim() === '') {
+            throw new Error(
+                'Electron Builder Linux targets must have a non-empty target name.'
+            );
+        }
+
+        if (target && typeof target === 'object' && target.arch !== undefined) {
+            const configuredArches = Array.isArray(target.arch)
+                ? target.arch
+                : [target.arch];
+            const configuredArchNames = configuredArches.map(
+                (configuredArch) => {
+                    const configuredArchName =
+                        resolveElectronBuilderArchName(configuredArch);
+                    if (!configuredArchName) {
+                        throw new Error(
+                            `Unknown Electron Builder architecture: ${String(
+                                configuredArch
+                            )}.`
+                        );
+                    }
+                    return configuredArchName;
+                }
+            );
+            if (!configuredArchNames.includes(archName)) {
+                continue;
+            }
+        }
+        targetNames.add(targetName.trim().toLowerCase());
+    }
+
+    if (targetNames.size === 0) {
+        throw new Error(
+            `Electron Builder has no Linux targets configured for ${archName}.`
+        );
+    }
+    return [...targetNames].sort();
 }
 
 /**
- * The embedded MPV addon is compiled once per CI host (x64 on Linux), but
- * electron-builder also produces arm64/armv7l Linux packages from the same
- * dist output. Those packages must not ship a foreign-architecture
- * `embedded_mpv.node` — it can never load and produces a cryptic error.
+ * Official Linux frame-copy support is x64-only. electron-builder also
+ * produces arm64/armv7l packages, which must always carry only the
+ * unavailable marker and native-view fallback.
  */
-function isForeignLinuxEmbeddedMpvArch(platform, targetArch, env = process.env) {
+function isForeignLinuxEmbeddedMpvArch(platform, targetArch) {
     if (normalizeEmbeddedMpvPlatform(platform) !== 'linux') {
         return false;
     }
     const archName = resolveElectronBuilderArchName(targetArch);
-    return Boolean(archName) && archName !== getEmbeddedMpvAddonArch(env);
+    return Boolean(archName) && archName !== 'x64';
 }
 
 // Maps electron-builder Linux output directory names (`linux-unpacked`,
@@ -499,8 +783,1029 @@ function linuxUnpackedDirArch(unpackedDirName) {
     return match[1] ?? 'x64';
 }
 
+function pathExistsByLstat(filePath) {
+    try {
+        fs.lstatSync(filePath);
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+function inspectRegularReadableFile(
+    filePath,
+    label,
+    errors,
+    expectedMode = null
+) {
+    let stat;
+    try {
+        stat = fs.lstatSync(filePath);
+    } catch {
+        errors.push(`Missing ${label}: ${filePath}`);
+        return null;
+    }
+
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        errors.push(`${label} must be a regular file: ${filePath}`);
+        return null;
+    }
+    try {
+        fs.accessSync(filePath, fs.constants.R_OK);
+    } catch {
+        errors.push(`${label} must be readable: ${filePath}`);
+    }
+
+    if (expectedMode !== null && (stat.mode & 0o7777) !== expectedMode) {
+        errors.push(
+            `${label} must have mode ${expectedMode
+                .toString(8)
+                .padStart(4, '0')}: ${filePath}`
+        );
+    }
+    return stat;
+}
+
+function readPackagedJson(filePath, label, errors) {
+    let contents;
+    try {
+        contents = fs.readFileSync(filePath, 'utf8');
+    } catch (error) {
+        errors.push(
+            `Unable to read ${label} at ${filePath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return null;
+    }
+
+    try {
+        return JSON.parse(contents);
+    } catch (error) {
+        errors.push(
+            `Invalid JSON in ${label} at ${filePath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return null;
+    }
+}
+
+function validateForeignLinuxNativeDir(nativeDir) {
+    const errors = [];
+    const markerName = 'embedded-mpv-unavailable.txt';
+    const markerPath = path.join(nativeDir, markerName);
+    let nativeStat;
+    try {
+        nativeStat = fs.lstatSync(nativeDir);
+    } catch {
+        return [
+            `Missing embedded MPV unavailable marker for foreign-architecture package: ${markerPath}`,
+        ];
+    }
+    if (!nativeStat.isDirectory() || nativeStat.isSymbolicLink()) {
+        return [
+            `Foreign-architecture embedded MPV native path must be a regular directory: ${nativeDir}`,
+        ];
+    }
+
+    const entries = fs.readdirSync(nativeDir).sort();
+    const unexpectedEntries = entries.filter((name) => name !== markerName);
+    if (unexpectedEntries.length > 0) {
+        errors.push(
+            [
+                'Embedded MPV artifacts must not ship in foreign-architecture Linux packages; only the unavailable marker is allowed.',
+                ...unexpectedEntries.map(
+                    (name) => `- ${path.join(nativeDir, name)}`
+                ),
+            ].join('\n')
+        );
+    }
+    if (!entries.includes(markerName)) {
+        errors.push(
+            `Missing embedded MPV unavailable marker for foreign-architecture package: ${markerPath}`
+        );
+    } else {
+        inspectRegularReadableFile(
+            markerPath,
+            'embedded MPV unavailable marker',
+            errors
+        );
+    }
+    return errors;
+}
+
+function validateNativeViewOnlyLinuxPackage(
+    nativeDir,
+    addonPath,
+    manifestPath,
+    errors
+) {
+    for (const legalPath of linuxRuntimeLegalPaths) {
+        const packagedLegalPath = path.join(nativeDir, legalPath);
+        if (pathExistsByLstat(packagedLegalPath)) {
+            errors.push(
+                `Linux native-view-only packages must not ship bundled runtime legal files: ${packagedLegalPath}`
+            );
+        }
+    }
+    for (const artifactName of [
+        'iptvnator_mpv_helper',
+        'iptvnator_mpv_helper.exe',
+        'embedded_mpv_frame_reader.node',
+    ]) {
+        const artifactPath = path.join(nativeDir, artifactName);
+        if (pathExistsByLstat(artifactPath)) {
+            errors.push(
+                `Linux native-view-only packages must not ship frame-copy helpers or readers: ${artifactPath}`
+            );
+        }
+    }
+
+    const markerPath = path.join(nativeDir, 'embedded-mpv-unavailable.txt');
+    if (pathExistsByLstat(markerPath)) {
+        errors.push(
+            `Same-architecture Linux packages must not retain the unavailable marker: ${markerPath}`
+        );
+    }
+
+    const libDir = path.join(nativeDir, 'lib');
+    if (pathExistsByLstat(libDir)) {
+        errors.push(
+            `Linux native-view-only packages must not bundle libmpv or retain a private runtime directory: ${libDir}`
+        );
+    }
+
+    inspectRegularReadableFile(addonPath, 'embedded MPV native addon', errors);
+    if (
+        !inspectRegularReadableFile(
+            manifestPath,
+            'embedded MPV runtime manifest',
+            errors
+        )
+    ) {
+        return;
+    }
+    const manifest = readPackagedJson(
+        manifestPath,
+        'embedded MPV runtime manifest',
+        errors
+    );
+    if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
+        if (manifest !== null) {
+            errors.push('Embedded MPV runtime manifest must be an object.');
+        }
+        return;
+    }
+
+    const expectedFields = {
+        schemaVersion: 1,
+        origin: 'external-mpv-process',
+        platform: 'linux',
+        arch: 'x64',
+        runtimeMode: 'native-view-only',
+        frameCopyAvailable: false,
+        artifacts: { addon: 'embedded_mpv.node' },
+        nativeViewFallback: linuxNativeViewFallback,
+    };
+    for (const [field, expected] of Object.entries(expectedFields)) {
+        if (!isDeepStrictEqual(manifest[field], expected)) {
+            errors.push(
+                `Linux native-view-only manifest ${field} must equal ${JSON.stringify(
+                    expected
+                )}; received ${JSON.stringify(manifest[field])}.`
+            );
+        }
+    }
+    if (Object.hasOwn(manifest, 'profile')) {
+        errors.push(
+            'Linux native-view-only manifest must not include a frame-copy profile.'
+        );
+    }
+}
+
+function normalizeLinuxTargetNames(targetNames, errors) {
+    if (!Array.isArray(targetNames) || targetNames.length === 0) {
+        errors.push(
+            'Linux frame-copy package validation requires at least one target name.'
+        );
+        return [];
+    }
+    const normalized = [];
+    for (const targetName of targetNames) {
+        const name = String(targetName ?? '')
+            .trim()
+            .toLowerCase();
+        if (!name) {
+            errors.push(
+                'Linux frame-copy target names must be non-empty strings.'
+            );
+            continue;
+        }
+        if (normalized.includes(name)) {
+            errors.push(`Linux frame-copy target "${name}" is duplicated.`);
+            continue;
+        }
+        normalized.push(name);
+    }
+    return normalized.sort();
+}
+
+function validatePackagedManifestContract(
+    manifest,
+    profile,
+    targetNames,
+    errors
+) {
+    const expectedFields = {
+        schemaVersion: 1,
+        origin: profile.manifestOrigin,
+        platform: 'linux',
+        arch: 'x64',
+        profile: profile.name,
+        runtimeMode: profile.runtimeMode,
+        targets: targetNames,
+        artifacts: linuxFrameCopyArtifacts,
+        processIsolation: linuxFrameCopyProcessIsolation,
+        nativeViewFallback: linuxNativeViewFallback,
+    };
+    for (const [field, expected] of Object.entries(expectedFields)) {
+        if (!isDeepStrictEqual(manifest[field], expected)) {
+            errors.push(
+                `Linux frame-copy manifest ${field} for profile "${profile.name}" must equal ${JSON.stringify(
+                    expected
+                )}; received ${JSON.stringify(manifest[field])}.`
+            );
+        }
+    }
+
+    if (
+        typeof manifest.generatedAt !== 'string' ||
+        manifest.generatedAt.trim() === '' ||
+        Number.isNaN(Date.parse(manifest.generatedAt))
+    ) {
+        errors.push(
+            'Linux frame-copy manifest generatedAt must be a valid timestamp.'
+        );
+    }
+    if (
+        typeof manifest.libmpvSoname !== 'string' ||
+        !versionedLinuxLibmpvPattern.test(manifest.libmpvSoname)
+    ) {
+        errors.push(
+            'Linux frame-copy manifest libmpvSoname must be a versioned libmpv SONAME.'
+        );
+    }
+}
+
+function validateSystemLinuxRuntime(nativeDir, manifest, errors) {
+    for (const legalPath of linuxRuntimeLegalPaths) {
+        const packagedLegalPath = path.join(nativeDir, legalPath);
+        if (pathExistsByLstat(packagedLegalPath)) {
+            errors.push(
+                `Linux system frame-copy packages must not ship bundled runtime legal files: ${packagedLegalPath}`
+            );
+        }
+    }
+    if (
+        !isDeepStrictEqual(
+            manifest.packageDependencies,
+            LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+        )
+    ) {
+        errors.push(
+            `Linux system frame-copy manifest packageDependencies must equal ${JSON.stringify(
+                LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+            )}.`
+        );
+    }
+    if (!isDeepStrictEqual(manifest.runtimeFiles, [])) {
+        errors.push(
+            'Linux system frame-copy manifest runtimeFiles must be empty.'
+        );
+    }
+    if (manifest.runtimeTotalBytes !== 0) {
+        errors.push(
+            'Linux system frame-copy manifest runtimeTotalBytes must equal 0.'
+        );
+    }
+    for (const forbiddenField of [
+        'runtimeDependencyClosure',
+        'externalSystemLibraries',
+        'sourceArchive',
+        'sourceRuntime',
+    ]) {
+        if (Object.hasOwn(manifest, forbiddenField)) {
+            errors.push(
+                `Linux system frame-copy manifest must not include ${forbiddenField}.`
+            );
+        }
+    }
+
+    const libDir = path.join(nativeDir, 'lib');
+    if (pathExistsByLstat(libDir)) {
+        errors.push(
+            `Linux system frame-copy packages must not retain a private runtime directory: ${libDir}`
+        );
+    }
+}
+
+function sha256File(filePath) {
+    return crypto
+        .createHash('sha256')
+        .update(fs.readFileSync(filePath))
+        .digest('hex');
+}
+
+function validateBundledLinuxRuntime(nativeDir, manifest, errors) {
+    if (!isDeepStrictEqual(manifest.packageDependencies, {})) {
+        errors.push(
+            'Linux bundled frame-copy manifest packageDependencies must be empty.'
+        );
+    }
+
+    const sourceRuntimeErrors = validateLinuxRuntimeManifest(
+        manifest.sourceRuntime
+    );
+    errors.push(
+        ...sourceRuntimeErrors.map(
+            (error) => `Invalid packaged Linux source runtime: ${error}`
+        )
+    );
+    errors.push(
+        ...validateLinuxSourceArchiveBinding(manifest.sourceArchive).map(
+            (error) => `Invalid packaged Linux source archive binding: ${error}`
+        )
+    );
+    errors.push(
+        ...validateLinuxRuntimeNotices(nativeDir, manifest.sourceRuntime, {
+            allowUnrelatedFiles: true,
+        }).map((error) => `Invalid packaged Linux runtime notices: ${error}`)
+    );
+    if (
+        !isDeepStrictEqual(
+            manifest.runtimeFiles,
+            manifest.sourceRuntime?.runtimeFiles
+        )
+    ) {
+        errors.push(
+            'Linux bundled frame-copy manifest runtimeFiles must exactly match sourceRuntime.runtimeFiles.'
+        );
+    }
+    if (
+        !isDeepStrictEqual(
+            manifest.runtimeDependencyClosure,
+            manifest.sourceRuntime?.runtimeDependencyClosure
+        )
+    ) {
+        errors.push(
+            'Linux bundled frame-copy manifest runtimeDependencyClosure must exactly match sourceRuntime.runtimeDependencyClosure.'
+        );
+    }
+    if (
+        !isDeepStrictEqual(
+            manifest.externalSystemLibraries,
+            manifest.sourceRuntime?.externalSystemLibraries
+        )
+    ) {
+        errors.push(
+            'Linux bundled frame-copy manifest externalSystemLibraries must exactly match sourceRuntime.externalSystemLibraries.'
+        );
+    }
+
+    if (!Array.isArray(manifest.runtimeFiles)) {
+        errors.push(
+            'Linux bundled frame-copy manifest runtimeFiles must be an array.'
+        );
+        return;
+    }
+    const expectedTotal = manifest.runtimeFiles.reduce(
+        (total, runtimeFile) =>
+            total +
+            (runtimeFile &&
+            Number.isSafeInteger(runtimeFile.size) &&
+            runtimeFile.size > 0
+                ? runtimeFile.size
+                : 0),
+        0
+    );
+    if (manifest.runtimeTotalBytes !== expectedTotal) {
+        errors.push(
+            `Linux bundled frame-copy manifest runtimeTotalBytes must equal ${expectedTotal}.`
+        );
+    }
+
+    const libDir = path.join(nativeDir, 'lib');
+    let libStat;
+    try {
+        libStat = fs.lstatSync(libDir);
+    } catch {
+        errors.push(`Missing bundled Linux runtime directory: ${libDir}`);
+        return;
+    }
+    if (!libStat.isDirectory() || libStat.isSymbolicLink()) {
+        errors.push(
+            `Bundled Linux runtime path must be a regular directory: ${libDir}`
+        );
+        return;
+    }
+
+    const declaredNames = new Set();
+    for (const runtimeFile of manifest.runtimeFiles) {
+        if (
+            !runtimeFile ||
+            typeof runtimeFile.name !== 'string' ||
+            path.basename(runtimeFile.name) !== runtimeFile.name ||
+            runtimeFile.name === '.' ||
+            runtimeFile.name === '..'
+        ) {
+            errors.push(
+                `Bundled Linux runtime manifest contains an unsafe file name: ${JSON.stringify(
+                    runtimeFile?.name
+                )}.`
+            );
+            continue;
+        }
+        if (declaredNames.has(runtimeFile.name)) {
+            errors.push(
+                `Bundled Linux runtime manifest contains duplicate file ${runtimeFile.name}.`
+            );
+            continue;
+        }
+        declaredNames.add(runtimeFile.name);
+    }
+
+    let packagedEntries;
+    try {
+        packagedEntries = fs.readdirSync(libDir).sort();
+    } catch (error) {
+        errors.push(
+            `Unable to enumerate bundled Linux runtime at ${libDir}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return;
+    }
+    for (const entryName of packagedEntries) {
+        if (!declaredNames.has(entryName)) {
+            errors.push(
+                `Found undeclared bundled Linux runtime artifact: ${path.join(
+                    libDir,
+                    entryName
+                )}`
+            );
+        }
+    }
+
+    for (const runtimeFile of manifest.runtimeFiles) {
+        if (!runtimeFile || !declaredNames.has(runtimeFile.name)) {
+            continue;
+        }
+        const runtimePath = path.join(libDir, runtimeFile.name);
+        const stat = inspectRegularReadableFile(
+            runtimePath,
+            `bundled Linux runtime file ${runtimeFile.name}`,
+            errors
+        );
+        if (!stat) {
+            continue;
+        }
+        if (stat.size !== runtimeFile.size) {
+            errors.push(
+                `Bundled Linux runtime size mismatch for ${runtimeFile.name}: expected ${runtimeFile.size}, received ${stat.size}.`
+            );
+        }
+        let actualSha256;
+        try {
+            actualSha256 = sha256File(runtimePath);
+        } catch (error) {
+            errors.push(
+                `Unable to hash bundled Linux runtime file ${runtimePath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+            continue;
+        }
+        if (actualSha256 !== runtimeFile.sha256) {
+            errors.push(
+                `Bundled Linux runtime SHA-256 mismatch for ${runtimeFile.name}: expected ${runtimeFile.sha256}, received ${actualSha256}.`
+            );
+        }
+    }
+}
+
+function normalizeElfInspection(value, binaryPath) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error(
+            `ELF inspection for ${binaryPath} must return an object.`
+        );
+    }
+    const result = {
+        soname: value.soname ?? null,
+    };
+    if (
+        result.soname !== null &&
+        (typeof result.soname !== 'string' ||
+            path.basename(result.soname) !== result.soname)
+    ) {
+        throw new Error(
+            `ELF inspection for ${binaryPath} must return a safe SONAME or null.`
+        );
+    }
+    for (const field of ['needed', 'rpath', 'runpath']) {
+        if (
+            !Array.isArray(value[field]) ||
+            value[field].some((entry) => typeof entry !== 'string')
+        ) {
+            throw new Error(
+                `ELF inspection for ${binaryPath} must return string array ${field}.`
+            );
+        }
+        result[field] = [...new Set(value[field])].sort();
+    }
+    return result;
+}
+
+function dependencyFileName(dependencyName) {
+    return dependencyName.replaceAll('\\', '/').split('/').at(-1) ?? '';
+}
+
+function listElectronShippedLinuxLibraries(resourceDir, options = {}) {
+    const appDir = path.dirname(resourceDir);
+    const normalizedResourceDir = path.resolve(resourceDir);
+    const excludedSnapLibraryRoots =
+        options.artifactFormat === 'snap'
+            ? new Set(
+                  [
+                      path.join(appDir, 'lib'),
+                      path.join(appDir, 'usr', 'lib'),
+                  ].map((directoryPath) => path.resolve(directoryPath))
+              )
+            : new Set();
+    const libraries = [];
+
+    function visit(directoryPath) {
+        for (const entry of fs.readdirSync(directoryPath, {
+            withFileTypes: true,
+        })) {
+            const entryPath = path.join(directoryPath, entry.name);
+            if (path.resolve(entryPath) === normalizedResourceDir) {
+                continue;
+            }
+            if (entry.isDirectory()) {
+                if (excludedSnapLibraryRoots.has(path.resolve(entryPath))) {
+                    continue;
+                }
+                visit(entryPath);
+                continue;
+            }
+            if (
+                (entry.isFile() || entry.isSymbolicLink()) &&
+                /\.so(?:\.\d+)*$/.test(entry.name)
+            ) {
+                libraries.push(entryPath);
+            }
+        }
+    }
+
+    // afterPack and unpacked-layout checks see the pristine Electron tree, so
+    // recurse to catch future nested Electron libraries. An extracted Snap
+    // overlays package-manager lib/ and usr/lib/ trees onto that same root;
+    // exclude exactly those target-provided roots while scanning everything
+    // else recursively.
+    visit(appDir);
+    return libraries.sort();
+}
+
+function inspectLinuxElfIsolation(
+    resourceDir,
+    nativeDir,
+    manifest,
+    targetNames,
+    options,
+    errors
+) {
+    const executableName = options.executableName ?? 'iptvnator';
+    let launcherLayout;
+    try {
+        launcherLayout = resolveLinuxLauncherLayout(
+            targetNames,
+            executableName
+        );
+    } catch (error) {
+        errors.push(
+            `Unable to resolve Linux launcher layout: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return;
+    }
+
+    const hostPlatform = options.hostPlatform ?? process.platform;
+    let inspectElf = options.elfInspector;
+    if (!inspectElf) {
+        if (hostPlatform !== 'linux') {
+            return;
+        }
+        if (!commandExists('readelf')) {
+            errors.push(
+                'readelf is required to validate Linux embedded MPV packaging.'
+            );
+            return;
+        }
+        inspectElf = (binaryPath) =>
+            parseReadelfDynamic(run('readelf', ['-d', binaryPath]));
+    }
+    if (typeof inspectElf !== 'function') {
+        errors.push('Linux ELF inspector must be a function.');
+        return;
+    }
+
+    const inspectedPaths = {
+        electron: path.join(
+            path.dirname(resourceDir),
+            launcherLayout.electronBinaryName
+        ),
+        addon: path.join(nativeDir, linuxFrameCopyArtifacts.addon.name),
+        reader: path.join(nativeDir, linuxFrameCopyArtifacts.frameReader.name),
+        helper: path.join(nativeDir, linuxFrameCopyArtifacts.helper.name),
+    };
+    for (const [index, libraryPath] of listElectronShippedLinuxLibraries(
+        resourceDir,
+        { artifactFormat: options.artifactFormat }
+    ).entries()) {
+        inspectedPaths[`electronLibrary:${index}`] = libraryPath;
+    }
+    const inspections = {};
+    for (const [label, binaryPath] of Object.entries(inspectedPaths)) {
+        if (
+            !inspectRegularReadableFile(
+                binaryPath,
+                `Linux ${label} ELF binary`,
+                errors
+            )
+        ) {
+            continue;
+        }
+        try {
+            inspections[label] = normalizeElfInspection(
+                inspectElf(binaryPath),
+                binaryPath
+            );
+        } catch (error) {
+            errors.push(
+                `Unable to inspect Linux ${label} ELF binary at ${binaryPath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+        }
+    }
+
+    for (const label of Object.keys(inspections).filter(
+        (name) =>
+            name === 'electron' ||
+            name === 'addon' ||
+            name === 'reader' ||
+            name.startsWith('electronLibrary:')
+    )) {
+        const dynamic = inspections[label];
+        if (!dynamic) {
+            continue;
+        }
+        const displayLabel = label.startsWith('electronLibrary:')
+            ? 'Electron library'
+            : label;
+        for (const dependencyName of dynamic.needed) {
+            if (dependencyFileName(dependencyName) !== dependencyName) {
+                errors.push(
+                    `Linux ${displayLabel} DT_NEEDED entry must not contain a path: ${dependencyName} in ${inspectedPaths[label]}.`
+                );
+            }
+        }
+        const libmpvDependencies = dynamic.needed.filter((dependencyName) =>
+            anyLinuxLibmpvPattern.test(dependencyFileName(dependencyName))
+        );
+        if (libmpvDependencies.length > 0) {
+            errors.push(
+                `Linux ${displayLabel} must not link libmpv; found ${libmpvDependencies.join(
+                    ', '
+                )} in ${inspectedPaths[label]}.`
+            );
+        }
+    }
+
+    const helper = inspections.helper;
+    if (helper) {
+        if (!helper.needed.includes(manifest.libmpvSoname)) {
+            errors.push(
+                `Linux frame-copy helper must directly need ${manifest.libmpvSoname}.`
+            );
+        }
+        const unexpectedLibmpvDependencies = helper.needed.filter(
+            (dependencyName) =>
+                anyLinuxLibmpvPattern.test(
+                    dependencyFileName(dependencyName)
+                ) && dependencyName !== manifest.libmpvSoname
+        );
+        if (unexpectedLibmpvDependencies.length > 0) {
+            errors.push(
+                `Linux frame-copy helper must not need a different libmpv SONAME: ${unexpectedLibmpvDependencies.join(
+                    ', '
+                )}.`
+            );
+        }
+        if (helper.rpath.length > 0) {
+            errors.push(
+                `Linux frame-copy helper must not contain RPATH; found ${helper.rpath.join(
+                    ':'
+                )}.`
+            );
+        }
+        if (
+            helper.runpath.length !== 1 ||
+            helper.runpath[0] !== '$ORIGIN/lib'
+        ) {
+            errors.push(
+                `Linux frame-copy helper RUNPATH must be exactly $ORIGIN/lib; received ${
+                    helper.runpath.length > 0
+                        ? helper.runpath.join(':')
+                        : '<empty>'
+                }.`
+            );
+        }
+
+        const allowedHelperDependencies = new Set([
+            manifest.libmpvSoname,
+            ...GLIBC_TOOLCHAIN_ALLOWLIST,
+            ...EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+            ...(manifest.runtimeMode === 'bundled' &&
+            Array.isArray(manifest.runtimeFiles)
+                ? manifest.runtimeFiles.map(({ name }) => name)
+                : []),
+            ...(manifest.runtimeMode === 'bundled' &&
+            Array.isArray(
+                manifest.runtimeDependencyClosure?.externalDependencies
+            )
+                ? manifest.runtimeDependencyClosure.externalDependencies
+                : []),
+        ]);
+        for (const dependencyName of helper.needed) {
+            if (
+                dependencyFileName(dependencyName) !== dependencyName ||
+                !allowedHelperDependencies.has(dependencyName)
+            ) {
+                errors.push(
+                    `Linux frame-copy helper dependency is not bundled or allowlisted: ${dependencyName}.`
+                );
+            }
+        }
+    }
+
+    if (
+        manifest.runtimeMode !== 'bundled' ||
+        !Array.isArray(manifest.runtimeFiles)
+    ) {
+        return;
+    }
+
+    const runtimeFileNames = manifest.runtimeFiles
+        .map((runtimeFile) => runtimeFile?.name)
+        .filter((name) => typeof name === 'string');
+    const runtimeNameSet = new Set(runtimeFileNames);
+    const allowedExternalNames = new Set([
+        ...GLIBC_TOOLCHAIN_ALLOWLIST,
+        ...EXTERNAL_SYSTEM_LIBRARIES.map(({ name }) => name),
+    ]);
+    const closureEntries = [];
+    let closureHasErrors = false;
+    for (const runtimeFileName of runtimeFileNames) {
+        const runtimePath = path.join(nativeDir, 'lib', runtimeFileName);
+        let dynamic;
+        try {
+            dynamic = normalizeElfInspection(
+                inspectElf(runtimePath),
+                runtimePath
+            );
+        } catch (error) {
+            closureHasErrors = true;
+            errors.push(
+                `Unable to inspect bundled Linux runtime ELF at ${runtimePath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+            continue;
+        }
+        closureEntries.push({
+            name: runtimeFileName,
+            soname: dynamic.soname,
+            needed: dynamic.needed,
+            rpath: dynamic.rpath,
+            runpath: dynamic.runpath,
+        });
+        if (dynamic.rpath.length > 0) {
+            closureHasErrors = true;
+            errors.push(
+                `${runtimeFileName} has forbidden RPATH ${dynamic.rpath.join(
+                    ':'
+                )}.`
+            );
+        }
+        if (dynamic.runpath.length !== 1 || dynamic.runpath[0] !== '$ORIGIN') {
+            closureHasErrors = true;
+            errors.push(
+                `${runtimeFileName} RUNPATH must be exactly $ORIGIN; got ${
+                    dynamic.runpath.length > 0
+                        ? dynamic.runpath.join(':')
+                        : '<empty>'
+                }.`
+            );
+        }
+        for (const dependencyName of dynamic.needed) {
+            if (
+                !runtimeNameSet.has(dependencyName) &&
+                !allowedExternalNames.has(dependencyName)
+            ) {
+                closureHasErrors = true;
+                errors.push(
+                    `Runtime dependency is not bundled or allowlisted: ${runtimeFileName} -> ${dependencyName}.`
+                );
+            }
+        }
+    }
+
+    if (closureHasErrors) {
+        return;
+    }
+    try {
+        const actualClosure = validateRuntimeDependencyClosure({
+            entries: closureEntries,
+            runtimeFileNames,
+            buildPrefix: '',
+        });
+        if (
+            !isDeepStrictEqual(actualClosure, manifest.runtimeDependencyClosure)
+        ) {
+            errors.push(
+                'Actual bundled Linux ELF dependency closure does not match the packaged manifest.'
+            );
+        }
+    } catch (error) {
+        errors.push(
+            `Invalid bundled Linux ELF dependency closure: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+    }
+}
+
+function validateLinuxPackagedEmbeddedMpv(resourceDir, options) {
+    const nativeDir = path.join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    if (options.foreignArch) {
+        return validateForeignLinuxNativeDir(nativeDir);
+    }
+
+    const errors = [];
+    const addonPath = path.join(nativeDir, 'embedded_mpv.node');
+    const manifestPath = path.join(nativeDir, 'embedded-mpv-runtime.json');
+    if (!pathExistsByLstat(addonPath)) {
+        if (options.required) {
+            errors.push(`Missing embedded MPV native addon: ${addonPath}`);
+        }
+        if (pathExistsByLstat(nativeDir)) {
+            for (const staleName of [
+                'embedded_mpv_frame_reader.node',
+                'iptvnator_mpv_helper',
+                'iptvnator_mpv_helper.exe',
+                'embedded-mpv-runtime.json',
+                'embedded-mpv-unavailable.txt',
+                'lib',
+            ]) {
+                const stalePath = path.join(nativeDir, staleName);
+                if (pathExistsByLstat(stalePath)) {
+                    errors.push(
+                        `Embedded MPV addon is missing but stale packaged artifact remains: ${stalePath}`
+                    );
+                }
+            }
+        }
+        return errors;
+    }
+
+    if (!options.profile) {
+        if (options.required) {
+            errors.push(
+                'Linux frame-copy profile is required for a required same-architecture package.'
+            );
+        }
+        validateNativeViewOnlyLinuxPackage(
+            nativeDir,
+            addonPath,
+            manifestPath,
+            errors
+        );
+        return errors;
+    }
+
+    let profile;
+    try {
+        profile = resolveLinuxFrameCopyProfile(options.profile);
+    } catch (error) {
+        errors.push(error instanceof Error ? error.message : String(error));
+        return errors;
+    }
+    const targetNames = normalizeLinuxTargetNames(options.targetNames, errors);
+    if (targetNames.length > 0) {
+        try {
+            errors.push(
+                ...validateLinuxProfileTargets(profile.name, targetNames)
+            );
+        } catch (error) {
+            errors.push(error instanceof Error ? error.message : String(error));
+        }
+    }
+
+    const readerPath = path.join(
+        nativeDir,
+        linuxFrameCopyArtifacts.frameReader.name
+    );
+    const helperPath = path.join(
+        nativeDir,
+        linuxFrameCopyArtifacts.helper.name
+    );
+    inspectRegularReadableFile(addonPath, 'embedded MPV native addon', errors);
+    inspectRegularReadableFile(
+        readerPath,
+        'embedded MPV frame reader',
+        errors,
+        0o644
+    );
+    inspectRegularReadableFile(
+        helperPath,
+        'embedded MPV frame-copy helper',
+        errors,
+        0o755
+    );
+    const staleWindowsHelper = path.join(nativeDir, 'iptvnator_mpv_helper.exe');
+    if (pathExistsByLstat(staleWindowsHelper)) {
+        errors.push(
+            `Linux frame-copy package must not retain the Windows helper: ${staleWindowsHelper}`
+        );
+    }
+    const staleMarker = path.join(nativeDir, 'embedded-mpv-unavailable.txt');
+    if (pathExistsByLstat(staleMarker)) {
+        errors.push(
+            `Same-architecture Linux package must not retain the unavailable marker: ${staleMarker}`
+        );
+    }
+
+    if (
+        !inspectRegularReadableFile(
+            manifestPath,
+            'embedded MPV runtime manifest',
+            errors
+        )
+    ) {
+        return errors;
+    }
+    const manifest = readPackagedJson(
+        manifestPath,
+        'embedded MPV runtime manifest',
+        errors
+    );
+    if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
+        if (manifest !== null) {
+            errors.push('Embedded MPV runtime manifest must be an object.');
+        }
+        return errors;
+    }
+
+    validatePackagedManifestContract(manifest, profile, targetNames, errors);
+    if (profile.runtimeMode === 'system') {
+        validateSystemLinuxRuntime(nativeDir, manifest, errors);
+    } else {
+        validateBundledLinuxRuntime(nativeDir, manifest, errors);
+    }
+    inspectLinuxElfIsolation(
+        resourceDir,
+        nativeDir,
+        manifest,
+        targetNames,
+        options,
+        errors
+    );
+    return errors;
+}
+
 function validatePackagedEmbeddedMpv(resourceDir, options = {}) {
     const platform = normalizeEmbeddedMpvPlatform(options.platform);
+    if (platform === 'linux') {
+        return validateLinuxPackagedEmbeddedMpv(resourceDir, options);
+    }
     const unpackedNativeDir = path.join(
         resourceDir,
         'app.asar.unpacked',
@@ -515,24 +1820,6 @@ function validatePackagedEmbeddedMpv(resourceDir, options = {}) {
     );
     const errors = [];
 
-    if (options.foreignArch) {
-        if (fs.existsSync(addonPath)) {
-            errors.push(
-                `Embedded MPV addon must not ship in foreign-architecture Linux packages: ${addonPath}`
-            );
-        }
-        const markerPath = path.join(
-            unpackedNativeDir,
-            'embedded-mpv-unavailable.txt'
-        );
-        if (!fs.existsSync(markerPath)) {
-            errors.push(
-                `Missing embedded MPV unavailable marker for foreign-architecture package: ${markerPath}`
-            );
-        }
-        return errors;
-    }
-
     if (!fs.existsSync(addonPath)) {
         if (options.required) {
             errors.push(`Missing embedded MPV native addon: ${addonPath}`);
@@ -540,12 +1827,103 @@ function validatePackagedEmbeddedMpv(resourceDir, options = {}) {
         return errors;
     }
 
+    if (platform === 'darwin' || platform === 'win32') {
+        // The frame-copy engine artifacts are built by the same binding.gyp
+        // run as the addon; a macOS/Windows package that ships the addon
+        // without them would silently lose the engine (support probe hides
+        // it).
+        const missingFrameCopyArtifacts = [
+            platform === 'win32'
+                ? 'iptvnator_mpv_helper.exe'
+                : 'iptvnator_mpv_helper',
+            'embedded_mpv_frame_reader.node',
+        ]
+            .map((name) => path.join(unpackedNativeDir, name))
+            .filter((artifactPath) => !fs.existsSync(artifactPath));
+        errors.push(
+            ...missingFrameCopyArtifacts.map(
+                (artifactPath) =>
+                    `Missing embedded MPV frame-copy artifact: ${artifactPath}`
+            )
+        );
+
+        if (platform === 'win32') {
+            // The helper is a separate executable. Windows resolves its
+            // imported libmpv DLL from the executable directory, so a copy
+            // under native/lib may satisfy addon bookkeeping but cannot
+            // start iptvnator_mpv_helper.exe.
+            const helperPath = path.join(
+                unpackedNativeDir,
+                'iptvnator_mpv_helper.exe'
+            );
+            const helperRuntimeCandidates = windowsMpvRuntimeNames.map((name) =>
+                path.join(unpackedNativeDir, name)
+            );
+            if (
+                !helperRuntimeCandidates.some((candidate) =>
+                    fs.existsSync(candidate)
+                )
+            ) {
+                errors.push(
+                    [
+                        `Missing bundled MPV DLL beside the Windows frame-copy helper in ${unpackedNativeDir}.`,
+                        'Expected one of:',
+                        ...helperRuntimeCandidates.map(
+                            (candidate) => `- ${candidate}`
+                        ),
+                    ].join('\n')
+                );
+            }
+
+            if (fs.existsSync(helperPath)) {
+                try {
+                    const acceptedRuntimeNames = new Set(
+                        windowsMpvRuntimeNames.map((name) => name.toLowerCase())
+                    );
+                    const importedRuntimeNames = readPeImportedDllNames(
+                        helperPath
+                    ).filter((name) =>
+                        acceptedRuntimeNames.has(name.toLowerCase())
+                    );
+                    if (importedRuntimeNames.length === 0) {
+                        errors.push(
+                            `Windows frame-copy helper does not import a supported MPV DLL: ${helperPath}`
+                        );
+                    }
+
+                    const packagedRuntimeNames = new Set(
+                        fs
+                            .readdirSync(unpackedNativeDir, {
+                                withFileTypes: true,
+                            })
+                            .filter((entry) => entry.isFile())
+                            .map((entry) => entry.name.toLowerCase())
+                    );
+                    for (const importedRuntimeName of importedRuntimeNames) {
+                        if (
+                            !packagedRuntimeNames.has(
+                                importedRuntimeName.toLowerCase()
+                            )
+                        ) {
+                            errors.push(
+                                `Windows frame-copy helper imports ${importedRuntimeName}, but the matching DLL is missing beside it: ${path.join(unpackedNativeDir, importedRuntimeName)}`
+                            );
+                        }
+                    }
+                } catch (error) {
+                    errors.push(
+                        `Unable to inspect Windows frame-copy helper imports at ${helperPath}: ${error instanceof Error ? error.message : String(error)}`
+                    );
+                }
+            }
+        }
+    }
+
     if (!fs.existsSync(manifestPath)) {
         errors.push(`Missing embedded MPV runtime manifest: ${manifestPath}`);
     } else {
         const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-        const expectedOrigin =
-            platform === 'linux' ? 'external-mpv-process' : 'vendored-lgpl';
+        const expectedOrigin = 'vendored-lgpl';
         if (manifest.origin !== expectedOrigin) {
             errors.push(
                 `Embedded MPV packaged runtime must be ${expectedOrigin}, received: ${manifest.origin}`
@@ -553,24 +1931,6 @@ function validatePackagedEmbeddedMpv(resourceDir, options = {}) {
         }
     }
 
-    if (platform === 'linux') {
-        const bundledLinuxRuntime = [
-            path.join(libDir, 'libmpv.so.2'),
-            path.join(libDir, 'libmpv.so.1'),
-            path.join(libDir, 'libmpv.so'),
-        ].filter((candidate) => fs.existsSync(candidate));
-
-        if (bundledLinuxRuntime.length > 0) {
-            errors.push(
-                [
-                    'Linux embedded MPV must use the external mpv process backend and must not bundle libmpv.',
-                    'Remove:',
-                    ...bundledLinuxRuntime.map((candidate) => `- ${candidate}`),
-                ].join('\n')
-            );
-        }
-    }
-
     const runtimeCandidates = getPackagedRuntimeCandidates(
         libDir,
         platform,
@@ -612,6 +1972,7 @@ module.exports = {
     commandExists,
     copyRuntimeToNativeBuild,
     findLibMpv,
+    listElectronShippedLinuxLibraries,
     listRuntimeFiles,
     listDylibs,
     parseOtoolDependencies,
@@ -620,8 +1981,8 @@ module.exports = {
     validateNoForbiddenRuntimeLinks,
     getPackagedRuntimeCandidates,
     validatePackagedEmbeddedMpv,
-    getEmbeddedMpvAddonArch,
     isForeignLinuxEmbeddedMpvArch,
     linuxUnpackedDirArch,
+    resolveConfiguredLinuxTargetNames,
     resolveElectronBuilderArchName,
 };
diff --git a/tools/packaging/flatpak-launcher-validation.cjs b/tools/packaging/flatpak-launcher-validation.cjs
new file mode 100644
index 000000000..933bf6098
--- /dev/null
+++ b/tools/packaging/flatpak-launcher-validation.cjs
@@ -0,0 +1,125 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const expectedElfMagic = Buffer.from([0x7f, 0x45, 0x4c, 0x46]);
+const executableModeBits = 0o111;
+
+function fsErrorCode(error) {
+    return error && typeof error === 'object' && typeof error.code === 'string'
+        ? error.code
+        : 'UNKNOWN';
+}
+
+function validateBinarySibling(siblingPath, errors) {
+    try {
+        fs.lstatSync(siblingPath);
+    } catch (error) {
+        if (fsErrorCode(error) === 'ENOENT') {
+            return;
+        }
+        errors.push(
+            `Unable to inspect Flatpak Electron launcher binary sibling at ${siblingPath} (${fsErrorCode(error)}).`
+        );
+        return;
+    }
+
+    errors.push(
+        `Flatpak Electron layout must not include a launcher binary sibling: ${siblingPath}`
+    );
+}
+
+function validateFlatpakLauncher(appDir, executableName) {
+    const errors = [];
+    const launcherPath = path.join(appDir, executableName);
+    const flatpakBinarySiblingPath = `${launcherPath}.bin`;
+    validateBinarySibling(flatpakBinarySiblingPath, errors);
+
+    let descriptor;
+    try {
+        descriptor = fs.openSync(
+            launcherPath,
+            fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW
+        );
+    } catch (error) {
+        const errorCode = fsErrorCode(error);
+        if (errorCode === 'ENOENT') {
+            errors.push(
+                `Missing Flatpak Electron ELF in ${appDir}: ${path.basename(launcherPath)}`
+            );
+        } else if (errorCode === 'ELOOP') {
+            errors.push(
+                `Flatpak Electron launcher must be a regular file: ${launcherPath}`
+            );
+        } else {
+            errors.push(
+                `Unable to open Flatpak Electron launcher at ${launcherPath} (${errorCode}).`
+            );
+        }
+        return errors;
+    }
+
+    try {
+        let launcherStat;
+        try {
+            launcherStat = fs.fstatSync(descriptor);
+        } catch (error) {
+            errors.push(
+                `Unable to stat Flatpak Electron launcher at ${launcherPath} (${fsErrorCode(error)}).`
+            );
+            return errors;
+        }
+
+        if (!launcherStat.isFile()) {
+            errors.push(
+                `Flatpak Electron launcher must be a regular file: ${launcherPath}`
+            );
+            return errors;
+        }
+        if ((launcherStat.mode & executableModeBits) === 0) {
+            errors.push(
+                `Flatpak Electron launcher must be executable: ${launcherPath}`
+            );
+        }
+
+        const elfMagic = Buffer.alloc(expectedElfMagic.length);
+        let bytesRead;
+        try {
+            bytesRead = fs.readSync(
+                descriptor,
+                elfMagic,
+                0,
+                elfMagic.length,
+                0
+            );
+        } catch (error) {
+            errors.push(
+                `Unable to read Flatpak Electron launcher at ${launcherPath} (${fsErrorCode(error)}).`
+            );
+            return errors;
+        }
+
+        if (
+            bytesRead !== expectedElfMagic.length ||
+            !elfMagic.equals(expectedElfMagic)
+        ) {
+            errors.push(
+                `Flatpak Electron launcher must be an ELF binary: ${launcherPath}`
+            );
+        }
+    } finally {
+        try {
+            fs.closeSync(descriptor);
+        } catch (error) {
+            errors.push(
+                `Unable to close Flatpak Electron launcher at ${launcherPath} (${fsErrorCode(error)}).`
+            );
+        }
+    }
+    return errors;
+}
+
+module.exports = {
+    validateFlatpakLauncher,
+};
diff --git a/tools/packaging/flatpak-launcher-validation.test.mjs b/tools/packaging/flatpak-launcher-validation.test.mjs
new file mode 100644
index 000000000..0b8ff95b2
--- /dev/null
+++ b/tools/packaging/flatpak-launcher-validation.test.mjs
@@ -0,0 +1,108 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const {
+    validateFlatpakLauncher,
+} = require('./flatpak-launcher-validation.cjs');
+
+const executableName = 'iptvnator';
+const electronElf = Buffer.from([
+    0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+]);
+
+async function createFixture(t) {
+    const appDir = await fs.mkdtemp(
+        path.join(os.tmpdir(), 'iptvnator-flatpak-launcher-')
+    );
+    t.after(() => fs.rm(appDir, { recursive: true, force: true }));
+
+    return {
+        appDir,
+        launcherPath: path.join(appDir, executableName),
+        siblingPath: path.join(appDir, `${executableName}.bin`),
+    };
+}
+
+async function writeLauncher(launcherPath, contents, mode) {
+    await fs.writeFile(launcherPath, contents);
+    await fs.chmod(launcherPath, mode);
+}
+
+test('accepts a regular executable Flatpak Electron ELF', async (t) => {
+    const fixture = await createFixture(t);
+    await writeLauncher(fixture.launcherPath, electronElf, 0o755);
+
+    assert.deepEqual(
+        validateFlatpakLauncher(fixture.appDir, executableName),
+        []
+    );
+});
+
+test('rejects a symlinked Flatpak Electron launcher', async (t) => {
+    const fixture = await createFixture(t);
+    const electronTargetPath = path.join(fixture.appDir, 'electron-target');
+    await writeLauncher(electronTargetPath, electronElf, 0o755);
+    await fs.symlink(electronTargetPath, fixture.launcherPath);
+
+    assert.deepEqual(validateFlatpakLauncher(fixture.appDir, executableName), [
+        `Flatpak Electron launcher must be a regular file: ${fixture.launcherPath}`,
+    ]);
+});
+
+test('rejects a dangling Flatpak launcher binary sibling', async (t) => {
+    const fixture = await createFixture(t);
+    await writeLauncher(fixture.launcherPath, electronElf, 0o755);
+    await fs.symlink('missing-electron', fixture.siblingPath);
+
+    assert.deepEqual(validateFlatpakLauncher(fixture.appDir, executableName), [
+        `Flatpak Electron layout must not include a launcher binary sibling: ${fixture.siblingPath}`,
+    ]);
+});
+
+test('rejects a non-executable regular Flatpak Electron ELF', async (t) => {
+    const fixture = await createFixture(t);
+    await writeLauncher(fixture.launcherPath, electronElf, 0o644);
+
+    assert.deepEqual(validateFlatpakLauncher(fixture.appDir, executableName), [
+        `Flatpak Electron launcher must be executable: ${fixture.launcherPath}`,
+    ]);
+});
+
+for (const [description, contents] of [
+    ['short ELF magic', Buffer.from([0x7f, 0x45, 0x4c])],
+    ['incorrect ELF magic', Buffer.from([0x00, 0x45, 0x4c, 0x46])],
+]) {
+    test(`rejects ${description} in the Flatpak Electron launcher`, async (t) => {
+        const fixture = await createFixture(t);
+        await writeLauncher(fixture.launcherPath, contents, 0o755);
+
+        assert.deepEqual(
+            validateFlatpakLauncher(fixture.appDir, executableName),
+            [
+                `Flatpak Electron launcher must be an ELF binary: ${fixture.launcherPath}`,
+            ]
+        );
+    });
+}
+
+test('packaging Nx tests register the Flatpak launcher validation suite', async () => {
+    const project = JSON.parse(
+        await fs.readFile(new URL('./project.json', import.meta.url), 'utf8')
+    );
+    const moduleFile =
+        '{workspaceRoot}/tools/packaging/flatpak-launcher-validation.cjs';
+    const testFile =
+        '{workspaceRoot}/tools/packaging/flatpak-launcher-validation.test.mjs';
+
+    assert.ok(project.targets.test.inputs.includes(moduleFile));
+    assert.ok(project.targets.test.inputs.includes(testFile));
+    assert.match(
+        project.targets.test.options.command,
+        /node --test .*tools\/packaging\/flatpak-launcher-validation\.test\.mjs/
+    );
+});
diff --git a/tools/packaging/linux-after-pack.cjs b/tools/packaging/linux-after-pack.cjs
index 93e6b8cb4..3cdb829f1 100644
--- a/tools/packaging/linux-after-pack.cjs
+++ b/tools/packaging/linux-after-pack.cjs
@@ -1,5 +1,6 @@
 const fs = require('fs/promises');
 const path = require('path');
+const { resolveLinuxLauncherLayout } = require('./linux-launcher-layout.cjs');
 
 function log(message) {
     console.log(`  - ${message}`);
@@ -41,17 +42,33 @@ exec "$SCRIPT_DIR/${executableName}.bin" "\${EXEC_ARGS[@]}" "$@"
 `;
 }
 
-async function afterPackHook(params) {
+async function afterPackHook(params, { targetNames = params.targets } = {}) {
     if (params.electronPlatformName !== 'linux') {
         return;
     }
 
+    const launcherLayout = resolveLinuxLauncherLayout(
+        targetNames,
+        params.packager.executableName
+    );
+    if (!launcherLayout.wrapperRequired) {
+        log('preserving the Electron ELF for isolated Flatpak packaging');
+        return;
+    }
+
     log('applying Linux launcher sandbox fix');
 
-    const executable = path.join(params.appOutDir, params.packager.executableName);
+    const executable = path.join(
+        params.appOutDir,
+        params.packager.executableName
+    );
+    const electronBinary = path.join(
+        params.appOutDir,
+        launcherLayout.electronBinaryName
+    );
 
     try {
-        await fs.rename(executable, `${executable}.bin`);
+        await fs.rename(executable, electronBinary);
         await fs.writeFile(
             executable,
             createLoaderScript({
diff --git a/tools/packaging/linux-after-pack.test.mjs b/tools/packaging/linux-after-pack.test.mjs
new file mode 100644
index 000000000..3e55e00cb
--- /dev/null
+++ b/tools/packaging/linux-after-pack.test.mjs
@@ -0,0 +1,187 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const linuxAfterPack = require('./linux-after-pack.cjs');
+const { createLoaderScript } = linuxAfterPack;
+
+const electronElf = Buffer.from([
+    0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, 0x49, 0x50, 0x54, 0x56,
+]);
+
+async function createAfterPackFixture(targets) {
+    const appOutDir = await fs.mkdtemp(
+        path.join(os.tmpdir(), 'iptvnator-linux-after-pack-')
+    );
+    const executablePath = path.join(appOutDir, 'iptvnator');
+    await fs.writeFile(executablePath, electronElf, { mode: 0o755 });
+
+    return {
+        appOutDir,
+        executablePath,
+        params: {
+            appOutDir,
+            electronPlatformName: 'linux',
+            targets,
+            packager: {
+                executableName: 'iptvnator',
+                appInfo: {
+                    productName: 'IPTVnator',
+                },
+            },
+        },
+    };
+}
+
+function resolveLinuxLauncherLayout(...args) {
+    return require('./linux-launcher-layout.cjs').resolveLinuxLauncherLayout(
+        ...args
+    );
+}
+
+async function assertPathMissing(filePath) {
+    await assert.rejects(
+        fs.stat(filePath),
+        (error) => error?.code === 'ENOENT'
+    );
+}
+
+test('isolated Flatpak preserves the Electron ELF for Zypak', async (t) => {
+    const fixture = await createAfterPackFixture([{ name: 'flatpak' }]);
+    t.after(() =>
+        fs.rm(fixture.appOutDir, {
+            recursive: true,
+            force: true,
+        })
+    );
+
+    await linuxAfterPack(fixture.params);
+
+    assert.deepEqual(await fs.readFile(fixture.executablePath), electronElf);
+    await assertPathMissing(`${fixture.executablePath}.bin`);
+});
+
+test('resolves normalized string and Target-like launcher layouts', () => {
+    assert.deepEqual(resolveLinuxLauncherLayout([' FlatPak ']), {
+        targetNames: ['flatpak'],
+        electronBinaryName: 'iptvnator',
+        wrapperRequired: false,
+    });
+    assert.deepEqual(
+        resolveLinuxLauncherLayout(
+            [' AppImage ', { name: ' DEB ' }],
+            'iptvnator-player'
+        ),
+        {
+            targetNames: ['appimage', 'deb'],
+            electronBinaryName: 'iptvnator-player.bin',
+            wrapperRequired: true,
+        }
+    );
+});
+
+test('rejects missing, empty, and non-array target lists', () => {
+    for (const targets of [undefined, null, 'flatpak', new Map(), {}]) {
+        assert.throws(
+            () => resolveLinuxLauncherLayout(targets),
+            /Linux launcher targets must be an array/
+        );
+    }
+    assert.throws(
+        () => resolveLinuxLauncherLayout([]),
+        /Linux launcher targets must contain at least one target/
+    );
+});
+
+test('rejects empty target names and normalized duplicates', () => {
+    for (const target of ['', '  ', {}, { name: '' }, null, 42]) {
+        assert.throws(
+            () => resolveLinuxLauncherLayout([target]),
+            /Linux launcher targets must expose a non-empty name/
+        );
+    }
+    assert.throws(
+        () => resolveLinuxLauncherLayout([{ name: ' DEB ' }, { name: 'deb' }]),
+        /Linux launcher target "deb" is duplicated/
+    );
+});
+
+test('rejects Flatpak mixed with another target', () => {
+    assert.throws(
+        () =>
+            resolveLinuxLauncherLayout([
+                { name: 'flatpak' },
+                { name: 'AppImage' },
+            ]),
+        /Flatpak must be packaged in an isolated Electron Builder pass so Zypak receives the Electron ELF directly/
+    );
+});
+
+for (const targetName of ['appimage', 'deb', 'rpm', 'pacman', 'snap']) {
+    test(`${targetName} retains the launcher wrapper and Electron ELF binary`, async (t) => {
+        const fixture = await createAfterPackFixture([{ name: targetName }]);
+        t.after(() =>
+            fs.rm(fixture.appOutDir, {
+                recursive: true,
+                force: true,
+            })
+        );
+
+        await linuxAfterPack(fixture.params);
+
+        assert.equal(
+            await fs.readFile(fixture.executablePath, 'utf8'),
+            createLoaderScript({
+                executableName: 'iptvnator',
+                productName: 'IPTVnator',
+            })
+        );
+        assert.deepEqual(
+            await fs.readFile(`${fixture.executablePath}.bin`),
+            electronElf
+        );
+        assert.equal(
+            (await fs.stat(fixture.executablePath)).mode & 0o777,
+            0o755
+        );
+    });
+}
+
+test('mixed Flatpak targets fail before mutating the Electron ELF', async (t) => {
+    const fixture = await createAfterPackFixture([
+        { name: 'flatpak' },
+        { name: 'appimage' },
+    ]);
+    t.after(() =>
+        fs.rm(fixture.appOutDir, {
+            recursive: true,
+            force: true,
+        })
+    );
+
+    await assert.rejects(
+        linuxAfterPack(fixture.params),
+        /Flatpak must be packaged in an isolated Electron Builder pass so Zypak receives the Electron ELF directly/
+    );
+
+    assert.deepEqual(await fs.readFile(fixture.executablePath), electronElf);
+    await assertPathMissing(`${fixture.executablePath}.bin`);
+});
+
+test('packaging Nx tests register the Linux afterPack regression suite', async () => {
+    const project = JSON.parse(
+        await fs.readFile(new URL('./project.json', import.meta.url), 'utf8')
+    );
+    const testFile =
+        '{workspaceRoot}/tools/packaging/linux-after-pack.test.mjs';
+
+    assert.ok(project.targets.test.inputs.includes(testFile));
+    assert.match(
+        project.targets.test.options.command,
+        /node --test .*tools\/packaging\/linux-after-pack\.test\.mjs/
+    );
+});
diff --git a/tools/packaging/linux-frame-copy-profile.cjs b/tools/packaging/linux-frame-copy-profile.cjs
new file mode 100644
index 000000000..0276e94c6
--- /dev/null
+++ b/tools/packaging/linux-frame-copy-profile.cjs
@@ -0,0 +1,100 @@
+'use strict';
+
+function createProfile(name, runtimeMode, targets, manifestOrigin) {
+    return Object.freeze({
+        name,
+        runtimeMode,
+        targets: Object.freeze([...targets]),
+        manifestOrigin,
+    });
+}
+
+const LINUX_FRAME_COPY_PROFILES = Object.freeze({
+    system: createProfile(
+        'system',
+        'system',
+        ['deb', 'rpm', 'pacman'],
+        'system-libmpv-frame-copy'
+    ),
+    portable: createProfile(
+        'portable',
+        'bundled',
+        ['appimage', 'snap'],
+        'bundled-lgpl-frame-copy'
+    ),
+    flatpak: createProfile(
+        'flatpak',
+        'bundled',
+        ['flatpak'],
+        'bundled-lgpl-frame-copy'
+    ),
+});
+const SUPPORTED_PROFILE_NAMES = Object.freeze(
+    Object.keys(LINUX_FRAME_COPY_PROFILES)
+);
+
+const LINUX_SYSTEM_PACKAGE_DEPENDENCIES = Object.freeze({
+    deb: Object.freeze(['libmpv2', 'libegl1', 'libgl1', 'libgbm1']),
+    rpm: Object.freeze([
+        'mpv-libs',
+        'libglvnd-egl',
+        'libglvnd-glx',
+        'mesa-libgbm',
+    ]),
+    pacman: Object.freeze(['mpv', 'libglvnd', 'mesa']),
+});
+
+function expectedProfileNames() {
+    return SUPPORTED_PROFILE_NAMES.map((name) => `"${name}"`).join(', ');
+}
+
+function findLinuxFrameCopyProfile(value) {
+    if (value == null || (typeof value === 'string' && value.trim() === '')) {
+        throw new Error(
+            `Linux frame-copy profile is required. Expected one of: ${expectedProfileNames()}.`
+        );
+    }
+
+    const name = typeof value === 'string' ? value.trim() : String(value);
+    if (!Object.hasOwn(LINUX_FRAME_COPY_PROFILES, name)) {
+        throw new Error(
+            `Unsupported Linux frame-copy profile "${name}". Expected one of: ${expectedProfileNames()}.`
+        );
+    }
+    return LINUX_FRAME_COPY_PROFILES[name];
+}
+
+function resolveLinuxFrameCopyProfile(value) {
+    const profile = findLinuxFrameCopyProfile(value);
+    return createProfile(
+        profile.name,
+        profile.runtimeMode,
+        profile.targets,
+        profile.manifestOrigin
+    );
+}
+
+function validateLinuxProfileTargets(profileName, targetNames) {
+    const profile = findLinuxFrameCopyProfile(profileName);
+    if (!Array.isArray(targetNames)) {
+        throw new TypeError('Linux frame-copy targets must be an array.');
+    }
+
+    const allowedTargets = new Set(profile.targets);
+    return targetNames.flatMap((targetName) => {
+        const normalizedTarget = String(targetName).trim().toLowerCase();
+        if (allowedTargets.has(normalizedTarget)) {
+            return [];
+        }
+        return [
+            `Linux frame-copy profile "${profile.name}" cannot build target "${normalizedTarget}".`,
+        ];
+    });
+}
+
+module.exports = {
+    LINUX_FRAME_COPY_PROFILES,
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+    validateLinuxProfileTargets,
+};
diff --git a/tools/packaging/linux-frame-copy-profile.test.mjs b/tools/packaging/linux-frame-copy-profile.test.mjs
new file mode 100644
index 000000000..8d3f858e0
--- /dev/null
+++ b/tools/packaging/linux-frame-copy-profile.test.mjs
@@ -0,0 +1,212 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import { dirname, join } from 'node:path';
+import test from 'node:test';
+import { fileURLToPath } from 'node:url';
+
+import { configureLinuxFrameCopyBuild } from './configure-linux-frame-copy-build.mjs';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const {
+    LINUX_FRAME_COPY_PROFILES,
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+    validateLinuxProfileTargets,
+} = require('./linux-frame-copy-profile.cjs');
+const electronBuilderConfig = JSON.parse(
+    fs.readFileSync(
+        join(currentDir, '..', '..', 'electron-builder.json'),
+        'utf8'
+    )
+);
+
+function hasSystemFrameCopyDependency(config, format, dependency) {
+    return (config[format]?.fpm ?? []).some((option) =>
+        new RegExp(`^--depends(?:=|\\s+)${dependency}(?:$|\\s|[<>=])`).test(
+            option
+        )
+    );
+}
+
+test('defines the exact immutable Linux frame-copy profile matrix', () => {
+    assert.deepEqual(LINUX_FRAME_COPY_PROFILES, {
+        system: {
+            name: 'system',
+            runtimeMode: 'system',
+            targets: ['deb', 'rpm', 'pacman'],
+            manifestOrigin: 'system-libmpv-frame-copy',
+        },
+        portable: {
+            name: 'portable',
+            runtimeMode: 'bundled',
+            targets: ['appimage', 'snap'],
+            manifestOrigin: 'bundled-lgpl-frame-copy',
+        },
+        flatpak: {
+            name: 'flatpak',
+            runtimeMode: 'bundled',
+            targets: ['flatpak'],
+            manifestOrigin: 'bundled-lgpl-frame-copy',
+        },
+    });
+    assert.equal(Object.isFrozen(LINUX_FRAME_COPY_PROFILES), true);
+    for (const profile of Object.values(LINUX_FRAME_COPY_PROFILES)) {
+        assert.equal(Object.isFrozen(profile), true);
+        assert.equal(Object.isFrozen(profile.targets), true);
+    }
+});
+
+test('defines immutable system-package helper runtime dependencies', () => {
+    assert.deepEqual(LINUX_SYSTEM_PACKAGE_DEPENDENCIES, {
+        deb: ['libmpv2', 'libegl1', 'libgl1', 'libgbm1'],
+        rpm: ['mpv-libs', 'libglvnd-egl', 'libglvnd-glx', 'mesa-libgbm'],
+        pacman: ['mpv', 'libglvnd', 'mesa'],
+    });
+    assert.equal(Object.isFrozen(LINUX_SYSTEM_PACKAGE_DEPENDENCIES), true);
+    for (const dependencies of Object.values(
+        LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+    )) {
+        assert.equal(Object.isFrozen(dependencies), true);
+    }
+});
+
+test('resolves each supported profile as an immutable defensive value', () => {
+    const firstSystemProfile = resolveLinuxFrameCopyProfile('system');
+    const secondSystemProfile = resolveLinuxFrameCopyProfile('system');
+
+    assert.deepEqual(firstSystemProfile, {
+        name: 'system',
+        runtimeMode: 'system',
+        targets: ['deb', 'rpm', 'pacman'],
+        manifestOrigin: 'system-libmpv-frame-copy',
+    });
+    assert.deepEqual(resolveLinuxFrameCopyProfile('portable'), {
+        name: 'portable',
+        runtimeMode: 'bundled',
+        targets: ['appimage', 'snap'],
+        manifestOrigin: 'bundled-lgpl-frame-copy',
+    });
+    assert.deepEqual(resolveLinuxFrameCopyProfile('flatpak'), {
+        name: 'flatpak',
+        runtimeMode: 'bundled',
+        targets: ['flatpak'],
+        manifestOrigin: 'bundled-lgpl-frame-copy',
+    });
+    assert.notEqual(firstSystemProfile, LINUX_FRAME_COPY_PROFILES.system);
+    assert.notEqual(firstSystemProfile, secondSystemProfile);
+    assert.notEqual(
+        firstSystemProfile.targets,
+        LINUX_FRAME_COPY_PROFILES.system.targets
+    );
+    assert.notEqual(firstSystemProfile.targets, secondSystemProfile.targets);
+    assert.equal(Object.isFrozen(firstSystemProfile), true);
+    assert.equal(Object.isFrozen(firstSystemProfile.targets), true);
+    assert.throws(() => firstSystemProfile.targets.push('appimage'), TypeError);
+    assert.deepEqual(resolveLinuxFrameCopyProfile('system').targets, [
+        'deb',
+        'rpm',
+        'pacman',
+    ]);
+});
+
+test('rejects missing and unsupported profile names with clear errors', () => {
+    for (const value of [undefined, null, '', '   ']) {
+        assert.throws(
+            () => resolveLinuxFrameCopyProfile(value),
+            /Linux frame-copy profile is required/
+        );
+    }
+    assert.throws(
+        () => resolveLinuxFrameCopyProfile('standard'),
+        /Unsupported Linux frame-copy profile "standard"/
+    );
+});
+
+test('rejects inherited object property names as unsupported profiles', () => {
+    for (const value of ['constructor', 'toString', '__proto__']) {
+        const unsupportedProfileError = new RegExp(
+            `Unsupported Linux frame-copy profile "${value}"`
+        );
+
+        assert.throws(
+            () => resolveLinuxFrameCopyProfile(value),
+            unsupportedProfileError
+        );
+        assert.throws(
+            () => validateLinuxProfileTargets(value, ['deb']),
+            unsupportedProfileError
+        );
+    }
+});
+
+test('validates profile targets case-insensitively with deterministic errors', () => {
+    const targets = ['DEB', 'AppImage', 'RPM'];
+
+    assert.deepEqual(validateLinuxProfileTargets('system', targets), [
+        'Linux frame-copy profile "system" cannot build target "appimage".',
+    ]);
+    assert.deepEqual(targets, ['DEB', 'AppImage', 'RPM']);
+    assert.deepEqual(
+        validateLinuxProfileTargets('portable', ['APPIMAGE', 'sNaP']),
+        []
+    );
+    assert.deepEqual(validateLinuxProfileTargets('flatpak', ['FlatPak']), []);
+});
+
+test('rejects a non-array profile target list', () => {
+    assert.throws(
+        () => validateLinuxProfileTargets('system', 'deb'),
+        /Linux frame-copy targets must be an array/
+    );
+});
+
+test('keeps frame-copy package dependencies out of the base Electron Builder config', () => {
+    for (const [target, dependencies] of Object.entries(
+        LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+    )) {
+        assert.equal(
+            electronBuilderConfig[target]?.depends,
+            undefined,
+            `${target}.depends must remain unset so electron-builder keeps its defaults`
+        );
+        for (const dependency of dependencies) {
+            assert.equal(
+                hasSystemFrameCopyDependency(
+                    electronBuilderConfig,
+                    target,
+                    dependency
+                ),
+                false
+            );
+        }
+    }
+});
+
+test('keeps frame-copy package dependencies out of non-system passes', () => {
+    const configs = [
+        configureLinuxFrameCopyBuild(electronBuilderConfig, {
+            profileName: 'portable',
+        }),
+        configureLinuxFrameCopyBuild(electronBuilderConfig, {
+            profileName: 'flatpak',
+        }),
+        configureLinuxFrameCopyBuild(electronBuilderConfig, {
+            foreignDeb: true,
+        }),
+    ];
+
+    for (const config of configs) {
+        for (const [format, dependencies] of Object.entries(
+            LINUX_SYSTEM_PACKAGE_DEPENDENCIES
+        )) {
+            for (const dependency of dependencies) {
+                assert.equal(
+                    hasSystemFrameCopyDependency(config, format, dependency),
+                    false
+                );
+            }
+        }
+    }
+});
diff --git a/tools/packaging/linux-launcher-layout.cjs b/tools/packaging/linux-launcher-layout.cjs
new file mode 100644
index 000000000..2564db529
--- /dev/null
+++ b/tools/packaging/linux-launcher-layout.cjs
@@ -0,0 +1,56 @@
+'use strict';
+
+function normalizedTargetName(target) {
+    const value =
+        typeof target === 'string'
+            ? target
+            : target && typeof target === 'object'
+              ? target.name
+              : null;
+    if (typeof value !== 'string' || value.trim() === '') {
+        throw new Error('Linux launcher targets must expose a non-empty name.');
+    }
+    return value.trim().toLowerCase();
+}
+
+function resolveLinuxLauncherLayout(targets, executableName = 'iptvnator') {
+    if (!Array.isArray(targets)) {
+        throw new TypeError('Linux launcher targets must be an array.');
+    }
+    if (targets.length === 0) {
+        throw new Error(
+            'Linux launcher targets must contain at least one target.'
+        );
+    }
+
+    const targetNames = [];
+    for (const target of targets) {
+        const targetName = normalizedTargetName(target);
+        if (targetNames.includes(targetName)) {
+            throw new Error(
+                `Linux launcher target "${targetName}" is duplicated.`
+            );
+        }
+        targetNames.push(targetName);
+    }
+
+    const flatpakSelected = targetNames.includes('flatpak');
+    if (flatpakSelected && targetNames.length !== 1) {
+        throw new Error(
+            'Flatpak must be packaged in an isolated Electron Builder pass so Zypak receives the Electron ELF directly.'
+        );
+    }
+
+    const wrapperRequired = !flatpakSelected;
+    return {
+        targetNames,
+        electronBinaryName: wrapperRequired
+            ? `${executableName}.bin`
+            : executableName,
+        wrapperRequired,
+    };
+}
+
+module.exports = {
+    resolveLinuxLauncherLayout,
+};
diff --git a/tools/packaging/prepare-linux-runtime-source-snapshot.cjs b/tools/packaging/prepare-linux-runtime-source-snapshot.cjs
new file mode 100644
index 000000000..bdf6b9e3c
--- /dev/null
+++ b/tools/packaging/prepare-linux-runtime-source-snapshot.cjs
@@ -0,0 +1,753 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const childProcess = require('node:child_process');
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    canonicalizeGitSubmoduleStatus,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
+
+const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+const LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT = Object.freeze({
+    schemaVersion: 1,
+    hashAlgorithm: 'sha256',
+    canonicalEncoding: 'utf8-json-line-v1',
+});
+
+// Derived from a clean recursive checkout of libplacebo v7.360.1 at
+// cee9b076f2c63104ccfd497fa79c39a867293ec4 with every recorded submodule at
+// its pinned commit. The inventory contract above excludes all .git entries.
+// Derivation: git clone --branch v7.360.1 --single-branch --recurse-submodules
+// https://github.com/haasn/libplacebo.git, then globally sort and inventory the
+// VCS-free copy under LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT.
+// The trusted snapshot has 1,456 entries and 54,312,340 regular-file bytes.
+const EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256 =
+    '0db67c1523411255244186af437e9fbfe7ccac04a5ac1b3dc9275dd0806f6f0c';
+
+function gitOutput(checkoutPath, ...args) {
+    try {
+        return childProcess
+            .execFileSync('git', ['-C', checkoutPath, ...args], {
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'pipe'],
+            })
+            .trim();
+    } catch (error) {
+        const stderr =
+            error && typeof error === 'object' && 'stderr' in error
+                ? String(error.stderr).trim()
+                : '';
+        throw new Error(
+            `Unable to inspect source checkout with git ${args.join(' ')}${stderr ? `: ${stderr}` : '.'}`
+        );
+    }
+}
+
+function assertExpectedGitRecord(expected) {
+    if (
+        expected === null ||
+        typeof expected !== 'object' ||
+        typeof expected.sourceGitCommit !== 'string' ||
+        !GIT_COMMIT_PATTERN.test(expected.sourceGitCommit) ||
+        !Array.isArray(expected.sourceSubmodules) ||
+        expected.sourceSubmodules.some(
+            (record) => typeof record !== 'string' || record.length === 0
+        )
+    ) {
+        throw new Error(
+            'Expected source identity must contain one commit and a submodule record array.'
+        );
+    }
+}
+
+function assertCleanCheckout(checkoutPath, label) {
+    const status = gitOutput(
+        checkoutPath,
+        'status',
+        '--porcelain=v1',
+        '--untracked-files=all',
+        '--ignore-submodules=none'
+    );
+    if (status) {
+        throw new Error(`${label} checkout contains dirty or untracked files.`);
+    }
+}
+
+function sourceSubmoduleIdentity(record) {
+    const match = record.match(/^([a-f0-9]{40,64})\s+([A-Za-z0-9_+./-]+)$/);
+    if (!match) {
+        throw new Error(`Invalid source submodule record: ${record}`);
+    }
+    const submodulePath = match[2];
+    if (
+        path.isAbsolute(submodulePath) ||
+        submodulePath
+            .split('/')
+            .some((part) => part === '' || part === '.' || part === '..')
+    ) {
+        throw new Error(`Unsafe source submodule path: ${submodulePath}`);
+    }
+    return {
+        commit: match[1],
+        path: submodulePath,
+    };
+}
+
+function inspectCleanGitSource(checkoutPath, expected) {
+    assertExpectedGitRecord(expected);
+    const sourceGitCommit = gitOutput(checkoutPath, 'rev-parse', 'HEAD');
+    if (sourceGitCommit !== expected.sourceGitCommit) {
+        throw new Error(
+            'Source checkout commit does not match the runtime manifest.'
+        );
+    }
+    const submoduleOutput = gitOutput(
+        checkoutPath,
+        'submodule',
+        'status',
+        '--recursive'
+    );
+    const sourceSubmodules = canonicalizeGitSubmoduleStatus(submoduleOutput);
+    if (!isDeepStrictEqual(sourceSubmodules, expected.sourceSubmodules)) {
+        throw new Error(
+            'Source checkout submodules do not match the runtime manifest.'
+        );
+    }
+
+    assertCleanCheckout(checkoutPath, 'Source');
+    for (const submoduleRecord of sourceSubmodules) {
+        const submodule = sourceSubmoduleIdentity(submoduleRecord);
+        const submoduleCheckout = path.join(
+            checkoutPath,
+            ...submodule.path.split('/')
+        );
+        if (
+            gitOutput(submoduleCheckout, 'rev-parse', 'HEAD') !==
+            submodule.commit
+        ) {
+            throw new Error(
+                `Source submodule ${submodule.path} commit does not match its recorded identity.`
+            );
+        }
+        assertCleanCheckout(
+            submoduleCheckout,
+            `Source submodule ${submodule.path}`
+        );
+    }
+    return {
+        sourceGitCommit,
+        sourceSubmodules,
+    };
+}
+
+function gitMetadataEntries(rootPath) {
+    const entries = [];
+    function visit(directoryPath, relativeDirectory = '') {
+        for (const entry of fs.readdirSync(directoryPath, {
+            withFileTypes: true,
+        })) {
+            const relativePath = path.posix.join(relativeDirectory, entry.name);
+            const absolutePath = path.join(directoryPath, entry.name);
+            if (entry.name === '.git') {
+                entries.push(relativePath);
+            } else if (entry.isDirectory()) {
+                visit(absolutePath, relativePath);
+            }
+        }
+    }
+    visit(rootPath);
+    return entries.sort();
+}
+
+function assertNoGitMetadata(rootPath) {
+    const entries = gitMetadataEntries(rootPath);
+    if (entries.length > 0) {
+        throw new Error(
+            `Prepared source snapshot must not contain VCS metadata: ${entries.join(', ')}`
+        );
+    }
+}
+
+function compareCanonicalPaths(left, right) {
+    if (left < right) {
+        return -1;
+    }
+    if (left > right) {
+        return 1;
+    }
+    return 0;
+}
+
+function sha256File(filePath) {
+    const descriptor = fs.openSync(filePath, 'r');
+    try {
+        const stat = fs.fstatSync(descriptor);
+        if (!stat.isFile()) {
+            throw new Error(
+                `Unsupported source snapshot entry (not a regular file): ${filePath}`
+            );
+        }
+        if (!Number.isSafeInteger(stat.size) || stat.size < 0) {
+            throw new Error(
+                `Source snapshot file has an unsupported size: ${filePath}`
+            );
+        }
+        const hash = crypto.createHash('sha256');
+        const buffer = Buffer.allocUnsafe(1024 * 1024);
+        let offset = 0;
+        while (offset < stat.size) {
+            const bytesRead = fs.readSync(
+                descriptor,
+                buffer,
+                0,
+                Math.min(buffer.length, stat.size - offset),
+                offset
+            );
+            if (bytesRead === 0) {
+                throw new Error(
+                    `Source snapshot file changed while hashing: ${filePath}`
+                );
+            }
+            hash.update(buffer.subarray(0, bytesRead));
+            offset += bytesRead;
+        }
+        const finalStat = fs.fstatSync(descriptor);
+        if (
+            !finalStat.isFile() ||
+            finalStat.size !== stat.size ||
+            finalStat.mtimeMs !== stat.mtimeMs
+        ) {
+            throw new Error(
+                `Source snapshot file changed while hashing: ${filePath}`
+            );
+        }
+        return {
+            size: stat.size,
+            executable: (stat.mode & 0o111) !== 0,
+            sha256: hash.digest('hex'),
+        };
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+
+function assertSafeSnapshotPath(relativePath) {
+    if (
+        typeof relativePath !== 'string' ||
+        relativePath.length === 0 ||
+        relativePath.includes('\\') ||
+        path.posix.isAbsolute(relativePath) ||
+        path.win32.isAbsolute(relativePath) ||
+        [...relativePath].some((character) => {
+            const codePoint = character.codePointAt(0);
+            return codePoint <= 0x1f || codePoint === 0x7f;
+        }) ||
+        relativePath
+            .split('/')
+            .some(
+                (part) =>
+                    part === '' ||
+                    part === '.' ||
+                    part === '..' ||
+                    part === '.git'
+            )
+    ) {
+        throw new Error(`Unsafe source snapshot path: ${relativePath}`);
+    }
+}
+
+function assertSafeSymlinkTarget(relativePath, target) {
+    const targetSegments = target.split('/');
+    const resolvedTarget = path.posix.normalize(
+        path.posix.join(path.posix.dirname(relativePath), target)
+    );
+    if (
+        target.length === 0 ||
+        target.includes('\\') ||
+        path.posix.isAbsolute(target) ||
+        path.win32.isAbsolute(target) ||
+        [...target].some((character) => {
+            const codePoint = character.codePointAt(0);
+            return codePoint <= 0x1f || codePoint === 0x7f;
+        }) ||
+        resolvedTarget === '..' ||
+        resolvedTarget.startsWith('../') ||
+        path.posix.isAbsolute(resolvedTarget) ||
+        targetSegments.includes('.git')
+    ) {
+        throw new Error(
+            `Unsafe source snapshot symlink ${relativePath}: ${target}`
+        );
+    }
+}
+
+function hasExactFields(value, expectedFields) {
+    return (
+        value !== null &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        isDeepStrictEqual(
+            Object.keys(value).sort(compareCanonicalPaths),
+            [...expectedFields].sort(compareCanonicalPaths)
+        )
+    );
+}
+
+function canonicalSourceSnapshotSha256({
+    schemaVersion,
+    entryCount,
+    totalBytes,
+    entries,
+}) {
+    return crypto
+        .createHash('sha256')
+        .update(
+            `${JSON.stringify({
+                schemaVersion,
+                entryCount,
+                totalBytes,
+                entries,
+            })}\n`,
+            'utf8'
+        )
+        .digest('hex');
+}
+
+function invalidSourceSnapshot(detail) {
+    throw new Error(`Invalid source snapshot: ${detail}`);
+}
+
+function validateLinuxRuntimeSourceSnapshot(snapshot, { expectedSha256 } = {}) {
+    if (
+        !hasExactFields(snapshot, [
+            'schemaVersion',
+            'sha256',
+            'entryCount',
+            'totalBytes',
+            'entries',
+        ]) ||
+        snapshot.schemaVersion !==
+            LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT.schemaVersion ||
+        typeof snapshot.sha256 !== 'string' ||
+        !SHA256_PATTERN.test(snapshot.sha256) ||
+        !Number.isSafeInteger(snapshot.entryCount) ||
+        snapshot.entryCount < 0 ||
+        !Number.isSafeInteger(snapshot.totalBytes) ||
+        snapshot.totalBytes < 0 ||
+        !Array.isArray(snapshot.entries)
+    ) {
+        invalidSourceSnapshot('top-level fields do not match the contract.');
+    }
+
+    const entries = [];
+    const entryTypes = new Map();
+    let previousPath = null;
+    let totalBytes = 0;
+    for (const entry of snapshot.entries) {
+        if (
+            entry === null ||
+            typeof entry !== 'object' ||
+            Array.isArray(entry) ||
+            typeof entry.path !== 'string'
+        ) {
+            invalidSourceSnapshot('an entry is not an exact object.');
+        }
+        assertSafeSnapshotPath(entry.path);
+        if (
+            previousPath !== null &&
+            compareCanonicalPaths(previousPath, entry.path) >= 0
+        ) {
+            throw new Error(
+                'Invalid source snapshot: entry paths must be sorted and unique.'
+            );
+        }
+        previousPath = entry.path;
+
+        let normalizedEntry;
+        if (entry.type === 'directory') {
+            if (!hasExactFields(entry, ['path', 'type'])) {
+                invalidSourceSnapshot(
+                    `directory entry ${entry.path} has invalid fields.`
+                );
+            }
+            normalizedEntry = {
+                path: entry.path,
+                type: 'directory',
+            };
+        } else if (entry.type === 'file') {
+            if (
+                !hasExactFields(entry, [
+                    'path',
+                    'type',
+                    'size',
+                    'executable',
+                    'sha256',
+                ]) ||
+                !Number.isSafeInteger(entry.size) ||
+                entry.size < 0 ||
+                typeof entry.executable !== 'boolean' ||
+                typeof entry.sha256 !== 'string' ||
+                !SHA256_PATTERN.test(entry.sha256)
+            ) {
+                invalidSourceSnapshot(
+                    `file entry ${entry.path} has invalid fields.`
+                );
+            }
+            totalBytes += entry.size;
+            if (!Number.isSafeInteger(totalBytes)) {
+                invalidSourceSnapshot(
+                    'regular-file byte total exceeds the supported range.'
+                );
+            }
+            normalizedEntry = {
+                path: entry.path,
+                type: 'file',
+                size: entry.size,
+                executable: entry.executable,
+                sha256: entry.sha256,
+            };
+        } else if (entry.type === 'symlink') {
+            if (
+                !hasExactFields(entry, ['path', 'type', 'target']) ||
+                typeof entry.target !== 'string'
+            ) {
+                invalidSourceSnapshot(
+                    `symlink entry ${entry.path} has invalid fields.`
+                );
+            }
+            assertSafeSymlinkTarget(entry.path, entry.target);
+            normalizedEntry = {
+                path: entry.path,
+                type: 'symlink',
+                target: entry.target,
+            };
+        } else {
+            invalidSourceSnapshot(
+                `entry ${entry.path} has an unsupported type.`
+            );
+        }
+
+        const parentPath = path.posix.dirname(entry.path);
+        if (parentPath !== '.' && entryTypes.get(parentPath) !== 'directory') {
+            throw new Error(
+                `Invalid source snapshot: parent ${parentPath} of ${entry.path} must be a directory entry.`
+            );
+        }
+        entryTypes.set(entry.path, entry.type);
+        entries.push(normalizedEntry);
+    }
+
+    if (
+        snapshot.entryCount !== entries.length ||
+        snapshot.totalBytes !== totalBytes
+    ) {
+        invalidSourceSnapshot(
+            'entryCount or totalBytes does not match the entries.'
+        );
+    }
+    const normalizedSnapshot = {
+        schemaVersion: LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT.schemaVersion,
+        sha256: snapshot.sha256,
+        entryCount: entries.length,
+        totalBytes,
+        entries,
+    };
+    const canonicalSha256 = canonicalSourceSnapshotSha256(normalizedSnapshot);
+    if (snapshot.sha256 !== canonicalSha256) {
+        invalidSourceSnapshot('canonical SHA-256 does not match the entries.');
+    }
+    assertExpectedSourceSnapshot(normalizedSnapshot, expectedSha256);
+    return normalizedSnapshot;
+}
+
+function inventoryLinuxRuntimeSourceSnapshot(rootPath) {
+    const rootStat = fs.lstatSync(rootPath);
+    if (!rootStat.isDirectory() || rootStat.isSymbolicLink()) {
+        throw new Error('Source snapshot root must be a real directory.');
+    }
+    assertNoGitMetadata(rootPath);
+    const entries = [];
+    let totalBytes = 0;
+
+    function visit(directoryPath, relativeDirectory = '') {
+        const childNames = fs
+            .readdirSync(directoryPath)
+            .sort(compareCanonicalPaths);
+        for (const childName of childNames) {
+            const relativePath = relativeDirectory
+                ? `${relativeDirectory}/${childName}`
+                : childName;
+            assertSafeSnapshotPath(relativePath);
+            const absolutePath = path.join(directoryPath, childName);
+            const stat = fs.lstatSync(absolutePath);
+            if (stat.isDirectory()) {
+                entries.push({
+                    path: relativePath,
+                    type: 'directory',
+                });
+                visit(absolutePath, relativePath);
+                continue;
+            }
+            if (stat.isFile()) {
+                const file = sha256File(absolutePath);
+                totalBytes += file.size;
+                if (!Number.isSafeInteger(totalBytes)) {
+                    throw new Error(
+                        'Source snapshot total byte count exceeds the supported range.'
+                    );
+                }
+                entries.push({
+                    path: relativePath,
+                    type: 'file',
+                    size: file.size,
+                    executable: file.executable,
+                    sha256: file.sha256,
+                });
+                continue;
+            }
+            if (stat.isSymbolicLink()) {
+                const target = fs.readlinkSync(absolutePath);
+                assertSafeSymlinkTarget(relativePath, target);
+                entries.push({
+                    path: relativePath,
+                    type: 'symlink',
+                    target,
+                });
+                continue;
+            }
+            throw new Error(
+                `Unsupported source snapshot entry: ${relativePath}`
+            );
+        }
+    }
+
+    visit(rootPath);
+    entries.sort(({ path: left }, { path: right }) =>
+        compareCanonicalPaths(left, right)
+    );
+    const canonicalInventory = {
+        schemaVersion: LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT.schemaVersion,
+        entryCount: entries.length,
+        totalBytes,
+        entries,
+    };
+    const sha256 = canonicalSourceSnapshotSha256(canonicalInventory);
+    return {
+        schemaVersion: canonicalInventory.schemaVersion,
+        sha256,
+        entryCount: canonicalInventory.entryCount,
+        totalBytes: canonicalInventory.totalBytes,
+        entries,
+    };
+}
+
+function lstatIfExists(candidatePath) {
+    try {
+        return fs.lstatSync(candidatePath);
+    } catch (error) {
+        if (
+            error &&
+            typeof error === 'object' &&
+            'code' in error &&
+            error.code === 'ENOENT'
+        ) {
+            return null;
+        }
+        throw error;
+    }
+}
+
+function assertExpectedSourceSnapshot(
+    sourceSnapshot,
+    expectedSourceSnapshotSha256
+) {
+    if (expectedSourceSnapshotSha256 === undefined) {
+        return;
+    }
+    if (
+        typeof expectedSourceSnapshotSha256 !== 'string' ||
+        !SHA256_PATTERN.test(expectedSourceSnapshotSha256)
+    ) {
+        throw new Error(
+            'Expected source snapshot digest must be a lowercase SHA-256 digest.'
+        );
+    }
+    if (sourceSnapshot.sha256 !== expectedSourceSnapshotSha256) {
+        throw new Error(
+            `Source snapshot digest mismatch: expected ${expectedSourceSnapshotSha256}, received ${sourceSnapshot.sha256}.`
+        );
+    }
+}
+
+function copyWorkingTreeWithoutGitMetadata(
+    checkoutPath,
+    outputPath,
+    expectedSourceSnapshotSha256
+) {
+    const outputParent = path.dirname(outputPath);
+    const temporaryPath = fs.mkdtempSync(
+        path.join(outputParent, `.${path.basename(outputPath)}-`)
+    );
+    try {
+        fs.cpSync(checkoutPath, temporaryPath, {
+            recursive: true,
+            dereference: false,
+            verbatimSymlinks: true,
+            filter: (sourcePath) => path.basename(sourcePath) !== '.git',
+        });
+        assertNoGitMetadata(temporaryPath);
+        const sourceSnapshot =
+            inventoryLinuxRuntimeSourceSnapshot(temporaryPath);
+        assertExpectedSourceSnapshot(
+            sourceSnapshot,
+            expectedSourceSnapshotSha256
+        );
+        if (lstatIfExists(outputPath)) {
+            throw new Error(
+                `Prepared source snapshot output must not already exist: ${outputPath}`
+            );
+        }
+        fs.renameSync(temporaryPath, outputPath);
+        return sourceSnapshot;
+    } catch (error) {
+        fs.rmSync(temporaryPath, { recursive: true, force: true });
+        throw error;
+    }
+}
+
+function prepareLinuxRuntimeSourceSnapshot({
+    checkoutPath,
+    outputPath,
+    expected,
+    expectedSourceSnapshotSha256,
+}) {
+    const checkoutStat = fs.lstatSync(checkoutPath);
+    if (!checkoutStat.isDirectory() || checkoutStat.isSymbolicLink()) {
+        throw new Error('Source checkout must be a real directory.');
+    }
+    const checkoutRoot = fs.realpathSync(checkoutPath);
+    const outputRoot = path.resolve(outputPath);
+    const outputParent = path.dirname(outputRoot);
+    const outputParentStat = fs.lstatSync(outputParent);
+    if (!outputParentStat.isDirectory() || outputParentStat.isSymbolicLink()) {
+        throw new Error(
+            'Prepared source snapshot parent must be a real directory.'
+        );
+    }
+    if (lstatIfExists(outputRoot)) {
+        throw new Error(
+            `Prepared source snapshot output must not already exist: ${outputRoot}`
+        );
+    }
+    const realOutputRoot = path.join(
+        fs.realpathSync(outputParent),
+        path.basename(outputRoot)
+    );
+    const isInside = (root, candidate) => {
+        const relative = path.relative(root, candidate);
+        return (
+            relative === '' ||
+            (relative !== '..' &&
+                !relative.startsWith(`..${path.sep}`) &&
+                !path.isAbsolute(relative))
+        );
+    };
+    if (
+        isInside(checkoutRoot, realOutputRoot) ||
+        isInside(realOutputRoot, checkoutRoot)
+    ) {
+        throw new Error(
+            'Prepared source snapshot and checkout must be separate trees.'
+        );
+    }
+    const record = inspectCleanGitSource(checkoutRoot, expected);
+    const sourceSnapshot = copyWorkingTreeWithoutGitMetadata(
+        checkoutRoot,
+        realOutputRoot,
+        expectedSourceSnapshotSha256
+    );
+    assertNoGitMetadata(realOutputRoot);
+    return {
+        ...record,
+        sourceSnapshot,
+    };
+}
+
+function parseArguments(argv) {
+    const [command, ...tokens] = argv;
+    const options = {};
+    for (let index = 0; index < tokens.length; index += 2) {
+        const name = tokens[index];
+        const value = tokens[index + 1];
+        if (!name?.startsWith('--') || value === undefined) {
+            throw new Error(`Invalid command-line argument: ${name ?? ''}`);
+        }
+        options[name.slice(2)] = value;
+    }
+    return { command, options };
+}
+
+function readJson(filePath) {
+    return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+}
+
+function writeJson(filePath, value) {
+    fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+function main(argv = process.argv.slice(2)) {
+    const { command, options } = parseArguments(argv);
+    if (
+        command === 'prepare' &&
+        options['runtime-manifest'] &&
+        options.checkout &&
+        options.output &&
+        options['record-output']
+    ) {
+        const runtimeManifest = readJson(options['runtime-manifest']);
+        const sourcePackage = runtimeManifest?.packages?.libplacebo;
+        const record = prepareLinuxRuntimeSourceSnapshot({
+            checkoutPath: options.checkout,
+            outputPath: options.output,
+            expected: {
+                sourceGitCommit: sourcePackage?.sourceGitCommit,
+                sourceSubmodules: sourcePackage?.sourceSubmodules,
+            },
+            expectedSourceSnapshotSha256:
+                EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+        });
+        writeJson(options['record-output'], record);
+        return;
+    }
+    if (command === 'assert-vcs-free' && options.directory) {
+        assertNoGitMetadata(options.directory);
+        return;
+    }
+    throw new Error(
+        'Usage: prepare-linux-runtime-source-snapshot.cjs prepare --runtime-manifest <path> --checkout <path> --output <path> --record-output <path> | assert-vcs-free --directory <path>'
+    );
+}
+
+if (require.main === module) {
+    try {
+        main();
+    } catch (error) {
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exitCode = 1;
+    }
+}
+
+module.exports = {
+    EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+    LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT,
+    assertNoGitMetadata,
+    inspectCleanGitSource,
+    inventoryLinuxRuntimeSourceSnapshot,
+    prepareLinuxRuntimeSourceSnapshot,
+    validateLinuxRuntimeSourceSnapshot,
+};
diff --git a/tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs b/tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs
new file mode 100644
index 000000000..6d9d0e0a0
--- /dev/null
+++ b/tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs
@@ -0,0 +1,776 @@
+import assert from 'node:assert/strict';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { createRequire } from 'node:module';
+import test from 'node:test';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const {
+    canonicalizeGitSubmoduleStatus,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
+const helperPath = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    'prepare-linux-runtime-source-snapshot.cjs'
+);
+
+async function loadHelper() {
+    if (!fs.existsSync(helperPath)) {
+        return null;
+    }
+    return import(pathToFileURL(helperPath).href);
+}
+
+function runGit(cwd, args, env = {}) {
+    const result = spawnSync('git', args, {
+        cwd,
+        encoding: 'utf8',
+        env: {
+            ...process.env,
+            ...env,
+        },
+    });
+    assert.equal(
+        result.status,
+        0,
+        `git ${args.join(' ')} failed:\n${result.stderr}`
+    );
+    return result.stdout.trim();
+}
+
+function createEquivalentCheckouts(root) {
+    const origin = path.join(root, 'origin');
+    fs.mkdirSync(origin);
+    runGit(origin, ['init', '--quiet']);
+    fs.mkdirSync(path.join(origin, 'src'));
+    fs.writeFileSync(path.join(origin, 'src', 'renderer.c'), 'int main() {}\n');
+    fs.writeFileSync(path.join(origin, 'LICENSE'), 'license\n');
+    fs.symlinkSync('../LICENSE', path.join(origin, 'src', 'license-link'));
+    runGit(origin, ['add', '.']);
+    runGit(origin, ['commit', '--quiet', '-m', 'source fixture'], {
+        GIT_AUTHOR_NAME: 'Fixture',
+        GIT_AUTHOR_EMAIL: 'fixture@example.invalid',
+        GIT_AUTHOR_DATE: '2000-01-01T00:00:00Z',
+        GIT_COMMITTER_NAME: 'Fixture',
+        GIT_COMMITTER_EMAIL: 'fixture@example.invalid',
+        GIT_COMMITTER_DATE: '2000-01-01T00:00:00Z',
+    });
+    const commit = runGit(origin, ['rev-parse', 'HEAD']);
+    const first = path.join(root, 'first');
+    const second = path.join(root, 'second');
+    runGit(root, ['clone', '--quiet', origin, first]);
+    runGit(root, ['clone', '--quiet', origin, second]);
+
+    fs.appendFileSync(
+        path.join(first, '.git', 'config'),
+        '\n[fixture]\n\tvalue = first\n'
+    );
+    fs.appendFileSync(
+        path.join(second, '.git', 'config'),
+        '\n[fixture]\n\tvalue = second\n'
+    );
+    fs.writeFileSync(path.join(first, '.git', 'fixture-cache'), 'one');
+    fs.writeFileSync(path.join(second, '.git', 'fixture-cache'), 'two');
+    const differentTime = new Date('2030-01-01T00:00:00Z');
+    fs.utimesSync(
+        path.join(second, '.git', 'index'),
+        differentTime,
+        differentTime
+    );
+
+    return { commit, first, second };
+}
+
+function createCheckoutWithSubmodule(root) {
+    const submoduleOrigin = path.join(root, 'submodule-origin');
+    fs.mkdirSync(submoduleOrigin);
+    runGit(submoduleOrigin, ['init', '--quiet']);
+    fs.writeFileSync(
+        path.join(submoduleOrigin, 'submodule-source.c'),
+        'int submodule_source;\n'
+    );
+    runGit(submoduleOrigin, ['add', '.']);
+    runGit(submoduleOrigin, ['commit', '--quiet', '-m', 'submodule source'], {
+        GIT_AUTHOR_NAME: 'Fixture',
+        GIT_AUTHOR_EMAIL: 'fixture@example.invalid',
+        GIT_AUTHOR_DATE: '2000-01-01T00:00:00Z',
+        GIT_COMMITTER_NAME: 'Fixture',
+        GIT_COMMITTER_EMAIL: 'fixture@example.invalid',
+        GIT_COMMITTER_DATE: '2000-01-01T00:00:00Z',
+    });
+
+    const checkout = path.join(root, 'checkout-with-submodule');
+    fs.mkdirSync(checkout);
+    runGit(checkout, ['init', '--quiet']);
+    fs.writeFileSync(path.join(checkout, 'README'), 'source tree\n');
+    runGit(checkout, ['add', 'README']);
+    runGit(checkout, [
+        '-c',
+        'protocol.file.allow=always',
+        'submodule',
+        'add',
+        '--quiet',
+        submoduleOrigin,
+        '3rdparty/example',
+    ]);
+    runGit(checkout, ['commit', '--quiet', '-m', 'source with submodule'], {
+        GIT_AUTHOR_NAME: 'Fixture',
+        GIT_AUTHOR_EMAIL: 'fixture@example.invalid',
+        GIT_AUTHOR_DATE: '2000-01-02T00:00:00Z',
+        GIT_COMMITTER_NAME: 'Fixture',
+        GIT_COMMITTER_EMAIL: 'fixture@example.invalid',
+        GIT_COMMITTER_DATE: '2000-01-02T00:00:00Z',
+    });
+    return {
+        checkout,
+        expected: {
+            sourceGitCommit: runGit(checkout, ['rev-parse', 'HEAD']),
+            sourceSubmodules: canonicalizeGitSubmoduleStatus(
+                runGit(checkout, ['submodule', 'status', '--recursive'])
+            ),
+        },
+    };
+}
+
+function snapshotRecords(root) {
+    const records = [];
+    function visit(directory, relativeDirectory = '') {
+        for (const entry of fs
+            .readdirSync(directory, { withFileTypes: true })
+            .sort(({ name: left }, { name: right }) =>
+                left.localeCompare(right)
+            )) {
+            const relativePath = path.posix.join(relativeDirectory, entry.name);
+            const absolutePath = path.join(directory, entry.name);
+            const stat = fs.lstatSync(absolutePath);
+            if (entry.isDirectory()) {
+                records.push({
+                    path: `${relativePath}/`,
+                    mode: stat.mode & 0o777,
+                });
+                visit(absolutePath, relativePath);
+            } else if (entry.isSymbolicLink()) {
+                records.push({
+                    path: relativePath,
+                    mode: stat.mode & 0o777,
+                    symlink: fs.readlinkSync(absolutePath),
+                });
+            } else {
+                records.push({
+                    path: relativePath,
+                    mode: stat.mode & 0o777,
+                    sha256: crypto
+                        .createHash('sha256')
+                        .update(fs.readFileSync(absolutePath))
+                        .digest('hex'),
+                });
+            }
+        }
+    }
+    visit(root);
+    return records;
+}
+
+const FIXTURE_SOURCE_SNAPSHOT = Object.freeze({
+    schemaVersion: 1,
+    sha256: '445a78c08a661d68f8ab15a790ba9c3462766d23e31b00eeca7429544c21a497',
+    entryCount: 4,
+    totalBytes: 22,
+    entries: [
+        {
+            path: 'LICENSE',
+            type: 'file',
+            size: 8,
+            executable: false,
+            sha256: 'c0c56958ef8be5c1979366896b7e0c7206949a5aa2b23f51429c7f56b10990d3',
+        },
+        {
+            path: 'src',
+            type: 'directory',
+        },
+        {
+            path: 'src/license-link',
+            type: 'symlink',
+            target: '../LICENSE',
+        },
+        {
+            path: 'src/renderer.c',
+            type: 'file',
+            size: 14,
+            executable: false,
+            sha256: 'bc8bb8e433bf65214540115414c821c904b2a30d60a3ac0424bf9b77a00024b7',
+        },
+    ],
+});
+
+function cloneFixtureSourceSnapshot() {
+    return JSON.parse(JSON.stringify(FIXTURE_SOURCE_SNAPSHOT));
+}
+
+test('purely validates the exact source snapshot contract independent of object key order', async () => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const shuffled = {
+        entries: FIXTURE_SOURCE_SNAPSHOT.entries.map((entry) => {
+            if (entry.type === 'file') {
+                return {
+                    sha256: entry.sha256,
+                    executable: entry.executable,
+                    size: entry.size,
+                    type: entry.type,
+                    path: entry.path,
+                };
+            }
+            if (entry.type === 'symlink') {
+                return {
+                    target: entry.target,
+                    type: entry.type,
+                    path: entry.path,
+                };
+            }
+            return {
+                type: entry.type,
+                path: entry.path,
+            };
+        }),
+        totalBytes: FIXTURE_SOURCE_SNAPSHOT.totalBytes,
+        entryCount: FIXTURE_SOURCE_SNAPSHOT.entryCount,
+        sha256: FIXTURE_SOURCE_SNAPSHOT.sha256,
+        schemaVersion: FIXTURE_SOURCE_SNAPSHOT.schemaVersion,
+    };
+
+    assert.deepEqual(
+        helper.validateLinuxRuntimeSourceSnapshot(shuffled),
+        FIXTURE_SOURCE_SNAPSHOT
+    );
+    assert.deepEqual(
+        helper.validateLinuxRuntimeSourceSnapshot(shuffled, {
+            expectedSha256: FIXTURE_SOURCE_SNAPSHOT.sha256,
+        }),
+        FIXTURE_SOURCE_SNAPSHOT
+    );
+    assert.deepEqual(shuffled.entries[0], {
+        sha256: FIXTURE_SOURCE_SNAPSHOT.entries[0].sha256,
+        executable: false,
+        size: 8,
+        type: 'file',
+        path: 'LICENSE',
+    });
+});
+
+test('rejects non-exact source snapshot fields and malformed entry shapes', async () => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const invalidSnapshots = [];
+
+    const extraTopLevelField = cloneFixtureSourceSnapshot();
+    extraTopLevelField.extra = true;
+    invalidSnapshots.push(extraTopLevelField);
+
+    const missingTopLevelField = cloneFixtureSourceSnapshot();
+    delete missingTopLevelField.totalBytes;
+    invalidSnapshots.push(missingTopLevelField);
+
+    const extraEntryField = cloneFixtureSourceSnapshot();
+    extraEntryField.entries[0].mode = 0o644;
+    invalidSnapshots.push(extraEntryField);
+
+    const missingEntryField = cloneFixtureSourceSnapshot();
+    delete missingEntryField.entries[0].executable;
+    invalidSnapshots.push(missingEntryField);
+
+    const invalidFileSize = cloneFixtureSourceSnapshot();
+    invalidFileSize.entries[0].size = -1;
+    invalidSnapshots.push(invalidFileSize);
+
+    const invalidExecutable = cloneFixtureSourceSnapshot();
+    invalidExecutable.entries[0].executable = 1;
+    invalidSnapshots.push(invalidExecutable);
+
+    const invalidFileHash = cloneFixtureSourceSnapshot();
+    invalidFileHash.entries[0].sha256 = 'A'.repeat(64);
+    invalidSnapshots.push(invalidFileHash);
+
+    const invalidType = cloneFixtureSourceSnapshot();
+    invalidType.entries[1].type = 'socket';
+    invalidSnapshots.push(invalidType);
+
+    for (const snapshot of invalidSnapshots) {
+        assert.throws(
+            () => helper.validateLinuxRuntimeSourceSnapshot(snapshot),
+            /invalid source snapshot/i
+        );
+    }
+});
+
+test('rejects unsafe or unsorted paths, bad links, aggregates, and digests', async () => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+
+    const unsorted = cloneFixtureSourceSnapshot();
+    [unsorted.entries[0], unsorted.entries[1]] = [
+        unsorted.entries[1],
+        unsorted.entries[0],
+    ];
+    assert.throws(
+        () => helper.validateLinuxRuntimeSourceSnapshot(unsorted),
+        /sorted and unique/i
+    );
+
+    const duplicate = cloneFixtureSourceSnapshot();
+    duplicate.entries[1].path = duplicate.entries[0].path;
+    assert.throws(
+        () => helper.validateLinuxRuntimeSourceSnapshot(duplicate),
+        /sorted and unique/i
+    );
+
+    const unsafePath = cloneFixtureSourceSnapshot();
+    unsafePath.entries[0].path = '../LICENSE';
+    assert.throws(
+        () => helper.validateLinuxRuntimeSourceSnapshot(unsafePath),
+        /unsafe source snapshot path/i
+    );
+
+    const unsafeLink = cloneFixtureSourceSnapshot();
+    unsafeLink.entries[2].target = '../../outside';
+    assert.throws(
+        () => helper.validateLinuxRuntimeSourceSnapshot(unsafeLink),
+        /unsafe source snapshot symlink/i
+    );
+
+    const missingParentDirectory = cloneFixtureSourceSnapshot();
+    missingParentDirectory.entries.splice(1, 1);
+    missingParentDirectory.entryCount -= 1;
+    assert.throws(
+        () => helper.validateLinuxRuntimeSourceSnapshot(missingParentDirectory),
+        /parent.*directory/i
+    );
+
+    for (const [field, value] of [
+        ['entryCount', FIXTURE_SOURCE_SNAPSHOT.entryCount + 1],
+        ['totalBytes', FIXTURE_SOURCE_SNAPSHOT.totalBytes + 1],
+        ['sha256', '0'.repeat(64)],
+    ]) {
+        const invalidAggregate = cloneFixtureSourceSnapshot();
+        invalidAggregate[field] = value;
+        assert.throws(
+            () => helper.validateLinuxRuntimeSourceSnapshot(invalidAggregate),
+            /invalid source snapshot/i
+        );
+    }
+
+    assert.throws(
+        () =>
+            helper.validateLinuxRuntimeSourceSnapshot(FIXTURE_SOURCE_SNAPSHOT, {
+                expectedSha256: '0'.repeat(64),
+            }),
+        /source snapshot digest mismatch/i
+    );
+});
+
+test('prepares identical VCS-free snapshots from equivalent clean checkouts', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-snapshot-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const { commit, first, second } = createEquivalentCheckouts(root);
+    const firstOutput = path.join(root, 'snapshot-first');
+    const secondOutput = path.join(root, 'snapshot-second');
+    const expected = {
+        sourceGitCommit: commit,
+        sourceSubmodules: [],
+    };
+
+    const firstRecord = helper.prepareLinuxRuntimeSourceSnapshot({
+        checkoutPath: first,
+        outputPath: firstOutput,
+        expected,
+    });
+    const secondRecord = helper.prepareLinuxRuntimeSourceSnapshot({
+        checkoutPath: second,
+        outputPath: secondOutput,
+        expected,
+    });
+
+    assert.deepEqual(firstRecord, {
+        ...expected,
+        sourceSnapshot: FIXTURE_SOURCE_SNAPSHOT,
+    });
+    assert.deepEqual(secondRecord, {
+        ...expected,
+        sourceSnapshot: FIXTURE_SOURCE_SNAPSHOT,
+    });
+    assert.deepEqual(
+        helper.LINUX_RUNTIME_SOURCE_SNAPSHOT_CONTRACT,
+        Object.freeze({
+            schemaVersion: 1,
+            hashAlgorithm: 'sha256',
+            canonicalEncoding: 'utf8-json-line-v1',
+        })
+    );
+    assert.deepEqual(
+        helper.inventoryLinuxRuntimeSourceSnapshot(firstOutput),
+        FIXTURE_SOURCE_SNAPSHOT
+    );
+    assert.deepEqual(
+        snapshotRecords(firstOutput),
+        snapshotRecords(secondOutput)
+    );
+    assert.equal(
+        snapshotRecords(firstOutput).some(({ path: recordPath }) =>
+            recordPath.split('/').includes('.git')
+        ),
+        false
+    );
+    assert.equal(
+        fs.readlinkSync(path.join(firstOutput, 'src', 'license-link')),
+        '../LICENSE'
+    );
+});
+
+test('normalizes regular-file executable permissions in the canonical inventory', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-modes-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const first = path.join(root, 'first');
+    const second = path.join(root, 'second');
+    fs.mkdirSync(path.join(first, 'bin'), { recursive: true, mode: 0o700 });
+    fs.mkdirSync(path.join(second, 'bin'), { recursive: true, mode: 0o755 });
+    fs.writeFileSync(path.join(first, 'bin', 'tool'), '#!/bin/sh\n', {
+        mode: 0o700,
+    });
+    fs.writeFileSync(path.join(second, 'bin', 'tool'), '#!/bin/sh\n', {
+        mode: 0o755,
+    });
+    fs.writeFileSync(path.join(first, 'README'), 'same\n', { mode: 0o600 });
+    fs.writeFileSync(path.join(second, 'README'), 'same\n', { mode: 0o644 });
+
+    const firstInventory = helper.inventoryLinuxRuntimeSourceSnapshot(first);
+    const secondInventory = helper.inventoryLinuxRuntimeSourceSnapshot(second);
+
+    assert.deepEqual(firstInventory, secondInventory);
+    assert.deepEqual(
+        firstInventory.entries.map((entry) => ({
+            path: entry.path,
+            executable: entry.executable,
+        })),
+        [
+            { path: 'README', executable: false },
+            { path: 'bin', executable: undefined },
+            { path: 'bin/tool', executable: true },
+        ]
+    );
+});
+
+test('globally sorts prefix-colliding sibling paths before hashing', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-global-order-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    fs.mkdirSync(path.join(root, 'c'));
+    fs.mkdirSync(path.join(root, 'c++'));
+    fs.writeFileSync(path.join(root, 'c', 'tool'), 'c\n');
+    fs.writeFileSync(path.join(root, 'c++', 'tool'), 'c++\n');
+
+    const inventory = helper.inventoryLinuxRuntimeSourceSnapshot(root);
+
+    assert.deepEqual(
+        inventory.entries.map(({ path: entryPath }) => entryPath),
+        ['c', 'c++', 'c++/tool', 'c/tool']
+    );
+    assert.doesNotThrow(() =>
+        helper.validateLinuxRuntimeSourceSnapshot(inventory)
+    );
+});
+
+test('fails closed on VCS entries, unsafe symlinks, and special files', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-unsafe-entry-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+
+    const vcsRoot = path.join(root, 'vcs');
+    fs.mkdirSync(vcsRoot);
+    fs.writeFileSync(path.join(vcsRoot, '.git'), 'gitdir: elsewhere\n');
+    assert.throws(
+        () => helper.inventoryLinuxRuntimeSourceSnapshot(vcsRoot),
+        /must not contain VCS metadata.*\.git/i
+    );
+
+    const escapingLinkRoot = path.join(root, 'escaping-link');
+    fs.mkdirSync(path.join(escapingLinkRoot, 'nested'), { recursive: true });
+    fs.symlinkSync(
+        '../../outside',
+        path.join(escapingLinkRoot, 'nested', 'link')
+    );
+    assert.throws(
+        () => helper.inventoryLinuxRuntimeSourceSnapshot(escapingLinkRoot),
+        /unsafe source snapshot symlink.*nested\/link.*\.\.\/\.\.\/outside/i
+    );
+
+    const absoluteLinkRoot = path.join(root, 'absolute-link');
+    fs.mkdirSync(absoluteLinkRoot);
+    fs.symlinkSync('/outside', path.join(absoluteLinkRoot, 'link'));
+    assert.throws(
+        () => helper.inventoryLinuxRuntimeSourceSnapshot(absoluteLinkRoot),
+        /unsafe source snapshot symlink.*\/outside/i
+    );
+
+    if (process.platform !== 'win32') {
+        const specialRoot = path.join(root, 'special');
+        fs.mkdirSync(specialRoot);
+        const fifoPath = path.join(specialRoot, 'pipe');
+        const mkfifo = spawnSync('mkfifo', [fifoPath], { encoding: 'utf8' });
+        assert.equal(mkfifo.status, 0, mkfifo.stderr);
+        assert.throws(
+            () => helper.inventoryLinuxRuntimeSourceSnapshot(specialRoot),
+            /unsupported source snapshot entry.*pipe/i
+        );
+    }
+});
+
+test('checks an optional expected digest atomically for direct callers', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-expected-digest-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const { commit, first } = createEquivalentCheckouts(root);
+    const expected = {
+        sourceGitCommit: commit,
+        sourceSubmodules: [],
+    };
+    const matchingOutput = path.join(root, 'matching');
+
+    assert.deepEqual(
+        helper.prepareLinuxRuntimeSourceSnapshot({
+            checkoutPath: first,
+            outputPath: matchingOutput,
+            expected,
+            expectedSourceSnapshotSha256: FIXTURE_SOURCE_SNAPSHOT.sha256,
+        }).sourceSnapshot,
+        FIXTURE_SOURCE_SNAPSHOT
+    );
+
+    const mismatchingOutput = path.join(root, 'mismatching');
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: first,
+                outputPath: mismatchingOutput,
+                expected,
+                expectedSourceSnapshotSha256: '0'.repeat(64),
+            }),
+        /source snapshot digest mismatch.*expected 000000.*received 445a78/i
+    );
+    assert.equal(fs.existsSync(mismatchingOutput), false);
+});
+
+test('production CLI always enforces the trusted pinned libplacebo digest', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    assert.match(
+        helper.EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+        /^[a-f0-9]{64}$/
+    );
+    assert.equal(
+        helper.EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+        '0db67c1523411255244186af437e9fbfe7ccac04a5ac1b3dc9275dd0806f6f0c'
+    );
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-cli-digest-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const { commit, first } = createEquivalentCheckouts(root);
+    const runtimeManifestPath = path.join(root, 'runtime-manifest.json');
+    fs.writeFileSync(
+        runtimeManifestPath,
+        JSON.stringify({
+            packages: {
+                libplacebo: {
+                    sourceGitCommit: commit,
+                    sourceSubmodules: [],
+                },
+            },
+        })
+    );
+    const outputPath = path.join(root, 'output');
+    const recordOutputPath = path.join(root, 'record.json');
+    const result = spawnSync(
+        process.execPath,
+        [
+            helperPath,
+            'prepare',
+            '--runtime-manifest',
+            runtimeManifestPath,
+            '--checkout',
+            first,
+            '--output',
+            outputPath,
+            '--record-output',
+            recordOutputPath,
+        ],
+        { encoding: 'utf8' }
+    );
+
+    assert.notEqual(result.status, 0);
+    assert.match(result.stderr, /source snapshot digest mismatch/i);
+    assert.equal(fs.existsSync(outputPath), false);
+    assert.equal(fs.existsSync(recordOutputPath), false);
+});
+
+test('validates checkout cleanliness and exact commit/submodule identities before copying', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-identity-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const { commit, first, second } = createEquivalentCheckouts(root);
+
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: first,
+                outputPath: path.join(root, 'wrong-commit'),
+                expected: {
+                    sourceGitCommit: '0'.repeat(40),
+                    sourceSubmodules: [],
+                },
+            }),
+        /commit does not match/
+    );
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: first,
+                outputPath: path.join(root, 'wrong-submodules'),
+                expected: {
+                    sourceGitCommit: commit,
+                    sourceSubmodules: [`${'1'.repeat(40)} 3rdparty/example`],
+                },
+            }),
+        /submodules do not match/
+    );
+
+    fs.writeFileSync(path.join(second, 'untracked-build-output'), 'dirty');
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: second,
+                outputPath: path.join(root, 'dirty'),
+                expected: {
+                    sourceGitCommit: commit,
+                    sourceSubmodules: [],
+                },
+            }),
+        /dirty or untracked files/
+    );
+
+    const existingOutput = path.join(root, 'existing-output');
+    fs.mkdirSync(existingOutput);
+    fs.writeFileSync(
+        path.join(existingOutput, 'owned-by-someone-else'),
+        'keep'
+    );
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: first,
+                outputPath: existingOutput,
+                expected: {
+                    sourceGitCommit: commit,
+                    sourceSubmodules: [],
+                },
+            }),
+        /output.*must not already exist/i
+    );
+    assert.equal(
+        fs.readFileSync(
+            path.join(existingOutput, 'owned-by-someone-else'),
+            'utf8'
+        ),
+        'keep'
+    );
+
+    const existingSymlink = path.join(root, 'existing-symlink');
+    fs.symlinkSync('missing-target', existingSymlink);
+    assert.throws(
+        () =>
+            helper.prepareLinuxRuntimeSourceSnapshot({
+                checkoutPath: first,
+                outputPath: existingSymlink,
+                expected: {
+                    sourceGitCommit: commit,
+                    sourceSubmodules: [],
+                },
+            }),
+        /output.*must not already exist/i
+    );
+    assert.equal(fs.readlinkSync(existingSymlink), 'missing-target');
+});
+
+test('preserves recursive submodule sources while stripping every nested .git link', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-submodule-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    const { checkout, expected } = createCheckoutWithSubmodule(root);
+    const output = path.join(root, 'submodule-snapshot');
+
+    const record = helper.prepareLinuxRuntimeSourceSnapshot({
+        checkoutPath: checkout,
+        outputPath: output,
+        expected,
+    });
+    assert.deepEqual(
+        {
+            sourceGitCommit: record.sourceGitCommit,
+            sourceSubmodules: record.sourceSubmodules,
+        },
+        expected
+    );
+    assert.deepEqual(
+        record.sourceSnapshot,
+        helper.inventoryLinuxRuntimeSourceSnapshot(output)
+    );
+    assert.equal(
+        fs.readFileSync(
+            path.join(output, '3rdparty', 'example', 'submodule-source.c'),
+            'utf8'
+        ),
+        'int submodule_source;\n'
+    );
+    assert.doesNotThrow(() => helper.assertNoGitMetadata(output));
+});
+
+test('fails closed when a prepared snapshot contains any nested .git entry', async (t) => {
+    const helper = await loadHelper();
+    assert.ok(helper, 'the deterministic source snapshot helper must exist');
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-source-vcs-entry-')
+    );
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    fs.mkdirSync(path.join(root, 'nested', '.git'), { recursive: true });
+    fs.writeFileSync(path.join(root, 'nested', '.git', 'index'), 'metadata');
+
+    assert.throws(
+        () => helper.assertNoGitMetadata(root),
+        /must not contain VCS metadata.*nested\/\.git/i
+    );
+});
diff --git a/tools/packaging/project.json b/tools/packaging/project.json
index 25e5aa53f..709602181 100644
--- a/tools/packaging/project.json
+++ b/tools/packaging/project.json
@@ -12,6 +12,7 @@
                 "{workspaceRoot}/package.json",
                 "{workspaceRoot}/electron-builder.json",
                 "{workspaceRoot}/.github/workflows/build-and-make.yaml",
+                "{workspaceRoot}/.github/workflows/publish-snap.yaml",
                 "{workspaceRoot}/apps/electron-backend/build-embedded-mpv.js",
                 "{workspaceRoot}/apps/electron-backend/project.json",
                 "{workspaceRoot}/apps/electron-backend/native/src/embedded_mpv_win32.cc",
@@ -21,16 +22,62 @@
                 "{workspaceRoot}/tools/packaging/asar-dependency-closure.test.mjs",
                 "{workspaceRoot}/tools/packaging/embedded-mpv-packaging.cjs",
                 "{workspaceRoot}/tools/packaging/embedded-mpv-arch.test.mjs",
+                "{workspaceRoot}/tools/packaging/flatpak-launcher-validation.cjs",
+                "{workspaceRoot}/tools/packaging/flatpak-launcher-validation.test.mjs",
+                "{workspaceRoot}/tools/packaging/configure-linux-frame-copy-build.mjs",
+                "{workspaceRoot}/tools/packaging/configure-linux-frame-copy-build.test.mjs",
+                "{workspaceRoot}/tools/packaging/linux-after-pack.test.mjs",
+                "{workspaceRoot}/tools/packaging/linux-frame-copy-profile.cjs",
+                "{workspaceRoot}/tools/packaging/linux-frame-copy-profile.test.mjs",
+                "{workspaceRoot}/tools/packaging/prepare-linux-runtime-source-snapshot.cjs",
+                "{workspaceRoot}/tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs",
+                "{workspaceRoot}/tools/packaging/publish-snap-workflow.test.mjs",
+                "{workspaceRoot}/tools/packaging/release-snap-assets.cjs",
+                "{workspaceRoot}/tools/packaging/release-snap-assets.test.mjs",
+                "{workspaceRoot}/tools/packaging/release-snap-source-binding.cjs",
+                "{workspaceRoot}/tools/packaging/verify-linux-frame-copy-runtime.mjs",
+                "{workspaceRoot}/tools/packaging/verify-linux-frame-copy-runtime.test.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.test.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/generate-linux-runtime-notices.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/generate-linux-runtime-notices.test.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-runtime-manifest.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-runtime-manifest.test.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts",
                 "{workspaceRoot}/tools/embedded-mpv/stage-runtime.mjs",
                 "{workspaceRoot}/tools/embedded-mpv/stage-windows-runtime-archive.mjs"
             ],
             "options": {
-                "command": "node --test tools/packaging/electron-package-identity.test.mjs tools/packaging/asar-dependency-closure.test.mjs tools/packaging/embedded-mpv-arch.test.mjs",
+                "command": "node --test tools/packaging/electron-package-identity.test.mjs tools/packaging/asar-dependency-closure.test.mjs tools/packaging/embedded-mpv-arch.test.mjs tools/packaging/flatpak-launcher-validation.test.mjs tools/packaging/configure-linux-frame-copy-build.test.mjs tools/packaging/linux-after-pack.test.mjs tools/packaging/linux-frame-copy-profile.test.mjs tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs tools/packaging/publish-snap-workflow.test.mjs tools/packaging/release-snap-assets.test.mjs tools/packaging/verify-linux-frame-copy-runtime.test.mjs tools/embedded-mpv/build-linux-runtime.test.mjs tools/embedded-mpv/generate-linux-runtime-notices.test.mjs tools/embedded-mpv/linux-runtime-manifest.test.mjs",
                 "cwd": "{workspaceRoot}"
             }
         },
         "lint": {
-            "command": "eslint \"tools/packaging/**/*.{js,cjs,mjs,ts}\""
+            "inputs": [
+                "default",
+                "{workspaceRoot}/eslint.config.mjs",
+                "{workspaceRoot}/tools/eslint-rules/**/*",
+                "{workspaceRoot}/tools/eslint/**/*",
+                "{workspaceRoot}/.github/workflows/build-and-make.yaml",
+                "{workspaceRoot}/.github/workflows/publish-snap.yaml",
+                "{workspaceRoot}/tools/packaging/prepare-linux-runtime-source-snapshot.cjs",
+                "{workspaceRoot}/tools/packaging/prepare-linux-runtime-source-snapshot.test.mjs",
+                "{workspaceRoot}/tools/packaging/publish-snap-workflow.test.mjs",
+                "{workspaceRoot}/tools/packaging/release-snap-assets.cjs",
+                "{workspaceRoot}/tools/packaging/release-snap-assets.test.mjs",
+                "{workspaceRoot}/tools/packaging/release-snap-source-binding.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/build-linux-runtime.test.mjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/linux-source-archive-contract.d.cts",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs",
+                "{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts"
+            ],
+            "command": "eslint \"tools/packaging/**/*.{js,cjs,mjs,ts}\" \"tools/embedded-mpv/build-linux-runtime.{mjs,test.mjs}\" \"tools/embedded-mpv/generate-linux-runtime-notices.{cjs,test.mjs}\" \"tools/embedded-mpv/linux-source-archive-contract.cjs\" \"tools/embedded-mpv/runtime-probe-contract.cjs\""
         }
     },
     "tags": ["scope:tools", "domain:packaging", "type:tool"]
diff --git a/tools/packaging/publish-snap-workflow.test.mjs b/tools/packaging/publish-snap-workflow.test.mjs
new file mode 100644
index 000000000..9bc87f59b
--- /dev/null
+++ b/tools/packaging/publish-snap-workflow.test.mjs
@@ -0,0 +1,507 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { parse } from 'yaml';
+import {
+    assertBuildSnapWorkflowPolicy,
+    assertPublishSnapWorkflowPolicy,
+} from './snap-workflow-policy.test-helpers.mjs';
+
+const workspaceRoot = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '..',
+    '..'
+);
+const buildWorkflowPath = path.join(
+    workspaceRoot,
+    '.github',
+    'workflows',
+    'build-and-make.yaml'
+);
+const publishWorkflowPath = path.join(
+    workspaceRoot,
+    '.github',
+    'workflows',
+    'publish-snap.yaml'
+);
+const releaseAssetHelperPath = path.join(
+    workspaceRoot,
+    'tools',
+    'packaging',
+    'release-snap-assets.cjs'
+);
+
+async function loadReleaseAssetHelper() {
+    if (!fs.existsSync(releaseAssetHelperPath)) {
+        return null;
+    }
+    return import(pathToFileURL(releaseAssetHelperPath).href);
+}
+
+function insertFirstJobStep(workflowText, stepSource) {
+    const stepsHeader = /^([ \t]+)steps:\r?\n/m.exec(workflowText);
+    assert.ok(stepsHeader, 'workflow must contain a steps list');
+    const insertionIndex = stepsHeader.index + stepsHeader[0].length;
+    const stepIndent = `${stepsHeader[1]}    `;
+    const indentedStep = stepSource
+        .split('\n')
+        .map((line) => `${stepIndent}${line}`)
+        .join('\n');
+    return `${workflowText.slice(
+        0,
+        insertionIndex
+    )}${indentedStep}\n${workflowText.slice(insertionIndex)}`;
+}
+
+function insertWorkflowJob(workflowText, jobSource) {
+    const jobsHeader = /^([ \t]*)jobs:\r?\n/m.exec(workflowText);
+    assert.ok(jobsHeader, 'workflow must contain a jobs mapping');
+    const insertionIndex = jobsHeader.index + jobsHeader[0].length;
+    const jobIndent = `${jobsHeader[1]}    `;
+    const indentedJob = jobSource
+        .split('\n')
+        .map((line) => `${jobIndent}${line}`)
+        .join('\n');
+    return `${workflowText.slice(
+        0,
+        insertionIndex
+    )}${indentedJob}\n${workflowText.slice(insertionIndex)}`;
+}
+
+function insertFirstJobField(workflowText, fieldSource) {
+    const stepsHeader = /^([ \t]+)steps:\r?\n/m.exec(workflowText);
+    assert.ok(stepsHeader, 'workflow must contain a steps list');
+    const fieldIndent = stepsHeader[1];
+    const indentedField = fieldSource
+        .split('\n')
+        .map((line) => `${fieldIndent}${line}`)
+        .join('\n');
+    return `${workflowText.slice(
+        0,
+        stepsHeader.index
+    )}${indentedField}\n${workflowText.slice(stepsHeader.index)}`;
+}
+
+function assertStepRejectedByBothPolicies(stepSource) {
+    for (const [workflowPath, assertPolicy] of [
+        [publishWorkflowPath, assertPublishSnapWorkflowPolicy],
+        [buildWorkflowPath, assertBuildSnapWorkflowPolicy],
+    ]) {
+        const workflowText = insertFirstJobStep(
+            fs.readFileSync(workflowPath, 'utf8'),
+            stepSource
+        );
+        assert.doesNotThrow(() => parse(workflowText));
+        assert.throws(() => assertPolicy(workflowText));
+    }
+}
+
+test('publishes Snap only after a public v-tag release contains binary and source assets', () => {
+    assert.equal(
+        fs.existsSync(publishWorkflowPath),
+        true,
+        'the release-published Snap workflow must exist'
+    );
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    assert.match(workflowText, /^permissions:\n {4}contents: read$/m);
+    assert.match(
+        workflowText,
+        /startsWith\(github\.event\.release\.tag_name,\s*'v'\)/
+    );
+    assert.match(workflowText, /github\.event\.release\.draft\s*==\s*false/);
+
+    const validateIndex = workflowText.indexOf(
+        '- name: Select exact public release assets'
+    );
+    const verifyIndex = workflowText.indexOf(
+        '- name: Verify downloaded public release assets'
+    );
+    const uploadIndex = workflowText.indexOf(
+        '- name: Publish all public-release snaps to edge'
+    );
+    assert.ok(validateIndex >= 0);
+    assert.ok(verifyIndex > validateIndex);
+    assert.ok(uploadIndex > verifyIndex);
+
+    assert.match(
+        workflowText,
+        /github\.event\.release\.id[\s\S]*release-snap-assets\.cjs select/
+    );
+    assert.match(workflowText, /linux-frame-copy-runtime-sources\.tar\.xz/);
+    assert.match(workflowText, /release-snap-assets\.cjs verify/);
+    assertPublishSnapWorkflowPolicy(workflowText);
+    const disabledWorkflow = workflowText.replace(
+        'github.event.release.draft == false }}',
+        'github.event.release.draft == false && false }}'
+    );
+    assert.notEqual(disabledWorkflow, workflowText);
+    assert.doesNotThrow(() => parse(disabledWorkflow));
+    assert.throws(() => assertPublishSnapWorkflowPolicy(disabledWorkflow));
+    const extraTrigger = workflowText.replace(
+        '            - published',
+        '            - published\n            - edited'
+    );
+    assert.doesNotThrow(() => parse(extraTrigger));
+    assert.throws(() => assertPublishSnapWorkflowPolicy(extraTrigger));
+    assert.match(
+        workflowText,
+        /Candidate\/stable promotion is manual after installed-Snap frame-copy and missing-runtime fallback smoke/
+    );
+
+    const buildWorkflow = fs.readFileSync(buildWorkflowPath, 'utf8');
+    assert.doesNotMatch(buildWorkflow, /^ {4}publish-snap:/m);
+    assertBuildSnapWorkflowPolicy(buildWorkflow);
+});
+
+test('isolates released verification from the fresh credentialed upload runner', () => {
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    const workflow = parse(workflowText);
+    assert.deepEqual(Object.keys(workflow.jobs), [
+        'verify-snap',
+        'publish-snap',
+    ]);
+
+    const verifyJob = workflow.jobs['verify-snap'];
+    const publishJob = workflow.jobs['publish-snap'];
+    assert.equal(publishJob.needs, 'verify-snap');
+    assert.deepEqual(verifyJob.outputs, {
+        'receipt-sha256': '${{ steps.bind-transfer.outputs.receipt-sha256 }}',
+    });
+    assert.equal(JSON.stringify(verifyJob).includes('snapcraft_token'), false);
+    assert.deepEqual(
+        verifyJob.steps.filter((step) => step.uses).map((step) => step.uses),
+        [
+            'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1',
+            'actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a',
+        ]
+    );
+    assert.deepEqual(
+        publishJob.steps.filter((step) => step.uses).map((step) => step.uses),
+        ['actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c']
+    );
+
+    const bindingStep = verifyJob.steps.find(
+        (step) => step.name === 'Bind verified release transfer'
+    );
+    assert.equal(bindingStep.id, 'bind-transfer');
+    assert.match(
+        bindingStep.run,
+        /\/usr\/bin\/sha256sum --binary[\s\S]*receipt-sha256/
+    );
+    const transferredSealStep = publishJob.steps.find(
+        (step) => step.name === 'Seal transferred public release assets'
+    );
+    assert.deepEqual(transferredSealStep.env, {
+        EXPECTED_RECEIPT_SHA256:
+            '${{ needs.verify-snap.outputs.receipt-sha256 }}',
+    });
+    assert.match(
+        transferredSealStep.run,
+        /\/usr\/bin\/sha256sum --binary[\s\S]*EXPECTED_RECEIPT_SHA256/
+    );
+    assert.match(
+        transferredSealStep.run,
+        /\/usr\/bin\/jq --exit-status[\s\S]*\/usr\/bin\/sha256sum --strict --check/
+    );
+    assert.match(
+        transferredSealStep.run,
+        /\/usr\/bin\/jq --raw-output[\s\S]*@tsv[\s\S]*while IFS=\$'\\t' read -r ASSET_NAME EXPECTED_SIZE[\s\S]*\/usr\/bin\/stat --format=%s -- "\$\{ASSET_PATH\}"[\s\S]*test "\$\{ACTUAL_SIZE\}" = "\$\{EXPECTED_SIZE\}"/
+    );
+
+    const uploadJobCommands = publishJob.steps
+        .map((step) => step.run ?? '')
+        .join('\n');
+    assert.doesNotMatch(uploadJobCommands, /\bnode\b/);
+    assert.doesNotMatch(uploadJobCommands, /release-snap-assets\.cjs/);
+    const uploadStep = publishJob.steps.at(-1);
+    assert.deepEqual(uploadStep.env, {
+        SNAPCRAFT_STORE_CREDENTIALS: '${{ secrets.snapcraft_token }}',
+    });
+    assert.match(uploadStep.run, /shopt -s nullglob dotglob/);
+    assert.match(
+        uploadStep.run,
+        /SNAP_FILES=\("\$\{VERIFIED_ASSET_DIRECTORY\}"\/\*\.snap\)/
+    );
+    assert.match(
+        uploadStep.run,
+        /SNAPCRAFT_STORE_CREDENTIALS="\$\{STORE_CREDENTIALS\}" \/snap\/bin\/snapcraft upload --release=edge/
+    );
+    assert.doesNotMatch(uploadStep.run, /\bfind\b|\bsort\b|\bnode\b/);
+    assertPublishSnapWorkflowPolicy(workflowText);
+});
+
+test('rejects environment and execution-surface expansion on the fresh publish runner', () => {
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    for (const mutatedWorkflow of [
+        workflowText.replace(
+            '    publish-snap:\n',
+            '    publish-snap:\n        env:\n            BASH_ENV: /tmp/release-hook\n'
+        ),
+        workflowText.replace(
+            '        runs-on: ubuntu-latest\n        timeout-minutes: 20',
+            '        runs-on: ubuntu-latest\n        container: ubuntu:latest\n        timeout-minutes: 20'
+        ),
+        workflowText.replace(
+            'permissions:\n    contents: read',
+            'env:\n    BASH_ENV: /tmp/release-hook\n\npermissions:\n    contents: read'
+        ),
+        workflowText.replaceAll(
+            'runs-on: ubuntu-latest',
+            'runs-on: self-hosted'
+        ),
+        workflowText.replace(
+            '        timeout-minutes: 20',
+            '        timeout-minutes: 120'
+        ),
+    ]) {
+        assert.notEqual(mutatedWorkflow, workflowText);
+        assert.doesNotThrow(() => parse(mutatedWorkflow));
+        assert.throws(() => assertPublishSnapWorkflowPolicy(mutatedWorkflow));
+    }
+});
+
+test('rejects Snap uploads that target candidate or stable channels', () => {
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    for (const forbiddenReleaseArgument of [
+        '--release=edge,candidate,stable',
+        '--release edge,candidate,stable',
+        '--release=candidate',
+        '--release stable',
+    ]) {
+        const mixedChannelWorkflow = workflowText.replace(
+            '--release=edge',
+            forbiddenReleaseArgument
+        );
+        assert.notEqual(mixedChannelWorkflow, workflowText);
+        assert.doesNotThrow(() => parse(mixedChannelWorkflow));
+        assert.throws(() =>
+            assertPublishSnapWorkflowPolicy(mixedChannelWorkflow)
+        );
+    }
+});
+
+test('rejects edge upload text in non-executing shell contexts', () => {
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    const edgeUpload =
+        'SNAPCRAFT_STORE_CREDENTIALS="${STORE_CREDENTIALS}" /snap/bin/snapcraft upload --release=edge "${SNAP_FILE}"';
+    const blockIndent = ' '.repeat(18);
+    for (const replacement of [
+        `cat <<123\n${edgeUpload}\n123`,
+        `cat <<\\EOF\n${edgeUpload}\nEOF`,
+        `printf '%s\\n' "\n${edgeUpload}\n"`,
+        `publish_snap() {\n${edgeUpload}\n}`,
+        `if false; then\n${edgeUpload}\nfi`,
+        `cat <<FIRST <<SECOND\nfirst\nFIRST\n${edgeUpload}\nSECOND`,
+        `cat <<-'EOF'\n\t${edgeUpload}\n\tEOF`,
+        `cat <<'EOF'\n${edgeUpload}\nEOF`,
+    ]) {
+        const indentedReplacement = replacement.replaceAll(
+            '\n',
+            `\n${blockIndent}`
+        );
+        const mutatedWorkflow = workflowText.replace(
+            edgeUpload,
+            indentedReplacement
+        );
+        assert.notEqual(mutatedWorkflow, workflowText);
+        assert.doesNotThrow(() => parse(mutatedWorkflow));
+        assert.throws(() => assertPublishSnapWorkflowPolicy(mutatedWorkflow));
+    }
+});
+
+test('rejects extra CLI tokens across wrappers, YAML forms, quotes, and heredocs', () => {
+    const workflowText = fs.readFileSync(publishWorkflowPath, 'utf8');
+    for (const stepSource of [
+        '- run: command snapcraft upload --release=stable package.snap',
+        '- run: |\n    if true; then command snapcraft \\\n        upload --release=edge,candidate,stable package.snap; fi',
+        '- run: |\n    snap\\\n        craft upload --release=stable package.snap',
+        '- run: |\n    snapcraft up\\\n        load --release=stable package.snap',
+        '- run: |2\n    snapcraft upload --release=stable package.snap',
+        '- run: snapcraft upload --release=stable package.snap',
+        '- { run: snapcraft upload --release=stable package.snap }',
+        '- run: echo "snapcraft upload --release=edge package.snap"',
+        "- run: |\n    cat <<'EOF'\n    snapcraft upload --release=edge package.snap\n    EOF",
+        '- run: command snapcraft release iptvnator stable',
+    ]) {
+        const mutatedWorkflow = insertFirstJobStep(workflowText, stepSource);
+        assert.doesNotThrow(() => parse(mutatedWorkflow));
+        assert.throws(() => assertPublishSnapWorkflowPolicy(mutatedWorkflow));
+    }
+});
+
+test('rejects continued uploads and release commands in the build workflow', () => {
+    const workflowText = fs.readFileSync(buildWorkflowPath, 'utf8');
+    for (const stepSource of [
+        '- run: |\n    if true; then command snapcraft \\\n        upload --release=edge package.snap; fi',
+        '- run: command snapcraft release iptvnator edge',
+    ]) {
+        const mutatedWorkflow = insertFirstJobStep(workflowText, stepSource);
+        assert.doesNotThrow(() => parse(mutatedWorkflow));
+        assert.throws(() => assertBuildSnapWorkflowPolicy(mutatedWorkflow));
+    }
+});
+
+test('rejects encoded, indirect, and unknown actions in both workflows', () => {
+    for (const stepSource of [
+        '- uses: snapcore/action-publish@v1\n  with:\n    release: stable',
+        '- "uses": snapcore/action-publish@v1\n  with:\n    release: stable',
+        "- 'uses' : snapcore/action-publish@v1\n  with:\n    release: stable",
+        '- "\\x75ses": snapcore/action-publish@v1\n  with:\n    release: stable',
+        '- ? uses\n  : snapcore/action-publish@v1\n  with:\n    release: stable',
+        '- { uses: snapcore/action-publish@v1, with: { release: stable } }',
+        '- uses: >-\n    snapcore/action-publish@v1\n  with:\n    release: stable',
+        '- name: Alias publisher\n  env:\n    PUBLISHER: &publisher snapcore/action-publish@v1\n  uses: *publisher\n  with:\n    release: stable',
+        '- uses: "\\x73napcore/action-publish@v1"\n  with:\n    release: stable',
+        '- uses: example/action-publish@v1\n  with:\n    release: stable',
+    ]) {
+        assertStepRejectedByBothPolicies(stepSource);
+    }
+});
+
+test('rejects job-level reusable workflow publication in both workflows', () => {
+    const reusableJob =
+        'synthetic-publisher:\n  uses: snapcore/action-publish/.github/workflows/publish.yml@v1\n  with:\n    release: stable\n  secrets: inherit';
+    for (const [workflowPath, assertPolicy] of [
+        [publishWorkflowPath, assertPublishSnapWorkflowPolicy],
+        [buildWorkflowPath, assertBuildSnapWorkflowPolicy],
+    ]) {
+        const workflowText = insertWorkflowJob(
+            fs.readFileSync(workflowPath, 'utf8'),
+            reusableJob
+        );
+        assert.doesNotThrow(() => parse(workflowText));
+        assert.throws(() => assertPolicy(workflowText));
+    }
+});
+
+test('rejects command-bearing explicit shell templates in both workflows', () => {
+    const maliciousShell = '"snapcraft release iptvnator stable; bash {0}"';
+    for (const [workflowPath, assertPolicy] of [
+        [publishWorkflowPath, assertPublishSnapWorkflowPolicy],
+        [buildWorkflowPath, assertBuildSnapWorkflowPolicy],
+    ]) {
+        const workflowText = fs.readFileSync(workflowPath, 'utf8');
+        for (const mutatedWorkflow of [
+            insertFirstJobStep(
+                workflowText,
+                `- shell: ${maliciousShell}\n  run: echo safe`
+            ),
+            `${workflowText}\ndefaults:\n    run:\n        shell: ${maliciousShell}\n`,
+            insertFirstJobField(
+                workflowText,
+                `defaults:\n    run:\n        shell: ${maliciousShell}`
+            ),
+        ]) {
+            assert.doesNotThrow(() => parse(mutatedWorkflow));
+            assert.throws(() => assertPolicy(mutatedWorkflow));
+        }
+    }
+});
+
+test('ignores Snapcraft names in comments and allowlisted action uses', () => {
+    const commentStep =
+        '- run: |\n    # snapcraft upload --release=stable package.snap\n    # snapcraft release iptvnator stable';
+    const publishWorkflow = insertFirstJobStep(
+        fs.readFileSync(publishWorkflowPath, 'utf8'),
+        commentStep
+    );
+    const buildWorkflow = insertFirstJobStep(
+        fs.readFileSync(buildWorkflowPath, 'utf8'),
+        commentStep
+    );
+
+    assert.doesNotThrow(() => parse(publishWorkflow));
+    assert.doesNotThrow(() => parse(buildWorkflow));
+    assert.doesNotThrow(() => assertPublishSnapWorkflowPolicy(publishWorkflow));
+    assert.doesNotThrow(() => assertBuildSnapWorkflowPolicy(buildWorkflow));
+});
+
+test('selects every exact Snap and exactly one compliance source asset', async () => {
+    const helper = await loadReleaseAssetHelper();
+    assert.ok(helper, 'the release asset selection helper must exist');
+    const selected = helper.selectSnapReleaseAssets([
+        { id: 9, name: 'IPTVnator-1.0.0-amd64.snap' },
+        { id: 3, name: 'linux-frame-copy-runtime-sources.tar.xz' },
+        { id: 8, name: 'IPTVnator-1.0.0-armhf.snap' },
+        { id: 7, name: 'IPTVnator-1.0.0.AppImage' },
+    ]);
+
+    assert.deepEqual(selected, {
+        snapAssets: [
+            { id: 9, name: 'IPTVnator-1.0.0-amd64.snap' },
+            { id: 8, name: 'IPTVnator-1.0.0-armhf.snap' },
+        ],
+        sourceAsset: {
+            id: 3,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    });
+});
+
+test('rejects a release missing either exact asset class or containing ambiguous source assets', async () => {
+    const helper = await loadReleaseAssetHelper();
+    assert.ok(helper, 'the release asset selection helper must exist');
+    assert.throws(
+        () =>
+            helper.selectSnapReleaseAssets([
+                {
+                    id: 1,
+                    name: 'linux-frame-copy-runtime-sources.tar.xz',
+                },
+            ]),
+        /at least one \.snap asset/
+    );
+    assert.throws(
+        () =>
+            helper.selectSnapReleaseAssets([{ id: 1, name: 'IPTVnator.snap' }]),
+        /exactly one linux-frame-copy-runtime-sources\.tar\.xz/
+    );
+    assert.throws(
+        () =>
+            helper.selectSnapReleaseAssets([
+                { id: 1, name: 'IPTVnator.snap' },
+                {
+                    id: 2,
+                    name: 'linux-frame-copy-runtime-sources.tar.xz',
+                },
+                {
+                    id: 3,
+                    name: 'linux-frame-copy-runtime-sources.tar.xz',
+                },
+            ]),
+        /exactly one linux-frame-copy-runtime-sources\.tar\.xz/
+    );
+});
+
+test('verifies the complete selected download set before publication', async (t) => {
+    const helper = await loadReleaseAssetHelper();
+    assert.ok(helper, 'the release asset selection helper must exist');
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-release-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const manifest = {
+        snapAssets: [{ id: 1, name: 'IPTVnator.snap' }],
+        sourceAsset: {
+            id: 2,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    };
+
+    fs.writeFileSync(path.join(temporaryRoot, 'IPTVnator.snap'), 'snap');
+    assert.throws(
+        () => helper.verifySnapReleaseDownloads(manifest, temporaryRoot),
+        /missing or empty.*linux-frame-copy-runtime-sources\.tar\.xz/i
+    );
+    fs.writeFileSync(
+        path.join(temporaryRoot, 'linux-frame-copy-runtime-sources.tar.xz'),
+        'sources'
+    );
+    assert.deepEqual(
+        helper.verifySnapReleaseDownloads(manifest, temporaryRoot),
+        manifest
+    );
+});
diff --git a/tools/packaging/release-snap-assets.cjs b/tools/packaging/release-snap-assets.cjs
new file mode 100644
index 000000000..0670df809
--- /dev/null
+++ b/tools/packaging/release-snap-assets.cjs
@@ -0,0 +1,701 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    inspectSnapPayload,
+    inspectSourceArchive,
+    verifySnapReleaseSourceBinding,
+} = require('./release-snap-source-binding.cjs');
+const {
+    SOURCE_ARCHIVE_NAME,
+} = require('../embedded-mpv/linux-source-archive-contract.cjs');
+
+const VERIFIED_RELEASE_RECEIPT_NAME = 'verified-release-assets.json';
+const VERIFIED_RELEASE_RECEIPT_SCHEMA_VERSION = 1;
+const VERIFIED_RELEASE_RECEIPT_MAX_BYTES = 1024 * 1024;
+const FILE_COPY_BUFFER_BYTES = 1024 * 1024;
+const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+
+function flattenAssetPages(value) {
+    if (!Array.isArray(value)) {
+        throw new Error('GitHub release assets must be an array.');
+    }
+    return value.flatMap((entry) =>
+        Array.isArray(entry) ? flattenAssetPages(entry) : [entry]
+    );
+}
+
+function normalizeReleaseAsset(asset) {
+    if (
+        asset === null ||
+        typeof asset !== 'object' ||
+        !Number.isSafeInteger(asset.id) ||
+        asset.id <= 0 ||
+        typeof asset.name !== 'string' ||
+        asset.name.length === 0 ||
+        asset.name === '.' ||
+        asset.name === '..' ||
+        asset.name.includes('/') ||
+        asset.name.includes('\\') ||
+        [...asset.name].some((character) => {
+            const codePoint = character.codePointAt(0);
+            return codePoint <= 0x1f || codePoint === 0x7f;
+        })
+    ) {
+        throw new Error('GitHub release contains an invalid asset record.');
+    }
+    return {
+        id: asset.id,
+        name: asset.name,
+    };
+}
+
+function selectSnapReleaseAssets(assets) {
+    const normalized = flattenAssetPages(assets).map(normalizeReleaseAsset);
+    const snapAssets = normalized
+        .filter(({ name }) => name.endsWith('.snap'))
+        .sort(({ name: left }, { name: right }) => left.localeCompare(right));
+    if (snapAssets.length === 0) {
+        throw new Error(
+            'Public release must contain at least one .snap asset.'
+        );
+    }
+
+    const sourceAssets = normalized.filter(
+        ({ name }) => name === SOURCE_ARCHIVE_NAME
+    );
+    if (sourceAssets.length !== 1) {
+        throw new Error(
+            `Public release must contain exactly one ${SOURCE_ARCHIVE_NAME} asset.`
+        );
+    }
+    const names = normalized.map(({ name }) => name);
+    if (new Set(names).size !== names.length) {
+        throw new Error('GitHub release asset names must be unique.');
+    }
+
+    return {
+        snapAssets,
+        sourceAsset: sourceAssets[0],
+    };
+}
+
+function canonicalSelection(selection) {
+    if (
+        selection === null ||
+        typeof selection !== 'object' ||
+        !Array.isArray(selection.snapAssets)
+    ) {
+        throw new Error('Invalid selected Snap release asset manifest.');
+    }
+    const canonical = selectSnapReleaseAssets([
+        ...selection.snapAssets,
+        selection.sourceAsset,
+    ]);
+    if (!isDeepStrictEqual(selection, canonical)) {
+        throw new Error(
+            'Selected Snap release asset manifest is not canonical.'
+        );
+    }
+    return canonical;
+}
+
+function verifySnapReleaseDownloads(selection, directoryPath) {
+    const canonical = canonicalSelection(selection);
+    const expectedNames = [
+        ...canonical.snapAssets.map(({ name }) => name),
+        canonical.sourceAsset.name,
+    ].sort();
+    try {
+        fs.accessSync(directoryPath);
+    } catch {
+        throw new Error(
+            `Missing public release asset directory: ${directoryPath}`
+        );
+    }
+    for (const name of expectedNames) {
+        const assetPath = path.join(directoryPath, name);
+        let stat;
+        try {
+            stat = fs.lstatSync(assetPath);
+        } catch {
+            throw new Error(`Missing or empty public release asset: ${name}`);
+        }
+        if (!stat.isFile() || stat.isSymbolicLink() || stat.size === 0) {
+            throw new Error(`Missing or empty public release asset: ${name}`);
+        }
+    }
+    const actualNames = fs.readdirSync(directoryPath).sort();
+    if (!isDeepStrictEqual(actualNames, expectedNames)) {
+        throw new Error(
+            'Downloaded public release assets do not match the exact selected set.'
+        );
+    }
+    return canonical;
+}
+
+function regularFileRecord(filePath, asset) {
+    const descriptor = fs.openSync(
+        filePath,
+        fs.constants.O_RDONLY | (fs.constants.O_NOFOLLOW ?? 0)
+    );
+    try {
+        const initialStat = fs.fstatSync(descriptor);
+        if (!initialStat.isFile() || initialStat.size === 0) {
+            throw new Error(
+                `Verified public release asset is not a non-empty regular file: ${asset.name}`
+            );
+        }
+        const hash = crypto.createHash('sha256');
+        const buffer = Buffer.allocUnsafe(FILE_COPY_BUFFER_BYTES);
+        let totalBytes = 0;
+        for (;;) {
+            const bytesRead = fs.readSync(
+                descriptor,
+                buffer,
+                0,
+                buffer.length,
+                null
+            );
+            if (bytesRead === 0) {
+                break;
+            }
+            hash.update(buffer.subarray(0, bytesRead));
+            totalBytes += bytesRead;
+        }
+        const finalStat = fs.fstatSync(descriptor);
+        if (
+            totalBytes !== initialStat.size ||
+            finalStat.dev !== initialStat.dev ||
+            finalStat.ino !== initialStat.ino ||
+            finalStat.size !== initialStat.size ||
+            finalStat.mtimeMs !== initialStat.mtimeMs ||
+            finalStat.ctimeMs !== initialStat.ctimeMs
+        ) {
+            throw new Error(
+                `Verified public release asset changed while being hashed: ${asset.name}`
+            );
+        }
+        return {
+            id: asset.id,
+            name: asset.name,
+            sha256: hash.digest('hex'),
+            size: totalBytes,
+        };
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+
+function copyRegularFileSnapshot(sourcePath, destinationPath, asset) {
+    const noFollowFlag = fs.constants.O_NOFOLLOW ?? 0;
+    const sourceDescriptor = fs.openSync(
+        sourcePath,
+        fs.constants.O_RDONLY | noFollowFlag
+    );
+    let destinationDescriptor;
+    try {
+        const sourceStat = fs.fstatSync(sourceDescriptor);
+        if (!sourceStat.isFile() || sourceStat.size === 0) {
+            throw new Error(
+                `Downloaded public release asset is not a non-empty regular file: ${asset.name}`
+            );
+        }
+        destinationDescriptor = fs.openSync(
+            destinationPath,
+            fs.constants.O_WRONLY |
+                fs.constants.O_CREAT |
+                fs.constants.O_EXCL |
+                noFollowFlag,
+            0o444
+        );
+        const hash = crypto.createHash('sha256');
+        const buffer = Buffer.allocUnsafe(FILE_COPY_BUFFER_BYTES);
+        let totalBytes = 0;
+        for (;;) {
+            const bytesRead = fs.readSync(
+                sourceDescriptor,
+                buffer,
+                0,
+                buffer.length,
+                null
+            );
+            if (bytesRead === 0) {
+                break;
+            }
+            hash.update(buffer.subarray(0, bytesRead));
+            let written = 0;
+            while (written < bytesRead) {
+                written += fs.writeSync(
+                    destinationDescriptor,
+                    buffer,
+                    written,
+                    bytesRead - written
+                );
+            }
+            totalBytes += bytesRead;
+        }
+        const finalSourceStat = fs.fstatSync(sourceDescriptor);
+        if (
+            totalBytes !== sourceStat.size ||
+            finalSourceStat.dev !== sourceStat.dev ||
+            finalSourceStat.ino !== sourceStat.ino ||
+            finalSourceStat.size !== sourceStat.size ||
+            finalSourceStat.mtimeMs !== sourceStat.mtimeMs ||
+            finalSourceStat.ctimeMs !== sourceStat.ctimeMs
+        ) {
+            throw new Error(
+                `Downloaded public release asset changed while being snapshotted: ${asset.name}`
+            );
+        }
+        fs.fsyncSync(destinationDescriptor);
+        return {
+            id: asset.id,
+            name: asset.name,
+            sha256: hash.digest('hex'),
+            size: totalBytes,
+        };
+    } finally {
+        if (destinationDescriptor !== undefined) {
+            fs.closeSync(destinationDescriptor);
+        }
+        fs.closeSync(sourceDescriptor);
+    }
+}
+
+function snapshotSnapReleaseDownloads(
+    selection,
+    directoryPath,
+    verifiedDirectoryPath
+) {
+    const canonical = verifySnapReleaseDownloads(selection, directoryPath);
+    const outputPath = path.resolve(verifiedDirectoryPath);
+    const sourcePath = path.resolve(directoryPath);
+    if (
+        outputPath === sourcePath ||
+        outputPath.startsWith(`${sourcePath}${path.sep}`)
+    ) {
+        throw new Error(
+            'Verified public release asset directory must be separate from downloads.'
+        );
+    }
+    const outputParent = path.dirname(outputPath);
+    const outputParentStat = fs.lstatSync(outputParent);
+    if (!outputParentStat.isDirectory() || outputParentStat.isSymbolicLink()) {
+        throw new Error(
+            'Verified public release asset parent must be a real directory.'
+        );
+    }
+    try {
+        fs.lstatSync(outputPath);
+        throw new Error(
+            'Verified public release asset directory must not already exist.'
+        );
+    } catch (error) {
+        if (
+            !(
+                error &&
+                typeof error === 'object' &&
+                'code' in error &&
+                error.code === 'ENOENT'
+            )
+        ) {
+            throw error;
+        }
+    }
+    const temporaryPath = fs.mkdtempSync(
+        path.join(outputParent, `.${path.basename(outputPath)}-`)
+    );
+    const assets = [...canonical.snapAssets, canonical.sourceAsset];
+    try {
+        const records = assets.map((asset) =>
+            copyRegularFileSnapshot(
+                path.join(sourcePath, asset.name),
+                path.join(temporaryPath, asset.name),
+                asset
+            )
+        );
+        fs.renameSync(temporaryPath, outputPath);
+        return { canonical, records };
+    } catch (error) {
+        fs.rmSync(temporaryPath, { recursive: true, force: true });
+        throw error;
+    }
+}
+
+function inspectStableReleaseFile(filePath, asset, inspector) {
+    const before = regularFileRecord(filePath, asset);
+    const inspection = inspector();
+    const after = regularFileRecord(filePath, asset);
+    if (!isDeepStrictEqual(after, before)) {
+        throw new Error(
+            `Verified public release asset changed during inspection: ${asset.name}`
+        );
+    }
+    return { inspection, record: after };
+}
+
+function writeVerifiedReleaseReceipt(
+    verifiedDirectoryPath,
+    expectedRepositoryRevision,
+    records
+) {
+    if (
+        typeof expectedRepositoryRevision !== 'string' ||
+        !GIT_COMMIT_PATTERN.test(expectedRepositoryRevision)
+    ) {
+        throw new Error(
+            'Verified release receipt requires a full repository revision.'
+        );
+    }
+    const receipt = {
+        schemaVersion: VERIFIED_RELEASE_RECEIPT_SCHEMA_VERSION,
+        repositoryRevision: expectedRepositoryRevision,
+        assets: records,
+    };
+    const receiptPath = path.join(
+        verifiedDirectoryPath,
+        VERIFIED_RELEASE_RECEIPT_NAME
+    );
+    fs.writeFileSync(receiptPath, `${JSON.stringify(receipt, null, 2)}\n`, {
+        flag: 'wx',
+        mode: 0o444,
+    });
+    return receipt;
+}
+
+function verifyVerifiedReleaseReceipt(
+    selection,
+    verifiedDirectoryPath,
+    receiptPath,
+    expectedRepositoryRevision
+) {
+    const canonical = canonicalSelection(selection);
+    const resolvedDirectory = path.resolve(verifiedDirectoryPath);
+    const resolvedReceipt = path.resolve(receiptPath);
+    if (
+        path.dirname(resolvedReceipt) !== resolvedDirectory ||
+        path.basename(resolvedReceipt) !== VERIFIED_RELEASE_RECEIPT_NAME
+    ) {
+        throw new Error(
+            'Verified release receipt must use its canonical asset-directory path.'
+        );
+    }
+    const receiptStat = fs.lstatSync(resolvedReceipt);
+    if (
+        !receiptStat.isFile() ||
+        receiptStat.isSymbolicLink() ||
+        receiptStat.size === 0 ||
+        receiptStat.size > VERIFIED_RELEASE_RECEIPT_MAX_BYTES
+    ) {
+        throw new Error(
+            'Verified release receipt must be a bounded regular file.'
+        );
+    }
+    let receipt;
+    try {
+        receipt = JSON.parse(fs.readFileSync(resolvedReceipt, 'utf8'));
+    } catch {
+        throw new Error('Verified release receipt is not valid JSON.');
+    }
+    if (
+        receipt === null ||
+        typeof receipt !== 'object' ||
+        !isDeepStrictEqual(Object.keys(receipt).sort(), [
+            'assets',
+            'repositoryRevision',
+            'schemaVersion',
+        ]) ||
+        receipt.schemaVersion !== VERIFIED_RELEASE_RECEIPT_SCHEMA_VERSION ||
+        typeof receipt.repositoryRevision !== 'string' ||
+        !GIT_COMMIT_PATTERN.test(receipt.repositoryRevision) ||
+        receipt.repositoryRevision !== expectedRepositoryRevision ||
+        !Array.isArray(receipt.assets)
+    ) {
+        throw new Error('Verified release receipt has an invalid contract.');
+    }
+    const expectedAssets = [...canonical.snapAssets, canonical.sourceAsset];
+    if (
+        receipt.assets.length !== expectedAssets.length ||
+        receipt.assets.some((record, index) => {
+            const asset = expectedAssets[index];
+            return (
+                record === null ||
+                typeof record !== 'object' ||
+                !isDeepStrictEqual(Object.keys(record).sort(), [
+                    'id',
+                    'name',
+                    'sha256',
+                    'size',
+                ]) ||
+                record.id !== asset.id ||
+                record.name !== asset.name ||
+                !Number.isSafeInteger(record.size) ||
+                record.size <= 0 ||
+                typeof record.sha256 !== 'string' ||
+                !/^[a-f0-9]{64}$/.test(record.sha256)
+            );
+        })
+    ) {
+        throw new Error(
+            'Verified release receipt does not match the selected assets.'
+        );
+    }
+    const actualNames = fs.readdirSync(resolvedDirectory).sort();
+    const expectedNames = [
+        ...expectedAssets.map(({ name }) => name),
+        VERIFIED_RELEASE_RECEIPT_NAME,
+    ].sort();
+    if (!isDeepStrictEqual(actualNames, expectedNames)) {
+        throw new Error(
+            'Verified release directory does not match its exact receipt.'
+        );
+    }
+    for (const record of receipt.assets) {
+        const actual = regularFileRecord(
+            path.join(resolvedDirectory, record.name),
+            record
+        );
+        if (!isDeepStrictEqual(actual, record)) {
+            throw new Error(
+                `Verified release asset no longer matches its receipt: ${record.name}`
+            );
+        }
+    }
+    return receipt;
+}
+
+function verifySnapReleaseCorrespondence(
+    selection,
+    directoryPath,
+    {
+        expectedRepositoryRevision,
+        expectedSourceSnapshotSha256,
+        inspectSnapPayload: inspectSnap = inspectSnapPayload,
+        inspectSourceArchive: inspectSource = inspectSourceArchive,
+        validateRuntimeManifest,
+        verifiedDirectory,
+        verifiedReceiptPath,
+    } = {}
+) {
+    if (verifiedDirectory && verifiedReceiptPath) {
+        throw new Error(
+            'Release verification cannot create and consume a verified receipt at the same time.'
+        );
+    }
+    let canonical;
+    let inspectionDirectory = directoryPath;
+    let snapshottedRecords = null;
+    let verifiedReceipt = null;
+    if (verifiedDirectory) {
+        const snapshot = snapshotSnapReleaseDownloads(
+            selection,
+            directoryPath,
+            verifiedDirectory
+        );
+        canonical = snapshot.canonical;
+        snapshottedRecords = snapshot.records;
+        inspectionDirectory = path.resolve(verifiedDirectory);
+    } else if (verifiedReceiptPath) {
+        canonical = canonicalSelection(selection);
+        inspectionDirectory = path.resolve(directoryPath);
+        verifiedReceipt = verifyVerifiedReleaseReceipt(
+            canonical,
+            inspectionDirectory,
+            verifiedReceiptPath,
+            expectedRepositoryRevision
+        );
+    } else {
+        canonical = verifySnapReleaseDownloads(selection, directoryPath);
+    }
+    try {
+        const sourceResult = inspectStableReleaseFile(
+            path.join(inspectionDirectory, canonical.sourceAsset.name),
+            canonical.sourceAsset,
+            () =>
+                inspectSource(
+                    path.join(inspectionDirectory, canonical.sourceAsset.name),
+                    { expectedSourceSnapshotSha256 }
+                )
+        );
+        const snapResults = canonical.snapAssets.map((asset) =>
+            inspectStableReleaseFile(
+                path.join(inspectionDirectory, asset.name),
+                asset,
+                () =>
+                    inspectSnap(
+                        path.join(inspectionDirectory, asset.name),
+                        asset
+                    )
+            )
+        );
+        verifySnapReleaseSourceBinding(
+            {
+                expectedRepositoryRevision,
+                sourceInspection: sourceResult.inspection,
+                snapPayloads: snapResults.map(({ inspection }) => inspection),
+            },
+            {
+                expectedSourceSnapshotSha256,
+                validateRuntimeManifest,
+            }
+        );
+        const inspectedRecords = [
+            ...snapResults.map(({ record }) => record),
+            sourceResult.record,
+        ];
+        if (verifiedDirectory) {
+            if (!isDeepStrictEqual(inspectedRecords, snapshottedRecords)) {
+                throw new Error(
+                    'Verified release assets changed after their stable snapshot was created.'
+                );
+            }
+            writeVerifiedReleaseReceipt(
+                inspectionDirectory,
+                expectedRepositoryRevision,
+                inspectedRecords
+            );
+        }
+        if (verifiedReceipt) {
+            if (!isDeepStrictEqual(inspectedRecords, verifiedReceipt.assets)) {
+                throw new Error(
+                    'Verified release assets do not match the initially verified receipt after inspection.'
+                );
+            }
+            const reverifiedReceipt = verifyVerifiedReleaseReceipt(
+                canonical,
+                inspectionDirectory,
+                verifiedReceiptPath,
+                expectedRepositoryRevision
+            );
+            if (!isDeepStrictEqual(reverifiedReceipt, verifiedReceipt)) {
+                throw new Error(
+                    'Verified release receipt changed during full inspection.'
+                );
+            }
+        }
+        return canonical;
+    } catch (error) {
+        if (verifiedDirectory) {
+            fs.rmSync(path.resolve(verifiedDirectory), {
+                recursive: true,
+                force: true,
+            });
+        }
+        throw error;
+    }
+}
+
+function parseArguments(argv) {
+    const [command, ...tokens] = argv;
+    const options = {};
+    for (let index = 0; index < tokens.length; index += 2) {
+        const name = tokens[index];
+        const value = tokens[index + 1];
+        if (!name?.startsWith('--') || value === undefined) {
+            throw new Error(`Invalid command-line argument: ${name ?? ''}`);
+        }
+        options[name.slice(2)] = value;
+    }
+    return { command, options };
+}
+
+function readJson(filePath) {
+    return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+}
+
+function writeJson(filePath, value) {
+    fs.writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`);
+}
+
+function main(argv = process.argv.slice(2)) {
+    const { command, options } = parseArguments(argv);
+    if (
+        command === 'select' &&
+        options['assets-json'] &&
+        options['output-json']
+    ) {
+        writeJson(
+            options['output-json'],
+            selectSnapReleaseAssets(readJson(options['assets-json']))
+        );
+        return;
+    }
+    if (
+        command === 'verify' &&
+        options.manifest &&
+        options.directory &&
+        options['repository-revision'] &&
+        options['verified-directory']
+    ) {
+        verifySnapReleaseCorrespondence(
+            readJson(options.manifest),
+            options.directory,
+            {
+                expectedRepositoryRevision: options['repository-revision'],
+                verifiedDirectory: options['verified-directory'],
+            }
+        );
+        return;
+    }
+    if (
+        command === 'verify-receipt' &&
+        options.manifest &&
+        options.directory &&
+        options.receipt &&
+        options['repository-revision']
+    ) {
+        verifyVerifiedReleaseReceipt(
+            readJson(options.manifest),
+            options.directory,
+            options.receipt,
+            options['repository-revision']
+        );
+        return;
+    }
+    if (
+        command === 'verify-sealed' &&
+        options.manifest &&
+        options.directory &&
+        options.receipt &&
+        options['repository-revision']
+    ) {
+        verifySnapReleaseCorrespondence(
+            readJson(options.manifest),
+            options.directory,
+            {
+                expectedRepositoryRevision: options['repository-revision'],
+                verifiedReceiptPath: options.receipt,
+            }
+        );
+        return;
+    }
+    throw new Error(
+        `Usage: release-snap-assets.cjs select --assets-json <path> --output-json <path> | verify --manifest <path> --directory <path> --repository-revision <commit> --verified-directory <path> | verify-receipt --manifest <path> --directory <path> --receipt <path> --repository-revision <commit> | verify-sealed --manifest <path> --directory <path> --receipt <path> --repository-revision <commit>`
+    );
+}
+
+if (require.main === module) {
+    try {
+        main();
+    } catch (error) {
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exitCode = 1;
+    }
+}
+
+module.exports = {
+    SOURCE_ARCHIVE_NAME,
+    VERIFIED_RELEASE_RECEIPT_NAME,
+    selectSnapReleaseAssets,
+    snapshotSnapReleaseDownloads,
+    verifyVerifiedReleaseReceipt,
+    verifySnapReleaseCorrespondence,
+    verifySnapReleaseDownloads,
+    verifySnapReleaseSourceBinding,
+};
diff --git a/tools/packaging/release-snap-assets.test.mjs b/tools/packaging/release-snap-assets.test.mjs
new file mode 100644
index 000000000..27e1cd045
--- /dev/null
+++ b/tools/packaging/release-snap-assets.test.mjs
@@ -0,0 +1,1649 @@
+import assert from 'node:assert/strict';
+import childProcess from 'node:child_process';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { parse } from 'yaml';
+
+const require = createRequire(import.meta.url);
+const { createPackage: createAsarPackage } = require('@electron/asar');
+const workspaceRoot = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '..',
+    '..'
+);
+const helperPath = path.join(
+    workspaceRoot,
+    'tools',
+    'packaging',
+    'release-snap-assets.cjs'
+);
+const sourceBindingHelperPath = path.join(
+    workspaceRoot,
+    'tools',
+    'packaging',
+    'release-snap-source-binding.cjs'
+);
+const sourceArchiveContractPath = path.join(
+    workspaceRoot,
+    'tools',
+    'embedded-mpv',
+    'linux-source-archive-contract.cjs'
+);
+const publishWorkflowPath = path.join(
+    workspaceRoot,
+    '.github',
+    'workflows',
+    'publish-snap.yaml'
+);
+
+async function loadHelper() {
+    return import(pathToFileURL(helperPath).href);
+}
+
+async function loadSourceBindingHelper() {
+    return import(pathToFileURL(sourceBindingHelperPath).href);
+}
+
+async function loadSourceArchiveContract() {
+    return import(pathToFileURL(sourceArchiveContractPath).href);
+}
+
+function syntheticSquashfsListing() {
+    return [
+        'drwxr-xr-x 0/0 0 2026-07-18 00:00 squashfs-root',
+        '-rw-r--r-- 0/0 1 2026-07-18 00:00 squashfs-root/payload',
+        '',
+    ].join('\n');
+}
+
+function sha256(contents) {
+    return crypto.createHash('sha256').update(contents).digest('hex');
+}
+
+const SYNTHETIC_LIBPLACEBO_CONTENTS = Buffer.from(
+    'libplacebo source snapshot\n'
+);
+const SYNTHETIC_LIBPLACEBO_ENTRIES = Object.freeze([
+    Object.freeze({
+        path: 'README.md',
+        type: 'file',
+        size: SYNTHETIC_LIBPLACEBO_CONTENTS.length,
+        executable: false,
+        sha256: sha256(SYNTHETIC_LIBPLACEBO_CONTENTS),
+    }),
+]);
+const SYNTHETIC_LIBPLACEBO_SOURCE_SNAPSHOT = (() => {
+    const canonical = {
+        schemaVersion: 1,
+        entryCount: SYNTHETIC_LIBPLACEBO_ENTRIES.length,
+        totalBytes: SYNTHETIC_LIBPLACEBO_CONTENTS.length,
+        entries: SYNTHETIC_LIBPLACEBO_ENTRIES,
+    };
+    return Object.freeze({
+        schemaVersion: canonical.schemaVersion,
+        sha256: sha256(`${JSON.stringify(canonical)}\n`),
+        entryCount: canonical.entryCount,
+        totalBytes: canonical.totalBytes,
+        entries: SYNTHETIC_LIBPLACEBO_ENTRIES,
+    });
+})();
+const EXPECTED_LIBPLACEBO_SOURCE_SUBMODULES = Object.freeze([
+    '450bd2232225d6c7728a4108055ac2e37cef6475 3rdparty/Vulkan-Headers',
+    '97b54ca9e75f5303507699d27c6b4f4efe4641a1 3rdparty/fast_float',
+    '73db193f853e2ee079bf3ca8a64aa2eaf6459043 3rdparty/glad',
+    '15206881c006c79667fe5154fe80c01c65410679 3rdparty/jinja',
+    '297fc8e356e6836a62087949245d09a28e9f1b13 3rdparty/markupsafe',
+    '242f35efa067a46c595645eeda7b1771ea1f83b1 demos/3rdparty/nuklear',
+]);
+
+function sourcePackageIdentity(sourcePackage) {
+    return Object.fromEntries(
+        [
+            'version',
+            'sourceUrl',
+            'sourceTag',
+            'sourceSha256',
+            'sourceGitCommit',
+            'license',
+        ]
+            .filter((field) => Object.hasOwn(sourcePackage, field))
+            .map((field) => [field, sourcePackage[field]])
+    );
+}
+
+function createComplianceInspection(sourceRuntime) {
+    const licenseInputFiles = [];
+    const noticeLicenseFiles = [];
+    const licenseInputPackages = [];
+    const noticePackages = [];
+    for (const [id, sourcePackage] of Object.entries(sourceRuntime.packages)) {
+        const contents = Buffer.from(`${id} license\n`);
+        const file = {
+            path: `licenses/${id}/LICENSE`,
+            size: contents.length,
+            sha256: sha256(contents),
+        };
+        licenseInputFiles.push(file);
+        noticeLicenseFiles.push(file);
+        licenseInputPackages.push({
+            id,
+            ...sourcePackageIdentity(sourcePackage),
+            files: [
+                {
+                    sourcePath: 'LICENSE',
+                    ...file,
+                },
+            ],
+        });
+        noticePackages.push({
+            id,
+            ...sourcePackageIdentity(sourcePackage),
+            files: [file],
+        });
+    }
+    const aggregateNoticeContents = Buffer.from('third-party notices\n');
+    const noticeFile = {
+        path: 'THIRD_PARTY_NOTICES.txt',
+        size: aggregateNoticeContents.length,
+        sha256: sha256(aggregateNoticeContents),
+    };
+    return {
+        aggregateNoticeContents,
+        libplaceboSourceSnapshot: SYNTHETIC_LIBPLACEBO_SOURCE_SNAPSHOT,
+        licenseInputFiles,
+        licenseInputs: {
+            schemaVersion: 1,
+            origin: 'pinned-linux-runtime-license-inputs',
+            platform: 'linux',
+            arch: 'x64',
+            packages: licenseInputPackages,
+        },
+        noticeFile,
+        noticeLicenseFiles,
+        notices: {
+            schemaVersion: 1,
+            origin: 'pinned-linux-runtime-upstream-licenses',
+            platform: 'linux',
+            arch: 'x64',
+            noticeFile,
+            packages: noticePackages,
+            totalBytes:
+                noticeFile.size +
+                noticeLicenseFiles.reduce(
+                    (total, file) => total + file.size,
+                    0
+                ),
+        },
+        toolingValidated: true,
+    };
+}
+
+function createSourceBindingFixture() {
+    const repositoryRevision = 'a'.repeat(40);
+    const archiveSha256 = 'b'.repeat(64);
+    const sourceRuntime = {
+        generatedAt: '2026-07-18T00:00:00.000Z',
+        packages: {
+            ffmpeg: {
+                version: '1.0.0',
+                sourceUrl: 'https://example.test/ffmpeg.tar.xz',
+                sourceSha256: archiveSha256,
+                license: 'LGPL-2.1-or-later',
+            },
+            libplacebo: {
+                version: '2.0.0',
+                sourceUrl: 'https://example.test/libplacebo.git',
+                sourceTag: 'v2.0.0',
+                sourceGitCommit: 'c'.repeat(40),
+                sourceSubmodules: [...EXPECTED_LIBPLACEBO_SOURCE_SUBMODULES],
+                license: 'LGPL-2.1-or-later',
+            },
+        },
+    };
+    const compliance = createComplianceInspection(sourceRuntime);
+    const sourceCompliance = { ...compliance };
+    delete sourceCompliance.aggregateNoticeContents;
+    const sourceIndex = {
+        schemaVersion: 3,
+        repositoryRevision,
+        sourcePackages: sourceRuntime.packages,
+        archives: [
+            {
+                name: 'ffmpeg.tar.xz',
+                sha256: archiveSha256,
+            },
+        ],
+        libplacebo: {
+            sourceGitCommit: sourceRuntime.packages.libplacebo.sourceGitCommit,
+            sourceSubmodules: [...EXPECTED_LIBPLACEBO_SOURCE_SUBMODULES],
+            sourceSnapshot: SYNTHETIC_LIBPLACEBO_SOURCE_SNAPSHOT,
+        },
+        legal: {
+            manifest: 'notices/embedded-mpv-notices.json',
+            noticeFile: compliance.notices.noticeFile,
+            packages: compliance.notices.packages,
+        },
+    };
+    const sourceInspection = {
+        archiveSha256: 'd'.repeat(64),
+        sourceRuntime,
+        sourceIndex,
+        repositoryRevision,
+        localChanges: Buffer.alloc(0),
+        archiveFiles: sourceIndex.archives,
+        compliance: sourceCompliance,
+    };
+    const snapPayloads = {
+        'IPTVnator-amd64.snap': {
+            assetName: 'IPTVnator-amd64.snap',
+            architecture: 'x64',
+            markerOnly: false,
+            manifest: {
+                platform: 'linux',
+                arch: 'x64',
+                profile: 'portable',
+                runtimeMode: 'bundled',
+                targets: ['appimage', 'snap'],
+                sourceArchive: {
+                    schemaVersion: 1,
+                    name: 'linux-frame-copy-runtime-sources.tar.xz',
+                    sha256: 'd'.repeat(64),
+                    repositoryRevision,
+                },
+                sourceRuntime,
+            },
+        },
+        'IPTVnator-arm64.snap': {
+            assetName: 'IPTVnator-arm64.snap',
+            architecture: 'arm64',
+            markerOnly: true,
+            manifest: null,
+        },
+    };
+    return {
+        expectedSourceSnapshotSha256:
+            SYNTHETIC_LIBPLACEBO_SOURCE_SNAPSHOT.sha256,
+        repositoryRevision,
+        sourceInspection,
+        snapPayloads,
+    };
+}
+
+test('binds source metadata and checksums to every selected Snap before publication', async (t) => {
+    const helper = await loadHelper();
+    const fixture = createSourceBindingFixture();
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-source-binding-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const selection = {
+        snapAssets: [
+            { id: 1, name: 'IPTVnator-amd64.snap' },
+            { id: 2, name: 'IPTVnator-arm64.snap' },
+        ],
+        sourceAsset: {
+            id: 3,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    };
+    for (const name of [
+        ...selection.snapAssets.map(({ name }) => name),
+        selection.sourceAsset.name,
+    ]) {
+        fs.writeFileSync(path.join(temporaryRoot, name), name);
+    }
+    const inspectedSnaps = [];
+
+    assert.deepEqual(
+        helper.verifySnapReleaseCorrespondence(selection, temporaryRoot, {
+            expectedRepositoryRevision: fixture.repositoryRevision,
+            expectedSourceSnapshotSha256: fixture.expectedSourceSnapshotSha256,
+            inspectSourceArchive: () => fixture.sourceInspection,
+            inspectSnapPayload: (_snapPath, asset) => {
+                inspectedSnaps.push(asset.name);
+                return fixture.snapPayloads[asset.name];
+            },
+            validateRuntimeManifest: () => [],
+        }),
+        selection
+    );
+    assert.deepEqual(
+        inspectedSnaps,
+        selection.snapAssets.map(({ name }) => name)
+    );
+});
+
+test('publishes only a stable verified asset snapshot with an exact receipt', async (t) => {
+    const helper = await loadHelper();
+    const fixture = createSourceBindingFixture();
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-release-snapshot-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const downloadRoot = path.join(temporaryRoot, 'downloads');
+    const verifiedRoot = path.join(temporaryRoot, 'verified');
+    fs.mkdirSync(downloadRoot);
+    const selection = {
+        snapAssets: [
+            { id: 1, name: 'IPTVnator-amd64.snap' },
+            { id: 2, name: 'IPTVnator-arm64.snap' },
+        ],
+        sourceAsset: {
+            id: 3,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    };
+    for (const name of [
+        ...selection.snapAssets.map(({ name }) => name),
+        selection.sourceAsset.name,
+    ]) {
+        fs.writeFileSync(path.join(downloadRoot, name), name);
+    }
+    const inspectedPaths = [];
+    assert.deepEqual(
+        helper.verifySnapReleaseCorrespondence(selection, downloadRoot, {
+            expectedRepositoryRevision: fixture.repositoryRevision,
+            expectedSourceSnapshotSha256: fixture.expectedSourceSnapshotSha256,
+            inspectSourceArchive: (sourcePath) => {
+                inspectedPaths.push(sourcePath);
+                return fixture.sourceInspection;
+            },
+            inspectSnapPayload: (snapPath, asset) => {
+                inspectedPaths.push(snapPath);
+                return fixture.snapPayloads[asset.name];
+            },
+            validateRuntimeManifest: () => [],
+            verifiedDirectory: verifiedRoot,
+        }),
+        selection
+    );
+    assert.ok(
+        inspectedPaths.every((filePath) =>
+            filePath.startsWith(`${verifiedRoot}${path.sep}`)
+        )
+    );
+    const receiptPath = path.join(
+        verifiedRoot,
+        helper.VERIFIED_RELEASE_RECEIPT_NAME
+    );
+    const receipt = helper.verifyVerifiedReleaseReceipt(
+        selection,
+        verifiedRoot,
+        receiptPath,
+        fixture.repositoryRevision
+    );
+    assert.equal(receipt.repositoryRevision, fixture.repositoryRevision);
+    assert.deepEqual(
+        receipt.assets.map(({ name }) => name),
+        [
+            ...selection.snapAssets.map(({ name }) => name),
+            selection.sourceAsset.name,
+        ]
+    );
+    const sealedInspectionPaths = [];
+    assert.deepEqual(
+        helper.verifySnapReleaseCorrespondence(selection, verifiedRoot, {
+            expectedRepositoryRevision: fixture.repositoryRevision,
+            expectedSourceSnapshotSha256: fixture.expectedSourceSnapshotSha256,
+            inspectSourceArchive: (sourcePath) => {
+                sealedInspectionPaths.push(sourcePath);
+                return fixture.sourceInspection;
+            },
+            inspectSnapPayload: (snapPath, asset) => {
+                sealedInspectionPaths.push(snapPath);
+                return fixture.snapPayloads[asset.name];
+            },
+            validateRuntimeManifest: () => [],
+            verifiedReceiptPath: receiptPath,
+        }),
+        selection
+    );
+    assert.ok(
+        sealedInspectionPaths.every((filePath) =>
+            filePath.startsWith(`${verifiedRoot}${path.sep}`)
+        )
+    );
+    assert.throws(
+        () =>
+            helper.verifyVerifiedReleaseReceipt(
+                selection,
+                verifiedRoot,
+                receiptPath,
+                'f'.repeat(40)
+            ),
+        /invalid contract/i
+    );
+
+    const changedSnapPath = path.join(
+        verifiedRoot,
+        selection.snapAssets[0].name
+    );
+    fs.chmodSync(changedSnapPath, 0o644);
+    fs.appendFileSync(changedSnapPath, 'changed');
+    assert.throws(
+        () =>
+            helper.verifyVerifiedReleaseReceipt(
+                selection,
+                verifiedRoot,
+                receiptPath,
+                fixture.repositoryRevision
+            ),
+        /no longer matches its receipt/i
+    );
+});
+
+test('binds sealed inspection to the initially verified receipt across a mutually consistent replacement', async (t) => {
+    const helper = await loadHelper();
+    const fixture = createSourceBindingFixture();
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-release-replacement-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const downloadRoot = path.join(temporaryRoot, 'downloads');
+    const verifiedRoot = path.join(temporaryRoot, 'verified');
+    const replacementRoot = path.join(temporaryRoot, 'replacement');
+    const originalRoot = path.join(temporaryRoot, 'original');
+    fs.mkdirSync(downloadRoot);
+    fs.mkdirSync(replacementRoot);
+    const selection = {
+        snapAssets: [{ id: 1, name: 'IPTVnator-amd64.snap' }],
+        sourceAsset: {
+            id: 2,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    };
+    for (const name of [
+        selection.snapAssets[0].name,
+        selection.sourceAsset.name,
+    ]) {
+        fs.writeFileSync(path.join(downloadRoot, name), name);
+    }
+    helper.verifySnapReleaseCorrespondence(selection, downloadRoot, {
+        expectedRepositoryRevision: fixture.repositoryRevision,
+        expectedSourceSnapshotSha256: fixture.expectedSourceSnapshotSha256,
+        inspectSourceArchive: () => fixture.sourceInspection,
+        inspectSnapPayload: (_snapPath, asset) =>
+            fixture.snapPayloads[asset.name],
+        validateRuntimeManifest: () => [],
+        verifiedDirectory: verifiedRoot,
+    });
+
+    const replacementSnapContents = Buffer.from('replacement Snap payload');
+    const sourceContents = fs.readFileSync(
+        path.join(verifiedRoot, selection.sourceAsset.name)
+    );
+    fs.writeFileSync(
+        path.join(replacementRoot, selection.snapAssets[0].name),
+        replacementSnapContents
+    );
+    fs.writeFileSync(
+        path.join(replacementRoot, selection.sourceAsset.name),
+        sourceContents
+    );
+    const replacementRecords = [
+        {
+            ...selection.snapAssets[0],
+            sha256: sha256(replacementSnapContents),
+            size: replacementSnapContents.length,
+        },
+        {
+            ...selection.sourceAsset,
+            sha256: sha256(sourceContents),
+            size: sourceContents.length,
+        },
+    ];
+    const replacementReceiptPath = path.join(
+        replacementRoot,
+        helper.VERIFIED_RELEASE_RECEIPT_NAME
+    );
+    fs.writeFileSync(
+        replacementReceiptPath,
+        `${JSON.stringify(
+            {
+                schemaVersion: 1,
+                repositoryRevision: fixture.repositoryRevision,
+                assets: replacementRecords,
+            },
+            null,
+            2
+        )}\n`
+    );
+    assert.deepEqual(
+        helper.verifyVerifiedReleaseReceipt(
+            selection,
+            replacementRoot,
+            replacementReceiptPath,
+            fixture.repositoryRevision
+        ).assets,
+        replacementRecords
+    );
+    const receiptPath = path.join(
+        verifiedRoot,
+        helper.VERIFIED_RELEASE_RECEIPT_NAME
+    );
+    let replaced = false;
+
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseCorrespondence(selection, verifiedRoot, {
+                expectedRepositoryRevision: fixture.repositoryRevision,
+                expectedSourceSnapshotSha256:
+                    fixture.expectedSourceSnapshotSha256,
+                inspectSourceArchive: () => {
+                    fs.renameSync(verifiedRoot, originalRoot);
+                    fs.renameSync(replacementRoot, verifiedRoot);
+                    replaced = true;
+                    return fixture.sourceInspection;
+                },
+                inspectSnapPayload: (_snapPath, asset) =>
+                    fixture.snapPayloads[asset.name],
+                validateRuntimeManifest: () => [],
+                verifiedReceiptPath: receiptPath,
+            }),
+        /initially verified receipt/i
+    );
+    assert.equal(replaced, true);
+});
+
+test('removes a verified snapshot when an asset changes during inspection', async (t) => {
+    const helper = await loadHelper();
+    const fixture = createSourceBindingFixture();
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-release-race-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+    const downloadRoot = path.join(temporaryRoot, 'downloads');
+    const verifiedRoot = path.join(temporaryRoot, 'verified');
+    fs.mkdirSync(downloadRoot);
+    const selection = {
+        snapAssets: [{ id: 1, name: 'IPTVnator-amd64.snap' }],
+        sourceAsset: {
+            id: 2,
+            name: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+    };
+    for (const name of [
+        selection.snapAssets[0].name,
+        selection.sourceAsset.name,
+    ]) {
+        fs.writeFileSync(path.join(downloadRoot, name), name);
+    }
+
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseCorrespondence(selection, downloadRoot, {
+                expectedRepositoryRevision: fixture.repositoryRevision,
+                expectedSourceSnapshotSha256:
+                    fixture.expectedSourceSnapshotSha256,
+                inspectSourceArchive: (sourcePath) => {
+                    fs.chmodSync(sourcePath, 0o644);
+                    fs.appendFileSync(sourcePath, 'changed');
+                    return fixture.sourceInspection;
+                },
+                inspectSnapPayload: (_snapPath, asset) =>
+                    fixture.snapPayloads[asset.name],
+                validateRuntimeManifest: () => [],
+                verifiedDirectory: verifiedRoot,
+            }),
+        /changed during inspection/i
+    );
+    assert.equal(fs.existsSync(verifiedRoot), false);
+});
+
+test('fails closed for stale source identity, archive bytes, and x64 marker-only payloads', async () => {
+    const helper = await loadHelper();
+    const fixture = createSourceBindingFixture();
+    const validateRuntimeManifest = () => [];
+
+    const staleRevision = structuredClone(fixture.sourceInspection);
+    staleRevision.sourceIndex.repositoryRevision = 'e'.repeat(40);
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: staleRevision,
+                    snapPayloads: Object.values(fixture.snapPayloads),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /repository revision/i
+    );
+
+    const forgedSubmodules = structuredClone(fixture);
+    const forgedSubmoduleRecord = `${'f'.repeat(40)} 3rdparty/Vulkan-Headers`;
+    forgedSubmodules.sourceInspection.sourceRuntime.packages.libplacebo.sourceSubmodules[0] =
+        forgedSubmoduleRecord;
+    forgedSubmodules.sourceInspection.sourceIndex.libplacebo.sourceSubmodules[0] =
+        forgedSubmoduleRecord;
+    forgedSubmodules.sourceInspection.sourceIndex.sourcePackages =
+        forgedSubmodules.sourceInspection.sourceRuntime.packages;
+    forgedSubmodules.snapPayloads[
+        'IPTVnator-amd64.snap'
+    ].manifest.sourceRuntime = forgedSubmodules.sourceInspection.sourceRuntime;
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: forgedSubmodules.sourceInspection,
+                    snapPayloads: Object.values(forgedSubmodules.snapPayloads),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /submodule/i
+    );
+
+    const tamperedArchive = structuredClone(fixture.sourceInspection);
+    tamperedArchive.archiveFiles[0].sha256 = 'f'.repeat(64);
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: tamperedArchive,
+                    snapPayloads: Object.values(fixture.snapPayloads),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /archive.*checksum/i
+    );
+
+    const staleSnapPayloads = structuredClone(fixture.snapPayloads);
+    staleSnapPayloads[
+        'IPTVnator-amd64.snap'
+    ].manifest.sourceRuntime.generatedAt = '2025-01-01T00:00:00.000Z';
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: fixture.sourceInspection,
+                    snapPayloads: Object.values(staleSnapPayloads),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /Snap source runtime.*source archive/i
+    );
+
+    const markerOnlyX64 = structuredClone(fixture.snapPayloads);
+    markerOnlyX64['IPTVnator-amd64.snap'] = {
+        assetName: 'IPTVnator-amd64.snap',
+        architecture: 'x64',
+        markerOnly: true,
+        manifest: null,
+    };
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: fixture.sourceInspection,
+                    snapPayloads: Object.values(markerOnlyX64),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /x64 Snap.*frame-copy/i
+    );
+
+    const incompleteCompliance = structuredClone(fixture.sourceInspection);
+    incompleteCompliance.compliance.toolingValidated = false;
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: incompleteCompliance,
+                    snapPayloads: Object.values(fixture.snapPayloads),
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /source archive compliance/i
+    );
+
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: fixture.sourceInspection,
+                    snapPayloads: [
+                        fixture.snapPayloads['IPTVnator-arm64.snap'],
+                    ],
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /exactly one x64 Snap/i
+    );
+
+    assert.throws(
+        () =>
+            helper.verifySnapReleaseSourceBinding(
+                {
+                    expectedRepositoryRevision: fixture.repositoryRevision,
+                    sourceInspection: fixture.sourceInspection,
+                    snapPayloads: [
+                        fixture.snapPayloads['IPTVnator-amd64.snap'],
+                        {
+                            ...fixture.snapPayloads['IPTVnator-amd64.snap'],
+                            assetName: 'IPTVnator-second-amd64.snap',
+                        },
+                    ],
+                },
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                    validateRuntimeManifest,
+                }
+            ),
+        /exactly one x64 Snap/i
+    );
+});
+
+test('hashes the final source archive bytes and reads the exact packaged Snap binding', async (t) => {
+    const sourceBindingHelper = await loadSourceBindingHelper();
+    const sourceArchiveContract = await loadSourceArchiveContract();
+    const fixture = createSourceBindingFixture();
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-source-inspection-')
+    );
+    t.after(() => fs.rmSync(temporaryRoot, { recursive: true, force: true }));
+
+    const sourceRoot = path.join(temporaryRoot, 'source');
+    const metadataRoot = path.join(sourceRoot, 'metadata');
+    const archivesRoot = path.join(sourceRoot, 'archives');
+    fs.mkdirSync(metadataRoot, { recursive: true });
+    fs.mkdirSync(archivesRoot, { recursive: true });
+    const pinnedSourceContents = Buffer.from('pinned ffmpeg source');
+    const pinnedSourceSha256 = crypto
+        .createHash('sha256')
+        .update(pinnedSourceContents)
+        .digest('hex');
+    const sourceRuntime = structuredClone(
+        fixture.sourceInspection.sourceRuntime
+    );
+    sourceRuntime.packages.ffmpeg.sourceSha256 = pinnedSourceSha256;
+    const sourceIndex = structuredClone(fixture.sourceInspection.sourceIndex);
+    sourceIndex.sourcePackages = sourceRuntime.packages;
+    sourceIndex.archives = [
+        {
+            name: 'ffmpeg.tar.xz',
+            sha256: pinnedSourceSha256,
+        },
+    ];
+    sourceIndex.libplacebo = {
+        sourceGitCommit: sourceRuntime.packages.libplacebo.sourceGitCommit,
+        sourceSubmodules: [
+            ...sourceRuntime.packages.libplacebo.sourceSubmodules,
+        ],
+        sourceSnapshot: SYNTHETIC_LIBPLACEBO_SOURCE_SNAPSHOT,
+    };
+    const compliance = createComplianceInspection(sourceRuntime);
+    sourceIndex.legal = {
+        manifest: 'notices/embedded-mpv-notices.json',
+        noticeFile: compliance.notices.noticeFile,
+        packages: compliance.notices.packages,
+    };
+    fs.writeFileSync(
+        path.join(archivesRoot, 'ffmpeg.tar.xz'),
+        pinnedSourceContents
+    );
+    const licenseInputRoot = path.join(sourceRoot, 'license-inputs');
+    const noticesRoot = path.join(sourceRoot, 'notices');
+    for (const [root, files] of [
+        [licenseInputRoot, compliance.licenseInputFiles],
+        [noticesRoot, compliance.noticeLicenseFiles],
+    ]) {
+        for (const file of files) {
+            const filePath = path.join(root, ...file.path.split('/'));
+            fs.mkdirSync(path.dirname(filePath), { recursive: true });
+            fs.writeFileSync(filePath, `${file.path.split('/')[1]} license\n`);
+        }
+    }
+    fs.writeFileSync(
+        path.join(licenseInputRoot, 'linux-runtime-license-inputs.json'),
+        `${JSON.stringify(compliance.licenseInputs)}\n`
+    );
+    fs.writeFileSync(
+        path.join(noticesRoot, 'embedded-mpv-notices.json'),
+        `${JSON.stringify(compliance.notices)}\n`
+    );
+    fs.writeFileSync(
+        path.join(noticesRoot, 'THIRD_PARTY_NOTICES.txt'),
+        compliance.aggregateNoticeContents
+    );
+    const libplaceboRoot = path.join(sourceRoot, 'git', 'libplacebo');
+    fs.mkdirSync(libplaceboRoot, { recursive: true });
+    fs.writeFileSync(
+        path.join(libplaceboRoot, 'README.md'),
+        'libplacebo source snapshot\n'
+    );
+    const toolingFiles = [
+        ['embedded-mpv', 'build-linux-runtime.cjs'],
+        ['embedded-mpv', 'build-linux-runtime.mjs'],
+        ['embedded-mpv', 'generate-linux-runtime-notices.cjs'],
+        ['embedded-mpv', 'linux-runtime-manifest.cjs'],
+        ['embedded-mpv', 'linux-source-archive-contract.cjs'],
+        ['embedded-mpv', 'stage-runtime.mjs'],
+        ['packaging', 'prepare-linux-runtime-source-snapshot.cjs'],
+    ];
+    const toolingRoot = path.join(sourceRoot, 'tooling');
+    fs.mkdirSync(toolingRoot, { recursive: true });
+    for (const [directoryName, fileName] of toolingFiles) {
+        fs.copyFileSync(
+            path.join(workspaceRoot, 'tools', directoryName, fileName),
+            path.join(toolingRoot, fileName)
+        );
+    }
+    fs.writeFileSync(
+        path.join(metadataRoot, 'runtime-manifest.json'),
+        `${JSON.stringify(sourceRuntime)}\n`
+    );
+    fs.writeFileSync(
+        path.join(metadataRoot, 'source-index.json'),
+        `${JSON.stringify(sourceIndex)}\n`
+    );
+    fs.writeFileSync(
+        path.join(metadataRoot, 'iptvnator-git-revision.txt'),
+        `${fixture.repositoryRevision}\n`
+    );
+    fs.writeFileSync(path.join(metadataRoot, 'local-changes.patch'), '');
+    const archiveChecksumsPath = path.join(metadataRoot, 'archive-sha256.txt');
+    fs.writeFileSync(
+        archiveChecksumsPath,
+        `${pinnedSourceSha256}  ffmpeg.tar.xz\n`
+    );
+
+    const sourceArchivePath = path.join(
+        temporaryRoot,
+        'linux-frame-copy-runtime-sources.tar.xz'
+    );
+    const tarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            sourceArchivePath,
+            '--directory',
+            sourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(tarResult.error, undefined);
+    assert.equal(tarResult.status, 0, tarResult.stderr);
+
+    let observedTarFilesFromFile = false;
+    const runCommand = (command, args, options = {}) => {
+        if (command === 'tar' && args.includes('-T')) {
+            const filesFromPath = args[args.indexOf('-T') + 1];
+            assert.equal(path.isAbsolute(filesFromPath), true);
+            assert.equal(fs.lstatSync(filesFromPath).isFile(), true);
+            assert.equal(
+                fs.lstatSync(filesFromPath).mode & 0o077,
+                0,
+                'tar files-from input must not be group/world accessible'
+            );
+            const filesFromContents = fs.readFileSync(filesFromPath, 'utf8');
+            assert.match(
+                filesFromContents,
+                /(?:^|\n)\.\/git\/libplacebo\/README\.md(?:\n|$)/,
+                'tar files-from input must preserve the exact archive member names'
+            );
+            assert.ok(
+                args.includes('--no-recursion'),
+                'tar must not recursively consume descendants that are also listed explicitly'
+            );
+            observedTarFilesFromFile = true;
+        }
+        const result = childProcess.spawnSync(command, args, {
+            encoding:
+                options.encoding === undefined ? 'utf8' : options.encoding,
+            input: options.input,
+            killSignal: 'SIGKILL',
+            maxBuffer: options.maxBuffer,
+            stdio: 'pipe',
+            timeout: options.timeout,
+            windowsHide: true,
+        });
+        if (result.error) {
+            throw result.error;
+        }
+        if (result.status !== 0) {
+            throw new Error(
+                `${command} exited with status ${String(result.status)}: ${
+                    result.stderr ?? ''
+                }`
+            );
+        }
+        return result.stdout;
+    };
+    const sourceArchive = sourceArchiveContract.createLinuxSourceArchiveBinding(
+        {
+            archivePath: sourceArchivePath,
+            repositoryRevision: fixture.repositoryRevision,
+        }
+    );
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSourceArchive(sourceArchivePath, {
+                runCommand,
+            }),
+        /snapshot digest mismatch/i
+    );
+    const sourceInspection = sourceBindingHelper.inspectSourceArchive(
+        sourceArchivePath,
+        {
+            expectedSourceSnapshotSha256: fixture.expectedSourceSnapshotSha256,
+            runCommand,
+        }
+    );
+    assert.equal(observedTarFilesFromFile, true);
+    assert.equal(sourceInspection.archiveSha256, sourceArchive.sha256);
+    assert.deepEqual(sourceInspection.archiveFiles, sourceIndex.archives);
+
+    const hiddenSourceRoot = path.join(temporaryRoot, 'hidden-source');
+    fs.mkdirSync(hiddenSourceRoot);
+    fs.writeFileSync(
+        path.join(hiddenSourceRoot, 'undeclared-hidden-source.txt'),
+        'not part of the canonical source bundle'
+    );
+    const hiddenSourceArchivePath = path.join(
+        temporaryRoot,
+        'hidden-source.tar.xz'
+    );
+    const hiddenSourceTarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            hiddenSourceArchivePath,
+            '--directory',
+            hiddenSourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(hiddenSourceTarResult.error, undefined);
+    assert.equal(hiddenSourceTarResult.status, 0, hiddenSourceTarResult.stderr);
+    const concatenatedSourceArchivePath = path.join(
+        temporaryRoot,
+        'concatenated-source.tar.xz'
+    );
+    fs.writeFileSync(
+        concatenatedSourceArchivePath,
+        Buffer.concat([
+            fs.readFileSync(sourceArchivePath),
+            fs.readFileSync(hiddenSourceArchivePath),
+        ])
+    );
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSourceArchive(
+                concatenatedSourceArchivePath,
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                }
+            ),
+        /undeclared source archive member/i
+    );
+
+    fs.writeFileSync(
+        archiveChecksumsPath,
+        `${'0'.repeat(64)}  ffmpeg.tar.xz\n`
+    );
+    const badChecksumArchivePath = path.join(
+        temporaryRoot,
+        'bad-checksum-source.tar.xz'
+    );
+    const badChecksumTarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            badChecksumArchivePath,
+            '--directory',
+            sourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(badChecksumTarResult.error, undefined);
+    assert.equal(badChecksumTarResult.status, 0, badChecksumTarResult.stderr);
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSourceArchive(badChecksumArchivePath, {
+                expectedSourceSnapshotSha256:
+                    fixture.expectedSourceSnapshotSha256,
+            }),
+        /archive checksum/i
+    );
+    fs.writeFileSync(
+        archiveChecksumsPath,
+        `${pinnedSourceSha256}  ffmpeg.tar.xz\n`
+    );
+
+    const extraSourcePath = path.join(sourceRoot, 'undeclared-source.txt');
+    fs.writeFileSync(
+        extraSourcePath,
+        'not part of the canonical source bundle'
+    );
+    const extraMemberArchivePath = path.join(
+        temporaryRoot,
+        'extra-member-source.tar.xz'
+    );
+    const extraMemberTarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            extraMemberArchivePath,
+            '--directory',
+            sourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(extraMemberTarResult.error, undefined);
+    assert.equal(extraMemberTarResult.status, 0, extraMemberTarResult.stderr);
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSourceArchive(extraMemberArchivePath, {
+                expectedSourceSnapshotSha256:
+                    fixture.expectedSourceSnapshotSha256,
+            }),
+        /undeclared source archive member/i
+    );
+    fs.unlinkSync(extraSourcePath);
+
+    const oversizedSourceArchive = path.join(
+        temporaryRoot,
+        'oversized-source.tar.xz'
+    );
+    fs.writeFileSync(oversizedSourceArchive, '');
+    fs.truncateSync(oversizedSourceArchive, 1024 * 1024 * 1024 + 1);
+    assert.throws(
+        () => sourceBindingHelper.inspectSourceArchive(oversizedSourceArchive),
+        /bounded non-empty regular file/i
+    );
+
+    const localChangesPath = path.join(metadataRoot, 'local-changes.patch');
+    const emptyTargetPath = path.join(sourceRoot, 'empty-target');
+    fs.writeFileSync(emptyTargetPath, '');
+    fs.unlinkSync(localChangesPath);
+    fs.symlinkSync('../empty-target', localChangesPath);
+    const symlinkArchivePath = path.join(
+        temporaryRoot,
+        'symlinked-source.tar.xz'
+    );
+    const symlinkTarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            symlinkArchivePath,
+            '--directory',
+            sourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(symlinkTarResult.error, undefined);
+    assert.equal(symlinkTarResult.status, 0, symlinkTarResult.stderr);
+    assert.throws(
+        () => sourceBindingHelper.inspectSourceArchive(symlinkArchivePath),
+        /required member.*regular file/i
+    );
+    fs.unlinkSync(localChangesPath);
+    fs.writeFileSync(localChangesPath, '');
+
+    const oversizedMemberPath = path.join(
+        libplaceboRoot,
+        'oversized-source-member.bin'
+    );
+    fs.writeFileSync(oversizedMemberPath, '');
+    fs.truncateSync(oversizedMemberPath, 128 * 1024 * 1024 + 1);
+    const oversizedMemberArchivePath = path.join(
+        temporaryRoot,
+        'oversized-member-source.tar.xz'
+    );
+    const oversizedMemberTarResult = childProcess.spawnSync(
+        'tar',
+        [
+            '--create',
+            '--xz',
+            '--file',
+            oversizedMemberArchivePath,
+            '--directory',
+            sourceRoot,
+            '.',
+        ],
+        { encoding: 'utf8' }
+    );
+    assert.equal(oversizedMemberTarResult.error, undefined);
+    assert.equal(
+        oversizedMemberTarResult.status,
+        0,
+        oversizedMemberTarResult.stderr
+    );
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSourceArchive(
+                oversizedMemberArchivePath,
+                {
+                    expectedSourceSnapshotSha256:
+                        fixture.expectedSourceSnapshotSha256,
+                }
+            ),
+        /member exceeds.*size limit/i
+    );
+    fs.unlinkSync(oversizedMemberPath);
+
+    const snapSourceRoot = path.join(temporaryRoot, 'snap-source');
+    const appRoot = path.join(snapSourceRoot, 'usr', 'lib', 'iptvnator');
+    const nativeRoot = path.join(
+        appRoot,
+        'resources',
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(nativeRoot, { recursive: true });
+    const electronHeader = Buffer.alloc(20);
+    electronHeader.set([0x7f, 0x45, 0x4c, 0x46, 2, 1]);
+    electronHeader.writeUInt16LE(62, 18);
+    fs.writeFileSync(path.join(appRoot, 'iptvnator.bin'), electronHeader);
+    const packagedManifest = {
+        ...fixture.snapPayloads['IPTVnator-amd64.snap'].manifest,
+        sourceArchive,
+        sourceRuntime,
+    };
+    fs.writeFileSync(
+        path.join(nativeRoot, 'embedded-mpv-runtime.json'),
+        `${JSON.stringify(packagedManifest)}\n`
+    );
+    const snapYamlPath = path.join(snapSourceRoot, 'meta', 'snap.yaml');
+    fs.mkdirSync(path.dirname(snapYamlPath), { recursive: true });
+    const validSnapYaml = [
+        'name: iptvnator',
+        'base: core22',
+        'confinement: strict',
+        'apps:',
+        '  iptvnator:',
+        '    command: iptvnator',
+        '    environment:',
+        '      SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform',
+        '    plugs:',
+        '      - desktop',
+        '      - shared-memory',
+        '      - graphics-core22',
+        'plugs:',
+        '  shared-memory:',
+        '    interface: shared-memory',
+        '    private: true',
+        '  graphics-core22:',
+        '    interface: content',
+        '    target: $SNAP/graphics',
+        '    default-provider: mesa-core22',
+        'layout:',
+        '  /usr/share/libdrm:',
+        '    bind: $SNAP/graphics/libdrm',
+        '  /usr/share/drirc.d:',
+        '    symlink: $SNAP/graphics/drirc.d',
+        '',
+    ].join('\n');
+    fs.writeFileSync(snapYamlPath, validSnapYaml);
+    const graphicsRoot = path.join(snapSourceRoot, 'graphics');
+    fs.mkdirSync(graphicsRoot, { mode: 0o755 });
+    fs.chmodSync(graphicsRoot, 0o755);
+    const asarSourceRoot = path.join(temporaryRoot, 'asar-source');
+    const appAsarPath = path.join(appRoot, 'resources', 'app.asar');
+    fs.mkdirSync(asarSourceRoot);
+    fs.writeFileSync(
+        path.join(asarSourceRoot, 'main.js'),
+        'module.exports = {}'
+    );
+    await createAsarPackage(asarSourceRoot, appAsarPath);
+    const cleanReleaseCheckoutRoot = path.join(
+        temporaryRoot,
+        'clean-release-checkout'
+    );
+    const cleanReleaseToolsRoot = path.join(cleanReleaseCheckoutRoot, 'tools');
+    fs.mkdirSync(cleanReleaseToolsRoot, { recursive: true });
+    for (const toolDirectory of ['packaging', 'embedded-mpv']) {
+        fs.cpSync(
+            path.join(workspaceRoot, 'tools', toolDirectory),
+            path.join(cleanReleaseToolsRoot, toolDirectory),
+            { recursive: true }
+        );
+    }
+    const cleanReleaseBoundaryHelperPath = path.join(
+        cleanReleaseToolsRoot,
+        'packaging',
+        'validate-snap-release-boundary.mjs'
+    );
+    const dependencyFreeBoundaryResult = childProcess.spawnSync(
+        process.execPath,
+        [cleanReleaseBoundaryHelperPath, snapSourceRoot],
+        {
+            encoding: 'utf8',
+            env: {
+                ...process.env,
+                NODE_OPTIONS: '',
+                NODE_PATH: '',
+            },
+        }
+    );
+    assert.equal(
+        dependencyFreeBoundaryResult.status,
+        0,
+        dependencyFreeBoundaryResult.stderr
+    );
+    assert.deepEqual(JSON.parse(dependencyFreeBoundaryResult.stdout), {
+        schemaVersion: 1,
+        errors: [],
+    });
+    const snapPath = path.join(temporaryRoot, 'IPTVnator-amd64.snap');
+    fs.writeFileSync(snapPath, 'synthetic Snap bytes');
+    const staticValidationCalls = [];
+    const snapPayload = sourceBindingHelper.inspectSnapPayload(
+        snapPath,
+        { id: 1, name: 'IPTVnator-amd64.snap' },
+        {
+            runCommand: (command, args) => {
+                assert.equal(command, 'unsquashfs');
+                if (args[0] === '-lln') {
+                    return syntheticSquashfsListing();
+                }
+                const destinationIndex = args.indexOf('-dest') + 1;
+                assert.ok(destinationIndex > 0);
+                fs.cpSync(snapSourceRoot, args[destinationIndex], {
+                    recursive: true,
+                });
+                return '';
+            },
+            validatePackagedEmbeddedMpv: (resourceDirectory, options) => {
+                staticValidationCalls.push({ options, resourceDirectory });
+                return [];
+            },
+        }
+    );
+    assert.deepEqual(snapPayload, {
+        architecture: 'x64',
+        assetName: 'IPTVnator-amd64.snap',
+        manifest: packagedManifest,
+        markerOnly: false,
+    });
+    assert.equal(staticValidationCalls.length, 1);
+    assert.ok(
+        staticValidationCalls[0].resourceDirectory.endsWith(
+            ['payload', 'usr', 'lib', 'iptvnator', 'resources'].join(path.sep)
+        )
+    );
+    assert.deepEqual(staticValidationCalls[0].options, {
+        artifactFormat: 'snap',
+        executableName: 'iptvnator',
+        foreignArch: false,
+        hostPlatform: 'linux',
+        platform: 'linux',
+        profile: 'portable',
+        required: true,
+        targetArch: 'x64',
+        targetNames: ['appimage', 'snap'],
+    });
+
+    fs.writeFileSync(
+        snapYamlPath,
+        validSnapYaml.replace('      - shared-memory\n', '')
+    );
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSnapPayload(
+                snapPath,
+                { id: 1, name: 'IPTVnator-amd64.snap' },
+                {
+                    runCommand: (command, args) => {
+                        assert.equal(command, 'unsquashfs');
+                        if (args[0] === '-lln') {
+                            return syntheticSquashfsListing();
+                        }
+                        const destinationIndex = args.indexOf('-dest') + 1;
+                        fs.cpSync(snapSourceRoot, args[destinationIndex], {
+                            recursive: true,
+                        });
+                        return '';
+                    },
+                    validatePackagedEmbeddedMpv: () => [],
+                }
+            ),
+        /shared-memory plug/i
+    );
+    fs.writeFileSync(snapYamlPath, validSnapYaml);
+
+    fs.rmSync(asarSourceRoot, { recursive: true });
+    const staleAsarNativeRoot = path.join(
+        asarSourceRoot,
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(staleAsarNativeRoot, { recursive: true });
+    fs.writeFileSync(
+        path.join(staleAsarNativeRoot, 'embedded-mpv-runtime.json'),
+        '{}\n'
+    );
+    fs.rmSync(appAsarPath);
+    await createAsarPackage(asarSourceRoot, appAsarPath);
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSnapPayload(
+                snapPath,
+                { id: 1, name: 'IPTVnator-amd64.snap' },
+                {
+                    runCommand: (command, args) => {
+                        assert.equal(command, 'unsquashfs');
+                        if (args[0] === '-lln') {
+                            return syntheticSquashfsListing();
+                        }
+                        const destinationIndex = args.indexOf('-dest') + 1;
+                        fs.cpSync(snapSourceRoot, args[destinationIndex], {
+                            recursive: true,
+                        });
+                        return '';
+                    },
+                    validatePackagedEmbeddedMpv: () => [],
+                }
+            ),
+        /app\.asar.*embedded MPV native payload/i
+    );
+    fs.rmSync(asarSourceRoot, { recursive: true });
+    fs.mkdirSync(asarSourceRoot);
+    fs.writeFileSync(
+        path.join(asarSourceRoot, 'main.js'),
+        'module.exports = {}'
+    );
+    fs.rmSync(appAsarPath);
+    await createAsarPackage(asarSourceRoot, appAsarPath);
+
+    assert.equal(
+        sourceBindingHelper.verifySnapReleaseSourceBinding(
+            {
+                expectedRepositoryRevision: fixture.repositoryRevision,
+                sourceInspection,
+                snapPayloads: [snapPayload],
+            },
+            {
+                expectedSourceSnapshotSha256:
+                    fixture.expectedSourceSnapshotSha256,
+                validateRuntimeManifest: () => [],
+            }
+        ),
+        true
+    );
+
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSnapPayload(
+                snapPath,
+                { id: 1, name: 'IPTVnator-amd64.snap' },
+                {
+                    runCommand: (command, args) => {
+                        assert.equal(command, 'unsquashfs');
+                        if (args[0] === '-lln') {
+                            return syntheticSquashfsListing();
+                        }
+                        const destinationIndex = args.indexOf('-dest') + 1;
+                        fs.cpSync(snapSourceRoot, args[destinationIndex], {
+                            recursive: true,
+                        });
+                        return '';
+                    },
+                    validatePackagedEmbeddedMpv: () => [
+                        'Hidden inherited frame-copy artifact.',
+                    ],
+                }
+            ),
+        /Hidden inherited frame-copy artifact/
+    );
+
+    const decoySourceRoot = path.join(temporaryRoot, 'decoy-snap-source');
+    const decoyAppRoot = path.join(decoySourceRoot, 'decoy');
+    fs.cpSync(appRoot, decoyAppRoot, { recursive: true });
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSnapPayload(
+                snapPath,
+                { id: 1, name: 'IPTVnator-amd64.snap' },
+                {
+                    runCommand: (command, args) => {
+                        assert.equal(command, 'unsquashfs');
+                        if (args[0] === '-lln') {
+                            return syntheticSquashfsListing();
+                        }
+                        const destinationIndex = args.indexOf('-dest') + 1;
+                        fs.cpSync(decoySourceRoot, args[destinationIndex], {
+                            recursive: true,
+                        });
+                        return '';
+                    },
+                    validatePackagedEmbeddedMpv: () => {
+                        throw new Error(
+                            'Static validation must not inspect a decoy root.'
+                        );
+                    },
+                }
+            ),
+        /canonical frame-copy manifest/i
+    );
+
+    const manifestPath = path.join(nativeRoot, 'embedded-mpv-runtime.json');
+    fs.truncateSync(manifestPath, 16 * 1024 * 1024 + 1);
+    let oversizedStaticValidationCalls = 0;
+    assert.throws(
+        () =>
+            sourceBindingHelper.inspectSnapPayload(
+                snapPath,
+                { id: 1, name: 'IPTVnator-amd64.snap' },
+                {
+                    runCommand: (command, args) => {
+                        assert.equal(command, 'unsquashfs');
+                        if (args[0] === '-lln') {
+                            return syntheticSquashfsListing();
+                        }
+                        const destinationIndex = args.indexOf('-dest') + 1;
+                        fs.cpSync(snapSourceRoot, args[destinationIndex], {
+                            recursive: true,
+                        });
+                        return '';
+                    },
+                    validatePackagedEmbeddedMpv: () => {
+                        oversizedStaticValidationCalls += 1;
+                        return [];
+                    },
+                }
+            ),
+        /invalid frame-copy manifest/i
+    );
+    assert.equal(oversizedStaticValidationCalls, 0);
+});
+
+test('publish workflow installs the source verifier and binds the release tag revision', () => {
+    const workflow = fs.readFileSync(publishWorkflowPath, 'utf8');
+    const parsedWorkflow = parse(workflow);
+    const verifyJob = parsedWorkflow.jobs['verify-snap'];
+    const publishJob = parsedWorkflow.jobs['publish-snap'];
+    const uploadStep = publishJob.steps.find(
+        (step) => step.name === 'Publish all public-release snaps to edge'
+    );
+    const checkoutStep = verifyJob.steps.find(
+        (step) => step.name === 'Checkout released tooling'
+    );
+    const snapcraftStep = publishJob.steps.find(
+        (step) => step.name === 'Install Snapcraft'
+    );
+    const selectStep = verifyJob.steps.find(
+        (step) => step.name === 'Select exact public release assets'
+    );
+    const downloadStep = verifyJob.steps.find(
+        (step) => step.name === 'Download exact public release assets'
+    );
+    const verifyStep = verifyJob.steps.find(
+        (step) => step.name === 'Verify downloaded public release assets'
+    );
+    const sealedVerifyStep = verifyJob.steps.find(
+        (step) => step.name === 'Reverify sealed public release assets'
+    );
+    const transferStep = verifyJob.steps.find(
+        (step) => step.name === 'Transfer verified release assets'
+    );
+    const artifactDownloadStep = publishJob.steps.find(
+        (step) => step.name === 'Download verified release assets'
+    );
+    const transferredSealStep = publishJob.steps.find(
+        (step) => step.name === 'Seal transferred public release assets'
+    );
+    assert.equal(verifyJob['timeout-minutes'], 45);
+    assert.equal(publishJob['timeout-minutes'], 20);
+    assert.equal(publishJob.needs, 'verify-snap');
+    assert.match(
+        workflow,
+        /apt-get install[\s\S]*binutils[\s\S]*squashfs-tools[\s\S]*xz-utils/
+    );
+    assert.match(
+        workflow,
+        /release-snap-assets\.cjs verify[\s\S]*--repository-revision/
+    );
+    assert.ok(
+        workflow.indexOf('--repository-revision') <
+            workflow.indexOf('snapcraft upload --release=edge')
+    );
+    assert.equal(JSON.stringify(verifyJob).includes('snapcraft_token'), false);
+    assert.equal(
+        checkoutStep.with?.['persist-credentials'],
+        false,
+        'release checkout must not persist github.token for later steps'
+    );
+    assert.equal(
+        checkoutStep.uses,
+        'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1'
+    );
+    assert.equal(snapcraftStep.uses, undefined);
+    assert.match(
+        snapcraftStep.run,
+        /sudo snap install snapcraft --classic --channel=stable/
+    );
+    assert.match(verifyStep.run, /--verified-directory/);
+    assert.match(verifyStep.run, /chown -R root:root/);
+    assert.match(verifyStep.run, /chmod 0555/);
+    assert.match(verifyStep.run, /chmod 0444/);
+    assert.match(
+        verifyStep.run,
+        /SEALED_ASSET_PARENT="\/var\/lib\/iptvnator-snap-release"/
+    );
+    assert.match(
+        verifyStep.run,
+        /sudo mv "\$\{VERIFIED_ASSET_STAGING\}" "\$\{SEALED_ASSET_DIRECTORY\}"/
+    );
+    assert.ok(sealedVerifyStep);
+    assert.equal(sealedVerifyStep.env, undefined);
+    assert.match(
+        sealedVerifyStep.run,
+        /release-snap-assets\.cjs verify-sealed/
+    );
+    assert.ok(
+        verifyJob.steps.indexOf(sealedVerifyStep) <
+            verifyJob.steps.indexOf(transferStep)
+    );
+    assert.equal(
+        transferStep.uses,
+        'actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a'
+    );
+    assert.equal(
+        artifactDownloadStep.uses,
+        'actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c'
+    );
+    assert.ok(
+        publishJob.steps.indexOf(artifactDownloadStep) <
+            publishJob.steps.indexOf(transferredSealStep)
+    );
+    assert.ok(
+        publishJob.steps.indexOf(transferredSealStep) <
+            publishJob.steps.indexOf(snapcraftStep)
+    );
+    assert.ok(
+        publishJob.steps.indexOf(snapcraftStep) <
+            publishJob.steps.indexOf(uploadStep)
+    );
+    assert.match(
+        uploadStep.run,
+        /VERIFIED_ASSET_DIRECTORY="\/var\/lib\/iptvnator-snap-release\/assets"/
+    );
+    assert.doesNotMatch(uploadStep.run, /\bnode\b/);
+    assert.doesNotMatch(uploadStep.run, /release-snap-assets\.cjs/);
+    assert.doesNotMatch(uploadStep.run, /\bfind\b|\bsort\b/);
+    assert.match(
+        uploadStep.run,
+        /SNAP_FILES=\("\$\{VERIFIED_ASSET_DIRECTORY\}"\/\*\.snap\)/
+    );
+    assert.match(
+        uploadStep.run,
+        /SNAPCRAFT_STORE_CREDENTIALS="\$\{STORE_CREDENTIALS\}" \/snap\/bin\/snapcraft upload/
+    );
+    assert.doesNotMatch(
+        uploadStep.run,
+        /snap-release-downloads\/\$\{SNAP_NAME\}/
+    );
+    assert.equal(
+        Object.hasOwn(publishJob.env ?? {}, 'SNAPCRAFT_STORE_CREDENTIALS'),
+        false
+    );
+    assert.equal(Object.hasOwn(publishJob.env ?? {}, 'GH_TOKEN'), false);
+    assert.deepEqual(selectStep.env, {
+        GH_TOKEN: '${{ github.token }}',
+    });
+    assert.deepEqual(downloadStep.env, {
+        GH_TOKEN: '${{ github.token }}',
+    });
+    assert.equal(verifyStep.env, undefined);
+    assert.deepEqual(uploadStep.env, {
+        SNAPCRAFT_STORE_CREDENTIALS: '${{ secrets.snapcraft_token }}',
+    });
+});
diff --git a/tools/packaging/release-snap-source-binding.cjs b/tools/packaging/release-snap-source-binding.cjs
new file mode 100644
index 000000000..966df433b
--- /dev/null
+++ b/tools/packaging/release-snap-source-binding.cjs
@@ -0,0 +1,1765 @@
+'use strict';
+
+const childProcess = require('node:child_process');
+const crypto = require('node:crypto');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const { isDeepStrictEqual } = require('node:util');
+const {
+    validateLinuxRuntimeManifest,
+} = require('../embedded-mpv/linux-runtime-manifest.cjs');
+const {
+    EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
+const { validatePackagedEmbeddedMpv } = require('./embedded-mpv-packaging.cjs');
+const {
+    SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION,
+    SOURCE_ARCHIVE_NAME,
+    sha256File,
+    validateLinuxSourceArchiveBinding,
+} = require('../embedded-mpv/linux-source-archive-contract.cjs');
+const {
+    EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+    inventoryLinuxRuntimeSourceSnapshot,
+    validateLinuxRuntimeSourceSnapshot,
+} = require('./prepare-linux-runtime-source-snapshot.cjs');
+
+const COMMAND_OUTPUT_MAX_BUFFER_BYTES = 16 * 1024 * 1024;
+const SQUASHFS_LIST_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
+const SOURCE_MEMBER_MAX_BUFFER_BYTES = 128 * 1024 * 1024;
+const COMMAND_TIMEOUT_MS = 120_000;
+const SOURCE_ARCHIVE_MAX_BYTES = 1024 * 1024 * 1024;
+const SOURCE_ARCHIVE_EXTRACTED_MAX_BYTES = 2 * 1024 * 1024 * 1024;
+const SNAP_ARCHIVE_MAX_BYTES = 1024 * 1024 * 1024;
+const SNAP_EXTRACTED_MAX_BYTES = 2 * 1024 * 1024 * 1024;
+const SOURCE_INDEX_SCHEMA_VERSION = 3;
+const SNAP_PAYLOAD_ENTRY_LIMIT = 250_000;
+const SOURCE_ARCHIVE_ENTRY_LIMIT = 250_000;
+const GIT_COMMIT_PATTERN = /^[a-f0-9]{40,64}$/;
+const SHA256_PATTERN = /^[a-f0-9]{64}$/;
+const SAFE_BASENAME_PATTERN = /^[A-Za-z0-9_+.-]+$/;
+const FRAME_COPY_MANIFEST_NAME = 'embedded-mpv-runtime.json';
+const FRAME_COPY_UNAVAILABLE_MARKER_NAME = 'embedded-mpv-unavailable.txt';
+const SNAP_RELEASE_BOUNDARY_SCHEMA_VERSION = 1;
+const SNAP_RELEASE_BOUNDARY_HELPER_PATH = path.join(
+    __dirname,
+    'validate-snap-release-boundary.mjs'
+);
+const NATIVE_PAYLOAD_SUFFIX = [
+    'resources',
+    'app.asar.unpacked',
+    'electron-backend',
+    'native',
+].join('/');
+const SOURCE_TOOLING_FILES = Object.freeze([
+    {
+        archivePath: 'tooling/build-linux-runtime.cjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'build-linux-runtime.cjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/build-linux-runtime.mjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'build-linux-runtime.mjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/generate-linux-runtime-notices.cjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'generate-linux-runtime-notices.cjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/linux-runtime-manifest.cjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'linux-runtime-manifest.cjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/linux-source-archive-contract.cjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'linux-source-archive-contract.cjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/stage-runtime.mjs',
+        checkoutPath: path.join(
+            __dirname,
+            '..',
+            'embedded-mpv',
+            'stage-runtime.mjs'
+        ),
+    },
+    {
+        archivePath: 'tooling/prepare-linux-runtime-source-snapshot.cjs',
+        checkoutPath: path.join(
+            __dirname,
+            'prepare-linux-runtime-source-snapshot.cjs'
+        ),
+    },
+]);
+
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function commandFailureDetails(result) {
+    const stderr = Buffer.isBuffer(result?.stderr)
+        ? result.stderr.toString('utf8')
+        : String(result?.stderr ?? '');
+    return stderr.trim().slice(0, 2048);
+}
+
+function defaultRunCommand(
+    command,
+    args,
+    {
+        encoding = 'utf8',
+        input,
+        maxBuffer = COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+        timeout = COMMAND_TIMEOUT_MS,
+    } = {}
+) {
+    const spawnOptions = {
+        killSignal: 'SIGKILL',
+        maxBuffer,
+        stdio: 'pipe',
+        timeout,
+        windowsHide: true,
+    };
+    if (input !== undefined) {
+        spawnOptions.input = input;
+    }
+    if (encoding !== null) {
+        spawnOptions.encoding = encoding;
+    }
+    const result = childProcess.spawnSync(command, args, spawnOptions);
+    if (result.error) {
+        throw new Error(
+            `Unable to run ${command}: ${
+                result.error instanceof Error
+                    ? result.error.message
+                    : String(result.error)
+            }`
+        );
+    }
+    if (result.status !== 0) {
+        const details = commandFailureDetails(result);
+        throw new Error(
+            `${command} exited with status ${String(result.status)}${
+                details ? `: ${details}` : '.'
+            }`
+        );
+    }
+    return result.stdout ?? (encoding === null ? Buffer.alloc(0) : '');
+}
+
+function normalizeTarMember(rawName) {
+    if (
+        typeof rawName !== 'string' ||
+        rawName.length === 0 ||
+        rawName.includes('\\') ||
+        [...rawName].some((character) => {
+            const codePoint = character.codePointAt(0);
+            return codePoint <= 0x1f || codePoint === 0x7f;
+        })
+    ) {
+        throw new Error('Source archive contains an unsafe member name.');
+    }
+    let memberName = rawName;
+    while (memberName.startsWith('./')) {
+        memberName = memberName.slice(2);
+    }
+    const isDirectory = memberName.endsWith('/');
+    if (isDirectory) {
+        memberName = memberName.slice(0, -1);
+    }
+    if (memberName === '') {
+        return null;
+    }
+    const parts = memberName.split('/');
+    if (
+        path.posix.isAbsolute(memberName) ||
+        parts.some(
+            (part) =>
+                part === '' ||
+                part === '.' ||
+                part === '..' ||
+                !SAFE_BASENAME_PATTERN.test(part)
+        )
+    ) {
+        throw new Error(
+            `Source archive contains an unsafe member name: ${rawName}`
+        );
+    }
+    return {
+        isDirectory,
+        name: parts.join('/'),
+        rawName,
+    };
+}
+
+function parseVerboseTarMembers(listing) {
+    if (typeof listing !== 'string') {
+        throw new Error('Unable to read source archive member types.');
+    }
+    const memberTypes = new Map();
+    for (const line of listing.split(/\r?\n/).filter(Boolean)) {
+        let type = line[0];
+        if (!['-', 'd', 'h', 'l'].includes(type)) {
+            throw new Error(
+                'Source archive contains an unsupported member type.'
+            );
+        }
+        let identity = line.trimEnd();
+        let linkTarget = null;
+        for (const marker of [' -> ', ' link to ']) {
+            const markerIndex = identity.indexOf(marker);
+            if (markerIndex !== -1) {
+                linkTarget = identity.slice(markerIndex + marker.length);
+                identity = identity.slice(0, markerIndex);
+                if (marker === ' link to ') {
+                    type = 'h';
+                }
+                break;
+            }
+        }
+        const trimmedIdentity = identity.trim();
+        const rawName = trimmedIdentity.split(/\s+/).at(-1);
+        const rawNameOffset = trimmedIdentity.lastIndexOf(rawName);
+        const metadataTokens = trimmedIdentity
+            .slice(0, rawNameOffset)
+            .trim()
+            .split(/\s+/);
+        const dateTokenIndex = metadataTokens.findIndex(
+            (token) =>
+                /^\d{4}-\d{2}-\d{2}$/.test(token) ||
+                /^(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)$/.test(
+                    token
+                )
+        );
+        const sizeToken =
+            dateTokenIndex > 0 ? metadataTokens[dateTokenIndex - 1] : '';
+        const size = Number(sizeToken);
+        if (
+            !/^\d+$/.test(sizeToken) ||
+            !Number.isSafeInteger(size) ||
+            size < 0
+        ) {
+            throw new Error(
+                'Unable to read a bounded source archive member size.'
+            );
+        }
+        const member = normalizeTarMember(rawName);
+        if (!member) {
+            continue;
+        }
+        if (memberTypes.has(member.name)) {
+            throw new Error(
+                `Source archive contains duplicate verbose member: ${member.name}`
+            );
+        }
+        if (member.isDirectory !== (type === 'd')) {
+            throw new Error(
+                `Source archive member type does not match its name: ${member.name}`
+            );
+        }
+        if (type === 'l' || type === 'h') {
+            if (
+                typeof linkTarget !== 'string' ||
+                linkTarget.length === 0 ||
+                linkTarget.includes('\\') ||
+                path.posix.isAbsolute(linkTarget) ||
+                [...linkTarget].some((character) => {
+                    const codePoint = character.codePointAt(0);
+                    return codePoint <= 0x1f || codePoint === 0x7f;
+                })
+            ) {
+                throw new Error(
+                    `Source archive contains an unsafe link target: ${member.name}`
+                );
+            }
+            const resolvedTarget =
+                type === 'h'
+                    ? path.posix.normalize(linkTarget)
+                    : path.posix.normalize(
+                          path.posix.join(
+                              path.posix.dirname(member.name),
+                              linkTarget
+                          )
+                      );
+            if (resolvedTarget === '..' || resolvedTarget.startsWith('../')) {
+                throw new Error(
+                    `Source archive link target escapes its root: ${member.name}`
+                );
+            }
+            linkTarget = resolvedTarget.replace(/^\.\/+/, '');
+        } else if (linkTarget !== null) {
+            throw new Error(
+                `Source archive regular member has link metadata: ${member.name}`
+            );
+        }
+        memberTypes.set(member.name, { linkTarget, size, type });
+    }
+    for (const [memberName, member] of memberTypes) {
+        if (
+            member.type === 'h' &&
+            memberTypes.get(member.linkTarget)?.type !== '-'
+        ) {
+            throw new Error(
+                `Source archive hardlink target must be a regular member: ${memberName}`
+            );
+        }
+    }
+    return memberTypes;
+}
+
+function listTarMembers(archivePath, runCommand) {
+    const listing = runCommand(
+        'tar',
+        ['--list', '--ignore-zeros', '--xz', '--file', archivePath],
+        {
+            encoding: 'utf8',
+            maxBuffer: COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+        }
+    );
+    if (typeof listing !== 'string') {
+        throw new Error('Unable to read source archive member listing.');
+    }
+    const verboseMembers = parseVerboseTarMembers(
+        runCommand(
+            'tar',
+            [
+                '--list',
+                '--verbose',
+                '--ignore-zeros',
+                '--xz',
+                '--file',
+                archivePath,
+            ],
+            {
+                encoding: 'utf8',
+                maxBuffer: COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+            }
+        )
+    );
+    const members = new Map();
+    let extractedBytes = 0;
+    let entryCount = 0;
+    for (const rawName of listing.split(/\r?\n/).filter(Boolean)) {
+        const member = normalizeTarMember(rawName);
+        if (!member) {
+            continue;
+        }
+        if (members.has(member.name)) {
+            throw new Error(
+                `Source archive contains duplicate member: ${member.name}`
+            );
+        }
+        const verboseMember = verboseMembers.get(member.name);
+        if (!verboseMember) {
+            throw new Error(
+                `Source archive member type is missing: ${member.name}`
+            );
+        }
+        entryCount += 1;
+        if (entryCount > SOURCE_ARCHIVE_ENTRY_LIMIT) {
+            throw new Error(
+                'Source archive exceeds the release-verifier entry limit.'
+            );
+        }
+        if (verboseMember.type === '-') {
+            if (verboseMember.size > SOURCE_MEMBER_MAX_BUFFER_BYTES) {
+                throw new Error(
+                    `Source archive member exceeds the release-verifier size limit: ${member.name}`
+                );
+            }
+            extractedBytes += verboseMember.size;
+            if (
+                !Number.isSafeInteger(extractedBytes) ||
+                extractedBytes > SOURCE_ARCHIVE_EXTRACTED_MAX_BYTES
+            ) {
+                throw new Error(
+                    'Source archive exceeds the release-verifier extracted-size limit.'
+                );
+            }
+        }
+        members.set(member.name, {
+            ...member,
+            ...verboseMember,
+        });
+    }
+    if (verboseMembers.size !== members.size) {
+        throw new Error(
+            'Source archive member and type listings do not match.'
+        );
+    }
+    return members;
+}
+
+function readTarMember(
+    archivePath,
+    members,
+    memberName,
+    runCommand,
+    maxBuffer
+) {
+    const member = members.get(memberName);
+    if (!member || member.type !== '-') {
+        throw new Error(
+            `Source archive required member must be a regular file: ${memberName}`
+        );
+    }
+    const contents = runCommand(
+        'tar',
+        [
+            '--extract',
+            '--xz',
+            '--to-stdout',
+            '--file',
+            archivePath,
+            '--',
+            member.rawName,
+        ],
+        {
+            encoding: null,
+            maxBuffer,
+        }
+    );
+    const buffer = Buffer.isBuffer(contents) ? contents : Buffer.from(contents);
+    if (buffer.length !== member.size) {
+        throw new Error(
+            `Source archive member size changed during inspection: ${memberName}`
+        );
+    }
+    return buffer;
+}
+
+function parseJsonMember(contents, memberName) {
+    try {
+        return JSON.parse(contents.toString('utf8'));
+    } catch {
+        throw new Error(
+            `Source archive member is not valid JSON: ${memberName}`
+        );
+    }
+}
+
+function sourceMemberRecord(
+    archivePath,
+    members,
+    memberName,
+    runCommand,
+    relativePath
+) {
+    const contents = readTarMember(
+        archivePath,
+        members,
+        memberName,
+        runCommand,
+        COMMAND_OUTPUT_MAX_BUFFER_BYTES
+    );
+    return {
+        path: relativePath,
+        sha256: crypto.createHash('sha256').update(contents).digest('hex'),
+        size: contents.length,
+    };
+}
+
+function inspectLegalFiles(
+    archivePath,
+    members,
+    runCommand,
+    rootName,
+    rootFiles
+) {
+    const rootPrefix = `${rootName}/`;
+    const licensePrefix = `${rootPrefix}licenses/`;
+    const allowedRootFiles = new Set(
+        rootFiles.map((name) => `${rootPrefix}${name}`)
+    );
+    const records = [];
+    for (const member of members.values()) {
+        if (member.isDirectory || !member.name.startsWith(rootPrefix)) {
+            continue;
+        }
+        if (
+            !member.name.startsWith(licensePrefix) &&
+            !allowedRootFiles.has(member.name)
+        ) {
+            throw new Error(
+                `Source archive contains an undeclared ${rootName} file: ${member.name}`
+            );
+        }
+        if (member.name.startsWith(licensePrefix)) {
+            records.push(
+                sourceMemberRecord(
+                    archivePath,
+                    members,
+                    member.name,
+                    runCommand,
+                    member.name.slice(rootPrefix.length)
+                )
+            );
+        }
+    }
+    return records.sort(({ path: left }, { path: right }) =>
+        left.localeCompare(right)
+    );
+}
+
+function inspectLibplaceboSourceSnapshot(
+    archivePath,
+    members,
+    runCommand,
+    expectedSourceSnapshotSha256
+) {
+    const sourceRootName = 'git/libplacebo';
+    const sourceRootMember = members.get(sourceRootName);
+    if (!sourceRootMember || sourceRootMember.type !== 'd') {
+        throw new Error(
+            'Source archive must contain a regular libplacebo source directory.'
+        );
+    }
+    const sourceMembers = [...members.values()].filter(
+        ({ name }) =>
+            name === sourceRootName || name.startsWith(`${sourceRootName}/`)
+    );
+    if (sourceMembers.length <= 1) {
+        throw new Error(
+            'Source archive must contain the prepared libplacebo source snapshot.'
+        );
+    }
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-libplacebo-source-verifier-')
+    );
+    try {
+        const memberListPath = path.join(
+            temporaryRoot,
+            'libplacebo-members.txt'
+        );
+        fs.writeFileSync(
+            memberListPath,
+            `${sourceMembers.map(({ rawName }) => rawName).join('\n')}\n`,
+            {
+                encoding: 'utf8',
+                flag: 'wx',
+                mode: 0o600,
+            }
+        );
+        runCommand(
+            'tar',
+            [
+                '--extract',
+                '--xz',
+                '--file',
+                archivePath,
+                '--directory',
+                temporaryRoot,
+                '--no-same-owner',
+                '--no-same-permissions',
+                '--no-recursion',
+                '-T',
+                memberListPath,
+            ],
+            {
+                encoding: 'utf8',
+                maxBuffer: COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+            }
+        );
+        const sourceSnapshot = inventoryLinuxRuntimeSourceSnapshot(
+            path.join(temporaryRoot, 'git', 'libplacebo')
+        );
+        return validateLinuxRuntimeSourceSnapshot(sourceSnapshot, {
+            expectedSha256: expectedSourceSnapshotSha256,
+        });
+    } finally {
+        fs.rmSync(temporaryRoot, { recursive: true, force: true });
+    }
+}
+
+function inspectSourceCompliance(
+    archivePath,
+    members,
+    runCommand,
+    expectedSourceSnapshotSha256
+) {
+    if ([...members.keys()].some((name) => name.split('/').includes('.git'))) {
+        throw new Error(
+            'Source archive must not contain VCS metadata directories.'
+        );
+    }
+    const expectedToolingNames = SOURCE_TOOLING_FILES.map(
+        ({ archivePath: memberName }) => memberName
+    ).sort();
+    const actualToolingNames = [...members.values()]
+        .filter(
+            ({ isDirectory, name }) =>
+                !isDirectory && name.startsWith('tooling/')
+        )
+        .map(({ name }) => name)
+        .sort();
+    if (!isDeepStrictEqual(actualToolingNames, expectedToolingNames)) {
+        throw new Error(
+            'Source archive must contain the exact released runtime tooling set.'
+        );
+    }
+    for (const toolingFile of SOURCE_TOOLING_FILES) {
+        const archivedContents = readTarMember(
+            archivePath,
+            members,
+            toolingFile.archivePath,
+            runCommand,
+            COMMAND_OUTPUT_MAX_BUFFER_BYTES
+        );
+        const checkoutContents = fs.readFileSync(toolingFile.checkoutPath);
+        if (!archivedContents.equals(checkoutContents)) {
+            throw new Error(
+                `Source archive tooling does not match the released tag: ${toolingFile.archivePath}`
+            );
+        }
+    }
+    const libplaceboSourceSnapshot = inspectLibplaceboSourceSnapshot(
+        archivePath,
+        members,
+        runCommand,
+        expectedSourceSnapshotSha256
+    );
+    const licenseInputManifestName =
+        'license-inputs/linux-runtime-license-inputs.json';
+    const noticeManifestName = 'notices/embedded-mpv-notices.json';
+    const noticeFileName = 'notices/THIRD_PARTY_NOTICES.txt';
+    const licenseInputs = parseJsonMember(
+        readTarMember(
+            archivePath,
+            members,
+            licenseInputManifestName,
+            runCommand,
+            COMMAND_OUTPUT_MAX_BUFFER_BYTES
+        ),
+        licenseInputManifestName
+    );
+    const notices = parseJsonMember(
+        readTarMember(
+            archivePath,
+            members,
+            noticeManifestName,
+            runCommand,
+            COMMAND_OUTPUT_MAX_BUFFER_BYTES
+        ),
+        noticeManifestName
+    );
+    const noticeFile = sourceMemberRecord(
+        archivePath,
+        members,
+        noticeFileName,
+        runCommand,
+        'THIRD_PARTY_NOTICES.txt'
+    );
+    return {
+        libplaceboSourceSnapshot,
+        licenseInputFiles: inspectLegalFiles(
+            archivePath,
+            members,
+            runCommand,
+            'license-inputs',
+            ['linux-runtime-license-inputs.json']
+        ),
+        licenseInputs,
+        noticeFile,
+        noticeLicenseFiles: inspectLegalFiles(
+            archivePath,
+            members,
+            runCommand,
+            'notices',
+            ['embedded-mpv-notices.json', 'THIRD_PARTY_NOTICES.txt']
+        ),
+        notices,
+        toolingValidated: true,
+    };
+}
+
+function parseArchiveChecksumRecords(contents) {
+    const text = contents.toString('utf8');
+    if (!text.endsWith('\n') || text.includes('\r')) {
+        throw new Error(
+            'Source archive checksum manifest must use canonical LF-terminated sha256sum records.'
+        );
+    }
+    const lines = text.slice(0, -1).split('\n');
+    const records = lines.map((line) => {
+        const match = /^([a-f0-9]{64}) {2}([A-Za-z0-9_+.-]+)$/.exec(line);
+        if (!match) {
+            throw new Error(
+                'Source archive checksum manifest contains an invalid record.'
+            );
+        }
+        return {
+            name: match[2],
+            sha256: match[1],
+        };
+    });
+    return normalizeArchiveRecords(records, 'Source archive checksum manifest');
+}
+
+function assertExactSourceArchiveLayout(members, archiveFiles, compliance) {
+    const expectedFiles = new Set([
+        ...archiveFiles.map(({ name }) => `archives/${name}`),
+        ...SOURCE_TOOLING_FILES.map(({ archivePath }) => archivePath),
+        'license-inputs/linux-runtime-license-inputs.json',
+        ...compliance.licenseInputFiles.map(
+            ({ path: relativePath }) => `license-inputs/${relativePath}`
+        ),
+        'metadata/archive-sha256.txt',
+        'metadata/iptvnator-git-revision.txt',
+        'metadata/local-changes.patch',
+        'metadata/runtime-manifest.json',
+        'metadata/source-index.json',
+        'notices/THIRD_PARTY_NOTICES.txt',
+        'notices/embedded-mpv-notices.json',
+        ...compliance.noticeLicenseFiles.map(
+            ({ path: relativePath }) => `notices/${relativePath}`
+        ),
+    ]);
+    const expectedDirectories = new Set(['git']);
+    for (const fileName of expectedFiles) {
+        const parts = fileName.split('/');
+        parts.pop();
+        while (parts.length > 0) {
+            expectedDirectories.add(parts.join('/'));
+            parts.pop();
+        }
+    }
+
+    const sourceRootName = 'git/libplacebo';
+    for (const member of members.values()) {
+        if (
+            member.name === sourceRootName ||
+            member.name.startsWith(`${sourceRootName}/`)
+        ) {
+            if (
+                member.type === 'h' &&
+                !member.linkTarget.startsWith(`${sourceRootName}/`)
+            ) {
+                throw new Error(
+                    `Source archive hardlink leaves the libplacebo snapshot: ${member.name}`
+                );
+            }
+            continue;
+        }
+        if (expectedFiles.has(member.name)) {
+            if (member.type !== '-') {
+                throw new Error(
+                    `Canonical source archive file must be regular: ${member.name}`
+                );
+            }
+            continue;
+        }
+        if (expectedDirectories.has(member.name)) {
+            if (member.type !== 'd') {
+                throw new Error(
+                    `Canonical source archive directory has the wrong type: ${member.name}`
+                );
+            }
+            continue;
+        }
+        throw new Error(
+            `Source archive contains an undeclared source archive member: ${member.name}`
+        );
+    }
+
+    for (const fileName of expectedFiles) {
+        if (members.get(fileName)?.type !== '-') {
+            throw new Error(
+                `Source archive is missing canonical regular file: ${fileName}`
+            );
+        }
+    }
+    for (const directoryName of expectedDirectories) {
+        if (members.get(directoryName)?.type !== 'd') {
+            throw new Error(
+                `Source archive is missing canonical directory: ${directoryName}`
+            );
+        }
+    }
+}
+
+function inspectSourceArchive(
+    archivePath,
+    {
+        expectedSourceSnapshotSha256 = EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+        runCommand = defaultRunCommand,
+    } = {}
+) {
+    const archiveStat = fs.lstatSync(archivePath);
+    if (
+        !archiveStat.isFile() ||
+        archiveStat.isSymbolicLink() ||
+        archiveStat.size === 0 ||
+        archiveStat.size > SOURCE_ARCHIVE_MAX_BYTES
+    ) {
+        throw new Error(
+            'Linux source archive must be a bounded non-empty regular file.'
+        );
+    }
+    const members = listTarMembers(archivePath, runCommand);
+    const readMetadata = (memberName) =>
+        readTarMember(
+            archivePath,
+            members,
+            memberName,
+            runCommand,
+            COMMAND_OUTPUT_MAX_BUFFER_BYTES
+        );
+    const sourceRuntime = parseJsonMember(
+        readMetadata('metadata/runtime-manifest.json'),
+        'metadata/runtime-manifest.json'
+    );
+    const sourceIndex = parseJsonMember(
+        readMetadata('metadata/source-index.json'),
+        'metadata/source-index.json'
+    );
+    const repositoryRevision = readMetadata(
+        'metadata/iptvnator-git-revision.txt'
+    )
+        .toString('utf8')
+        .trim();
+    const localChanges = readMetadata('metadata/local-changes.patch');
+    const archiveMemberNames = [...members.values()]
+        .filter(
+            ({ isDirectory, name }) =>
+                !isDirectory &&
+                name.startsWith('archives/') &&
+                name.split('/').length === 2
+        )
+        .map(({ name }) => name.slice('archives/'.length))
+        .sort();
+    const archiveFiles = archiveMemberNames.map((name) => ({
+        name,
+        sha256: crypto
+            .createHash('sha256')
+            .update(
+                readTarMember(
+                    archivePath,
+                    members,
+                    `archives/${name}`,
+                    runCommand,
+                    SOURCE_MEMBER_MAX_BUFFER_BYTES
+                )
+            )
+            .digest('hex'),
+    }));
+    const archiveChecksums = parseArchiveChecksumRecords(
+        readMetadata('metadata/archive-sha256.txt')
+    );
+    if (
+        !isDeepStrictEqual(
+            archiveChecksums,
+            normalizeArchiveRecords(
+                archiveFiles,
+                'Source archive inspected archives'
+            )
+        )
+    ) {
+        throw new Error(
+            'Source archive checksum manifest does not match the inspected archives.'
+        );
+    }
+    const compliance = inspectSourceCompliance(
+        archivePath,
+        members,
+        runCommand,
+        expectedSourceSnapshotSha256
+    );
+    assertExactSourceArchiveLayout(members, archiveFiles, compliance);
+    return {
+        archiveSha256: sha256File(archivePath),
+        archiveFiles,
+        compliance,
+        localChanges,
+        repositoryRevision,
+        sourceIndex,
+        sourceRuntime,
+    };
+}
+
+function readElfArchitecture(binaryPath) {
+    const descriptor = fs.openSync(binaryPath, 'r');
+    try {
+        const header = Buffer.alloc(20);
+        const bytesRead = fs.readSync(descriptor, header, 0, header.length, 0);
+        if (
+            bytesRead !== header.length ||
+            header[0] !== 0x7f ||
+            header[1] !== 0x45 ||
+            header[2] !== 0x4c ||
+            header[3] !== 0x46 ||
+            ![1, 2].includes(header[4]) ||
+            header[5] !== 1
+        ) {
+            throw new Error('Snap Electron executable is not a supported ELF.');
+        }
+        const machine = header.readUInt16LE(18);
+        if (machine === 62 && header[4] === 2) {
+            return 'x64';
+        }
+        if (machine === 183 && header[4] === 2) {
+            return 'arm64';
+        }
+        if (machine === 40 && header[4] === 1) {
+            return 'arm';
+        }
+        throw new Error(
+            `Snap Electron executable uses unsupported ELF machine ${machine}.`
+        );
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+
+function collectSnapNativePayloads(extractionRoot) {
+    const candidates = [];
+    const pendingDirectories = [extractionRoot];
+    let entryCount = 0;
+    while (pendingDirectories.length > 0) {
+        const directoryPath = pendingDirectories.pop();
+        const entries = fs
+            .readdirSync(directoryPath, { withFileTypes: true })
+            .sort(({ name: left }, { name: right }) =>
+                left.localeCompare(right)
+            );
+        for (const entry of entries) {
+            entryCount += 1;
+            if (entryCount > SNAP_PAYLOAD_ENTRY_LIMIT) {
+                throw new Error(
+                    'Extracted Snap exceeds the release-verifier entry limit.'
+                );
+            }
+            const entryPath = path.join(directoryPath, entry.name);
+            if (entry.isDirectory()) {
+                pendingDirectories.push(entryPath);
+                continue;
+            }
+            if (
+                !entry.isFile() ||
+                ![
+                    FRAME_COPY_MANIFEST_NAME,
+                    FRAME_COPY_UNAVAILABLE_MARKER_NAME,
+                ].includes(entry.name)
+            ) {
+                continue;
+            }
+            const relativePath = path
+                .relative(extractionRoot, entryPath)
+                .split(path.sep)
+                .join('/');
+            const expectedSuffix = `${NATIVE_PAYLOAD_SUFFIX}/${entry.name}`;
+            if (
+                relativePath === expectedSuffix ||
+                relativePath.endsWith(`/${expectedSuffix}`)
+            ) {
+                candidates.push(entryPath);
+            }
+        }
+    }
+    return candidates;
+}
+
+function inspectSquashfsListing(snapPath, runCommand) {
+    const listing = runCommand('unsquashfs', ['-lln', snapPath], {
+        encoding: 'utf8',
+        maxBuffer: SQUASHFS_LIST_MAX_BUFFER_BYTES,
+        timeout: COMMAND_TIMEOUT_MS,
+    });
+    if (typeof listing !== 'string') {
+        throw new Error('Unable to inspect the Snap filesystem listing.');
+    }
+    let entryCount = 0;
+    let extractedBytes = 0;
+    for (const line of listing.split(/\r?\n/).filter(Boolean)) {
+        const match =
+            /^([bcdlps-])\S*\s+\d+\/\d+\s+(\d+)\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+.+$/.exec(
+                line
+            );
+        if (!match || !['-', 'd', 'l'].includes(match[1])) {
+            throw new Error(
+                'Snap filesystem listing contains an invalid entry.'
+            );
+        }
+        entryCount += 1;
+        if (entryCount > SNAP_PAYLOAD_ENTRY_LIMIT) {
+            throw new Error('Snap exceeds the release-verifier entry limit.');
+        }
+        if (match[1] === '-') {
+            extractedBytes += Number(match[2]);
+            if (
+                !Number.isSafeInteger(extractedBytes) ||
+                extractedBytes > SNAP_EXTRACTED_MAX_BYTES
+            ) {
+                throw new Error(
+                    'Snap exceeds the release-verifier extracted-size limit.'
+                );
+            }
+        }
+    }
+    if (entryCount === 0) {
+        throw new Error('Snap filesystem listing must not be empty.');
+    }
+}
+
+function validateSnapReleaseBoundary(extractionRoot) {
+    const output = defaultRunCommand(
+        process.execPath,
+        [SNAP_RELEASE_BOUNDARY_HELPER_PATH, extractionRoot],
+        {
+            encoding: 'utf8',
+            maxBuffer: COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+            timeout: COMMAND_TIMEOUT_MS,
+        }
+    );
+    if (typeof output !== 'string' || !/^[^\r\n]+\n$/.test(output)) {
+        throw new Error(
+            'Snap release-boundary validator must emit exactly one newline-terminated JSON line.'
+        );
+    }
+    let payload;
+    try {
+        payload = JSON.parse(output.slice(0, -1));
+    } catch {
+        throw new Error(
+            'Snap release-boundary validator emitted malformed JSON.'
+        );
+    }
+    if (
+        !isObject(payload) ||
+        !isDeepStrictEqual(Object.keys(payload).sort(), [
+            'errors',
+            'schemaVersion',
+        ]) ||
+        payload.schemaVersion !== SNAP_RELEASE_BOUNDARY_SCHEMA_VERSION ||
+        !Array.isArray(payload.errors) ||
+        payload.errors.some(
+            (error) =>
+                typeof error !== 'string' ||
+                error.length === 0 ||
+                error.length > 4096
+        )
+    ) {
+        throw new Error(
+            'Snap release-boundary validator emitted an invalid result.'
+        );
+    }
+    return payload.errors;
+}
+
+function inspectSnapPayload(
+    snapPath,
+    asset,
+    {
+        runCommand = defaultRunCommand,
+        validatePackagedEmbeddedMpv:
+            validatePackaged = validatePackagedEmbeddedMpv,
+    } = {}
+) {
+    const snapStat = fs.lstatSync(snapPath);
+    if (
+        !snapStat.isFile() ||
+        snapStat.isSymbolicLink() ||
+        snapStat.size === 0 ||
+        snapStat.size > SNAP_ARCHIVE_MAX_BYTES
+    ) {
+        throw new Error(
+            `Snap ${asset.name} must be a bounded non-empty regular file.`
+        );
+    }
+    inspectSquashfsListing(snapPath, runCommand);
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-snap-source-verifier-')
+    );
+    try {
+        const extractionRoot = path.join(temporaryRoot, 'payload');
+        runCommand(
+            'unsquashfs',
+            ['-no-progress', '-dest', extractionRoot, snapPath],
+            {
+                encoding: 'utf8',
+                maxBuffer: COMMAND_OUTPUT_MAX_BUFFER_BYTES,
+                timeout: COMMAND_TIMEOUT_MS,
+            }
+        );
+        const payloads = collectSnapNativePayloads(extractionRoot);
+        const canonicalNativeDirectory = path.join(
+            extractionRoot,
+            'usr',
+            'lib',
+            'iptvnator',
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        const canonicalPayloads = [
+            FRAME_COPY_MANIFEST_NAME,
+            FRAME_COPY_UNAVAILABLE_MARKER_NAME,
+        ]
+            .map((name) => path.join(canonicalNativeDirectory, name))
+            .filter((candidate) => payloads.includes(candidate));
+        if (
+            payloads.length !== 1 ||
+            canonicalPayloads.length !== 1 ||
+            payloads[0] !== canonicalPayloads[0]
+        ) {
+            throw new Error(
+                `Snap ${asset.name} must contain exactly one canonical frame-copy manifest or unavailable marker.`
+            );
+        }
+        const boundaryErrors = validateSnapReleaseBoundary(extractionRoot);
+        if (boundaryErrors.length > 0) {
+            throw new Error(
+                `Snap ${asset.name} failed public-release boundary validation: ${boundaryErrors.join(
+                    '; '
+                )}`
+            );
+        }
+        const payloadPath = canonicalPayloads[0];
+        const resourcesDirectory = path.join(
+            extractionRoot,
+            'usr',
+            'lib',
+            'iptvnator',
+            'resources'
+        );
+        const electronPath = path.join(
+            extractionRoot,
+            'usr',
+            'lib',
+            'iptvnator',
+            'iptvnator.bin'
+        );
+        const electronStat = fs.lstatSync(electronPath);
+        if (
+            !electronStat.isFile() ||
+            electronStat.isSymbolicLink() ||
+            electronStat.size < 20
+        ) {
+            throw new Error(
+                `Snap ${asset.name} is missing its regular Electron executable.`
+            );
+        }
+        const architecture = readElfArchitecture(electronPath);
+        if (path.basename(payloadPath) === FRAME_COPY_MANIFEST_NAME) {
+            const manifestStat = fs.lstatSync(payloadPath);
+            if (
+                !manifestStat.isFile() ||
+                manifestStat.isSymbolicLink() ||
+                manifestStat.size === 0 ||
+                manifestStat.size > COMMAND_OUTPUT_MAX_BUFFER_BYTES
+            ) {
+                throw new Error(
+                    `Snap ${asset.name} contains an invalid frame-copy manifest.`
+                );
+            }
+        }
+        const staticErrors = validatePackaged(resourcesDirectory, {
+            artifactFormat: 'snap',
+            executableName: 'iptvnator',
+            foreignArch: architecture !== 'x64',
+            hostPlatform: 'linux',
+            platform: 'linux',
+            profile: 'portable',
+            required: true,
+            targetArch: architecture,
+            targetNames: ['appimage', 'snap'],
+        });
+        if (!Array.isArray(staticErrors) || staticErrors.length > 0) {
+            throw new Error(
+                `Snap ${asset.name} failed static frame-copy validation${
+                    Array.isArray(staticErrors) && staticErrors.length > 0
+                        ? `: ${staticErrors.join('; ')}`
+                        : '.'
+                }`
+            );
+        }
+        if (path.basename(payloadPath) === FRAME_COPY_UNAVAILABLE_MARKER_NAME) {
+            return {
+                architecture,
+                assetName: asset.name,
+                manifest: null,
+                markerOnly: true,
+            };
+        }
+        let manifest;
+        try {
+            manifest = JSON.parse(fs.readFileSync(payloadPath, 'utf8'));
+        } catch {
+            throw new Error(
+                `Snap ${asset.name} contains malformed frame-copy manifest JSON.`
+            );
+        }
+        return {
+            architecture,
+            assetName: asset.name,
+            manifest,
+            markerOnly: false,
+        };
+    } finally {
+        fs.rmSync(temporaryRoot, { recursive: true, force: true });
+    }
+}
+
+function normalizeArchiveRecords(records, label) {
+    if (!Array.isArray(records) || records.length === 0) {
+        throw new Error(`${label} must contain source archive checksums.`);
+    }
+    const normalized = records.map((record) => {
+        if (
+            !isObject(record) ||
+            !isDeepStrictEqual(Object.keys(record).sort(), [
+                'name',
+                'sha256',
+            ]) ||
+            typeof record.name !== 'string' ||
+            !SAFE_BASENAME_PATTERN.test(record.name) ||
+            typeof record.sha256 !== 'string' ||
+            !SHA256_PATTERN.test(record.sha256)
+        ) {
+            throw new Error(`${label} contains an invalid archive record.`);
+        }
+        return {
+            name: record.name,
+            sha256: record.sha256,
+        };
+    });
+    const names = normalized.map(({ name }) => name);
+    const hashes = normalized.map(({ sha256 }) => sha256);
+    if (
+        new Set(names).size !== names.length ||
+        new Set(hashes).size !== hashes.length
+    ) {
+        throw new Error(`${label} contains duplicate archive records.`);
+    }
+    return normalized.sort(({ name: left }, { name: right }) =>
+        left.localeCompare(right)
+    );
+}
+
+function hasExactFields(value, fields) {
+    return (
+        isObject(value) &&
+        isDeepStrictEqual(Object.keys(value).sort(), [...fields].sort())
+    );
+}
+
+function safeRelativePath(value) {
+    return (
+        typeof value === 'string' &&
+        value.length > 0 &&
+        !value.includes('\\') &&
+        !path.posix.isAbsolute(value) &&
+        value
+            .split('/')
+            .every(
+                (part) =>
+                    part !== '' &&
+                    part !== '.' &&
+                    part !== '..' &&
+                    SAFE_BASENAME_PATTERN.test(part)
+            )
+    );
+}
+
+function normalizeLegalFileRecords(records, label) {
+    if (!Array.isArray(records) || records.length === 0) {
+        throw new Error(`${label} must contain legal files.`);
+    }
+    const normalized = records.map((record) => {
+        if (
+            !hasExactFields(record, ['path', 'sha256', 'size']) ||
+            !safeRelativePath(record.path) ||
+            !record.path.startsWith('licenses/') ||
+            !Number.isSafeInteger(record.size) ||
+            record.size <= 0 ||
+            typeof record.sha256 !== 'string' ||
+            !SHA256_PATTERN.test(record.sha256)
+        ) {
+            throw new Error(`${label} contains an invalid legal file.`);
+        }
+        return { ...record };
+    });
+    const paths = normalized.map(({ path: filePath }) => filePath);
+    if (new Set(paths).size !== paths.length) {
+        throw new Error(`${label} contains duplicate legal files.`);
+    }
+    return normalized.sort(({ path: left }, { path: right }) =>
+        left.localeCompare(right)
+    );
+}
+
+function sourcePackageLegalIdentity(sourcePackage) {
+    return Object.fromEntries(
+        [
+            'version',
+            'sourceUrl',
+            'sourceTag',
+            'sourceSha256',
+            'sourceGitCommit',
+            'license',
+        ]
+            .filter((field) => Object.hasOwn(sourcePackage, field))
+            .map((field) => [field, sourcePackage[field]])
+    );
+}
+
+function verifySourceArchiveCompliance({
+    compliance,
+    sourceIndex,
+    sourceRuntime,
+}) {
+    if (
+        !hasExactFields(compliance, [
+            'libplaceboSourceSnapshot',
+            'licenseInputFiles',
+            'licenseInputs',
+            'noticeFile',
+            'noticeLicenseFiles',
+            'notices',
+            'toolingValidated',
+        ]) ||
+        compliance.toolingValidated !== true
+    ) {
+        throw new Error('Source archive compliance payload is incomplete.');
+    }
+    const { licenseInputs, notices } = compliance;
+    if (
+        !hasExactFields(licenseInputs, [
+            'schemaVersion',
+            'origin',
+            'platform',
+            'arch',
+            'packages',
+        ]) ||
+        licenseInputs.schemaVersion !== 1 ||
+        licenseInputs.origin !== 'pinned-linux-runtime-license-inputs' ||
+        licenseInputs.platform !== 'linux' ||
+        licenseInputs.arch !== 'x64' ||
+        !Array.isArray(licenseInputs.packages) ||
+        !hasExactFields(notices, [
+            'schemaVersion',
+            'origin',
+            'platform',
+            'arch',
+            'noticeFile',
+            'packages',
+            'totalBytes',
+        ]) ||
+        notices.schemaVersion !== 1 ||
+        notices.origin !== 'pinned-linux-runtime-upstream-licenses' ||
+        notices.platform !== 'linux' ||
+        notices.arch !== 'x64' ||
+        !Array.isArray(notices.packages)
+    ) {
+        throw new Error('Source archive compliance manifests are invalid.');
+    }
+    const runtimePackages = sourceRuntime.packages;
+    const runtimePackageIds = Object.keys(runtimePackages).sort();
+    const inputPackages = new Map(
+        licenseInputs.packages.map((record) => [record?.id, record])
+    );
+    const noticePackages = new Map(
+        notices.packages.map((record) => [record?.id, record])
+    );
+    if (
+        inputPackages.size !== licenseInputs.packages.length ||
+        noticePackages.size !== notices.packages.length ||
+        !isDeepStrictEqual(
+            [...inputPackages.keys()].sort(),
+            runtimePackageIds
+        ) ||
+        !isDeepStrictEqual([...noticePackages.keys()].sort(), runtimePackageIds)
+    ) {
+        throw new Error(
+            'Source archive legal package set does not match the runtime.'
+        );
+    }
+    const declaredLegalFiles = [];
+    for (const packageId of runtimePackageIds) {
+        if (!SAFE_BASENAME_PATTERN.test(packageId)) {
+            throw new Error(
+                'Source archive runtime contains an unsafe package id.'
+            );
+        }
+        const identity = sourcePackageLegalIdentity(runtimePackages[packageId]);
+        const inputPackage = inputPackages.get(packageId);
+        const noticePackage = noticePackages.get(packageId);
+        if (
+            !hasExactFields(inputPackage, [
+                'id',
+                ...Object.keys(identity),
+                'files',
+            ]) ||
+            !hasExactFields(noticePackage, [
+                'id',
+                ...Object.keys(identity),
+                'files',
+            ]) ||
+            !Object.entries(identity).every(
+                ([field, value]) =>
+                    isDeepStrictEqual(inputPackage[field], value) &&
+                    isDeepStrictEqual(noticePackage[field], value)
+            ) ||
+            !Array.isArray(inputPackage.files) ||
+            !Array.isArray(noticePackage.files) ||
+            inputPackage.files.length === 0 ||
+            inputPackage.files.length !== noticePackage.files.length
+        ) {
+            throw new Error(
+                `Source archive legal identity is invalid for ${packageId}.`
+            );
+        }
+        const inputFiles = inputPackage.files
+            .map((record) => {
+                if (
+                    !hasExactFields(record, [
+                        'sourcePath',
+                        'path',
+                        'size',
+                        'sha256',
+                    ]) ||
+                    !safeRelativePath(record.sourcePath) ||
+                    record.path !== `licenses/${packageId}/${record.sourcePath}`
+                ) {
+                    throw new Error(
+                        `Source archive license input is invalid for ${packageId}.`
+                    );
+                }
+                return {
+                    path: record.path,
+                    sha256: record.sha256,
+                    size: record.size,
+                };
+            })
+            .sort(({ path: left }, { path: right }) =>
+                left.localeCompare(right)
+            );
+        const noticeFiles = normalizeLegalFileRecords(
+            noticePackage.files,
+            `Source archive notices for ${packageId}`
+        );
+        const normalizedInputFiles = normalizeLegalFileRecords(
+            inputFiles,
+            `Source archive license inputs for ${packageId}`
+        );
+        if (!isDeepStrictEqual(normalizedInputFiles, noticeFiles)) {
+            throw new Error(
+                `Source archive legal files diverge for ${packageId}.`
+            );
+        }
+        declaredLegalFiles.push(...noticeFiles);
+    }
+    const normalizedDeclaredFiles = normalizeLegalFileRecords(
+        declaredLegalFiles,
+        'Source archive declared legal files'
+    );
+    if (
+        !isDeepStrictEqual(
+            normalizeLegalFileRecords(
+                compliance.licenseInputFiles,
+                'Source archive license input contents'
+            ),
+            normalizedDeclaredFiles
+        ) ||
+        !isDeepStrictEqual(
+            normalizeLegalFileRecords(
+                compliance.noticeLicenseFiles,
+                'Source archive notice contents'
+            ),
+            normalizedDeclaredFiles
+        )
+    ) {
+        throw new Error(
+            'Source archive legal contents do not match their manifests.'
+        );
+    }
+    if (
+        !hasExactFields(compliance.noticeFile, ['path', 'sha256', 'size']) ||
+        compliance.noticeFile.path !== 'THIRD_PARTY_NOTICES.txt' ||
+        !Number.isSafeInteger(compliance.noticeFile.size) ||
+        compliance.noticeFile.size <= 0 ||
+        !SHA256_PATTERN.test(compliance.noticeFile.sha256) ||
+        !isDeepStrictEqual(notices.noticeFile, compliance.noticeFile) ||
+        notices.totalBytes !==
+            compliance.noticeFile.size +
+                normalizedDeclaredFiles.reduce(
+                    (total, file) => total + file.size,
+                    0
+                )
+    ) {
+        throw new Error('Source archive aggregate notices are invalid.');
+    }
+    if (
+        !isDeepStrictEqual(sourceIndex.legal, {
+            manifest: 'notices/embedded-mpv-notices.json',
+            noticeFile: notices.noticeFile,
+            packages: notices.packages,
+        })
+    ) {
+        throw new Error(
+            'Source archive legal index does not match its notices.'
+        );
+    }
+}
+
+function verifySnapReleaseSourceBinding(
+    { expectedRepositoryRevision, sourceInspection, snapPayloads },
+    {
+        expectedSourceSnapshotSha256 = EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SNAPSHOT_SHA256,
+        validateRuntimeManifest = validateLinuxRuntimeManifest,
+    } = {}
+) {
+    if (
+        typeof expectedRepositoryRevision !== 'string' ||
+        !GIT_COMMIT_PATTERN.test(expectedRepositoryRevision)
+    ) {
+        throw new Error(
+            'Expected release repository revision must be a full Git commit.'
+        );
+    }
+    if (!isObject(sourceInspection)) {
+        throw new Error('Source archive inspection is missing.');
+    }
+    const {
+        archiveFiles,
+        archiveSha256,
+        compliance,
+        localChanges,
+        repositoryRevision,
+        sourceIndex,
+        sourceRuntime,
+    } = sourceInspection;
+    const runtimeErrors = validateRuntimeManifest(sourceRuntime);
+    if (!Array.isArray(runtimeErrors) || runtimeErrors.length > 0) {
+        throw new Error(
+            `Source archive runtime manifest is invalid${
+                Array.isArray(runtimeErrors) && runtimeErrors.length > 0
+                    ? `: ${runtimeErrors.join('; ')}`
+                    : '.'
+            }`
+        );
+    }
+    if (
+        repositoryRevision !== expectedRepositoryRevision ||
+        !isObject(sourceIndex) ||
+        sourceIndex.repositoryRevision !== expectedRepositoryRevision
+    ) {
+        throw new Error(
+            'Source archive repository revision does not match the released tag.'
+        );
+    }
+    const expectedSourceArchiveBinding = {
+        schemaVersion: SOURCE_ARCHIVE_BINDING_SCHEMA_VERSION,
+        name: SOURCE_ARCHIVE_NAME,
+        sha256: archiveSha256,
+        repositoryRevision,
+    };
+    const sourceArchiveBindingErrors = validateLinuxSourceArchiveBinding(
+        expectedSourceArchiveBinding,
+        {
+            expectedRepositoryRevision,
+            expectedSha256: archiveSha256,
+        }
+    );
+    if (sourceArchiveBindingErrors.length > 0) {
+        throw new Error(
+            `Source archive byte binding is invalid: ${sourceArchiveBindingErrors.join(
+                '; '
+            )}`
+        );
+    }
+    const localChangesLength =
+        typeof localChanges === 'string'
+            ? Buffer.byteLength(localChanges)
+            : localChanges instanceof Uint8Array
+              ? localChanges.byteLength
+              : -1;
+    if (localChangesLength !== 0) {
+        throw new Error(
+            'Source archive must describe a clean released repository revision.'
+        );
+    }
+    if (
+        sourceIndex.schemaVersion !== SOURCE_INDEX_SCHEMA_VERSION ||
+        !isDeepStrictEqual(Object.keys(sourceIndex).sort(), [
+            'archives',
+            'legal',
+            'libplacebo',
+            'repositoryRevision',
+            'schemaVersion',
+            'sourcePackages',
+        ]) ||
+        !isObject(sourceIndex.legal) ||
+        !isDeepStrictEqual(sourceIndex.sourcePackages, sourceRuntime.packages)
+    ) {
+        throw new Error(
+            'Source archive index does not match its runtime manifest.'
+        );
+    }
+    verifySourceArchiveCompliance({
+        compliance,
+        sourceIndex,
+        sourceRuntime,
+    });
+    const libplaceboPackage = sourceRuntime.packages?.libplacebo;
+    const sourceSnapshot = validateLinuxRuntimeSourceSnapshot(
+        compliance.libplaceboSourceSnapshot,
+        {
+            expectedSha256: expectedSourceSnapshotSha256,
+        }
+    );
+    const expectedLibplaceboRecord = {
+        sourceGitCommit: libplaceboPackage?.sourceGitCommit,
+        sourceSubmodules: [...EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES],
+        sourceSnapshot,
+    };
+    if (
+        !isDeepStrictEqual(
+            libplaceboPackage?.sourceSubmodules,
+            EXPECTED_LIBPLACEBO_V7_360_1_SOURCE_SUBMODULES
+        )
+    ) {
+        throw new Error(
+            'Source archive libplacebo submodule records do not match the pinned source identity.'
+        );
+    }
+    if (
+        !GIT_COMMIT_PATTERN.test(
+            expectedLibplaceboRecord.sourceGitCommit ?? ''
+        ) ||
+        !isDeepStrictEqual(sourceIndex.libplacebo, expectedLibplaceboRecord)
+    ) {
+        throw new Error(
+            'Source archive libplacebo identity does not match its runtime manifest.'
+        );
+    }
+    const indexedArchives = normalizeArchiveRecords(
+        sourceIndex.archives,
+        'Source archive index'
+    );
+    const inspectedArchives = normalizeArchiveRecords(
+        archiveFiles,
+        'Source archive contents'
+    );
+    if (!isDeepStrictEqual(inspectedArchives, indexedArchives)) {
+        throw new Error(
+            'Source archive checksums do not match its source index.'
+        );
+    }
+    const expectedArchiveHashes = Object.values(sourceRuntime.packages ?? {})
+        .filter(
+            (sourcePackage) =>
+                isObject(sourcePackage) &&
+                Object.hasOwn(sourcePackage, 'sourceSha256')
+        )
+        .map((sourcePackage) => sourcePackage.sourceSha256)
+        .sort();
+    const indexedArchiveHashes = indexedArchives
+        .map(({ sha256 }) => sha256)
+        .sort();
+    if (
+        expectedArchiveHashes.length === 0 ||
+        expectedArchiveHashes.some(
+            (sha256) =>
+                typeof sha256 !== 'string' || !SHA256_PATTERN.test(sha256)
+        ) ||
+        new Set(expectedArchiveHashes).size !== expectedArchiveHashes.length ||
+        !isDeepStrictEqual(indexedArchiveHashes, expectedArchiveHashes)
+    ) {
+        throw new Error(
+            'Source archive checksums do not match the pinned runtime packages.'
+        );
+    }
+    if (!Array.isArray(snapPayloads) || snapPayloads.length === 0) {
+        throw new Error('Every selected Snap must be inspected.');
+    }
+    const assetNames = new Set();
+    let x64SnapCount = 0;
+    for (const payload of snapPayloads) {
+        if (
+            !isObject(payload) ||
+            typeof payload.assetName !== 'string' ||
+            payload.assetName.length === 0 ||
+            assetNames.has(payload.assetName)
+        ) {
+            throw new Error('Selected Snap inspections must be unique.');
+        }
+        assetNames.add(payload.assetName);
+        if (payload.architecture === 'x64') {
+            x64SnapCount += 1;
+            if (payload.markerOnly !== false || !isObject(payload.manifest)) {
+                throw new Error(
+                    `x64 Snap ${payload.assetName} must contain the frame-copy runtime.`
+                );
+            }
+            const manifest = payload.manifest;
+            if (
+                manifest.platform !== 'linux' ||
+                manifest.arch !== 'x64' ||
+                manifest.profile !== 'portable' ||
+                manifest.runtimeMode !== 'bundled' ||
+                !Array.isArray(manifest.targets) ||
+                !manifest.targets.includes('snap') ||
+                !isDeepStrictEqual(
+                    manifest.sourceArchive,
+                    expectedSourceArchiveBinding
+                )
+            ) {
+                throw new Error(
+                    `x64 Snap ${payload.assetName} has an invalid frame-copy source archive binding.`
+                );
+            }
+            if (!isDeepStrictEqual(manifest.sourceRuntime, sourceRuntime)) {
+                throw new Error(
+                    `Snap source runtime does not match source archive: ${payload.assetName}`
+                );
+            }
+            continue;
+        }
+        if (
+            !['arm', 'arm64'].includes(payload.architecture) ||
+            payload.markerOnly !== true ||
+            payload.manifest !== null
+        ) {
+            throw new Error(
+                `Non-x64 Snap ${payload.assetName} must remain marker-only.`
+            );
+        }
+    }
+    if (x64SnapCount !== 1) {
+        throw new Error(
+            `Public release must contain exactly one x64 Snap; received ${x64SnapCount}.`
+        );
+    }
+    return true;
+}
+
+module.exports = {
+    inspectSnapPayload,
+    inspectSourceArchive,
+    verifySnapReleaseSourceBinding,
+};
diff --git a/tools/packaging/snap-workflow-policy.test-helpers.mjs b/tools/packaging/snap-workflow-policy.test-helpers.mjs
new file mode 100644
index 000000000..5fc55b065
--- /dev/null
+++ b/tools/packaging/snap-workflow-policy.test-helpers.mjs
@@ -0,0 +1,564 @@
+import assert from 'node:assert/strict';
+import { parse } from 'yaml';
+
+const PINNED_CHECKOUT_ACTION =
+    'actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1';
+const PINNED_UPLOAD_ARTIFACT_ACTION =
+    'actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a';
+const PINNED_DOWNLOAD_ARTIFACT_ACTION =
+    'actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c';
+const PUBLISH_ACTION_ALLOWLIST = Object.freeze([
+    PINNED_CHECKOUT_ACTION,
+    PINNED_DOWNLOAD_ARTIFACT_ACTION,
+    PINNED_UPLOAD_ARTIFACT_ACTION,
+]);
+const BUILD_ACTION_ALLOWLIST = Object.freeze([
+    'actions/cache/restore@v4',
+    'actions/cache/save@v4',
+    'actions/cache@v4',
+    'actions/checkout@v7',
+    'actions/download-artifact@v8',
+    'actions/setup-node@v4',
+    'actions/upload-artifact@v7',
+    'pnpm/action-setup@v4',
+    'softprops/action-gh-release@v2',
+]);
+const VERIFY_JOB_ID = 'verify-snap';
+const PUBLISH_JOB_ID = 'publish-snap';
+const VERIFY_JOB_CONDITION =
+    "${{ startsWith(github.event.release.tag_name, 'v') && github.event.release.draft == false }}";
+const PUBLISH_JOB_CONDITION =
+    "${{ needs.verify-snap.result == 'success' && startsWith(github.event.release.tag_name, 'v') && github.event.release.draft == false }}";
+const VERIFIED_RELEASE_ARTIFACT_NAME = 'verified-snap-release-assets';
+const PUBLISH_STEP_NAME = 'Publish all public-release snaps to edge';
+const PUBLISH_CHECKOUT_STEP_NAME = 'Checkout released tooling';
+const PUBLISH_CHECKOUT_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_CHECKOUT_STEP_NAME,
+    uses: PINNED_CHECKOUT_ACTION,
+    with: {
+        ref: '${{ github.event.release.tag_name }}',
+        'persist-credentials': false,
+    },
+});
+const PUBLISH_SNAPCRAFT_SETUP_STEP_NAME = 'Install Snapcraft';
+const PUBLISH_SNAPCRAFT_SETUP_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_SNAPCRAFT_SETUP_STEP_NAME,
+    shell: 'bash',
+    run: [
+        'set -euo pipefail',
+        '',
+        'sudo snap install snapcraft --classic --channel=stable',
+        '',
+    ].join('\n'),
+});
+const VERIFY_ARTIFACT_UPLOAD_STEP_NAME = 'Transfer verified release assets';
+const VERIFY_ARTIFACT_UPLOAD_STEP_CONTRACT = Object.freeze({
+    name: VERIFY_ARTIFACT_UPLOAD_STEP_NAME,
+    uses: PINNED_UPLOAD_ARTIFACT_ACTION,
+    with: {
+        name: VERIFIED_RELEASE_ARTIFACT_NAME,
+        path: '/var/lib/iptvnator-snap-release/assets',
+        'if-no-files-found': 'error',
+        'retention-days': 1,
+        'compression-level': 0,
+        'include-hidden-files': true,
+    },
+});
+const PUBLISH_ARTIFACT_DOWNLOAD_STEP_NAME = 'Download verified release assets';
+const PUBLISH_ARTIFACT_DOWNLOAD_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_ARTIFACT_DOWNLOAD_STEP_NAME,
+    uses: PINNED_DOWNLOAD_ARTIFACT_ACTION,
+    with: {
+        name: VERIFIED_RELEASE_ARTIFACT_NAME,
+        path: '${{ runner.temp }}/verified-snap-release-assets',
+    },
+});
+const PUBLISH_SEALED_VERIFY_STEP_NAME = 'Reverify sealed public release assets';
+const PUBLISH_SEALED_VERIFY_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_SEALED_VERIFY_STEP_NAME,
+    shell: 'bash',
+    run: [
+        'set -euo pipefail',
+        '',
+        'VERIFIED_ASSET_DIRECTORY="/var/lib/iptvnator-snap-release/assets"',
+        'node tools/packaging/release-snap-assets.cjs verify-sealed \\',
+        '    --manifest "${RUNNER_TEMP}/selected-snap-release-assets.json" \\',
+        '    --directory "${VERIFIED_ASSET_DIRECTORY}" \\',
+        '    --receipt "${VERIFIED_ASSET_DIRECTORY}/verified-release-assets.json" \\',
+        '    --repository-revision "$(git rev-parse HEAD)"',
+        '',
+    ].join('\n'),
+});
+const VERIFY_TRANSFER_BINDING_STEP_NAME = 'Bind verified release transfer';
+const VERIFY_TRANSFER_BINDING_STEP_CONTRACT = Object.freeze({
+    name: VERIFY_TRANSFER_BINDING_STEP_NAME,
+    id: 'bind-transfer',
+    shell: 'bash',
+    run: [
+        'set -euo pipefail',
+        '',
+        'RECEIPT_PATH="/var/lib/iptvnator-snap-release/assets/verified-release-assets.json"',
+        'RECEIPT_RECORD="$(/usr/bin/sha256sum --binary "${RECEIPT_PATH}")"',
+        'RECEIPT_SHA256="${RECEIPT_RECORD%% *}"',
+        '[[ "${RECEIPT_SHA256}" =~ ^[a-f0-9]{64}$ ]]',
+        `printf 'receipt-sha256=%s\\n' "\${RECEIPT_SHA256}" >> "\${GITHUB_OUTPUT}"`,
+        '',
+    ].join('\n'),
+});
+const PUBLISH_TRANSFER_VERIFY_STEP_NAME =
+    'Seal transferred public release assets';
+const PUBLISH_TRANSFER_VERIFY_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_TRANSFER_VERIFY_STEP_NAME,
+    shell: 'bash',
+    env: {
+        EXPECTED_RECEIPT_SHA256:
+            '${{ needs.verify-snap.outputs.receipt-sha256 }}',
+    },
+    run: [
+        'set -euo pipefail',
+        '',
+        'TRANSFERRED_ASSET_DIRECTORY="${RUNNER_TEMP}/verified-snap-release-assets"',
+        'SEALED_ASSET_PARENT="/var/lib/iptvnator-snap-release"',
+        'SEALED_ASSET_DIRECTORY="${SEALED_ASSET_PARENT}/assets"',
+        'test -d "${TRANSFERRED_ASSET_DIRECTORY}"',
+        'test ! -L "${TRANSFERRED_ASSET_DIRECTORY}"',
+        'shopt -s nullglob dotglob',
+        'TRANSFERRED_FILES=("${TRANSFERRED_ASSET_DIRECTORY}"/*)',
+        'TRANSFERRED_SNAPS=("${TRANSFERRED_ASSET_DIRECTORY}"/*.snap)',
+        'test "${#TRANSFERRED_SNAPS[@]}" -gt 0',
+        'test "${#TRANSFERRED_FILES[@]}" -eq "$(( ${#TRANSFERRED_SNAPS[@]} + 2 ))"',
+        'test -f "${TRANSFERRED_ASSET_DIRECTORY}/linux-frame-copy-runtime-sources.tar.xz"',
+        'test ! -L "${TRANSFERRED_ASSET_DIRECTORY}/linux-frame-copy-runtime-sources.tar.xz"',
+        'test -f "${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"',
+        'test ! -L "${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"',
+        'for ASSET_FILE in "${TRANSFERRED_FILES[@]}"; do',
+        '    test -f "${ASSET_FILE}"',
+        '    test ! -L "${ASSET_FILE}"',
+        'done',
+        'RECEIPT_PATH="${TRANSFERRED_ASSET_DIRECTORY}/verified-release-assets.json"',
+        'RECEIPT_RECORD="$(/usr/bin/sha256sum --binary "${RECEIPT_PATH}")"',
+        'ACTUAL_RECEIPT_SHA256="${RECEIPT_RECORD%% *}"',
+        '[[ "${EXPECTED_RECEIPT_SHA256}" =~ ^[a-f0-9]{64}$ ]]',
+        'test "${ACTUAL_RECEIPT_SHA256}" = "${EXPECTED_RECEIPT_SHA256}"',
+        "/usr/bin/jq --exit-status '",
+        '    type == "object" and',
+        '    (keys == ["assets", "repositoryRevision", "schemaVersion"]) and',
+        '    (.schemaVersion == 1) and',
+        '    (.repositoryRevision |',
+        '        type == "string" and test("^[a-f0-9]{40,64}$")) and',
+        '    (.assets | type == "array" and length >= 2) and',
+        '    (.assets | all(.[];',
+        '        type == "object" and',
+        '        (keys == ["id", "name", "sha256", "size"]) and',
+        '        (.id |',
+        '            type == "number" and . > 0 and',
+        '            . <= 9007199254740991 and . == floor) and',
+        '        (.name |',
+        '            type == "string" and length > 0 and',
+        '            . != "." and . != ".." and',
+        '            (contains("/") | not) and',
+        '            (contains("\\\\") | not) and',
+        '            (explode | all(.[]; . > 31 and . != 127))) and',
+        '        (.sha256 |',
+        '            type == "string" and test("^[a-f0-9]{64}$")) and',
+        '        (.size |',
+        '            type == "number" and . > 0 and',
+        '            . <= 9007199254740991 and . == floor))) and',
+        '    ([.assets[].name] | length == (unique | length)) and',
+        '    ([.assets[] |',
+        '        select(.name == "linux-frame-copy-runtime-sources.tar.xz")] |',
+        '        length == 1) and',
+        '    ([.assets[] | select(.name | endswith(".snap"))] |',
+        '        length >= 1) and',
+        '    (.assets | all(.[];',
+        '        .name == "linux-frame-copy-runtime-sources.tar.xz" or',
+        '        (.name | endswith(".snap"))))',
+        '\' "${RECEIPT_PATH}" > /dev/null',
+        `RECEIPT_ASSET_COUNT="$(/usr/bin/jq --raw-output '.assets | length' "\${RECEIPT_PATH}")"`,
+        'test "${RECEIPT_ASSET_COUNT}" -eq "$(( ${#TRANSFERRED_SNAPS[@]} + 1 ))"',
+        'SIZE_MANIFEST="${RUNNER_TEMP}/verified-release-asset-sizes.tsv"',
+        'CHECKSUM_MANIFEST="${RUNNER_TEMP}/verified-release-asset-checksums.txt"',
+        'umask 077',
+        '/usr/bin/jq --raw-output \\',
+        `    '.assets[] | [.name, (.size | tostring)] | @tsv' \\`,
+        '    "${RECEIPT_PATH}" > "${SIZE_MANIFEST}"',
+        `while IFS=$'\\t' read -r ASSET_NAME EXPECTED_SIZE; do`,
+        '    ASSET_PATH="${TRANSFERRED_ASSET_DIRECTORY}/${ASSET_NAME}"',
+        '    ACTUAL_SIZE="$(/usr/bin/stat --format=%s -- "${ASSET_PATH}")"',
+        '    test "${ACTUAL_SIZE}" = "${EXPECTED_SIZE}"',
+        'done < "${SIZE_MANIFEST}"',
+        '/usr/bin/jq --raw-output \\',
+        `    '.assets[] | "\\(.sha256)  \\(.name)"' \\`,
+        '    "${RECEIPT_PATH}" > "${CHECKSUM_MANIFEST}"',
+        '(',
+        '    cd "${TRANSFERRED_ASSET_DIRECTORY}"',
+        '    /usr/bin/sha256sum --strict --check "${CHECKSUM_MANIFEST}"',
+        ')',
+        'rm -f "${SIZE_MANIFEST}" "${CHECKSUM_MANIFEST}"',
+        'shopt -u nullglob dotglob',
+        'sudo test ! -e "${SEALED_ASSET_PARENT}"',
+        'sudo install -d -m 0700 -o root -g root "${SEALED_ASSET_PARENT}"',
+        'sudo mv "${TRANSFERRED_ASSET_DIRECTORY}" "${SEALED_ASSET_DIRECTORY}"',
+        'sudo chown -R root:root "${SEALED_ASSET_DIRECTORY}"',
+        'sudo find "${SEALED_ASSET_DIRECTORY}" -type d -exec chmod 0555 {} +',
+        'sudo find "${SEALED_ASSET_DIRECTORY}" -type f -exec chmod 0444 {} +',
+        'sudo chmod 0555 "${SEALED_ASSET_PARENT}"',
+        '',
+    ].join('\n'),
+});
+const PUBLISH_STEP_CONTRACT = Object.freeze({
+    name: PUBLISH_STEP_NAME,
+    shell: 'bash',
+    env: {
+        SNAPCRAFT_STORE_CREDENTIALS: '${{ secrets.snapcraft_token }}',
+    },
+    run: [
+        'set -euo pipefail',
+        '',
+        'VERIFIED_ASSET_DIRECTORY="/var/lib/iptvnator-snap-release/assets"',
+        'STORE_CREDENTIALS="${SNAPCRAFT_STORE_CREDENTIALS}"',
+        'unset SNAPCRAFT_STORE_CREDENTIALS',
+        'shopt -s nullglob dotglob',
+        'SNAP_FILES=("${VERIFIED_ASSET_DIRECTORY}"/*.snap)',
+        'test "${#SNAP_FILES[@]}" -gt 0',
+        'for SNAP_FILE in "${SNAP_FILES[@]}"; do',
+        '    SNAP_NAME="${SNAP_FILE##*/}"',
+        '    echo "Publishing public release asset: ${SNAP_NAME}"',
+        '    # Candidate/stable promotion is manual after installed-Snap frame-copy and missing-runtime fallback smoke.',
+        '    # GitHub Actions never promotes automatically.',
+        '    SNAPCRAFT_STORE_CREDENTIALS="${STORE_CREDENTIALS}" /snap/bin/snapcraft upload --release=edge "${SNAP_FILE}"',
+        'done',
+        'unset STORE_CREDENTIALS',
+        'shopt -u nullglob dotglob',
+        '',
+    ].join('\n'),
+});
+
+function stripShellComment(line) {
+    let quote = null;
+    for (let index = 0; index < line.length; index += 1) {
+        const character = line[index];
+        if (quote === "'") {
+            if (character === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (character === '\\') {
+            index += 1;
+            continue;
+        }
+        if (quote === '"') {
+            if (character === quote) {
+                quote = null;
+            }
+            continue;
+        }
+        if (character === "'" || character === '"') {
+            quote = character;
+            continue;
+        }
+        if (
+            character === '#' &&
+            (index === 0 || /[\s;|&()]/.test(line[index - 1]))
+        ) {
+            return line.slice(0, index);
+        }
+    }
+    return line;
+}
+
+function isRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function normalizeRunSource(runSource) {
+    return runSource
+        .split('\n')
+        .map(stripShellComment)
+        .join('\n')
+        .replace(/\\\r?\n[ \t]*/g, '');
+}
+
+function collectDefaultShell(container, containerName, explicitShells) {
+    if (!Object.hasOwn(container, 'defaults')) {
+        return;
+    }
+    assert.ok(
+        isRecord(container.defaults),
+        `${containerName} defaults must be a mapping`
+    );
+    if (!Object.hasOwn(container.defaults, 'run')) {
+        return;
+    }
+    assert.ok(
+        isRecord(container.defaults.run),
+        `${containerName} run defaults must be a mapping`
+    );
+    if (!Object.hasOwn(container.defaults.run, 'shell')) {
+        return;
+    }
+    assert.equal(
+        typeof container.defaults.run.shell,
+        'string',
+        `${containerName} default shell must resolve to a string`
+    );
+    explicitShells.push(container.defaults.run.shell);
+}
+
+function collectWorkflowPolicyInputs(workflowText) {
+    const workflow = parse(workflowText);
+    assert.ok(isRecord(workflow), 'workflow must be a YAML mapping');
+    assert.ok(isRecord(workflow.jobs), 'workflow jobs must be a YAML mapping');
+
+    const actions = [];
+    const explicitShells = [];
+    const jobActions = [];
+    const jobsWithoutSteps = [];
+    const runSources = [];
+    collectDefaultShell(workflow, 'workflow', explicitShells);
+    for (const [jobName, job] of Object.entries(workflow.jobs)) {
+        assert.ok(isRecord(job), `workflow job "${jobName}" must be a mapping`);
+        collectDefaultShell(job, `workflow job "${jobName}"`, explicitShells);
+        if (Object.hasOwn(job, 'uses')) {
+            assert.equal(
+                typeof job.uses,
+                'string',
+                'reusable workflow identifiers must resolve to strings'
+            );
+            jobActions.push(job.uses);
+        }
+        if (!Array.isArray(job.steps)) {
+            jobsWithoutSteps.push(jobName);
+            continue;
+        }
+        for (const step of job.steps) {
+            assert.ok(isRecord(step), 'workflow steps must be mappings');
+            if (Object.hasOwn(step, 'uses')) {
+                assert.equal(
+                    typeof step.uses,
+                    'string',
+                    'workflow action identifiers must resolve to strings'
+                );
+                actions.push(step.uses);
+            }
+            if (Object.hasOwn(step, 'run')) {
+                assert.equal(
+                    typeof step.run,
+                    'string',
+                    'workflow run commands must resolve to strings'
+                );
+                runSources.push(normalizeRunSource(step.run));
+            }
+            if (Object.hasOwn(step, 'shell')) {
+                assert.equal(
+                    typeof step.shell,
+                    'string',
+                    'workflow step shells must resolve to strings'
+                );
+                explicitShells.push(step.shell);
+            }
+        }
+    }
+
+    return {
+        actions,
+        commandSource: runSources.join('\n'),
+        explicitShells,
+        jobActions,
+        jobsWithoutSteps,
+        workflow,
+    };
+}
+
+function assertWorkflowExecutionShape({
+    explicitShells,
+    jobActions,
+    jobsWithoutSteps,
+}) {
+    assert.deepEqual(
+        jobActions,
+        [],
+        'job-level reusable workflow delegation is not allowed'
+    );
+    assert.deepEqual(
+        jobsWithoutSteps,
+        [],
+        'every workflow job must define a concrete steps sequence'
+    );
+    assert.deepEqual(
+        explicitShells.filter((shell) => shell !== 'bash'),
+        [],
+        'every explicit workflow shell must be exactly "bash"'
+    );
+}
+
+function literalSnapcraftTokens(commandSource) {
+    return commandSource.match(/\bsnapcraft\b/g) ?? [];
+}
+
+export function assertPublishSnapWorkflowPolicy(workflowText) {
+    const policyInputs = collectWorkflowPolicyInputs(workflowText);
+    const { actions, commandSource, workflow } = policyInputs;
+    assertWorkflowExecutionShape(policyInputs);
+    assert.deepEqual(
+        workflow.on,
+        { release: { types: ['published'] } },
+        'the publish workflow must retain its exact release trigger'
+    );
+    assert.deepEqual(
+        Object.keys(workflow).sort(),
+        ['jobs', 'name', 'on', 'permissions'],
+        'the publish workflow must not add global execution or environment surfaces'
+    );
+    assert.deepEqual(
+        workflow.permissions,
+        { contents: 'read' },
+        'the publish workflow must retain read-only repository permissions'
+    );
+    assert.deepEqual(
+        [...actions].sort(),
+        [...PUBLISH_ACTION_ALLOWLIST].sort(),
+        'the publish workflow must use exactly the allowlisted actions'
+    );
+    assert.deepEqual(
+        Object.keys(workflow.jobs),
+        [VERIFY_JOB_ID, PUBLISH_JOB_ID],
+        'the publish workflow must isolate verification and credentialed upload on two exact jobs'
+    );
+    const verifyJob = workflow.jobs[VERIFY_JOB_ID];
+    const publishJob = workflow.jobs[PUBLISH_JOB_ID];
+    assert.ok(isRecord(verifyJob), 'the canonical verification job must exist');
+    assert.ok(isRecord(publishJob), 'the canonical publish job must exist');
+    assert.deepEqual(
+        Object.keys(verifyJob).sort(),
+        ['env', 'if', 'name', 'outputs', 'runs-on', 'steps', 'timeout-minutes'],
+        'the verification job must retain its exact execution surface'
+    );
+    assert.deepEqual(
+        verifyJob.env,
+        {
+            SOURCE_ARCHIVE_NAME: 'linux-frame-copy-runtime-sources.tar.xz',
+        },
+        'the verification job must expose only the fixed source archive name'
+    );
+    assert.deepEqual(
+        verifyJob.outputs,
+        {
+            'receipt-sha256':
+                '${{ steps.bind-transfer.outputs.receipt-sha256 }}',
+        },
+        'the verification job must expose only the separately bound receipt digest'
+    );
+    assert.deepEqual(
+        Object.keys(publishJob).sort(),
+        ['if', 'name', 'needs', 'runs-on', 'steps', 'timeout-minutes'],
+        'the fresh credentialed job must retain its exact execution surface'
+    );
+    assert.equal(
+        verifyJob['runs-on'],
+        'ubuntu-latest',
+        'the verification job must use a fresh GitHub-hosted runner'
+    );
+    assert.equal(
+        publishJob['runs-on'],
+        'ubuntu-latest',
+        'the credentialed job must use a separate fresh GitHub-hosted runner'
+    );
+    assert.equal(
+        verifyJob['timeout-minutes'],
+        45,
+        'the verification job must retain its bounded timeout'
+    );
+    assert.equal(
+        publishJob['timeout-minutes'],
+        20,
+        'the credentialed job must retain its bounded timeout'
+    );
+    assert.equal(
+        verifyJob.if,
+        VERIFY_JOB_CONDITION,
+        'the verification job must retain its exact release condition'
+    );
+    assert.equal(
+        publishJob.needs,
+        VERIFY_JOB_ID,
+        'the publish job must depend on successful isolated verification'
+    );
+    assert.equal(
+        publishJob.if,
+        PUBLISH_JOB_CONDITION,
+        'the publish job must retain its exact verified-release condition'
+    );
+    assert.deepEqual(
+        verifyJob.steps.filter(
+            (step) => step.name === PUBLISH_CHECKOUT_STEP_NAME
+        ),
+        [PUBLISH_CHECKOUT_STEP_CONTRACT],
+        'the publish workflow must checkout released tooling without persisting repository credentials'
+    );
+    assert.deepEqual(
+        verifyJob.steps.filter(
+            (step) => step.name === PUBLISH_SEALED_VERIFY_STEP_NAME
+        ),
+        [PUBLISH_SEALED_VERIFY_STEP_CONTRACT],
+        'the verification job must fully verify root-sealed assets before transfer'
+    );
+    assert.deepEqual(
+        verifyJob.steps.filter(
+            (step) => step.name === VERIFY_ARTIFACT_UPLOAD_STEP_NAME
+        ),
+        [VERIFY_ARTIFACT_UPLOAD_STEP_CONTRACT],
+        'the verification job must transfer only the root-sealed verified data artifact'
+    );
+    assert.deepEqual(
+        verifyJob.steps.filter(
+            (step) => step.name === VERIFY_TRANSFER_BINDING_STEP_NAME
+        ),
+        [VERIFY_TRANSFER_BINDING_STEP_CONTRACT],
+        'the verification job must bind the exact receipt outside artifact transport'
+    );
+    assert.deepEqual(
+        publishJob.steps,
+        [
+            PUBLISH_ARTIFACT_DOWNLOAD_STEP_CONTRACT,
+            PUBLISH_TRANSFER_VERIFY_STEP_CONTRACT,
+            PUBLISH_SNAPCRAFT_SETUP_STEP_CONTRACT,
+            PUBLISH_STEP_CONTRACT,
+        ],
+        'the fresh publish runner must only download, validate, seal, install Snapcraft, and upload'
+    );
+    assert.equal(
+        JSON.stringify(verifyJob).includes('snapcraft_token'),
+        false,
+        'the release-tag verification job must never receive the Store credential'
+    );
+    assert.equal(
+        publishJob.steps
+            .slice(0, -1)
+            .some((step) => JSON.stringify(step).includes('snapcraft_token')),
+        false,
+        'only the final credentialed upload step may receive the Store credential'
+    );
+    assert.equal(
+        literalSnapcraftTokens(commandSource).length,
+        2,
+        'the publish workflow must contain exactly the reviewed install and upload Snapcraft commands'
+    );
+}
+
+export function assertBuildSnapWorkflowPolicy(workflowText) {
+    const policyInputs = collectWorkflowPolicyInputs(workflowText);
+    const { actions, commandSource } = policyInputs;
+    assertWorkflowExecutionShape(policyInputs);
+    assert.deepEqual(
+        actions.filter((action) => !BUILD_ACTION_ALLOWLIST.includes(action)),
+        [],
+        'the build workflow must use only allowlisted actions'
+    );
+    assert.equal(
+        literalSnapcraftTokens(commandSource).length,
+        0,
+        'the build workflow must not contain a literal Snapcraft token'
+    );
+}
diff --git a/tools/packaging/validate-snap-release-boundary.mjs b/tools/packaging/validate-snap-release-boundary.mjs
new file mode 100644
index 000000000..2a98df1c8
--- /dev/null
+++ b/tools/packaging/validate-snap-release-boundary.mjs
@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import {
+    collectEmbeddedMpvNativeArchiveEntries,
+    listAsarPackageEntries,
+} from './asar-dependency-closure.mjs';
+import { validateExtractedSnapMetadata } from './verify-linux-frame-copy-runtime.mjs';
+
+const scriptPath = fileURLToPath(import.meta.url);
+const SNAP_RELEASE_BOUNDARY_SCHEMA_VERSION = 1;
+
+export function validateExtractedSnapReleaseBoundary(
+    extractionRoot,
+    { asarListPackage = listAsarPackageEntries } = {}
+) {
+    const errors = [...validateExtractedSnapMetadata(extractionRoot)];
+    const asarPath = path.join(
+        extractionRoot,
+        'usr',
+        'lib',
+        'iptvnator',
+        'resources',
+        'app.asar'
+    );
+    let asarStat;
+    try {
+        asarStat = fs.lstatSync(asarPath);
+    } catch {
+        errors.push(
+            `Public-release Snap must contain its canonical app.asar: ${asarPath}`
+        );
+        return errors;
+    }
+    if (
+        !asarStat.isFile() ||
+        asarStat.isSymbolicLink() ||
+        asarStat.size === 0
+    ) {
+        errors.push(
+            `Public-release Snap app.asar must be a non-empty regular file: ${asarPath}`
+        );
+        return errors;
+    }
+
+    let nativeEntries;
+    try {
+        nativeEntries = collectEmbeddedMpvNativeArchiveEntries(
+            asarListPackage(asarPath)
+        );
+    } catch (error) {
+        errors.push(
+            `Unable to inspect public-release Snap app.asar at ${asarPath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return errors;
+    }
+    if (nativeEntries.length > 0) {
+        errors.push(
+            `Public-release Snap app.asar must not contain embedded MPV native payloads: ${nativeEntries.join(
+                ', '
+            )}`
+        );
+    }
+    return errors;
+}
+
+function main() {
+    const args = process.argv.slice(2);
+    if (args.length !== 1 || args[0].length === 0) {
+        throw new Error(
+            'Usage: validate-snap-release-boundary.mjs <extracted-snap-root>'
+        );
+    }
+    const errors = validateExtractedSnapReleaseBoundary(path.resolve(args[0]));
+    process.stdout.write(
+        `${JSON.stringify({
+            schemaVersion: SNAP_RELEASE_BOUNDARY_SCHEMA_VERSION,
+            errors,
+        })}\n`
+    );
+}
+
+function isMainModule() {
+    if (!process.argv[1]) {
+        return false;
+    }
+    try {
+        return fs.realpathSync(process.argv[1]) === fs.realpathSync(scriptPath);
+    } catch {
+        return false;
+    }
+}
+
+if (isMainModule()) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
diff --git a/tools/packaging/verify-electron-package-layout.mjs b/tools/packaging/verify-electron-package-layout.mjs
index 05a0deded..40a709c6f 100644
--- a/tools/packaging/verify-electron-package-layout.mjs
+++ b/tools/packaging/verify-electron-package-layout.mjs
@@ -3,15 +3,25 @@ import { createRequire } from 'module';
 import path from 'path';
 
 import { buildElectronBuilderMetadata } from './generate-electron-builder-metadata.mjs';
-import { inspectPackagedDependencyClosure } from './asar-dependency-closure.mjs';
+import {
+    collectEmbeddedMpvNativeArchiveEntries,
+    inspectPackagedDependencyClosure,
+} from './asar-dependency-closure.mjs';
 
 const require = createRequire(import.meta.url);
 const { extractFile, listPackage } = require('@electron/asar');
 const {
-    getEmbeddedMpvAddonArch,
     linuxUnpackedDirArch,
+    resolveConfiguredLinuxTargetNames,
     validatePackagedEmbeddedMpv,
 } = require('./embedded-mpv-packaging.cjs');
+const {
+    validateLinuxProfileTargets,
+} = require('./linux-frame-copy-profile.cjs');
+const { resolveLinuxLauncherLayout } = require('./linux-launcher-layout.cjs');
+const {
+    validateFlatpakLauncher,
+} = require('./flatpak-launcher-validation.cjs');
 const args = process.argv.slice(2);
 const normalizedArgs = args[0] === '--' ? args.slice(1) : args;
 const [platform, arch = ''] = normalizedArgs;
@@ -53,6 +63,8 @@ const snapConfigInspection = loadSnapConfigInspection();
 const embeddedMpvRequired = isTruthy(
     process.env.IPTVNATOR_REQUIRE_EMBEDDED_MPV
 );
+const linuxFrameCopyProfile =
+    process.env.IPTVNATOR_LINUX_FRAME_COPY_PROFILE?.trim() || undefined;
 const workerRelativeDir = path.join(
     'dist',
     'apps',
@@ -460,10 +472,34 @@ function verifyPackagedPackageMetadata(resourceDir, errors) {
     }
 }
 
-function verifyLinuxLauncher(resourceDir, errors) {
+function verifyLinuxLauncher(resourceDir, targetNames, errors) {
+    let launcherLayout;
+    try {
+        launcherLayout = resolveLinuxLauncherLayout(
+            targetNames,
+            linuxExecutableName
+        );
+    } catch (error) {
+        errors.push(
+            `Unable to resolve Linux launcher layout: ${
+                error instanceof Error ? error.message : String(error)
+            }`
+        );
+        return;
+    }
+
     const appDir = path.dirname(resourceDir);
     const launcherPath = path.join(appDir, linuxExecutableName);
-    const launcherBinaryPath = `${launcherPath}.bin`;
+
+    if (!launcherLayout.wrapperRequired) {
+        errors.push(...validateFlatpakLauncher(appDir, linuxExecutableName));
+        return;
+    }
+
+    const launcherBinaryPath = path.join(
+        appDir,
+        launcherLayout.electronBinaryName
+    );
 
     if (!fileExists(launcherBinaryPath)) {
         errors.push(
@@ -601,7 +637,9 @@ function verifyPackagedDependencyClosure(resourceDir, errors) {
     }
 
     const details = missing
-        .map((entry) => `- ${entry.dependency} (required by ${entry.requiredBy})`)
+        .map(
+            (entry) => `- ${entry.dependency} (required by ${entry.requiredBy})`
+        )
         .join('\n');
 
     errors.push(
@@ -614,9 +652,37 @@ function verifyPackagedDependencyClosure(resourceDir, errors) {
     );
 }
 
-// The embedded MPV addon is built once per CI host (x64), but electron-builder
-// emits arm64/armv7l Linux output directories from the same dist tree. Those
-// must carry the unavailable marker instead of a foreign-architecture addon.
+function verifyNoEmbeddedMpvNativeArchiveEntries(resourceDir, errors) {
+    const asarPath = path.join(resourceDir, 'app.asar');
+    if (!fileExists(asarPath)) {
+        // Missing archive is already reported by verifyPackagedPackageMetadata.
+        return;
+    }
+
+    let nativeEntries;
+    try {
+        nativeEntries = collectEmbeddedMpvNativeArchiveEntries(
+            listPackage(asarPath)
+        );
+    } catch (error) {
+        errors.push(
+            `Unable to inspect embedded MPV archive ownership in ${asarPath}: ${error.message}`
+        );
+        return;
+    }
+
+    if (nativeEntries.length > 0) {
+        errors.push(
+            [
+                `Packaged app.asar must not contain embedded MPV native payloads; afterPack exclusively owns the profile-specific unpacked directory in ${asarPath}.`,
+                ...nativeEntries.map((entry) => `- ${entry}`),
+            ].join('\n')
+        );
+    }
+}
+
+// Official Linux frame-copy support is x64-only. Every arm64/armv7l output
+// must carry the unavailable marker instead of native frame-copy artifacts.
 function isForeignArchLinuxResourceDir(resourceDir) {
     if (platform !== 'linux') {
         return false;
@@ -625,7 +691,7 @@ function isForeignArchLinuxResourceDir(resourceDir) {
     const dirArch = linuxUnpackedDirArch(
         path.basename(path.dirname(resourceDir))
     );
-    return Boolean(dirArch) && dirArch !== getEmbeddedMpvAddonArch();
+    return Boolean(dirArch) && dirArch !== 'x64';
 }
 
 function verifyResourceDir(resourceDir) {
@@ -642,9 +708,11 @@ function verifyResourceDir(resourceDir) {
     );
 
     const errors = [];
+    let linuxTargetNames;
 
     verifyPackagedPackageMetadata(resourceDir, errors);
     verifyPackagedDependencyClosure(resourceDir, errors);
+    verifyNoEmbeddedMpvNativeArchiveEntries(resourceDir, errors);
 
     if (missingWorkers.length > 0) {
         errors.push(
@@ -663,6 +731,28 @@ function verifyResourceDir(resourceDir) {
     }
 
     if (platform === 'linux') {
+        const resourceArch =
+            linuxUnpackedDirArch(path.basename(path.dirname(resourceDir))) ||
+            arch;
+        try {
+            linuxTargetNames = resolveConfiguredLinuxTargetNames(
+                electronBuilderConfig.linux?.target,
+                resourceArch
+            );
+            if (linuxFrameCopyProfile) {
+                errors.push(
+                    ...validateLinuxProfileTargets(
+                        linuxFrameCopyProfile,
+                        linuxTargetNames
+                    )
+                );
+            }
+        } catch (error) {
+            errors.push(
+                `Unable to resolve selected Linux package targets: ${error.message}`
+            );
+            linuxTargetNames = [];
+        }
         if (!fileExists(flatpakMetainfoPath)) {
             errors.push(
                 `Missing Flatpak metainfo file: ${flatpakMetainfoPath}`
@@ -671,7 +761,7 @@ function verifyResourceDir(resourceDir) {
         verifyLinuxExecutableArgs(errors);
         verifyFlatpakPermissions(errors);
         verifySnapPackagingConfig(errors);
-        verifyLinuxLauncher(resourceDir, errors);
+        verifyLinuxLauncher(resourceDir, linuxTargetNames, errors);
     }
 
     errors.push(
@@ -679,6 +769,9 @@ function verifyResourceDir(resourceDir) {
             platform,
             required: embeddedMpvRequired,
             foreignArch: isForeignArchLinuxResourceDir(resourceDir),
+            profile: linuxFrameCopyProfile,
+            targetNames: linuxTargetNames,
+            executableName: linuxExecutableName,
         })
     );
 
diff --git a/tools/packaging/verify-linux-frame-copy-runtime.mjs b/tools/packaging/verify-linux-frame-copy-runtime.mjs
new file mode 100644
index 000000000..68121639d
--- /dev/null
+++ b/tools/packaging/verify-linux-frame-copy-runtime.mjs
@@ -0,0 +1,1747 @@
+#!/usr/bin/env node
+
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+
+import {
+    collectEmbeddedMpvNativeArchiveEntries,
+    listAsarPackageEntries,
+} from './asar-dependency-closure.mjs';
+
+const require = createRequire(import.meta.url);
+const {
+    parseReadelfDynamic,
+} = require('../embedded-mpv/build-linux-runtime.cjs');
+const {
+    listElectronShippedLinuxLibraries,
+    validatePackagedEmbeddedMpv,
+} = require('./embedded-mpv-packaging.cjs');
+const {
+    LINUX_SYSTEM_PACKAGE_DEPENDENCIES,
+    resolveLinuxFrameCopyProfile,
+} = require('./linux-frame-copy-profile.cjs');
+const { resolveLinuxLauncherLayout } = require('./linux-launcher-layout.cjs');
+const {
+    RUNTIME_PROBE_MAX_BUFFER_BYTES,
+    RUNTIME_PROBE_TIMEOUT_MS,
+} = require('../embedded-mpv/runtime-probe-contract.cjs');
+
+const scriptPath = fileURLToPath(import.meta.url);
+const LIBMPV_DEPENDENCY_PATTERN = /^libmpv\.so(?:\.|$)/;
+const SNAP_METADATA_MAX_BYTES = 256 * 1024;
+// Keep this set identical to the packaged helper sanitizer in
+// embedded-mpv-frame-copy-runtime/helper-environment.ts. Feature/debug
+// selectors such as LIBGL_ALWAYS_SOFTWARE remain intentionally available.
+const UNSAFE_RUNTIME_PROBE_ENVIRONMENT_VARIABLES = [
+    'BASH_ENV',
+    'ENV',
+    'BASHOPTS',
+    'SHELLOPTS',
+    'PS4',
+    'BASH_XTRACEFD',
+    'CDPATH',
+    'LD_AUDIT',
+    'LD_LIBRARY_PATH',
+    'LD_ORIGIN_PATH',
+    'LD_PRELOAD',
+    '__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS',
+    '__EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES',
+    '__EGL_VENDOR_LIBRARY_DIRS',
+    '__EGL_VENDOR_LIBRARY_FILENAMES',
+    'GBM_BACKEND',
+    'GBM_BACKENDS_PATH',
+    'LIBGL_DRIVERS_PATH',
+    'MESA_LOADER_DRIVER_OVERRIDE',
+    'LIBVA_DRIVER_NAME',
+    'LIBVA_DRIVERS_PATH',
+    'VDPAU_DRIVER_PATH',
+    'VK_DRIVER_FILES',
+    'VK_ICD_FILENAMES',
+    'VK_ADD_DRIVER_FILES',
+    'VK_ADD_LAYER_PATH',
+    'VK_IMPLICIT_LAYER_PATH',
+    'VK_ADD_IMPLICIT_LAYER_PATH',
+    'VK_LAYER_PATH',
+];
+
+export function runVerifierCommand(command, args, options = {}) {
+    const spawnOptions = {
+        cwd: options.cwd,
+        env: options.env,
+        encoding: 'utf8',
+        stdio: 'pipe',
+        timeout: options.timeout,
+        killSignal: options.killSignal,
+        windowsHide: true,
+    };
+    if (options.maxBuffer !== undefined) {
+        spawnOptions.maxBuffer = options.maxBuffer;
+    }
+    return spawnSync(command, args, spawnOptions);
+}
+
+function assertCommandSucceeded(command, args, result) {
+    if (result?.error) {
+        throw new Error(
+            `Unable to run ${command}: ${
+                result.error instanceof Error
+                    ? result.error.message
+                    : String(result.error)
+            }`
+        );
+    }
+    if (result?.status !== 0) {
+        const details = [result?.stdout, result?.stderr]
+            .filter(Boolean)
+            .join('\n')
+            .trim();
+        throw new Error(
+            `${command} ${args.join(' ')} failed with status ${
+                result?.status ?? 'unknown'
+            }.${details ? `\n${details}` : ''}`
+        );
+    }
+    return result;
+}
+
+export function detectLinuxArtifactFormat(artifactPath) {
+    const fileName = path.basename(artifactPath);
+    if (/\.AppImage$/i.test(fileName)) {
+        return 'appimage';
+    }
+    if (/\.deb$/i.test(fileName)) {
+        return 'deb';
+    }
+    if (/\.rpm$/i.test(fileName)) {
+        return 'rpm';
+    }
+    if (/\.(?:pacman|pkg\.tar(?:\.[A-Za-z0-9]+)*)$/i.test(fileName)) {
+        return 'pacman';
+    }
+    if (/\.snap$/i.test(fileName)) {
+        return 'snap';
+    }
+    if (/\.flatpak$/i.test(fileName)) {
+        return 'flatpak';
+    }
+    throw new Error(`Unsupported Linux package artifact: ${artifactPath}`);
+}
+
+export function parseVerifierArguments(argv) {
+    const normalizedArgs = argv[0] === '--' ? argv.slice(1) : [...argv];
+    let artifactValue;
+    let profileValue;
+    for (let index = 0; index < normalizedArgs.length; index += 1) {
+        const argument = normalizedArgs[index];
+        if (argument === '--artifact') {
+            if (artifactValue !== undefined) {
+                throw new Error('Received duplicate --artifact argument.');
+            }
+            artifactValue = normalizedArgs[++index];
+            continue;
+        }
+        if (argument === '--profile') {
+            if (profileValue !== undefined) {
+                throw new Error('Received duplicate --profile argument.');
+            }
+            profileValue = normalizedArgs[++index];
+            continue;
+        }
+        throw new Error(`Unsupported verifier argument: ${argument}`);
+    }
+    if (!artifactValue) {
+        throw new Error('--artifact is required.');
+    }
+    if (!profileValue) {
+        throw new Error('--profile is required.');
+    }
+    const artifactPath = path.resolve(artifactValue);
+    const stat = fs.lstatSync(artifactPath);
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        throw new Error(
+            `Linux package artifact must be a regular file: ${artifactPath}`
+        );
+    }
+    const profile = resolveLinuxFrameCopyProfile(profileValue);
+    detectLinuxArtifactFormat(artifactPath);
+    return {
+        artifactPath,
+        profileName: profile.name,
+    };
+}
+
+export function findAppImageSquashfsOffsets(artifactPath) {
+    const magic = Buffer.from('hsqs');
+    const chunkSize = 1024 * 1024;
+    const descriptor = fs.openSync(artifactPath, 'r');
+    const offsets = [];
+    let position = 0;
+    let overlap = Buffer.alloc(0);
+    try {
+        while (true) {
+            const chunk = Buffer.alloc(chunkSize);
+            const bytesRead = fs.readSync(
+                descriptor,
+                chunk,
+                0,
+                chunk.length,
+                position
+            );
+            if (bytesRead === 0) {
+                break;
+            }
+            const contents = Buffer.concat([
+                overlap,
+                chunk.subarray(0, bytesRead),
+            ]);
+            const contentsStart = position - overlap.length;
+            let searchOffset = 0;
+            while (searchOffset <= contents.length - magic.length) {
+                const matchOffset = contents.indexOf(magic, searchOffset);
+                if (matchOffset === -1) {
+                    break;
+                }
+                const absoluteOffset = contentsStart + matchOffset;
+                if (offsets.at(-1) !== absoluteOffset) {
+                    offsets.push(absoluteOffset);
+                }
+                searchOffset = matchOffset + 1;
+            }
+            overlap = contents.subarray(
+                Math.max(0, contents.length - (magic.length - 1))
+            );
+            position += bytesRead;
+        }
+    } finally {
+        fs.closeSync(descriptor);
+    }
+    return offsets;
+}
+
+export function extractLinuxArtifact({
+    artifactPath,
+    format,
+    destination,
+    runCommand = runVerifierCommand,
+}) {
+    fs.rmSync(destination, { recursive: true, force: true });
+    fs.mkdirSync(path.dirname(destination), { recursive: true });
+    const run = (command, args, options = {}) =>
+        assertCommandSucceeded(
+            command,
+            args,
+            runCommand(command, args, options)
+        );
+
+    switch (format) {
+        case 'appimage': {
+            const squashfsOffsets = findAppImageSquashfsOffsets(artifactPath);
+            if (squashfsOffsets.length === 0) {
+                throw new Error(
+                    `AppImage contains no SquashFS payload: ${artifactPath}`
+                );
+            }
+            const failures = [];
+            for (const offset of squashfsOffsets) {
+                fs.rmSync(destination, { recursive: true, force: true });
+                const args = [
+                    '-no-progress',
+                    '-offset',
+                    String(offset),
+                    '-dest',
+                    destination,
+                    artifactPath,
+                ];
+                const result = runCommand('unsquashfs', args);
+                if (!result?.error && result?.status === 0) {
+                    return destination;
+                }
+                failures.push(
+                    [result?.stdout, result?.stderr]
+                        .filter(Boolean)
+                        .join('\n')
+                        .trim()
+                );
+            }
+            throw new Error(
+                [
+                    `Unable to extract the AppImage SquashFS payload at any candidate offset: ${artifactPath}`,
+                    ...failures.filter(Boolean),
+                ].join('\n')
+            );
+        }
+        case 'deb':
+            fs.mkdirSync(destination, { recursive: true });
+            run('dpkg-deb', ['--extract', artifactPath, destination]);
+            return destination;
+        case 'rpm':
+        case 'pacman':
+            fs.mkdirSync(destination, { recursive: true });
+            run('bsdtar', [
+                '--extract',
+                '--file',
+                artifactPath,
+                '--directory',
+                destination,
+            ]);
+            return destination;
+        case 'snap':
+            run('unsquashfs', [
+                '-no-progress',
+                '-dest',
+                destination,
+                artifactPath,
+            ]);
+            return destination;
+        case 'flatpak': {
+            fs.mkdirSync(destination, { recursive: true });
+            const repository = path.join(destination, '.ostree-repository');
+            const checkout = path.join(destination, 'checkout');
+            fs.mkdirSync(repository, { recursive: true });
+            run('ostree', [
+                `--repo=${repository}`,
+                'init',
+                '--mode=archive-z2',
+            ]);
+            run('flatpak', ['build-import-bundle', repository, artifactPath]);
+            const refsResult = run('ostree', ['refs', `--repo=${repository}`]);
+            const refs = String(refsResult.stdout ?? '')
+                .split(/\r?\n/)
+                .map((line) => line.trim())
+                .filter((line) => line.startsWith('app/'));
+            if (refs.length !== 1) {
+                throw new Error(
+                    `Flatpak bundle must import exactly one application ref; received ${
+                        refs.length > 0 ? refs.join(', ') : '<none>'
+                    }.`
+                );
+            }
+            run('ostree', [
+                'checkout',
+                '-U',
+                `--repo=${repository}`,
+                refs[0],
+                checkout,
+            ]);
+            return checkout;
+        }
+        default:
+            throw new Error(`Unsupported Linux package format: ${format}`);
+    }
+}
+
+export function findExtractedResourceDir(extractionRoot) {
+    const candidates = [];
+
+    function visit(directoryPath) {
+        let entries;
+        try {
+            entries = fs.readdirSync(directoryPath, { withFileTypes: true });
+        } catch (error) {
+            throw new Error(
+                `Unable to inspect extracted package directory ${directoryPath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+        }
+        for (const entry of entries) {
+            if (!entry.isDirectory() || entry.isSymbolicLink()) {
+                continue;
+            }
+            const entryPath = path.join(directoryPath, entry.name);
+            if (entry.name === 'resources') {
+                const nativeDir = path.join(
+                    entryPath,
+                    'app.asar.unpacked',
+                    'electron-backend',
+                    'native'
+                );
+                let nativeStat;
+                try {
+                    nativeStat = fs.lstatSync(nativeDir);
+                } catch {
+                    nativeStat = null;
+                }
+                if (nativeStat?.isDirectory() && !nativeStat.isSymbolicLink()) {
+                    candidates.push(entryPath);
+                    continue;
+                }
+            }
+            visit(entryPath);
+        }
+    }
+
+    visit(extractionRoot);
+    if (candidates.length !== 1) {
+        throw new Error(
+            `Expected exactly one embedded MPV native payload in ${extractionRoot}; found ${candidates.length}.`
+        );
+    }
+    return candidates[0];
+}
+
+function stripYamlTrailingComment(value) {
+    let quote = null;
+    for (let index = 0; index < value.length; index += 1) {
+        const character = value[index];
+        if (quote === "'") {
+            if (character === "'" && value[index + 1] === "'") {
+                index += 1;
+            } else if (character === "'") {
+                quote = null;
+            }
+            continue;
+        }
+        if (quote === '"') {
+            if (character === '\\') {
+                index += 1;
+            } else if (character === '"') {
+                quote = null;
+            }
+            continue;
+        }
+        if (character === "'" || character === '"') {
+            quote = character;
+            continue;
+        }
+        if (
+            character === '#' &&
+            (index === 0 || /[ \t]/.test(value[index - 1]))
+        ) {
+            return value.slice(0, index).trimEnd();
+        }
+    }
+    return value;
+}
+
+function yamlMappingEntries(lines, key, indent, start = 0, end = lines.length) {
+    const prefix = `${' '.repeat(indent)}${key}:`;
+    return lines
+        .map((line, index) => ({ index, line }))
+        .filter(
+            ({ index, line }) =>
+                index >= start &&
+                index < end &&
+                line.startsWith(prefix) &&
+                line.slice(prefix.length).match(/^(?:\s|$)/) &&
+                line.length - line.trimStart().length === indent
+        )
+        .map(({ index, line }) => {
+            let blockEnd = end;
+            for (
+                let candidateIndex = index + 1;
+                candidateIndex < end;
+                candidateIndex += 1
+            ) {
+                const candidate = lines[candidateIndex];
+                if (
+                    !candidate.trim() ||
+                    candidate.trimStart().startsWith('#')
+                ) {
+                    continue;
+                }
+                const candidateIndent =
+                    candidate.length - candidate.trimStart().length;
+                if (candidateIndent <= indent) {
+                    blockEnd = candidateIndex;
+                    break;
+                }
+            }
+            return {
+                index,
+                end: blockEnd,
+                value: stripYamlTrailingComment(
+                    line.slice(prefix.length).trim()
+                ),
+            };
+        });
+}
+
+function singleYamlMappingEntry(lines, key, indent, start, end) {
+    const entries = yamlMappingEntries(lines, key, indent, start, end);
+    return entries.length === 1 ? entries[0] : null;
+}
+
+function directYamlMappingEntries(lines, parent, indent) {
+    const entries = [];
+    for (let index = parent.index + 1; index < parent.end; index += 1) {
+        const line = lines[index];
+        if (!line.trim() || line.trimStart().startsWith('#')) {
+            continue;
+        }
+        const lineIndent = line.length - line.trimStart().length;
+        if (lineIndent !== indent) {
+            continue;
+        }
+        const match = line
+            .slice(indent)
+            .match(/^([A-Za-z0-9][A-Za-z0-9_-]*):(?:\s*(.*))?$/);
+        if (!match) {
+            return null;
+        }
+        let blockEnd = parent.end;
+        for (
+            let candidateIndex = index + 1;
+            candidateIndex < parent.end;
+            candidateIndex += 1
+        ) {
+            const candidate = lines[candidateIndex];
+            if (!candidate.trim() || candidate.trimStart().startsWith('#')) {
+                continue;
+            }
+            const candidateIndent =
+                candidate.length - candidate.trimStart().length;
+            if (candidateIndent <= indent) {
+                blockEnd = candidateIndex;
+                break;
+            }
+        }
+        entries.push({
+            key: match[1],
+            value: stripYamlTrailingComment(match[2] ?? ''),
+            index,
+            end: blockEnd,
+        });
+    }
+    return entries;
+}
+
+function directYamlAbsolutePathMappingEntries(lines, parent, indent) {
+    const entries = [];
+    for (let index = parent.index + 1; index < parent.end; index += 1) {
+        const line = lines[index];
+        if (!line.trim() || line.trimStart().startsWith('#')) {
+            continue;
+        }
+        const lineIndent = line.length - line.trimStart().length;
+        if (lineIndent !== indent) {
+            continue;
+        }
+        const match = line
+            .slice(indent)
+            .match(/^(\/[A-Za-z0-9._/-]+):(?:\s*(.*))?$/);
+        if (!match) {
+            return null;
+        }
+        let blockEnd = parent.end;
+        for (
+            let candidateIndex = index + 1;
+            candidateIndex < parent.end;
+            candidateIndex += 1
+        ) {
+            const candidate = lines[candidateIndex];
+            if (!candidate.trim() || candidate.trimStart().startsWith('#')) {
+                continue;
+            }
+            const candidateIndent =
+                candidate.length - candidate.trimStart().length;
+            if (candidateIndent <= indent) {
+                blockEnd = candidateIndex;
+                break;
+            }
+        }
+        entries.push({
+            key: match[1],
+            value: stripYamlTrailingComment(match[2] ?? ''),
+            index,
+            end: blockEnd,
+        });
+    }
+    return entries;
+}
+
+function yamlScalarEquals(value, expected) {
+    return (
+        value === expected ||
+        value === JSON.stringify(expected) ||
+        value === `'${expected.replaceAll("'", "''")}'`
+    );
+}
+
+function yamlSequenceIncludes(lines, entry, expected) {
+    if (entry.value) {
+        if (!entry.value.startsWith('[') || !entry.value.endsWith(']')) {
+            return false;
+        }
+        const values = entry.value
+            .slice(1, -1)
+            .split(',')
+            .map((value) => value.trim());
+        return (
+            values.length > 0 &&
+            values.every(
+                (value) =>
+                    value.length > 0 &&
+                    !/[:[\]{}&*]/.test(value) &&
+                    !value.startsWith('-')
+            ) &&
+            values.some((value) => yamlScalarEquals(value, expected))
+        );
+    }
+    const sequenceLines = lines
+        .slice(entry.index + 1, entry.end)
+        .filter((line) => line.trim() && !line.trimStart().startsWith('#'));
+    const itemIndent = 6;
+    const values = sequenceLines.map((line) => {
+        const lineIndent = line.length - line.trimStart().length;
+        if (lineIndent !== itemIndent) {
+            return null;
+        }
+        const match = line.trim().match(/^-\s+([^:[\]{}&*]+)$/);
+        return match ? stripYamlTrailingComment(match[1].trim()) : null;
+    });
+    return (
+        values.length > 0 &&
+        values.every((value) => value !== null) &&
+        values.some((value) => yamlScalarEquals(value, expected))
+    );
+}
+
+function yamlSyntaxOutsideQuotedScalars(line) {
+    let result = '';
+    let quote = null;
+    for (let index = 0; index < line.length; index += 1) {
+        const character = line[index];
+        if (quote === "'") {
+            if (character === "'" && line[index + 1] === "'") {
+                result += '  ';
+                index += 1;
+            } else {
+                result += ' ';
+                if (character === "'") {
+                    quote = null;
+                }
+            }
+            continue;
+        }
+        if (quote === '"') {
+            result += ' ';
+            if (character === '\\') {
+                result += ' ';
+                index += 1;
+            } else if (character === '"') {
+                quote = null;
+            }
+            continue;
+        }
+        if (character === '#') {
+            break;
+        }
+        if (character === "'" || character === '"') {
+            quote = character;
+            result += ' ';
+            continue;
+        }
+        result += character;
+    }
+    return result;
+}
+
+function containsUnsupportedYamlSemantics(lines) {
+    let blockScalarParentIndent = null;
+    for (const line of lines) {
+        if (!line.trim()) {
+            continue;
+        }
+        const lineIndent = line.length - line.trimStart().length;
+        if (
+            blockScalarParentIndent !== null &&
+            lineIndent > blockScalarParentIndent
+        ) {
+            continue;
+        }
+        blockScalarParentIndent = null;
+        const syntax = yamlSyntaxOutsideQuotedScalars(line);
+        if (
+            /(?:^|[\s:[\]{},])(?:[&*][^\s,[\]{}]+|![^\s,[\]{}]+)(?=$|[\s,\]}])/.test(
+                syntax
+            ) ||
+            /(?:^|\s)<<\s*:/.test(syntax)
+        ) {
+            return true;
+        }
+        if (/:\s*[>|][+-]?\d?\s*$/.test(syntax)) {
+            blockScalarParentIndent = lineIndent;
+        }
+    }
+    return false;
+}
+
+export function validateExtractedSnapMetadata(extractionRoot) {
+    const snapYamlPath = path.join(extractionRoot, 'meta', 'snap.yaml');
+    let stat;
+    try {
+        stat = fs.lstatSync(snapYamlPath);
+    } catch {
+        return [`Missing extracted Snap metadata: ${snapYamlPath}`];
+    }
+    if (!stat.isFile() || stat.isSymbolicLink()) {
+        return [
+            `Extracted Snap metadata must be a regular file: ${snapYamlPath}`,
+        ];
+    }
+    if (stat.size > SNAP_METADATA_MAX_BYTES) {
+        return [
+            `Extracted Snap metadata exceeds the ${String(
+                SNAP_METADATA_MAX_BYTES
+            )}-byte size limit: ${snapYamlPath}`,
+        ];
+    }
+
+    let contents;
+    try {
+        contents = fs.readFileSync(snapYamlPath, 'utf8');
+    } catch (error) {
+        return [
+            `Unable to read extracted Snap metadata at ${snapYamlPath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`,
+        ];
+    }
+    if (contents.includes('\t')) {
+        return [
+            `Extracted Snap metadata must use space indentation: ${snapYamlPath}`,
+        ];
+    }
+    const lines = contents.split(/\r?\n/);
+    if (containsUnsupportedYamlSemantics(lines)) {
+        return [
+            'Extracted Snap metadata must not use YAML anchors, aliases, merge keys, or custom tags.',
+        ];
+    }
+    const errors = [];
+    const graphicsMountPath = path.join(extractionRoot, 'graphics');
+    let graphicsMountStat;
+    try {
+        graphicsMountStat = fs.lstatSync(graphicsMountPath);
+    } catch {
+        errors.push(
+            `Extracted Snap must contain an empty graphics content mount directory: ${graphicsMountPath}`
+        );
+    }
+    if (
+        graphicsMountStat &&
+        (!graphicsMountStat.isDirectory() || graphicsMountStat.isSymbolicLink())
+    ) {
+        errors.push(
+            `Extracted Snap graphics content mount must be a real directory: ${graphicsMountPath}`
+        );
+    } else if (graphicsMountStat) {
+        if ((graphicsMountStat.mode & 0o777) !== 0o755) {
+            errors.push(
+                `Extracted Snap graphics content mount directory must have mode 0755: ${graphicsMountPath}`
+            );
+        }
+        try {
+            if (fs.readdirSync(graphicsMountPath).length > 0) {
+                errors.push(
+                    `Extracted Snap graphics content mount directory must be empty: ${graphicsMountPath}`
+                );
+            }
+        } catch (error) {
+            errors.push(
+                `Unable to inspect extracted Snap graphics content mount at ${graphicsMountPath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+        }
+    }
+    const base = singleYamlMappingEntry(lines, 'base', 0, 0, lines.length);
+    if (!base || !yamlScalarEquals(base.value, 'core22')) {
+        errors.push('Extracted Snap metadata must declare base: core22.');
+    }
+    const confinement = singleYamlMappingEntry(
+        lines,
+        'confinement',
+        0,
+        0,
+        lines.length
+    );
+    if (!confinement || !yamlScalarEquals(confinement.value, 'strict')) {
+        errors.push(
+            'Extracted Snap metadata must declare confinement: strict.'
+        );
+    }
+    const layout = singleYamlMappingEntry(lines, 'layout', 0, 0, lines.length);
+    if (!layout || layout.value) {
+        errors.push(
+            'Extracted Snap metadata must declare the exact Snap graphics layout contract.'
+        );
+    } else {
+        const layoutEntries = directYamlAbsolutePathMappingEntries(
+            lines,
+            layout,
+            2
+        );
+        const expectedLayouts = [
+            {
+                path: '/usr/share/libdrm',
+                field: 'bind',
+                target: '$SNAP/graphics/libdrm',
+                label: 'libdrm',
+            },
+            {
+                path: '/usr/share/drirc.d',
+                field: 'symlink',
+                target: '$SNAP/graphics/drirc.d',
+                label: 'drirc.d',
+            },
+        ];
+        if (
+            layoutEntries &&
+            new Set(layoutEntries.map(({ key }) => key)).size !==
+                layoutEntries.length
+        ) {
+            errors.push('Extracted Snap layout paths must be unique.');
+        }
+        if (
+            !layoutEntries ||
+            layoutEntries.length !== expectedLayouts.length ||
+            expectedLayouts.some(
+                ({ path: expectedPath }) =>
+                    layoutEntries.filter(({ key }) => key === expectedPath)
+                        .length !== 1
+            )
+        ) {
+            errors.push(
+                'Extracted Snap graphics layout must contain exactly the libdrm and drirc.d entries.'
+            );
+        }
+        for (const expected of expectedLayouts) {
+            const entry = layoutEntries?.find(
+                ({ key }) => key === expected.path
+            );
+            const fields =
+                entry && !entry.value
+                    ? directYamlMappingEntries(lines, entry, 4)
+                    : null;
+            if (
+                !fields ||
+                fields.length !== 1 ||
+                fields[0].key !== expected.field
+            ) {
+                errors.push(
+                    `Extracted Snap ${expected.label} layout must contain exactly ${expected.field}.`
+                );
+            }
+            if (
+                !fields ||
+                fields.filter(
+                    ({ key, value }) =>
+                        key === expected.field &&
+                        yamlScalarEquals(value, expected.target)
+                ).length !== 1
+            ) {
+                errors.push(
+                    `Extracted Snap ${expected.label} layout must declare ${expected.field}: ${expected.target}.`
+                );
+            }
+        }
+    }
+    const plugs = singleYamlMappingEntry(lines, 'plugs', 0, 0, lines.length);
+    const sharedMemory =
+        plugs &&
+        singleYamlMappingEntry(
+            lines,
+            'shared-memory',
+            2,
+            plugs.index + 1,
+            plugs.end
+        );
+    const graphicsCore22 =
+        plugs &&
+        singleYamlMappingEntry(
+            lines,
+            'graphics-core22',
+            2,
+            plugs.index + 1,
+            plugs.end
+        );
+    if (!plugs || plugs.value || !sharedMemory || sharedMemory.value) {
+        errors.push(
+            'Extracted Snap metadata must declare exactly one top-level shared-memory plug.'
+        );
+    } else {
+        const fields = directYamlMappingEntries(lines, sharedMemory, 4);
+        const interfaceEntries =
+            fields?.filter(({ key }) => key === 'interface') ?? [];
+        const privateEntries =
+            fields?.filter(({ key }) => key === 'private') ?? [];
+        const interfaceEntry = interfaceEntries[0];
+        const privateEntry = privateEntries[0];
+        if (
+            !fields ||
+            fields.length !== 2 ||
+            interfaceEntries.length !== 1 ||
+            privateEntries.length !== 1
+        ) {
+            errors.push(
+                'Extracted Snap private shared-memory plug must contain exactly interface and private.'
+            );
+        }
+        if (
+            !interfaceEntry ||
+            !yamlScalarEquals(interfaceEntry.value, 'shared-memory')
+        ) {
+            errors.push(
+                'Extracted Snap top-level shared-memory plug must declare interface: shared-memory.'
+            );
+        }
+        if (!privateEntry || privateEntry.value !== 'true') {
+            errors.push(
+                'Extracted Snap top-level shared-memory plug must declare private: true.'
+            );
+        }
+
+        const plugEntries = directYamlMappingEntries(lines, plugs, 2);
+        if (!plugEntries || plugEntries.some(({ value }) => value.length > 0)) {
+            errors.push(
+                'Extracted Snap plug declarations must use block mappings.'
+            );
+        }
+        if (
+            plugEntries &&
+            new Set(plugEntries.map(({ key }) => key)).size !==
+                plugEntries.length
+        ) {
+            errors.push('Extracted Snap direct plug keys must be unique.');
+        }
+        const sharedMemoryInterfaces =
+            plugEntries?.filter((plugEntry) => {
+                const plugFields = directYamlMappingEntries(
+                    lines,
+                    plugEntry,
+                    4
+                );
+                const interfaceFields =
+                    plugFields?.filter(({ key }) => key === 'interface') ?? [];
+                return (
+                    interfaceFields.length === 1 &&
+                    yamlScalarEquals(interfaceFields[0].value, 'shared-memory')
+                );
+            }) ?? [];
+        if (
+            !plugEntries ||
+            sharedMemoryInterfaces.length !== 1 ||
+            sharedMemoryInterfaces[0].key !== 'shared-memory'
+        ) {
+            errors.push(
+                'Extracted Snap metadata must declare exactly one plug with the shared-memory interface.'
+            );
+        }
+    }
+
+    if (!plugs || plugs.value || !graphicsCore22 || graphicsCore22.value) {
+        errors.push(
+            'Extracted Snap metadata must declare exactly one top-level graphics-core22 plug.'
+        );
+    } else {
+        const fields = directYamlMappingEntries(lines, graphicsCore22, 4);
+        const interfaceEntries =
+            fields?.filter(({ key }) => key === 'interface') ?? [];
+        const targetEntries =
+            fields?.filter(({ key }) => key === 'target') ?? [];
+        const providerEntries =
+            fields?.filter(({ key }) => key === 'default-provider') ?? [];
+        const interfaceEntry = interfaceEntries[0];
+        const targetEntry = targetEntries[0];
+        const providerEntry = providerEntries[0];
+        if (
+            !fields ||
+            fields.length !== 3 ||
+            interfaceEntries.length !== 1 ||
+            targetEntries.length !== 1 ||
+            providerEntries.length !== 1
+        ) {
+            errors.push(
+                'Extracted Snap graphics-core22 plug must contain exactly interface, target, and default-provider.'
+            );
+        }
+        if (
+            !interfaceEntry ||
+            !yamlScalarEquals(interfaceEntry.value, 'content')
+        ) {
+            errors.push(
+                'Extracted Snap graphics-core22 plug must declare interface: content.'
+            );
+        }
+        if (
+            !targetEntry ||
+            !yamlScalarEquals(targetEntry.value, '$SNAP/graphics')
+        ) {
+            errors.push(
+                'Extracted Snap graphics-core22 plug must declare target: $SNAP/graphics.'
+            );
+        }
+        if (
+            !providerEntry ||
+            !yamlScalarEquals(providerEntry.value, 'mesa-core22')
+        ) {
+            errors.push(
+                'Extracted Snap graphics-core22 plug must declare default-provider: mesa-core22.'
+            );
+        }
+
+        const plugEntries = directYamlMappingEntries(lines, plugs, 2);
+        const graphicsContracts =
+            plugEntries?.filter((plugEntry) => {
+                const plugFields = directYamlMappingEntries(
+                    lines,
+                    plugEntry,
+                    4
+                );
+                if (!plugFields || plugFields.length !== 3) {
+                    return false;
+                }
+                return [
+                    ['interface', 'content'],
+                    ['target', '$SNAP/graphics'],
+                    ['default-provider', 'mesa-core22'],
+                ].every(
+                    ([key, expected]) =>
+                        plugFields.filter(
+                            ({ key: fieldKey, value }) =>
+                                fieldKey === key &&
+                                yamlScalarEquals(value, expected)
+                        ).length === 1
+                );
+            }) ?? [];
+        if (
+            !plugEntries ||
+            graphicsContracts.length !== 1 ||
+            graphicsContracts[0].key !== 'graphics-core22'
+        ) {
+            errors.push(
+                'Extracted Snap metadata must declare exactly one plug with the graphics-core22 contract.'
+            );
+        }
+        const graphicsTargets =
+            plugEntries?.filter((plugEntry) => {
+                const plugFields = directYamlMappingEntries(
+                    lines,
+                    plugEntry,
+                    4
+                );
+                return (
+                    plugFields?.some(
+                        ({ key, value }) =>
+                            key === 'target' &&
+                            yamlScalarEquals(value, '$SNAP/graphics')
+                    ) ?? false
+                );
+            }) ?? [];
+        if (
+            !plugEntries ||
+            graphicsTargets.length !== 1 ||
+            graphicsTargets[0].key !== 'graphics-core22'
+        ) {
+            errors.push(
+                'Extracted Snap metadata must declare exactly one plug with target $SNAP/graphics.'
+            );
+        }
+    }
+
+    const slotsEntries = yamlMappingEntries(lines, 'slots', 0, 0, lines.length);
+    let hasSharedMemorySlot = slotsEntries.length > 1;
+    let invalidSlotsShape = slotsEntries.some(({ value }) => value.length > 0);
+    for (const slots of slotsEntries) {
+        const slotEntries = directYamlMappingEntries(lines, slots, 2);
+        if (!slotEntries) {
+            invalidSlotsShape = true;
+            continue;
+        }
+        invalidSlotsShape ||= slotEntries.some(({ value }) => value.length > 0);
+        hasSharedMemorySlot ||= slotEntries.some((slotEntry) => {
+            if (slotEntry.key === 'shared-memory') {
+                return true;
+            }
+            const slotFields = directYamlMappingEntries(lines, slotEntry, 4);
+            return (
+                slotFields?.some(
+                    ({ key, value }) =>
+                        key === 'interface' &&
+                        yamlScalarEquals(value, 'shared-memory')
+                ) ?? false
+            );
+        });
+    }
+    if (invalidSlotsShape) {
+        errors.push(
+            'Extracted Snap slots must use block mappings with scalar fields.'
+        );
+    }
+    if (hasSharedMemorySlot) {
+        errors.push(
+            'Extracted Snap metadata must not declare a shared-memory slot.'
+        );
+    }
+
+    const apps = singleYamlMappingEntry(lines, 'apps', 0, 0, lines.length);
+    const app =
+        apps &&
+        singleYamlMappingEntry(lines, 'iptvnator', 2, apps.index + 1, apps.end);
+    const appPlugs =
+        app &&
+        singleYamlMappingEntry(lines, 'plugs', 4, app.index + 1, app.end);
+    const appEnvironment =
+        app &&
+        singleYamlMappingEntry(lines, 'environment', 4, app.index + 1, app.end);
+    const snapDesktopRuntime =
+        appEnvironment &&
+        singleYamlMappingEntry(
+            lines,
+            'SNAP_DESKTOP_RUNTIME',
+            6,
+            appEnvironment.index + 1,
+            appEnvironment.end
+        );
+    if (
+        !apps ||
+        apps.value ||
+        !app ||
+        app.value ||
+        !appPlugs ||
+        !yamlSequenceIncludes(lines, appPlugs, 'shared-memory')
+    ) {
+        errors.push(
+            'Extracted Snap iptvnator app scalar sequence must contain the shared-memory plug.'
+        );
+    }
+    if (
+        !apps ||
+        apps.value ||
+        !app ||
+        app.value ||
+        !appPlugs ||
+        !yamlSequenceIncludes(lines, appPlugs, 'graphics-core22')
+    ) {
+        errors.push(
+            'Extracted Snap iptvnator app scalar sequence must contain the graphics-core22 plug.'
+        );
+    }
+    if (
+        !appEnvironment ||
+        appEnvironment.value ||
+        !snapDesktopRuntime ||
+        !yamlScalarEquals(snapDesktopRuntime.value, '$SNAP/gnome-platform')
+    ) {
+        errors.push(
+            'Extracted Snap iptvnator app environment must declare SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform.'
+        );
+    }
+    return errors;
+}
+
+export function readElfArchitecture(binaryPath) {
+    const descriptor = fs.openSync(binaryPath, 'r');
+    try {
+        const header = Buffer.alloc(20);
+        const bytesRead = fs.readSync(descriptor, header, 0, header.length, 0);
+        if (
+            bytesRead !== header.length ||
+            !header.subarray(0, 4).equals(Buffer.from([0x7f, 0x45, 0x4c, 0x46]))
+        ) {
+            throw new Error(`Not an ELF binary: ${binaryPath}`);
+        }
+        const byteOrder = header[5];
+        const machine =
+            byteOrder === 1
+                ? header.readUInt16LE(18)
+                : byteOrder === 2
+                  ? header.readUInt16BE(18)
+                  : null;
+        const architecture = new Map([
+            [62, 'x64'],
+            [183, 'arm64'],
+            [40, 'armv7l'],
+        ]).get(machine);
+        if (!architecture) {
+            throw new Error(
+                `Unsupported ELF machine ${String(machine)} in ${binaryPath}.`
+            );
+        }
+        return architecture;
+    } finally {
+        fs.closeSync(descriptor);
+    }
+}
+
+function normalizePackageArchitecture(value) {
+    const normalized = String(value ?? '')
+        .trim()
+        .toLowerCase();
+    const architecture = {
+        amd64: 'x64',
+        x86_64: 'x64',
+        arm64: 'arm64',
+        aarch64: 'arm64',
+        armhf: 'armv7l',
+        armv7h: 'armv7l',
+        armv7hl: 'armv7l',
+    }[normalized];
+    if (!architecture) {
+        throw new Error(
+            `Unsupported Linux package architecture: ${
+                normalized || '<empty>'
+            }.`
+        );
+    }
+    return architecture;
+}
+
+function splitNonEmptyLines(value) {
+    return String(value ?? '')
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean);
+}
+
+function findPackageInfoFiles(extractionRoot) {
+    const packageInfoPaths = [];
+
+    function visit(directoryPath) {
+        for (const entry of fs.readdirSync(directoryPath, {
+            withFileTypes: true,
+        })) {
+            const entryPath = path.join(directoryPath, entry.name);
+            if (entry.isDirectory() && !entry.isSymbolicLink()) {
+                visit(entryPath);
+            } else if (entry.isFile() && entry.name === '.PKGINFO') {
+                packageInfoPaths.push(entryPath);
+            }
+        }
+    }
+
+    visit(extractionRoot);
+    return packageInfoPaths;
+}
+
+export function readLinuxArtifactMetadata({
+    artifactPath,
+    format,
+    extractionRoot,
+    runCommand = runVerifierCommand,
+}) {
+    const run = (command, args) =>
+        assertCommandSucceeded(command, args, runCommand(command, args));
+    if (format === 'deb') {
+        const architectureResult = run('dpkg-deb', [
+            '--field',
+            artifactPath,
+            'Architecture',
+        ]);
+        const dependencyResult = run('dpkg-deb', [
+            '--field',
+            artifactPath,
+            'Depends',
+        ]);
+        return {
+            declaredArch: normalizePackageArchitecture(
+                architectureResult.stdout
+            ),
+            dependencies: String(dependencyResult.stdout ?? '')
+                .split(',')
+                .map((dependency) => dependency.trim())
+                .filter(Boolean),
+        };
+    }
+    if (format === 'rpm') {
+        const architectureResult = run('rpm', [
+            '-qp',
+            '--queryformat',
+            '%{ARCH}\\n',
+            artifactPath,
+        ]);
+        const dependencyResult = run('rpm', [
+            '-qp',
+            '--requires',
+            artifactPath,
+        ]);
+        return {
+            declaredArch: normalizePackageArchitecture(
+                architectureResult.stdout
+            ),
+            dependencies: splitNonEmptyLines(dependencyResult.stdout),
+        };
+    }
+    if (format === 'pacman') {
+        const packageInfoPaths = findPackageInfoFiles(extractionRoot);
+        if (packageInfoPaths.length !== 1) {
+            throw new Error(
+                `Pacman payload must contain exactly one .PKGINFO; found ${packageInfoPaths.length}.`
+            );
+        }
+        const fields = fs
+            .readFileSync(packageInfoPaths[0], 'utf8')
+            .split(/\r?\n/)
+            .map((line) => line.match(/^([^=]+?)\s*=\s*(.*)$/))
+            .filter(Boolean)
+            .map((match) => ({
+                name: match[1].trim(),
+                value: match[2].trim(),
+            }));
+        const architectures = fields
+            .filter(({ name }) => name === 'arch')
+            .map(({ value }) => value);
+        if (architectures.length !== 1) {
+            throw new Error(
+                `Pacman .PKGINFO must declare exactly one architecture; found ${architectures.length}.`
+            );
+        }
+        return {
+            declaredArch: normalizePackageArchitecture(architectures[0]),
+            dependencies: fields
+                .filter(({ name }) => name === 'depend')
+                .map(({ value }) => value),
+        };
+    }
+    return {
+        declaredArch: null,
+        dependencies: [],
+    };
+}
+
+function dependencyMatches(dependency, expected) {
+    const escapedExpected = expected.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`^${escapedExpected}(?:$|\\s|[<>=])`).test(
+        dependency.trim()
+    );
+}
+
+export function validateSystemPackageDependencies(format, dependencies) {
+    const expectedDependencies = LINUX_SYSTEM_PACKAGE_DEPENDENCIES[format];
+    if (!expectedDependencies) {
+        return [];
+    }
+    if (!Array.isArray(dependencies)) {
+        return [
+            `Linux ${format} package dependency metadata must be an array.`,
+        ];
+    }
+    return expectedDependencies.flatMap((expectedDependency) =>
+        dependencies.some((dependency) =>
+            dependencyMatches(String(dependency), expectedDependency)
+        )
+            ? []
+            : [
+                  `Linux x64 ${format} package must declare ${expectedDependency}.`,
+              ]
+    );
+}
+
+function validateForeignPackageDependencies(format, dependencies) {
+    const forbiddenDependencies =
+        LINUX_SYSTEM_PACKAGE_DEPENDENCIES[format] ?? [];
+    return forbiddenDependencies.flatMap((forbiddenDependency) =>
+        dependencies.some((dependency) =>
+            dependencyMatches(String(dependency), forbiddenDependency)
+        )
+            ? [
+                  `Linux foreign-architecture ${format} package must not declare frame-copy dependency ${forbiddenDependency}.`,
+              ]
+            : []
+    );
+}
+
+function dependencyFileName(dependencyName) {
+    return String(dependencyName).replaceAll('\\', '/').split('/').at(-1) ?? '';
+}
+
+function resolveElectronBinaryPath(resourceDir, artifactFormat) {
+    const layout = resolveLinuxLauncherLayout([artifactFormat]);
+    return path.join(path.dirname(resourceDir), layout.electronBinaryName);
+}
+
+function validateElectronIsolation(resourceDir, artifactFormat, elfInspector) {
+    const errors = [];
+    const electronPath = resolveElectronBinaryPath(resourceDir, artifactFormat);
+    const binaries = [
+        { label: 'Electron binary', binaryPath: electronPath },
+        ...listElectronShippedLinuxLibraries(resourceDir, {
+            artifactFormat,
+        }).map((binaryPath) => ({
+            label: 'Electron library',
+            binaryPath,
+        })),
+    ];
+    for (const { label, binaryPath } of binaries) {
+        let stat;
+        try {
+            stat = fs.lstatSync(binaryPath);
+        } catch {
+            errors.push(`Missing ${label}: ${binaryPath}`);
+            continue;
+        }
+        if (!stat.isFile() || stat.isSymbolicLink()) {
+            errors.push(`${label} must be a regular file: ${binaryPath}`);
+            continue;
+        }
+        let dynamic;
+        try {
+            dynamic = elfInspector(binaryPath);
+        } catch (error) {
+            errors.push(
+                `Unable to inspect ${label} at ${binaryPath}: ${
+                    error instanceof Error ? error.message : String(error)
+                }`
+            );
+            continue;
+        }
+        if (!dynamic || !Array.isArray(dynamic.needed)) {
+            errors.push(
+                `ELF inspection for ${label} must provide a needed array: ${binaryPath}`
+            );
+            continue;
+        }
+        const libmpvDependencies = dynamic.needed.filter((dependencyName) =>
+            LIBMPV_DEPENDENCY_PATTERN.test(dependencyFileName(dependencyName))
+        );
+        if (libmpvDependencies.length > 0) {
+            errors.push(
+                `${label} must not link libmpv; found ${libmpvDependencies.join(
+                    ', '
+                )} in ${binaryPath}.`
+            );
+        }
+    }
+    return errors;
+}
+
+function defaultElfInspector(binaryPath) {
+    const result = assertCommandSucceeded(
+        'readelf',
+        ['-d', binaryPath],
+        runVerifierCommand('readelf', ['-d', binaryPath])
+    );
+    return parseReadelfDynamic(result.stdout);
+}
+
+function validateProbeResult(result) {
+    if (result?.error) {
+        return [
+            `Unable to execute Linux frame-copy runtime probe: ${
+                result.error instanceof Error
+                    ? result.error.message
+                    : String(result.error)
+            }`,
+        ];
+    }
+    if (result?.signal) {
+        return [
+            `Linux frame-copy runtime probe terminated by signal ${result.signal}.`,
+        ];
+    }
+    if (result?.status !== 0) {
+        const details = [result?.stdout, result?.stderr]
+            .filter(Boolean)
+            .join('\n')
+            .trim();
+        return [
+            `Linux frame-copy runtime probe failed with status ${
+                result?.status ?? 'unknown'
+            }.${details ? `\n${details}` : ''}`,
+        ];
+    }
+    const stdout = result.stdout;
+    if (typeof stdout !== 'string' || !/^[^\r\n]+\n$/.test(stdout)) {
+        return [
+            'Linux frame-copy runtime probe must emit exactly one newline-terminated JSON line.',
+        ];
+    }
+    let payload;
+    try {
+        payload = JSON.parse(stdout.slice(0, -1));
+    } catch (error) {
+        return [
+            `Linux frame-copy runtime probe emitted invalid JSON: ${
+                error instanceof Error ? error.message : String(error)
+            }`,
+        ];
+    }
+    if (
+        !payload ||
+        typeof payload !== 'object' ||
+        Array.isArray(payload) ||
+        JSON.stringify(Object.keys(payload).sort()) !==
+            JSON.stringify(['libmpv', 'protocol', 'renderApi', 'usable']) ||
+        payload.protocol !== 1 ||
+        payload.usable !== true ||
+        typeof payload.libmpv !== 'string' ||
+        payload.libmpv.trim() === '' ||
+        payload.renderApi !== 'egl'
+    ) {
+        return [
+            'Linux frame-copy runtime probe did not return protocol 1 usable EGL capability.',
+        ];
+    }
+    return [];
+}
+
+export function createRuntimeProbeEnvironment({
+    environment,
+    nativeDir,
+    runtimeMode,
+}) {
+    const probeEnvironment = { ...(environment ?? {}) };
+    for (const variableName of UNSAFE_RUNTIME_PROBE_ENVIRONMENT_VARIABLES) {
+        delete probeEnvironment[variableName];
+    }
+    for (const variableName of Object.keys(probeEnvironment)) {
+        if (variableName.startsWith('BASH_FUNC_')) {
+            delete probeEnvironment[variableName];
+        }
+    }
+    if (runtimeMode === 'bundled') {
+        probeEnvironment.LD_LIBRARY_PATH = path.join(nativeDir, 'lib');
+    }
+    return probeEnvironment;
+}
+
+function validateNoEmbeddedMpvNativeArchiveEntries(
+    resourceDir,
+    asarListPackage
+) {
+    const asarPath = path.join(resourceDir, 'app.asar');
+    if (!fs.existsSync(asarPath)) {
+        return [];
+    }
+
+    let nativeEntries;
+    try {
+        nativeEntries = collectEmbeddedMpvNativeArchiveEntries(
+            asarListPackage(asarPath)
+        );
+    } catch (error) {
+        return [
+            `Unable to inspect embedded MPV archive ownership in ${asarPath}: ${
+                error instanceof Error ? error.message : String(error)
+            }`,
+        ];
+    }
+    if (nativeEntries.length === 0) {
+        return [];
+    }
+    return [
+        [
+            `Packaged app.asar must not contain embedded MPV native payloads; afterPack exclusively owns the profile-specific unpacked directory in ${asarPath}.`,
+            ...nativeEntries.map((entry) => `- ${entry}`),
+        ].join('\n'),
+    ];
+}
+
+export function verifyExtractedLinuxFrameCopyRuntime({
+    resourceDir,
+    artifactFormat,
+    profileName,
+    packageDependencies = [],
+    declaredArch = null,
+    elfInspector = defaultElfInspector,
+    probeRunner = runVerifierCommand,
+    environment = process.env,
+    asarListPackage = listAsarPackageEntries,
+}) {
+    const errors = [];
+    let profile;
+    try {
+        profile = resolveLinuxFrameCopyProfile(profileName);
+    } catch (error) {
+        return [error instanceof Error ? error.message : String(error)];
+    }
+    if (!profile.targets.includes(artifactFormat)) {
+        return [
+            `Linux frame-copy profile "${profile.name}" does not include target "${artifactFormat}".`,
+        ];
+    }
+    errors.push(
+        ...validateNoEmbeddedMpvNativeArchiveEntries(
+            resourceDir,
+            asarListPackage
+        )
+    );
+
+    const electronPath = resolveElectronBinaryPath(resourceDir, artifactFormat);
+    let packageArch;
+    try {
+        packageArch = readElfArchitecture(electronPath);
+    } catch (error) {
+        return [
+            ...errors,
+            error instanceof Error ? error.message : String(error),
+        ];
+    }
+    const foreignArch = packageArch !== 'x64';
+    if (declaredArch && declaredArch !== packageArch) {
+        errors.push(
+            `Package metadata architecture ${declaredArch} does not match Electron ELF architecture ${packageArch}.`
+        );
+    }
+    if (profile.runtimeMode === 'system') {
+        errors.push(
+            ...(foreignArch
+                ? validateForeignPackageDependencies(
+                      artifactFormat,
+                      packageDependencies
+                  )
+                : validateSystemPackageDependencies(
+                      artifactFormat,
+                      packageDependencies
+                  ))
+        );
+    }
+
+    errors.push(
+        ...validatePackagedEmbeddedMpv(resourceDir, {
+            platform: 'linux',
+            required: true,
+            foreignArch,
+            targetArch: packageArch,
+            profile: profile.name,
+            targetNames: profile.targets,
+            artifactFormat,
+            hostPlatform: 'linux',
+            executableName: 'iptvnator',
+            elfInspector,
+        })
+    );
+    errors.push(
+        ...validateElectronIsolation(resourceDir, artifactFormat, elfInspector)
+    );
+    if (foreignArch || errors.length > 0) {
+        return errors;
+    }
+
+    const nativeDir = path.join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    const probeEnvironment = createRuntimeProbeEnvironment({
+        environment,
+        nativeDir,
+        runtimeMode: profile.runtimeMode,
+    });
+    const probeResult = probeRunner(
+        path.join(nativeDir, 'iptvnator_mpv_helper'),
+        ['--runtime-probe'],
+        {
+            encoding: 'utf8',
+            env: probeEnvironment,
+            killSignal: 'SIGKILL',
+            maxBuffer: RUNTIME_PROBE_MAX_BUFFER_BYTES,
+            timeout: RUNTIME_PROBE_TIMEOUT_MS,
+            windowsHide: true,
+        }
+    );
+    errors.push(...validateProbeResult(probeResult));
+    return errors;
+}
+
+export function verifyLinuxFrameCopyArtifact({
+    artifactPath,
+    profileName,
+    runCommand = runVerifierCommand,
+    extractArtifact = extractLinuxArtifact,
+    metadataReader = readLinuxArtifactMetadata,
+    payloadVerifier = verifyExtractedLinuxFrameCopyRuntime,
+    elfInspector = defaultElfInspector,
+    probeRunner = runVerifierCommand,
+    environment = process.env,
+}) {
+    const resolvedArtifactPath = path.resolve(artifactPath);
+    const artifactStat = fs.lstatSync(resolvedArtifactPath);
+    if (!artifactStat.isFile() || artifactStat.isSymbolicLink()) {
+        throw new Error(
+            `Linux package artifact must be a regular file: ${resolvedArtifactPath}`
+        );
+    }
+    const profile = resolveLinuxFrameCopyProfile(profileName);
+    const format = detectLinuxArtifactFormat(resolvedArtifactPath);
+    if (!profile.targets.includes(format)) {
+        throw new Error(
+            `Linux frame-copy profile "${profile.name}" does not include target "${format}".`
+        );
+    }
+
+    const temporaryRoot = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-linux-package-verifier-')
+    );
+    try {
+        const extractionDestination = path.join(temporaryRoot, 'payload');
+        const extractionRoot = extractArtifact({
+            artifactPath: resolvedArtifactPath,
+            format,
+            destination: extractionDestination,
+            runCommand,
+        });
+        if (format === 'snap') {
+            const snapMetadataErrors =
+                validateExtractedSnapMetadata(extractionRoot);
+            if (snapMetadataErrors.length > 0) {
+                throw new Error(
+                    [
+                        `Linux frame-copy package verification failed for ${resolvedArtifactPath}:`,
+                        ...snapMetadataErrors.map((error) => `- ${error}`),
+                    ].join('\n')
+                );
+            }
+        }
+        const resourceDir = findExtractedResourceDir(extractionRoot);
+        const metadata = metadataReader({
+            artifactPath: resolvedArtifactPath,
+            format,
+            extractionRoot,
+            runCommand,
+        });
+        const errors = payloadVerifier({
+            resourceDir,
+            artifactFormat: format,
+            profileName: profile.name,
+            packageDependencies: metadata.dependencies,
+            declaredArch: metadata.declaredArch,
+            elfInspector,
+            probeRunner,
+            environment,
+        });
+        if (errors.length > 0) {
+            throw new Error(
+                [
+                    `Linux frame-copy package verification failed for ${resolvedArtifactPath}:`,
+                    ...errors.map((error) => `- ${error}`),
+                ].join('\n')
+            );
+        }
+        const electronPath = resolveElectronBinaryPath(resourceDir, format);
+        return {
+            artifactPath: resolvedArtifactPath,
+            format,
+            profileName: profile.name,
+            architecture: readElfArchitecture(electronPath),
+        };
+    } finally {
+        fs.rmSync(temporaryRoot, { recursive: true, force: true });
+    }
+}
+
+function main() {
+    const options = parseVerifierArguments(process.argv.slice(2));
+    const result = verifyLinuxFrameCopyArtifact(options);
+    process.stdout.write(
+        `Verified ${result.format} ${result.architecture} Linux frame-copy package (${result.profileName}): ${result.artifactPath}\n`
+    );
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === scriptPath) {
+    try {
+        main();
+    } catch (error) {
+        process.stderr.write(
+            `${error instanceof Error ? error.message : String(error)}\n`
+        );
+        process.exitCode = 1;
+    }
+}
diff --git a/tools/packaging/verify-linux-frame-copy-runtime.test.mjs b/tools/packaging/verify-linux-frame-copy-runtime.test.mjs
new file mode 100644
index 000000000..0a92857ea
--- /dev/null
+++ b/tools/packaging/verify-linux-frame-copy-runtime.test.mjs
@@ -0,0 +1,1947 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+
+import {
+    createRuntimeProbeEnvironment,
+    detectLinuxArtifactFormat,
+    extractLinuxArtifact,
+    findAppImageSquashfsOffsets,
+    findExtractedResourceDir,
+    parseVerifierArguments,
+    readLinuxArtifactMetadata,
+    readElfArchitecture,
+    runVerifierCommand,
+    validateSystemPackageDependencies,
+    validateExtractedSnapMetadata,
+    verifyExtractedLinuxFrameCopyRuntime,
+    verifyLinuxFrameCopyArtifact,
+} from './verify-linux-frame-copy-runtime.mjs';
+
+const runtimeProbeContractUrl = new URL(
+    '../embedded-mpv/runtime-probe-contract.cjs',
+    import.meta.url
+);
+const runtimeProbeContractTypesUrl = new URL(
+    '../embedded-mpv/runtime-probe-contract.d.cts',
+    import.meta.url
+);
+const verifierUrl = new URL(
+    './verify-linux-frame-copy-runtime.mjs',
+    import.meta.url
+);
+const backendRuntimeContractsUrl = new URL(
+    '../../apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/contracts.ts',
+    import.meta.url
+);
+const backendRuntimeProbeUrl = new URL(
+    '../../apps/electron-backend/src/app/services/embedded-mpv-frame-copy-runtime/probe.ts',
+    import.meta.url
+);
+const electronBackendProjectUrl = new URL(
+    '../../apps/electron-backend/project.json',
+    import.meta.url
+);
+const SYSTEM_TARGETS = ['deb', 'pacman', 'rpm'];
+const SYSTEM_MANIFEST = {
+    schemaVersion: 1,
+    origin: 'system-libmpv-frame-copy',
+    generatedAt: '2026-07-17T00:00:00.000Z',
+    platform: 'linux',
+    arch: 'x64',
+    profile: 'system',
+    runtimeMode: 'system',
+    targets: SYSTEM_TARGETS,
+    artifacts: {
+        addon: {
+            name: 'embedded_mpv.node',
+            regularFile: true,
+            readable: true,
+        },
+        frameReader: {
+            name: 'embedded_mpv_frame_reader.node',
+            regularFile: true,
+            readable: true,
+        },
+        helper: {
+            name: 'iptvnator_mpv_helper',
+            regularFile: true,
+            readable: true,
+            executable: true,
+        },
+    },
+    processIsolation: {
+        addonLoadsLibmpv: false,
+        readerLoadsLibmpv: false,
+        electronLoadsLibmpv: false,
+        helperLinksLibmpv: true,
+        helperRunpath: ['$ORIGIN/lib'],
+    },
+    nativeViewFallback: 'process-isolated mpv --wid',
+    libmpvSoname: 'libmpv.so.2',
+    packageDependencies: {
+        deb: ['libmpv2', 'libegl1', 'libgl1', 'libgbm1'],
+        rpm: ['mpv-libs', 'libglvnd-egl', 'libglvnd-glx', 'mesa-libgbm'],
+        pacman: ['mpv', 'libglvnd', 'mesa'],
+    },
+    runtimeFiles: [],
+    runtimeTotalBytes: 0,
+};
+const DEB_SYSTEM_PACKAGE_DEPENDENCIES = [
+    'libmpv2',
+    'libegl1',
+    'libgl1',
+    'libgbm1',
+];
+
+test('uses the shared frozen runtime probe resource contract', async () => {
+    assert.equal(
+        fs.existsSync(runtimeProbeContractUrl),
+        true,
+        'the shared runtime probe contract must exist'
+    );
+    assert.equal(
+        fs.existsSync(runtimeProbeContractTypesUrl),
+        true,
+        'the shared runtime probe contract types must exist'
+    );
+
+    const { default: runtimeProbeContract } = await import(
+        runtimeProbeContractUrl.href
+    );
+    assert.equal(Object.isFrozen(runtimeProbeContract), true);
+    assert.equal(runtimeProbeContract.RUNTIME_PROBE_TIMEOUT_MS, 3000);
+    assert.equal(
+        runtimeProbeContract.RUNTIME_PROBE_MAX_BUFFER_BYTES,
+        16 * 1024 * 1024
+    );
+    assert.match(
+        fs.readFileSync(runtimeProbeContractTypesUrl, 'utf8'),
+        /readonly RUNTIME_PROBE_TIMEOUT_MS: 3000/
+    );
+    assert.match(
+        fs.readFileSync(runtimeProbeContractTypesUrl, 'utf8'),
+        /readonly RUNTIME_PROBE_MAX_BUFFER_BYTES: 16777216/
+    );
+
+    const verifierSource = fs.readFileSync(verifierUrl, 'utf8');
+    assert.match(
+        verifierSource,
+        /require\(['"]\.\.\/embedded-mpv\/runtime-probe-contract\.cjs['"]\)/
+    );
+    assert.doesNotMatch(
+        verifierSource,
+        /const RUNTIME_PROBE_TIMEOUT_MS\s*=\s*3000/
+    );
+
+    const backendContractsSource = fs.readFileSync(
+        backendRuntimeContractsUrl,
+        'utf8'
+    );
+    assert.match(
+        backendContractsSource,
+        /import runtimeProbeContract = require\(['"][^'"]*\/runtime-probe-contract\.cjs['"]\)/
+    );
+    assert.match(
+        backendContractsSource,
+        /export const \{\s*RUNTIME_PROBE_MAX_BUFFER_BYTES,\s*RUNTIME_PROBE_TIMEOUT_MS,?\s*\}\s*=\s*runtimeProbeContract/
+    );
+    assert.doesNotMatch(
+        backendContractsSource,
+        /RUNTIME_PROBE_TIMEOUT_MS\s*=\s*3000/
+    );
+    for (const sourceUrl of [verifierUrl, backendRuntimeProbeUrl]) {
+        assert.match(
+            fs.readFileSync(sourceUrl, 'utf8'),
+            /maxBuffer:\s*RUNTIME_PROBE_MAX_BUFFER_BYTES/
+        );
+    }
+});
+
+test('preserves the child-process default unless an explicit capture bound is requested', () => {
+    const outputScript = 'process.stdout.write("x".repeat(2 * 1024 * 1024))';
+    const defaultCapture = runVerifierCommand(process.execPath, [
+        '-e',
+        outputScript,
+    ]);
+    assert.equal(defaultCapture.error?.code, 'ENOBUFS');
+
+    const explicitCapture = runVerifierCommand(
+        process.execPath,
+        ['-e', outputScript],
+        { maxBuffer: 3 * 1024 * 1024 }
+    );
+    assert.equal(explicitCapture.error, undefined);
+    assert.equal(explicitCapture.status, 0);
+    assert.equal(explicitCapture.stdout.length, 2 * 1024 * 1024);
+});
+
+test('tracks the shared probe contract in cached backend targets and runtime lint', () => {
+    const backendProject = JSON.parse(
+        fs.readFileSync(electronBackendProjectUrl, 'utf8')
+    );
+    const contractInputs = [
+        '{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.cjs',
+        '{workspaceRoot}/tools/embedded-mpv/runtime-probe-contract.d.cts',
+    ];
+
+    for (const targetName of ['build', 'build-e2e', 'test', 'lint']) {
+        const inputs = backendProject.targets[targetName]?.inputs ?? [];
+        for (const contractInput of contractInputs) {
+            assert.ok(
+                inputs.includes(contractInput),
+                `${targetName} must track ${contractInput}`
+            );
+        }
+    }
+
+    assert.match(
+        backendProject.targets.lint.command,
+        /embedded-mpv-frame-copy-runtime\.ts/
+    );
+    assert.match(
+        backendProject.targets.lint.command,
+        /embedded-mpv-frame-copy-runtime\/\*\*\/\*\.ts/
+    );
+});
+
+function elfHeader(architecture) {
+    const machines = {
+        x64: 62,
+        arm64: 183,
+        armv7l: 40,
+    };
+    const image = Buffer.alloc(64);
+    image.set([0x7f, 0x45, 0x4c, 0x46, 2, 1], 0);
+    image.writeUInt16LE(machines[architecture], 18);
+    return image;
+}
+
+function createSystemPayload({
+    architecture = 'x64',
+    electronBinaryName = 'iptvnator.bin',
+} = {}) {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-layout-')
+    );
+    const appDir = path.join(root, 'opt', 'IPTVnator');
+    const resourceDir = path.join(appDir, 'resources');
+    const nativeDir = path.join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(nativeDir, { recursive: true });
+    fs.writeFileSync(
+        path.join(appDir, electronBinaryName),
+        elfHeader(architecture)
+    );
+
+    if (architecture === 'x64') {
+        fs.writeFileSync(path.join(nativeDir, 'embedded_mpv.node'), 'addon', {
+            mode: 0o644,
+        });
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded_mpv_frame_reader.node'),
+            'reader',
+            { mode: 0o644 }
+        );
+        fs.writeFileSync(
+            path.join(nativeDir, 'iptvnator_mpv_helper'),
+            'helper',
+            { mode: 0o755 }
+        );
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded-mpv-runtime.json'),
+            `${JSON.stringify(SYSTEM_MANIFEST, null, 2)}\n`,
+            { mode: 0o644 }
+        );
+    } else {
+        fs.writeFileSync(
+            path.join(nativeDir, 'embedded-mpv-unavailable.txt'),
+            `Unavailable for ${architecture}\n`
+        );
+    }
+
+    return { root, appDir, resourceDir, nativeDir };
+}
+
+function validElfInspector(binaryPath) {
+    const name = path.basename(binaryPath);
+    if (name === 'iptvnator_mpv_helper') {
+        return {
+            soname: null,
+            needed: ['libc.so.6', 'libmpv.so.2'],
+            rpath: [],
+            runpath: ['$ORIGIN/lib'],
+        };
+    }
+    return {
+        soname: null,
+        needed: ['libc.so.6'],
+        rpath: [],
+        runpath: [],
+    };
+}
+
+function successfulProbeRunner() {
+    return {
+        status: 0,
+        signal: null,
+        stdout: '{"protocol":1,"usable":true,"libmpv":"0.41.0","renderApi":"egl"}\n',
+        stderr: '',
+    };
+}
+
+test('detects every supported Linux package payload format', () => {
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.AppImage'), 'appimage');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.deb'), 'deb');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.rpm'), 'rpm');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.pacman'), 'pacman');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.pkg.tar.zst'), 'pacman');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.snap'), 'snap');
+    assert.equal(detectLinuxArtifactFormat('IPTVnator.flatpak'), 'flatpak');
+    assert.throws(
+        () => detectLinuxArtifactFormat('IPTVnator.tar.gz'),
+        /Unsupported Linux package artifact/
+    );
+});
+
+test('parses the required artifact and profile arguments without evaluating paths', () => {
+    const directory = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-args-')
+    );
+    const artifactPath = path.join(directory, 'package $(touch owned).deb');
+    fs.writeFileSync(artifactPath, 'fixture');
+
+    try {
+        assert.deepEqual(
+            parseVerifierArguments([
+                '--artifact',
+                artifactPath,
+                '--profile',
+                'system',
+            ]),
+            {
+                artifactPath: path.resolve(artifactPath),
+                profileName: 'system',
+            }
+        );
+        assert.throws(
+            () => parseVerifierArguments(['--artifact', artifactPath]),
+            /--profile/
+        );
+        assert.throws(
+            () =>
+                parseVerifierArguments([
+                    '--artifact',
+                    artifactPath,
+                    '--profile',
+                    'standard',
+                ]),
+            /Unsupported Linux frame-copy profile/
+        );
+        assert.throws(
+            () =>
+                parseVerifierArguments([
+                    '--artifact',
+                    artifactPath,
+                    '--artifact',
+                    artifactPath,
+                    '--profile',
+                    'system',
+                ]),
+            /duplicate --artifact/
+        );
+        assert.throws(
+            () =>
+                parseVerifierArguments([
+                    '--artifact',
+                    artifactPath,
+                    '--profile',
+                    'system',
+                    '--profile',
+                    'system',
+                ]),
+            /duplicate --profile/
+        );
+    } finally {
+        fs.rmSync(directory, { recursive: true, force: true });
+    }
+});
+
+test('extracts every payload format with argument arrays and no shell', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-extract-')
+    );
+    const invocations = [];
+    const runCommand = (command, args, options = {}) => {
+        invocations.push({ command, args: [...args], cwd: options.cwd });
+        if (command === 'ostree' && args[0] === 'refs') {
+            return {
+                status: 0,
+                stdout: 'app/com.fourgray.iptvnator/x86_64/stable\n',
+                stderr: '',
+            };
+        }
+        return { status: 0, stdout: '', stderr: '' };
+    };
+
+    try {
+        for (const [format, fileName] of [
+            ['appimage', 'IPTVnator.AppImage'],
+            ['deb', 'IPTVnator.deb'],
+            ['rpm', 'IPTVnator.rpm'],
+            ['pacman', 'IPTVnator.pacman'],
+            ['snap', 'IPTVnator.snap'],
+            ['flatpak', 'IPTVnator.flatpak'],
+        ]) {
+            const artifactPath = path.join(root, fileName);
+            const destination = path.join(root, `${format}-payload`);
+            fs.writeFileSync(
+                artifactPath,
+                format === 'appimage'
+                    ? Buffer.concat([Buffer.alloc(4096), Buffer.from('hsqs')])
+                    : 'fixture'
+            );
+            fs.mkdirSync(destination);
+            extractLinuxArtifact({
+                artifactPath,
+                format,
+                destination,
+                runCommand,
+            });
+        }
+
+        assert.deepEqual(
+            invocations.map(({ command }) => command),
+            [
+                'unsquashfs',
+                'dpkg-deb',
+                'bsdtar',
+                'bsdtar',
+                'unsquashfs',
+                'ostree',
+                'flatpak',
+                'ostree',
+                'ostree',
+            ]
+        );
+        assert.equal(
+            invocations.some(
+                ({ command, args }) =>
+                    ['sh', 'bash'].includes(command) || args.includes('-c')
+            ),
+            false
+        );
+        assert.deepEqual(invocations[1].args.slice(0, 2), [
+            '--extract',
+            path.join(root, 'IPTVnator.deb'),
+        ]);
+        assert.deepEqual(invocations[2].args.slice(0, 2), [
+            '--extract',
+            '--file',
+        ]);
+        assert.deepEqual(invocations[4].args.slice(0, 2), [
+            '-no-progress',
+            '-dest',
+        ]);
+        assert.equal(invocations[5].args[1], 'init');
+        assert.ok(invocations[5].args.includes('--mode=archive-z2'));
+        assert.equal(invocations[8].args[0], 'checkout');
+        assert.ok(invocations[8].args.includes('-U'));
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('gives unsquashfs a fresh destination for every AppImage and Snap extraction', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-unsquashfs-')
+    );
+    const appImagePath = path.join(root, 'IPTVnator.AppImage');
+    const snapPath = path.join(root, 'IPTVnator.snap');
+    const appImageDestination = path.join(root, 'appimage-payload');
+    const snapDestination = path.join(root, 'snap-payload');
+    fs.writeFileSync(
+        appImagePath,
+        Buffer.concat([
+            Buffer.alloc(128),
+            Buffer.from('hsqs'),
+            Buffer.alloc(64),
+            Buffer.from('hsqs'),
+        ])
+    );
+    fs.writeFileSync(snapPath, 'snap fixture');
+    fs.mkdirSync(appImageDestination);
+    fs.mkdirSync(snapDestination);
+    let appImageAttempt = 0;
+
+    try {
+        extractLinuxArtifact({
+            artifactPath: appImagePath,
+            format: 'appimage',
+            destination: appImageDestination,
+            runCommand: (command) => {
+                assert.equal(command, 'unsquashfs');
+                assert.equal(fs.existsSync(appImageDestination), false);
+                appImageAttempt += 1;
+                fs.mkdirSync(appImageDestination);
+                return {
+                    status: appImageAttempt === 1 ? 1 : 0,
+                    stdout: '',
+                    stderr: '',
+                };
+            },
+        });
+        assert.equal(appImageAttempt, 2);
+
+        extractLinuxArtifact({
+            artifactPath: snapPath,
+            format: 'snap',
+            destination: snapDestination,
+            runCommand: (command) => {
+                assert.equal(command, 'unsquashfs');
+                assert.equal(fs.existsSync(snapDestination), false);
+                fs.mkdirSync(snapDestination);
+                return { status: 0, stdout: '', stderr: '' };
+            },
+        });
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('initializes a user-checkout OSTree repository before importing Flatpak bundles', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-flatpak-repo-')
+    );
+    const artifactPath = path.join(root, 'IPTVnator.flatpak');
+    const destination = path.join(root, 'flatpak-payload');
+    const invocations = [];
+    let initializedRepository = null;
+    fs.writeFileSync(artifactPath, 'flatpak fixture');
+
+    try {
+        extractLinuxArtifact({
+            artifactPath,
+            format: 'flatpak',
+            destination,
+            runCommand: (command, args) => {
+                invocations.push([command, ...args]);
+                if (command === 'ostree' && args.includes('init')) {
+                    initializedRepository = args
+                        .find((argument) => argument.startsWith('--repo='))
+                        ?.slice('--repo='.length);
+                    assert.ok(args.includes('--mode=archive-z2'));
+                    return { status: 0, stdout: '', stderr: '' };
+                }
+                if (command === 'flatpak') {
+                    assert.equal(args[0], 'build-import-bundle');
+                    assert.equal(args[1], initializedRepository);
+                    if (!initializedRepository) {
+                        return {
+                            status: 1,
+                            stdout: '',
+                            stderr: 'error: opening repo: opendir(objects): No such file or directory',
+                        };
+                    }
+                    return { status: 0, stdout: '', stderr: '' };
+                }
+                if (command === 'ostree' && args[0] === 'refs') {
+                    return {
+                        status: 0,
+                        stdout: 'app/com.fourgray.iptvnator/x86_64/stable\n',
+                        stderr: '',
+                    };
+                }
+                if (command === 'ostree' && args[0] === 'checkout') {
+                    assert.ok(args.includes('-U'));
+                    return { status: 0, stdout: '', stderr: '' };
+                }
+                throw new Error(`Unexpected command: ${command}`);
+            },
+        });
+
+        assert.deepEqual(
+            invocations.map(([command, ...args]) => [
+                command,
+                args.find((argument) =>
+                    [
+                        'init',
+                        'build-import-bundle',
+                        'refs',
+                        'checkout',
+                    ].includes(argument)
+                ),
+            ]),
+            [
+                ['ostree', 'init'],
+                ['flatpak', 'build-import-bundle'],
+                ['ostree', 'refs'],
+                ['ostree', 'checkout'],
+            ]
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('locates AppImage SquashFS payloads without executing a foreign-arch runtime', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-appimage-')
+    );
+    const artifactPath = path.join(root, 'arm64.AppImage');
+    fs.writeFileSync(
+        artifactPath,
+        Buffer.concat([
+            Buffer.alloc(128, 0x41),
+            Buffer.from('hsqs'),
+            Buffer.alloc(64),
+            Buffer.from('hsqs'),
+        ])
+    );
+    try {
+        assert.deepEqual(findAppImageSquashfsOffsets(artifactPath), [128, 196]);
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('finds one packaged native payload under arbitrary format roots', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-payload-')
+    );
+    const resourceDir = path.join(root, 'opt', 'IPTVnator', 'resources');
+    const nativeDir = path.join(
+        resourceDir,
+        'app.asar.unpacked',
+        'electron-backend',
+        'native'
+    );
+    fs.mkdirSync(nativeDir, { recursive: true });
+
+    try {
+        assert.equal(findExtractedResourceDir(root), resourceDir);
+        const duplicateNativeDir = path.join(
+            root,
+            'duplicate',
+            'resources',
+            'app.asar.unpacked',
+            'electron-backend',
+            'native'
+        );
+        fs.mkdirSync(duplicateNativeDir, { recursive: true });
+        assert.throws(
+            () => findExtractedResourceDir(root),
+            /exactly one embedded MPV native payload/
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('reads x64, arm64, and armv7 ELF architectures without host execution', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-elf-')
+    );
+    try {
+        for (const architecture of ['x64', 'arm64', 'armv7l']) {
+            const binaryPath = path.join(root, architecture);
+            fs.writeFileSync(binaryPath, elfHeader(architecture));
+            assert.equal(readElfArchitecture(binaryPath), architecture);
+        }
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('requires every direct helper runtime dependency for DEB, RPM, and Pacman', () => {
+    assert.deepEqual(
+        validateSystemPackageDependencies('deb', [
+            'libmpv2 (>= 0.35)',
+            'libegl1',
+            'libgl1',
+            'libgbm1',
+            'libc6',
+        ]),
+        []
+    );
+    assert.deepEqual(
+        validateSystemPackageDependencies('rpm', [
+            'mpv-libs',
+            'libglvnd-egl',
+            'libglvnd-glx',
+            'mesa-libgbm',
+            'glibc',
+        ]),
+        []
+    );
+    assert.deepEqual(
+        validateSystemPackageDependencies('pacman', [
+            'mpv>=0.35',
+            'libglvnd',
+            'mesa',
+            'glibc',
+        ]),
+        []
+    );
+    assert.match(
+        validateSystemPackageDependencies('deb', [
+            'libmpv2',
+            'libegl1',
+            'libgbm1',
+        ])[0],
+        /libgl1/
+    );
+});
+
+test('reads DEB and RPM metadata without shell pipelines', () => {
+    const invocations = [];
+    const runCommand = (command, args) => {
+        invocations.push({ command, args: [...args] });
+        if (command === 'dpkg-deb' && args.at(-1) === 'Architecture') {
+            return { status: 0, stdout: 'amd64\n', stderr: '' };
+        }
+        if (command === 'dpkg-deb') {
+            return {
+                status: 0,
+                stdout: 'libmpv2 (>= 0.35), libc6\n',
+                stderr: '',
+            };
+        }
+        if (command === 'rpm' && args.includes('%{ARCH}\\n')) {
+            return { status: 0, stdout: 'x86_64\n', stderr: '' };
+        }
+        return {
+            status: 0,
+            stdout: 'mpv-libs\nglibc\n',
+            stderr: '',
+        };
+    };
+
+    assert.deepEqual(
+        readLinuxArtifactMetadata({
+            artifactPath: '/tmp/package name.deb',
+            format: 'deb',
+            extractionRoot: '/tmp/payload',
+            runCommand,
+        }),
+        {
+            declaredArch: 'x64',
+            dependencies: ['libmpv2 (>= 0.35)', 'libc6'],
+        }
+    );
+    assert.deepEqual(
+        readLinuxArtifactMetadata({
+            artifactPath: '/tmp/package name.rpm',
+            format: 'rpm',
+            extractionRoot: '/tmp/payload',
+            runCommand,
+        }),
+        {
+            declaredArch: 'x64',
+            dependencies: ['mpv-libs', 'glibc'],
+        }
+    );
+    assert.equal(
+        invocations.some(
+            ({ command, args }) =>
+                ['sh', 'bash'].includes(command) || args.includes('-c')
+        ),
+        false
+    );
+});
+
+test('reads Pacman architecture and dependencies from the extracted .PKGINFO', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-pacman-')
+    );
+    fs.writeFileSync(
+        path.join(root, '.PKGINFO'),
+        [
+            'pkgname = iptvnator',
+            'arch = x86_64',
+            'depend = mpv>=0.35',
+            'depend = glibc',
+            '',
+        ].join('\n')
+    );
+    try {
+        assert.deepEqual(
+            readLinuxArtifactMetadata({
+                artifactPath: '/tmp/package.pacman',
+                format: 'pacman',
+                extractionRoot: root,
+            }),
+            {
+                declaredArch: 'x64',
+                dependencies: ['mpv>=0.35', 'glibc'],
+            }
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('validates an x64 system payload and executes one bounded helper probe', () => {
+    const fixture = createSystemPayload();
+    const probeCalls = [];
+    try {
+        const errors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'deb',
+            profileName: 'system',
+            packageDependencies: [
+                'libmpv2 (>= 0.35)',
+                'libegl1',
+                'libgl1',
+                'libgbm1',
+            ],
+            elfInspector: validElfInspector,
+            probeRunner(command, args, options) {
+                probeCalls.push({ command, args, options });
+                return successfulProbeRunner();
+            },
+            environment: {
+                PATH: '/usr/bin',
+                LD_AUDIT: '/host/can-inject-audit.so',
+                LD_LIBRARY_PATH: '/host/can-mask-missing-dependencies',
+                LD_PRELOAD: '/host/can-inject.so',
+            },
+        });
+        assert.deepEqual(errors, []);
+        assert.equal(probeCalls.length, 1);
+        assert.equal(
+            probeCalls[0].command,
+            path.join(fixture.nativeDir, 'iptvnator_mpv_helper')
+        );
+        assert.deepEqual(probeCalls[0].args, ['--runtime-probe']);
+        assert.deepEqual(probeCalls[0].options, {
+            encoding: 'utf8',
+            env: { PATH: '/usr/bin' },
+            killSignal: 'SIGKILL',
+            maxBuffer: 16 * 1024 * 1024,
+            timeout: 3000,
+            windowsHide: true,
+        });
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('rejects any stale embedded MPV native payload hidden inside app.asar', () => {
+    const fixture = createSystemPayload();
+    fs.writeFileSync(path.join(fixture.resourceDir, 'app.asar'), 'fixture');
+    try {
+        const errors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'deb',
+            profileName: 'system',
+            packageDependencies: DEB_SYSTEM_PACKAGE_DEPENDENCIES,
+            elfInspector: validElfInspector,
+            probeRunner: successfulProbeRunner,
+            asarListPackage: () => [
+                '/electron-backend/main.js',
+                '/electron-backend/native/iptvnator_mpv_helper',
+                '/electron-backend/native/lib/libmpv.so.2',
+            ],
+        });
+        assert.match(
+            errors.join('\n'),
+            /app\.asar must not contain embedded MPV native payloads.*iptvnator_mpv_helper.*libmpv\.so\.2/s
+        );
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('excludes only Snap template library roots from Electron isolation checks', () => {
+    const fixture = createSystemPayload({ architecture: 'arm64' });
+    const packageLibraryDirs = [
+        path.join(fixture.appDir, 'lib', 'x86_64-linux-gnu'),
+        path.join(fixture.appDir, 'usr', 'lib', 'x86_64-linux-gnu'),
+    ];
+    const electronLibrary = path.join(fixture.appDir, 'libelectron-extra.so');
+    for (const [index, packageLibraryDir] of packageLibraryDirs.entries()) {
+        const packageLibraryTarget = path.join(
+            packageLibraryDir,
+            `libpackage-${index}.so.0.12.2`
+        );
+        fs.mkdirSync(packageLibraryDir, { recursive: true });
+        fs.writeFileSync(packageLibraryTarget, 'package-managed library');
+        fs.symlinkSync(
+            path.basename(packageLibraryTarget),
+            path.join(packageLibraryDir, `libpackage-${index}.so.0`)
+        );
+    }
+    fs.writeFileSync(electronLibrary, 'electron library');
+
+    const inspectedPaths = [];
+    const isPackageLibraryPath = (binaryPath) =>
+        packageLibraryDirs.some((packageLibraryDir) =>
+            path
+                .resolve(binaryPath)
+                .startsWith(`${path.resolve(packageLibraryDir)}${path.sep}`)
+        );
+    const ownershipScopedElfInspector = (binaryPath) => {
+        inspectedPaths.push(binaryPath);
+        if (isPackageLibraryPath(binaryPath)) {
+            throw new Error(
+                'package-manager library tree crossed the Electron ownership boundary'
+            );
+        }
+        return validElfInspector(binaryPath);
+    };
+
+    try {
+        assert.deepEqual(
+            verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'snap',
+                profileName: 'portable',
+                packageDependencies: [],
+                elfInspector: ownershipScopedElfInspector,
+                probeRunner() {
+                    assert.fail('foreign-architecture Snap must not probe');
+                },
+            }),
+            []
+        );
+        assert.ok(inspectedPaths.includes(electronLibrary));
+        assert.equal(inspectedPaths.some(isPackageLibraryPath), false);
+
+        const isolationErrors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'snap',
+            profileName: 'portable',
+            packageDependencies: [],
+            elfInspector(binaryPath) {
+                if (binaryPath === electronLibrary) {
+                    return {
+                        soname: null,
+                        needed: ['libmpv.so.2'],
+                        rpath: [],
+                        runpath: [],
+                    };
+                }
+                return ownershipScopedElfInspector(binaryPath);
+            },
+            probeRunner() {
+                assert.fail('foreign-architecture Snap must not probe');
+            },
+        });
+        assert.match(
+            isolationErrors.join('\n'),
+            /Electron library must not link libmpv.*libelectron-extra\.so/
+        );
+
+        const nestedElectronLibrary = path.join(
+            fixture.appDir,
+            'future-electron-runtime',
+            'libfuture-electron.so'
+        );
+        fs.mkdirSync(path.dirname(nestedElectronLibrary), {
+            recursive: true,
+        });
+        fs.writeFileSync(nestedElectronLibrary, 'nested electron library');
+        const nestedIsolationErrors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'snap',
+            profileName: 'portable',
+            packageDependencies: [],
+            elfInspector(binaryPath) {
+                if (binaryPath === nestedElectronLibrary) {
+                    return {
+                        soname: null,
+                        needed: ['libmpv.so.2'],
+                        rpath: [],
+                        runpath: [],
+                    };
+                }
+                return ownershipScopedElfInspector(binaryPath);
+            },
+            probeRunner() {
+                assert.fail('foreign-architecture Snap must not probe');
+            },
+        });
+        assert.match(
+            nestedIsolationErrors.join('\n'),
+            /Electron library must not link libmpv.*libfuture-electron\.so/
+        );
+
+        fs.symlinkSync(
+            path.basename(electronLibrary),
+            path.join(fixture.appDir, 'libEGL.so')
+        );
+        const symlinkErrors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'snap',
+            profileName: 'portable',
+            packageDependencies: [],
+            elfInspector: ownershipScopedElfInspector,
+            probeRunner() {
+                assert.fail('foreign-architecture Snap must not probe');
+            },
+        });
+        assert.match(
+            symlinkErrors.join('\n'),
+            /Electron library must be a regular file: .*libEGL\.so/
+        );
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('rejects helper probes terminated by a signal or hard timeout', () => {
+    for (const probeResult of [
+        {
+            status: null,
+            signal: 'SIGKILL',
+            stdout: '',
+            stderr: '',
+        },
+        {
+            error: Object.assign(new Error('spawnSync helper ETIMEDOUT'), {
+                code: 'ETIMEDOUT',
+            }),
+            status: null,
+            signal: 'SIGKILL',
+            stdout: '',
+            stderr: '',
+        },
+    ]) {
+        const fixture = createSystemPayload();
+        try {
+            const errors = verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'deb',
+                profileName: 'system',
+                packageDependencies: DEB_SYSTEM_PACKAGE_DEPENDENCIES,
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    return probeResult;
+                },
+            });
+            assert.match(
+                errors.join('\n'),
+                /(?:runtime probe terminated by signal SIGKILL|Unable to execute .*ETIMEDOUT)/
+            );
+        } finally {
+            fs.rmSync(fixture.root, { recursive: true, force: true });
+        }
+    }
+});
+
+test('requires exact Snap graphics layouts and plugs used by the app', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-snap-metadata-')
+    );
+    const snapYamlPath = path.join(root, 'meta', 'snap.yaml');
+    fs.mkdirSync(path.dirname(snapYamlPath), { recursive: true });
+    fs.mkdirSync(path.join(root, 'graphics'));
+
+    const validSnapYaml = [
+        'name: iptvnator',
+        'base: core22',
+        'confinement: strict',
+        'summary: "*literal &anchor !tag <<: is quoted"',
+        '# *commented-alias &commented-anchor !commented-tag',
+        'apps:',
+        '  iptvnator:',
+        '    command: iptvnator',
+        '    environment:',
+        '      SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform',
+        '    plugs:',
+        '      - desktop',
+        '      - shared-memory',
+        '      - graphics-core22',
+        'plugs:',
+        '  shared-memory:',
+        '    interface: shared-memory',
+        '    private: true',
+        '  graphics-core22:',
+        '    interface: content',
+        '    target: $SNAP/graphics',
+        '    default-provider: mesa-core22',
+        'layout:',
+        '  /usr/share/libdrm:',
+        '    bind: $SNAP/graphics/libdrm',
+        '  /usr/share/drirc.d:',
+        '    symlink: $SNAP/graphics/drirc.d',
+        '',
+    ].join('\n');
+
+    try {
+        fs.writeFileSync(snapYamlPath, validSnapYaml);
+        assert.deepEqual(validateExtractedSnapMetadata(root), []);
+
+        fs.truncateSync(snapYamlPath, 256 * 1024 + 1);
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /Snap metadata exceeds.*size limit/i
+        );
+        fs.writeFileSync(snapYamlPath, validSnapYaml);
+
+        fs.rmSync(path.join(root, 'graphics'), { recursive: true });
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /empty graphics content mount directory/i
+        );
+        fs.mkdirSync(path.join(root, 'graphics'));
+        fs.writeFileSync(path.join(root, 'graphics', 'unexpected'), 'data');
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /graphics content mount directory must be empty/i
+        );
+        fs.rmSync(path.join(root, 'graphics'), { recursive: true });
+        const outsideGraphics = path.join(root, 'outside-graphics');
+        fs.mkdirSync(outsideGraphics);
+        fs.symlinkSync(outsideGraphics, path.join(root, 'graphics'), 'dir');
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /graphics content mount.*real directory/i
+        );
+        fs.rmSync(path.join(root, 'graphics'));
+        fs.mkdirSync(path.join(root, 'graphics'));
+        fs.chmodSync(path.join(root, 'graphics'), 0o700);
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /graphics content mount directory must have mode 0755/i
+        );
+        fs.chmodSync(path.join(root, 'graphics'), 0o755);
+
+        for (const [mutate, expected] of [
+            [
+                (contents) => contents.replace('base: core22', 'base: core20'),
+                /base: core22/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        'confinement: strict',
+                        'confinement: classic'
+                    ),
+                /confinement: strict/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        'layout:\n  /usr/share/libdrm:\n    bind: $SNAP/graphics/libdrm\n  /usr/share/drirc.d:\n    symlink: $SNAP/graphics/drirc.d\n',
+                        ''
+                    ),
+                /exact Snap graphics layout contract/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '  /usr/share/drirc.d:\n',
+                        '  /usr/share/extra:\n    bind: $SNAP/graphics/extra\n  /usr/share/drirc.d:\n'
+                    ),
+                /exactly the libdrm and drirc.d entries/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '  /usr/share/drirc.d:\n',
+                        '  /usr/share/libdrm:\n    bind: $SNAP/graphics/libdrm\n  /usr/share/drirc.d:\n'
+                    ),
+                /layout paths must be unique/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    bind: $SNAP/graphics/libdrm',
+                        '    bind: $SNAP/graphics/wrong-libdrm'
+                    ),
+                /libdrm.*bind: \$SNAP\/graphics\/libdrm/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    symlink: $SNAP/graphics/drirc.d',
+                        '    symlink: $SNAP/graphics/wrong-drirc.d'
+                    ),
+                /drirc.d.*symlink: \$SNAP\/graphics\/drirc.d/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    bind: $SNAP/graphics/libdrm\n',
+                        '    bind: $SNAP/graphics/libdrm\n    type: directory\n'
+                    ),
+                /libdrm layout.*exactly bind/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '      SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform\n',
+                        ''
+                    ),
+                /SNAP_DESKTOP_RUNTIME.*\$SNAP\/gnome-platform/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '$SNAP/gnome-platform',
+                        '$SNAP/hostile-platform'
+                    ),
+                /SNAP_DESKTOP_RUNTIME.*\$SNAP\/gnome-platform/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace('    private: true', '    private: false'),
+                /private: true/,
+            ],
+            [
+                (contents) => contents.replace('      - shared-memory\n', ''),
+                /app.*shared-memory plug/i,
+            ],
+            [
+                (contents) => contents.replace('      - graphics-core22\n', ''),
+                /app.*graphics-core22 plug/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '  shared-memory:\n    interface: shared-memory\n    private: true\n',
+                        ''
+                    ),
+                /top-level shared-memory plug/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '  graphics-core22:\n    interface: content\n    target: $SNAP/graphics\n    default-provider: mesa-core22\n',
+                        ''
+                    ),
+                /top-level graphics-core22 plug/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    interface: content',
+                        '    interface: opengl'
+                    ),
+                /graphics-core22.*interface: content/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    target: $SNAP/graphics',
+                        '    target: $SNAP/wrong-graphics'
+                    ),
+                /graphics-core22.*target: \$SNAP\/graphics/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    default-provider: mesa-core22',
+                        '    default-provider: wrong-provider'
+                    ),
+                /graphics-core22.*default-provider: mesa-core22/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    default-provider: mesa-core22\n',
+                        '    default-provider: mesa-core22\n    source: graphics-core22\n'
+                    ),
+                /graphics-core22 plug.*exactly interface, target, and default-provider/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        [
+                            '',
+                            'plugs:',
+                            '  duplicate-graphics:',
+                            '    interface: content',
+                            '    target: $SNAP/graphics',
+                            '    default-provider: mesa-core22',
+                            '',
+                        ].join('\n')
+                    ),
+                /exactly one plug.*graphics-core22 contract/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        [
+                            '',
+                            'plugs:',
+                            '  competing-graphics:',
+                            '    interface: content',
+                            '    target: $SNAP/graphics',
+                            '    default-provider: hostile-provider',
+                            '    content: alternate-graphics',
+                            '',
+                        ].join('\n')
+                    ),
+                /exactly one plug.*target \$SNAP\/graphics/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '    private: true\n',
+                        '    private: true\n    shared-memory: named-area\n'
+                    ),
+                /private shared-memory plug.*exactly interface and private/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        [
+                            '',
+                            'plugs:',
+                            '  second-shared-memory:',
+                            '    interface: shared-memory',
+                            '    private: true',
+                            '',
+                        ].join('\n')
+                    ),
+                /exactly one plug.*shared-memory interface/i,
+            ],
+            [
+                (contents) =>
+                    `${contents}slots:\n  shared-memory:\n    interface: shared-memory\n`,
+                /must not declare.*shared-memory slot/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        '\nplugs:\n  other: { interface: shared-memory }\n'
+                    ),
+                /plug declarations.*block mappings/i,
+            ],
+            [
+                (contents) =>
+                    `${contents}slots: { leak: { interface: shared-memory } }\n`,
+                /slots.*block mappings/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        '\nplugs:\n  network:\n    interface: network\n  network:\n    interface: network\n'
+                    ),
+                /plug keys.*unique/i,
+            ],
+            [
+                (contents) =>
+                    [
+                        'shared-interface: &shared.interface shared-memory',
+                        contents.replace(
+                            '\nplugs:\n',
+                            '\nplugs:\n  alias-plug:\n    interface: *shared.interface\n'
+                        ),
+                    ].join('\n'),
+                /anchors, aliases, merge keys, or custom tags/i,
+            ],
+            [
+                (contents) =>
+                    [
+                        'shared-interface: &sharedInterface shared-memory',
+                        `${contents}slots:\n  alias-slot:\n    interface: *sharedInterface\n`,
+                    ].join('\n'),
+                /anchors, aliases, merge keys, or custom tags/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        '\nplugs:\n',
+                        '\nplugs:\n  tagged:\n    interface: !shared-memory shared-memory\n'
+                    ),
+                /anchors, aliases, merge keys, or custom tags/i,
+            ],
+            [
+                (contents) =>
+                    [
+                        'shared-plug: &sharedPlug',
+                        '  interface: network',
+                        contents.replace(
+                            '\nplugs:\n',
+                            '\nplugs:\n  merged:\n    <<: *sharedPlug\n'
+                        ),
+                    ].join('\n'),
+                /anchors, aliases, merge keys, or custom tags/i,
+            ],
+            [
+                (contents) =>
+                    contents.replace(
+                        [
+                            '    plugs:',
+                            '      - desktop',
+                            '      - shared-memory',
+                        ].join('\n'),
+                        [
+                            '    plugs:',
+                            '      nested:',
+                            '        - shared-memory',
+                        ].join('\n')
+                    ),
+                /scalar sequence.*shared-memory/i,
+            ],
+        ]) {
+            fs.writeFileSync(snapYamlPath, mutate(validSnapYaml));
+            assert.match(
+                validateExtractedSnapMetadata(root).join('\n'),
+                expected
+            );
+        }
+
+        fs.rmSync(snapYamlPath);
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /Missing extracted Snap metadata/
+        );
+
+        fs.writeFileSync(path.join(root, 'outside.yaml'), validSnapYaml);
+        fs.symlinkSync(
+            path.join(root, 'outside.yaml'),
+            snapYamlPath,
+            process.platform === 'win32' ? 'file' : undefined
+        );
+        assert.match(
+            validateExtractedSnapMetadata(root).join('\n'),
+            /regular file/
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+const SNAP_METADATA_WITH_LITERAL_HASHES = [
+    'name: iptvnator',
+    'base: core22',
+    'confinement: strict',
+    'summary: "quoted # is scalar data"',
+    'description: | # block scalar header comment',
+    '  Block scalar # stays literal.',
+    'apps:',
+    '  iptvnator:',
+    '    command: iptvnator',
+    '    environment:',
+    '      SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform',
+    '    plugs:',
+    '      - shared-memory',
+    '      - graphics-core22',
+    'plugs:',
+    '  shared-memory:',
+    '    interface: shared-memory',
+    '    private: true',
+    '  graphics-core22:',
+    '    interface: content',
+    '    target: $SNAP/graphics',
+    '    default-provider: mesa-core22',
+    'layout:',
+    '  /usr/share/libdrm:',
+    '    bind: $SNAP/graphics/libdrm',
+    '  /usr/share/drirc.d:',
+    '    symlink: $SNAP/graphics/drirc.d',
+    '',
+].join('\n');
+
+for (const [kind, mutate, expected] of [
+    [
+        'plug',
+        (contents) =>
+            contents.replace(
+                '\nplugs:\n',
+                [
+                    '',
+                    'plugs:',
+                    '  hidden-extra-plug:',
+                    '    interface: shared-memory # trailing comment',
+                    '',
+                ].join('\n')
+            ),
+        /exactly one plug.*shared-memory interface/i,
+    ],
+    [
+        'slot',
+        (contents) =>
+            `${contents}slots:\n  hidden-slot:\n    interface: shared-memory # trailing comment\n`,
+        /must not declare.*shared-memory slot/i,
+    ],
+]) {
+    test(`rejects an extra Snap shared-memory ${kind} with a trailing comment`, () => {
+        const root = fs.mkdtempSync(
+            path.join(os.tmpdir(), 'iptvnator-verifier-snap-comments-')
+        );
+        const snapYamlPath = path.join(root, 'meta', 'snap.yaml');
+        fs.mkdirSync(path.dirname(snapYamlPath), { recursive: true });
+        fs.mkdirSync(path.join(root, 'graphics'));
+
+        try {
+            fs.writeFileSync(snapYamlPath, SNAP_METADATA_WITH_LITERAL_HASHES);
+            assert.deepEqual(validateExtractedSnapMetadata(root), []);
+
+            fs.writeFileSync(
+                snapYamlPath,
+                mutate(SNAP_METADATA_WITH_LITERAL_HASHES)
+            );
+            assert.match(
+                validateExtractedSnapMetadata(root).join('\n'),
+                expected
+            );
+        } finally {
+            fs.rmSync(root, { recursive: true, force: true });
+        }
+    });
+}
+
+test('artifact verification enforces Snap metadata for x64 and ARM payloads', () => {
+    for (const architecture of ['x64', 'arm64', 'armv7l']) {
+        const fixture = createSystemPayload({ architecture });
+        const artifactPath = path.join(fixture.root, 'package.snap');
+        const snapYamlPath = path.join(fixture.root, 'meta', 'snap.yaml');
+        fs.writeFileSync(artifactPath, 'fixture');
+        fs.mkdirSync(path.dirname(snapYamlPath), { recursive: true });
+        fs.mkdirSync(path.join(fixture.root, 'graphics'));
+        fs.writeFileSync(
+            snapYamlPath,
+            [
+                'name: iptvnator',
+                'base: core22',
+                'confinement: strict',
+                'apps:',
+                '  iptvnator:',
+                '    command: iptvnator',
+                '    environment:',
+                '      SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform',
+                '    plugs:',
+                '      - desktop',
+                '      - graphics-core22',
+                'plugs:',
+                '  shared-memory:',
+                '    interface: shared-memory',
+                '    private: true',
+                '  graphics-core22:',
+                '    interface: content',
+                '    target: $SNAP/graphics',
+                '    default-provider: mesa-core22',
+                'layout:',
+                '  /usr/share/libdrm:',
+                '    bind: $SNAP/graphics/libdrm',
+                '  /usr/share/drirc.d:',
+                '    symlink: $SNAP/graphics/drirc.d',
+                '',
+            ].join('\n')
+        );
+        let payloadVerifierCalls = 0;
+
+        const verify = () =>
+            verifyLinuxFrameCopyArtifact({
+                artifactPath,
+                profileName: 'portable',
+                extractArtifact() {
+                    return fixture.root;
+                },
+                metadataReader() {
+                    return { declaredArch: architecture, dependencies: [] };
+                },
+                payloadVerifier() {
+                    payloadVerifierCalls += 1;
+                    return [];
+                },
+            });
+
+        try {
+            assert.throws(verify, /app.*shared-memory plug/i);
+            assert.equal(payloadVerifierCalls, 0);
+
+            fs.writeFileSync(
+                snapYamlPath,
+                fs
+                    .readFileSync(snapYamlPath, 'utf8')
+                    .replace('      - desktop\n', '      - shared-memory\n')
+            );
+            assert.deepEqual(verify(), {
+                artifactPath,
+                format: 'snap',
+                profileName: 'portable',
+                architecture,
+            });
+            assert.equal(payloadVerifierCalls, 1);
+        } finally {
+            fs.rmSync(fixture.root, { recursive: true, force: true });
+        }
+    }
+});
+
+test('verifies an outer Flatpak artifact with an unwrapped Electron ELF', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-flatpak-artifact-')
+    );
+    const artifactPath = path.join(root, 'IPTVnator.flatpak');
+    fs.writeFileSync(artifactPath, 'flatpak fixture');
+
+    try {
+        assert.deepEqual(
+            verifyLinuxFrameCopyArtifact({
+                artifactPath,
+                profileName: 'flatpak',
+                extractArtifact({ destination }) {
+                    const appDir = path.join(
+                        destination,
+                        'files',
+                        'lib',
+                        'com.fourgray.iptvnator'
+                    );
+                    const resourceDir = path.join(appDir, 'resources');
+                    const nativeDir = path.join(
+                        resourceDir,
+                        'app.asar.unpacked',
+                        'electron-backend',
+                        'native'
+                    );
+                    fs.mkdirSync(nativeDir, { recursive: true });
+                    fs.writeFileSync(
+                        path.join(appDir, 'iptvnator'),
+                        elfHeader('arm64')
+                    );
+                    fs.writeFileSync(
+                        path.join(nativeDir, 'embedded-mpv-unavailable.txt'),
+                        'Unavailable for arm64\n'
+                    );
+                    return destination;
+                },
+                metadataReader: () => ({
+                    declaredArch: 'arm64',
+                    dependencies: [],
+                }),
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    assert.fail('foreign Flatpak must not probe');
+                },
+            }),
+            {
+                artifactPath: path.resolve(artifactPath),
+                format: 'flatpak',
+                profileName: 'flatpak',
+                architecture: 'arm64',
+            }
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
+
+test('bundled probes remove ambient loader paths and use only packaged libraries', () => {
+    assert.deepEqual(
+        createRuntimeProbeEnvironment({
+            environment: {
+                PATH: '/usr/bin',
+                BASH_ENV: '/host/hostile-bash-env',
+                ENV: '/host/hostile-shell-env',
+                BASHOPTS: 'extdebug',
+                SHELLOPTS: 'xtrace',
+                PS4: '$(/host/hostile-trace-hook)',
+                BASH_XTRACEFD: '9',
+                CDPATH: '/host/hostile-cdpath',
+                'BASH_FUNC_dirname%%':
+                    '() { printf /host/hostile-provider-root; }',
+                LD_AUDIT: '/host/can-inject-audit.so',
+                LD_LIBRARY_PATH: '/host/can-mask-missing-dependencies',
+                LD_ORIGIN_PATH: '/host/can-change-origin',
+                LD_PRELOAD: '/host/can-inject.so',
+                __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:
+                    '/host/egl/external-platform',
+                __EGL_EXTERNAL_PLATFORM_CONFIG_FILENAMES:
+                    '/host/egl/external-platform.json',
+                __EGL_VENDOR_LIBRARY_DIRS: '/host/egl/vendor',
+                __EGL_VENDOR_LIBRARY_FILENAMES: '/host/egl/vendor/host.json',
+                GBM_BACKEND: 'host-gbm',
+                GBM_BACKENDS_PATH: '/host/gbm',
+                LIBGL_DRIVERS_PATH: '/host/dri',
+                MESA_LOADER_DRIVER_OVERRIDE: 'host-dri',
+                LIBVA_DRIVER_NAME: 'host-va',
+                LIBVA_DRIVERS_PATH: '/host/va',
+                VDPAU_DRIVER_PATH: '/host/vdpau',
+                VK_DRIVER_FILES: '/host/vulkan/driver.json',
+                VK_ICD_FILENAMES: '/host/vulkan/icd.json',
+                VK_ADD_DRIVER_FILES: '/host/vulkan/add-driver.json',
+                VK_ADD_LAYER_PATH: '/host/vulkan/add-layer',
+                VK_IMPLICIT_LAYER_PATH: '/host/vulkan/implicit-layer',
+                VK_ADD_IMPLICIT_LAYER_PATH: '/host/vulkan/add-implicit-layer',
+                VK_LAYER_PATH: '/host/vulkan/layer',
+                LIBGL_ALWAYS_SOFTWARE: '1',
+            },
+            nativeDir: '/package/resources/native',
+            runtimeMode: 'bundled',
+        }),
+        {
+            PATH: '/usr/bin',
+            LIBGL_ALWAYS_SOFTWARE: '1',
+            LD_LIBRARY_PATH: '/package/resources/native/lib',
+        }
+    );
+});
+
+test('rejects helper probe framing and fields that runtime capability rejects', () => {
+    const validPayload =
+        '{"protocol":1,"usable":true,"libmpv":"0.41.0","renderApi":"egl"}';
+    for (const stdout of [
+        validPayload,
+        `${validPayload}\n\n`,
+        `${validPayload.slice(0, -1)},"extra":true}\n`,
+    ]) {
+        const fixture = createSystemPayload();
+        try {
+            const errors = verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'deb',
+                profileName: 'system',
+                packageDependencies: DEB_SYSTEM_PACKAGE_DEPENDENCIES,
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    return {
+                        status: 0,
+                        signal: null,
+                        stdout,
+                        stderr: '',
+                    };
+                },
+            });
+            assert.match(
+                errors.join('\n'),
+                /runtime probe (?:must emit|did not return)/
+            );
+        } finally {
+            fs.rmSync(fixture.root, { recursive: true, force: true });
+        }
+    }
+});
+
+test('reports missing helper, wrong mode, wrong profile, isolation, and loader failures', () => {
+    const cases = [
+        {
+            mutate({ nativeDir }) {
+                fs.rmSync(path.join(nativeDir, 'iptvnator_mpv_helper'));
+            },
+            expected: /Missing embedded MPV frame-copy helper/,
+        },
+        {
+            mutate({ nativeDir }) {
+                fs.chmodSync(
+                    path.join(nativeDir, 'iptvnator_mpv_helper'),
+                    0o644
+                );
+            },
+            expected: /must have mode 0755/,
+        },
+        {
+            profileName: 'portable',
+            expected: /does not include target "deb"/,
+        },
+        {
+            elfInspector(binaryPath) {
+                if (path.basename(binaryPath) === 'embedded_mpv.node') {
+                    return {
+                        soname: null,
+                        needed: ['libmpv.so.2'],
+                        rpath: [],
+                        runpath: [],
+                    };
+                }
+                return validElfInspector(binaryPath);
+            },
+            expected: /addon must not link libmpv/,
+        },
+        {
+            probeRunner() {
+                return {
+                    status: 127,
+                    signal: null,
+                    stdout: '',
+                    stderr: 'error while loading shared libraries: libmpv.so.2',
+                };
+            },
+            expected: /runtime probe failed with status 127.*libmpv\.so\.2/s,
+        },
+    ];
+
+    for (const testCase of cases) {
+        const fixture = createSystemPayload();
+        try {
+            testCase.mutate?.(fixture);
+            const errors = verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'deb',
+                profileName: testCase.profileName ?? 'system',
+                packageDependencies: DEB_SYSTEM_PACKAGE_DEPENDENCIES,
+                elfInspector: testCase.elfInspector ?? validElfInspector,
+                probeRunner: testCase.probeRunner ?? successfulProbeRunner,
+            });
+            assert.match(errors.join('\n'), testCase.expected);
+        } finally {
+            fs.rmSync(fixture.root, { recursive: true, force: true });
+        }
+    }
+});
+
+test('rejects an x64 package manifest produced from a target subset', () => {
+    const fixture = createSystemPayload();
+    const manifestPath = path.join(
+        fixture.nativeDir,
+        'embedded-mpv-runtime.json'
+    );
+    const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+    manifest.targets = ['deb'];
+    fs.writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+
+    try {
+        const errors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'deb',
+            profileName: 'system',
+            packageDependencies: DEB_SYSTEM_PACKAGE_DEPENDENCIES,
+            elfInspector: validElfInspector,
+            probeRunner: successfulProbeRunner,
+        });
+        assert.match(
+            errors.join('\n'),
+            /manifest targets.*must equal \["deb","pacman","rpm"\]/
+        );
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('requires marker-only foreign packages, scans Electron, and never probes', () => {
+    const fixture = createSystemPayload({ architecture: 'arm64' });
+    let probeCalls = 0;
+    try {
+        assert.deepEqual(
+            verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'appimage',
+                profileName: 'portable',
+                packageDependencies: [],
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    probeCalls += 1;
+                    return successfulProbeRunner();
+                },
+            }),
+            []
+        );
+        assert.equal(probeCalls, 0);
+
+        const isolationErrors = verifyExtractedLinuxFrameCopyRuntime({
+            resourceDir: fixture.resourceDir,
+            artifactFormat: 'appimage',
+            profileName: 'portable',
+            packageDependencies: [],
+            elfInspector(binaryPath) {
+                if (path.basename(binaryPath) === 'iptvnator.bin') {
+                    return {
+                        soname: null,
+                        needed: ['/tmp/libmpv.so.2'],
+                        rpath: [],
+                        runpath: [],
+                    };
+                }
+                return validElfInspector(binaryPath);
+            },
+            probeRunner() {
+                probeCalls += 1;
+                return successfulProbeRunner();
+            },
+        });
+        assert.match(
+            isolationErrors.join('\n'),
+            /Electron binary must not link libmpv/
+        );
+        assert.equal(probeCalls, 0);
+
+        for (const forbiddenDependency of DEB_SYSTEM_PACKAGE_DEPENDENCIES) {
+            const dependencyErrors = verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'deb',
+                profileName: 'system',
+                packageDependencies: [forbiddenDependency, 'libc6'],
+                declaredArch: 'arm64',
+                elfInspector: validElfInspector,
+                probeRunner: successfulProbeRunner,
+            });
+            assert.match(
+                dependencyErrors.join('\n'),
+                new RegExp(
+                    `must not declare frame-copy dependency ${forbiddenDependency}`
+                )
+            );
+        }
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('validates a marker-only Flatpak with an unwrapped Electron ELF', () => {
+    const fixture = createSystemPayload({
+        architecture: 'arm64',
+        electronBinaryName: 'iptvnator',
+    });
+    try {
+        assert.deepEqual(
+            verifyExtractedLinuxFrameCopyRuntime({
+                resourceDir: fixture.resourceDir,
+                artifactFormat: 'flatpak',
+                profileName: 'flatpak',
+                packageDependencies: [],
+                elfInspector: validElfInspector,
+                probeRunner() {
+                    assert.fail(
+                        'foreign Flatpak must not run the helper probe'
+                    );
+                },
+            }),
+            []
+        );
+    } finally {
+        fs.rmSync(fixture.root, { recursive: true, force: true });
+    }
+});
+
+test('always removes its temporary extraction root after a verifier failure', () => {
+    const root = fs.mkdtempSync(
+        path.join(os.tmpdir(), 'iptvnator-verifier-cleanup-parent-')
+    );
+    const artifactPath = path.join(root, 'package.deb');
+    fs.writeFileSync(artifactPath, 'fixture');
+    let extractionDestination;
+
+    try {
+        assert.throws(
+            () =>
+                verifyLinuxFrameCopyArtifact({
+                    artifactPath,
+                    profileName: 'system',
+                    extractArtifact({ destination }) {
+                        extractionDestination = destination;
+                        fs.writeFileSync(
+                            path.join(path.dirname(destination), 'sentinel'),
+                            'temporary'
+                        );
+                        throw new Error('intentional extraction failure');
+                    },
+                }),
+            /intentional extraction failure/
+        );
+        assert.equal(
+            fs.existsSync(path.dirname(extractionDestination)),
+            false,
+            'temporary verifier root must be removed'
+        );
+    } finally {
+        fs.rmSync(root, { recursive: true, force: true });
+    }
+});
diff --git a/tools/release/build-release-notes.mjs b/tools/release/build-release-notes.mjs
new file mode 100644
index 000000000..39a921d97
--- /dev/null
+++ b/tools/release/build-release-notes.mjs
@@ -0,0 +1,339 @@
+#!/usr/bin/env node
+/**
+ * Composes release surfaces from the notes accumulated in `.changes/`.
+ *
+ *   node tools/release/build-release-notes.mjs --validate
+ *   node tools/release/build-release-notes.mjs --version 0.24.0 --format github
+ *   node tools/release/build-release-notes.mjs --version 0.24.0 --format changelog
+ *   node tools/release/build-release-notes.mjs --version 0.24.0 --format blog
+ *   node tools/release/build-release-notes.mjs --version 0.24.0 --consume
+ *
+ * Every mode except `--consume` is a safe dry run: nothing is deleted unless
+ * `--consume` is passed explicitly.
+ */
+
+import { execFileSync } from 'node:child_process';
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+import { loadNotes } from './release-notes.mjs';
+import { manifestSlugs } from './screenshot-guards.mjs';
+import {
+    releaseSlug,
+    renderBlogScaffold,
+    renderChangelogSection,
+    renderGithubBody,
+    upsertChangelogSection,
+} from './release-notes-render.mjs';
+
+const workspaceRoot = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '../..'
+);
+const CHANGELOG_PATH = path.join(workspaceRoot, 'CHANGELOG.md');
+const BLOG_DIR = path.join(workspaceRoot, 'apps/website/src/content/blog');
+
+/** Generated sections are inserted directly below this marker. */
+const CHANGELOG_MARKER = '<!-- next-release -->';
+
+const FORMATS = new Set(['github', 'changelog', 'blog']);
+
+function parseArgs(argv) {
+    const options = {
+        format: null,
+        version: null,
+        previous: null,
+        date: new Date().toISOString().slice(0, 10),
+        dir: '.changes',
+        validate: false,
+        consume: false,
+        force: false,
+    };
+
+    for (let index = 0; index < argv.length; index += 1) {
+        const arg = argv[index];
+        const takeValue = () => {
+            const value = argv[index + 1];
+
+            if (value === undefined || value.startsWith('--')) {
+                throw new Error(`${arg} requires a value`);
+            }
+
+            index += 1;
+            return value;
+        };
+
+        switch (arg) {
+            case '--format':
+                options.format = takeValue();
+                break;
+            case '--version':
+                options.version = takeValue();
+                break;
+            case '--previous':
+                options.previous = takeValue();
+                break;
+            case '--date':
+                options.date = takeValue();
+                break;
+            case '--dir':
+                options.dir = takeValue();
+                break;
+            case '--validate':
+                options.validate = true;
+                break;
+            case '--consume':
+                options.consume = true;
+                break;
+            case '--force':
+                options.force = true;
+                break;
+            // npm needs `--` to forward arguments past the script name; pnpm
+            // hands it to the script verbatim. Ignore it so the habitual
+            // `pnpm run release:notes:github -- --version 0.24.0` works
+            // instead of dying on its own separator. There are no positional
+            // arguments for it to delimit.
+            case '--':
+                break;
+            default:
+                throw new Error(`unknown argument: ${arg}`);
+        }
+    }
+
+    return options;
+}
+
+function git(args) {
+    return execFileSync('git', args, {
+        cwd: workspaceRoot,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+}
+
+/**
+ * Resolves each note to the commit that added it, and to a PR number when the
+ * commit subject carries one. Authors never write a PR number themselves —
+ * they cannot know it while the branch is still local.
+ *
+ * @param {object[]} notes
+ * @returns {Map<string, { commit?: string, pr?: number }>}
+ */
+function resolveLinks(notes) {
+    const links = new Map();
+
+    for (const note of notes) {
+        let output = '';
+
+        try {
+            output = git([
+                'log',
+                '--diff-filter=A',
+                '--format=%H%x00%s',
+                '-1',
+                '--',
+                note.sourcePath,
+            ]);
+        } catch {
+            // Not a git checkout, or the note is not committed yet. Entries
+            // simply render without a reference link.
+        }
+
+        if (!output) {
+            continue;
+        }
+
+        const [commit, subject = ''] = output.split('\0');
+        const prMatch = subject.match(/\(#(\d+)\)\s*$/);
+
+        links.set(note.sourcePath, {
+            commit,
+            pr: prMatch ? Number(prMatch[1]) : undefined,
+        });
+    }
+
+    return links;
+}
+
+/** Latest `v*` tag, used for the CHANGELOG compare link. */
+function detectPreviousVersion() {
+    try {
+        return git(['describe', '--tags', '--abbrev=0', '--match=v*']).replace(
+            /^v/,
+            ''
+        );
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * The release version is the one in the root package.json — bumping it is the
+ * deliberate act that starts a release. `--version` stays available as an
+ * override (dry runs, previewing a version before the bump), but the default
+ * keeps a single source of truth and lets the package scripts run bare.
+ */
+function resolveVersion(options) {
+    let version = options.version;
+
+    if (!version) {
+        version = JSON.parse(
+            readFileSync(path.join(workspaceRoot, 'package.json'), 'utf8')
+        ).version;
+
+        // stderr, so `--format github` keeps a clean pipeable stdout.
+        console.error(`Using version ${version} from package.json.`);
+    }
+
+    if (!/^\d+\.\d+\.\d+$/.test(version)) {
+        throw new Error(
+            `version must be a bare semver like 0.24.0, got "${version}"`
+        );
+    }
+
+    return version;
+}
+
+function writeChangelog(section, version) {
+    const { content, replaced } = upsertChangelogSection(
+        readFileSync(CHANGELOG_PATH, 'utf8'),
+        section,
+        version,
+        CHANGELOG_MARKER
+    );
+
+    if (replaced) {
+        console.error(`Replacing existing CHANGELOG.md section for ${version}.`);
+    }
+
+    writeFileSync(CHANGELOG_PATH, content, 'utf8');
+
+    return CHANGELOG_PATH;
+}
+
+function writeBlogScaffold(content, version, force) {
+    const target = path.join(
+        BLOG_DIR,
+        `${releaseSlug(version)}-release-notes.mdx`
+    );
+
+    if (existsSync(target) && !force) {
+        throw new Error(
+            [
+                `${path.relative(workspaceRoot, target)} already exists.`,
+                'The website publishes one post per minor version, so a patch',
+                'release edits the existing post instead of creating a new one.',
+                'Pass --force only to regenerate it from scratch.',
+            ].join(' ')
+        );
+    }
+
+    writeFileSync(target, content, 'utf8');
+
+    return target;
+}
+
+function main() {
+    const options = parseArgs(process.argv.slice(2));
+    const notesDir = path.resolve(workspaceRoot, options.dir);
+    const { notes, errors } = loadNotes(notesDir);
+
+    // `screenshot:` slugs must exist in the capture manifest, otherwise the
+    // blog scaffold would reference images the capture run never produces.
+    const slugs = manifestSlugs(
+        JSON.parse(
+            readFileSync(
+                path.join(workspaceRoot, 'tools/release/screenshots.manifest.json'),
+                'utf8'
+            )
+        )
+    );
+
+    for (const note of notes) {
+        if (note.screenshot && !slugs.has(note.screenshot)) {
+            errors.push(
+                `${path.basename(note.sourcePath)}: \`screenshot: ${note.screenshot}\` is not a slug in tools/release/screenshots.manifest.json`
+            );
+        }
+    }
+
+    if (errors.length > 0) {
+        console.error('Invalid release notes:\n');
+        for (const error of errors) {
+            console.error(`  ${error}`);
+        }
+        console.error(
+            '\nSee .changes/README.md for the expected format.'
+        );
+        process.exit(1);
+    }
+
+    if (options.validate) {
+        console.log(`${notes.length} release note(s) valid.`);
+    }
+
+    if (options.format) {
+        if (!FORMATS.has(options.format)) {
+            throw new Error(
+                `unknown --format "${options.format}" (expected ${[...FORMATS].join(', ')})`
+            );
+        }
+
+        const version = resolveVersion(options);
+        const links = resolveLinks(notes);
+
+        if (notes.length === 0) {
+            throw new Error(
+                `no notes found in ${path.relative(workspaceRoot, notesDir)}/ — nothing to render`
+            );
+        }
+
+        if (options.format === 'github') {
+            process.stdout.write(`${renderGithubBody(notes, { links })}\n`);
+        }
+
+        if (options.format === 'changelog') {
+            const section = renderChangelogSection(notes, {
+                version,
+                date: options.date,
+                previousVersion: options.previous ?? detectPreviousVersion(),
+                links,
+            });
+            const target = writeChangelog(section, version);
+            console.log(`Updated ${path.relative(workspaceRoot, target)}`);
+        }
+
+        if (options.format === 'blog') {
+            const content = renderBlogScaffold(notes, {
+                version,
+                date: options.date,
+                links,
+            });
+            const target = writeBlogScaffold(content, version, options.force);
+            console.log(`Wrote ${path.relative(workspaceRoot, target)}`);
+        }
+    }
+
+    if (options.consume) {
+        for (const note of notes) {
+            rmSync(note.sourcePath);
+        }
+
+        console.log(`Removed ${notes.length} consumed note(s).`);
+    }
+
+    if (!options.format && !options.validate && !options.consume) {
+        throw new Error(
+            'nothing to do — pass --validate, --format <github|changelog|blog>, or --consume'
+        );
+    }
+}
+
+try {
+    main();
+} catch (error) {
+    console.error(error.message);
+    process.exit(1);
+}
diff --git a/tools/release/build-release-notes.test.mjs b/tools/release/build-release-notes.test.mjs
new file mode 100644
index 000000000..e7d77f9dd
--- /dev/null
+++ b/tools/release/build-release-notes.test.mjs
@@ -0,0 +1,119 @@
+/**
+ * CLI-level tests for build-release-notes.mjs.
+ *
+ * The script parses its arguments and runs on import, so these drive the real
+ * entry point in a subprocess rather than importing parseArgs directly.
+ */
+
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+import { after, describe, it } from 'node:test';
+
+const workspaceRoot = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '../..'
+);
+const CLI = path.join(workspaceRoot, 'tools/release/build-release-notes.mjs');
+const tempDirs = [];
+
+/** A notes directory holding one valid note, so runs have something to render. */
+function makeNotesDir() {
+    const directory = mkdtempSync(path.join(tmpdir(), 'release-cli-'));
+    tempDirs.push(directory);
+
+    writeFileSync(
+        path.join(directory, 'playback-example.md'),
+        '---\ntype: feature\narea: playback\n---\n\nAn example note.\n',
+        'utf8'
+    );
+
+    return directory;
+}
+
+/**
+ * @returns {{ status: number, stdout: string, stderr: string }}
+ */
+function runCli(args) {
+    try {
+        const stdout = execFileSync(process.execPath, [CLI, ...args], {
+            cwd: workspaceRoot,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+
+        return { status: 0, stdout, stderr: '' };
+    } catch (error) {
+        return {
+            status: error.status ?? 1,
+            stdout: error.stdout ?? '',
+            stderr: error.stderr ?? '',
+        };
+    }
+}
+
+after(() => {
+    for (const directory of tempDirs) {
+        rmSync(directory, { recursive: true, force: true });
+    }
+});
+
+describe('build-release-notes CLI arguments', () => {
+    it('validates a notes directory', () => {
+        const result = runCli(['--validate', '--dir', makeNotesDir()]);
+
+        assert.equal(result.status, 0);
+        assert.match(result.stdout, /1 release note\(s\) valid\./);
+    });
+
+    it('ignores a bare `--` separator', () => {
+        // pnpm forwards `--` to the script instead of consuming it, so the
+        // npm-style `pnpm run release:notes:validate -- --dir x` reaches us
+        // with the separator still attached.
+        const result = runCli(['--validate', '--', '--dir', makeNotesDir()]);
+
+        assert.equal(result.status, 0);
+        assert.match(result.stdout, /1 release note\(s\) valid\./);
+    });
+
+    it('ignores a leading `--` separator', () => {
+        const result = runCli(['--', '--validate', '--dir', makeNotesDir()]);
+
+        assert.equal(result.status, 0);
+        assert.match(result.stdout, /1 release note\(s\) valid\./);
+    });
+
+    it('renders the github body with a version passed after `--`', () => {
+        const result = runCli([
+            '--format',
+            'github',
+            '--',
+            '--version',
+            '0.24.0',
+            '--dir',
+            makeNotesDir(),
+        ]);
+
+        assert.equal(result.status, 0);
+        assert.match(result.stdout, /## Features/);
+        assert.match(result.stdout, /\*\*playback\*\* — An example note\./);
+    });
+
+    it('still rejects a genuinely unknown argument', () => {
+        const result = runCli(['--validate', '--nope']);
+
+        assert.equal(result.status, 1);
+        assert.match(result.stderr, /unknown argument: --nope/);
+    });
+
+    it('still rejects a flag whose value is missing', () => {
+        const result = runCli(['--format']);
+
+        assert.equal(result.status, 1);
+        assert.match(result.stderr, /--format requires a value/);
+    });
+});
diff --git a/tools/release/capture-app-driver.ts b/tools/release/capture-app-driver.ts
new file mode 100644
index 000000000..59fe2436f
--- /dev/null
+++ b/tools/release/capture-app-driver.ts
@@ -0,0 +1,373 @@
+/**
+ * App driving for capture-release-screenshots.ts: launch, readiness, demo
+ * seeding, theme switching, and the named setup actions the manifest refers
+ * to. Mechanics proven in the v0.20 capture run, generalized behind action
+ * names.
+ */
+
+import { spawn, type ChildProcess } from 'node:child_process';
+import { writeFileSync } from 'node:fs';
+import path from 'node:path';
+import {
+    _electron as electron,
+    type ElectronApplication,
+    type Page,
+} from '@playwright/test';
+
+import { registerPlaylistId, requirePlaylistId } from './capture-navigation';
+
+export const XTREAM_MOCK_ORIGIN = 'http://localhost:3211';
+export const XTREAM_FIXTURE_TITLE = 'Fictional Xtream Demo';
+export const M3U_FIXTURE_TITLE = 'release-demo';
+
+/** Synthetic categories that only the marketing fixture generator produces. */
+const MOCK_FIXTURE_CATEGORIES = ['Action & Mystery', 'Urban Drama'];
+
+
+/* ------------------------------------------------------------------ */
+/* Fixtures                                                            */
+/* ------------------------------------------------------------------ */
+
+/** Entirely synthetic channels; streams and logos point at the mock. */
+export function writeM3uFixture(dataDir: string): string {
+    const channels = [
+        ['Newsroom', 'Aurora Local', 'aurora-local'],
+        ['Newsroom', 'Civic Pulse', 'civic-pulse'],
+        ['Sports', 'Fieldside One', 'fieldside-one'],
+        ['Sports', 'Motion Arena', 'motion-arena'],
+        ['Kids', 'Horizon Kids', 'horizon-kids'],
+        ['Kids', 'Story Lantern', 'story-lantern'],
+        ['Culture', 'Atlas Culture', 'atlas-culture'],
+        ['Culture', 'Night Music', 'night-music'],
+    ];
+    const stream = `${XTREAM_MOCK_ORIGIN}/live/marketing/marketing/52000.m3u8`;
+    const lines = ['#EXTM3U'];
+
+    channels.forEach(([group, title, slug], index) => {
+        lines.push(
+            `#EXTINF:-1 tvg-id="demo-${index + 1}" tvg-name="${title}" tvg-logo="${XTREAM_MOCK_ORIGIN}/assets/marketing/logo/${slug}.svg?size=256x256" group-title="${group}",${title}`,
+            stream
+        );
+    });
+
+    const filePath = path.join(dataDir, `${M3U_FIXTURE_TITLE}.m3u`);
+    writeFileSync(filePath, `${lines.join('\n')}\n`, 'utf8');
+
+    return filePath;
+}
+
+export async function ensureXtreamMockServer(
+    workspaceRoot: string
+): Promise<ChildProcess | undefined> {
+    const healthUrl = `${XTREAM_MOCK_ORIGIN}/health`;
+
+    // Reusing whatever answers on the port is not enough: every guard treats
+    // localhost as trusted, so an unrelated local server or proxy could feed
+    // real catalog data and artwork straight into published screenshots.
+    // Require the marketing fixtures this capture is built around.
+    if (await isHealthy(healthUrl)) {
+        await assertMockServerIdentity();
+        return undefined;
+    }
+
+    const child = spawn(
+        path.join(workspaceRoot, 'node_modules/.bin/tsx'),
+        // The mock server imports `@iptvnator/shared/marketing-fixtures`, and
+        // tsx only resolves that path alias when pointed at the base config —
+        // matching how the project's own serve target invokes it.
+        [
+            '--tsconfig',
+            'tsconfig.base.json',
+            'apps/xtream-mock-server/src/main.ts',
+        ],
+        {
+            cwd: workspaceRoot,
+            env: { ...process.env, NODE_ENV: 'development', PORT: '3211' },
+            stdio: ['ignore', 'pipe', 'pipe'],
+        }
+    );
+
+    child.stderr?.on('data', (chunk) =>
+        process.stderr.write(`[xtream-mock] ${chunk}`)
+    );
+
+    const deadline = Date.now() + 20_000;
+
+    while (Date.now() < deadline) {
+        if (await isHealthy(healthUrl)) {
+            return child;
+        }
+        await sleep(500);
+    }
+
+    child.kill('SIGTERM');
+    throw new Error(`xtream-mock-server did not become healthy at ${healthUrl}`);
+}
+
+/**
+ * Confirms the service on the mock port is our fixture server: it must serve
+ * the marketing catalog with the exact synthetic titles the shots rely on.
+ */
+async function assertMockServerIdentity(): Promise<void> {
+    const response = await fetch(
+        `${XTREAM_MOCK_ORIGIN}/player_api.php?username=marketing&password=marketing&action=get_vod_categories`
+    ).catch(() => null);
+
+    if (!response?.ok) {
+        throw new Error(
+            `Something is listening on ${XTREAM_MOCK_ORIGIN} but does not answer the Xtream marketing API — stop it and let this script start the mock server itself.`
+        );
+    }
+
+    const categories = (await response.json().catch(() => null)) as
+        | { category_name?: string }[]
+        | null;
+    const names = new Set(
+        (categories ?? []).map((entry) => entry.category_name)
+    );
+
+    for (const expected of MOCK_FIXTURE_CATEGORIES) {
+        if (!names.has(expected)) {
+            throw new Error(
+                `The server on ${XTREAM_MOCK_ORIGIN} is not the IPTVnator marketing mock (missing category "${expected}"). Refusing to capture screenshots from unknown data.`
+            );
+        }
+    }
+}
+
+async function isHealthy(url: string): Promise<boolean> {
+    try {
+        return (await fetch(url)).ok;
+    } catch {
+        return false;
+    }
+}
+
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+/* ------------------------------------------------------------------ */
+/* Launch and readiness                                                */
+/* ------------------------------------------------------------------ */
+
+export async function launchApp(
+    electronMainPath: string,
+    env: Record<string, string>,
+    hostResolverRules: string
+): Promise<ElectronApplication> {
+    // The resolver switch is the only part of the network gate with no
+    // install-timing window: it takes effect before Electron runs a single
+    // line of app code, so startup traffic cannot slip through ahead of the
+    // session hook.
+    return electron.launch({
+        args: [
+            electronMainPath,
+            `--host-resolver-rules=${hostResolverRules}`,
+        ],
+        env,
+    });
+}
+
+export async function findMainWindow(app: ElectronApplication): Promise<Page> {
+    await sleep(1500);
+
+    for (const candidate of app.windows()) {
+        if (!(await candidate.title()).includes('DevTools')) {
+            return candidate;
+        }
+    }
+
+    return app.firstWindow();
+}
+
+export async function sizeWindow(
+    app: ElectronApplication,
+    viewport: { width: number; height: number }
+): Promise<void> {
+    await app.evaluate(({ BrowserWindow }, size) => {
+        const win = BrowserWindow.getAllWindows().find(
+            (candidate) => !candidate.webContents.getTitle().includes('DevTools')
+        );
+        win?.setSize(size.width, size.height);
+        win?.center();
+    }, viewport);
+}
+
+export async function waitForAppReady(page: Page): Promise<void> {
+    await page.waitForLoadState('domcontentloaded');
+    await page.waitForSelector('app-root', { timeout: 45_000 });
+    await page.waitForFunction(
+        () =>
+            (document.querySelector('app-root')?.innerHTML.trim().length ?? 0) >
+            0,
+        { timeout: 45_000 }
+    );
+}
+
+/* ------------------------------------------------------------------ */
+/* Seeding                                                             */
+/* ------------------------------------------------------------------ */
+
+export async function seedDemoData(page: Page, m3uPath: string): Promise<void> {
+    await addXtreamPortal(page);
+    await addM3uPlaylist(page, m3uPath);
+    await seedDashboardActivity(page);
+}
+
+/**
+ * The dashboard hero and rails only render with favorites/recent activity.
+ * Seed a handful of mock titles through the Electron DB bridge; backdrops
+ * point at the mock server, keeping G3/G4 satisfied.
+ */
+async function seedDashboardActivity(page: Page): Promise<void> {
+    const playlistId = requirePlaylistId('xtreams');
+    const backdrop = (title: string) =>
+        `${XTREAM_MOCK_ORIGIN}/assets/marketing/backdrop/${title
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, '-')}.svg?size=${encodeURIComponent('1280x720')}`;
+    // Xtream VOD stream ids are assigned by array position
+    // (`MARKETING_VOD_STREAM_ID_BASE + index` in marketing.generator.ts), and
+    // the generator lists POSTER_SHOWCASE_MOVIES first. Keep these three titles
+    // in step with the first three entries of that fixture list, otherwise the
+    // seeded backdrops belong to different movies than the ids resolve to.
+    const items = [
+        { xtreamId: 62000, type: 'movie', backdropUrl: backdrop('Black Harbor'), recent: true },
+        { xtreamId: 62001, type: 'movie', backdropUrl: backdrop('The Paper Astronaut'), recent: true },
+        { xtreamId: 62002, type: 'movie', backdropUrl: backdrop('Summer Static'), recent: false },
+        { xtreamId: 72000, type: 'series', backdropUrl: backdrop('Skyline Sentinels'), recent: true },
+        { xtreamId: 72001, type: 'series', backdropUrl: backdrop('The Aegis Club'), recent: false },
+    ] as const;
+
+    await page.evaluate(
+        async ({ items, playlistId }) => {
+            const bridge = (
+                window as typeof window & {
+                    electron?: {
+                        dbAddFavorite?: (contentId: number, playlistId: string, backdropUrl?: string) => Promise<unknown>;
+                        dbAddRecentItem?: (contentId: number, playlistId: string, backdropUrl?: string) => Promise<unknown>;
+                        dbGetContentByXtreamId?: (
+                            xtreamId: number,
+                            playlistId: string,
+                            contentType?: 'live' | 'movie' | 'series'
+                        ) => Promise<{ id: number } | null>;
+                    };
+                }
+            ).electron;
+
+            if (!bridge?.dbGetContentByXtreamId) {
+                throw new Error('Electron database bridge is unavailable.');
+            }
+
+            for (const item of items) {
+                const content = await bridge.dbGetContentByXtreamId(
+                    item.xtreamId,
+                    playlistId,
+                    item.type
+                );
+
+                if (!content?.id) {
+                    throw new Error(
+                        `Could not find imported Xtream content ${item.xtreamId}.`
+                    );
+                }
+
+                await bridge.dbAddFavorite?.(content.id, playlistId, item.backdropUrl);
+
+                if (item.recent) {
+                    await bridge.dbAddRecentItem?.(content.id, playlistId, item.backdropUrl);
+                }
+            }
+        },
+        { items, playlistId }
+    );
+}
+
+async function addXtreamPortal(page: Page): Promise<void> {
+    await openAddPlaylistDialog(page);
+    const dialog = page.locator('mat-dialog-container').last();
+
+    await clickDialogOption(dialog, /xtream credentials/i);
+    await dialog.locator('#title').fill(XTREAM_FIXTURE_TITLE);
+    await dialog.locator('#serverUrl').fill(XTREAM_MOCK_ORIGIN);
+    await dialog.locator('#username').fill('marketing');
+    await dialog.locator('#password').fill('marketing');
+    await dialog
+        .getByRole('button', { name: /^(add|add playlist)$/i })
+        .last()
+        .click();
+    await dialog.waitFor({ state: 'detached', timeout: 30_000 });
+    await page.waitForURL(/\/workspace\/xtreams\/[^/]+\/vod/, {
+        timeout: 45_000,
+    });
+    registerPlaylistId('xtreams', idFromUrl(page.url(), 'xtreams'));
+    await page
+        .locator('.category-content-layout, app-content-card')
+        .first()
+        .waitFor({ state: 'visible', timeout: 45_000 });
+}
+
+async function addM3uPlaylist(page: Page, m3uPath: string): Promise<void> {
+    await openAddPlaylistDialog(page);
+    const dialog = page.locator('mat-dialog-container').last();
+
+    // Unanchored: the radio's accessible name concatenates title + subtitle.
+    await clickDialogOption(dialog, /m3u file/i);
+
+    const fileInput = dialog.locator('input[type="file"][name="playlist"]');
+    await fileInput.setInputFiles(m3uPath);
+    await dialog
+        .getByRole('button', { name: /add playlist/i })
+        .last()
+        .click({ timeout: 15_000 });
+    await dialog.waitFor({ state: 'detached', timeout: 30_000 });
+    await page.waitForURL(/\/workspace\/playlists\/[^/]+\/all/, {
+        timeout: 45_000,
+    });
+    registerPlaylistId('playlists', idFromUrl(page.url(), 'playlists'));
+    await page
+        .locator('[data-test-id="channel-item"]')
+        .first()
+        .waitFor({ state: 'visible', timeout: 60_000 });
+}
+
+async function openAddPlaylistDialog(page: Page): Promise<void> {
+    await page.getByRole('button', { name: /add playlist/i }).first().click();
+    await page
+        .locator('mat-dialog-container')
+        .last()
+        .waitFor({ state: 'visible', timeout: 15_000 });
+}
+
+async function clickDialogOption(
+    dialog: ReturnType<Page['locator']>,
+    label: RegExp
+): Promise<void> {
+    // The add-playlist dialog has changed shape across releases: source
+    // methods were tabs, then plain buttons, now a radio group.
+    for (const role of ['radio', 'tab', 'button'] as const) {
+        const option = dialog.getByRole(role, { name: label }).first();
+
+        if ((await option.count()) > 0) {
+            await option.click();
+            return;
+        }
+    }
+
+    throw new Error(`Dialog option matching ${label} not found`);
+}
+
+
+function idFromUrl(url: string, provider: 'playlists' | 'xtreams'): string {
+    // `provider` is a closed union, but build the pattern from a literal
+    // anyway so no future caller can inject regex syntax through it.
+    const pattern =
+        provider === 'playlists'
+            ? /\/workspace\/playlists\/([^/]+)\//
+            : /\/workspace\/xtreams\/([^/]+)\//;
+    const match = url.match(pattern);
+
+    if (!match) {
+        throw new Error(`Could not extract ${provider} id from ${url}`);
+    }
+
+    return match[1];
+}
diff --git a/tools/release/capture-navigation.ts b/tools/release/capture-navigation.ts
new file mode 100644
index 000000000..9a8f033ed
--- /dev/null
+++ b/tools/release/capture-navigation.ts
@@ -0,0 +1,250 @@
+/**
+ * Named setup actions for capture-release-screenshots.ts — the vocabulary
+ * that screenshots.manifest.json steps refer to — plus theme switching and
+ * the playlist-id registry the actions navigate with.
+ */
+
+import type { Page } from '@playwright/test';
+
+let m3uPlaylistId: string | undefined;
+let xtreamPlaylistId: string | undefined;
+
+export function registerPlaylistId(
+    provider: 'playlists' | 'xtreams',
+    id: string
+): void {
+    if (provider === 'playlists') {
+        m3uPlaylistId = id;
+    } else {
+        xtreamPlaylistId = id;
+    }
+}
+
+export function requirePlaylistId(
+    provider: 'playlists' | 'xtreams'
+): string {
+    return requireId(provider);
+}
+
+function requireId(provider: 'playlists' | 'xtreams'): string {
+    const id = provider === 'playlists' ? m3uPlaylistId : xtreamPlaylistId;
+
+    if (!id) {
+        throw new Error(`No captured ${provider} playlist id — seeding failed?`);
+    }
+
+    return id;
+}
+
+/* ------------------------------------------------------------------ */
+/* Theme                                                               */
+/* ------------------------------------------------------------------ */
+
+export async function applyTheme(
+    page: Page,
+    theme: 'dark' | 'light'
+): Promise<void> {
+    await runAction(page, 'open-settings', null);
+    const testId = theme === 'dark' ? 'DARK_THEME' : 'LIGHT_THEME';
+    const themeButton = page.locator(`[data-test-id="${testId}"]`).first();
+
+    await themeButton.scrollIntoViewIfNeeded();
+    await themeButton.click();
+
+    const saveButton = page.locator('[data-test-id="save-settings"]').first();
+
+    if (await saveButton.isEnabled()) {
+        await saveButton.click();
+        await settleUi(page);
+    }
+
+    await page.waitForFunction(
+        (expectedTheme) =>
+            document.body.classList.contains('dark-theme') ===
+            (expectedTheme === 'dark'),
+        theme,
+        { timeout: 10_000 }
+    );
+}
+
+/* ------------------------------------------------------------------ */
+/* Named setup actions                                                 */
+/* ------------------------------------------------------------------ */
+
+export async function runAction(
+    page: Page,
+    action: string,
+    param: string | null
+): Promise<void> {
+    switch (action) {
+        case 'open-settings': {
+            await page.locator('a[href$="/workspace/settings"]').first().click();
+            await page.waitForURL(/\/workspace\/settings/, { timeout: 15_000 });
+            await page
+                .locator('[data-test-id="settings-container"]')
+                .waitFor({ state: 'visible', timeout: 15_000 });
+            return;
+        }
+        case 'open-dashboard': {
+            await page
+                .locator('a.brand[href$="/workspace/dashboard"]')
+                .first()
+                .click();
+            await page.waitForURL(/\/workspace\/dashboard/, { timeout: 20_000 });
+            await page
+                .locator('[data-test-id="dashboard-hero"]')
+                .waitFor({ state: 'visible', timeout: 30_000 });
+            await settleUi(page);
+            return;
+        }
+        case 'open-xtream-vod': {
+            await openXtreamSection(page, 'vod', param ?? 'Action & Mystery');
+            await page.waitForURL(
+                /\/workspace\/xtreams\/[^/]+\/vod\/[^/]+\/[^/]+/,
+                { timeout: 30_000 }
+            );
+            await page
+                .locator('app-content-hero')
+                .waitFor({ state: 'visible', timeout: 30_000 });
+            await page.waitForTimeout(700);
+            return;
+        }
+        case 'open-xtream-series': {
+            await openXtreamSection(page, 'series', param ?? 'Urban Drama');
+            await page.waitForURL(
+                /\/workspace\/xtreams\/[^/]+\/series\/[^/]+\/[^/]+/,
+                { timeout: 30_000 }
+            );
+            await page
+                .locator('app-season-container')
+                .waitFor({ state: 'visible', timeout: 30_000 });
+
+            // Season tabs auto-select a season; click the first pill only
+            // when no episodes rendered on their own.
+            const episode = page
+                .locator('.episode-card, .episode-list-item')
+                .first();
+
+            if (!(await episode.isVisible().catch(() => false))) {
+                await page
+                    .locator('.season-tabs__pill, [data-testid="season-dropdown"]')
+                    .first()
+                    .click();
+            }
+
+            await episode.waitFor({ state: 'visible', timeout: 20_000 });
+            await page.waitForTimeout(700);
+            return;
+        }
+        case 'open-m3u-groups': {
+            const playlistId = requireId('playlists');
+
+            await goHome(page);
+            await page
+                .locator(`a[href*="/workspace/playlists/${playlistId}"]`)
+                .first()
+                .click();
+            await page.waitForURL(
+                (url) => url.href.includes(`/workspace/playlists/${playlistId}/`),
+                { timeout: 20_000 }
+            );
+            await clickHrefSuffix(
+                page,
+                `/workspace/playlists/${playlistId}/groups`
+            );
+            await page
+                .locator('.group-nav-item')
+                .first()
+                .waitFor({ state: 'visible', timeout: 20_000 });
+            await page.locator('.group-nav-item').first().click();
+            // Deliberately no channel click: starting playback would pull a
+            // real HLS stream (the mock redirects to a public demo stream),
+            // and third-party video frames must never enter a release shot.
+            await page
+                .locator('[data-test-id="channel-item"]')
+                .first()
+                .waitFor({ state: 'visible', timeout: 20_000 });
+            await page.waitForTimeout(500);
+            return;
+        }
+        default:
+            throw new Error(`Unknown setup action: ${action}`);
+    }
+}
+
+/** Returns to the dashboard via the always-visible brand link. */
+async function goHome(page: Page): Promise<void> {
+    if (/\/workspace\/dashboard/.test(page.url())) {
+        return;
+    }
+
+    await page.locator('a.brand[href$="/workspace/dashboard"]').first().click();
+    await page.waitForURL(/\/workspace\/dashboard/, { timeout: 20_000 });
+    await settleUi(page);
+}
+
+async function openXtreamSection(
+    page: Page,
+    section: 'vod' | 'series',
+    category: string
+): Promise<void> {
+    // Manifest steps must be order-independent, so every portal action
+    // starts from the dashboard, whose sources rail links into the portal.
+    await goHome(page);
+    await clickHrefSuffix(
+        page,
+        `/workspace/xtreams/${requireId('xtreams')}/vod`
+    );
+
+    if (section !== 'vod') {
+        await clickHrefSuffix(
+            page,
+            `/workspace/xtreams/${requireId('xtreams')}/${section}`
+        );
+    }
+
+    const item = page
+        .locator('app-workspace-context-panel .category-item')
+        .filter({ hasText: category })
+        .first();
+
+    await item.waitFor({ state: 'visible', timeout: 30_000 });
+    await item.click();
+    await page.waitForTimeout(600);
+
+    const card = page.locator('.category-content-layout mat-card').first();
+    await card.waitFor({ state: 'visible', timeout: 30_000 });
+    await card.click();
+}
+
+async function clickHrefSuffix(page: Page, suffix: string): Promise<void> {
+    await page.locator(`a[href$="${suffix}"]`).first().click();
+    // Predicate rather than a RegExp built from the suffix: the value carries
+    // playlist ids and path separators, and hand-escaping only some
+    // metacharacters is how incomplete-sanitization bugs are born.
+    await page.waitForURL((url) => url.href.includes(suffix), {
+        timeout: 20_000,
+    });
+}
+
+export async function settleUi(page: Page): Promise<void> {
+    await page
+        .locator('.mat-mdc-snack-bar-container')
+        .first()
+        .waitFor({ state: 'detached', timeout: 10_000 })
+        .catch(() => undefined);
+    // Park the cursor so no nav item keeps its hover tooltip in frame.
+    await page.mouse.move(640, 700);
+    await page.evaluate(() => {
+        document
+            .querySelectorAll(
+                '.mat-mdc-snack-bar-container, simple-snack-bar, .mat-mdc-tooltip, .cdk-describedby-message-container'
+            )
+            .forEach((element) => {
+                (element.closest('.cdk-overlay-pane') ?? element).remove();
+            });
+    });
+    await page.waitForTimeout(250);
+}
+
+
diff --git a/tools/release/capture-network-gate.ts b/tools/release/capture-network-gate.ts
new file mode 100644
index 000000000..6540e56e3
--- /dev/null
+++ b/tools/release/capture-network-gate.ts
@@ -0,0 +1,122 @@
+/**
+ * The Electron-side half of G3: a request gate in the main process covering
+ * both Chromium's network stack and Node's `fetch`.
+ *
+ * Known and unavoidable timing window: this can only be installed once
+ * `electron.launch()` resolves, and Playwright releases Electron's ready
+ * event before that — so a Node-stack request fired in the first
+ * milliseconds of `app.whenReady()` would escape it. It cannot be closed
+ * from the test side: Playwright deletes `NODE_OPTIONS` unconditionally
+ * (`playwright-core/lib/server/electron/electron.js`), which rules out a
+ * `--require` preload, and it exposes no pre-ready hook. Closing it entirely
+ * would mean holding renderer startup from inside `main.ts` — production code
+ * bent around a screenshot tool.
+ *
+ * What covers that window instead:
+ *   - Chromium-stack traffic (renderer, main-process `net`) is blocked from
+ *     process start by `--host-resolver-rules`, which has no window at all;
+ *   - the only startup Node `fetch` in the app, the update check, returns
+ *     early on `!app.isPackaged`, and the capture always runs unpackaged.
+ */
+
+import type { ElectronApplication } from '@playwright/test';
+
+type NetworkPolicy = {
+    schemes: string[];
+    hosts: string[];
+    protocols: string[];
+    stubPrefixes: string[];
+};
+
+/**
+ * Records and blocks at the Electron session level, from before the renderer
+ * boots. Blocking here as well as in the page route matters because
+ * `page.route` only covers renderer traffic: anything the main process fetches
+ * (updater, telemetry, a future feature) would otherwise reach the network and
+ * only be reported afterwards — too late to be a fail-closed boundary.
+ *
+ * Stubbed URLs are allowed through so the page-level route can fulfill them
+ * locally; every other non-local URL is cancelled outright.
+ */
+export async function installRequestRecorder(
+    app: ElectronApplication,
+    policy: NetworkPolicy
+): Promise<void> {
+    // The body is serialized into the Electron main process, where esbuild's
+    // `__name` helper does not exist — so it must contain no *named* inner
+    // function (`const isLocal = …` or `function isLocal()`), only anonymous
+    // callbacks. A named one throws `__name is not defined` at install time.
+    await app.evaluate(({ session }, appliedPolicy) => {
+        const store: string[] = [];
+        const scope = globalThis as unknown as {
+            __captureRequests: string[];
+            __captureIsLocal: (url: string) => boolean;
+            fetch: typeof fetch;
+        };
+
+        scope.__captureRequests = store;
+
+        // Assigned to a member expression on purpose: esbuild's keepNames
+        // wraps functions bound to an identifier with a `__name` helper that
+        // does not exist in this serialized context.
+        scope.__captureIsLocal = (url: string) => {
+            if (appliedPolicy.stubPrefixes.some((p) => url.startsWith(p))) {
+                return true;
+            }
+
+            try {
+                const parsed = new URL(url);
+
+                return (
+                    appliedPolicy.schemes.includes(parsed.protocol) ||
+                    (appliedPolicy.protocols.includes(parsed.protocol) &&
+                        appliedPolicy.hosts.includes(parsed.hostname))
+                );
+            } catch {
+                return appliedPolicy.schemes.some((s) => url.startsWith(s));
+            }
+        };
+
+        session.defaultSession.webRequest.onBeforeRequest(
+            (details, callback) => {
+                store.push(details.url);
+                callback({ cancel: !scope.__captureIsLocal(details.url) });
+            }
+        );
+
+        // Chromium's network stack — and therefore both the resolver switch
+        // and the webRequest hook — never sees main-process `fetch`, which
+        // runs on Node's stack. The app update service uses exactly that, so
+        // wrap it: record every URL and reject non-local ones outright.
+        const originalFetch = scope.fetch;
+
+        scope.fetch = (input: RequestInfo | URL, init?: RequestInit) => {
+            const url =
+                typeof input === 'string'
+                    ? input
+                    : input instanceof URL
+                      ? input.href
+                      : input.url;
+
+            store.push(url);
+
+            if (!scope.__captureIsLocal(url)) {
+                return Promise.reject(
+                    new Error(`capture network gate blocked ${url}`)
+                );
+            }
+
+            return originalFetch(input, init);
+        };
+    }, policy);
+}
+
+export async function drainRecordedRequests(
+    app: ElectronApplication
+): Promise<string[]> {
+    return app.evaluate(
+        () =>
+            (globalThis as unknown as { __captureRequests?: string[] })
+                .__captureRequests ?? []
+    );
+}
diff --git a/tools/release/capture-release-screenshots.ts b/tools/release/capture-release-screenshots.ts
new file mode 100644
index 000000000..83f7d6a6a
--- /dev/null
+++ b/tools/release/capture-release-screenshots.ts
@@ -0,0 +1,358 @@
+/**
+ * Release screenshot capture, manifest-driven and fail-closed.
+ *
+ *   pnpm release:screenshots                      # release slug from package.json
+ *   pnpm release:screenshots --release v0-24      # explicit
+ *   pnpm release:screenshots --only dashboard --theme dark
+ *
+ * Reads tools/release/screenshots.manifest.json and writes
+ * apps/website/public/blog/<release>/screenshots/<slug>-<theme>.png against
+ * dist builds + the xtream mock server. Guards (screenshot-guards.mjs):
+ *
+ *   G1  the real ~/.iptvnator/databases directory — including the SQLite WAL
+ *       sidecars, compared after Electron exits and checkpoints — is proven
+ *       untouched
+ *   G2  the app gets an allowlisted environment, never ...process.env
+ *   G3  a main-process recorder (installed before the renderer boots) plus a
+ *       page-level deny-by-default route; any external attempt fails the run
+ *   G4  every frame is checked for external resources / credential text
+ *   G5  TMDB stays disabled (fresh profile default, asserted via IndexedDB)
+ *
+ * Frames are staged outside the repository and published only after every
+ * shot and every guard has passed, so a failure can neither leave unsafe
+ * frames behind nor destroy previously committed release assets.
+ */
+
+import { accessSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { homedir, tmpdir } from 'node:os';
+import path from 'node:path';
+import process from 'node:process';
+import type { Page } from '@playwright/test';
+
+import {
+    buildCaptureEnv,
+    compareDatabaseStates,
+    evaluateFrameReport,
+    externalRequestViolations,
+    HOST_RESOLVER_RULES,
+    isAllowedRequestUrl,
+    networkPolicy,
+    parseSetupStep,
+    publishDirectory,
+    snapshotDatabaseState,
+    stubbedResponseFor,
+    validateManifest,
+    validateReleaseSlug,
+} from './screenshot-guards.mjs';
+import * as driver from './capture-app-driver';
+import { applyTheme, runAction, settleUi } from './capture-navigation';
+import { assertTmdbDisabled } from './capture-tmdb-check';
+import {
+    drainRecordedRequests,
+    installRequestRecorder,
+} from './capture-network-gate';
+
+type Theme = 'dark' | 'light';
+
+const workspaceRoot = process.cwd();
+const manifestPath = path.join(
+    workspaceRoot,
+    'tools/release/screenshots.manifest.json'
+);
+const electronMainPath = path.join(
+    workspaceRoot,
+    'dist/apps/electron-backend/main.js'
+);
+const realDbDir = path.join(homedir(), '.iptvnator/databases');
+
+const args = process.argv.slice(2);
+const flag = (name: string): string | null => {
+    const index = args.indexOf(`--${name}`);
+
+    return index !== -1 ? (args[index + 1] ?? null) : null;
+};
+
+const blockedRequests: string[] = [];
+
+async function main(): Promise<void> {
+    const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
+    const manifestErrors = validateManifest(manifest);
+
+    if (manifestErrors.length > 0) {
+        throw new Error(`Invalid manifest:\n  ${manifestErrors.join('\n  ')}`);
+    }
+
+    const release =
+        flag('release') ?? `v${readAppVersion().split('.').slice(0, 2).join('-')}`;
+    const releaseError = validateReleaseSlug(release);
+
+    if (releaseError) {
+        throw new Error(`--release rejected: ${releaseError}`);
+    }
+
+    const only = flag('only');
+    const themeFilter = flag('theme');
+    const shots = manifest.shots.filter(
+        (shot: { slug: string }) => !only || shot.slug === only
+    );
+
+    if (shots.length === 0) {
+        throw new Error(`--only ${only} matches no manifest slug`);
+    }
+
+    // Without this an erased cast would accept `--theme --only`, and every
+    // non-`dark` value silently renders as light into a misnamed file.
+    if (themeFilter && !manifest.themes.includes(themeFilter)) {
+        throw new Error(
+            `--theme "${themeFilter}" is not one of ${manifest.themes.join(', ')}`
+        );
+    }
+
+    const themes: Theme[] = themeFilter
+        ? [themeFilter as Theme]
+        : manifest.themes;
+    const blogRoot = path.join(workspaceRoot, 'apps/website/public/blog');
+    const outputRoot = path.join(blogRoot, release, 'screenshots');
+
+    // Belt and braces: the slug is validated above, but assert the resolved
+    // path really lands inside the blog tree before anything deletes there.
+    assertSync(
+        path.resolve(outputRoot).startsWith(`${path.resolve(blogRoot)}${path.sep}`),
+        `refusing to publish outside the blog tree: ${outputRoot}`
+    );
+
+    assertBuiltRuntime();
+
+    // G1: snapshot the real database directory BEFORE anything launches.
+    const dbBefore = snapshotDatabaseState(realDbDir);
+
+    // Frames are staged outside the repo and published only once every shot
+    // and every guard has passed, so a late failure can never destroy the
+    // release assets an earlier run already committed.
+    const stagingDir = mkdtempSync(path.join(tmpdir(), 'iptvnator-shots-'));
+    const mockServer = await driver.ensureXtreamMockServer(workspaceRoot);
+    const dataDir = mkdtempSync(path.join(tmpdir(), 'iptvnator-release-shots-'));
+    let app: Awaited<ReturnType<typeof driver.launchApp>> | undefined;
+    let recordedRequests: string[] = [];
+    let captured = 0;
+    let primaryError: unknown;
+
+    try {
+        // G2: constructed environment — nothing ambient crosses over.
+        app = await driver.launchApp(
+            electronMainPath,
+            buildCaptureEnv(process.env, {
+                ELECTRON_IS_DEV: '0',
+                IPTVNATOR_E2E_DATA_DIR: dataDir,
+                NODE_ENV: 'test',
+            }),
+            HOST_RESOLVER_RULES
+        );
+
+        // G3, first layer: a main-process gate, installed before the renderer
+        // can boot. It both records and blocks, because page-level routing
+        // exists only once a page handle is obtained and never covers what the
+        // main process itself fetches.
+        await installRequestRecorder(app, networkPolicy());
+
+        const page = await driver.findMainWindow(app);
+
+        // G3, second layer: page-level deny-by-default, which also blocks.
+        await page.route('**/*', async (route) => {
+            const url = route.request().url();
+
+            if (isAllowedRequestUrl(url)) {
+                await route.continue();
+                return;
+            }
+
+            // Known app-level calls are answered locally so the run stays
+            // hermetic without failing on legitimate app behavior.
+            const stub = stubbedResponseFor(url);
+
+            if (stub) {
+                await route.fulfill({
+                    body: stub.body,
+                    contentType: stub.contentType,
+                });
+                return;
+            }
+
+            blockedRequests.push(url);
+            await route.abort();
+        });
+
+        await driver.sizeWindow(app, manifest.viewport);
+        await driver.waitForAppReady(page);
+        await assertTmdbDisabled(page); // G5
+        await driver.seedDemoData(page, driver.writeM3uFixture(dataDir));
+
+        for (const theme of themes) {
+            await applyTheme(page, theme);
+
+            for (const shot of shots) {
+                for (const step of shot.setup) {
+                    const { action, param } = parseSetupStep(String(step));
+                    await runAction(page, action, param);
+                }
+
+                await captureShot(page, stagingDir, shot.slug, theme);
+                captured += 1;
+            }
+        }
+
+        recordedRequests = await drainRecordedRequests(app);
+
+        // A recorder that observes nothing is indistinguishable from a
+        // passing run, which is how a guard silently stops guarding. Assert
+        // it saw the renderer's own document load rather than merely "some"
+        // traffic: seeding requests alone would prove nothing about whether
+        // the hook existed before the renderer started fetching.
+        assertSync(
+            recordedRequests.some((url) => /\/index\.html?($|[?#])/.test(url)),
+            `G3 failed: the request recorder never saw the renderer document load (${recordedRequests.length} URL(s) recorded) — it was installed too late to cover startup`
+        );
+
+        // G3: an attempted external request means a fixture is wrong, not
+        // that we got away with it.
+        const external = externalRequestViolations([
+            ...blockedRequests,
+            ...recordedRequests,
+        ]);
+
+        if (external.length > 0) {
+            throw new Error(
+                `G3 failed: ${external.length} external request(s) were attempted:\n  ${external
+                    .slice(0, 15)
+                    .join('\n  ')}`
+            );
+        }
+
+        assertSync(
+            snapshotDatabaseState(path.join(dataDir, 'databases')).exists,
+            'G1 failed: the isolated database was never created — the app did not honor IPTVNATOR_E2E_DATA_DIR'
+        );
+    } catch (error) {
+        // Captured rather than rethrown: a failing run is exactly when a lost
+        // isolation override is most likely, so G1 must still be evaluated.
+        primaryError = error;
+    } finally {
+        // Close before the G1 comparison: SQLite runs in WAL mode, so writes
+        // may sit in -wal until the worker shuts down and checkpoints.
+        await app?.close().catch(() => undefined);
+        mockServer?.kill('SIGTERM');
+        rmSync(dataDir, { recursive: true, force: true });
+    }
+
+    const dbViolation = compareDatabaseStates(
+        dbBefore,
+        snapshotDatabaseState(realDbDir)
+    );
+
+    if (dbViolation) {
+        rmSync(stagingDir, { recursive: true, force: true });
+        throw new Error(
+            `G1 failed: ${dbViolation}${
+                primaryError instanceof Error
+                    ? `\n(raised while handling: ${primaryError.message})`
+                    : ''
+            }`
+        );
+    }
+
+    if (primaryError) {
+        rmSync(stagingDir, { recursive: true, force: true });
+        throw primaryError;
+    }
+
+    // A filtered run refreshes a subset, so it must overlay rather than
+    // replace: publishing only the captured frames would delete every other
+    // screenshot of the release.
+    publishDirectory(stagingDir, outputRoot, String(process.pid), {
+        mode: only || themeFilter ? 'merge' : 'replace',
+    });
+    rmSync(stagingDir, { recursive: true, force: true });
+    console.log(
+        `Captured ${captured} screenshot(s) into ${path.relative(workspaceRoot, outputRoot)}`
+    );
+    console.log(
+        `Guards passed: ${new Set(recordedRequests).size} distinct request(s) observed, all local.`
+    );
+}
+
+async function captureShot(
+    page: Page,
+    outputRoot: string,
+    slug: string,
+    theme: Theme
+): Promise<void> {
+    await settleUi(page);
+
+    // G4: inspect the frame before trusting it.
+    const report = await page.evaluate(() => {
+        const urls = new Set<string>();
+
+        document.querySelectorAll('img[src]').forEach((img) => {
+            urls.add((img as HTMLImageElement).src);
+        });
+        document.querySelectorAll<HTMLElement>('*').forEach((element) => {
+            const background = getComputedStyle(element).backgroundImage;
+            const match = background?.match(/url\("?([^")]+)"?\)/);
+
+            if (match) {
+                urls.add(match[1]);
+            }
+        });
+
+        return {
+            resourceUrls: [...urls],
+            bodyText: document.body.innerText,
+        };
+    });
+
+    const violations = evaluateFrameReport(report);
+
+    if (violations.length > 0) {
+        throw new Error(
+            `G4 failed on ${slug} (${theme}):\n  ${violations.join('\n  ')}`
+        );
+    }
+
+    await page.screenshot({
+        path: path.join(outputRoot, `${slug}-${theme}.png`),
+        type: 'png',
+    });
+    console.log(`  ✓ ${slug} (${theme})`);
+}
+
+function assertBuiltRuntime(): void {
+    for (const required of [
+        electronMainPath,
+        path.join(workspaceRoot, 'dist/apps/web/index.html'),
+    ]) {
+        try {
+            accessSync(required);
+        } catch {
+            throw new Error(
+                `Built runtime missing: ${required}\nBuild it first: pnpm nx run electron-backend:build-e2e`
+            );
+        }
+    }
+}
+
+function readAppVersion(): string {
+    return JSON.parse(
+        readFileSync(path.join(workspaceRoot, 'package.json'), 'utf8')
+    ).version;
+}
+
+function assertSync(condition: unknown, message: string): asserts condition {
+    if (!condition) {
+        throw new Error(message);
+    }
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});
diff --git a/tools/release/capture-tmdb-check.ts b/tools/release/capture-tmdb-check.ts
new file mode 100644
index 000000000..8f0df00b6
--- /dev/null
+++ b/tools/release/capture-tmdb-check.ts
@@ -0,0 +1,56 @@
+/**
+ * G5: proof that TMDB enrichment stays off for the capture profile, so no
+ * licensed poster or still can reach a published screenshot.
+ */
+
+import type { Page } from '@playwright/test';
+
+/**
+ * G5: settings live in the renderer's IndexedDB (ngx-pwa StorageMap). A
+ * fresh profile has no entry, which means the TMDB defaults (disabled,
+ * empty key) apply. Read-only assertion — if a future change flips the
+ * default or seeds a key, the run stops before a licensed poster can render.
+ */
+export async function assertTmdbDisabled(page: Page): Promise<void> {
+    const tmdb = await page.evaluate(
+        () =>
+            new Promise<{ enabled?: boolean; apiKey?: string } | null>(
+                (resolve) => {
+                    const request = indexedDB.open('ngStorage');
+
+                    request.onerror = () => resolve(null);
+                    request.onsuccess = () => {
+                        const db = request.result;
+
+                        if (!db.objectStoreNames.contains('localStorage')) {
+                            resolve(null);
+                            return;
+                        }
+
+                        const get = db
+                            .transaction('localStorage')
+                            .objectStore('localStorage')
+                            .get('settings');
+
+                        get.onerror = () => resolve(null);
+                        get.onsuccess = () =>
+                            resolve(
+                                (get.result as { tmdb?: { enabled?: boolean; apiKey?: string } })
+                                    ?.tmdb ?? null
+                            );
+                    };
+                }
+            )
+    );
+
+    assertSync(
+        !tmdb?.enabled && !tmdb?.apiKey,
+        `G5 failed: TMDB enrichment is active in the capture profile (${JSON.stringify(tmdb)})`
+    );
+}
+
+function assertSync(condition: unknown, message: string): asserts condition {
+    if (!condition) {
+        throw new Error(message);
+    }
+}
diff --git a/tools/release/capture-v020-screenshots.ts b/tools/release/capture-v020-screenshots.ts
deleted file mode 100644
index eb09fce16..000000000
--- a/tools/release/capture-v020-screenshots.ts
+++ /dev/null
@@ -1,1165 +0,0 @@
-import { spawn, type ChildProcess } from 'node:child_process';
-import {
-    accessSync,
-    mkdtempSync,
-    mkdirSync,
-    readFileSync,
-    rmSync,
-    writeFileSync,
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import path from 'node:path';
-import process from 'node:process';
-import {
-    _electron as electron,
-    type ElectronApplication,
-    type Page,
-} from '@playwright/test';
-
-type ThemeName = 'dark' | 'light';
-type ScreenshotSlug =
-    | 'dashboard'
-    | 'm3u-live-groups-two-column'
-    | 'settings'
-    | 'xtream-series-season-open'
-    | 'xtream-vod-details';
-
-type CaptureTarget = {
-    slug: ScreenshotSlug;
-    title: string;
-    kicker: string;
-};
-
-const workspaceRoot = process.cwd();
-const electronMainPath = path.join(
-    workspaceRoot,
-    'dist/apps/electron-backend/main.js'
-);
-const rendererIndexPath = path.join(workspaceRoot, 'dist/apps/web/index.html');
-const xtreamMockOrigin = 'http://localhost:3211';
-const outputRoot = path.join(
-    workspaceRoot,
-    'apps/website/public/blog/v0-20/screenshots'
-);
-const heroOutputPath = path.join(
-    workspaceRoot,
-    'apps/website/public/blog/v0-20/v0-20-hero.png'
-);
-const viewport = { width: 1280, height: 720 };
-const captureTargets: CaptureTarget[] = [
-    {
-        slug: 'dashboard',
-        title: 'Content-first dashboard',
-        kicker: 'New in v0.20',
-    },
-    {
-        slug: 'xtream-vod-details',
-        title: 'Richer movie details',
-        kicker: 'Xtream',
-    },
-    {
-        slug: 'xtream-series-season-open',
-        title: 'Series seasons and episodes',
-        kicker: 'Xtream',
-    },
-    {
-        slug: 'settings',
-        title: 'Reworked settings',
-        kicker: 'Customization',
-    },
-    {
-        slug: 'm3u-live-groups-two-column',
-        title: 'Two-column live TV',
-        kicker: 'M3U',
-    },
-];
-let capturedM3uPlaylistId: string | undefined;
-let capturedXtreamPlaylistId: string | undefined;
-
-async function main(): Promise<void> {
-    assertBuiltRuntimeExists();
-
-    mkdirSync(outputRoot, { recursive: true });
-    const managedMockServer = await ensureXtreamMockServer();
-    const dataDir = mkdtempSync(path.join(tmpdir(), 'iptvnator-v020-shots-'));
-    const m3uFixturePath = writeM3uPlaylistFixture(dataDir);
-    let app: ElectronApplication | undefined;
-
-    try {
-        app = await launchApp(dataDir);
-        const page = await findMainWindow(app);
-        await sizeElectronWindow(app);
-        await waitForAppReady(page);
-        await seedDemoData(page, m3uFixturePath);
-
-        for (const theme of ['dark', 'light'] as ThemeName[]) {
-            await applyTheme(page, theme);
-            await captureThemeSet(page, theme);
-        }
-
-        await createHeroImage(page);
-        await verifyExpectedAssets();
-    } finally {
-        await app?.close().catch(() => undefined);
-        managedMockServer?.kill('SIGTERM');
-        rmSync(dataDir, { recursive: true, force: true });
-    }
-}
-
-function assertBuiltRuntimeExists(): void {
-    if (!fileExists(electronMainPath) || !fileExists(rendererIndexPath)) {
-        throw new Error(
-            [
-                'Electron E2E runtime is missing.',
-                `Expected ${electronMainPath}`,
-                `Expected ${rendererIndexPath}`,
-                'Build it first, for example: pnpm nx run electron-backend:build-e2e',
-            ].join('\n')
-        );
-    }
-}
-
-async function ensureXtreamMockServer(): Promise<ChildProcess | undefined> {
-    if (await isHealthy(`${xtreamMockOrigin}/health`)) {
-        return undefined;
-    }
-
-    const child = spawn(
-        path.join(workspaceRoot, 'node_modules/.bin/tsx'),
-        ['apps/xtream-mock-server/src/main.ts'],
-        {
-            cwd: workspaceRoot,
-            env: {
-                ...process.env,
-                NODE_ENV: 'development',
-                PORT: '3211',
-            },
-            stdio: ['ignore', 'pipe', 'pipe'],
-        }
-    );
-
-    child.stdout?.on('data', (chunk) => {
-        process.stdout.write(`[xtream-mock] ${chunk}`);
-    });
-    child.stderr?.on('data', (chunk) => {
-        process.stderr.write(`[xtream-mock] ${chunk}`);
-    });
-
-    await waitForHealthy(`${xtreamMockOrigin}/health`, 20_000);
-    return child;
-}
-
-function buildM3uPlaylist(): string {
-    const channels = [
-        ['Newsroom', 'Aurora Local', 'aurora-local'],
-        ['Newsroom', 'Civic Pulse', 'civic-pulse'],
-        ['Sports', 'Fieldside One', 'fieldside-one'],
-        ['Sports', 'Motion Arena', 'motion-arena'],
-        ['Kids', 'Horizon Kids', 'horizon-kids'],
-        ['Kids', 'Story Lantern', 'story-lantern'],
-        ['Culture', 'Atlas Culture', 'atlas-culture'],
-        ['Culture', 'Night Music', 'night-music'],
-    ];
-    const stream = `${xtreamMockOrigin}/live/marketing/marketing/52000.m3u8`;
-    const lines = ['#EXTM3U'];
-
-    channels.forEach(([group, title, slug], index) => {
-        lines.push(
-            `#EXTINF:-1 tvg-id="demo-${index + 1}" tvg-name="${title}" tvg-logo="${xtreamMockOrigin}/assets/marketing/logo/${slug}.svg?size=256x256" group-title="${group}",${title}`
-        );
-        lines.push(stream);
-    });
-
-    return `${lines.join('\n')}\n`;
-}
-
-function writeM3uPlaylistFixture(dataDir: string): string {
-    const filePath = path.join(dataDir, 'v020-demo.m3u');
-    writeFileSync(filePath, buildM3uPlaylist(), 'utf8');
-    return filePath;
-}
-
-function marketingAssetUrl(
-    kind: 'backdrop' | 'episode' | 'logo' | 'poster' | 'season',
-    title: string,
-    size: string
-): string {
-    return `${xtreamMockOrigin}/assets/marketing/${kind}/${slugifyForFile(
-        title
-    )}.svg?size=${encodeURIComponent(size)}`;
-}
-
-async function launchApp(dataDir: string): Promise<ElectronApplication> {
-    return electron.launch({
-        args: [electronMainPath],
-        env: {
-            ...process.env,
-            ELECTRON_IS_DEV: '0',
-            IPTVNATOR_E2E_DATA_DIR: dataDir,
-            NODE_ENV: 'test',
-        },
-    });
-}
-
-async function findMainWindow(app: ElectronApplication): Promise<Page> {
-    await new Promise((resolve) => setTimeout(resolve, 1500));
-
-    for (const candidate of app.windows()) {
-        const title = await candidate.title();
-        if (!title.includes('DevTools')) {
-            return candidate;
-        }
-    }
-
-    return app.firstWindow();
-}
-
-async function sizeElectronWindow(app: ElectronApplication): Promise<void> {
-    await app.evaluate(({ BrowserWindow }, size) => {
-        const win = BrowserWindow.getAllWindows().find(
-            (candidate) => !candidate.webContents.getTitle().includes('DevTools')
-        );
-        win?.setSize(size.width, size.height);
-        win?.center();
-    }, viewport);
-}
-
-async function waitForAppReady(page: Page): Promise<void> {
-    await page.waitForLoadState('domcontentloaded');
-    await page.waitForSelector('app-root', { timeout: 45_000 });
-    await page.waitForFunction(
-        () => (document.querySelector('app-root')?.innerHTML.trim().length ?? 0) > 0,
-        { timeout: 45_000 }
-    );
-}
-
-async function seedDemoData(page: Page, m3uPath: string): Promise<void> {
-    await addXtreamPortal(page);
-    await addM3uPlaylist(page, m3uPath);
-    await seedDashboardActivity(page);
-}
-
-async function addXtreamPortal(page: Page): Promise<void> {
-    await openAddPlaylistDialog(page);
-    const dialog = page.locator('mat-dialog-container').last();
-
-    await clickDialogOption(dialog, /^xtream$/i);
-    await dialog.locator('#title').fill('v0.20 Fictional Xtream');
-    await dialog.locator('#serverUrl').fill(xtreamMockOrigin);
-    await dialog.locator('#username').fill('marketing');
-    await dialog.locator('#password').fill('marketing');
-    await dialog.getByRole('button', { name: /^(add|add playlist)$/i }).last().click();
-    await dialog.waitFor({ state: 'detached', timeout: 30_000 });
-    await page.waitForURL(/\/workspace\/xtreams\/[^/]+\/vod/, {
-        timeout: 45_000,
-    });
-    capturedXtreamPlaylistId = playlistIdFromUrl(page.url(), 'xtreams');
-    await page.locator('.category-content-layout, app-content-card').first().waitFor({
-        state: 'visible',
-        timeout: 45_000,
-    });
-}
-
-async function addM3uPlaylist(page: Page, m3uPath: string): Promise<void> {
-    await openAddPlaylistDialog(page);
-    const dialog = page.locator('mat-dialog-container').last();
-
-    await clickDialogOption(dialog, /^m3u$/i);
-    await clickDialogOption(dialog, /add\s+via\s+file\s+upload/i);
-
-    const fileInput = dialog.locator('input[type="file"][name="playlist"]');
-    await fileInput.evaluate((element, selectedFilePath) => {
-        (element as HTMLInputElement).dataset.filePathOverride =
-            selectedFilePath;
-    }, m3uPath);
-    await fileInput.setInputFiles(m3uPath);
-    await dialog
-        .getByRole('button', { name: /add playlist/i })
-        .last()
-        .click({ timeout: 15_000 });
-    await dialog.waitFor({ state: 'detached', timeout: 30_000 });
-    await page.waitForURL(/\/workspace\/playlists\/[^/]+\/all/, {
-        timeout: 45_000,
-    });
-    capturedM3uPlaylistId = playlistIdFromUrl(page.url(), 'playlists');
-    try {
-        await page.locator('[data-test-id="channel-item"]').first().waitFor({
-            state: 'visible',
-            timeout: 60_000,
-        });
-    } catch (error) {
-        await writeDebugScreenshot(page, 'm3u-import');
-        const diagnostics = await page.evaluate(() => ({
-            bodyText: document.body.innerText.slice(0, 2000),
-            title: document.title,
-            url: location.href,
-        }));
-
-        console.error(
-            `[capture] M3U import did not show channels: ${JSON.stringify(
-                diagnostics,
-                null,
-                2
-            )}`
-        );
-        throw error;
-    }
-}
-
-async function seedDashboardActivity(page: Page): Promise<void> {
-    const playlistId = requireCapturedPlaylistId('xtreams');
-    const items = [
-        {
-            xtreamId: 62000,
-            type: 'movie' as const,
-            backdropUrl: marketingAssetUrl('backdrop', 'Crimson Skylark', '1280x720'),
-            favorite: true,
-            recent: true,
-        },
-        {
-            xtreamId: 62001,
-            type: 'movie' as const,
-            backdropUrl: marketingAssetUrl('backdrop', 'The Voltage Guard', '1280x720'),
-            favorite: true,
-            recent: true,
-        },
-        {
-            xtreamId: 62002,
-            type: 'movie' as const,
-            backdropUrl: marketingAssetUrl('backdrop', 'Midnight Mantle', '1280x720'),
-            favorite: true,
-            recent: false,
-        },
-        {
-            xtreamId: 72000,
-            type: 'series' as const,
-            backdropUrl: marketingAssetUrl('backdrop', 'Skyline Sentinels', '1280x720'),
-            favorite: true,
-            recent: true,
-        },
-        {
-            xtreamId: 72001,
-            type: 'series' as const,
-            backdropUrl: marketingAssetUrl('backdrop', 'The Aegis Club', '1280x720'),
-            favorite: true,
-            recent: false,
-        },
-    ];
-
-    await page.evaluate(
-        async ({ items, playlistId }) => {
-            const electronApi = (window as typeof window & {
-                electron?: {
-                    dbAddFavorite?: (
-                        contentId: number,
-                        playlistId: string,
-                        backdropUrl?: string
-                    ) => Promise<unknown>;
-                    dbAddRecentItem?: (
-                        contentId: number,
-                        playlistId: string,
-                        backdropUrl?: string
-                    ) => Promise<unknown>;
-                    dbGetContentByXtreamId?: (
-                        xtreamId: number,
-                        playlistId: string,
-                        contentType?: 'live' | 'movie' | 'series'
-                    ) => Promise<{ id: number } | null>;
-                };
-            }).electron;
-
-            if (!electronApi?.dbGetContentByXtreamId) {
-                throw new Error('Electron database bridge is unavailable.');
-            }
-
-            for (const item of items) {
-                const content = await electronApi.dbGetContentByXtreamId(
-                    item.xtreamId,
-                    playlistId,
-                    item.type
-                );
-
-                if (!content?.id) {
-                    throw new Error(
-                        `Could not find imported Xtream content ${item.xtreamId}.`
-                    );
-                }
-
-                if (item.favorite) {
-                    await electronApi.dbAddFavorite?.(
-                        content.id,
-                        playlistId,
-                        item.backdropUrl
-                    );
-                }
-
-                if (item.recent) {
-                    await electronApi.dbAddRecentItem?.(
-                        content.id,
-                        playlistId,
-                        item.backdropUrl
-                    );
-                }
-            }
-        },
-        { items, playlistId }
-    );
-}
-
-async function openAddPlaylistDialog(page: Page): Promise<void> {
-    await page.getByRole('button', { name: /add playlist/i }).first().click();
-    await page.locator('mat-dialog-container').last().waitFor({
-        state: 'visible',
-        timeout: 15_000,
-    });
-}
-
-async function clickDialogOption(dialog: ReturnType<Page['locator']>, label: RegExp): Promise<void> {
-    const tab = dialog.getByRole('tab', { name: label }).first();
-    if ((await tab.count()) > 0) {
-        await tab.click();
-        return;
-    }
-
-    await dialog.getByRole('button', { name: label }).first().click();
-}
-
-async function applyTheme(page: Page, theme: ThemeName): Promise<void> {
-    await openSettings(page);
-    const testId = theme === 'dark' ? 'DARK_THEME' : 'LIGHT_THEME';
-    const themeButton = page.locator(`[data-test-id="${testId}"]`).first();
-
-    await themeButton.scrollIntoViewIfNeeded();
-    await themeButton.click();
-
-    const saveButton = page.locator('[data-test-id="save-settings"]').first();
-    if (await saveButton.isEnabled()) {
-        await saveButton.click();
-        await waitForTransientUiToSettle(page);
-    }
-
-    await page.waitForFunction(
-        (expectedTheme) =>
-            document.body.classList.contains('dark-theme') ===
-            (expectedTheme === 'dark'),
-        theme,
-        { timeout: 10_000 }
-    );
-}
-
-async function openSettings(page: Page): Promise<void> {
-    await page.locator('a[href$="/workspace/settings"]').first().click();
-    await page.waitForURL(/\/workspace\/settings/, { timeout: 15_000 });
-    await page.locator('[data-test-id="settings-container"]').waitFor({
-        state: 'visible',
-        timeout: 15_000,
-    });
-}
-
-async function captureThemeSet(page: Page, theme: ThemeName): Promise<void> {
-    await captureCurrentView(page, theme, 'settings');
-    await openDashboard(page);
-    await captureCurrentView(page, theme, 'dashboard');
-    await openXtreamVodDetails(page);
-    await captureCurrentView(page, theme, 'xtream-vod-details');
-    await openXtreamSeriesSeason(page);
-    await captureCurrentView(page, theme, 'xtream-series-season-open');
-    await openM3uGroupsView(page);
-    await captureCurrentView(page, theme, 'm3u-live-groups-two-column');
-}
-
-async function openDashboard(page: Page): Promise<void> {
-    await page.locator('a.brand[href$="/workspace/dashboard"]').first().click();
-    await page.waitForURL(/\/workspace\/dashboard/, { timeout: 20_000 });
-    await page.locator('[data-test-id="dashboard-page"]').waitFor({
-        state: 'visible',
-        timeout: 20_000,
-    });
-    await waitForTransientUiToSettle(page);
-    await page.locator('[data-test-id="dashboard-hero"]').waitFor({
-        state: 'visible',
-        timeout: 30_000,
-    });
-
-    for (const testId of [
-        'dashboard-recently-watched-rail',
-        'dashboard-global-favorites-rail',
-        'dashboard-recent-sources-rail',
-        'dashboard-xtream-recently-added-rail',
-    ]) {
-        await page.locator(`[data-test-id="${testId}"]`).waitFor({
-            state: 'visible',
-            timeout: 30_000,
-        });
-    }
-}
-
-async function waitForTransientUiToSettle(page: Page): Promise<void> {
-    await page
-        .locator('.mat-mdc-snack-bar-container')
-        .first()
-        .waitFor({ state: 'detached', timeout: 10_000 })
-        .catch(() => undefined);
-    await page.evaluate(() => {
-        document
-            .querySelectorAll('.mat-mdc-snack-bar-container, simple-snack-bar')
-            .forEach((element) => {
-                const overlayPane = element.closest('.cdk-overlay-pane');
-                (overlayPane ?? element).remove();
-            });
-    });
-    await page.waitForTimeout(250);
-}
-
-async function openXtreamVodDetails(page: Page): Promise<void> {
-    const xtreamId = requireCapturedPlaylistId('xtreams');
-
-    await clickHrefSuffix(page, `/workspace/xtreams/${xtreamId}/vod`);
-    await clickCategoryByName(page, 'Hero Premieres');
-    await clickFirstGridCard(page);
-    await page.waitForURL(/\/workspace\/xtreams\/[^/]+\/vod\/[^/]+\/[^/]+/, {
-        timeout: 30_000,
-    });
-    await page.locator('app-content-hero').waitFor({
-        state: 'visible',
-        timeout: 30_000,
-    });
-    await page.waitForTimeout(700);
-}
-
-async function openXtreamSeriesSeason(page: Page): Promise<void> {
-    const xtreamId = requireCapturedPlaylistId('xtreams');
-
-    await clickHrefSuffix(page, `/workspace/xtreams/${xtreamId}/series`);
-    await clickCategoryByName(page, 'Hero Teams');
-    await clickFirstGridCard(page);
-    await page.waitForURL(/\/workspace\/xtreams\/[^/]+\/series\/[^/]+\/[^/]+/, {
-        timeout: 30_000,
-    });
-    await page.locator('app-season-container').waitFor({
-        state: 'visible',
-        timeout: 30_000,
-    });
-    await page.locator('.season-card').first().click();
-    await page.locator('.episode-card, .episode-list-item').first().waitFor({
-        state: 'visible',
-        timeout: 20_000,
-    });
-    await page.waitForTimeout(700);
-}
-
-async function openM3uGroupsView(page: Page): Promise<void> {
-    const playlistId = requireCapturedPlaylistId('playlists');
-
-    await switchPlaylistFromHeader(page, 'v020-demo');
-    await page.waitForURL(new RegExp(`/workspace/playlists/${playlistId}/`), {
-        timeout: 20_000,
-    });
-    await clickHrefSuffix(page, `/workspace/playlists/${playlistId}/groups`);
-    await page.waitForURL(/\/workspace\/playlists\/[^/]+\/groups/, {
-        timeout: 20_000,
-    });
-    await page.locator('.group-nav-item').first().waitFor({
-        state: 'visible',
-        timeout: 20_000,
-    });
-    await page.locator('.group-nav-item').first().click();
-    await page.locator('[data-test-id="channel-item"]').first().click();
-    await page.waitForTimeout(1_000);
-}
-
-async function switchPlaylistFromHeader(
-    page: Page,
-    title: string
-): Promise<void> {
-    await page.locator('app-playlist-switcher .playlist-switcher-trigger').click();
-
-    const item = page
-        .locator('.cdk-overlay-pane .playlist-item')
-        .filter({ hasText: title })
-        .first();
-
-    await item.waitFor({ state: 'visible', timeout: 20_000 });
-    await item.click();
-    await page.locator('.cdk-overlay-pane .playlist-item').first().waitFor({
-        state: 'detached',
-        timeout: 10_000,
-    });
-}
-
-async function clickCategoryByName(
-    page: Page,
-    categoryName: string
-): Promise<void> {
-    const category = page
-        .locator('app-workspace-context-panel .category-item')
-        .filter({ hasText: categoryName })
-        .first();
-
-    try {
-        await category.waitFor({ state: 'visible', timeout: 30_000 });
-    } catch (error) {
-        await writeDebugScreenshot(page, `category-${slugifyForFile(categoryName)}`);
-        const diagnostics = await page.evaluate(() => ({
-            bodyText: document.body.innerText.slice(0, 2500),
-            categories: Array.from(
-                document.querySelectorAll(
-                    'app-workspace-context-panel .category-item'
-                )
-            ).map((element) => ({
-                id: element.getAttribute('data-category-id'),
-                text: (element.textContent ?? '').trim(),
-            })),
-            title: document.title,
-            url: location.href,
-        }));
-
-        console.error(
-            `[capture] Category ${categoryName} was not visible: ${JSON.stringify(
-                diagnostics,
-                null,
-                2
-            )}`
-        );
-        throw error;
-    }
-    await category.click();
-    await page.waitForTimeout(600);
-}
-
-async function clickFirstGridCard(page: Page): Promise<void> {
-    const card = page.locator('.category-content-layout mat-card').first();
-
-    await card.waitFor({ state: 'visible', timeout: 30_000 });
-    await card.click();
-}
-
-function requireCapturedPlaylistId(
-    provider: 'playlists' | 'xtreams'
-): string {
-    const id =
-        provider === 'playlists'
-            ? capturedM3uPlaylistId
-            : capturedXtreamPlaylistId;
-
-    if (!id) {
-        throw new Error(`Could not resolve captured ${provider} playlist id.`);
-    }
-
-    return id;
-}
-
-function playlistIdFromUrl(url: string, provider: 'playlists' | 'xtreams'): string {
-    const match = url.match(new RegExp(`/workspace/${provider}/([^/]+)`));
-
-    if (!match?.[1]) {
-        throw new Error(`Could not resolve ${provider} playlist id from URL ${url}`);
-    }
-
-    return match[1];
-}
-
-async function clickHrefSuffix(page: Page, suffix: string): Promise<void> {
-    const link = page.locator(`a[href$="${suffix}"]`).first();
-
-    await link.waitFor({ state: 'attached', timeout: 20_000 });
-    await link.click({ force: true });
-    await page.waitForTimeout(500);
-}
-
-async function captureCurrentView(
-    page: Page,
-    theme: ThemeName,
-    slug: ScreenshotSlug
-): Promise<void> {
-    const originalPath = screenshotPath('original', theme, slug);
-
-    mkdirSync(path.dirname(originalPath), { recursive: true });
-    await prepareForScreenshot(page);
-    await page.screenshot({
-        path: originalPath,
-        type: 'png',
-        fullPage: slug === 'dashboard',
-        scale: 'css',
-    });
-
-    await createDesignedCopy(
-        page,
-        originalPath,
-        screenshotPath('designed', theme, slug),
-        {
-            ...captureTargets.find((target) => target.slug === slug)!,
-            theme,
-        }
-    );
-}
-
-async function prepareForScreenshot(page: Page): Promise<void> {
-    await page.mouse.move(viewport.width - 32, viewport.height - 32);
-    await page.keyboard.press('Escape').catch(() => undefined);
-    await waitForTransientUiToSettle(page);
-    await page
-        .locator('.mat-mdc-tooltip, .mdc-tooltip, .mat-tooltip-panel')
-        .first()
-        .waitFor({ state: 'detached', timeout: 1_500 })
-        .catch(() => undefined);
-    await page.waitForTimeout(200);
-}
-
-async function writeDebugScreenshot(page: Page, name: string): Promise<void> {
-    const debugPath = path.join(outputRoot, 'debug', `${name}.png`);
-    mkdirSync(path.dirname(debugPath), { recursive: true });
-    await page.screenshot({ path: debugPath, fullPage: true, type: 'png' });
-}
-
-function screenshotPath(
-    variant: 'designed' | 'original',
-    theme: ThemeName,
-    slug: ScreenshotSlug
-): string {
-    return path.join(outputRoot, variant, theme, `${slug}.png`);
-}
-
-async function createDesignedCopy(
-    page: Page,
-    inputPath: string,
-    outputPath: string,
-    options: CaptureTarget & { theme: ThemeName }
-): Promise<void> {
-    mkdirSync(path.dirname(outputPath), { recursive: true });
-
-    const canvasWidth = 1920;
-    const canvasHeight = 1080;
-    const screenshotWidth = 1460;
-    const screenshotHeight = 822;
-    const left = 360;
-    const top = 170;
-    const palette =
-        options.theme === 'dark'
-            ? {
-                  bg1: '#090b12',
-                  bg2: '#172235',
-                  accent: '#49c6e5',
-                  text: '#f8fafc',
-                  muted: '#a7b4c8',
-              }
-            : {
-                  bg1: '#eef2f7',
-                  bg2: '#dce7ef',
-                  accent: '#2563eb',
-                  text: '#111827',
-                  muted: '#475569',
-              };
-    const dataUrl = await page.evaluate(
-        async ({
-            inputDataUrl,
-            options,
-            palette,
-            canvasWidth,
-            canvasHeight,
-            screenshotWidth,
-            screenshotHeight,
-            left,
-            top,
-        }) => {
-            const image = await loadCanvasImage(inputDataUrl);
-            const canvas = document.createElement('canvas');
-            const context = canvas.getContext('2d');
-
-            if (!context) {
-                throw new Error('Canvas 2D context is unavailable.');
-            }
-
-            canvas.width = canvasWidth;
-            canvas.height = canvasHeight;
-
-            const background = context.createLinearGradient(
-                0,
-                0,
-                canvasWidth,
-                canvasHeight
-            );
-            background.addColorStop(0, palette.bg1);
-            background.addColorStop(1, palette.bg2);
-            context.fillStyle = background;
-            context.fillRect(0, 0, canvasWidth, canvasHeight);
-
-            context.globalAlpha = 0.16;
-            context.fillStyle = palette.accent;
-            context.beginPath();
-            context.arc(1710, 140, 260, 0, Math.PI * 2);
-            context.fill();
-            context.globalAlpha = 0.12;
-            context.beginPath();
-            context.arc(160, 930, 340, 0, Math.PI * 2);
-            context.fill();
-            context.globalAlpha = 0.28;
-            context.strokeStyle = palette.accent;
-            context.lineWidth = 4;
-            context.beginPath();
-            context.moveTo(0, 810);
-            context.bezierCurveTo(420, 650, 720, 1040, 1220, 840);
-            context.bezierCurveTo(1460, 744, 1720, 610, 1920, 720);
-            context.stroke();
-            context.globalAlpha = 1;
-
-            context.fillStyle = palette.accent;
-            context.font = '800 28px Arial, Helvetica, sans-serif';
-            context.fillText(options.kicker.toUpperCase(), 110, 150);
-            context.fillStyle = palette.text;
-            context.font = '900 72px Arial, Helvetica, sans-serif';
-            context.fillText(options.title, 110, 220);
-            context.fillStyle = palette.muted;
-            context.font = '600 28px Arial, Helvetica, sans-serif';
-            context.fillText(
-                'IPTVnator v0.20 release preview using fictional demo content',
-                110,
-                278
-            );
-
-            context.save();
-            context.shadowColor =
-                options.theme === 'dark'
-                    ? 'rgba(0, 0, 0, 0.42)'
-                    : 'rgba(0, 0, 0, 0.18)';
-            context.shadowBlur = 76;
-            context.shadowOffsetY = 34;
-            context.globalAlpha = options.theme === 'dark' ? 0.78 : 0.9;
-            context.fillStyle = options.theme === 'dark' ? '#020617' : '#ffffff';
-            drawRoundRect(
-                context,
-                left - 18,
-                top - 18,
-                screenshotWidth + 36,
-                screenshotHeight + 36,
-                34
-            );
-            context.fill();
-            context.restore();
-
-            context.save();
-            drawRoundRect(context, left, top, screenshotWidth, screenshotHeight, 18);
-            context.clip();
-            context.drawImage(
-                image,
-                0,
-                0,
-                image.naturalWidth,
-                image.naturalHeight,
-                left,
-                top,
-                screenshotWidth,
-                screenshotHeight
-            );
-            context.restore();
-
-            context.strokeStyle = hexToRgba(palette.accent, 0.35);
-            context.lineWidth = 2;
-            drawRoundRect(
-                context,
-                left - 18,
-                top - 18,
-                screenshotWidth + 36,
-                screenshotHeight + 36,
-                34
-            );
-            context.stroke();
-
-            return canvas.toDataURL('image/png');
-
-            function loadCanvasImage(src: string): Promise<HTMLImageElement> {
-                return new Promise((resolve, reject) => {
-                    const candidate = new Image();
-                    candidate.onload = () => resolve(candidate);
-                    candidate.onerror = () =>
-                        reject(new Error('Could not load screenshot image.'));
-                    candidate.src = src;
-                });
-            }
-
-            function drawRoundRect(
-                context: CanvasRenderingContext2D,
-                x: number,
-                y: number,
-                width: number,
-                height: number,
-                radius: number
-            ): void {
-                context.beginPath();
-                context.moveTo(x + radius, y);
-                context.lineTo(x + width - radius, y);
-                context.quadraticCurveTo(x + width, y, x + width, y + radius);
-                context.lineTo(x + width, y + height - radius);
-                context.quadraticCurveTo(
-                    x + width,
-                    y + height,
-                    x + width - radius,
-                    y + height
-                );
-                context.lineTo(x + radius, y + height);
-                context.quadraticCurveTo(x, y + height, x, y + height - radius);
-                context.lineTo(x, y + radius);
-                context.quadraticCurveTo(x, y, x + radius, y);
-                context.closePath();
-            }
-
-            function hexToRgba(hex: string, alpha: number): string {
-                const normalized = hex.replace('#', '');
-                const red = Number.parseInt(normalized.slice(0, 2), 16);
-                const green = Number.parseInt(normalized.slice(2, 4), 16);
-                const blue = Number.parseInt(normalized.slice(4, 6), 16);
-                return `rgba(${red}, ${green}, ${blue}, ${alpha})`;
-            }
-        },
-        {
-            inputDataUrl: fileToDataUrl(inputPath),
-            options,
-            palette,
-            canvasWidth,
-            canvasHeight,
-            screenshotWidth,
-            screenshotHeight,
-            left,
-            top,
-        }
-    );
-
-    writeDataUrlPng(outputPath, dataUrl);
-}
-
-async function createHeroImage(page: Page): Promise<void> {
-    const dashboard = screenshotPath('original', 'dark', 'dashboard');
-    const vod = screenshotPath('original', 'dark', 'xtream-vod-details');
-    const series = screenshotPath('original', 'light', 'xtream-series-season-open');
-    mkdirSync(path.dirname(heroOutputPath), { recursive: true });
-
-    const dataUrl = await page.evaluate(
-        async ({ dashboard, vod, series }) => {
-            const canvas = document.createElement('canvas');
-            const context = canvas.getContext('2d');
-
-            if (!context) {
-                throw new Error('Canvas 2D context is unavailable.');
-            }
-
-            canvas.width = 1600;
-            canvas.height = 900;
-
-            const background = context.createLinearGradient(0, 0, 1600, 900);
-            background.addColorStop(0, '#06111f');
-            background.addColorStop(0.52, '#111827');
-            background.addColorStop(1, '#233b54');
-            context.fillStyle = background;
-            context.fillRect(0, 0, 1600, 900);
-
-            context.globalAlpha = 0.18;
-            context.fillStyle = '#49c6e5';
-            context.beginPath();
-            context.arc(1380, 120, 240, 0, Math.PI * 2);
-            context.fill();
-            context.globalAlpha = 0.15;
-            context.fillStyle = '#f2a65a';
-            context.beginPath();
-            context.arc(170, 790, 290, 0, Math.PI * 2);
-            context.fill();
-            context.globalAlpha = 1;
-
-            context.fillStyle = '#49c6e5';
-            context.font = '800 30px Arial, Helvetica, sans-serif';
-            context.fillText('IPTVNATOR V0.20', 86, 138);
-            context.fillStyle = '#f8fafc';
-            context.font = '900 78px Arial, Helvetica, sans-serif';
-            context.fillText('Unified UI.', 86, 224);
-            context.fillText('Content-first.', 86, 306);
-            context.fillStyle = '#b9c4d6';
-            context.font = '600 28px Arial, Helvetica, sans-serif';
-            context.fillText(
-                'Dashboard, search, favorites, history, and settings reworked across M3U, Xtream, and Stalker.',
-                88,
-                366
-            );
-
-            await drawFramedImage(context, dashboard, 650, 130, 780, 438, 26, '#020617');
-            await drawFramedImage(context, vod, 500, 505, 520, 292, 22, '#020617');
-            await drawFramedImage(context, series, 990, 565, 430, 242, 20, '#f8fafc');
-
-            return canvas.toDataURL('image/png');
-
-            async function drawFramedImage(
-                context: CanvasRenderingContext2D,
-                src: string,
-                x: number,
-                y: number,
-                width: number,
-                height: number,
-                radius: number,
-                frameColor: string
-            ): Promise<void> {
-                const image = await loadCanvasImage(src);
-
-                context.save();
-                context.shadowColor = 'rgba(0, 0, 0, 0.45)';
-                context.shadowBlur = 60;
-                context.shadowOffsetY = 28;
-                context.globalAlpha = frameColor === '#f8fafc' ? 0.94 : 0.82;
-                context.fillStyle = frameColor;
-                drawRoundRect(context, x, y, width, height, radius);
-                context.fill();
-                context.restore();
-
-                context.save();
-                drawRoundRect(context, x, y, width, height, radius);
-                context.clip();
-                context.drawImage(
-                    image,
-                    0,
-                    0,
-                    image.naturalWidth,
-                    image.naturalHeight,
-                    x,
-                    y,
-                    width,
-                    height
-                );
-                context.restore();
-            }
-
-            function loadCanvasImage(src: string): Promise<HTMLImageElement> {
-                return new Promise((resolve, reject) => {
-                    const candidate = new Image();
-                    candidate.onload = () => resolve(candidate);
-                    candidate.onerror = () =>
-                        reject(new Error('Could not load screenshot image.'));
-                    candidate.src = src;
-                });
-            }
-
-            function drawRoundRect(
-                context: CanvasRenderingContext2D,
-                x: number,
-                y: number,
-                width: number,
-                height: number,
-                radius: number
-            ): void {
-                context.beginPath();
-                context.moveTo(x + radius, y);
-                context.lineTo(x + width - radius, y);
-                context.quadraticCurveTo(x + width, y, x + width, y + radius);
-                context.lineTo(x + width, y + height - radius);
-                context.quadraticCurveTo(
-                    x + width,
-                    y + height,
-                    x + width - radius,
-                    y + height
-                );
-                context.lineTo(x + radius, y + height);
-                context.quadraticCurveTo(x, y + height, x, y + height - radius);
-                context.lineTo(x, y + radius);
-                context.quadraticCurveTo(x, y, x + radius, y);
-                context.closePath();
-            }
-        },
-        {
-            dashboard: fileToDataUrl(dashboard),
-            vod: fileToDataUrl(vod),
-            series: fileToDataUrl(series),
-        }
-    );
-
-    writeDataUrlPng(heroOutputPath, dataUrl);
-}
-
-async function verifyExpectedAssets(): Promise<void> {
-    const expected = [
-        heroOutputPath,
-        ...(['dark', 'light'] as ThemeName[]).flatMap((theme) =>
-            captureTargets.flatMap((target) => [
-                screenshotPath('original', theme, target.slug),
-                screenshotPath('designed', theme, target.slug),
-            ])
-        ),
-    ];
-
-    for (const filePath of expected) {
-        if (!fileExists(filePath)) {
-            throw new Error(`Expected screenshot asset was not created: ${filePath}`);
-        }
-
-        const dimensions = readPngDimensions(filePath);
-        if (!dimensions.width || !dimensions.height) {
-            throw new Error(`Screenshot asset has invalid dimensions: ${filePath}`);
-        }
-    }
-}
-
-async function isHealthy(url: string): Promise<boolean> {
-    try {
-        const response = await fetch(url);
-        return response.ok;
-    } catch {
-        return false;
-    }
-}
-
-async function waitForHealthy(url: string, timeoutMs: number): Promise<void> {
-    const deadline = Date.now() + timeoutMs;
-
-    while (Date.now() < deadline) {
-        if (await isHealthy(url)) {
-            return;
-        }
-        await new Promise((resolve) => setTimeout(resolve, 500));
-    }
-
-    throw new Error(`Timed out waiting for ${url}`);
-}
-
-function fileExists(filePath: string): boolean {
-    try {
-        accessSync(filePath);
-        return true;
-    } catch {
-        return false;
-    }
-}
-
-function fileToDataUrl(filePath: string): string {
-    return `data:image/png;base64,${readFileSync(filePath).toString('base64')}`;
-}
-
-function writeDataUrlPng(filePath: string, dataUrl: string): void {
-    const marker = 'data:image/png;base64,';
-
-    if (!dataUrl.startsWith(marker)) {
-        throw new Error(`Expected PNG data URL for ${filePath}`);
-    }
-
-    writeFileSync(filePath, Buffer.from(dataUrl.slice(marker.length), 'base64'));
-}
-
-function readPngDimensions(filePath: string): { height: number; width: number } {
-    const buffer = readFileSync(filePath);
-    const pngSignature = '89504e470d0a1a0a';
-
-    if (buffer.subarray(0, 8).toString('hex') !== pngSignature) {
-        throw new Error(`Expected PNG signature in ${filePath}`);
-    }
-
-    return {
-        width: buffer.readUInt32BE(16),
-        height: buffer.readUInt32BE(20),
-    };
-}
-
-function slugifyForFile(value: string): string {
-    return value
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-+|-+$/g, '');
-}
-
-main().catch((error) => {
-    console.error(error);
-    process.exit(1);
-});
diff --git a/tools/release/check-release-note-gate.mjs b/tools/release/check-release-note-gate.mjs
new file mode 100644
index 000000000..b774466c3
--- /dev/null
+++ b/tools/release/check-release-note-gate.mjs
@@ -0,0 +1,155 @@
+#!/usr/bin/env node
+/**
+ * Release-note gate policy for pull requests.
+ *
+ * The CI job feeds it `{files: [{filename, status}], labels: [...]}` on
+ * stdin (from the GitHub PR API) and it decides whether the PR needs a
+ * `.changes/*.md` note. Kept as a pure function so the policy is unit-tested
+ * instead of living in workflow bash.
+ *
+ * Policy: a PR that touches runtime code under `apps/` or `libs/` must add
+ * one release note, unless it carries the `no-release-note` label. Test-only,
+ * website, e2e, and mock-server changes never require a note.
+ */
+
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+export const GATE_LABEL = 'no-release-note';
+
+/** Paths that count as user-visible runtime code. */
+const TRIGGER_PREFIXES = ['apps/', 'libs/'];
+
+/**
+ * Changes matching any of these never require a note, even under a trigger
+ * prefix. Mirrors the "when a note is not needed" list in .changes/README.md.
+ */
+const EXEMPT_PATTERNS = [
+    /^apps\/website\//, // marketing site, not the app
+    /^apps\/[^/]*-e2e\//, // e2e projects
+    /^apps\/[^/]*mock-server\//, // dev/e2e fixtures
+    /\.spec\.[jt]s$/,
+    /\.e2e\.[jt]s$/,
+    /\/__snapshots__\//,
+    /\/testing\//, // libs/shared/testing and test-helper folders
+    /\.md$/, // docs anywhere
+];
+
+/**
+ * @param {{ filename: string }} file
+ * @returns {boolean} true when this change requires a release note
+ */
+function requiresNote(file) {
+    const { filename } = file;
+
+    if (!TRIGGER_PREFIXES.some((prefix) => filename.startsWith(prefix))) {
+        return false;
+    }
+
+    return !EXEMPT_PATTERNS.some((pattern) => pattern.test(filename));
+}
+
+/**
+ * Only a note this PR actually authored satisfies the gate.
+ *
+ * `status: 'added'` exclusively: the PR files API compares base…head, so a
+ * note created and then renamed inside the same PR still reports as `added`.
+ * A `renamed` entry therefore means the file already existed on the base
+ * branch — moving another PR's unconsumed note is not documenting this
+ * change, and the generator resolves PR links from the commit that added a
+ * path, which a rename does not provide.
+ *
+ * Direct children only: `loadNotes()` reads the immediate `.changes/`
+ * directory, so a nested `.changes/sub/note.md` would satisfy a prefix check
+ * while never being validated or rendered into any release surface.
+ *
+ * @param {{ filename: string, status: string }} file
+ * @returns {boolean} true when this file satisfies the gate
+ */
+function isAddedNote(file) {
+    const match = file.filename.match(/^\.changes\/([^/]+)\.md$/);
+
+    return Boolean(match) && match[1] !== 'README' && file.status === 'added';
+}
+
+/**
+ * @param {{ files: {filename: string, status: string}[], labels: string[] }} input
+ * @returns {{ ok: boolean, message: string }}
+ */
+export function evaluateGate({ files, labels }) {
+    if (labels.includes(GATE_LABEL)) {
+        return {
+            ok: true,
+            message: `Label \`${GATE_LABEL}\` present — release note not required.`,
+        };
+    }
+
+    const triggering = files.filter(requiresNote);
+
+    if (triggering.length === 0) {
+        return {
+            ok: true,
+            message:
+                'No runtime code changed under apps/ or libs/ — release note not required.',
+        };
+    }
+
+    const notes = files.filter(isAddedNote);
+
+    if (notes.length > 0) {
+        return {
+            ok: true,
+            message: `Release note present: ${notes.map((note) => note.filename).join(', ')}`,
+        };
+    }
+
+    const shown = triggering.slice(0, 10).map((file) => `  ${file.filename}`);
+    const more =
+        triggering.length > shown.length
+            ? [`  … and ${triggering.length - shown.length} more`]
+            : [];
+
+    return {
+        ok: false,
+        message: [
+            'This PR changes runtime code but adds no release note.',
+            '',
+            'Changed files that require one:',
+            ...shown,
+            ...more,
+            '',
+            'Add a file like `.changes/<area>-<short-slug>.md` describing the',
+            'change for a user (see .changes/README.md for the format), or apply',
+            `the \`${GATE_LABEL}\` label if this PR has no user-visible effect`,
+            '(pure refactor, CI plumbing, tests).',
+        ].join('\n'),
+    };
+}
+
+function main() {
+    let raw = '';
+
+    process.stdin.setEncoding('utf8');
+    process.stdin.on('data', (chunk) => {
+        raw += chunk;
+    });
+    process.stdin.on('end', () => {
+        const input = JSON.parse(raw);
+
+        if (!Array.isArray(input.files) || !Array.isArray(input.labels)) {
+            console.error(
+                'Expected {files: [{filename, status}], labels: [...]} on stdin.'
+            );
+            process.exit(2);
+        }
+
+        const verdict = evaluateGate(input);
+
+        console.log(verdict.message);
+        process.exit(verdict.ok ? 0 : 1);
+    });
+}
+
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+    main();
+}
diff --git a/tools/release/extract-changelog-section.mjs b/tools/release/extract-changelog-section.mjs
new file mode 100644
index 000000000..65a5aa697
--- /dev/null
+++ b/tools/release/extract-changelog-section.mjs
@@ -0,0 +1,99 @@
+#!/usr/bin/env node
+/**
+ * Prints the CHANGELOG.md section for one version to stdout.
+ *
+ *   node tools/release/extract-changelog-section.mjs 0.24.0
+ *
+ * Used by the tag-build release job to put the authored notes into the
+ * GitHub release body. `.changes/*.md` files are consumed before the tag
+ * exists, so at tag time the changelog section IS the authored source of
+ * truth — this reads what the generator already wrote.
+ *
+ * Exits non-zero when the section is missing so a forgotten
+ * `release:notes:changelog` fails the release instead of silently shipping
+ * PR-title-only notes.
+ */
+
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+const workspaceRoot = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '../..'
+);
+
+/**
+ * @param {string} changelog full CHANGELOG.md content
+ * @param {string} version bare semver, e.g. `0.24.0`
+ * @returns {string | null} section body without its own H1 heading
+ */
+export function extractSection(changelog, version) {
+    const lines = changelog.replace(/\r\n/g, '\n').split('\n');
+    // The CLI validates its argument, but this function is exported on its
+    // own — escape every regex metacharacter rather than only dots so no
+    // caller can inject pattern syntax.
+    const escapedVersion = version.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    // Matches both heading shapes used in this file:
+    //   # [0.24.0](compare-url) (2026-08-01)
+    //   # 0.24.0 (2026-08-01)
+    const headingPattern = new RegExp(
+        `^#\\s+\\[?${escapedVersion}\\]?\\s*[( ]`
+    );
+    const start = lines.findIndex((line) => headingPattern.test(line));
+
+    if (start === -1) {
+        return null;
+    }
+
+    let end = lines.length;
+
+    for (let index = start + 1; index < lines.length; index += 1) {
+        if (/^#\s/.test(lines[index])) {
+            end = index;
+            break;
+        }
+    }
+
+    return lines.slice(start + 1, end).join('\n').trim();
+}
+
+function main() {
+    const version = process.argv[2];
+
+    if (!version || !/^\d+\.\d+\.\d+$/.test(version)) {
+        console.error(
+            'Usage: extract-changelog-section.mjs <version>  (for example 0.24.0)'
+        );
+        process.exit(2);
+    }
+
+    const changelogPath = path.join(workspaceRoot, 'CHANGELOG.md');
+    const section = extractSection(readFileSync(changelogPath, 'utf8'), version);
+
+    if (section === null) {
+        console.error(
+            [
+                `CHANGELOG.md has no section for ${version}.`,
+                'The release flow writes it before tagging:',
+                '  pnpm run release:notes:changelog',
+                '  node tools/release/build-release-notes.mjs --consume',
+                'Commit the changelog, then re-tag.',
+            ].join('\n')
+        );
+        process.exit(1);
+    }
+
+    if (section === '') {
+        console.error(`CHANGELOG.md section for ${version} is empty.`);
+        process.exit(1);
+    }
+
+    process.stdout.write(`${section}\n`);
+}
+
+// Allow importing extractSection from tests without running the CLI.
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+    main();
+}
diff --git a/tools/release/project.json b/tools/release/project.json
new file mode 100644
index 000000000..0dec473ec
--- /dev/null
+++ b/tools/release/project.json
@@ -0,0 +1,43 @@
+{
+    "$schema": "../../node_modules/nx/schemas/project-schema.json",
+    "name": "release-tools",
+    "projectType": "library",
+    "sourceRoot": "tools/release",
+    "targets": {
+        "test": {
+            "executor": "nx:run-commands",
+            "cache": true,
+            "inputs": [
+                "{workspaceRoot}/tools/release/release-notes.mjs",
+                "{workspaceRoot}/tools/release/release-notes-render.mjs",
+                "{workspaceRoot}/tools/release/extract-changelog-section.mjs",
+                "{workspaceRoot}/tools/release/check-release-note-gate.mjs",
+                "{workspaceRoot}/tools/release/build-release-notes.mjs",
+                "{workspaceRoot}/tools/release/screenshot-guards.mjs",
+                "{workspaceRoot}/tools/release/screenshots.manifest.json",
+                "{workspaceRoot}/tools/release/release-notes.test.mjs",
+                "{workspaceRoot}/tools/release/release-note-gate.test.mjs",
+                "{workspaceRoot}/tools/release/build-release-notes.test.mjs",
+                "{workspaceRoot}/tools/release/screenshot-guards.test.mjs"
+            ],
+            "options": {
+                "command": "node --test tools/release/release-notes.test.mjs tools/release/release-note-gate.test.mjs tools/release/build-release-notes.test.mjs tools/release/screenshot-guards.test.mjs",
+                "cwd": "{workspaceRoot}"
+            }
+        },
+        "lint": {
+            "inputs": [
+                "default",
+                "{workspaceRoot}/eslint.config.mjs",
+                "{workspaceRoot}/tools/eslint-rules/**/*",
+                "{workspaceRoot}/tools/eslint/**/*"
+            ],
+            "command": "eslint \"tools/release/*.mjs\" \"tools/release/capture-release-screenshots.ts\" \"tools/release/capture-app-driver.ts\" \"tools/release/capture-navigation.ts\" \"tools/release/capture-network-gate.ts\" \"tools/release/capture-tmdb-check.ts\""
+        }
+    },
+    "tags": [
+        "scope:tools",
+        "domain:release",
+        "type:tool"
+    ]
+}
diff --git a/tools/release/release-note-gate.test.mjs b/tools/release/release-note-gate.test.mjs
new file mode 100644
index 000000000..2d6a59c3b
--- /dev/null
+++ b/tools/release/release-note-gate.test.mjs
@@ -0,0 +1,143 @@
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+
+import {
+    evaluateGate,
+    GATE_LABEL,
+} from './check-release-note-gate.mjs';
+
+function file(filename, status = 'modified') {
+    return { filename, status };
+}
+
+function gate(files, labels = []) {
+    return evaluateGate({ files, labels });
+}
+
+describe('evaluateGate', () => {
+    it('passes when runtime code ships with an added note', () => {
+        const verdict = gate([
+            file('libs/ui/playback/src/lib/player.ts'),
+            file('.changes/playback-volume-memory.md', 'added'),
+        ]);
+
+        assert.equal(verdict.ok, true);
+        assert.match(verdict.message, /playback-volume-memory/);
+    });
+
+    it('fails when runtime code ships without a note', () => {
+        const verdict = gate([file('apps/web/src/app/app.component.ts')]);
+
+        assert.equal(verdict.ok, false);
+        assert.match(verdict.message, /app\.component\.ts/);
+        assert.match(verdict.message, /\.changes\/<area>-<short-slug>\.md/);
+        assert.match(verdict.message, new RegExp(GATE_LABEL));
+    });
+
+    it('accepts the escape label', () => {
+        const verdict = gate(
+            [file('apps/web/src/app/app.component.ts')],
+            [GATE_LABEL]
+        );
+
+        assert.equal(verdict.ok, true);
+    });
+
+    it('a modified existing note does not satisfy the gate', () => {
+        const verdict = gate([
+            file('libs/m3u-state/src/lib/reducer.ts'),
+            file('.changes/old-note.md', 'modified'),
+        ]);
+
+        assert.equal(verdict.ok, false);
+    });
+
+    it('a renamed note does not satisfy the gate', () => {
+        // A note added and renamed within one PR still reports as `added`;
+        // `renamed` means it came from the base branch, i.e. another PR's.
+        const verdict = gate([
+            file('libs/m3u-state/src/lib/reducer.ts'),
+            file('.changes/m3u-better-name.md', 'renamed'),
+        ]);
+
+        assert.equal(verdict.ok, false);
+    });
+
+    it('a nested note does not satisfy the gate', () => {
+        // loadNotes() only reads the immediate directory, so a nested file
+        // would never be validated or rendered into a release surface.
+        const verdict = gate([
+            file('libs/m3u-state/src/lib/reducer.ts'),
+            file('.changes/subdir/m3u-note.md', 'added'),
+        ]);
+
+        assert.equal(verdict.ok, false);
+    });
+
+    it('accepts a top-level note regardless of surrounding path noise', () => {
+        const verdict = gate([
+            file('libs/m3u-state/src/lib/reducer.ts'),
+            file('.changes/m3u-long-urls.md', 'added'),
+        ]);
+
+        assert.equal(verdict.ok, true);
+    });
+
+    it('.changes/README.md is not a note', () => {
+        const verdict = gate([
+            file('libs/m3u-state/src/lib/reducer.ts'),
+            file('.changes/README.md', 'added'),
+        ]);
+
+        assert.equal(verdict.ok, false);
+    });
+
+    it('ignores changes outside apps/ and libs/', () => {
+        const verdict = gate([
+            file('tools/release/build-release-notes.mjs'),
+            file('.github/workflows/ci.yml'),
+            file('CLAUDE.md'),
+            file('package.json'),
+        ]);
+
+        assert.equal(verdict.ok, true);
+        assert.match(verdict.message, /not required/);
+    });
+
+    it('exempts tests, snapshots, e2e, website, mock servers and docs', () => {
+        const verdict = gate([
+            file('apps/web/src/app/app.component.spec.ts'),
+            file('apps/web-e2e/src/xtream.e2e.ts'),
+            file('apps/electron-backend-e2e/src/search.e2e.ts'),
+            file('apps/website/src/pages/index.astro'),
+            file('apps/xtream-mock-server/src/main.ts'),
+            file('apps/stalker-mock-server/src/main.ts'),
+            file('libs/shared/testing/src/lib/helpers.ts'),
+            file('libs/ui/playback/src/lib/__snapshots__/player.snap'),
+            file('libs/ui/playback/README.md'),
+        ]);
+
+        assert.equal(verdict.ok, true);
+    });
+
+    it('one runtime file among exempt ones still triggers the gate', () => {
+        const verdict = gate([
+            file('apps/web/src/app/app.component.spec.ts'),
+            file('apps/web/src/app/app.component.ts'),
+        ]);
+
+        assert.equal(verdict.ok, false);
+        assert.match(verdict.message, /app\.component\.ts/);
+        assert.doesNotMatch(verdict.message, /spec\.ts/);
+    });
+
+    it('truncates long file listings in the failure message', () => {
+        const files = Array.from({ length: 15 }, (_, index) =>
+            file(`libs/services/src/lib/file-${index}.ts`)
+        );
+        const verdict = gate(files);
+
+        assert.equal(verdict.ok, false);
+        assert.match(verdict.message, /… and 5 more/);
+    });
+});
diff --git a/tools/release/release-notes-render.mjs b/tools/release/release-notes-render.mjs
new file mode 100644
index 000000000..a8e4006b4
--- /dev/null
+++ b/tools/release/release-notes-render.mjs
@@ -0,0 +1,324 @@
+/**
+ * Renderers turning grouped `.changes/*.md` notes into the three release
+ * surfaces: the GitHub release body, the CHANGELOG.md section, and the
+ * website blog scaffold.
+ */
+
+import { extractSection } from './extract-changelog-section.mjs';
+import { groupNotes, REPO_URL } from './release-notes.mjs';
+
+const MONTHS = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+];
+
+/**
+ * @param {string} isoDate `YYYY-MM-DD`
+ * @returns {string} e.g. `August 1, 2026`
+ */
+export function formatLongDate(isoDate) {
+    const [year, month, day] = isoDate.split('-').map(Number);
+
+    return `${MONTHS[month - 1]} ${day}, ${year}`;
+}
+
+/**
+ * Deliberately minor-scoped: the website publishes one release post per minor
+ * version (`v0-18` … `v0-22`), and its screenshot assets live under the same
+ * directory. A patch release therefore reuses its minor's post rather than
+ * starting a new one.
+ *
+ * @param {string} version
+ * @returns {string} e.g. `v0-24` for both `0.24.0` and `0.24.1`
+ */
+export function releaseSlug(version) {
+    const [major, minor] = version.split('.');
+
+    return `v${major}-${minor}`;
+}
+
+/** Collapses a note body to a single line for list entries. */
+function oneLine(body) {
+    return body.replace(/\s+/g, ' ').trim();
+}
+
+/** Trims to a word boundary; used for image alt text, never for prose. */
+function truncate(text, max) {
+    if (text.length <= max) {
+        return text;
+    }
+
+    const cut = text.slice(0, max);
+    const lastSpace = cut.lastIndexOf(' ');
+
+    return `${(lastSpace > max / 2 ? cut.slice(0, lastSpace) : cut).trimEnd()}…`;
+}
+
+/**
+ * MDX parses `<` and `{` as markup. Note bodies are plain prose written by
+ * humans and agents, so escape them rather than letting a stray character
+ * break the website build. The closing counterparts are escaped too, so a
+ * body like `<live>` renders as written instead of half-escaped.
+ */
+function escapeMdx(text) {
+    return text
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/\{/g, '&#123;')
+        .replace(/\}/g, '&#125;');
+}
+
+/**
+ * @param {object} note
+ * @param {Map<string, { pr?: number, commit?: string }>} links
+ * @returns {string} trailing `([#123](url), closes [#45](url))` or ''
+ */
+function formatReferences(note, links) {
+    const parts = [];
+    const link = links.get(note.sourcePath);
+
+    if (link?.pr) {
+        parts.push(`[#${link.pr}](${REPO_URL}/pull/${link.pr})`);
+    } else if (link?.commit) {
+        parts.push(
+            `[${link.commit.slice(0, 7)}](${REPO_URL}/commit/${link.commit})`
+        );
+    }
+
+    for (const issue of note.issues) {
+        parts.push(`closes [#${issue}](${REPO_URL}/issues/${issue})`);
+    }
+
+    return parts.length > 0 ? ` (${parts.join(', ')})` : '';
+}
+
+function formatEntry(note, links) {
+    return `- **${note.area}** — ${oneLine(note.body)}${formatReferences(note, links)}`;
+}
+
+/**
+ * GitHub release body. `internal` notes are omitted: the release page is read
+ * by users, and GitHub still appends its own full commit list below.
+ *
+ * @param {object[]} notes
+ * @param {{ links?: Map<string, object> }} [options]
+ * @returns {string}
+ */
+export function renderGithubBody(notes, { links = new Map() } = {}) {
+    const sections = groupNotes(notes)
+        .filter((group) => group.type !== 'internal')
+        .map((group) => {
+            const entries = group.notes
+                .map((note) => formatEntry(note, links))
+                .join('\n');
+
+            return `## ${group.heading}\n\n${entries}`;
+        });
+
+    return sections.join('\n\n');
+}
+
+/**
+ * CHANGELOG.md section. Unlike the release body this keeps `internal` notes,
+ * collapsed, so the file stays a complete record.
+ *
+ * @param {object[]} notes
+ * @param {{ version: string, date: string, previousVersion?: string | null, links?: Map<string, object> }} options
+ * @returns {string}
+ */
+export function renderChangelogSection(
+    notes,
+    { version, date, previousVersion = null, links = new Map() }
+) {
+    const heading = previousVersion
+        ? `# [${version}](${REPO_URL}/compare/v${previousVersion}...v${version}) (${date})`
+        : `# ${version} (${date})`;
+
+    const blocks = [heading];
+
+    for (const group of groupNotes(notes)) {
+        const entries = group.notes
+            .map((note) => formatEntry(note, links))
+            .join('\n');
+
+        if (group.type === 'internal') {
+            blocks.push(
+                `<details>\n<summary>Internal changes</summary>\n\n${entries}\n\n</details>`
+            );
+            continue;
+        }
+
+        blocks.push(`### ${group.heading}\n\n${entries}`);
+    }
+
+    return `${blocks.join('\n\n')}\n`;
+}
+
+/**
+ * Inserts a version section below the marker, replacing any existing section
+ * for the same version — rerunning `--format changelog` after correcting a
+ * note must not prepend a duplicate.
+ *
+ * @param {string} changelog full CHANGELOG.md content
+ * @param {string} section rendered section (from renderChangelogSection)
+ * @param {string} version bare semver the section describes
+ * @param {string} marker insertion marker line
+ * @returns {{ content: string, replaced: boolean }}
+ */
+export function upsertChangelogSection(changelog, section, version, marker) {
+    if (!changelog.includes(marker)) {
+        throw new Error(
+            `changelog is missing the \`${marker}\` marker that new sections are inserted below`
+        );
+    }
+
+    let current = changelog;
+    const replaced = extractSection(current, version) !== null;
+
+    if (replaced) {
+        const lines = current.split('\n');
+        const headingIndex = lines.findIndex(
+            (line) =>
+                line.startsWith(`# [${version}]`) ||
+                line.startsWith(`# ${version} `)
+        );
+        let end = lines.length;
+
+        for (let index = headingIndex + 1; index < lines.length; index += 1) {
+            if (/^#\s/.test(lines[index])) {
+                end = index;
+                break;
+            }
+        }
+
+        current = [...lines.slice(0, headingIndex), ...lines.slice(end)].join(
+            '\n'
+        );
+    }
+
+    // Rebuild around the marker instead of string-replacing into it, so the
+    // blank-line count on both sides of the section stays exact regardless of
+    // whether a removal just happened.
+    const markerIndex = current.indexOf(marker);
+    const before = current.slice(0, markerIndex);
+    const after = current
+        .slice(markerIndex + marker.length)
+        .replace(/^\n+/, '');
+
+    return {
+        content: `${before}${marker}\n\n${section.trim()}\n\n${after}`,
+        replaced,
+    };
+}
+
+/**
+ * Blog entries carrying a `screenshot:` slug become their own subsection with
+ * an image slider; the rest stay bullets.
+ */
+function renderBlogGroup(group, { slug, links }) {
+    const bullets = group.notes.filter((note) => !note.screenshot);
+    const featured = group.notes.filter((note) => note.screenshot);
+    const blocks = [`## ${group.heading}`];
+
+    if (bullets.length > 0) {
+        blocks.push(
+            bullets
+                .map(
+                    (note) =>
+                        `- **${note.area}** — ${escapeMdx(oneLine(note.body))}${formatReferences(note, links)}`
+                )
+                .join('\n')
+        );
+    }
+
+    for (const note of featured) {
+        // The heading is editorial work — a note body makes a terrible one.
+        // Leave a visible TODO instead of pretending otherwise; the whole
+        // scaffold ships as `draft: true` anyway.
+        // Embedded in a single-quoted JS string inside MDX. Backslashes must
+        // be escaped before apostrophes, or a body ending in `\` produces an
+        // unterminated string and breaks the website build.
+        const alt = truncate(oneLine(note.body), 120)
+            .replace(/\\/g, '\\\\')
+            .replace(/'/g, "\\'");
+        const images = ['dark', 'light']
+            .map(
+                (theme) =>
+                    `        {\n            src: '/iptvnator/blog/${slug}/screenshots/${note.screenshot}-${theme}.png',\n            alt: '${alt}',\n        },`
+            )
+            .join('\n');
+
+        blocks.push(`### TODO headline (${note.area})`);
+        blocks.push(
+            `${escapeMdx(oneLine(note.body))}${formatReferences(note, links)}`
+        );
+        blocks.push(`<BlogImageSlider\n    images={[\n${images}\n    ]}\n/>`);
+    }
+
+    return blocks.join('\n\n');
+}
+
+/**
+ * Scaffold for `apps/website/src/content/blog/v0-24-release-notes.mdx`.
+ * Deliberately incomplete: `draft: true`, TODO markers for the narrative and
+ * description. The prose is editorial work, only the inventory is mechanical.
+ *
+ * @param {object[]} notes
+ * @param {{ version: string, date: string, links?: Map<string, object> }} options
+ * @returns {string}
+ */
+export function renderBlogScaffold(notes, { version, date, links = new Map() }) {
+    const slug = releaseSlug(version);
+    const shortVersion = slug.replace('-', '.');
+    const sections = groupNotes(notes)
+        .filter((group) => group.type !== 'internal')
+        .map((group) => renderBlogGroup(group, { slug, links }));
+
+    const frontmatter = [
+        '---',
+        `title: ${shortVersion} - Release Notes`,
+        'description: TODO — one sentence naming the two or three headline changes.',
+        'featured: true',
+        `pubDate: ${date}`,
+        'author: 4gray',
+        `heroImage: /iptvnator/blog/${slug}/hero.jpg`,
+        'tags:',
+        '    - release',
+        '    - release-notes',
+        `    - ${shortVersion}`,
+        'draft: true',
+        '---',
+    ].join('\n');
+
+    const imports = [
+        "import BlogImageSlider from '../../components/blog/BlogImageSlider.astro';",
+        "import ReleaseMeta from '../../components/blog/ReleaseMeta.astro';",
+    ].join('\n');
+
+    const meta = [
+        '<ReleaseMeta',
+        `    version="v${version}"`,
+        `    releaseDate="${formatLongDate(date)}"`,
+        "    channels={['Desktop', 'PWA']}",
+        '/>',
+    ].join('\n');
+
+    return [
+        frontmatter,
+        imports,
+        '{/* TODO: narrative intro — what this release is about, not what it contains. */}',
+        meta,
+        ...sections,
+        '',
+    ].join('\n\n');
+}
diff --git a/tools/release/release-notes.mjs b/tools/release/release-notes.mjs
new file mode 100644
index 000000000..8f50c4027
--- /dev/null
+++ b/tools/release/release-notes.mjs
@@ -0,0 +1,260 @@
+/**
+ * Parsing and validation for `.changes/*.md` release notes.
+ *
+ * One file per user-visible change, written by the PR author while the
+ * context is still fresh. The generator (build-release-notes.mjs) turns the
+ * accumulated files into the GitHub release body, the CHANGELOG.md section,
+ * and the website blog scaffold.
+ *
+ * Deliberately dependency-free: a hand-rolled parser for this tiny, closed
+ * schema is more predictable than a YAML engine, and it can reject unknown
+ * keys — which is what catches agent typos.
+ */
+
+import { readdirSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+
+export const REPO_URL = 'https://github.com/4gray/iptvnator';
+
+/** Render order. `internal` is last and is excluded from user-facing output. */
+export const NOTE_TYPES = ['breaking', 'feature', 'fix', 'perf', 'internal'];
+
+export const TYPE_HEADINGS = {
+    breaking: 'Breaking changes',
+    feature: 'Features',
+    fix: 'Fixes',
+    perf: 'Performance',
+    internal: 'Internal',
+};
+
+const KNOWN_KEYS = new Set(['type', 'area', 'issues', 'screenshot']);
+const SLUG_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+const DELIMITER = '---';
+
+/** Keeps entries to a sentence or three; essays belong in the blog post. */
+const MAX_BODY_LENGTH = 400;
+
+/**
+ * Splits a note into its frontmatter lines and body.
+ *
+ * @param {string} content raw file content
+ * @returns {{ frontmatterLines: string[], body: string }}
+ */
+function splitFrontmatter(content) {
+    const lines = content.replace(/\r\n/g, '\n').split('\n');
+
+    if (lines[0]?.trim() !== DELIMITER) {
+        throw new Error('missing opening `---` frontmatter delimiter');
+    }
+
+    const closingIndex = lines.findIndex(
+        (line, index) => index > 0 && line.trim() === DELIMITER
+    );
+
+    if (closingIndex === -1) {
+        throw new Error('missing closing `---` frontmatter delimiter');
+    }
+
+    return {
+        frontmatterLines: lines.slice(1, closingIndex),
+        body: lines.slice(closingIndex + 1).join('\n').trim(),
+    };
+}
+
+/**
+ * Parses a single `key: value` frontmatter line.
+ *
+ * Trailing `# comment` text is stripped: no value in this schema (enum slug,
+ * area slug, issue numbers) can legitimately contain `#`, and the documented
+ * examples carry explanatory comments.
+ *
+ * @param {string} line
+ * @returns {[string, string] | null} key/value pair, or null for blank lines
+ */
+function parseFrontmatterLine(line) {
+    const withoutComment = line.replace(/\s+#.*$/, '').trim();
+
+    if (!withoutComment) {
+        return null;
+    }
+
+    const separatorIndex = withoutComment.indexOf(':');
+
+    if (separatorIndex === -1) {
+        throw new Error(`frontmatter line is not \`key: value\`: "${line.trim()}"`);
+    }
+
+    const key = withoutComment.slice(0, separatorIndex).trim();
+    const value = withoutComment
+        .slice(separatorIndex + 1)
+        .trim()
+        .replace(/^['"]|['"]$/g, '');
+
+    return [key, value];
+}
+
+/**
+ * @param {string} value e.g. `[1187, 1188]` or `1187`
+ * @returns {number[]}
+ */
+function parseIssueList(value) {
+    const inner = value.startsWith('[') ? value.replace(/^\[|\]$/g, '') : value;
+
+    return inner
+        .split(',')
+        .map((entry) => entry.trim().replace(/^#/, ''))
+        .filter(Boolean)
+        .map((entry) => Number(entry));
+}
+
+/**
+ * Parses a note file into a structured record. Shape errors throw; semantic
+ * errors are reported by validateNote() so a run can list every problem at
+ * once instead of failing on the first one.
+ *
+ * @param {string} content
+ * @param {string} sourcePath path used in error messages and PR resolution
+ * @returns {{ type: string, area: string, issues: number[], screenshot: string | null, body: string, sourcePath: string }}
+ */
+export function parseNote(content, sourcePath) {
+    const { frontmatterLines, body } = splitFrontmatter(content);
+    const fields = new Map();
+
+    for (const line of frontmatterLines) {
+        const parsed = parseFrontmatterLine(line);
+
+        if (!parsed) {
+            continue;
+        }
+
+        const [key, value] = parsed;
+
+        if (fields.has(key)) {
+            throw new Error(`duplicate frontmatter key: \`${key}\``);
+        }
+
+        fields.set(key, value);
+    }
+
+    return {
+        type: fields.get('type') ?? '',
+        area: fields.get('area') ?? '',
+        issues: fields.has('issues') ? parseIssueList(fields.get('issues')) : [],
+        screenshot: fields.get('screenshot') ?? null,
+        unknownKeys: [...fields.keys()].filter((key) => !KNOWN_KEYS.has(key)),
+        body,
+        sourcePath,
+    };
+}
+
+/**
+ * @param {ReturnType<typeof parseNote>} note
+ * @returns {string[]} human-readable problems, empty when the note is valid
+ */
+export function validateNote(note) {
+    const errors = [];
+
+    if (!note.type) {
+        errors.push('`type` is required');
+    } else if (!NOTE_TYPES.includes(note.type)) {
+        errors.push(
+            `unknown \`type\`: "${note.type}" (expected one of ${NOTE_TYPES.join(', ')})`
+        );
+    }
+
+    if (!note.area) {
+        errors.push('`area` is required (use the conventional-commit scope)');
+    } else if (!SLUG_PATTERN.test(note.area)) {
+        errors.push(`\`area\` must be a lowercase slug, got "${note.area}"`);
+    }
+
+    if (!note.body) {
+        errors.push('body is empty — describe the change for a user');
+    } else if (note.body.length > MAX_BODY_LENGTH) {
+        errors.push(
+            `body is ${note.body.length} characters, max ${MAX_BODY_LENGTH} — keep it to a few sentences and put detail in the blog post`
+        );
+    }
+
+    for (const issue of note.issues) {
+        if (!Number.isInteger(issue) || issue <= 0) {
+            errors.push(`\`issues\` must be positive integers, got "${issue}"`);
+        }
+    }
+
+    if (note.screenshot !== null && !SLUG_PATTERN.test(note.screenshot)) {
+        errors.push(
+            `\`screenshot\` must be a lowercase slug from the screenshot manifest, got "${note.screenshot}"`
+        );
+    }
+
+    for (const key of note.unknownKeys) {
+        errors.push(
+            `unknown frontmatter key: \`${key}\` (expected ${[...KNOWN_KEYS].join(', ')})`
+        );
+    }
+
+    return errors;
+}
+
+/**
+ * Reads and parses every note in a directory, sorted by filename so output
+ * ordering is stable across machines.
+ *
+ * @param {string} directory
+ * @returns {{ notes: object[], errors: string[] }}
+ */
+export function loadNotes(directory) {
+    let entries = [];
+
+    try {
+        entries = readdirSync(directory);
+    } catch (error) {
+        if (error.code === 'ENOENT') {
+            return { notes: [], errors: [] };
+        }
+
+        throw error;
+    }
+
+    const files = entries
+        .filter((name) => name.endsWith('.md') && name !== 'README.md')
+        .sort();
+
+    const notes = [];
+    const errors = [];
+
+    for (const name of files) {
+        const sourcePath = path.join(directory, name);
+
+        try {
+            const note = parseNote(readFileSync(sourcePath, 'utf8'), sourcePath);
+            const problems = validateNote(note);
+
+            if (problems.length > 0) {
+                errors.push(...problems.map((problem) => `${name}: ${problem}`));
+                continue;
+            }
+
+            notes.push(note);
+        } catch (error) {
+            errors.push(`${name}: ${error.message}`);
+        }
+    }
+
+    return { notes, errors };
+}
+
+/**
+ * Groups notes by type in render order, dropping empty groups.
+ *
+ * @param {object[]} notes
+ * @returns {{ type: string, heading: string, notes: object[] }[]}
+ */
+export function groupNotes(notes) {
+    return NOTE_TYPES.map((type) => ({
+        type,
+        heading: TYPE_HEADINGS[type],
+        notes: notes.filter((note) => note.type === type),
+    })).filter((group) => group.notes.length > 0);
+}
diff --git a/tools/release/release-notes.test.mjs b/tools/release/release-notes.test.mjs
new file mode 100644
index 000000000..6445d5f59
--- /dev/null
+++ b/tools/release/release-notes.test.mjs
@@ -0,0 +1,517 @@
+import assert from 'node:assert/strict';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { after, describe, it } from 'node:test';
+
+import {
+    groupNotes,
+    loadNotes,
+    parseNote,
+    validateNote,
+} from './release-notes.mjs';
+import {
+    formatLongDate,
+    releaseSlug,
+    renderBlogScaffold,
+    renderChangelogSection,
+    renderGithubBody,
+    upsertChangelogSection,
+} from './release-notes-render.mjs';
+import { extractSection } from './extract-changelog-section.mjs';
+
+const tempDirs = [];
+
+function makeNotesDir(files) {
+    const directory = mkdtempSync(path.join(tmpdir(), 'release-notes-'));
+    tempDirs.push(directory);
+
+    for (const [name, content] of Object.entries(files)) {
+        writeFileSync(path.join(directory, name), content, 'utf8');
+    }
+
+    return directory;
+}
+
+function note(overrides = {}) {
+    return {
+        type: 'feature',
+        area: 'playback',
+        issues: [],
+        screenshot: null,
+        unknownKeys: [],
+        body: 'Series now show an Up Next rail beside the player.',
+        sourcePath: '.changes/playback-up-next.md',
+        ...overrides,
+    };
+}
+
+after(() => {
+    for (const directory of tempDirs) {
+        rmSync(directory, { recursive: true, force: true });
+    }
+});
+
+describe('parseNote', () => {
+    it('parses frontmatter, issue list and body', () => {
+        const parsed = parseNote(
+            [
+                '---',
+                'type: feature',
+                'area: playback',
+                'issues: [1187, 1188]',
+                'screenshot: up-next-rail',
+                '---',
+                '',
+                'Series now show an Up Next rail.',
+                '',
+            ].join('\n'),
+            '.changes/playback-up-next.md'
+        );
+
+        assert.equal(parsed.type, 'feature');
+        assert.equal(parsed.area, 'playback');
+        assert.deepEqual(parsed.issues, [1187, 1188]);
+        assert.equal(parsed.screenshot, 'up-next-rail');
+        assert.equal(parsed.body, 'Series now show an Up Next rail.');
+        assert.deepEqual(parsed.unknownKeys, []);
+    });
+
+    it('strips trailing comments and quotes, and accepts a bare issue', () => {
+        const parsed = parseNote(
+            [
+                '---',
+                'type: fix # one of feature | fix | perf',
+                "area: 'm3u'",
+                'issues: 1204',
+                '---',
+                'Playlists with very long URLs parse again.',
+            ].join('\n'),
+            'x.md'
+        );
+
+        assert.equal(parsed.type, 'fix');
+        assert.equal(parsed.area, 'm3u');
+        assert.deepEqual(parsed.issues, [1204]);
+    });
+
+    it('records unknown keys instead of dropping them silently', () => {
+        const parsed = parseNote(
+            ['---', 'type: fix', 'area: m3u', 'scope: m3u', '---', 'Body.'].join(
+                '\n'
+            ),
+            'x.md'
+        );
+
+        assert.deepEqual(parsed.unknownKeys, ['scope']);
+    });
+
+    it('rejects a missing or unterminated frontmatter block', () => {
+        assert.throws(
+            () => parseNote('type: fix\nBody.', 'x.md'),
+            /missing opening/
+        );
+        assert.throws(
+            () => parseNote('---\ntype: fix\nBody.', 'x.md'),
+            /missing closing/
+        );
+    });
+
+    it('rejects duplicate keys', () => {
+        assert.throws(
+            () =>
+                parseNote(
+                    ['---', 'type: fix', 'type: feature', '---', 'Body.'].join(
+                        '\n'
+                    ),
+                    'x.md'
+                ),
+            /duplicate frontmatter key/
+        );
+    });
+});
+
+describe('validateNote', () => {
+    it('accepts a well-formed note', () => {
+        assert.deepEqual(validateNote(note()), []);
+    });
+
+    it('rejects an unknown type', () => {
+        const errors = validateNote(note({ type: 'chore' }));
+
+        assert.equal(errors.length, 1);
+        assert.match(errors[0], /unknown `type`: "chore"/);
+    });
+
+    it('rejects an unknown frontmatter key', () => {
+        const errors = validateNote(note({ unknownKeys: ['scope'] }));
+
+        assert.match(errors[0], /unknown frontmatter key: `scope`/);
+    });
+
+    it('rejects an empty body and an essay', () => {
+        assert.match(validateNote(note({ body: '' }))[0], /body is empty/);
+        assert.match(
+            validateNote(note({ body: 'x'.repeat(401) }))[0],
+            /max 400/
+        );
+    });
+
+    it('rejects a non-slug area and screenshot', () => {
+        assert.match(
+            validateNote(note({ area: 'Playback Engine' }))[0],
+            /`area` must be a lowercase slug/
+        );
+        assert.match(
+            validateNote(note({ screenshot: 'Up Next' }))[0],
+            /`screenshot` must be a lowercase slug/
+        );
+    });
+
+    it('rejects non-numeric issues', () => {
+        assert.match(
+            validateNote(note({ issues: [Number.NaN] }))[0],
+            /`issues` must be positive integers/
+        );
+    });
+});
+
+describe('loadNotes', () => {
+    it('returns an empty result for a missing directory', () => {
+        const result = loadNotes(path.join(tmpdir(), 'definitely-not-here-9d3f'));
+
+        assert.deepEqual(result, { notes: [], errors: [] });
+    });
+
+    it('skips README.md and reports per-file errors', () => {
+        const directory = makeNotesDir({
+            'README.md': '# How to write notes',
+            'a-good.md': '---\ntype: fix\narea: m3u\n---\nParses again.',
+            'b-bad.md': '---\ntype: chore\narea: m3u\n---\nNope.',
+        });
+
+        const { notes, errors } = loadNotes(directory);
+
+        assert.equal(notes.length, 1);
+        assert.equal(notes[0].area, 'm3u');
+        assert.equal(errors.length, 1);
+        assert.match(errors[0], /^b-bad\.md: unknown `type`/);
+    });
+
+    it('sorts notes by filename for stable output', () => {
+        const directory = makeNotesDir({
+            'z-last.md': '---\ntype: fix\narea: zzz\n---\nLast.',
+            'a-first.md': '---\ntype: fix\narea: aaa\n---\nFirst.',
+        });
+
+        assert.deepEqual(
+            loadNotes(directory).notes.map((entry) => entry.area),
+            ['aaa', 'zzz']
+        );
+    });
+});
+
+describe('groupNotes', () => {
+    it('orders groups by severity and drops empty ones', () => {
+        const grouped = groupNotes([
+            note({ type: 'fix' }),
+            note({ type: 'breaking' }),
+            note({ type: 'feature' }),
+        ]);
+
+        assert.deepEqual(
+            grouped.map((group) => group.type),
+            ['breaking', 'feature', 'fix']
+        );
+    });
+});
+
+describe('renderGithubBody', () => {
+    it('groups entries, prefixes the area and links the PR', () => {
+        const links = new Map([
+            ['.changes/playback-up-next.md', { commit: 'abc1234', pr: 1231 }],
+        ]);
+
+        const body = renderGithubBody([note({ issues: [1187] })], { links });
+
+        assert.match(body, /^## Features\n\n- \*\*playback\*\* — Series now/);
+        assert.match(body, /\[#1231\]\(https:\/\/github\.com\/4gray\/iptvnator\/pull\/1231\)/);
+        assert.match(body, /closes \[#1187\]/);
+    });
+
+    it('falls back to a commit link when the note carries no PR', () => {
+        const links = new Map([
+            ['.changes/playback-up-next.md', { commit: 'abcdef1234567' }],
+        ]);
+
+        assert.match(renderGithubBody([note()], { links }), /\[abcdef1\]\(.*\/commit\/abcdef1234567\)/);
+    });
+
+    it('omits internal notes from the user-facing body', () => {
+        const body = renderGithubBody([
+            note({ type: 'internal', body: 'Split the store feature.' }),
+            note(),
+        ]);
+
+        assert.match(body, /## Features/);
+        assert.doesNotMatch(body, /Internal|Split the store feature/);
+    });
+});
+
+describe('renderChangelogSection', () => {
+    it('links the compare range when a previous version is known', () => {
+        const section = renderChangelogSection([note()], {
+            version: '0.24.0',
+            date: '2026-08-01',
+            previousVersion: '0.23.0',
+        });
+
+        assert.match(
+            section,
+            /^# \[0\.24\.0\]\(https:\/\/github\.com\/4gray\/iptvnator\/compare\/v0\.23\.0\.\.\.v0\.24\.0\) \(2026-08-01\)/
+        );
+    });
+
+    it('keeps internal notes but collapses them', () => {
+        const section = renderChangelogSection(
+            [note(), note({ type: 'internal', body: 'Split the store.' })],
+            { version: '0.24.0', date: '2026-08-01' }
+        );
+
+        assert.match(section, /### Features/);
+        assert.match(section, /<summary>Internal changes<\/summary>/);
+        assert.match(section, /Split the store\./);
+    });
+});
+
+describe('renderBlogScaffold', () => {
+    it('emits a draft with TODO markers and a release meta block', () => {
+        const content = renderBlogScaffold([note()], {
+            version: '0.24.0',
+            date: '2026-08-01',
+        });
+
+        assert.match(content, /^---\ntitle: v0\.24 - Release Notes/);
+        assert.match(content, /draft: true/);
+        assert.match(content, /TODO/);
+        assert.match(content, /releaseDate="August 1, 2026"/);
+    });
+
+    it('gives screenshot notes their own section with a dark/light slider', () => {
+        const content = renderBlogScaffold(
+            [note({ screenshot: 'up-next-rail' })],
+            { version: '0.24.0', date: '2026-08-01' }
+        );
+
+        assert.match(content, /### TODO headline \(playback\)/);
+        assert.match(
+            content,
+            /\/iptvnator\/blog\/v0-24\/screenshots\/up-next-rail-dark\.png/
+        );
+        assert.match(
+            content,
+            /\/iptvnator\/blog\/v0-24\/screenshots\/up-next-rail-light\.png/
+        );
+    });
+
+    it('truncates a long body for image alt text without cutting mid-word', () => {
+        const body = `${'Series show the rest of the season beside the player '.repeat(4)}now.`;
+        const content = renderBlogScaffold(
+            [note({ body, screenshot: 'up-next-rail' })],
+            { version: '0.24.0', date: '2026-08-01' }
+        );
+        const alt = content.match(/alt: '([^']*)'/)[1];
+
+        assert.ok(alt.length <= 121, `alt was ${alt.length} characters`);
+        assert.match(alt, /…$/);
+        assert.doesNotMatch(alt, /\s…$/);
+    });
+
+    it('escapes backslashes and apostrophes inside the alt string literal', () => {
+        const content = renderBlogScaffold(
+            [
+                note({
+                    body: "Windows paths like C:\\Users no longer break the app's import.",
+                    screenshot: 'windows-import',
+                }),
+            ],
+            { version: '0.24.0', date: '2026-08-01' }
+        );
+        const alt = content.match(/alt: '(.*)',/)[1];
+
+        assert.match(alt, /C:\\\\Users/);
+        assert.match(alt, /app\\'s/);
+        // An odd number of trailing backslashes would escape the closing quote.
+        assert.doesNotMatch(alt, /(^|[^\\])(\\\\)*\\$/);
+    });
+
+    it('escapes characters MDX would parse as markup', () => {
+        const content = renderBlogScaffold(
+            [note({ body: 'Channels named <live> and {vod} now sort correctly.' })],
+            { version: '0.24.0', date: '2026-08-01' }
+        );
+
+        assert.doesNotMatch(content, /<live>/);
+        assert.doesNotMatch(content, /\{vod\}/);
+        assert.match(content, /&lt;live&gt;/);
+        assert.match(content, /&#123;vod&#125;/);
+    });
+
+    it('imports only the components it emits', () => {
+        const content = renderBlogScaffold([note()], {
+            version: '0.24.0',
+            date: '2026-08-01',
+        });
+
+        assert.match(content, /import ReleaseMeta from/);
+        assert.match(content, /import BlogImageSlider from/);
+    });
+});
+
+describe('upsertChangelogSection', () => {
+    const marker = '<!-- next-release -->';
+    const base = [
+        '# Changelog',
+        '',
+        marker,
+        '',
+        '# [0.12.0](https://example.com) (2023-03-11)',
+        '',
+        '- old entry',
+    ].join('\n');
+
+    it('inserts a new section below the marker', () => {
+        const { content, replaced } = upsertChangelogSection(
+            base,
+            '# [0.24.0](url) (2026-08-01)\n\n### Features\n\n- entry',
+            '0.24.0',
+            marker
+        );
+
+        assert.equal(replaced, false);
+        assert.match(
+            content,
+            /<!-- next-release -->\n\n# \[0\.24\.0\]\(url\) \(2026-08-01\)/
+        );
+        assert.match(content, /- entry\n\n# \[0\.12\.0\]/);
+    });
+
+    it('replaces an existing section for the same version instead of duplicating', () => {
+        const first = upsertChangelogSection(
+            base,
+            '# [0.24.0](url) (2026-08-01)\n\n- v1 entry',
+            '0.24.0',
+            marker
+        ).content;
+        const { content, replaced } = upsertChangelogSection(
+            first,
+            '# [0.24.0](url) (2026-08-02)\n\n- v2 entry',
+            '0.24.0',
+            marker
+        );
+
+        assert.equal(replaced, true);
+        assert.equal(content.match(/^# \[0\.24\.0\]/gm).length, 1);
+        assert.match(content, /v2 entry/);
+        assert.doesNotMatch(content, /v1 entry/);
+        assert.match(content, /- v2 entry\n\n# \[0\.12\.0\]/);
+    });
+
+    it('keeps other versions untouched when replacing', () => {
+        const first = upsertChangelogSection(
+            base,
+            '# [0.24.0](url) (2026-08-01)\n\n- v1',
+            '0.24.0',
+            marker
+        ).content;
+        const { content } = upsertChangelogSection(
+            first,
+            '# [0.24.1](url) (2026-08-09)\n\n- patch',
+            '0.24.1',
+            marker
+        );
+
+        assert.match(content, /0\.24\.1.*\n\n- patch\n\n# \[0\.24\.0\]/);
+        assert.match(content, /- v1\n\n# \[0\.12\.0\]/);
+    });
+
+    it('throws when the marker is missing', () => {
+        assert.throws(
+            () => upsertChangelogSection('# Changelog', '# s', '0.24.0', marker),
+            /missing the/
+        );
+    });
+});
+
+describe('extractSection', () => {
+    const changelog = [
+        '# Changelog',
+        '',
+        'Intro paragraph with a pointer.',
+        '',
+        '<!-- next-release -->',
+        '',
+        '# [0.24.0](https://github.com/4gray/iptvnator/compare/v0.23.0...v0.24.0) (2026-08-01)',
+        '',
+        '### Features',
+        '',
+        '- **playback** — Up Next rail.',
+        '',
+        '<details>',
+        '<summary>Internal changes</summary>',
+        '',
+        '- **deps** — parser bump.',
+        '',
+        '</details>',
+        '',
+        '# [0.12.0](https://github.com/4gray/iptvnator/compare/v0.11.1...v0.12.0) (2023-03-11)',
+        '',
+        '### Bug Fixes',
+        '',
+        '- old entry',
+    ].join('\n');
+
+    it('returns the section body without its own heading', () => {
+        const section = extractSection(changelog, '0.24.0');
+
+        assert.match(section, /^### Features/);
+        assert.match(section, /Up Next rail/);
+        assert.match(section, /<\/details>$/);
+    });
+
+    it('stops at the next release heading', () => {
+        const section = extractSection(changelog, '0.24.0');
+
+        assert.doesNotMatch(section, /0\.12\.0|old entry/);
+    });
+
+    it('matches the plain heading shape without a compare link', () => {
+        const plain = '# 0.24.0 (2026-08-01)\n\n### Fixes\n\n- entry';
+
+        assert.match(extractSection(plain, '0.24.0'), /^### Fixes/);
+    });
+
+    it('does not match a different patch of the same minor', () => {
+        assert.equal(extractSection(changelog, '0.24.1'), null);
+    });
+
+    it('returns null when the version is absent', () => {
+        assert.equal(extractSection(changelog, '9.9.9'), null);
+    });
+
+    it('treats regex metacharacters in the version as literals', () => {
+        // `.` must not act as a wildcard: 0x24y0 would match an unescaped 0.24.0
+        assert.equal(extractSection('# 0x24y0 (2026-08-01)\n\n- e', '0.24.0'), null);
+        // Injected pattern syntax must not throw or widen the match.
+        assert.equal(extractSection(changelog, '0.24.0|0.12.0'), null);
+        assert.equal(extractSection(changelog, '.*'), null);
+        assert.equal(extractSection(changelog, '0.24\\.0'), null);
+    });
+});
+
+describe('helpers', () => {
+    it('formats dates and release slugs', () => {
+        assert.equal(formatLongDate('2026-08-01'), 'August 1, 2026');
+        assert.equal(releaseSlug('0.24.0'), 'v0-24');
+    });
+});
diff --git a/tools/release/screenshot-guards.mjs b/tools/release/screenshot-guards.mjs
new file mode 100644
index 000000000..ae29b4950
--- /dev/null
+++ b/tools/release/screenshot-guards.mjs
@@ -0,0 +1,504 @@
+/**
+ * Fail-closed guards for the release screenshot capture
+ * (capture-release-screenshots.ts). Published screenshots must never contain
+ * a real playlist, credential, stream, or third-party artwork — these
+ * helpers make that a property of the run, not a hope.
+ *
+ * Pure (or fs-only) so the policy is unit-tested; the Playwright driver just
+ * wires them in.
+ */
+
+import {
+    copyFileSync,
+    existsSync,
+    mkdirSync,
+    readdirSync,
+    renameSync,
+    rmSync,
+    statSync,
+} from 'node:fs';
+import path from 'node:path';
+
+/* ------------------------------------------------------------------ */
+/* Manifest                                                            */
+/* ------------------------------------------------------------------ */
+
+const SLUG_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
+
+/** The capture and the blog scaffold both assume exactly these themes. */
+export const SUPPORTED_THEMES = ['dark', 'light'];
+
+/**
+ * Chromium switch applied at process start, so it has no install-timing
+ * window at all: every hostname fails to resolve except the local mock. It
+ * covers Chromium-stack traffic (renderer plus the main process `net`
+ * module); requests made through Node's own stack are not affected, which is
+ * why the session hook and the recorded-URL verdict still exist.
+ */
+export const HOST_RESOLVER_RULES =
+    'MAP * ~NOTFOUND, EXCLUDE localhost, EXCLUDE 127.0.0.1';
+
+/** Setup actions the driver implements. Manifest steps must match. */
+export const KNOWN_ACTIONS = [
+    'open-dashboard',
+    'open-settings',
+    'open-xtream-vod',
+    'open-xtream-series',
+    'open-m3u-groups',
+];
+
+/** @param {string} step e.g. `open-xtream-vod=Hero Premieres` */
+export function parseSetupStep(step) {
+    const separator = step.indexOf('=');
+    const action = separator === -1 ? step : step.slice(0, separator);
+    const param = separator === -1 ? null : step.slice(separator + 1);
+
+    return { action, param };
+}
+
+/**
+ * @param {object} manifest parsed screenshots.manifest.json
+ * @returns {string[]} problems; empty when valid
+ */
+export function validateManifest(manifest) {
+    const errors = [];
+
+    if (manifest?.version !== 1) {
+        errors.push('manifest `version` must be 1');
+    }
+
+    // The blog scaffold always references both `-dark.png` and `-light.png`,
+    // and a full run publishes in replace mode — a manifest missing a theme
+    // would silently delete the previous set and leave the post with broken
+    // images.
+    const themes = manifest?.themes;
+
+    if (
+        !Array.isArray(themes) ||
+        themes.length !== SUPPORTED_THEMES.length ||
+        SUPPORTED_THEMES.some((theme) => !themes.includes(theme))
+    ) {
+        errors.push(
+            `manifest \`themes\` must be exactly ${SUPPORTED_THEMES.join(' and ')}, got ${JSON.stringify(themes)}`
+        );
+    }
+
+    const shots = Array.isArray(manifest?.shots) ? manifest.shots : null;
+
+    if (!shots || shots.length === 0) {
+        return [...errors, 'manifest `shots` must be a non-empty array'];
+    }
+
+    const seen = new Set();
+
+    for (const shot of shots) {
+        const label = shot?.slug ?? '<missing slug>';
+
+        if (!shot?.slug || !SLUG_PATTERN.test(shot.slug)) {
+            errors.push(`shot "${label}": slug must be a lowercase slug`);
+        }
+
+        if (seen.has(shot?.slug)) {
+            errors.push(`shot "${label}": duplicate slug`);
+        }
+
+        seen.add(shot?.slug);
+
+        if (!Array.isArray(shot?.setup) || shot.setup.length === 0) {
+            errors.push(`shot "${label}": setup must be a non-empty array`);
+            continue;
+        }
+
+        for (const step of shot.setup) {
+            const { action } = parseSetupStep(String(step));
+
+            if (!KNOWN_ACTIONS.includes(action)) {
+                errors.push(
+                    `shot "${label}": unknown setup action "${action}" (expected ${KNOWN_ACTIONS.join(', ')})`
+                );
+            }
+        }
+    }
+
+    return errors;
+}
+
+/**
+ * A release slug names a directory under apps/website/public/blog, which a
+ * full run replaces — including a recursive delete of what was there. Reject
+ * anything that could escape that tree or resolve somewhere unexpected.
+ *
+ * @param {string} release
+ * @returns {string | null} error message, or null when the slug is safe
+ */
+export function validateReleaseSlug(release) {
+    if (!release) {
+        return 'release slug is empty';
+    }
+
+    if (!/^[a-z0-9][a-z0-9.-]*$/.test(release) || release.includes('..')) {
+        return `release slug "${release}" must be a lowercase slug without path separators (for example v0-24)`;
+    }
+
+    return null;
+}
+
+/** @returns {Set<string>} all slugs, for `.changes/` screenshot validation */
+export function manifestSlugs(manifest) {
+    return new Set((manifest?.shots ?? []).map((shot) => shot.slug));
+}
+
+/* ------------------------------------------------------------------ */
+/* G2 — environment allowlist                                          */
+/* ------------------------------------------------------------------ */
+
+const ENV_ALLOWLIST = [
+    'PATH',
+    'HOME',
+    'SHELL',
+    'TMPDIR',
+    'TZ',
+    'LANG',
+    'DISPLAY',
+    'WAYLAND_DISPLAY',
+    // X11 sessions authenticate through an xauth cookie file; without it the
+    // Electron child cannot open the display and the run dies before a window
+    // exists. It grants display access, not application credentials.
+    'XAUTHORITY',
+];
+const ENV_ALLOWED_PREFIXES = ['LC_', 'XDG_'];
+
+/**
+ * The capture app gets a constructed environment, never `...process.env`:
+ * ambient variables are how TMDB keys, proxies, and experiment flags leak
+ * into a run that must be hermetic.
+ *
+ * @param {Record<string, string | undefined>} baseEnv
+ * @param {Record<string, string>} overrides explicit run configuration
+ * @returns {Record<string, string>}
+ */
+export function buildCaptureEnv(baseEnv, overrides) {
+    const env = {};
+
+    for (const [key, value] of Object.entries(baseEnv)) {
+        if (value === undefined) {
+            continue;
+        }
+
+        if (
+            ENV_ALLOWLIST.includes(key) ||
+            ENV_ALLOWED_PREFIXES.some((prefix) => key.startsWith(prefix))
+        ) {
+            env[key] = value;
+        }
+    }
+
+    return { ...env, ...overrides };
+}
+
+/* ------------------------------------------------------------------ */
+/* G3 — network gate                                                   */
+/* ------------------------------------------------------------------ */
+
+/** Single source of truth for what may load during a capture run. */
+export const ALLOWED_SCHEMES = [
+    'file:',
+    'data:',
+    'blob:',
+    'about:',
+    'chrome:',
+    'devtools:',
+];
+export const ALLOWED_HOSTS = ['localhost', '127.0.0.1'];
+export const ALLOWED_NETWORK_PROTOCOLS = ['http:', 'ws:'];
+
+/**
+ * Deny by default. Only local mock traffic and the app's own bundle may load;
+ * anything else (TMDB, logo CDNs, real streams) is blocked and — because the
+ * caller fails on a non-empty list — fatal, since a silently blocked request
+ * produces a frame that merely looks broken instead of unsafe.
+ *
+ * @param {string} url
+ * @returns {boolean}
+ */
+export function isAllowedRequestUrl(url) {
+    try {
+        const { hostname, protocol } = new URL(url);
+
+        if (ALLOWED_SCHEMES.includes(protocol)) {
+            return true;
+        }
+
+        return (
+            ALLOWED_NETWORK_PROTOCOLS.includes(protocol) &&
+            ALLOWED_HOSTS.includes(hostname)
+        );
+    } catch {
+        // `blob:file:///…` and similar opaque forms do not parse as URLs.
+        return ALLOWED_SCHEMES.some((scheme) => url.startsWith(scheme));
+    }
+}
+
+/**
+ * App-level requests that are legitimate in production but must not leave
+ * the machine during a capture run. The driver fulfills them locally with
+ * an empty payload instead of letting them hit the network — a deterministic
+ * stub, not an allowlist hole. Keep this list minimal and exact.
+ *
+ * @param {string} url
+ * @returns {{ body: string, contentType: string } | null} stub response
+ */
+export const STUB_URL_PREFIXES = [
+    // Settings "release notes" / update check.
+    'https://api.github.com/repos/4gray/iptvnator/releases',
+];
+
+export function stubbedResponseFor(url) {
+    if (STUB_URL_PREFIXES.some((prefix) => url.startsWith(prefix))) {
+        return { body: '[]', contentType: 'application/json' };
+    }
+
+    return null;
+}
+
+/**
+ * Data handed to the main-process request hook, which cannot import this
+ * module. Keeping the values here means the two predicates cannot disagree
+ * about what is local even though the check itself is written twice.
+ *
+ * @returns {{ schemes: string[], hosts: string[], protocols: string[], stubPrefixes: string[] }}
+ */
+export function networkPolicy() {
+    return {
+        schemes: ALLOWED_SCHEMES,
+        hosts: ALLOWED_HOSTS,
+        protocols: ALLOWED_NETWORK_PROTOCOLS,
+        stubPrefixes: STUB_URL_PREFIXES,
+    };
+}
+
+/**
+ * Publishes a staged frame set over the release directory as one swap.
+ *
+ * Copy-then-rename rather than moving file by file: staging lives in the
+ * system temp directory, which may be a different filesystem (rename would
+ * fail with EXDEV), and a per-file loop that fails midway would leave the
+ * release holding a mix of new and old screenshots. Files are copied into a
+ * sibling of the target — same filesystem, so the directory swap is atomic —
+ * and the previous set is only deleted once the new one is in place.
+ *
+ * `mode` decides what happens to shots the staging set does not contain:
+ * a full run replaces the directory so slugs dropped from the manifest do not
+ * linger, while a filtered run (`--only`, `--theme`) must overlay its frames
+ * onto the existing set — otherwise refreshing one shot would delete every
+ * other screenshot of the release.
+ *
+ * @param {string} stagingDir
+ * @param {string} outputRoot
+ * @param {string} token unique suffix for the scratch directories
+ * @param {{ mode?: 'replace' | 'merge', rename?: (from: string, to: string) => void }} [options]
+ *   `rename` is a seam for exercising the rollback path, which the filesystem
+ *   will not fail on demand
+ * @returns {number} number of published files
+ */
+export function publishDirectory(
+    stagingDir,
+    outputRoot,
+    token,
+    { mode = 'replace', rename = renameSync } = {}
+) {
+    const incoming = `${outputRoot}.incoming-${token}`;
+    const retired = `${outputRoot}.retired-${token}`;
+
+    mkdirSync(path.dirname(outputRoot), { recursive: true });
+    rmSync(incoming, { recursive: true, force: true });
+    mkdirSync(incoming, { recursive: true });
+
+    if (mode === 'merge' && existsSync(outputRoot)) {
+        for (const name of readdirSync(outputRoot)) {
+            const source = path.join(outputRoot, name);
+
+            if (statSync(source).isFile()) {
+                copyFileSync(source, path.join(incoming, name));
+            }
+        }
+    }
+
+    const names = readdirSync(stagingDir);
+
+    for (const name of names) {
+        copyFileSync(path.join(stagingDir, name), path.join(incoming, name));
+    }
+
+    const hadPrevious = existsSync(outputRoot);
+
+    if (hadPrevious) {
+        rename(outputRoot, retired);
+    }
+
+    try {
+        rename(incoming, outputRoot);
+    } catch (error) {
+        if (hadPrevious) {
+            rename(retired, outputRoot);
+        }
+
+        rmSync(incoming, { recursive: true, force: true });
+        throw error;
+    }
+
+    rmSync(retired, { recursive: true, force: true });
+
+    return names.length;
+}
+
+/**
+ * Verdict over every request URL observed during a run — both the ones the
+ * page-level route blocked and the ones the main-process recorder saw during
+ * startup, before page interception exists.
+ *
+ * @param {string[]} urls
+ * @returns {string[]} unique offending URLs; empty when the run stayed local
+ */
+export function externalRequestViolations(urls) {
+    return [...new Set(urls)].filter(
+        (url) => !isAllowedRequestUrl(url) && !stubbedResponseFor(url)
+    );
+}
+
+/* ------------------------------------------------------------------ */
+/* G4 — frame content assertions                                       */
+/* ------------------------------------------------------------------ */
+
+const CREDENTIAL_TEXT_PATTERNS = [
+    /https?:\/\/[^\s"']*(?:username|password)=/i,
+    /\b[0-9a-f]{2}(?::[0-9a-f]{2}){5}\b/i, // MAC address (Stalker identity)
+    /https?:\/\/(?!localhost|127\.0\.0\.1)[^\s"']+\.m3u8?\b/i,
+];
+
+/**
+ * Evaluated against a DOM report collected right before each screenshot:
+ * every image/background URL and the visible text. External resources or
+ * credential-shaped text fail the shot.
+ *
+ * @param {{ resourceUrls: string[], bodyText: string }} report
+ * @returns {string[]} violations; empty when the frame is safe
+ */
+export function evaluateFrameReport(report) {
+    const violations = [];
+
+    for (const url of report.resourceUrls) {
+        if (!isAllowedRequestUrl(url)) {
+            violations.push(`external resource in frame: ${url}`);
+        }
+    }
+
+    for (const pattern of CREDENTIAL_TEXT_PATTERNS) {
+        const match = report.bodyText.match(pattern);
+
+        if (match) {
+            violations.push(
+                `credential-shaped text visible in frame: "${match[0].slice(0, 80)}"`
+            );
+        }
+    }
+
+    return violations;
+}
+
+/* ------------------------------------------------------------------ */
+/* G1 — real database untouched                                        */
+/* ------------------------------------------------------------------ */
+
+/**
+ * Snapshots every file in the real database directory — `iptvnator.db` plus
+ * its SQLite WAL sidecars (`-wal`, `-shm`), where writes live until a
+ * checkpoint, so a mutation cannot hide in them.
+ *
+ * Identity is size + mtime + inode, deliberately not a content hash: the
+ * production database is multi-gigabyte, and the previous `readFileSync` +
+ * sha256 approach threw on it and was swallowed into "file does not exist" —
+ * which silently disabled this guard entirely. Only ENOENT means absent; any
+ * other error propagates.
+ *
+ * @param {string} directory
+ * @returns {{ exists: boolean, entries: Record<string, {size: number, mtimeMs: number, ino: number}> }}
+ */
+export function snapshotDatabaseState(directory) {
+    let names;
+
+    try {
+        names = readdirSync(directory);
+    } catch (error) {
+        if (error.code === 'ENOENT') {
+            return { exists: false, entries: {} };
+        }
+
+        throw error;
+    }
+
+    const entries = {};
+
+    for (const name of names.sort()) {
+        try {
+            const stats = statSync(path.join(directory, name));
+
+            if (stats.isFile()) {
+                entries[name] = {
+                    size: stats.size,
+                    mtimeMs: stats.mtimeMs,
+                    ino: stats.ino,
+                };
+            }
+        } catch (error) {
+            if (error.code !== 'ENOENT') {
+                throw error;
+            }
+        }
+    }
+
+    return { exists: true, entries };
+}
+
+/**
+ * @returns {string | null} violation message, or null when unchanged
+ */
+export function compareDatabaseStates(before, after) {
+    if (before.exists !== after.exists) {
+        return before.exists
+            ? 'the real database directory disappeared during the capture run'
+            : 'the real database directory was CREATED during the capture run';
+    }
+
+    if (!before.exists) {
+        return null;
+    }
+
+    const names = new Set([
+        ...Object.keys(before.entries),
+        ...Object.keys(after.entries),
+    ]);
+
+    for (const name of [...names].sort()) {
+        const from = before.entries[name];
+        const to = after.entries[name];
+
+        if (!from) {
+            return `the real database gained ${name} during the capture run`;
+        }
+
+        if (!to) {
+            return `the real database lost ${name} during the capture run`;
+        }
+
+        if (
+            from.size !== to.size ||
+            from.mtimeMs !== to.mtimeMs ||
+            from.ino !== to.ino
+        ) {
+            return `the real database file ${name} was modified during the capture run (close IPTVnator and any other process using it, then retry)`;
+        }
+    }
+
+    return null;
+}
diff --git a/tools/release/screenshot-guards.test.mjs b/tools/release/screenshot-guards.test.mjs
new file mode 100644
index 000000000..6b80f852c
--- /dev/null
+++ b/tools/release/screenshot-guards.test.mjs
@@ -0,0 +1,575 @@
+import assert from 'node:assert/strict';
+import {
+    mkdtempSync,
+    readdirSync,
+    readFileSync,
+    renameSync,
+    rmSync,
+    utimesSync,
+    writeFileSync,
+} from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import { after, describe, it } from 'node:test';
+
+import {
+    buildCaptureEnv,
+    HOST_RESOLVER_RULES,
+    networkPolicy,
+    publishDirectory,
+    compareDatabaseStates,
+    evaluateFrameReport,
+    externalRequestViolations,
+    isAllowedRequestUrl,
+    manifestSlugs,
+    parseSetupStep,
+    snapshotDatabaseState,
+    stubbedResponseFor,
+    validateManifest,
+    validateReleaseSlug,
+} from './screenshot-guards.mjs';
+
+const tempDirs = [];
+
+after(() => {
+    for (const dir of tempDirs) {
+        rmSync(dir, { recursive: true, force: true });
+    }
+});
+
+function validManifest() {
+    return {
+        version: 1,
+        viewport: { width: 1280, height: 720 },
+        themes: ['dark', 'light'],
+        shots: [
+            { slug: 'dashboard', title: 'Dashboard', setup: ['open-dashboard'] },
+            {
+                slug: 'vod',
+                title: 'VOD',
+                setup: ['open-xtream-vod=Hero Premieres'],
+            },
+        ],
+    };
+}
+
+describe('manifest validation', () => {
+    it('accepts the committed manifest shape', () => {
+        assert.deepEqual(validateManifest(validManifest()), []);
+    });
+
+    it('rejects unknown setup actions, bad slugs and duplicates', () => {
+        const manifest = validManifest();
+        manifest.shots.push(
+            { slug: 'Bad Slug', title: 'x', setup: ['open-dashboard'] },
+            { slug: 'dashboard', title: 'dupe', setup: ['fly-to-the-moon'] }
+        );
+
+        const errors = validateManifest(manifest);
+
+        assert.ok(errors.some((error) => /slug must be a lowercase/.test(error)));
+        assert.ok(errors.some((error) => /duplicate slug/.test(error)));
+        assert.ok(
+            errors.some((error) => /unknown setup action "fly-to-the-moon"/.test(error))
+        );
+    });
+
+    it('rejects a manifest that does not carry exactly dark and light', () => {
+        for (const themes of [['dark'], ['dark', 'drak'], [], undefined, 'dark']) {
+            const manifest = { ...validManifest(), themes };
+
+            assert.ok(
+                validateManifest(manifest).some((error) =>
+                    /`themes` must be exactly/.test(error)
+                ),
+                `should reject themes: ${JSON.stringify(themes)}`
+            );
+        }
+    });
+
+    it('accepts dark and light in either order', () => {
+        const manifest = { ...validManifest(), themes: ['light', 'dark'] };
+
+        assert.deepEqual(validateManifest(manifest), []);
+    });
+
+    it('rejects an empty or missing shots array', () => {
+        assert.ok(
+            validateManifest({ version: 1, themes: ['dark', 'light'], shots: [] })
+                .length > 0
+        );
+        assert.ok(
+            validateManifest({ version: 1, themes: ['dark', 'light'] }).length > 0
+        );
+    });
+
+    it('parses setup steps with and without a parameter', () => {
+        assert.deepEqual(parseSetupStep('open-dashboard'), {
+            action: 'open-dashboard',
+            param: null,
+        });
+        assert.deepEqual(parseSetupStep('open-xtream-vod=Hero Premieres'), {
+            action: 'open-xtream-vod',
+            param: 'Hero Premieres',
+        });
+    });
+
+    it('exposes slugs for .changes screenshot validation', () => {
+        assert.deepEqual(
+            [...manifestSlugs(validManifest())],
+            ['dashboard', 'vod']
+        );
+    });
+});
+
+describe('host resolver gate', () => {
+    it('blocks every host except the local mock', () => {
+        assert.match(HOST_RESOLVER_RULES, /^MAP \* ~NOTFOUND/);
+        assert.match(HOST_RESOLVER_RULES, /EXCLUDE localhost/);
+        assert.match(HOST_RESOLVER_RULES, /EXCLUDE 127\.0\.0\.1/);
+    });
+});
+
+describe('release slug validation', () => {
+    it('accepts ordinary release slugs', () => {
+        for (const slug of ['v0-24', 'v0-24.1', 'v-smoke-test', 'v1-0']) {
+            assert.equal(validateReleaseSlug(slug), null, slug);
+        }
+    });
+
+    it('rejects traversal and separators that would escape the blog tree', () => {
+        for (const slug of [
+            '../../assets',
+            '..',
+            'v0-24/../../etc',
+            '/etc/passwd',
+            'v0-24/nested',
+            'V0-24',
+            '',
+        ]) {
+            assert.ok(validateReleaseSlug(slug), `should reject: ${slug}`);
+        }
+    });
+});
+
+describe('network policy handed to the main process', () => {
+    it('carries the same data the in-process predicate uses', () => {
+        const policy = networkPolicy();
+
+        assert.ok(policy.schemes.includes('file:'));
+        assert.ok(policy.hosts.includes('127.0.0.1'));
+        assert.ok(policy.protocols.includes('http:'));
+        assert.deepEqual(policy.stubPrefixes, [
+            'https://api.github.com/repos/4gray/iptvnator/releases',
+        ]);
+    });
+
+    it('agrees with isAllowedRequestUrl on local and external URLs', () => {
+        const policy = networkPolicy();
+        const isLocal = (url) => {
+            if (policy.stubPrefixes.some((p) => url.startsWith(p))) return true;
+            try {
+                const parsed = new URL(url);
+                return (
+                    policy.schemes.includes(parsed.protocol) ||
+                    (policy.protocols.includes(parsed.protocol) &&
+                        policy.hosts.includes(parsed.hostname))
+                );
+            } catch {
+                return policy.schemes.some((s) => url.startsWith(s));
+            }
+        };
+
+        for (const url of [
+            'http://localhost:3211/a',
+            'file:///x/index.html',
+            'data:image/png;base64,AAA',
+            'blob:file:///abc',
+        ]) {
+            assert.equal(isLocal(url), isAllowedRequestUrl(url), url);
+        }
+
+        for (const url of [
+            'https://image.tmdb.org/p.jpg',
+            'https://test-streams.mux.dev/x.m3u8',
+            'https://localhost.evil.example/x',
+        ]) {
+            assert.equal(isLocal(url), false, url);
+            assert.equal(isAllowedRequestUrl(url), false, url);
+        }
+    });
+});
+
+describe('G2 — environment allowlist', () => {
+    it('keeps only allowlisted variables plus explicit overrides', () => {
+        const env = buildCaptureEnv(
+            {
+                PATH: '/usr/bin',
+                HOME: '/Users/x',
+                LC_ALL: 'en_US.UTF-8',
+                XDG_RUNTIME_DIR: '/run/user/1000',
+                TMDB_API_KEY: 'leaky-secret',
+                HTTPS_PROXY: 'http://proxy:8080',
+                IPTVNATOR_ENABLE_EMBEDDED_MPV_EXPERIMENT: '1',
+                AWS_SECRET_ACCESS_KEY: 'nope',
+            },
+            { NODE_ENV: 'test', IPTVNATOR_E2E_DATA_DIR: '/tmp/x' }
+        );
+
+        assert.deepEqual(env, {
+            PATH: '/usr/bin',
+            HOME: '/Users/x',
+            LC_ALL: 'en_US.UTF-8',
+            XDG_RUNTIME_DIR: '/run/user/1000',
+            NODE_ENV: 'test',
+            IPTVNATOR_E2E_DATA_DIR: '/tmp/x',
+        });
+    });
+
+    it('keeps the X11 display credentials Electron needs on Linux', () => {
+        // Without XAUTHORITY an xauth-based X11 session refuses the
+        // connection and the capture dies before a window exists.
+        const env = buildCaptureEnv(
+            {
+                DISPLAY: ':99',
+                XAUTHORITY: '/run/user/1000/gdm/Xauthority',
+                WAYLAND_DISPLAY: 'wayland-0',
+                TMDB_API_KEY: 'leaky-secret',
+            },
+            {}
+        );
+
+        assert.deepEqual(env, {
+            DISPLAY: ':99',
+            XAUTHORITY: '/run/user/1000/gdm/Xauthority',
+            WAYLAND_DISPLAY: 'wayland-0',
+        });
+    });
+
+    it('drops undefined values', () => {
+        assert.deepEqual(buildCaptureEnv({ PATH: undefined }, {}), {});
+    });
+});
+
+describe('G3 — network gate', () => {
+    it('allows localhost, loopback and internal schemes', () => {
+        for (const url of [
+            'http://localhost:3211/player_api.php?username=marketing',
+            'http://127.0.0.1:3211/assets/logo.svg',
+            'ws://localhost:4200/ng-cli-ws',
+            'file:///dist/apps/web/index.html',
+            'data:image/png;base64,AAA',
+            'blob:file:///abc',
+            'about:blank',
+            'devtools://devtools/bundled/root.js',
+        ]) {
+            assert.equal(isAllowedRequestUrl(url), true, url);
+        }
+    });
+
+    it('blocks everything external', () => {
+        for (const url of [
+            'https://api.themoviedb.org/3/trending/all/week',
+            'https://image.tmdb.org/t/p/w500/x.jpg',
+            'http://real-provider.example:8080/live/user/pass/1.m3u8',
+            'https://localhost.evil.example/x', // suffix-spoofed hostname
+            'http://192.168.1.50/stream.ts',
+            'not a url',
+        ]) {
+            assert.equal(isAllowedRequestUrl(url), false, url);
+        }
+    });
+});
+
+describe('G3 — local stubs', () => {
+    it('stubs the GitHub releases update check with an empty payload', () => {
+        const stub = stubbedResponseFor(
+            'https://api.github.com/repos/4gray/iptvnator/releases?per_page=100'
+        );
+
+        assert.deepEqual(stub, { body: '[]', contentType: 'application/json' });
+    });
+
+    it('stubs nothing else', () => {
+        for (const url of [
+            'https://api.github.com/repos/4gray/iptvnator/issues',
+            'https://api.github.com/repos/other/repo/releases',
+            'https://api.themoviedb.org/3/trending/all/week',
+            'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
+        ]) {
+            assert.equal(stubbedResponseFor(url), null, url);
+        }
+    });
+});
+
+describe('G4 — frame content assertions', () => {
+    it('passes a frame with only mock resources and clean text', () => {
+        const violations = evaluateFrameReport({
+            resourceUrls: [
+                'http://localhost:3211/assets/marketing/poster/crimson-skylark.svg',
+                'data:image/svg+xml;base64,AAA',
+            ],
+            bodyText: 'Crimson Skylark\nHero Premieres\nAurora Local',
+        });
+
+        assert.deepEqual(violations, []);
+    });
+
+    it('flags external artwork in the frame', () => {
+        const violations = evaluateFrameReport({
+            resourceUrls: ['https://image.tmdb.org/t/p/w500/poster.jpg'],
+            bodyText: '',
+        });
+
+        assert.equal(violations.length, 1);
+        assert.match(violations[0], /external resource/);
+    });
+
+    it('flags credential-shaped URLs, MAC addresses and external m3u8 text', () => {
+        const violations = evaluateFrameReport({
+            resourceUrls: [],
+            bodyText: [
+                'http://provider.example/get.php?username=real&password=secret',
+                '00:1A:79:12:34:56',
+                'stream at http://cdn.example/live/42.m3u8 is down',
+            ].join('\n'),
+        });
+
+        assert.equal(violations.length, 3);
+        assert.ok(violations.every((entry) => /credential-shaped/.test(entry)));
+    });
+
+    it('does not flag the mock server stream URL', () => {
+        const violations = evaluateFrameReport({
+            resourceUrls: [],
+            bodyText: 'http://localhost:3211/live/marketing/marketing/52000.m3u8',
+        });
+
+        assert.deepEqual(violations, []);
+    });
+});
+
+describe('G1 — real database untouched', () => {
+    function tempDbDir(files) {
+        const dir = mkdtempSync(path.join(tmpdir(), 'guard-db-'));
+        tempDirs.push(dir);
+
+        for (const [name, content] of Object.entries(files)) {
+            writeFileSync(path.join(dir, name), content);
+        }
+
+        return dir;
+    }
+
+    it('reports no violation for an untouched directory', () => {
+        const dir = tempDbDir({
+            'iptvnator.db': 'main',
+            'iptvnator.db-wal': 'wal',
+            'iptvnator.db-shm': 'shm',
+        });
+
+        assert.equal(
+            compareDatabaseStates(
+                snapshotDatabaseState(dir),
+                snapshotDatabaseState(dir)
+            ),
+            null
+        );
+    });
+
+    it('reports no violation when the directory does not exist', () => {
+        const missing = snapshotDatabaseState('/definitely/not/here-9d3f');
+
+        assert.equal(missing.exists, false);
+        assert.equal(compareDatabaseStates(missing, missing), null);
+    });
+
+    it('detects a write that only lands in the WAL sidecar', () => {
+        // The exact hole this replaced: hashing iptvnator.db alone missed
+        // writes that SQLite parks in -wal until a checkpoint.
+        const dir = tempDbDir({ 'iptvnator.db': 'main', 'iptvnator.db-wal': 'w' });
+        const before = snapshotDatabaseState(dir);
+        writeFileSync(path.join(dir, 'iptvnator.db-wal'), 'w+more');
+
+        assert.match(
+            compareDatabaseStates(before, snapshotDatabaseState(dir)),
+            /iptvnator\.db-wal was modified/
+        );
+    });
+
+    it('detects a bare touch of the main database', () => {
+        const dir = tempDbDir({ 'iptvnator.db': 'same-bytes' });
+        const before = snapshotDatabaseState(dir);
+        utimesSync(
+            path.join(dir, 'iptvnator.db'),
+            new Date(),
+            new Date(Date.now() + 5_000)
+        );
+
+        assert.match(
+            compareDatabaseStates(before, snapshotDatabaseState(dir)),
+            /iptvnator\.db was modified/
+        );
+    });
+
+    it('detects added and removed sidecars', () => {
+        const dir = tempDbDir({ 'iptvnator.db': 'main' });
+        const before = snapshotDatabaseState(dir);
+        writeFileSync(path.join(dir, 'iptvnator.db-wal'), 'new');
+        const after = snapshotDatabaseState(dir);
+
+        assert.match(compareDatabaseStates(before, after), /gained iptvnator\.db-wal/);
+        assert.match(compareDatabaseStates(after, before), /lost iptvnator\.db-wal/);
+    });
+
+    it('detects a directory that appears during the run', () => {
+        const dir = tempDbDir({ 'iptvnator.db': 'x' });
+
+        assert.match(
+            compareDatabaseStates({ exists: false, entries: {} }, snapshotDatabaseState(dir)),
+            /CREATED/
+        );
+    });
+
+    it('does not hash the database, so multi-gigabyte files are fine', () => {
+        // Regression guard: the previous implementation read the whole file
+        // into memory and swallowed the resulting failure as "absent",
+        // silently disabling G1 against a 4 GB production database.
+        const dir = tempDbDir({ 'iptvnator.db': 'x' });
+        const snapshot = snapshotDatabaseState(dir);
+
+        assert.equal(snapshot.exists, true);
+        assert.ok(!('sha256' in snapshot.entries['iptvnator.db']));
+        assert.ok(snapshot.entries['iptvnator.db'].ino > 0);
+    });
+});
+
+describe('publishDirectory', () => {
+    function staged(files) {
+        const dir = mkdtempSync(path.join(tmpdir(), 'guard-stage-'));
+        tempDirs.push(dir);
+
+        for (const [name, content] of Object.entries(files)) {
+            writeFileSync(path.join(dir, name), content);
+        }
+
+        return dir;
+    }
+
+    function outputPath() {
+        const parent = mkdtempSync(path.join(tmpdir(), 'guard-out-'));
+        tempDirs.push(parent);
+
+        return path.join(parent, 'screenshots');
+    }
+
+    it('publishes into a directory that does not exist yet', () => {
+        const out = outputPath();
+        const count = publishDirectory(
+            staged({ 'a-dark.png': 'A', 'a-light.png': 'B' }),
+            out,
+            'test'
+        );
+
+        assert.equal(count, 2);
+        assert.deepEqual(readdirSync(out).sort(), ['a-dark.png', 'a-light.png']);
+    });
+
+    it('replaces a previous set wholesale, leaving no stale files', () => {
+        const out = outputPath();
+        publishDirectory(staged({ 'old.png': 'OLD', 'a.png': 'v1' }), out, 't1');
+        publishDirectory(staged({ 'a.png': 'v2' }), out, 't2');
+
+        assert.deepEqual(readdirSync(out), ['a.png']);
+        assert.equal(readFileSync(path.join(out, 'a.png'), 'utf8'), 'v2');
+    });
+
+    it('merge mode overlays a partial set without deleting the rest', () => {
+        // The `--only` / `--theme` path: refreshing one shot must not wipe
+        // the other screenshots of the release.
+        const out = outputPath();
+        publishDirectory(
+            staged({ 'a-dark.png': 'A1', 'b-dark.png': 'B1' }),
+            out,
+            't1'
+        );
+
+        const count = publishDirectory(staged({ 'a-dark.png': 'A2' }), out, 't2', {
+            mode: 'merge',
+        });
+
+        assert.equal(count, 1);
+        assert.deepEqual(readdirSync(out).sort(), ['a-dark.png', 'b-dark.png']);
+        assert.equal(readFileSync(path.join(out, 'a-dark.png'), 'utf8'), 'A2');
+        assert.equal(readFileSync(path.join(out, 'b-dark.png'), 'utf8'), 'B1');
+    });
+
+    it('merge mode works when nothing was published before', () => {
+        const out = outputPath();
+        publishDirectory(staged({ 'a.png': 'A' }), out, 't', { mode: 'merge' });
+
+        assert.deepEqual(readdirSync(out), ['a.png']);
+    });
+
+    it('leaves no scratch directories behind', () => {
+        const out = outputPath();
+        publishDirectory(staged({ 'a.png': 'A' }), out, 'tok');
+
+        assert.deepEqual(readdirSync(path.dirname(out)), ['screenshots']);
+    });
+
+    it('rolls the previous set back when the swap fails', () => {
+        const out = outputPath();
+        publishDirectory(staged({ 'a.png': 'original' }), out, 't1');
+
+        let calls = 0;
+        const rename = (from, to) => {
+            calls += 1;
+            // First call retires the previous set; fail the swap that follows.
+            if (calls === 2) {
+                throw new Error('simulated EXDEV');
+            }
+            renameSync(from, to);
+        };
+
+        assert.throws(
+            () =>
+                publishDirectory(staged({ 'a.png': 'new' }), out, 'boom', {
+                    rename,
+                }),
+            /simulated EXDEV/
+        );
+
+        assert.equal(calls, 3, 'the rollback rename must have run');
+        assert.equal(readFileSync(path.join(out, 'a.png'), 'utf8'), 'original');
+        assert.deepEqual(readdirSync(path.dirname(out)), ['screenshots']);
+    });
+});
+
+describe('external request verdict', () => {
+    it('ignores local and stubbed URLs, reports the rest once', () => {
+        const violations = externalRequestViolations([
+            'http://localhost:3211/player_api.php',
+            'file:///dist/apps/web/index.html',
+            'https://api.github.com/repos/4gray/iptvnator/releases',
+            'https://image.tmdb.org/t/p/w500/a.jpg',
+            'https://image.tmdb.org/t/p/w500/a.jpg',
+            'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
+        ]);
+
+        assert.deepEqual(violations, [
+            'https://image.tmdb.org/t/p/w500/a.jpg',
+            'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8',
+        ]);
+    });
+
+    it('returns nothing for a fully local run', () => {
+        assert.deepEqual(
+            externalRequestViolations([
+                'http://127.0.0.1:3211/assets/logo.svg',
+                'data:image/png;base64,AAA',
+            ]),
+            []
+        );
+    });
+});
diff --git a/tools/release/screenshots.manifest.json b/tools/release/screenshots.manifest.json
new file mode 100644
index 000000000..31cef378c
--- /dev/null
+++ b/tools/release/screenshots.manifest.json
@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "viewport": { "width": 1280, "height": 720 },
+    "themes": ["dark", "light"],
+    "shots": [
+        {
+            "slug": "dashboard",
+            "title": "Dashboard",
+            "setup": ["open-dashboard"]
+        },
+        {
+            "slug": "settings",
+            "title": "Settings",
+            "setup": ["open-settings"]
+        },
+        {
+            "slug": "xtream-vod-details",
+            "title": "Movie details",
+            "setup": ["open-xtream-vod=Action & Mystery"]
+        },
+        {
+            "slug": "xtream-series-season-open",
+            "title": "Series season view",
+            "setup": ["open-xtream-series=Urban Drama"]
+        },
+        {
+            "slug": "m3u-live-groups-two-column",
+            "title": "Live TV groups",
+            "setup": ["open-m3u-groups"]
+        }
+    ]
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 2e8cc3c8c..78aa9fdc2 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -5,6 +5,7 @@
         "sourceMap": true,
         "declaration": false,
         "moduleResolution": "node",
+        "esModuleInterop": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "importHelpers": true,
@@ -80,6 +81,7 @@
                 "libs/shared/m3u-utils/src/index.ts"
             ],
             "@iptvnator/shared/testing": ["libs/shared/testing/src/index.ts"],
+            "@iptvnator/shared/logging": ["libs/shared/logging/src/index.ts"],
             "@iptvnator/services": ["libs/services/src/index.ts"],
             "@iptvnator/shared/interfaces": [
                 "libs/shared/interfaces/src/index.ts"
@@ -106,7 +108,10 @@
             "@iptvnator/workspace/dashboard/data-access": [
                 "libs/workspace/dashboard/data-access/src/index.ts"
             ],
-            "@package": ["./package.json"]
+            "@package": ["./package.json"],
+            "@iptvnator/shared/marketing-fixtures": [
+                "./libs/shared/marketing-fixtures/src/index.ts"
+            ]
         }
     },
     "exclude": ["node_modules", "tmp"],
diff --git a/vendor/embedded-mpv/README.md b/vendor/embedded-mpv/README.md
index 568b2cdb4..6943b7936 100644
--- a/vendor/embedded-mpv/README.md
+++ b/vendor/embedded-mpv/README.md
@@ -11,10 +11,37 @@ Generated architecture folders are expected at:
 - `vendor/embedded-mpv/linux-x64/`
 
 Each generated folder must contain `include/mpv/client.h` and
-`runtime-manifest.json`. macOS and Windows folders also contain platform
-runtime/build inputs under `lib/` or `bin/`. The binary runtime directories are
-ignored by git by default; generate, stage, or restore them in release packaging
-jobs before building the Electron backend.
+`runtime-manifest.json`. Platform runtime/build inputs live under `lib/` or
+`bin/`. In particular, `linux-x64/lib/` contains the pinned, dynamically linked
+LGPL-compatible libmpv closure used to link the out-of-process frame-copy
+helper. `linux-x64/notices/` contains the generated
+`embedded-mpv-notices.json`, `THIRD_PARTY_NOTICES.txt`, and exact
+`licenses/<package>/**` tree. The generated runtime directories are ignored by
+git; generate, stage, or restore them before building the Electron backend.
 
-Linux uses this directory for MPV headers and build metadata only. Linux
-packages launch the system `mpv` executable and must not bundle `libmpv.so`.
+Linux package profiles consume that one staged x64 source runtime differently:
+
+- DEB/RPM/Pacman remove the private closure and declare the system libmpv
+  dependency.
+- AppImage/Snap/Flatpak retain the manifest-declared closure under
+  `app.asar.unpacked/electron-backend/native/lib/` and flatten the validated
+  notice manifest, aggregate notice, and `licenses/**` tree beside it.
+- The strict Snap resolves the helper's remaining graphics interfaces through
+  the external `mesa-core22` content provider at `$SNAP/graphics`; that shared
+  provider is not staged below `vendor/embedded-mpv/`, bundled into IPTVnator,
+  or included in IPTVnator's source/notices archive.
+- DEB/RPM/Pacman and marker-only packages do not retain bundled-runtime
+  notices or license files.
+- Non-x64 Linux packages retain no native artifacts and ship only the
+  unavailable marker.
+- Electron Builder excludes the staged native tree from `app.asar`; only
+  `afterPack` writes the profile-specific unpacked payload, and package
+  verification rejects archived native entries.
+
+The DEB dependency is specifically `libmpv2` (verified on Ubuntu 24.04+).
+Ubuntu 22.04 provides `libmpv1`; use the x64 AppImage there.
+
+Only `iptvnator_mpv_helper` may link libmpv. Electron,
+`embedded_mpv.node`, and `embedded_mpv_frame_reader.node` must remain free of
+direct libmpv dependencies. See `tools/embedded-mpv/README.md` and
+`docs/architecture/embedded-mpv-native.md`.